summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
authorMichal Idziorek <m.i@gmx.at>2014-10-21 19:08:03 +0200
committerMichal Idziorek <m.i@gmx.at>2014-10-21 19:08:03 +0200
commitd25834310293c8a30b4a31418ff4ffd8fad8ef24 (patch)
tree97ae696211f7709002d80ecbfb8595123611d3c1 /kernel/kernel.c
parent5b9ea685dfd12415774e4e97ad387c601dd2b43b (diff)
started implementing our first fool-shell.
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index 34f3d69..dd5cc15 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -98,6 +98,7 @@ void kernel_main(uint32_t initial_stack, int mp)
// self-log message of logger :P
log_log();
+
//
// Print initial address of the esp stack pointer
//
@@ -147,6 +148,10 @@ void kernel_main(uint32_t initial_stack, int mp)
// init spinlocks
init_spinlocks();
+
+ // ringbuffer for stdin!
+ ringbuffer_init();
+
//
// Start the other Processors (also before paging for some reason!)
//
@@ -185,7 +190,7 @@ void kernel_main(uint32_t initial_stack, int mp)
// Will process input from the keyboard but will be completely
// redesigned soon. TODO!!
//
- shell_init();
+ //shell_init();
//
// Initialize Multitasking
@@ -206,8 +211,10 @@ void kernel_main(uint32_t initial_stack, int mp)
// autorun "user-space" prog
asm("push $0x80800");
asm("ret");
+
while(1)
{
+
}