justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor screen ouput from main console code

Browse Source
This commit is contained in:
Justin C. Miller
2018-04-24 09:32:57 -07:00
parent eb13f1f4fb
commit 94de87ef86
5 changed files with 224 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/main.cpp
View File

@@ -14,6 +14,9 @@ extern "C" {
void kernel_main(popcorn_data *header);
}
inline void * operator new (size_t, void *p) throw() { return p; }
/*
console
load_console(const popcorn_data *header)
{
@@ -36,11 +39,12 @@ load_console(const popcorn_data *header)
return cons;
}
*/
void
kernel_main(popcorn_data *header)
{
console cons = load_console(header);
console *cons = new (&g_console) console();
memory_initialize_managers(
header->memory_map,
@@ -50,13 +54,13 @@ kernel_main(popcorn_data *header)
interrupts_init();
interrupts_enable();
cons.puts("Interrupts initialized.\n");
g_console.puts("Interrupts initialized.\n");
device_manager devices(header->acpi_table);
// int x = 1 / 0;
// __asm__ __volatile__("int $15");
cons.puts("boogity!");
g_console.puts("boogity!");
do_the_set_registers(header);
}