Add write_devices_dat shell command, 043_#acpi_m012.t test

makefile

@@ -18,22 +18,22 @@ covpreproc: covpreproc.c
 	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
 
 umka_shell: umka_shell.o umka.o shell.o trace.o trace_lbr.o vdisk.o vnet.o \
-            lodepng.o pci.o thread.o
+            lodepng.o pci.o thread.o util.o
 	$(CC) $(LDFLAGS_32) $^ -o $@ -static -T umka.ld
 
 umka_fuse: umka_fuse.o umka.o trace.o trace_lbr.o vdisk.o pci.o thread.o
 	$(CC) $(LDFLAGS_32) $^ -o $@ `pkg-config fuse3 --libs` -T umka.ld
 
 umka_os: umka_os.o umka.o shell.o lodepng.o vdisk.o vnet.o trace.o trace_lbr.o \
-         pci.o thread.o umka_ping.o
+         pci.o thread.o umka_ping.o util.o
 	$(CC) $(LDFLAGS_32) $^ -o $@ -static -T umka.ld
 
-umka_gen_devices_dat: umka_gen_devices_dat.o umka.o pci.o thread.o
+umka_gen_devices_dat: umka_gen_devices_dat.o umka.o pci.o thread.o util.o
 	$(CC) $(LDFLAGS_32) $^ -o $@ -static -T umka.ld
 
 umka.o umka.fas: umka.asm
 	INCLUDE="$(KOLIBRIOS)/kernel/trunk;$(KOLIBRIOS)/programs/develop/libraries/libcrash/hash" \
-            $(FASM) $< umka.o -s umka.fas -m 1234567
+            $(FASM) $< umka.o -s umka.fas -m 2000000
 
 shell.o: shell.c
 	$(CC) $(CFLAGS_32) -c $<
@@ -47,6 +47,9 @@ pci.o: linux/pci.c
 lodepng.o: lodepng.c lodepng.h
 	$(CC) $(CFLAGS_32) -c $<
 
+util.o: util.c util.h umka.h
+	$(CC) $(CFLAGS_32) -c $<
+
 default.skn: $(KOLIBRIOS)/skins/Leency/Shkvorka/default.asm
 	$(FASM) $< $@
 

shell.c

@@ -43,6 +43,7 @@
 #include "umka.h"
 #include "trace.h"
 #include "pci.h"
+#include "util.h"
 #include "lodepng.h"
 
 #define PATH_MAX 4096
@@ -1395,6 +1396,20 @@ shell_blit_bitmap(int argc, char **argv) {
     free(image);
 }
 
