mirror of
https://git.stationery.faith/corn/corn.git
synced 2024-11-09 16:42:08 +00:00
disable wip code
This commit is contained in:
parent
9cc8dfcf0e
commit
f790341368
3 changed files with 5 additions and 11 deletions
|
@ -6,6 +6,7 @@
|
|||
|
||||
struct boot_info {
|
||||
struct memory_map *map;
|
||||
void *symbol_table;
|
||||
void *acpi_table;
|
||||
char cmdline[CMDLINE_MAX];
|
||||
};
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
#include "mboot.h"
|
||||
#include "serial.h"
|
||||
#include "shim.h"
|
||||
|
||||
#include <lib.h>
|
||||
|
@ -42,7 +41,7 @@ static uint32_t *read_tag(uint32_t *data, struct boot_info *shim_info) {
|
|||
read_memorymap(shim_info, size, data + 2);
|
||||
break;
|
||||
case MBOOT_SYMBOLS:
|
||||
// TODO:
|
||||
shim_info->symbol_table = (void *) (data + 2);
|
||||
break;
|
||||
case MBOOT_XSDP:
|
||||
read_xsdp(shim_info, (char *) (data + 2));
|
||||
|
|
12
src/kmain.c
12
src/kmain.c
|
@ -31,19 +31,13 @@ void print_memory() {
|
|||
|
||||
void kmain(struct boot_info *info) {
|
||||
memory_init(info->map);
|
||||
|
||||
int i = acpi_init(info->acpi_table);
|
||||
char buf[20];
|
||||
ltoa(i, buf, 10);
|
||||
serial_out_str("acpi: ");
|
||||
serial_out_str(buf);
|
||||
serial_out_str("\n");
|
||||
//acpi_init(info->acpi_table);
|
||||
//fb_init(1024, 768);
|
||||
|
||||
serial_out_str("entered kmain\n");
|
||||
*(char*)(0xB8000 + 0x144) = 'h';
|
||||
*(char*)(0xB8000 + 0x146) = 'i';
|
||||
//fb_init(1024, 768);
|
||||
acpi_shutdown();
|
||||
|
||||
while (1) {
|
||||
// loop so we dont halt
|
||||
// this allows interrupts to fire
|
||||
|
|
Loading…
Reference in a new issue