diff options
Diffstat (limited to 'kernel/kernel.c')
| -rw-r--r-- | kernel/kernel.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/kernel/kernel.c b/kernel/kernel.c index ba6bc5d..62556cb 100644 --- a/kernel/kernel.c +++ b/kernel/kernel.c @@ -24,13 +24,14 @@ void kernel_main(uint32_t eax,uint32_t ebx) { serial_init(); - log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"COM 1 - initialized"); log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"%s - BUILD: git-%s (%s %s)", KERNEL_NAME,GIT_REVISION,__DATE__,__TIME__); - // PIT TIMER - timer_init(); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"COM 1 - initialized"); + + uint64_t epoch_time=timer_init(); + log(FOOLOS_MODULE_NAME,FOOLOS_LOG_INFO,"PIT - initialized. %u seconds passed since 1970.",epoch_time); // STREAMS uint32_t sstdin = syscall_open("stdin",0,0); // stdin 0 @@ -53,11 +54,11 @@ void kernel_main(uint32_t eax,uint32_t ebx) multiboot_information *info=get_multiboot(eax, ebx); // Gather Info about other processors. (APs = application processors) // ACPI or MP - smp_processors procdata; - - if(!acpi_find(&procdata)) - if(!mp_find(&procdata)) - panic(FOOLOS_MODULE_NAME,"ACPI and MP search failed! I do not want to continue!"); + //smp_processors procdata; + // + //if(!acpi_find(&procdata)) + // if(!mp_find(&procdata)) + // panic(FOOLOS_MODULE_NAME,"ACPI and MP search failed! I do not want to continue!"); // MEMORY INIT (allows allocating and deaclloating physical memory) uint32_t kernel_blocks=mem_init(info); @@ -75,9 +76,9 @@ void kernel_main(uint32_t eax,uint32_t ebx) pdirectory *dir=vmem_init(kernel_blocks,(uint32_t)info->framebuffer_addr); // PCI Bus - pci_init(); + //pci_init(); - // INIT VESA + // INIT VESA: TODO: stop and say if not 32bit colormode! uint32_t addr=kballoc(1); fs_content("/binfont.bin",addr,0x100); // copy 0x100 bytes to 0x7000 vesa_init(info->vbe_control_info,info->vbe_mode_info,addr); |