Espresso 0.0.1d
This commit is contained in:
@ -37,6 +37,8 @@
|
||||
|
||||
#include <kernel/intro.h>
|
||||
|
||||
#include <builtin_games/miner.h>
|
||||
|
||||
#define DEBUG
|
||||
|
||||
|
||||
@ -44,12 +46,12 @@ extern void _hang_asm(void);
|
||||
extern void _sti_asm(void);
|
||||
|
||||
|
||||
void kernel_main(multiboot_info_t* mbd, unsigned int magic)
|
||||
void kernel_main(multiboot_info_t* mbd, uint32_t magic)
|
||||
{
|
||||
|
||||
/* --- BEGIN INITIALIZATION SECTION --- */
|
||||
|
||||
const char* espresso_kernel_version = "0.0.0f";
|
||||
const char* espresso_kernel_version = "0.0.1d";
|
||||
|
||||
/* We need to initialize the terminal so that any error/debugging messages show. */
|
||||
terminal_initialize();
|
||||
@ -78,7 +80,7 @@ void kernel_main(multiboot_info_t* mbd, unsigned int magic)
|
||||
idt_init();
|
||||
_sti_asm();
|
||||
|
||||
irq_init(); /* MUST be done after pci_remap() and idt_init() */
|
||||
irq_init(); /* MUST be done after pic_remap() and idt_init() */
|
||||
|
||||
terminal_setcolor(VGA_COLOR_GREEN);
|
||||
|
||||
@ -132,7 +134,6 @@ void kernel_main(multiboot_info_t* mbd, unsigned int magic)
|
||||
printd("PCI initialized\n");
|
||||
|
||||
|
||||
|
||||
/* --- END INITIALIZATION SECTION --- */
|
||||
|
||||
terminal_setcolor(VGA_COLOR_LIGHT_GREEN);
|
||||
@ -141,14 +142,14 @@ void kernel_main(multiboot_info_t* mbd, unsigned int magic)
|
||||
/*pit_sleep(4000);
|
||||
begin_anim(espresso_kernel_version);*/
|
||||
|
||||
printf("Guten tag and welcome to Espresso\n");
|
||||
|
||||
/*printf("here\n");
|
||||
|
||||
printf("%i\n", sfs_init(false));
|
||||
|
||||
printf("here\n");*/
|
||||
|
||||
printf("Guten tag and welcome to Espresso\n");
|
||||
|
||||
while (true)
|
||||
{
|
||||
|
||||
|
Reference in New Issue
Block a user