Use umka_boot instead of umka_init in ACPI tests

2023-07-19 21:41:34 +01:00
parent 57ab9ce5b6
commit 6e75385afc
15 changed files with 31 additions and 14 deletions
--- a/test/026_#acpi_m000.t
+++ b/test/026_#acpi_m000.t
@@ -11,6 +11,7 @@ acpi_preload_table machines/000/acpi/SSDT5
 acpi_preload_table machines/000/acpi/SSDT6

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/027_#acpi_m001.t
+++ b/test/027_#acpi_m001.t
@@ -1,4 +1,4 @@
-umka_init
+umka_boot
 pci_set_path machines/001/pci
 acpi_set_usage 2

@@ -7,6 +7,7 @@ acpi_preload_table machines/001/acpi/SSDT1
 acpi_preload_table machines/001/acpi/SSDT2

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/028_#acpi_m002.t
+++ b/test/028_#acpi_m002.t
@@ -1,4 +1,4 @@
-umka_init
+umka_boot
 pci_set_path machines/002/pci

 # some _ADR's are methods with memory access
@@ -20,6 +20,7 @@ acpi_preload_table machines/002/acpi/SSDT11
 acpi_preload_table machines/002/acpi/SSDT12

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/029_#acpi_m003.t
+++ b/test/029_#acpi_m003.t
@@ -1,10 +1,11 @@
-umka_init
+umka_boot
 pci_set_path machines/003/pci
 acpi_set_usage 2

 acpi_preload_table machines/003/acpi/DSDT

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/030_#acpi_m004.t
+++ b/test/030_#acpi_m004.t
@@ -1,4 +1,4 @@
-umka_init
+umka_boot
 acpi_set_usage 1

 acpi_preload_table machines/004/acpi/DSDT
@@ -7,6 +7,7 @@ acpi_preload_table machines/004/acpi/SSDT2
 acpi_preload_table machines/004/acpi/SSDT3

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/031_#acpi_#unit_scope.t
+++ b/test/031_#acpi_#unit_scope.t
@@ -1,4 +1,4 @@
-umka_init
+umka_boot
 acpi_set_usage 1

 acpi_preload_table machines/unit/acpi/scope_empty.aml
@@ -6,6 +6,7 @@ acpi_preload_table machines/unit/acpi/scope_spec1.aml
 acpi_preload_table machines/unit/acpi/scope.aml

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/032_#acpi_m005.t
+++ b/test/032_#acpi_m005.t
@@ -1,10 +1,11 @@
-umka_init
+umka_boot
 pci_set_path machines/005/pci
 acpi_set_usage 2

 acpi_preload_table machines/005/acpi/DSDT

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/033_#acpi_debug_object.t
+++ b/test/033_#acpi_debug_object.t
@@ -1,15 +1,17 @@
-umka_init
+umka_boot
 acpi_set_usage 1

 acpi_preload_table machines/unit/acpi/debug_object.aml

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
 acpi_get_node_cnt

 acpi_call \MAIN
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/034_#acpi_#unit_fieldio.t
+++ b/test/034_#acpi_#unit_fieldio.t
@@ -1,15 +1,17 @@
-umka_init
+umka_boot
 acpi_set_usage 1

 acpi_preload_table machines/unit/acpi/field.aml

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
 acpi_get_node_cnt

 acpi_call \MAIN
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/035_#acpi_m006.t
+++ b/test/035_#acpi_m006.t
@@ -1,10 +1,11 @@
-umka_init
+umka_boot
 pci_set_path machines/006/pci
 acpi_set_usage 2

 acpi_preload_table machines/006/acpi/DSDT

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/036_#acpi_m007.t
+++ b/test/036_#acpi_m007.t
@@ -1,4 +1,4 @@
-umka_init
+umka_boot
 pci_set_path machines/007/pci
 acpi_set_usage 2

@@ -6,6 +6,7 @@ acpi_preload_table machines/007/acpi/DSDT
 acpi_preload_table machines/007/acpi/SSDT

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/038_#acpi_m008.t
+++ b/test/038_#acpi_m008.t
@@ -1,4 +1,4 @@
-umka_init
+umka_boot
 acpi_set_usage 1

 acpi_preload_table machines/008/acpi/dsdt.dat
@@ -12,6 +12,7 @@ acpi_preload_table machines/008/acpi/ssdt7.dat
 acpi_preload_table machines/008/acpi/ssdt8.dat

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/040_#acpi_m010.t
+++ b/test/040_#acpi_m010.t
@@ -1,4 +1,4 @@
-umka_init
+umka_boot
 acpi_set_usage 1

 acpi_preload_table machines/010/acpi/dsdt.dat
@@ -11,6 +11,7 @@ acpi_preload_table machines/010/acpi/ssdt5.dat
 acpi_preload_table machines/010/acpi/ssdt6.dat

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/042_#acpi_m011.t
+++ b/test/042_#acpi_m011.t
@@ -1,4 +1,4 @@
-umka_init
+umka_boot
 pci_set_path machines/011/pci
 acpi_set_usage 2

@@ -7,6 +7,7 @@ acpi_preload_table machines/011/acpi/ssdt1.dat
 acpi_preload_table machines/011/acpi/ssdt2.dat

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
--- a/test/043_#acpi_m012.t
+++ b/test/043_#acpi_m012.t
@@ -1,4 +1,4 @@
-umka_init
+umka_boot
 pci_set_path machines/012/pci
 acpi_set_usage 2

@@ -11,6 +11,7 @@ acpi_preload_table machines/012/acpi/ssdt5.dat
 acpi_preload_table machines/012/acpi/ssdt6.dat

 acpi_enable
+board_get -f

 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt