structure project
This commit is contained in:
18
src/kernel.c
18
src/kernel.c
@@ -1,7 +1,7 @@
|
||||
#include "kernel.h"
|
||||
#include "interrupts.h"
|
||||
#include "multiboot.h"
|
||||
#include "pmm.h"
|
||||
#include "arch/x86_64/interrupts.h"
|
||||
#include "arch/x86_64/multiboot.h"
|
||||
#include "arch/x86_64/pmm.h"
|
||||
#include "string.h"
|
||||
#include "vga.h"
|
||||
#include <stdarg.h>
|
||||
@@ -15,18 +15,18 @@ void kmain(multiboot_info_t* mbd)
|
||||
remap_pic();
|
||||
enable_interrupts();
|
||||
|
||||
kprintf("Welcome to nub OS :)\n");
|
||||
khalt();
|
||||
printf("Welcome to nub OS :)\n");
|
||||
halt();
|
||||
}
|
||||
|
||||
void kpanic()
|
||||
void panic()
|
||||
{
|
||||
kprintf("Kernel panic!\n");
|
||||
printf("Kernel panic!\n");
|
||||
disable_interrupts();
|
||||
khalt();
|
||||
halt();
|
||||
}
|
||||
|
||||
void kprintf(const char* fmt, ...)
|
||||
void printf(const char* fmt, ...)
|
||||
{
|
||||
va_list args;
|
||||
va_start(args, fmt);
|
||||
|
||||
Reference in New Issue
Block a user