Support for [u]int16_t attribute types.

Also fixed createIfAttrService.pl to start at argv 0 to work correctly.

Change-Id: I9f2886b156ab55d1d0499a0c5d8fe8c65adac9a1
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20949
Tested-by: Jenkins Server
Reviewed-by: Matt K. Light <mklight@us.ibm.com>
Reviewed-by: Brian Silver <bsilver@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>

3 files changed, 94 insertions, 2 deletions

diff --git a/src/import/hwpf/fapi2/tools/createIfAttrService.pl b/src/import/hwpf/fapi2/tools/createIfAttrService.pl
index 075fe9d4a..b46e84ec4 100755
--- a/src/import/hwpf/fapi2/tools/createIfAttrService.pl
+++ b/src/import/hwpf/fapi2/tools/createIfAttrService.pl
@@ -104,7 +104,7 @@ my $attribute = 'attribute';
 #------------------------------------------------------------------------------
 # For each argument
 #------------------------------------------------------------------------------
-foreach my $argnum (1 .. $#ARGV)
+foreach my $argnum (0 .. $#ARGV)
 {
     my $infile = $ARGV[$argnum];
 
diff --git a/src/import/hwpf/fapi2/tools/parseAttributeInfo.pl b/src/import/hwpf/fapi2/tools/parseAttributeInfo.pl
index 0c215e222..ecaa08e5c 100755
--- a/src/import/hwpf/fapi2/tools/parseAttributeInfo.pl
+++ b/src/import/hwpf/fapi2/tools/parseAttributeInfo.pl
@@ -394,7 +394,7 @@ foreach my $argnum (0 .. $#ARGV)
                 exit(1);
             }
 
-            my @sizes = ( 'uint8', 'uint32', 'uint64', 'int8', 'int32', 'int64' );
+            my @sizes = ( 'uint8', 'uint16', 'uint32', 'uint64', 'int8', 'int16', 'int32', 'int64' );
             my $actualSize = '';
             foreach my $size (@sizes)
             {
diff --git a/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml b/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml
index 32f36916f..1a676b863 100644
--- a/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml
+++ b/src/import/hwpf/fapi2/xml/attribute_info/scratch_attributes.xml
@@ -48,6 +48,28 @@
   </attribute>
   <!-- ********************************************************************* -->
   <attribute>
+    <id>ATTR_SCRATCH_UINT16_1</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>
+        Scratch uint16_t attribute.
+        Can be used by HWPs for testing.
+    </description>
+    <valueType>uint16</valueType>
+    <writeable/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_SCRATCH_UINT16_2</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>
+        Scratch uint16_t attribute.
+        Can be used by HWPs for testing.
+    </description>
+    <valueType>uint16</valueType>
+    <writeable/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
     <id>ATTR_SCRATCH_UINT32_1</id>
     <targetType>TARGET_TYPE_SYSTEM</targetType>
     <description>
@@ -117,6 +139,30 @@
   </attribute>
   <!-- ********************************************************************* -->
   <attribute>
+    <id>ATTR_SCRATCH_UINT16_ARRAY_1</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>
+        Scratch uint16_t[16] attribute.
+        Can be used by HWPs for testing.
+    </description>
+    <valueType>uint16</valueType>
+    <array>16</array>
+    <writeable/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_SCRATCH_UINT16_ARRAY_2</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>
+        Scratch uint16_t[2][3][2] attribute.
+        Can be used by HWPs for testing.
+    </description>
+    <valueType>uint16</valueType>
+    <array>2,3,2</array>
+    <writeable/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
     <id>ATTR_SCRATCH_UINT32_ARRAY_1</id>
     <targetType>TARGET_TYPE_SYSTEM</targetType>
     <description>
@@ -188,6 +234,28 @@
   </attribute>
   <!-- ********************************************************************* -->
   <attribute>
+    <id>ATTR_SCRATCH_INT16_1</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>
+        Scratch int16_t attribute.
+        Can be used by HWPs for testing.
+    </description>
+    <valueType>int16</valueType>
+    <writeable/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_SCRATCH_INT16_2</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>
+        Scratch int16_t attribute.
+        Can be used by HWPs for testing.
+    </description>
+    <valueType>int16</valueType>
+    <writeable/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
     <id>ATTR_SCRATCH_INT32_1</id>
     <targetType>TARGET_TYPE_SYSTEM</targetType>
     <description>
@@ -257,6 +325,30 @@
   </attribute>
   <!-- ********************************************************************* -->
   <attribute>
+    <id>ATTR_SCRATCH_INT16_ARRAY_1</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>
+        Scratch int16_t[16] attribute.
+        Can be used by HWPs for testing.
+    </description>
+    <valueType>int16</valueType>
+    <array>16</array>
+    <writeable/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
+    <id>ATTR_SCRATCH_INT16_ARRAY_2</id>
+    <targetType>TARGET_TYPE_SYSTEM</targetType>
+    <description>
+        Scratch int16_t[2][3][2] attribute.
+        Can be used by HWPs for testing.
+    </description>
+    <valueType>int16</valueType>
+    <array>2,3,2</array>
+    <writeable/>
+  </attribute>
+  <!-- ********************************************************************* -->
+  <attribute>
     <id>ATTR_SCRATCH_INT32_ARRAY_1</id>
     <targetType>TARGET_TYPE_SYSTEM</targetType>
     <description>