From a8552636905f76769e156aefce3397f2bb221c7e Mon Sep 17 00:00:00 2001
From: Al Stone <ahs3(a)redhat.com>
Date: Fri, 31 Mar 2017 19:03:17 -0600
Subject: Update misc tests to reflect minor parser changes
Signed-off-by: Al Stone <ahs3(a)redhat.com>
---
badcode.asl.result | 40 ++++++++++++++++++++--------------------
grammar.asl.result | 6 +++---
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/badcode.asl.result b/badcode.asl.result
index 4cfcefc..d2b04bc 100644
--- a/badcode.asl.result
+++ b/badcode.asl.result
@@ -85,25 +85,25 @@ Warning 3144 - Method Local is set but never used ^ (Local0)
badcode.asl 126: Method (MTH5) {Store (MTH4(), Local0)}
Error 6080 - Called method returns no value ^
-badcode.asl 132: Name (_HID, "*PNP0C0A") // Illegal leading asterisk
+badcode.asl 132: Name (_HID, "*PNP0C0A") /* Illegal leading asterisk
Error 6061 - Invalid leading asterisk ^ (*PNP0C0A)
-badcode.asl 136: Name (_HID, "PNP") // Too short, must be 7 or 8 chars
+badcode.asl 136: Name (_HID, "PNP") /* Too short, must be 7 or 8 chars
Error 6033 - ^ _HID string must be exactly 7 or 8 characters (PNP)
-badcode.asl 140: Name (_HID, "MYDEVICE01") // Too long, must be 7 or 8 chars
+badcode.asl 140: Name (_HID, "MYDEVICE01") /* Too long, must be 7 or 8 chars
Error 6033 - ^ _HID string must be exactly 7 or 8 characters (MYDEVICE01)
-badcode.asl 144: Name (_HID, "acpi0001") // non-hex chars must be uppercase
+badcode.asl 144: Name (_HID, "acpi0001") /* non-hex chars must be uppercase
Error 6034 - ^ _HID prefix must be all uppercase or decimal digits (acpi0001)
-badcode.asl 148: Name (_HID, "PNP-123") // HID must be alphanumeric
+badcode.asl 148: Name (_HID, "PNP-123") /* HID must be alphanumeric
Error 6002 - ^ String must be entirely alphanumeric (PNP-123)
-badcode.asl 152: Name (_HID, "") // Illegal Null HID
+badcode.asl 152: Name (_HID, "") /* Illegal Null HID
Error 6091 - ^ Invalid zero-length (null) string
-badcode.asl 153: Name (_CID, "") // Illegal Null CID
+badcode.asl 153: Name (_CID, "") /* Illegal Null CID
Error 6091 - ^ Invalid zero-length (null) string
badcode.asl 158: Name (_PRW, 4)
@@ -157,49 +157,49 @@ Error 6019 - ^ Dependent function macros can
badcode.asl 225: })
Error 6070 - ^ Missing EndDependentFn() macro in dependent resource list
-badcode.asl 242: 0x00002000, // Length
+badcode.asl 242: 0x00002000, /* Length
Error 6049 - ^ Length is larger than Min/Max window
-badcode.asl 247: 0x00001001, // Range Minimum
+badcode.asl 247: 0x00001001, /* Range Minimum
Error 6001 - ^ Must be a multiple of alignment/granularity value
-badcode.asl 248: 0x00002002, // Range Maximum
+badcode.asl 248: 0x00002002, /* Range Maximum
Error 6001 - ^ Must be a multiple of alignment/granularity value
-badcode.asl 255: 0xFFFF, // Address
+badcode.asl 255: 0xFFFF, /* Address
Warning 3060 - ^ Maximum 10-bit ISA address (0x3FF)
-badcode.asl 264: 0x05 // Access Size
+badcode.asl 264: 0x05 /* Access Size
Error 6042 - ^ Invalid AccessSize (Maximum is 4 - QWord access)
badcode.asl 268: QWordSpace (0xB0, ResourceConsumer, PosDecode, MinFixed, MaxFixed, 0xA5,
Error 6139 - Constant out of range ^ (0xB0, allowable: 0xC0-0xFF)
-badcode.asl 279: 0x0200, // Range Minimum
+badcode.asl 279: 0x0200, /* Range Minimum
Error 6051 - ^ Address Min is greater than Address Max
-badcode.asl 291: 0x00001002, // Length
+badcode.asl 291: 0x00001002, /* Length
Error 6049 - ^ Length is larger than Min/Max window
badcode.asl 296: 0x00000010,
Error 6048 - ^ Granularity must be zero or a power of two minus one
-badcode.asl 305: 0x0000000000000B02, // Range Minimum
+badcode.asl 305: 0x0000000000000B02, /* Range Minimum
Error 6001 - ^ Must be a multiple of alignment/granularity value
-badcode.asl 315: 0x00000000002FFFFE, // Range Maximum
+badcode.asl 315: 0x00000000002FFFFE, /* Range Maximum
Error 6001 - ^ Must be a multiple of alignment/granularity value (-1)
-badcode.asl 326: 0x00000000, // Length
+badcode.asl 326: 0x00000000, /* Length
Error 6043 - ^ Invalid combination of Length and Min/Max fixed flags
-badcode.asl 335: 0x00000100, // Length
+badcode.asl 335: 0x00000100, /* Length
Error 6043 - ^ Invalid combination of Length and Min/Max fixed flags
-badcode.asl 344: 0x00000200, // Length
+badcode.asl 344: 0x00000200, /* Length
Error 6043 - ^ Invalid combination of Length and Min/Max fixed flags
-badcode.asl 349: 0x0000000F, // Granularity
+badcode.asl 349: 0x0000000F, /* Granularity
Error 6047 - ^ Granularity must be zero for fixed Min/Max
badcode.asl 358: DWordIO (ResourceProducer, MinFixed, MaxFixed, PosDecode, EntireRange,
diff --git a/grammar.asl.result b/grammar.asl.result
index 0035bdf..9639088 100644
--- a/grammar.asl.result
+++ b/grammar.asl.result
@@ -256,7 +256,7 @@ Remark 2063 - ^ Initializer list shorter than
grammar.asl 6190: Device (C19B)
Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope)
-grammar.asl 6199: Divide (Local1, 10, Local0, Local2) // Local0 = Local1 / 10
+grammar.asl 6199: Divide (Local1, 10, Local0, Local2) /* Local0 = Local1 / 10
Warning 3144 - Method Local is set but never used ^ (Local0)
grammar.asl 6244: Device (DWDF)
@@ -307,10 +307,10 @@ Warning 3046 - Invalid or unknown escape sequence ^
grammar.asl 6709: Device (BITI)
Warning 3141 - Missing dependency ^ (Device object requires a _HID or _ADR in same scope)
-grammar.asl 6817: And (Local0, 1, Local0) // Local0 &= 1
+grammar.asl 6817: And (Local0, 1, Local0) /* Local0 &= 1
Error 6066 - ^ Method local variable is not initialized (Local0)
-grammar.asl 6903: Name (_HID, "*PNP0C0A") // Control Method Battey ID
+grammar.asl 6903: Name (_HID, "*PNP0C0A") /* Control Method Battey ID
Error 6061 - Invalid leading asterisk ^ (*PNP0C0A)
grammar.asl 6912: Device (IDX3)
--
cgit v1.1
https://src.fedoraproject.org/cgit/acpica-tools.git/commit/?h=master&id=a85…