summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCamVan Nguyen <ctnguyen@us.ibm.com>2012-07-12 11:00:34 -0500
committerA. Patrick Williams III <iawillia@us.ibm.com>2012-07-16 18:50:45 -0500
commit2aa5e0afac73384aaabe1fe1529898601be1155f (patch)
treeeb91abb9e7c72019b82915eddddeb4778c1e486c
parent571c5fc6729ddf06c8e0d08523f1263b179e4ec3 (diff)
downloadtalos-hostboot-2aa5e0afac73384aaabe1fe1529898601be1155f.tar.gz
talos-hostboot-2aa5e0afac73384aaabe1fe1529898601be1155f.zip
SCOM Initfile: Support for "ANY"
Change-Id: I35c3331f98f79852246ce1970e008e6051577931 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/1344 Tested-by: Jenkins Server Reviewed-by: Douglas R. Gilbert <dgilbert@us.ibm.com> Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com> Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
-rwxr-xr-xsrc/usr/hwpf/hwp/initfiles/sample.initfile2
-rwxr-xr-xsrc/usr/hwpf/ifcompiler/initCompiler.lex3
2 files changed, 3 insertions, 2 deletions
diff --git a/src/usr/hwpf/hwp/initfiles/sample.initfile b/src/usr/hwpf/hwp/initfiles/sample.initfile
index 6e3c0b178..b9bac67e9 100755
--- a/src/usr/hwpf/hwp/initfiles/sample.initfile
+++ b/src/usr/hwpf/hwp/initfiles/sample.initfile
@@ -153,7 +153,7 @@ scom 0x0000000013013283 {
scom 0x0000000013013284 {
bits , scom_data, expr ;
- 0:11 , 0b001111001001, any ;
+ 0:11 , 0b001111001001, ANY ;
12 , 0b1, def_equal_test ;
12 , 0b0, def_not_equal_test ;
13 , 0b1, def_uint8_greater_test ;
diff --git a/src/usr/hwpf/ifcompiler/initCompiler.lex b/src/usr/hwpf/ifcompiler/initCompiler.lex
index 6cd160aba..78bd7acb8 100755
--- a/src/usr/hwpf/ifcompiler/initCompiler.lex
+++ b/src/usr/hwpf/ifcompiler/initCompiler.lex
@@ -46,6 +46,7 @@
// camvanng 06/11/12 Fix shift/reduce warnings from yacc
// camvanng 06/15/12 Ability to do bitwise OR and AND operations
// camvanng 06/27/12 Improve error handling
+// camvanng 07/12/12 Support for "ANY"
// End Change Log *********************************************************************************/
/**
* @file initCompiler.lex
@@ -418,7 +419,7 @@ END_INITFILE return INIT_ENDINITFILE;
}
/* All attributes start with "ATTR_"; then there's "any". */
-<*>ATTR_{ID}|"any" {
+<*>ATTR_{ID}|"any"|"ANY" {
yylval.str_ptr = new std::string(yytext); return INIT_ID;
}
OpenPOWER on IntegriCloud