From f396871e3df9da14c65ab24a5a881674e06150a9 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 10 Feb 2013 21:06:14 -0500 Subject: [PATCH] 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 Signed-off-by: Kevin O'Connor --- tools/acpi_extract.py | 4 ++-- 1 file 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)) -- 2.39.5