Cleaning up some duplicate SRC tags that I noticed. I also changed

some of the constants to make them a little more consistent with
some of the other modules.

Change-Id: I56d9de9179fe088b46aaa41c6b46e06b6e4ca423
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/704
Tested-by: Jenkins Server
Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com>
Reviewed-by: Melissa J. Connell <missyc@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

5 files changed, 44 insertions, 39 deletions

diff --git a/src/include/usr/intr/intr_reasoncodes.H b/src/include/usr/intr/intr_reasoncodes.H
index 98070196b..489eda68a 100644
--- a/src/include/usr/intr/intr_reasoncodes.H
+++ b/src/include/usr/intr/intr_reasoncodes.H
@@ -29,16 +29,20 @@ namespace INTR
 {
     enum IntrModuleID
     {
-        UNDEFINED_MODULE_ERRL_ID        = 0,
-        INTR_MODULE_ID,
+        MOD_INVALID                  = 0x00, /**< Invalid Module ID */
+        MOD_INTR_ENABLE              = 0x01, /**< intrrp.C : INTR::enableExternalInterrupts */
+        MOD_INTR_DISABLE             = 0x02, /**< intrrp.C : INTR::disableExternalInterrupts */
+        MOD_INTR_REGISTER            = 0x03, /**< intrrp.C : INTR::registerMsgQ */
+        MOD_INTRRP_CHECKADDRESS      = 0x04, /**< intrrp.C : IntrRp::checkAddress */
+        MOD_INTRRP_REGISTERINTERRUPT = 0x05, /**< intrrp.C : IntrRp::registerInterrupt */
     };
 
     enum IntrReasonCode
     {
-        INTR_ALREADY_REGISTERED         = INTR_COMP_ID | 0x01,
-        INTR_REGISTRY_NOT_READY         = INTR_COMP_ID | 0x02,
-        INTR_RP_NOT_INITIALIZED         = INTR_COMP_ID | 0x03,
-        INTR_BAD_VIRTUAL_IO_ADDRESS     = INTR_COMP_ID | 0x04,
+        RC_ALREADY_REGISTERED         = INTR_COMP_ID | 0x01,
+        RC_REGISTRY_NOT_READY         = INTR_COMP_ID | 0x02,
+        RC_RP_NOT_INITIALIZED         = INTR_COMP_ID | 0x03,
+        RC_BAD_VIRTUAL_IO_ADDRESS     = INTR_COMP_ID | 0x04,
     };
 };
 
diff --git a/src/include/usr/scom/scomreasoncodes.H b/src/include/usr/scom/scomreasoncodes.H
index d2ffa7e79..85ba58a59 100644
--- a/src/include/usr/scom/scomreasoncodes.H
+++ b/src/include/usr/scom/scomreasoncodes.H
@@ -29,10 +29,10 @@ namespace SCOM
 {
     enum scomModuleId
     {
-        SCOM_PERFORM_OP            = 0x00,
-        SCOM_TRANSLATE             = 0x01,
-        SCOM_PERFORM_TRANSLATE     = 0x02,
-        SCOM_FIND_PARENT_TARGET    = 0x03,
+        MOD_INVALID                = 0x00, /**< Invalid Id */
+        SCOM_TRANSLATE             = 0x01, /**< scomtrans.C : scomTranslate */
+        SCOM_PERFORM_TRANSLATE     = 0x02, /**< scomtrans.C : scomPerformTranslate */
+        SCOM_FIND_PARENT_TARGET    = 0x03, /**< scomtrans.C : scomfindParentTarget */
 
     };
 
@@ -41,7 +41,8 @@ namespace SCOM
         SCOM_INVALID_ADDR           = SCOM_COMP_ID | 0x01,
         SCOM_NO_MATCHING_PARENT     = SCOM_COMP_ID | 0x02,
         SCOM_TRANS_INVALID_TYPE     = SCOM_COMP_ID | 0x03,
-        SCOM_TRANS_UNSUPPORTED      = SCOM_COMP_ID | 0x04,
+        SCOM_TRANS_UNSUPPORTED_XBUS = SCOM_COMP_ID | 0x04,
+        SCOM_TRANS_UNSUPPORTED_ABUS = SCOM_COMP_ID | 0x05,
     };
 };
 
