summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Swenson <cswenson@us.ibm.com>2017-07-12 15:53:59 -0500
committerChristian R. Geddes <crgeddes@us.ibm.com>2017-07-14 15:57:23 -0400
commitfddf433d2cacce8cf1b9b86e3df8cb54d926d07f (patch)
treeee09a98541cca135b93813e47018047d745036ec
parent3fbd50ab46e402867da8a5ae6b041aa9330fd6ea (diff)
downloadtalos-hostboot-fddf433d2cacce8cf1b9b86e3df8cb54d926d07f.tar.gz
talos-hostboot-fddf433d2cacce8cf1b9b86e3df8cb54d926d07f.zip
Fix for signed attribute overrides
Change-Id: I8a0dcc86b46ea0fbba03723ebb214419710dda3f CQ:SW394908 Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/43059 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com> Reviewed-by: Dzuy Nguyen <dzuy@us.ibm.com> Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
-rwxr-xr-xsrc/usr/targeting/common/xmltohb/xmltohb.pl38
1 files changed, 32 insertions, 6 deletions
diff --git a/src/usr/targeting/common/xmltohb/xmltohb.pl b/src/usr/targeting/common/xmltohb/xmltohb.pl
index a31aebd9a..72f38f9f9 100755
--- a/src/usr/targeting/common/xmltohb/xmltohb.pl
+++ b/src/usr/targeting/common/xmltohb/xmltohb.pl
@@ -1708,10 +1708,14 @@ sub writeTargAttrMap {
# Only (initially) support attributes with simple integer types
if ((exists $attribute->{simpleType}) &&
- ((exists $attribute->{simpleType}->{uint8_t}) ||
+ ((exists $attribute->{simpleType}->{uint8_t}) ||
(exists $attribute->{simpleType}->{uint16_t}) ||
(exists $attribute->{simpleType}->{uint32_t}) ||
- (exists $attribute->{simpleType}->{uint64_t})))
+ (exists $attribute->{simpleType}->{uint64_t}) ||
+ (exists $attribute->{simpleType}->{int8_t}) ||
+ (exists $attribute->{simpleType}->{int16_t}) ||
+ (exists $attribute->{simpleType}->{int32_t}) ||
+ (exists $attribute->{simpleType}->{int64_t})))
{
@@ -1727,7 +1731,9 @@ sub writeTargAttrMap {
print $outFile "\t\t$enum->{value},\n";
# iv_attrElemSizeBytes
my @sizes = ( "uint8_t", "uint16_t",
- "uint32_t", "uint64_t" );
+ "uint32_t", "uint64_t",
+ "int8_t", "int16_t",
+ "int32_t", "int64_t");
foreach my $size (@sizes)
{
@@ -2599,7 +2605,7 @@ sub writeAttrInfoCsvFile {
my($attributes,$outFile) = @_;
# Print the file header
- print $outFile "# targAttrInfo.cvs\n";
+ print $outFile "# targAttrInfo.csv\n";
print $outFile "# This file is generated by perl script xmltohb.pl\n";
print $outFile "# It lists information about TARG attributes and is used to\n";
print $outFile "# process FAPI Attribute text files (overrides/syncs)\n";
@@ -2613,10 +2619,14 @@ sub writeAttrInfoCsvFile {
{
# Only (initially) support attributes with simple integer types
if ((exists $attribute->{simpleType}) &&
- ((exists $attribute->{simpleType}->{uint8_t}) ||
+ ((exists $attribute->{simpleType}->{uint8_t}) ||
(exists $attribute->{simpleType}->{uint16_t}) ||
(exists $attribute->{simpleType}->{uint32_t}) ||
- (exists $attribute->{simpleType}->{uint64_t})))
+ (exists $attribute->{simpleType}->{uint64_t}) ||
+ (exists $attribute->{simpleType}->{int8_t}) ||
+ (exists $attribute->{simpleType}->{int16_t}) ||
+ (exists $attribute->{simpleType}->{int32_t}) ||
+ (exists $attribute->{simpleType}->{int64_t})))
{
my $fapiId = "NO-FAPI-ID";
@@ -2649,6 +2659,22 @@ sub writeAttrInfoCsvFile {
{
print $outFile "u64";
}
+ elsif (exists $attribute->{simpleType}->{int8_t})
+ {
+ print $outFile "s8";
+ }
+ elsif (exists $attribute->{simpleType}->{int16_t})
+ {
+ print $outFile "s16";
+ }
+ elsif (exists $attribute->{simpleType}->{int32_t})
+ {
+ print $outFile "s32";
+ }
+ elsif (exists $attribute->{simpleType}->{int64_t})
+ {
+ print $outFile "s64";
+ }
if (exists $attribute->{simpleType}->{array})
{
OpenPOWER on IntegriCloud