Ability to use defines for hex and binary addresses.

Ability to use defines in the bits, scom_data and attribute columns.

Change-Id: Ic5f001a524fe0bfe58eb91418abb152ba6e95729
RTC:35648
RTC:40446
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/933
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 33 insertions, 0 deletions

diff --git a/src/usr/hwpf/hwp/initfiles/sample.define b/src/usr/hwpf/hwp/initfiles/sample.define
index 4025ea6d4..b4c9e72ad 100755
--- a/src/usr/hwpf/hwp/initfiles/sample.define
+++ b/src/usr/hwpf/hwp/initfiles/sample.define
@@ -20,3 +20,25 @@
 #-- -----------------------------------------------------------------------------
 define def_uint8_greater_test = (SYS.ATTR_SCRATCH_UINT8_1 > SYS.ATTR_SCRATCH_UINT8_2);
 define def_uint32_greater_test = (SYS.ATTR_SCRATCH_UINT32_1 > SYS.ATTR_SCRATCH_UINT32_2);  
+
+define addr=0x800;
+define addr2=0x04011;
+define addr3=F3;
+define rx_mode_reg=0b100100000;
+
+define xbus0=0;
+define xbus3=C;
+
+define rx0=000000;
+define rx1=000001;
+
+define lane0=00000;
+define lane2=00010;
+define lane3=00011;
+
+define rx_field1 = 48:51;
+
+define rx_field1_enum_value1 = 0b0000;
+define rx_field1_enum_value2 = 0b0001;
+
+define attr_value1 = 5;
diff --git a/src/usr/hwpf/hwp/initfiles/sample.initfile b/src/usr/hwpf/hwp/initfiles/sample.initfile
index 093d912ba..325313f5c 100755
--- a/src/usr/hwpf/hwp/initfiles/sample.initfile
+++ b/src/usr/hwpf/hwp/initfiles/sample.initfile
@@ -211,3 +211,14 @@ scom 0x0000000013013289              {
 #  scom_data                 ;
 #  0x0000000000000194    ;
 #}
+
+#--******************************************************************************
+#-- SCOM with defines for Scom address and each supported column.
+#-- Note: This SCOM is inluded here as an example of the supported syntax.
+#-- Uncomment only for debugging code.
+#--******************************************************************************
+#scom addr.rx_mode_reg(rx0,rx1)(lane0, lane2..lane3).addr2(xbus0,xbus3)addr3 {
+#  bits     , scom_data,              SYS.ATTR_SCRATCH_UINT32_1, expr;
+#  rx_field1, rx_field1_enum_value1,  any,                       def_equal_test;
+#  rx_field1, rx_field1_enum_value2,  attr_value1,               def_not_equal_test;
+#}