diff options
Diffstat (limited to 'src/usr/hwpf/fapi')
| -rwxr-xr-x | src/usr/hwpf/fapi/fapiParseErrorInfo.pl | 30 | ||||
| -rw-r--r-- | src/usr/hwpf/fapi/makefile | 2 |
2 files changed, 9 insertions, 23 deletions
diff --git a/src/usr/hwpf/fapi/fapiParseErrorInfo.pl b/src/usr/hwpf/fapi/fapiParseErrorInfo.pl index 0117cf077..395d50318 100755 --- a/src/usr/hwpf/fapi/fapiParseErrorInfo.pl +++ b/src/usr/hwpf/fapi/fapiParseErrorInfo.pl @@ -56,6 +56,7 @@ # collectRegisterFfdc element # mjjones 05/20/13 Support Bus Callouts # mjjones 06/24/13 Support Children CDGs +# mjjones 08/20/13 Use constants for Reg FFDC collection # # End Change Log ****************************************************** @@ -278,7 +279,8 @@ print CRFILE "#include <fapiCollectRegFfdc.H>\n"; print CRFILE "#include <fapiTarget.H>\n"; print CRFILE "#include <fapiReturnCode.H>\n"; print CRFILE "#include <fapiHwAccess.H>\n"; -print CRFILE "#include <fapiPlatTrace.H>\n\n"; +print CRFILE "#include <fapiPlatTrace.H>\n"; +print CRFILE "#include <fapiPlatRegAddresses.H>\n\n"; print CRFILE "namespace fapi\n"; print CRFILE "{\n"; print CRFILE "void fapiCollectRegFfdc(const fapi::Target & i_target,\n"; @@ -777,33 +779,15 @@ foreach my $argnum (1 .. $#ARGV) # Look for CFAM Register addresses foreach my $cfamRegister (@{$registerFfdc->{cfamRegister}}) { - # Extract the address - if ($cfamRegister =~ m/(0x[\dA-Fa-f]+)/) - { - print CRFILE " l_cfamAddresses.push_back($1);\n"; - print CRFILE " l_ffdcSize += sizeof(l_cfamData);\n"; - } - else - { - print ("fapiParseErrorInfo.pl ERROR. CFAM address bad: $cfamRegister\n"); - exit(1); - } + print CRFILE " l_cfamAddresses.push_back($cfamRegister);\n"; + print CRFILE " l_ffdcSize += sizeof(l_cfamData);\n"; } # Look for SCOM Register addresses foreach my $scomRegister (@{$registerFfdc->{scomRegister}}) { - # Extract the address - if ($scomRegister =~ m/(0x[\dA-Fa-f]+)/) - { - print CRFILE " l_scomAddresses.push_back($1ULL);\n"; - print CRFILE " l_ffdcSize += sizeof(l_scomData);\n"; - } - else - { - print ("fapiParseErrorInfo.pl ERROR. SCOM address bad: $scomRegister\n"); - exit(1); - } + print CRFILE " l_scomAddresses.push_back($scomRegister);\n"; + print CRFILE " l_ffdcSize += sizeof(l_scomData);\n"; } print CRFILE " break;\n"; diff --git a/src/usr/hwpf/fapi/makefile b/src/usr/hwpf/fapi/makefile index 5af2f587f..ae098e7d3 100644 --- a/src/usr/hwpf/fapi/makefile +++ b/src/usr/hwpf/fapi/makefile @@ -27,6 +27,8 @@ EXTRAINCDIR += ${ROOTPATH}/src/include/usr/ecmddatabuffer EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/fapi EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/plat EXTRAINCDIR += ${ROOTPATH}/src/include/usr/hwpf/hwp +EXTRAINCDIR += ${ROOTPATH}/src/usr/hwpf/hwp/include + CFLAGS += -D_NO_SPY_ACCESS=1 OBJS = fapiReturnCode.o \ |
