summaryrefslogtreecommitdiff
path: root/kernel/kernel.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/kernel.c')
-rw-r--r--kernel/kernel.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c
index ba968d5..2e2e3e6 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -119,24 +119,11 @@ void kernel_main(uint32_t eax,uint32_t ebx)
uint32_t addr= ext2_inode_blockstart( VMEM_EXT2_RAMIMAGE,inode,0);
vesa_init(cfg_multiboot->vbe_control_info,cfg_multiboot->vbe_mode_info,addr);
- // -- STDIN/STDOUT -- //
- fixme("do not force order"); // now needed since ids are allocated 0,1,2...
- klog("Streams and Pipes init ...");
- uint32_t sstderr = syscall_open("~stderr",0,0); // stderr 2
- uint32_t sstdout;
- if(cfg_multiboot->framebuffer_type==2) // EGA-standard text mode
- {
- sstdout = syscall_open("~term",0,0); // stdout 1
- }
- else
- {
- sstdout = syscall_open("~xterm",0,0); // stdout 1
- }
- uint32_t sstdin = syscall_open("~stdin",0,0); // stdin 0
-
+ // -- KB -- //
klog("Keyboard init ...");
keyboard_init(0);
+ // -- MOUSE -- //
klog("Mouse init ...");
mouse_init();