From 6dea332771095c9a5891e2e7dea051cfc9e4f22d Mon Sep 17 00:00:00 2001 From: Dan Crowell Date: Tue, 28 Feb 2012 16:00:21 -0600 Subject: 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 Reviewed-by: Melissa J. Connell Reviewed-by: A. Patrick Williams III --- src/include/usr/intr/intr_reasoncodes.H | 16 ++++++++++------ src/include/usr/scom/scomreasoncodes.H | 11 ++++++----- 2 files changed, 16 insertions(+), 11 deletions(-) (limited to 'src/include/usr') 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, }; }; -- cgit v1.2.3