aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2013-02-10 21:06:14 -0500
committerKevin O'Connor <kevin@koconnor.net>2013-02-12 21:05:08 -0500
commit616fb27f88d9acac64d8bf786c7d2b32df273660 (patch)
tree326af5ba4de6b4118a216d9abd204f89b54e8807
parent3a735baa31f6014e205a4892dc2ab95dc81af797 (diff)
downloadseabios-616fb27f88d9acac64d8bf786c7d2b32df273660.tar.gz
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>
-rwxr-xr-xtools/acpi_extract.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/acpi_extract.py b/tools/acpi_extract.py
index 3295678..dd3ccfd 100755
--- 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))