diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/boot.asm | 2 | ||||
| -rw-r--r-- | src/kernel.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/boot.asm b/src/boot.asm index c88f08c..e723d61 100644 --- a/src/boot.asm +++ b/src/boot.asm @@ -14,7 +14,7 @@ MULTIBOOT_VIDEO_BPP: equ 16 ; We don't set flags[16] because we assemble to ELF32 so header_addr, etc is useless to us ; (at least at the moment). UNUSED_BYTES_COUNT: equ 5*4 -section .multiboot_header: +section .multiboot_header ; I guess multiboot 2 requires a length field and we might migrate to that in the future. multiboot_header_start: align 4 diff --git a/src/kernel.c b/src/kernel.c index 917c07e..952eac2 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -104,8 +104,7 @@ void outportb(u16 port, u8 data) { asm("outb %1, %0" : : "dN" (port), "a" (data)); } -// TODO: Why won't this work? void macaroni_panic(char* msg) { -void macaroni_panic() { +void macaroni_panic(char* msg) { // we'll do something with msg later. while(true){ asm("nop\n\t"); } } @@ -114,7 +113,7 @@ void macaroni_assert(bool condition) { if (condition) { return; } - macaroni_panic(); + macaroni_panic("thisisatest"); } void cmain(void) { @@ -131,4 +130,4 @@ void cmain(void) { macaroni_assert(magic_response == 0x2BADB002); //asm("int $0x13"); -}
\ No newline at end of file +} |