diff options
| author | Miguel <m.i@gmx.at> | 2018-09-20 20:51:57 +0200 |
|---|---|---|
| committer | Miguel <m.i@gmx.at> | 2018-09-20 20:51:57 +0200 |
| commit | aeefdb37d1fc1c0eb7953b9c196cab09460bc167 (patch) | |
| tree | 513789d7fd28b65afb594e9605975bd10ea06f74 /kernel/kernel.c | |
| parent | 763f85c55fdb5a2c4f5bf98e4989a69d27da6e4f (diff) | |
we are now prepared for piping with _pipe and _dup2
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 17 |
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(); |