Update tools/acpi_extract.py to handle iasl 20130117 release.

The latest iasl release produces "lst" output with "number:  " instead
of "number....".  Update the tool to support both formats.

Reported-by: Bo Yang <boyang@suse.com>
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>

diff --git a/tools/acpi_extract.py b/tools/acpi_extract.py
index 32956788596bb8a53474e60f606ee20a0704a810..dd3ccfdd96d38722309f4a0aff5ba3ebf7860df2 100755 (executable)
--- a/tools/acpi_extract.py
+++ b/tools/acpi_extract.py
@@ -225,12 +225,12 @@ for line in fileinput.input():
     lineno = lineno + 1
     debug = "input line %d: %s" % (lineno, line)
     #ASL listing: space, then line#, then ...., then code
-    pasl = re.compile('^\s+([0-9]+)\.\.\.\.\s*')
+    pasl = re.compile('^\s+([0-9]+)(:\s\s|\.\.\.\.)\s*')
     m = pasl.search(line)
     if (m):
         add_asl(lineno, pasl.sub("", line));
     # AML listing: offset in hex, then ...., then code
-    paml = re.compile('^([0-9A-Fa-f]+)\.\.\.\.\s*')
+    paml = re.compile('^([0-9A-Fa-f]+)(:\s\s|\.\.\.\.)\s*')
     m = paml.search(line)
     if (m):
         add_aml(m.group(1), paml.sub("", line))