push
This commit is contained in:
@@ -13,8 +13,14 @@
|
||||
#include "./device/serialstream.h"
|
||||
|
||||
// Separate title window on first line (for simplicity at scrolling)
|
||||
|
||||
void PageFrameAllocator::init();
|
||||
|
||||
|
||||
static TextStream tout(0, CGA::COLUMNS, 0, 1);
|
||||
|
||||
|
||||
|
||||
SerialStream sout;
|
||||
|
||||
TextStream dout(0, 80, 17, 25);
|
||||
@@ -40,12 +46,11 @@ alignas(4096) four_lvl_paging_t paging_tree;
|
||||
static const uint32_t NUM_APPS = 9;
|
||||
Application apps[NUM_APPS];
|
||||
|
||||
static KeyboardApplication kapp;
|
||||
//static KeyboardApplication kapp;
|
||||
|
||||
// Main function
|
||||
extern "C" int main() {
|
||||
|
||||
PageFrameAllocator::init();
|
||||
memset(&paging_tree, 0, sizeof(four_lvl_paging_t));
|
||||
create_basic_page_table((uintptr_t)&paging_tree);
|
||||
load_cr3((void*)&paging_tree.l4);
|
||||
@@ -76,7 +81,7 @@ extern "C" int main() {
|
||||
g.vault().scheduler.ready(&(apps[i]));
|
||||
}
|
||||
|
||||
g.vault().scheduler.ready(&kapp);
|
||||
//g.vault().scheduler.ready(&kapp);
|
||||
|
||||
// Enable Interrupts
|
||||
Core::Interrupt::enable();
|
||||
|
||||
Reference in New Issue
Block a user