diff options
| author | Alexis211 <alexis211@gmail.com> | 2009-09-13 16:46:15 +0200 |
|---|---|---|
| committer | Alexis211 <alexis211@gmail.com> | 2009-09-13 16:46:15 +0200 |
| commit | 708765621ede3541037fb822cc032b9feb2ea43e (patch) | |
| tree | 12e0e6c936fba8092479baf31d2ac4dc4ea9ed0f /Source/Kernel/Core | |
| parent | ace1914398633e05970f634ddec297665dfda7c6 (diff) | |
| download | Melon-708765621ede3541037fb822cc032b9feb2ea43e.tar.gz Melon-708765621ede3541037fb822cc032b9feb2ea43e.zip | |
Kernel can now load an Initrd.
Diffstat (limited to 'Source/Kernel/Core')
| -rw-r--r-- | Source/Kernel/Core/kmain.wtf.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/Kernel/Core/kmain.wtf.cpp b/Source/Kernel/Core/kmain.wtf.cpp index 19888c9..6806411 100644 --- a/Source/Kernel/Core/kmain.wtf.cpp +++ b/Source/Kernel/Core/kmain.wtf.cpp @@ -110,14 +110,14 @@ void kmain(multiboot_info_t* mbd, u32int magic) { PROCESSING(kvt, "Detecting floppy drives..."); FloppyController::detect(); OK(kvt); - asm volatile("sti"); - - FileSystem* fs = new RamFS(1024 * 1024); + FileSystem* fs = new RamFS((u8int*)mods[0].mod_start, 1024 * 1024); DirectoryNode* rd; rd = fs->getRootNode(); - FileNode* f; + /*FileNode* f; f = rd->createFile(String("test")); - f->write(0, 4, (u8int*)"plop"); + f->write(0, 4, (u8int*)"plop"); */ + + asm volatile("sti"); while(1) { kvt->setColor(0); @@ -146,7 +146,7 @@ void kmain(multiboot_info_t* mbd, u32int magic) { Mem::kfree(d); *kvt << "\n"; } else if (n->type() == NT_DIRECTORY) { - *kvt << "Found directory " << n->getName() << " :\n"; + *kvt << "Found directory " << n->getName() << ", " << (s32int)n->getLength() << " items.\n"; } } } else if (tmp == "reboot") { |