diff --git a/src/usr/fsiscom/fsiscom.C b/src/usr/fsiscom/fsiscom.C
index a88210a7f..a61bfcce2 100644
--- a/src/usr/fsiscom/fsiscom.C
+++ b/src/usr/fsiscom/fsiscom.C
@@ -309,14 +309,14 @@ errlHndl_t fsiScomPerformOp(DeviceFW::OperationType i_opType,
             /*@
              * @errortype
              * @moduleid     FSISCOM::MOD_FSISCOM_PERFORMOP
-             * @reasoncode   FSISCOM::RC_READ_ERROR
+             * @reasoncode   FSISCOM::RC_INVALID_OPTYPE
              * @userdata1    Operation Type (i_opType) : 0=READ, 1=WRITE
              * @userdata2    0
              * @devdesc      fsiScomPerformOp> Unsupported Operation Type specified
              */
             l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                             FSISCOM::MOD_FSISCOM_PERFORMOP,
-                                            FSISCOM::RC_READ_ERROR,
+                                            FSISCOM::RC_INVALID_OPTYPE,
                                             TO_UINT64(i_opType),
                                             0);
 
diff --git a/src/usr/intr/intrrp.C b/src/usr/intr/intrrp.C
index 23aa91777..c18a307f3 100644
--- a/src/usr/intr/intrrp.C
+++ b/src/usr/intr/intrrp.C
@@ -362,8 +362,8 @@ errlHndl_t IntrRp::registerInterrupt(msg_q_t i_msgQ, ext_intr_t i_type)
         {
         /*@ errorlog tag
          * @errortype       ERRL_SEV_INFORMATIONAL
-         * @moduleid        INTR_MODULE_ID
-         * @reasoncode      INTR_ALREADY_REGISTERED
+         * @moduleid        INTR::MOD_INTRRP_REGISTERINTERRUPT
+         * @reasoncode      INTR::RC_ALREADY_REGISTERED
          * @userdata1       Interrupt type
          * @userdata2       0
          *
@@ -372,9 +372,9 @@ errlHndl_t IntrRp::registerInterrupt(msg_q_t i_msgQ, ext_intr_t i_type)
          */
             err = new ERRORLOG::ErrlEntry
                 (
-                 ERRORLOG::ERRL_SEV_INFORMATIONAL,      // severity
-                 INTR::INTR_MODULE_ID,                  // moduleid
-                 INTR::INTR_ALREADY_REGISTERED,         // reason code
+                 ERRORLOG::ERRL_SEV_INFORMATIONAL,    // severity
+                 INTR::MOD_INTRRP_REGISTERINTERRUPT,  // moduleid
+                 INTR::RC_ALREADY_REGISTERED,         // reason code
                  i_type,
                  0
                 );
@@ -444,8 +444,8 @@ errlHndl_t IntrRp::checkAddress(uint64_t i_addr)
     {
         /*@ errorlog tag
          * @errortype       ERRL_SEV_INFORMATIONAL
-         * @moduleid        INTR_MODULE_ID
-         * @reasoncode      INTR_BAD_VIRTUAL_IO_ADDRESS
+         * @moduleid        INTR::MOD_INTRRP_CHECKADDRESS
+         * @reasoncode      INTR::RC_BAD_VIRTUAL_IO_ADDRESS
          * @userdata1       The bad virtual address
          * @userdata2       0
          *
@@ -455,8 +455,8 @@ errlHndl_t IntrRp::checkAddress(uint64_t i_addr)
         err = new ERRORLOG::ErrlEntry
             (
              ERRORLOG::ERRL_SEV_INFORMATIONAL,
-             INTR::INTR_MODULE_ID,
-             INTR::INTR_BAD_VIRTUAL_IO_ADDRESS,
+             INTR::MOD_INTRRP_CHECKADDRESS,
+             INTR::RC_BAD_VIRTUAL_IO_ADDRESS,
              i_addr,
              0
             );
@@ -487,8 +487,8 @@ errlHndl_t INTR::registerMsgQ(msg_q_t i_msgQ, ext_intr_t i_type)
     {
         /*@ errorlog tag
          * @errortype       ERRL_SEV_INFORMATIONAL
-         * @moduleid        INTR_MODULE_ID
-         * @reasoncode      INTR_REGISTRY_NOT_READY
+         * @moduleid        INTR::MOD_INTR_REGISTER
+         * @reasoncode      INTR::RC_REGISTRY_NOT_READY
          * @userdata1       Interrupt type to register
          * @userdata2       0
          *
@@ -497,9 +497,9 @@ errlHndl_t INTR::registerMsgQ(msg_q_t i_msgQ, ext_intr_t i_type)
          */
         err = new ERRORLOG::ErrlEntry
             (
-             ERRORLOG::ERRL_SEV_INFORMATIONAL,      // severity
-             INTR::INTR_MODULE_ID,                  // moduleid
-             INTR::INTR_REGISTRY_NOT_READY,         // reason code
+             ERRORLOG::ERRL_SEV_INFORMATIONAL,    // severity
+             INTR::MOD_INTR_REGISTER,             // moduleid
+             INTR::RC_REGISTRY_NOT_READY,         // reason code
              static_cast<uint64_t>(i_type),
              0
             );
@@ -527,8 +527,8 @@ errlHndl_t INTR::enableExternalInterrupts()
     {
         /*@ errorlog tag
          * @errortype       ERRL_SEV_INFORMATIONAL
-         * @moduleid        INTR_MODULE_ID
-         * @reasoncode      INTR_RP_NOT_INITIALIZED
+         * @moduleid        INTR::MOD_INTR_ENABLE
+         * @reasoncode      INTR::RC_RP_NOT_INITIALIZED
          * @userdata1       MSG_INTR_ENABLE
          * @userdata2       0
          *
@@ -538,8 +538,8 @@ errlHndl_t INTR::enableExternalInterrupts()
         err = new ERRORLOG::ErrlEntry
             (
              ERRORLOG::ERRL_SEV_INFORMATIONAL,      // severity
-             INTR::INTR_MODULE_ID,                  // moduleid
-             INTR::INTR_RP_NOT_INITIALIZED,         // reason code
+             INTR::MOD_INTR_ENABLE,                 // moduleid
+             INTR::RC_RP_NOT_INITIALIZED,           // reason code
              static_cast<uint64_t>(MSG_INTR_ENABLE),
              0
             );
@@ -568,8 +568,8 @@ errlHndl_t INTR::disableExternalInterrupts()
     {
         /*@ errorlog tag
          * @errortype       ERRL_SEV_INFORMATIONAL
-         * @moduleid        INTR_MODULE_ID
-         * @reasoncode      INTR_RP_NOT_INITIALIZED
+         * @moduleid        INTR::MOD_INTR_DISABLE
+         * @reasoncode      INTR::RC_RP_NOT_INITIALIZED
          * @userdata1       MSG_INTR_DISABLE
          * @userdata2       0
          *
@@ -579,8 +579,8 @@ errlHndl_t INTR::disableExternalInterrupts()
         err = new ERRORLOG::ErrlEntry
             (
              ERRORLOG::ERRL_SEV_INFORMATIONAL,      // severity
-             INTR::INTR_MODULE_ID,                  // moduleid
-             INTR::INTR_RP_NOT_INITIALIZED,         // reason code
+             INTR::MOD_INTR_DISABLE,                // moduleid
+             INTR::RC_RP_NOT_INITIALIZED,           // reason code
              static_cast<uint64_t>(MSG_INTR_DISABLE),
              0
             );
diff --git a/src/usr/scom/scomtrans.C b/src/usr/scom/scomtrans.C
index eaf42b98b..d1141582d 100644
--- a/src/usr/scom/scomtrans.C
+++ b/src/usr/scom/scomtrans.C
@@ -212,14 +212,14 @@ errlHndl_t scomTranslate(DeviceFW::OperationType i_opType,
             /*@
              * @errortype
              * @moduleid     SCOM::SCOM_TRANSLATE
-             * @reasoncode   SCOM::SCOM_TRANS_UNSUPPORTED
+             * @reasoncode   SCOM::SCOM_TRANS_UNSUPPORTED_XBUS
              * @userdata1    Address
              * @userdata2    Target Type that failed
              * @devdesc      Scom Translate not supported for this type
              */
              l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                              SCOM_TRANSLATE,
-                                             SCOM_TRANS_UNSUPPORTED,
+                                             SCOM_TRANS_UNSUPPORTED_XBUS,
                                              i_addr,
                                              l_type);
 
@@ -233,14 +233,14 @@ errlHndl_t scomTranslate(DeviceFW::OperationType i_opType,
             /*@
              * @errortype
              * @moduleid     SCOM::SCOM_TRANSLATE
-             * @reasoncode   SCOM::SCOM_TRANS_UNSUPPORTED
+             * @reasoncode   SCOM::SCOM_TRANS_UNSUPPORTED_ABUS
              * @userdata1    Address
              * @userdata2    Target Type that failed
              * @devdesc      Scom Translate not supported for this type
              */
              l_err = new ERRORLOG::ErrlEntry(ERRORLOG::ERRL_SEV_UNRECOVERABLE,
                                              SCOM_TRANSLATE,
-                                             SCOM_TRANS_UNSUPPORTED,
+                                             SCOM_TRANS_UNSUPPORTED_ABUS,
                                              i_addr,
                                              l_type);