nathan/quark-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed mmap and related functions to not be methods

Browse Source
This commit is contained in:
Nathan Giddings
2020-07-18 18:52:31 -05:00
parent 44167b778d
commit 913e6e2174
8 changed files with 146 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/quarkkernel.cpp
View File

@@ -3,9 +3,7 @@
#include "systypes.hpp"
#include "systeminfo.hpp"
#include "mmgr/memorymap.hpp"
#include "mmgr/buddyallocator.hpp"
#include "mmgr/addressspace.hpp"
#include "mmgr/mmgr.hpp"
#include "pio.hpp"
#include "tty.hpp"
#include "util.hpp"
@@ -18,7 +16,7 @@ extern MemoryMap::Region memory_map;
void main(char* cmdline)
{
TTY tty((char*) 0xC00B8000);
TTY tty((char*) 0xFF8B8000);
tty << PACKAGE_STRING << "\n\n";
tty << "Low memory: \t" << (int) system_info.getLowMemory() << " KiB\n";
tty << "High memory:\t" << (int) system_info.getHighMemory() << " KiB\n";
@@ -30,9 +28,8 @@ void main(char* cmdline)
tty << (void*) memmap[i].getLocation() << "\t\t";
tty << (int) memmap[i].getSize() << "\n";
}
BuddyAllocator alloc(memmap, (char*) 0xC0000000, system_info.getHighMemory() / 4 + 256, 6);
AddressSpace vmem(alloc);
vmem.mmap((void*) 0x80000000, 0x10000, MMAP_RW);
BuddyAllocator alloc(memmap, (char*) 0xFF800000, system_info.getHighMemory() / 4 + 256, 6);
mmap(alloc, (void*) 0, 4096, MMAP_RW);
outb(0xa1, 0xff);
outb(0x21, 0xff);
tty << "Nothing left to do. Hanging.\n";