Handle ps2 keyboard, no APIC for now
This commit is contained in:
@ -4,10 +4,8 @@
|
||||
#include "kprintf.h"
|
||||
#include "serial.h"
|
||||
#include "gdt.h"
|
||||
#include "acpi.h"
|
||||
#include "intr.h"
|
||||
#include "pic.h"
|
||||
#include "apic.h"
|
||||
#include "pit.h"
|
||||
|
||||
void hal_init(void) {
|
||||
@ -16,6 +14,10 @@ void hal_init(void) {
|
||||
}
|
||||
LOG("hal", "serial init\n");
|
||||
gdt_init();
|
||||
intr_init();
|
||||
pic_init();
|
||||
pit_init();
|
||||
hal_intr_disable();
|
||||
}
|
||||
|
||||
__attribute__((noreturn)) void hal_hang(void) {
|
||||
@ -24,16 +26,6 @@ __attribute__((noreturn)) void hal_hang(void) {
|
||||
}
|
||||
}
|
||||
|
||||
void hal_init_withmalloc(void) {
|
||||
acpi_init();
|
||||
pic_init();
|
||||
apic_init();
|
||||
intr_init();
|
||||
pit_init();
|
||||
ioapic_setentry(IOAPIC, acpi_remapirq(0x00), INTR_TIMER);
|
||||
hal_intr_disable();
|
||||
}
|
||||
|
||||
void hal_wait(uint32_t ms) {
|
||||
pit_wait(ms);
|
||||
}
|
||||
|
Reference in New Issue
Block a user