From 7e9cbe5e07dad3c89f0e49ded97df24169be77c7 Mon Sep 17 00:00:00 2001 From: Aren Elchinyan Date: Mon, 5 Feb 2024 20:57:44 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BE=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/version.h | 2 +- kernel/mod.c | 3 +-- kernel/start.c | 15 +-------------- 3 files changed, 3 insertions(+), 17 deletions(-) diff --git a/include/version.h b/include/version.h index 9933966..d3b7a2a 100644 --- a/include/version.h +++ b/include/version.h @@ -1,3 +1,3 @@ #define VERSION_MAJOR 0 #define VERSION_MINOR 2 -#define VERSION_BUILD 34 +#define VERSION_BUILD 51 diff --git a/kernel/mod.c b/kernel/mod.c index 025c1f8..c44f48f 100644 --- a/kernel/mod.c +++ b/kernel/mod.c @@ -147,6 +147,7 @@ void mod_init( ) { module_list[modules_count].name = ret.name; module_list[modules_count].message = ret.message; module_list[modules_count].data_size = ret.data_size; + module_list[modules_count].data = ret.data; module_list[modules_count].get_func = ret.get_func; module_list[modules_count].after_init = ret.after_init; @@ -154,8 +155,6 @@ void mod_init( ) { task_new_thread(module_list[modules_count].after_init, module_list[modules_count].name); } - if (ret.data_size != 0) { module_list[modules_count].data = ret.data; } - if (ret.irq != 0) { if (ret.irq_handler != 0) { LOG("Установлен обработчик прерывания [%u] по адресу 0x%x в модуле %s\n", ret.irq, ret.irq_handler, diff --git a/kernel/start.c b/kernel/start.c index 12b84e1..a9bf536 100644 --- a/kernel/start.c +++ b/kernel/start.c @@ -16,18 +16,6 @@ #include uint64_t full_init = 0; -uint64_t dum = 0; - -void finally( ) { - LOG("Готово! Для выхода из симуляции удерживайте: ESCAPE\n"); - for (;;) { asm volatile("hlt"); } -} - -void dummy( ) { - LOG("Поток %u\n", dum++); - task_del_current( ); - for (;;) { asm volatile("hlt"); } -} // Точка входа void _start( ) { @@ -52,12 +40,11 @@ void _start( ) { time_t time = rtc_get_time( ); LOG("Время: %u:%u.%u, %u.%u.%u\n", time.hours, time.minutes, time.second, time.day, time.month, time.year); - task_new_thread(finally, "fin"); - full_init = 1; task_after_init( ); + LOG("Готово! Для выхода из симуляции удерживайте: ESCAPE\n"); asm volatile("sti"); for (;;) { asm volatile("hlt"); }