Исправление загрузки модулей

configs/limine.cfg

@@ -16,17 +16,17 @@ TERM_WALLPAPER=boot:///boot.jpg
     KASLR=no
     KERNEL_PATH=boot:///kernel.elf
 
-    MODULE_PATH=boot:///boot.tga
+    MODULE_PATH=boot:///mod/cpubench.ko
-    MODULE_CMDLINE=[BOOTIMG]
+    MODULE_CMDLINE=[MOD]cpubench.ko
 
     MODULE_PATH=boot:///mod/simd.ko
     MODULE_CMDLINE=[MOD]simd.ko
 
-    MODULE_PATH=boot:///mod/cpubench.ko
-    MODULE_CMDLINE=[MOD]cpubench.ko
-
     MODULE_PATH=boot:///mod/pci_data.ko
     MODULE_CMDLINE=[MOD]pci_data.ko
 
     MODULE_PATH=boot:///mod/pci.ko
-    MODULE_CMDLINE=[MOD]pci.ko
+    MODULE_CMDLINE=[MOD]pci.ko
+
+    MODULE_PATH=boot:///boot.tga
+    MODULE_CMDLINE=[BOOTIMG]

include/version.h

@@ -1,3 +1,3 @@
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 1
-#define VERSION_BUILD 505
+#define VERSION_BUILD 512

kernel/mod.c

@@ -94,7 +94,7 @@ void mod_init( ) {
 			continue;
 		}
 
-		module_info_t (*module_init)(env_t * env) =
+		module_info_t (*module_init)(env_t *env) =
 		    (module_info_t(*)(env_t * env))
 		        elf_entry((elf64_header_t *)module_ptr->address);
 
@@ -109,6 +109,7 @@ void mod_init( ) {
 
 		module_info_t ret = module_init(&main_env);
 
+		LOG("\t->%s\n", ret.message);
 		module_list[modules_count].message = ret.message;
 		module_list[modules_count].data_size = ret.data_size;
 

modules/cpubench/main.c

@@ -52,9 +52,16 @@ module_info_t init(env_t *env) {
 	L2_cache_size( );
 	L3_cache_size( );
 
+	fb_printf("Конец");
+
 	return (module_info_t){
 		.name = (char *)"CPUBENCH",
 		.message = (char *)"Дополнительная информация о процессоре",
+		.type = 0,
+		.data_size = 0,
+		.data = (void *)0,
+		.data_size = 0,
 		.err_code = 0,
+		.module_id = 0,
 	};
 }

modules/helloworld/main.c

@@ -9,6 +9,11 @@ module_info_t init(env_t *env) {
 	return (module_info_t){
 		.name = (char *)&name,
 		.message = (char *)&message,
-		.err_code = 2023,
+		.type = 0,
+		.data_size = 0,
+		.data = (void *)0,
+		.data_size = 0,
+		.err_code = 0,
+		.module_id = 0,
 	};
 }

modules/music/main.c

@@ -41,7 +41,12 @@ module_info_t init(env_t *env) {
 	return (module_info_t){
 		.name = (char *)"Мелодия",
 		.message = (char *)"Надеюсь скоро тут будет тетрис!",
-		.err_code = 404,
+		.type = 0,
+		.data_size = 0,
+		.data = (void *)0,
+		.data_size = 0,
+		.err_code = 0,
+		.module_id = 0,
 	};
 
 	// Массив с нотами

modules/pci/main.c

@@ -80,6 +80,11 @@ module_info_t init(env_t *env) {
 	return (module_info_t){
 		.name = (char *)"[PCI]",
 		.message = (char *)"PCI драйвер",
+		.type = 0,
+		.data_size = 0,
+		.data = (void *)0,
+		.data_size = 0,
 		.err_code = 0,
+		.module_id = 0,
 	};
 }

modules/pci_data/main.c

@@ -11,8 +11,14 @@ vendor_t vendor_list[] = { { "Intel", 0x8086 },
 
 module_info_t init(env_t *env) {
 	init_env(env);
-	return (module_info_t){ .name = (char *)"[PCI][DATA]",
+	return (module_info_t){
-		                    .message = (char *)"PCI данные",
+		.name = (char *)"[PCI][DATA]",
-		                    .data_size = 3,
+		.message = (char *)"PCI данные",
-		                    .data = &vendor_list };
+		.type = 0,
+		.data_size = 0,
+		.data_size = 3,
+		.data = &vendor_list,
+		.err_code = 0,
+		.module_id = 0,
+	};
 }

modules/simd/main.c

@@ -30,6 +30,12 @@ module_info_t init(env_t *env) {
 	return (module_info_t){
 		.name = (char *)"SIMD",
 		.message = (char *)"SIMD инструкции",
+
+		.type = 0,
+		.data_size = 0,
+		.data = (void *)0,
+		.data_size = 0,
 		.err_code = 0,
+		.module_id = 0,
 	};
 }