Move acpi_tables to library from hal

Signed-off-by: Nathaniel Mitchell <nathaniel.p.mitchell@intel.com>

Author: npmitche

chipsec/hal/common/interrupts.py

@@ -36,7 +36,7 @@
 from chipsec.library.logger import logger, print_buffer_bytes
 from chipsec.hal.common.acpi import ACPI
 from chipsec.library.exceptions import CSReadError
-from chipsec.hal.common.acpi_tables import UEFI_TABLE, GAS
+from chipsec.library.acpi_tables import UEFI_TABLE, GAS
 from chipsec.library.defines import bytestostring
 
 SMI_APMC_PORT = 0xB2

chipsec/hal/common/pci.py

@@ -111,6 +111,7 @@ def write_dword(self, bus: int, device: int, function: int, address: int, dword_
 
     def enumerate_devices(self, bus: Optional[int] = None, device: Optional[int] = None, function: Optional[int] = None, spec: Optional[bool] = True) -> List[Tuple[int, int, int, int, int, int]]:
         devices = []
+        breakpoint()
         self.hal_log_every_read = False
         if bus is not None:
             bus_range = [bus]

chipsec/hal/common/acpi_tables.py chipsec/library/acpi_tables.pychipsec/hal/common/acpi_tables.py renamed to chipsec/library/acpi_tables.py

@@ -35,7 +35,7 @@
 from chipsec.library.uefi.common import EFI_GUID_FMT, EFI_GUID_STR
 
 
-class ACPI_TABLE:
+class ACPI_TABLE():
 
     def parse(self, table_content: bytes) -> None:
         return

chipsec/modules/tools/wsmt.py

@@ -37,7 +37,7 @@
 from chipsec.module_common import BaseModule, MTAG_BIOS, MTAG_SMM
 from chipsec.library.returncode import ModuleResult
 from chipsec.hal.common.acpi import ACPI
-from chipsec.hal.common.acpi_tables import WSMT
+from chipsec.library.acpi_tables import WSMT
 
 TAGS = [MTAG_BIOS, MTAG_SMM]
 

tests/hal/test_acpi.py

@@ -18,7 +18,7 @@
 import unittest
 
 from unittest.mock import MagicMock
-from chipsec.hal.common.acpi_tables import RSDP
+from chipsec.library.acpi_tables import RSDP
 from chipsec.hal.common.acpi import ACPI
 
 class TestACPI(unittest.TestCase):

tests/hal/test_acpi_tables.py tests/library/test_acpi_tables.pytests/hal/test_acpi_tables.py renamed to tests/library/test_acpi_tables.py

@@ -17,7 +17,7 @@
 
 import unittest
 
-from chipsec.hal.common.acpi_tables import APIC, BGRT, DMAR, XSDT, UEFI_TABLE, WSMT
+from chipsec.library.acpi_tables import APIC, BGRT, DMAR, XSDT, UEFI_TABLE, WSMT
 
 
 class TestACPITables(unittest.TestCase):