From 955a95f7adb190146e732084921760276a90d30c Mon Sep 17 00:00:00 2001 From: acevest Date: Sat, 27 May 2023 12:02:32 +0800 Subject: [PATCH] =?utf8?q?=E8=A7=A3=E5=86=B3=E5=9C=A8delay=5Ftasks?= =?utf8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E5=87=BA=E7=8E=B0READY=E7=8A=B6?= =?utf8?q?=E6=80=81=E4=BB=BB=E5=8A=A1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- drivers/keyboard.c | 2 +- kernel/sched.c | 3 +++ kernel/setup.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/keyboard.c b/drivers/keyboard.c index 0bc1458..b248dae 100644 --- a/drivers/keyboard.c +++ b/drivers/keyboard.c @@ -76,7 +76,7 @@ void kbd_debug(unsigned char scan_code) { printl(MPL_KEYBOARD, "keyboard irq: %d scan code %02x", kbd_cnt++, scan_code); if (scan_code == 0x01) { // Esc - reboot(); + // reboot(); } printd("[%02x]", scan_code); diff --git a/kernel/sched.c b/kernel/sched.c index 82c272d..8849bda 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -196,6 +196,9 @@ void schedule() { if (0 == current->ticks) { current->turn++; current->ticks = current->priority; + } + + if (current->state == TASK_RUNNING) { current->state = TASK_READY; } diff --git a/kernel/setup.c b/kernel/setup.c index aff660d..4d2e7f5 100644 --- a/kernel/setup.c +++ b/kernel/setup.c @@ -82,7 +82,7 @@ void setup_kernel() { cnsl_init(); - printl(MPL_TITLE, " SYSTEM MONITOR"); + printl(MPL_TITLE, " KERNEL MONITOR"); printl(MPL_ROOTDEV, "root device %08x", system.root_dev); setup_tasks(); -- 2.44.0