summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Kernel/Console.cpp1
-rw-r--r--Kernel/Syscall.cpp2
-rw-r--r--Kernel/init.cpp3
3 files changed, 4 insertions, 2 deletions
diff --git a/Kernel/Console.cpp b/Kernel/Console.cpp
index 2ad66f2f4e..7f8ce46888 100644
--- a/Kernel/Console.cpp
+++ b/Kernel/Console.cpp
@@ -10,6 +10,7 @@ static Console* s_the;
Console& Console::the()
{
+ ASSERT(s_the);
return *s_the;
}
diff --git a/Kernel/Syscall.cpp b/Kernel/Syscall.cpp
index e460da4b90..8ec4b7c28b 100644
--- a/Kernel/Syscall.cpp
+++ b/Kernel/Syscall.cpp
@@ -117,7 +117,7 @@ DWORD handle(DWORD function, DWORD arg1, DWORD arg2, DWORD arg3)
case Syscall::PosixTtynameR:
return current->sys$ttyname_r((int)arg1, (char*)arg2, (size_t)arg3);
default:
- kprintf("int0x80: Unknown function %x requested {%x, %x, %x}\n", function, arg1, arg2, arg3);
+ kprintf("<%u> int0x80: Unknown function %x requested {%x, %x, %x}\n", current->pid(), function, arg1, arg2, arg3);
break;
}
return 0;
diff --git a/Kernel/init.cpp b/Kernel/init.cpp
index a074614ef5..21a9b348fe 100644
--- a/Kernel/init.cpp
+++ b/Kernel/init.cpp
@@ -218,6 +218,8 @@ void init()
kmalloc_init();
vga_init();
+ auto console = make<Console>();
+
RTC::initialize();
PIC::initialize();
gdt_init();
@@ -225,7 +227,6 @@ void init()
keyboard = new Keyboard;
- auto console = make<Console>();
VirtualConsole::initialize();
tty0 = new VirtualConsole(0, VirtualConsole::AdoptCurrentVGABuffer);
tty1 = new VirtualConsole(1);