Espresso 0.0.0f
This commit is contained in:
@ -5,11 +5,13 @@
|
||||
|
||||
#include <kernel/intro.h>
|
||||
|
||||
void delay_us(uint32_t microseconds, uint32_t cpu_mhz) {
|
||||
uint32_t count = cpu_mhz * microseconds;
|
||||
while (count--) {
|
||||
asm volatile ("nop" ::: "memory");
|
||||
}
|
||||
void delay_us(uint32_t microseconds, uint32_t cpu_mhz)
|
||||
{
|
||||
uint32_t count = cpu_mhz * microseconds;
|
||||
while (count--)
|
||||
{
|
||||
asm volatile ("nop" ::: "memory");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
@ -50,7 +50,7 @@ void kernel_main(multiboot_info_t* mbd, unsigned int magic)
|
||||
|
||||
/* --- BEGIN INITIALIZATION SECTION --- */
|
||||
|
||||
const char* espresso_kernel_version = "0.0.0e";
|
||||
const char* espresso_kernel_version = "0.0.0f";
|
||||
|
||||
/* We need to initialize the terminal so that any error/debuging messages show. */
|
||||
terminal_initialize();
|
||||
@ -106,6 +106,10 @@ void kernel_main(multiboot_info_t* mbd, unsigned int magic)
|
||||
printd("SSE test succeeded\n");
|
||||
}
|
||||
|
||||
printd("Initializing the PS/2 keyboard...\n");
|
||||
keyboard_init();
|
||||
printd("PS/2 Keyboard initialized\n");
|
||||
|
||||
/*
|
||||
printd("Initalizing AHCI...\n");
|
||||
ahci_init();
|
||||
@ -138,7 +142,7 @@ void kernel_main(multiboot_info_t* mbd, unsigned int magic)
|
||||
|
||||
/*sleep(1000);*/
|
||||
|
||||
begin_anim(espresso_kernel_version);
|
||||
//begin_anim(espresso_kernel_version);
|
||||
|
||||
printf("Guten tag and welcome to Espresso\n");
|
||||
|
||||
|
Reference in New Issue
Block a user