diff options
Diffstat (limited to 'src/usr')
| -rwxr-xr-x | src/usr/errl/parser/genErrlParsers.pl | 18 | ||||
| -rw-r--r-- | src/usr/hwas/hwasPlatDeconfigGard.C | 10 | ||||
| -rw-r--r-- | src/usr/hwas/hwasPlatError.C | 4 |
3 files changed, 8 insertions, 24 deletions
diff --git a/src/usr/errl/parser/genErrlParsers.pl b/src/usr/errl/parser/genErrlParsers.pl index 14feb8bf8..182448a65 100755 --- a/src/usr/errl/parser/genErrlParsers.pl +++ b/src/usr/errl/parser/genErrlParsers.pl @@ -6,7 +6,7 @@ # # IBM CONFIDENTIAL # -# COPYRIGHT International Business Machines Corp. 2013 +# COPYRIGHT International Business Machines Corp. 2013,2014 # # p1 # @@ -234,22 +234,6 @@ foreach my $file (@reasonCodeFiles) } $namespace = $1; - # Check for common code files where the reason codes do not contain - # component IDs. Expand this hash as needed to add more components - my %namespaceToCompHash = ( - "HWAS" => "HWAS_COMP_ID"); - - if (exists $namespaceToCompHash{$namespace}) - { - # Reason codes do not contain component IDs - $compId = $namespaceToCompHash{$namespace}; - } - else - { - # Reason codes contain component IDs - $compId = ""; - } - next; } elsif ($line =~ /enum.+ModuleId/i) diff --git a/src/usr/hwas/hwasPlatDeconfigGard.C b/src/usr/hwas/hwasPlatDeconfigGard.C index ce54620e1..551373a15 100644 --- a/src/usr/hwas/hwasPlatDeconfigGard.C +++ b/src/usr/hwas/hwasPlatDeconfigGard.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2013 */ +/* COPYRIGHT International Business Machines Corp. 2013,2014 */ /* */ /* p1 */ /* */ @@ -201,7 +201,7 @@ errlHndl_t DeconfigGard::platCreateGardRecord( /*@ * @errortype - * @moduleid HWAS::MOD_DECONFIG_GARD + * @moduleid HWAS::MOD_PLAT_DECONFIG_GARD * @reasoncode HWAS::RC_TARGET_NOT_GARDABLE * @devdesc Attempt to create a GARD Record for a target that * is not GARDable @@ -215,7 +215,7 @@ errlHndl_t DeconfigGard::platCreateGardRecord( (static_cast<uint64_t>(lDeconfigGardable) << 32) | lPresent; l_pErr = hwasError( ERRL_SEV_UNRECOVERABLE, - HWAS::MOD_DECONFIG_GARD, + HWAS::MOD_PLAT_DECONFIG_GARD, HWAS::RC_TARGET_NOT_GARDABLE, userdata1, userdata2); @@ -310,7 +310,7 @@ errlHndl_t DeconfigGard::platCreateGardRecord( /*@ * @errortype - * @moduleid HWAS::MOD_DECONFIG_GARD + * @moduleid HWAS::MOD_PLAT_DECONFIG_GARD * @reasoncode HWAS::RC_GARD_REPOSITORY_FULL * @devdesc Attempt to create a GARD Record and the GARD * Repository is full @@ -321,7 +321,7 @@ errlHndl_t DeconfigGard::platCreateGardRecord( i_errlEid; l_pErr = hwasError( ERRL_SEV_UNRECOVERABLE, - HWAS::MOD_DECONFIG_GARD, + HWAS::MOD_PLAT_DECONFIG_GARD, HWAS::RC_GARD_REPOSITORY_FULL, userdata1); break; diff --git a/src/usr/hwas/hwasPlatError.C b/src/usr/hwas/hwasPlatError.C index 0b63973dc..fa5a3ccb8 100644 --- a/src/usr/hwas/hwasPlatError.C +++ b/src/usr/hwas/hwasPlatError.C @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2012,2013 */ +/* COPYRIGHT International Business Machines Corp. 2012,2014 */ /* */ /* p1 */ /* */ @@ -43,7 +43,7 @@ errlHndl_t hwasError(const uint8_t i_sev, l_pErr = new ERRORLOG::ErrlEntry( (ERRORLOG::errlSeverity_t)i_sev, i_modId, - HWAS_COMP_ID | i_reasonCode, + i_reasonCode, i_user1, i_user2); l_pErr->collectTrace("HWAS_I"); return l_pErr; |
