Latest iasl generate .lst as 'number: ' instead of 'number....', then acpi_extrace.py fails to extract any useful information, building fails.
Signed-off-by: Bo Yang boyang@suse.com --- tools/acpi_extract.py | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/tools/acpi_extract.py b/tools/acpi_extract.py index 3295678..503784c 100755 --- a/tools/acpi_extract.py +++ b/tools/acpi_extract.py @@ -229,11 +229,23 @@ for line in fileinput.input(): m = pasl.search(line) if (m): add_asl(lineno, pasl.sub("", line)); + else: + # latest iasl output different format. + 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*') m = paml.search(line) if (m): add_aml(m.group(1), paml.sub("", line)) + else: + # latest iasl output different format. + paml = re.compile('^([0-9A-Fa-f]+):\s\s\s*') + m = paml.search(line) + if (m): + add_aml(m.group(1), paml.sub("", line))
# Now go over code # Track AML offset of a previous non-empty ASL command