From 307793332e17d560cde3fb260e2fc1be13585c5a Mon Sep 17 00:00:00 2001 From: Ivan Baravy Date: Wed, 1 Dec 2021 22:28:14 +0300 Subject: [PATCH] Enable ACPI stuff --- test/026_#acpi_m000.t | 17 +++++++++++++++++ test/027_#acpi_m001.t | 13 +++++++++++++ test/028_#acpi_m002.t | 26 ++++++++++++++++++++++++++ test/029_#acpi_m003.t | 11 +++++++++++ test/030_#acpi_m004.t | 13 +++++++++++++ test/031_#acpi_#unit_scope.t | 12 ++++++++++++ test/032_#acpi_m005.t | 11 +++++++++++ test/033_#acpi_debug_object.t | 16 ++++++++++++++++ test/034_#acpi_#unit_fieldio.t | 16 ++++++++++++++++ test/035_#acpi_m006.t | 11 +++++++++++ test/036_#acpi_m007.t | 12 ++++++++++++ test/038_#acpi_m008.t | 18 ++++++++++++++++++ test/040_#acpi_m010.t | 17 +++++++++++++++++ test/042_#acpi_m011.t | 13 +++++++++++++ test/043_#acpi_m012.t | 18 ++++++++++++++++++ umka.asm | 14 +------------- 16 files changed, 225 insertions(+), 13 deletions(-) create mode 100644 test/026_#acpi_m000.t create mode 100644 test/027_#acpi_m001.t create mode 100644 test/028_#acpi_m002.t create mode 100644 test/029_#acpi_m003.t create mode 100644 test/030_#acpi_m004.t create mode 100644 test/031_#acpi_#unit_scope.t create mode 100644 test/032_#acpi_m005.t create mode 100644 test/033_#acpi_debug_object.t create mode 100644 test/034_#acpi_#unit_fieldio.t create mode 100644 test/035_#acpi_m006.t create mode 100644 test/036_#acpi_m007.t create mode 100644 test/038_#acpi_m008.t create mode 100644 test/040_#acpi_m010.t create mode 100644 test/042_#acpi_m011.t create mode 100644 test/043_#acpi_m012.t diff --git a/test/026_#acpi_m000.t b/test/026_#acpi_m000.t new file mode 100644 index 0000000..f3785ea --- /dev/null +++ b/test/026_#acpi_m000.t @@ -0,0 +1,17 @@ +umka_init +pci_set_path machines/000/pci +acpi_set_usage 2 + +acpi_preload_table machines/000/acpi/DSDT +acpi_preload_table machines/000/acpi/SSDT1 +acpi_preload_table machines/000/acpi/SSDT2 +acpi_preload_table machines/000/acpi/SSDT3 +acpi_preload_table machines/000/acpi/SSDT4 +acpi_preload_table machines/000/acpi/SSDT5 +acpi_preload_table machines/000/acpi/SSDT6 + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/027_#acpi_m001.t b/test/027_#acpi_m001.t new file mode 100644 index 0000000..bdc3a95 --- /dev/null +++ b/test/027_#acpi_m001.t @@ -0,0 +1,13 @@ +umka_init +pci_set_path machines/001/pci +acpi_set_usage 2 + +acpi_preload_table machines/001/acpi/DSDT +acpi_preload_table machines/001/acpi/SSDT1 +acpi_preload_table machines/001/acpi/SSDT2 + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/028_#acpi_m002.t b/test/028_#acpi_m002.t new file mode 100644 index 0000000..768933b --- /dev/null +++ b/test/028_#acpi_m002.t @@ -0,0 +1,26 @@ +umka_init +pci_set_path machines/002/pci + +# some _ADR's are methods with memory access +# don't know how to trick here +acpi_set_usage 1 + +acpi_preload_table machines/002/acpi/DSDT +acpi_preload_table machines/002/acpi/SSDT1 +acpi_preload_table machines/002/acpi/SSDT2 +acpi_preload_table machines/002/acpi/SSDT3 +acpi_preload_table machines/002/acpi/SSDT4 +acpi_preload_table machines/002/acpi/SSDT5 +acpi_preload_table machines/002/acpi/SSDT6 +acpi_preload_table machines/002/acpi/SSDT7 +acpi_preload_table machines/002/acpi/SSDT8 +acpi_preload_table machines/002/acpi/SSDT9 +acpi_preload_table machines/002/acpi/SSDT10 +acpi_preload_table machines/002/acpi/SSDT11 +acpi_preload_table machines/002/acpi/SSDT12 + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/029_#acpi_m003.t b/test/029_#acpi_m003.t new file mode 100644 index 0000000..3026ce6 --- /dev/null +++ b/test/029_#acpi_m003.t @@ -0,0 +1,11 @@ +umka_init +pci_set_path machines/003/pci +acpi_set_usage 2 + +acpi_preload_table machines/003/acpi/DSDT + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/030_#acpi_m004.t b/test/030_#acpi_m004.t new file mode 100644 index 0000000..bfcb29c --- /dev/null +++ b/test/030_#acpi_m004.t @@ -0,0 +1,13 @@ +umka_init +acpi_set_usage 1 + +acpi_preload_table machines/004/acpi/DSDT +acpi_preload_table machines/004/acpi/SSDT1 +acpi_preload_table machines/004/acpi/SSDT2 +acpi_preload_table machines/004/acpi/SSDT3 + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/031_#acpi_#unit_scope.t b/test/031_#acpi_#unit_scope.t new file mode 100644 index 0000000..aee823a --- /dev/null +++ b/test/031_#acpi_#unit_scope.t @@ -0,0 +1,12 @@ +umka_init +acpi_set_usage 1 + +acpi_preload_table machines/unit/acpi/scope_empty.aml +acpi_preload_table machines/unit/acpi/scope_spec1.aml +acpi_preload_table machines/unit/acpi/scope.aml + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/032_#acpi_m005.t b/test/032_#acpi_m005.t new file mode 100644 index 0000000..5e19dd7 --- /dev/null +++ b/test/032_#acpi_m005.t @@ -0,0 +1,11 @@ +umka_init +pci_set_path machines/005/pci +acpi_set_usage 2 + +acpi_preload_table machines/005/acpi/DSDT + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/033_#acpi_debug_object.t b/test/033_#acpi_debug_object.t new file mode 100644 index 0000000..720c0af --- /dev/null +++ b/test/033_#acpi_debug_object.t @@ -0,0 +1,16 @@ +umka_init +acpi_set_usage 1 + +acpi_preload_table machines/unit/acpi/debug_object.aml + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt + +acpi_call \MAIN + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/034_#acpi_#unit_fieldio.t b/test/034_#acpi_#unit_fieldio.t new file mode 100644 index 0000000..72b3b26 --- /dev/null +++ b/test/034_#acpi_#unit_fieldio.t @@ -0,0 +1,16 @@ +umka_init +acpi_set_usage 1 + +acpi_preload_table machines/unit/acpi/field.aml + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt + +acpi_call \MAIN + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/035_#acpi_m006.t b/test/035_#acpi_m006.t new file mode 100644 index 0000000..b74d9ef --- /dev/null +++ b/test/035_#acpi_m006.t @@ -0,0 +1,11 @@ +umka_init +pci_set_path machines/006/pci +acpi_set_usage 2 + +acpi_preload_table machines/006/acpi/DSDT + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/036_#acpi_m007.t b/test/036_#acpi_m007.t new file mode 100644 index 0000000..70cac47 --- /dev/null +++ b/test/036_#acpi_m007.t @@ -0,0 +1,12 @@ +umka_init +pci_set_path machines/007/pci +acpi_set_usage 2 + +acpi_preload_table machines/007/acpi/DSDT +acpi_preload_table machines/007/acpi/SSDT + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/038_#acpi_m008.t b/test/038_#acpi_m008.t new file mode 100644 index 0000000..59336e7 --- /dev/null +++ b/test/038_#acpi_m008.t @@ -0,0 +1,18 @@ +umka_init +acpi_set_usage 1 + +acpi_preload_table machines/008/acpi/dsdt.dat +acpi_preload_table machines/008/acpi/ssdt1.dat +acpi_preload_table machines/008/acpi/ssdt2.dat +acpi_preload_table machines/008/acpi/ssdt3.dat +acpi_preload_table machines/008/acpi/ssdt4.dat +acpi_preload_table machines/008/acpi/ssdt5.dat +acpi_preload_table machines/008/acpi/ssdt6.dat +acpi_preload_table machines/008/acpi/ssdt7.dat +acpi_preload_table machines/008/acpi/ssdt8.dat + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/040_#acpi_m010.t b/test/040_#acpi_m010.t new file mode 100644 index 0000000..02bea06 --- /dev/null +++ b/test/040_#acpi_m010.t @@ -0,0 +1,17 @@ +umka_init +acpi_set_usage 1 + +acpi_preload_table machines/010/acpi/dsdt.dat +acpi_preload_table machines/010/acpi/ssdt.dat +acpi_preload_table machines/010/acpi/ssdt1.dat +acpi_preload_table machines/010/acpi/ssdt2.dat +acpi_preload_table machines/010/acpi/ssdt3.dat +acpi_preload_table machines/010/acpi/ssdt4.dat +acpi_preload_table machines/010/acpi/ssdt5.dat +acpi_preload_table machines/010/acpi/ssdt6.dat + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/042_#acpi_m011.t b/test/042_#acpi_m011.t new file mode 100644 index 0000000..4e74bd3 --- /dev/null +++ b/test/042_#acpi_m011.t @@ -0,0 +1,13 @@ +umka_init +#pci_set_path machines/011/pci +acpi_set_usage 1 + +acpi_preload_table machines/011/acpi/dsdt.dat +acpi_preload_table machines/011/acpi/ssdt1.dat +acpi_preload_table machines/011/acpi/ssdt2.dat + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt diff --git a/test/043_#acpi_m012.t b/test/043_#acpi_m012.t new file mode 100644 index 0000000..f1ece3a --- /dev/null +++ b/test/043_#acpi_m012.t @@ -0,0 +1,18 @@ +umka_init +pci_set_path machines/012/pci +acpi_set_usage 2 + +acpi_preload_table machines/012/acpi/dsdt.dat +acpi_preload_table machines/012/acpi/ssdt1.dat +acpi_preload_table machines/012/acpi/ssdt2.dat +acpi_preload_table machines/012/acpi/ssdt3.dat +acpi_preload_table machines/012/acpi/ssdt4.dat +acpi_preload_table machines/012/acpi/ssdt5.dat +acpi_preload_table machines/012/acpi/ssdt6.dat + +acpi_enable + +acpi_get_node_alloc_cnt +acpi_get_node_free_cnt +acpi_get_node_cnt +#write_devices_dat devices.dat diff --git a/umka.asm b/umka.asm index 9511be1..bc8a8c7 100644 --- a/umka.asm +++ b/umka.asm @@ -1051,19 +1051,6 @@ v86_irq: ;init_mem: ;init_page_map: ahci_init: -enable_acpi: -acpi.call_name: -acpi.count_nodes: -acpi.aml.init: -aml._.attach: -acpi.fill_pci_irqs: -pci.walk_tree: -acpi.aml.new_thread: -aml._.alloc_node: -aml._.constructor.integer: -aml._.constructor.package: -acpi._.lookup_node: -acpi._.print_tree: ret load_PE: @@ -1086,6 +1073,7 @@ acpi_root dd ? acpi_dev_next dd ? endg +sys_msg_board equ __pex0 delay_ms equ __pex1 include fix pew