diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-11-15 17:42:07 +0100 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-11-15 17:42:07 +0100 |
| commit | ca1b573ef87498595a30b757d6d9c66d12d14ae6 (patch) | |
| tree | 6fa043fd75c83910737c3701c0147bde782fefdf /Source/Kernel/Core | |
| parent | 21bfca4ad4b84768f05eb4fa2bc0ad7a76b6c536 (diff) | |
| download | Melon-ca1b573ef87498595a30b757d6d9c66d12d14ae6.tar.gz Melon-ca1b573ef87498595a30b757d6d9c66d12d14ae6.zip | |
Reading from the FAT12-formatted floppy works \o
Diffstat (limited to 'Source/Kernel/Core')
| -rw-r--r-- | Source/Kernel/Core/Sys.ns.h | 3 | ||||
| -rw-r--r-- | Source/Kernel/Core/kmain.wtf.cpp | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/Source/Kernel/Core/Sys.ns.h b/Source/Kernel/Core/Sys.ns.h index 4d15676..9b34dbf 100644 --- a/Source/Kernel/Core/Sys.ns.h +++ b/Source/Kernel/Core/Sys.ns.h @@ -18,9 +18,12 @@ //This file contains system-relative functions class String; +class SimpleVT; class VirtualTerminal; struct registers_t; +extern SimpleVT* kvt; + namespace Sys { void outb(u16int port, u8int value); u8int inb(u16int port); diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp index d0751d1..bb77eeb 100644 --- a/Source/Kernel/Core/kmain.wtf.cpp +++ b/Source/Kernel/Core/kmain.wtf.cpp @@ -25,6 +25,7 @@ #include <Rand.ns.h> #include <VFS/Part.ns.h> #include <FileSystems/RamFS/RamFS.class.h> +#include <FileSystems/FAT/FATFS.class.h> #include <VFS/FileNode.class.h> #include <VFS/VFS.ns.h> #include <VFS/DirectoryNode.class.h> @@ -37,6 +38,8 @@ extern u32int end; //Placement address extern "C" void kmain(multiboot_info_t* mbd, u32int magic); +SimpleVT* kvt; + u32int logoAnimation(void* p) { SimpleVT& vt = *((SimpleVT*)p); vt.setColor(8); @@ -140,7 +143,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) { Disp::setText(vgaout); //Create a VT for logging what kernel does - SimpleVT *kvt = new ScrollableVT(25, 80, 20, KVT_FGCOLOR, KVT_BGCOLOR); + kvt = new ScrollableVT(25, 80, 20, KVT_FGCOLOR, KVT_BGCOLOR); kvt->map(0, 0); *kvt << "Melon is loading..."; @@ -187,6 +190,8 @@ void kmain(multiboot_info_t* mbd, u32int magic) { cwd = VFS::getRootNode(); Task::currProcess()->setCwd(cwd); + FATFS::mount(Part::partitions[0], (DirectoryNode*)VFS::createDirectory("/Mount")); + if (keymap != "builtin") { if (!Kbd::loadKeymap(keymap)) *kvt << "\nWARNING : Could not load keymap " << keymap << ", using built-in keymap instead."; } |