diff options
| author | Richard J. Knight <rjknight@us.ibm.com> | 2015-10-06 11:45:11 -0500 |
|---|---|---|
| committer | Patrick Williams <iawillia@us.ibm.com> | 2015-12-11 13:40:20 -0600 |
| commit | 8644de595bc194be543fc710e9a9468943c4b3d2 (patch) | |
| tree | 65b4023c31ecac21273558f7f95b694ef879f0fa /src | |
| parent | b824f4ec0e58ae02541a18f119fddc32d2dab7ad (diff) | |
| download | talos-hostboot-8644de595bc194be543fc710e9a9468943c4b3d2.tar.gz talos-hostboot-8644de595bc194be543fc710e9a9468943c4b3d2.zip | |
fapi2_chip_ec_feature.C does not compile.
-Fixed parsing script to use updated ReturnCode types.
-Fixed misc. compile issues with ported code.
-Modified makefile to re-enable compile.
Change-Id: I085cee2bbbe00218dd57dfc1d7bc81c700064899
RTC:134733
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20981
Tested-by: Jenkins Server
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Reviewed-by: PRACHI GUPTA <pragupta@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/import/hwpf/fapi2/src/fapi2.mk | 5 | ||||
| -rwxr-xr-x | src/import/hwpf/fapi2/tools/parseAttributeInfo.pl | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/src/import/hwpf/fapi2/src/fapi2.mk b/src/import/hwpf/fapi2/src/fapi2.mk index 5bbf7d151..6058daccb 100644 --- a/src/import/hwpf/fapi2/src/fapi2.mk +++ b/src/import/hwpf/fapi2/src/fapi2.mk @@ -27,10 +27,7 @@ FAPI2_MODULE_OBJS += array.o FAPI2_MODULE_OBJS += error_info.o FAPI2_MODULE_OBJS += ffdc.o FAPI2_MODULE_OBJS += fapi2_attribute_service.o -#TODO RTC 134733: Can't find the basic XML for attributes, so -# fapi2_chip_ec_feature.C doesn't compile. -#FAPI2_MODULE_OBJS += fapi2_chip_ec_feature.o -#FAPI2_MODULE_OBJS += collect_reg_ffdc.o +FAPI2_MODULE_OBJS += fapi2_chip_ec_feature.o # Define common source and include paths. define FAPI2_MODULE_INCLUDES diff --git a/src/import/hwpf/fapi2/tools/parseAttributeInfo.pl b/src/import/hwpf/fapi2/tools/parseAttributeInfo.pl index ecaa08e5c..12d6888d8 100755 --- a/src/import/hwpf/fapi2/tools/parseAttributeInfo.pl +++ b/src/import/hwpf/fapi2/tools/parseAttributeInfo.pl @@ -142,20 +142,21 @@ print ECFILE " o_hasFeature = false;\n"; print ECFILE " ReturnCode l_rc;\n"; print ECFILE " uint8_t l_chipName = 0;\n"; print ECFILE " uint8_t l_chipEc = 0;\n\n"; +print ECFILE " Target<TARGET_TYPE_ALL> l_target;\n\n"; print ECFILE " if (i_pTarget.isChiplet())\n"; print ECFILE " {\n"; -print ECFILE " Target<TARGET_TYPE_ALL> l_target = i_pTarget.getParent();\n"; +print ECFILE " l_target = i_pTarget.getParent();\n"; print ECFILE " }\n\n"; print ECFILE " if (!l_rc)\n"; print ECFILE " {\n"; -print ECFILE " l_rc = FAPI_ATTR_GET_PRIVILEGED(ATTR_NAME, &l_target, l_chipName);\n\n"; +print ECFILE " l_rc = FAPI_ATTR_GET_PRIVILEGED(ATTR_NAME, l_target, l_chipName);\n\n"; print ECFILE " if (l_rc)\n"; print ECFILE " {\n"; print ECFILE " FAPI_ERR(\"queryChipEcFeature: error getting chip name\");\n"; print ECFILE " }\n"; print ECFILE " else\n"; print ECFILE " {\n"; -print ECFILE " l_rc = FAPI_ATTR_GET_PRIVILEGED(ATTR_EC, &l_target, l_chipEc);\n\n"; +print ECFILE " l_rc = FAPI_ATTR_GET_PRIVILEGED(ATTR_EC, l_target, l_chipEc);\n\n"; print ECFILE " if (l_rc)\n"; print ECFILE " {\n"; print ECFILE " FAPI_ERR(\"queryChipEcFeature: error getting chip ec\");\n"; @@ -694,8 +695,7 @@ print AIFILE "#endif\n"; print ECFILE " default:\n"; print ECFILE " FAPI_ERR(\"queryChipEcFeature: Unknown feature 0x%x\",\n"; print ECFILE " i_id);\n"; -print ECFILE " l_rc.setFapiError(FAPI_RC_INVALID_CHIP_EC_FEATURE_GET);\n"; -print ECFILE " l_rc.addEIFfdc(0, &i_id, sizeof(i_id));\n"; +print ECFILE " l_rc = FAPI2_RC_INVALID_CHIP_EC_FEATURE_GET;\n"; print ECFILE " break;\n"; print ECFILE " }\n\n"; print ECFILE " if (o_hasFeature)\n"; |