+static void
+shell_write_devices_dat(int argc, char **argv) {
+    const char *usage = \
+        "usage: write_devices_dat <file>\n"
+        "  file             path/to/devices.dat";
+    if (argc != 2) {
+        fputs(usage, fout);
+        return;
+    }
+    COVERAGE_ON();
+    dump_devices_dat(argv[1]);
+    COVERAGE_OFF();
+}
+
 static void
 shell_scrot(int argc, char **argv) {
     const char *usage = \
@@ -2780,6 +2795,7 @@ func_table_t shell_cmds[] = {
     { "read70",                  shell_read70 },
     { "read80",                  shell_read80 },
     { "scrot",                   shell_scrot },
+    { "write_devices_dat",       shell_write_devices_dat },
     { "set_button_style",        shell_set_button_style },
     { "set_cwd",                 shell_cd },
     { "set_font_size",           shell_set_font_size },

test/031_#acpi_#unit_scope.ref.log

@@ -3069,15 +3069,12 @@ name_string: \PCI0DV00DV0A
 aml._.name_string end
 aml._.package_element_list_defer end
 aml._.package end
-aml._.data_object end
 aml._.data_ref_object end
 aml._.package_element_list_defer end
 aml._.package end
-aml._.data_object end
 aml._.data_ref_object end
 aml._.package_element_list_defer end
 aml._.package end
-aml._.data_object end
 aml._.data_ref_object end
 aml._.name end
 aml._.namespace_modifier_obj end
@@ -3489,15 +3486,12 @@ name_string: ^PCI0DV00DV0A
 aml._.name_string end
 aml._.package_element_list_defer end
 aml._.package end
-aml._.data_object end
 aml._.data_ref_object end
 aml._.package_element_list_defer end
 aml._.package end
-aml._.data_object end
 aml._.data_ref_object end
 aml._.package_element_list_defer end
 aml._.package end
-aml._.data_object end
 aml._.data_ref_object end
 aml._.name end
 aml._.namespace_modifier_obj end
@@ -5137,4 +5131,4 @@ nodes allocated: 197
 /> acpi_get_node_free_cnt
 nodes freed: 0
 /> acpi_get_node_cnt
-nodes in namespace: 109
+nodes in namespace: 110

test/033_#acpi_debug_object.ref.log

@@ -105,7 +105,7 @@ nodes allocated: 11
 /> acpi_get_node_free_cnt
 nodes freed: 0
 /> acpi_get_node_cnt
-nodes in namespace: 9
+nodes in namespace: 10
 
 /> acpi_call \MAIN
 acpi.call_name begin
@@ -457,4 +457,4 @@ nodes allocated: 29
 /> acpi_get_node_free_cnt
 nodes freed: 0
 /> acpi_get_node_cnt
-nodes in namespace: 9
+nodes in namespace: 10

test/034_#acpi_#unit_fieldio.ref.log

@@ -1796,7 +1796,7 @@ nodes allocated: 105
 /> acpi_get_node_free_cnt
 nodes freed: 0
 /> acpi_get_node_cnt
-nodes in namespace: 33
+nodes in namespace: 34
 
 /> acpi_call \MAIN
 acpi.call_name begin
@@ -2222,4 +2222,4 @@ nodes allocated: 121
 /> acpi_get_node_free_cnt
 nodes freed: 0
 /> acpi_get_node_cnt
-nodes in namespace: 33
+nodes in namespace: 34

test/035_#acpi_m006.ref.log

@@ -1220,7 +1220,6 @@ aml._.data_object end
 aml._.data_ref_object end
 aml._.package_element_list_defer end
 aml._.package end
-aml._.data_object end
 aml._.data_ref_object end
 aml._.name end
 aml._.namespace_modifier_obj end
@@ -4419,7 +4418,6 @@ aml._.data_object end
 aml._.data_ref_object end
 aml._.package_element_list_defer end
 aml._.package end
-aml._.data_object end
 aml._.data_ref_object end
 aml._.name end
 aml._.namespace_modifier_obj end
@@ -4487,7 +4485,6 @@ aml._.data_object end
 aml._.data_ref_object end
 aml._.package_element_list_defer end
 aml._.package end
-aml._.data_object end
 aml._.data_ref_object end
 aml._.name end
 aml._.namespace_modifier_obj end
@@ -4555,7 +4552,6 @@ aml._.data_object end
 aml._.data_ref_object end
 aml._.package_element_list_defer end
 aml._.package end
-aml._.data_object end
 aml._.data_ref_object end
 aml._.name end
 aml._.namespace_modifier_obj end
@@ -356861,4 +356857,4 @@ nodes allocated: 30850
 /> acpi_get_node_free_cnt
 nodes freed: 771
 /> acpi_get_node_cnt
-nodes in namespace: 282
+nodes in namespace: 283

test/043_#acpi_m012.t

@@ -1,3 +1,4 @@
+umka_init
 pci_set_path machines/012/pci
 acpi_set_usage 2
 
@@ -14,3 +15,4 @@ acpi_enable
 acpi_get_node_alloc_cnt
 acpi_get_node_free_cnt
 acpi_get_node_cnt
+#write_devices_dat devices.dat