From 3e5a6ca3ed7f9a614cdb14d8a1aa1b4bbe6be646 Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Thu, 21 May 2020 21:08:35 +0300 Subject: [PATCH] Fix construction of the path to PCI config files. Change %u to %x in sprintf format string ><. --- README | 2 +- linux/pci.c | 6 +- test/026_#acpi_m000.ref.log | 306 +++++++++-------- test/027_#acpi_m001.ref.log | 645 ++++++++++++++++++++++++++---------- test/029_#acpi_m003.ref.log | 198 +++++++++-- 5 files changed, 792 insertions(+), 365 deletions(-) diff --git a/README b/README index f736e33..e00a618 100644 --- a/README +++ b/README @@ -43,7 +43,7 @@ Framebuffer can be dumped to disk as image file. Testing ------- -sudo cp --parents --no-preserve=mode /sys/firmware/acpi/tables/?SDT* /sys/bus/pci/devices/*/config . > /data/work/proj/kolibri/umka/acpi.txt +sudo cp --parents --no-preserve=mode /sys/firmware/acpi/tables/?SDT* /sys/bus/pci/devices/*/config . Troubleshooting diff --git a/linux/pci.c b/linux/pci.c index cb4b815..729b0a3 100644 --- a/linux/pci.c +++ b/linux/pci.c @@ -9,10 +9,12 @@ char pci_path[PATH_MAX] = "."; -__attribute__((stdcall)) uint32_t pci_read(uint32_t bus, uint32_t dev, uint32_t fun, uint32_t offset, size_t len) { +__attribute__((stdcall)) uint32_t pci_read(uint32_t bus, uint32_t dev, + uint32_t fun, uint32_t offset, + size_t len) { char path[PATH_MAX*2]; uint32_t value = 0; - sprintf(path, "%s/%4.4u:%2.2u:%2.2u.%u/config", pci_path, 0, bus, dev, fun); + sprintf(path, "%s/%4.4x:%2.2x:%2.2x.%u/config", pci_path, 0, bus, dev, fun); int fd = open(path, O_RDONLY); if (!fd) { // TODO: report an error diff --git a/test/026_#acpi_m000.ref.log b/test/026_#acpi_m000.ref.log index 73306f6..35c08c4 100644 --- a/test/026_#acpi_m000.ref.log +++ b/test/026_#acpi_m000.ref.log @@ -124737,6 +124737,128 @@ aml._.get_node_by_name begin name: '_ADR' aml._.get_node_by_name end aml._.get_node_by_name begin +name: '_PRT' +aml._.get_node_by_name end +acpi.call_node begin +# func name _PRT +# bytes 0x49500AA0 +# bytes 0x41A44D43 +# bytes 0xA4303052 +table/position: [0xFFFE4E8A] +aml._.term_obj begin +aml._.object begin +aml._.namespace_modifier_obj begin +aml._.namespace_modifier_obj end +aml._.named_obj begin +aml._.named_obj end +aml._.object end +aml._.if begin +pkg_length: 0x0000000A +aml._.term_arg begin +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFE4E8C +aml._.name_path begin +aml._.name_path end +name_string: PICM +aml._.name_string end +aml._.get_node_by_name begin +name: 'PICM' +aml._.get_node_by_name end +aml._.data_object begin +aml._.data_object end +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFE4E8C +aml._.name_path begin +aml._.name_path end +name_string: PICM +aml._.name_string end +aml._.get_node_by_name begin +name: 'PICM' +aml._.get_node_by_name end +aml._.term_arg end +aml._.cast begin +types 2 to 2 +aml._.cast.integer_to_integer begin +aml._.cast.integer_to_integer end +aml._.cast end +if branch taken +table/position: [0xFFFE4E90] +aml._.term_obj begin +aml._.object begin +aml._.namespace_modifier_obj begin +aml._.namespace_modifier_obj end +aml._.named_obj begin +aml._.named_obj end +aml._.object end +aml._.return begin +aml._.term_arg begin +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFE4E91 +aml._.name_path begin +aml._.name_path end +name_string: AR00 +aml._.name_string end +aml._.get_node_by_name begin +name: 'AR00' +aml._.get_node_by_name end +aml._.data_object begin +aml._.data_object end +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFE4E91 +aml._.name_path begin +aml._.name_path end +name_string: AR00 +aml._.name_string end +aml._.get_node_by_name begin +name: 'AR00' +aml._.get_node_by_name end +aml._.term_arg end +aml._.return end +acpi.call_node end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin name: '_ADR' aml._.get_node_by_name end aml._.get_node_by_name begin @@ -125141,158 +125263,32 @@ aml._.get_node_by_name end aml._.get_node_by_name begin name: '_ADR' aml._.get_node_by_name end - -00:00.0 - acpi name: PCI0 - is_bridge: 1 - - 00:00.2 - acpi name: IOMA - is_bridge: 0 - - - 00:00.0 - acpi name: D003 - is_bridge: 1 - - - 00:08.1 - acpi name: GP17 - is_bridge: 1 - - 03:00.0 - acpi name: VGA_ - is_bridge: 0 - - - 03:00.1 - acpi name: D00C - is_bridge: 0 - - - 03:00.5 - acpi name: D00D - is_bridge: 0 - - - 03:00.6 - acpi name: D00E - is_bridge: 0 - - - 03:00.7 - acpi name: MP2C - is_bridge: 0 - - - 03:00.3 - acpi name: XHC0 - is_bridge: 0 - - - 03:00.4 - acpi name: XHC1 - is_bridge: 0 - - - 03:00.2 - acpi name: APSP - is_bridge: 0 - - - - 00:08.2 - acpi name: GP18 - is_bridge: 1 - - 04:00.0 - acpi name: SATA - is_bridge: 0 - - - 04:00.1 - acpi name: D01C - is_bridge: 0 - - - 04:00.2 - acpi name: D01D - is_bridge: 0 - - - - 00:14.0 - acpi name: D015 - is_bridge: 0 - - - 00:14.3 - acpi name: SBRG - is_bridge: 0 - - - 00:14.6 - acpi name: D018 - is_bridge: 0 - - - 00:01.1 - acpi name: GPP0 - is_bridge: 0 - - - 00:01.2 - acpi name: GPP1 - is_bridge: 0 - - - 00:01.3 - acpi name: GPP2 - is_bridge: 0 - - - 00:01.4 - acpi name: GPP3 - is_bridge: 0 - - - 00:01.5 - acpi name: GPP4 - is_bridge: 0 - - - 00:01.6 - acpi name: GPP5 - is_bridge: 1 - - 01:00.0 - acpi name: XPDV - is_bridge: 0 - - - - 00:01.7 - acpi name: GPP6 - is_bridge: 1 - - 02:00.F - acpi name: D027 - is_bridge: 0 - - - 02:00.0 - acpi name: XPDV - is_bridge: 0 - - - -DUMP 03:00.0 1002:15DD 34 -DUMP 03:00.1 1002:15DE 35 -DUMP 03:00.6 1022:15E3 36 -DUMP 03:00.7 1022:15E6 37 -DUMP 03:00.3 1022:15E0 37 -DUMP 03:00.4 1022:15E1 34 -DUMP 03:00.2 1022:15DF 36 -DUMP 04:00.0 1022:7901 36 -DUMP 01:00.0 10EC:B822 2C -DUMP 02:00.0 10EC:8168 30 +00:00.0 0000:0000 00 1 \_SB_\PCI0 + 00:00.2 1022:15D1 00 0 \_SB_\PCI0\IOMA + 00:00.0 0000:0000 00 1 \_SB_\PCI0\D003 + 00:08.1 0000:0000 00 1 \_SB_\PCI0\GP17 + 03:00.0 1002:15DD 34 0 \_SB_\PCI0\GP17\VGA_ + 03:00.1 1002:15DE 35 0 \_SB_\PCI0\GP17\D00C + 03:00.5 0000:0000 00 0 \_SB_\PCI0\GP17\D00D + 03:00.6 1022:15E3 36 0 \_SB_\PCI0\GP17\D00E + 03:00.7 1022:15E6 37 0 \_SB_\PCI0\GP17\MP2C + 03:00.3 1022:15E0 37 0 \_SB_\PCI0\GP17\XHC0 + 03:00.4 1022:15E1 34 0 \_SB_\PCI0\GP17\XHC1 + 03:00.2 1022:15DF 36 0 \_SB_\PCI0\GP17\APSP + 00:08.2 0000:0000 00 1 \_SB_\PCI0\GP18 + 04:00.0 1022:7901 36 0 \_SB_\PCI0\GP18\SATA + 04:00.1 0000:0000 00 0 \_SB_\PCI0\GP18\D01C + 04:00.2 0000:0000 00 0 \_SB_\PCI0\GP18\D01D + 00:14.0 1022:790B 00 0 \_SB_\PCI0\D015 + 00:14.3 0000:0000 00 1 \_SB_\PCI0\SBRG + 00:14.6 0000:0000 00 0 \_SB_\PCI0\D018 + 00:01.1 0000:0000 00 0 \_SB_\PCI0\GPP0 + 00:01.2 0000:0000 00 0 \_SB_\PCI0\GPP1 + 00:01.3 0000:0000 00 0 \_SB_\PCI0\GPP2 + 00:01.4 0000:0000 00 0 \_SB_\PCI0\GPP3 + 00:01.5 0000:0000 00 0 \_SB_\PCI0\GPP4 + 00:01.6 0000:0000 00 1 \_SB_\PCI0\GPP5 + 01:00.0 10EC:B822 2C 0 \_SB_\PCI0\GPP5\XPDV + 00:01.7 0000:0000 00 1 \_SB_\PCI0\GPP6 + 02:00.F 0000:0000 00 0 \_SB_\PCI0\GPP6\D027 + 02:00.0 10EC:8168 30 0 \_SB_\PCI0\GPP6\XPDV diff --git a/test/027_#acpi_m001.ref.log b/test/027_#acpi_m001.ref.log index e5b495f..f3651b4 100644 --- a/test/027_#acpi_m001.ref.log +++ b/test/027_#acpi_m001.ref.log @@ -67807,36 +67807,6 @@ aml._.get_node_by_name begin name: '_ADR' aml._.get_node_by_name end aml._.get_node_by_name begin -name: '_ADR' -aml._.get_node_by_name end -aml._.get_node_by_name begin -name: '_ADR' -aml._.get_node_by_name end -aml._.get_node_by_name begin -name: '_ADR' -aml._.get_node_by_name end -aml._.get_node_by_name begin -name: '_ADR' -aml._.get_node_by_name end -aml._.get_node_by_name begin -name: '_ADR' -aml._.get_node_by_name end -aml._.get_node_by_name begin -name: '_ADR' -aml._.get_node_by_name end -aml._.get_node_by_name begin -name: '_ADR' -aml._.get_node_by_name end -aml._.get_node_by_name begin -name: '_ADR' -aml._.get_node_by_name end -aml._.get_node_by_name begin -name: '_ADR' -aml._.get_node_by_name end -aml._.get_node_by_name begin -name: '_ADR' -aml._.get_node_by_name end -aml._.get_node_by_name begin name: '_PRT' aml._.get_node_by_name end acpi.call_node begin @@ -67941,6 +67911,128 @@ aml._.get_node_by_name begin name: '_ADR' aml._.get_node_by_name end aml._.get_node_by_name begin +name: '_PRT' +aml._.get_node_by_name end +acpi.call_node begin +# func name _PRT +# bytes 0x49500AA0 +# bytes 0x41A44D43 +# bytes 0xA4393052 +table/position: [0xFFFFA147] +aml._.term_obj begin +aml._.object begin +aml._.namespace_modifier_obj begin +aml._.namespace_modifier_obj end +aml._.named_obj begin +aml._.named_obj end +aml._.object end +aml._.if begin +pkg_length: 0x0000000A +aml._.term_arg begin +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFFA149 +aml._.name_path begin +aml._.name_path end +name_string: PICM +aml._.name_string end +aml._.get_node_by_name begin +name: 'PICM' +aml._.get_node_by_name end +aml._.data_object begin +aml._.data_object end +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFFA149 +aml._.name_path begin +aml._.name_path end +name_string: PICM +aml._.name_string end +aml._.get_node_by_name begin +name: 'PICM' +aml._.get_node_by_name end +aml._.term_arg end +aml._.cast begin +types 2 to 2 +aml._.cast.integer_to_integer begin +aml._.cast.integer_to_integer end +aml._.cast end +if branch taken +table/position: [0xFFFFA14D] +aml._.term_obj begin +aml._.object begin +aml._.namespace_modifier_obj begin +aml._.namespace_modifier_obj end +aml._.named_obj begin +aml._.named_obj end +aml._.object end +aml._.return begin +aml._.term_arg begin +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFFA14E +aml._.name_path begin +aml._.name_path end +name_string: AR09 +aml._.name_string end +aml._.get_node_by_name begin +name: 'AR09' +aml._.get_node_by_name end +aml._.data_object begin +aml._.data_object end +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFFA14E +aml._.name_path begin +aml._.name_path end +name_string: AR09 +aml._.name_string end +aml._.get_node_by_name begin +name: 'AR09' +aml._.get_node_by_name end +aml._.term_arg end +aml._.return end +acpi.call_node end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin name: '_ADR' aml._.get_node_by_name end aml._.get_node_by_name begin @@ -68144,6 +68236,271 @@ aml._.get_node_by_name begin name: '_ADR' aml._.get_node_by_name end aml._.get_node_by_name begin +name: '_PRT' +aml._.get_node_by_name end +acpi.call_node begin +# func name _PRT +# bytes 0x49500AA0 +# bytes 0x41A44D43 +# bytes 0xA4423052 +table/position: [0xFFFF85C5] +aml._.term_obj begin +aml._.object begin +aml._.namespace_modifier_obj begin +aml._.namespace_modifier_obj end +aml._.named_obj begin +aml._.named_obj end +aml._.object end +aml._.if begin +pkg_length: 0x0000000A +aml._.term_arg begin +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFF85C7 +aml._.name_path begin +aml._.name_path end +name_string: PICM +aml._.name_string end +aml._.get_node_by_name begin +name: 'PICM' +aml._.get_node_by_name end +aml._.data_object begin +aml._.data_object end +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFF85C7 +aml._.name_path begin +aml._.name_path end +name_string: PICM +aml._.name_string end +aml._.get_node_by_name begin +name: 'PICM' +aml._.get_node_by_name end +aml._.term_arg end +aml._.cast begin +types 2 to 2 +aml._.cast.integer_to_integer begin +aml._.cast.integer_to_integer end +aml._.cast end +if branch taken +table/position: [0xFFFF85CB] +aml._.term_obj begin +aml._.object begin +aml._.namespace_modifier_obj begin +aml._.namespace_modifier_obj end +aml._.named_obj begin +aml._.named_obj end +aml._.object end +aml._.return begin +aml._.term_arg begin +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFF85CC +aml._.name_path begin +aml._.name_path end +name_string: AR0B +aml._.name_string end +aml._.get_node_by_name begin +name: 'AR0B' +aml._.get_node_by_name end +aml._.data_object begin +aml._.data_object end +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFF85CC +aml._.name_path begin +aml._.name_path end +name_string: AR0B +aml._.name_string end +aml._.get_node_by_name begin +name: 'AR0B' +aml._.get_node_by_name end +aml._.term_arg end +aml._.return end +acpi.call_node end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_PRT' +aml._.get_node_by_name end +acpi.call_node begin +# func name _PRT +# bytes 0x49500AA0 +# bytes 0x41A44D43 +# bytes 0xA4413052 +table/position: [0xFFFF84AD] +aml._.term_obj begin +aml._.object begin +aml._.namespace_modifier_obj begin +aml._.namespace_modifier_obj end +aml._.named_obj begin +aml._.named_obj end +aml._.object end +aml._.if begin +pkg_length: 0x0000000A +aml._.term_arg begin +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFF84AF +aml._.name_path begin +aml._.name_path end +name_string: PICM +aml._.name_string end +aml._.get_node_by_name begin +name: 'PICM' +aml._.get_node_by_name end +aml._.data_object begin +aml._.data_object end +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFF84AF +aml._.name_path begin +aml._.name_path end +name_string: PICM +aml._.name_string end +aml._.get_node_by_name begin +name: 'PICM' +aml._.get_node_by_name end +aml._.term_arg end +aml._.cast begin +types 2 to 2 +aml._.cast.integer_to_integer begin +aml._.cast.integer_to_integer end +aml._.cast end +if branch taken +table/position: [0xFFFF84B3] +aml._.term_obj begin +aml._.object begin +aml._.namespace_modifier_obj begin +aml._.namespace_modifier_obj end +aml._.named_obj begin +aml._.named_obj end +aml._.object end +aml._.return begin +aml._.term_arg begin +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFF84B4 +aml._.name_path begin +aml._.name_path end +name_string: AR0A +aml._.name_string end +aml._.get_node_by_name begin +name: 'AR0A' +aml._.get_node_by_name end +aml._.data_object begin +aml._.data_object end +aml._.name_string begin +aml._.name_string begin again +offset: 0xFFFF84B4 +aml._.name_path begin +aml._.name_path end +name_string: AR0A +aml._.name_string end +aml._.get_node_by_name begin +name: 'AR0A' +aml._.get_node_by_name end +aml._.term_arg end +aml._.return end +acpi.call_node end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin name: '_ADR' aml._.get_node_by_name end aml._.get_node_by_name begin @@ -68212,149 +68569,85 @@ aml._.get_node_by_name end aml._.get_node_by_name begin name: '_ADR' aml._.get_node_by_name end - -00:00.0 - acpi name: PCI0 - is_bridge: 1 - - 00:01.0 - acpi name: VGA_ - is_bridge: 0 - - - 00:02.0 - acpi name: PB2_ - is_bridge: 0 - - - 00:03.0 - acpi name: PB3_ - is_bridge: 0 - - - 00:04.0 - acpi name: PB4_ - is_bridge: 0 - - - 00:05.0 - acpi name: PB5_ - is_bridge: 0 - - - 00:06.0 - acpi name: PB6_ - is_bridge: 0 - - - 00:07.0 - acpi name: PB7_ - is_bridge: 0 - - - 00:15.0 - acpi name: SPB0 - is_bridge: 0 - - - 00:15.1 - acpi name: SPB1 - is_bridge: 0 - - - 00:15.2 - acpi name: SPB2 - is_bridge: 0 - - - 00:15.3 - acpi name: SPB3 - is_bridge: 0 - - - 00:14.2 - acpi name: AZAL - is_bridge: 0 - - - 00:14.6 - acpi name: GEC_ - is_bridge: 0 - - - 00:12.0 - acpi name: OHC1 - is_bridge: 1 - - - 00:13.0 - acpi name: OHC2 - is_bridge: 0 - - - 00:16.0 - acpi name: OHC3 - is_bridge: 0 - - - 00:14.5 - acpi name: OHC4 - is_bridge: 0 - - - 00:12.2 - acpi name: EHC1 - is_bridge: 1 - - - 00:13.2 - acpi name: EHC2 - is_bridge: 0 - - - 00:16.2 - acpi name: EHC3 - is_bridge: 0 - - - 00:10.0 - acpi name: XHC0 - is_bridge: 0 - - - 00:10.1 - acpi name: XHC1 - is_bridge: 0 - - - 00:14.0 - acpi name: SMBS - is_bridge: 0 - - - 00:14.3 - acpi name: LPC0 - is_bridge: 0 - - - 00:14.4 - acpi name: P2P_ - is_bridge: 0 - - - 00:11.0 - acpi name: SATA - is_bridge: 0 - - - 00:14.1 - acpi name: IDE_ - is_bridge: 0 - - - 00:18.3 - acpi name: G3F3 - is_bridge: 0 - - -DUMP 00:01.0 1002:990D 11 +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +00:00.0 0000:0000 00 1 \_SB_\PCI0 + 00:01.0 1002:990D 11 0 \_SB_\PCI0\VGA_ + 00:02.0 0000:0000 00 0 \_SB_\PCI0\PB2_ + 00:03.0 0000:0000 00 0 \_SB_\PCI0\PB3_ + 00:04.0 0000:0000 00 0 \_SB_\PCI0\PB4_ + 00:05.0 0000:0000 00 0 \_SB_\PCI0\PB5_ + 00:06.0 0000:0000 00 0 \_SB_\PCI0\PB6_ + 00:07.0 0000:0000 00 0 \_SB_\PCI0\PB7_ + 00:15.0 0000:0000 00 1 \_SB_\PCI0\SPB0 + 02:00.0 1969:10A1 10 0 \_SB_\PCI0\SPB0\XPDV + 00:15.1 0000:0000 00 1 \_SB_\PCI0\SPB1 + 03:00.0 168C:0034 11 0 \_SB_\PCI0\SPB1\XPDV + 00:15.2 0000:0000 00 0 \_SB_\PCI0\SPB2 + 00:15.3 0000:0000 00 0 \_SB_\PCI0\SPB3 + 00:14.2 1022:780D 10 0 \_SB_\PCI0\AZAL + 00:14.6 0000:0000 00 0 \_SB_\PCI0\GEC_ + 00:12.0 1022:7807 12 0 \_SB_\PCI0\OHC1 + 00:13.0 1022:7807 12 0 \_SB_\PCI0\OHC2 + 00:16.0 0000:0000 00 0 \_SB_\PCI0\OHC3 + 00:14.5 0000:0000 00 0 \_SB_\PCI0\OHC4 + 00:12.2 1022:7808 11 0 \_SB_\PCI0\EHC1 + 00:13.2 1022:7808 11 0 \_SB_\PCI0\EHC2 + 00:16.2 0000:0000 00 0 \_SB_\PCI0\EHC3 + 00:10.0 1022:7814 12 0 \_SB_\PCI0\XHC0 + 00:10.1 0000:0000 00 0 \_SB_\PCI0\XHC1 + 00:14.0 1022:780B 00 0 \_SB_\PCI0\SMBS + 00:14.3 0000:0000 00 1 \_SB_\PCI0\LPC0 + 00:14.4 0000:0000 00 1 \_SB_\PCI0\P2P_ + 00:11.0 1022:7801 13 0 \_SB_\PCI0\SATA + 00:14.1 0000:0000 00 0 \_SB_\PCI0\IDE_ + 00:18.3 0000:0000 00 1 \_SB_\PCI0\G3F3 diff --git a/test/029_#acpi_m003.ref.log b/test/029_#acpi_m003.ref.log index 36a264a..ad8e3ab 100644 --- a/test/029_#acpi_m003.ref.log +++ b/test/029_#acpi_m003.ref.log @@ -24455,6 +24455,122 @@ aml._.get_node_by_name begin name: '_ADR' aml._.get_node_by_name end aml._.get_node_by_name begin +name: '_PRT' +aml._.get_node_by_name end +acpi.call_node begin +# func name _PRT +# bytes 0x50930CA0 +# bytes 0x00464349 +# bytes 0x545250A4 +table/position: [0x00001235] +aml._.term_obj begin +aml._.object begin +aml._.namespace_modifier_obj begin +aml._.namespace_modifier_obj end +aml._.named_obj begin +aml._.named_obj end +aml._.object end +aml._.if begin +pkg_length: 0x0000000C +aml._.term_arg begin +aml._.l_equal begin +aml._.term_arg begin +aml._.name_string begin +aml._.name_string begin again +offset: 0x00001238 +aml._.name_path begin +aml._.name_path end +name_string: PICF +aml._.name_string end +aml._.get_node_by_name begin +name: 'PICF' +aml._.get_node_by_name end +aml._.data_object begin +aml._.data_object end +aml._.name_string begin +aml._.name_string begin again +offset: 0x00001238 +aml._.name_path begin +aml._.name_path end +name_string: PICF +aml._.name_string end +aml._.get_node_by_name begin +name: 'PICF' +aml._.get_node_by_name end +aml._.term_arg end +aml._.cast begin +types 2 to 2 +aml._.cast.integer_to_integer begin +aml._.cast.integer_to_integer end +aml._.cast end +aml._.term_arg begin +aml._.name_string begin +aml._.name_string end +aml._.data_object begin +aml._.const_obj begin +aml._.const_obj end +aml._.data_object end +aml._.term_arg end +aml._.cast begin +types 2 to 2 +aml._.cast.integer_to_integer begin +aml._.cast.integer_to_integer end +aml._.cast end + eax == ecx: 0x00000000 == 0x00000001 +aml._.l_equal end +aml._.term_arg end +aml._.cast begin +types 2 to 2 +aml._.cast.integer_to_integer begin +aml._.cast.integer_to_integer end +aml._.cast end +pkg_length: 0x00000006 +else branch taken +table/position: [0x00001244] +aml._.term_obj begin +aml._.object begin +aml._.namespace_modifier_obj begin +aml._.namespace_modifier_obj end +aml._.named_obj begin +aml._.named_obj end +aml._.object end +aml._.return begin +aml._.term_arg begin +aml._.name_string begin +aml._.name_string begin again +offset: 0x00001245 +aml._.name_path begin +aml._.name_path end +name_string: PRTA +aml._.name_string end +aml._.get_node_by_name begin +name: 'PRTA' +aml._.get_node_by_name end +aml._.data_object begin +aml._.data_object end +aml._.name_string begin +aml._.name_string begin again +offset: 0x00001245 +aml._.name_path begin +aml._.name_path end +name_string: PRTA +aml._.name_string end +aml._.get_node_by_name begin +name: 'PRTA' +aml._.get_node_by_name end +aml._.term_arg end +aml._.return end +acpi.call_node end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin name: '_ADR' aml._.get_node_by_name end aml._.get_node_by_name begin @@ -24469,34 +24585,54 @@ aml._.get_node_by_name end aml._.get_node_by_name begin name: '_ADR' aml._.get_node_by_name end - -00:00.0 - acpi name: PCI0 - is_bridge: 1 - - 00:1F.0 - acpi name: ISA_ - is_bridge: 0 - - - 00:1F.3 - acpi name: SMB0 - is_bridge: 0 - - - 00:00.0 - acpi name: S00_ - is_bridge: 1 - - - 00:01.0 - acpi name: S08_ - is_bridge: 0 - - - 00:02.0 - acpi name: S10_ - is_bridge: 0 - - -DUMP 00:02.0 8086:10D3 00 +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_ADR' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_CRS' +aml._.get_node_by_name end +aml._.get_node_by_name begin +name: '_CRS' +aml._.get_node_by_name end +00:00.0 0000:0000 00 1 \_SB_\PCI0 + 00:1F.0 0000:0000 00 1 \_SB_\PCI0\ISA_ + 00:1F.3 8086:2930 10 0 \_SB_\PCI0\SMB0 + 00:00.0 0000:0000 00 1 \_SB_\PCI0\S00_ + 00:01.0 1234:1111 00 0 \_SB_\PCI0\S08_ + 00:02.0 8086:10D3 16 0 \_SB_\PCI0\S10_