freya/corn
1
0
Fork 0
mirror of https://git.stationery.faith/corn/corn.git synced 2024-09-19 16:01:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

disable wip code

Browse source
This commit is contained in:
Freya Murphy 2024-01-30 16:55:15 -05:00
parent 9cc8dfcf0e
commit f790341368
Signed by: freya
GPG key ID: 744AB800E383AE52
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/shim.h
View file

@ -6,6 +6,7 @@
struct boot_info { struct boot_info {
struct memory_map *map; struct memory_map *map;
void *symbol_table;
void *acpi_table; void *acpi_table;
char cmdline[CMDLINE_MAX]; char cmdline[CMDLINE_MAX];
}; };

3
src/arch/amd64/mboot.c
View file

@ -1,5 +1,4 @@
#include "mboot.h" #include "mboot.h"
#include "serial.h"
#include "shim.h" #include "shim.h"
#include <lib.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); read_memorymap(shim_info, size, data + 2);
break; break;
case MBOOT_SYMBOLS: case MBOOT_SYMBOLS:
// TODO: shim_info->symbol_table = (void *) (data + 2);
break; break;
case MBOOT_XSDP: case MBOOT_XSDP:
read_xsdp(shim_info, (char *) (data + 2)); read_xsdp(shim_info, (char *) (data + 2));

12
src/kmain.c
View file

@ -31,19 +31,13 @@ void print_memory() {
void kmain(struct boot_info *info) { void kmain(struct boot_info *info) {
memory_init(info->map); memory_init(info->map);
//acpi_init(info->acpi_table);
int i = acpi_init(info->acpi_table); //fb_init(1024, 768);
char buf[20];
ltoa(i, buf, 10);
serial_out_str("acpi: ");
serial_out_str(buf);
serial_out_str("\n");
serial_out_str("entered kmain\n"); serial_out_str("entered kmain\n");
*(char*)(0xB8000 + 0x144) = 'h'; *(char*)(0xB8000 + 0x144) = 'h';
*(char*)(0xB8000 + 0x146) = 'i'; *(char*)(0xB8000 + 0x146) = 'i';
//fb_init(1024, 768);
acpi_shutdown();
while (1) { while (1) {
// loop so we dont halt // loop so we dont halt
// this allows interrupts to fire // this allows interrupts to fire