| 39,11 → 39,15 |
|---|
| #include <config.h> |
| |
| #include <proc/thread.h> |
| #include <arch/drivers/ega.h> |
| #include <genarch/multiboot/multiboot.h> |
| #include <genarch/drivers/legacy/ia32/io.h> |
| #include <genarch/drivers/ega/ega.h> |
| #include <arch/drivers/vesa.h> |
| #include <genarch/kbd/i8042.h> |
| #include <genarch/drivers/i8042/i8042.h> |
| #include <genarch/kbrd/kbrd.h> |
| #include <arch/drivers/i8254.h> |
| #include <arch/drivers/i8259.h> |
| #include <arch/boot/boot.h> |
| |
| #ifdef CONFIG_SMP |
| #include <arch/smp/apic.h> |
| 61,9 → 65,8 |
|---|
| #include <syscall/syscall.h> |
| #include <console/console.h> |
| #include <ddi/irq.h> |
| #include <ddi/device.h> |
| #include <sysinfo/sysinfo.h> |
| |
| |
| /** Disable I/O on non-privileged levels |
| * |
| * Clean IOPL(12,13) and NT(14) flags in EFLAGS register |
| 70,15 → 73,13 |
|---|
| */ |
| static void clean_IOPL_NT_flags(void) |
| { |
| asm ( |
| asm volatile ( |
| "pushfq\n" |
| "pop %%rax\n" |
| "and $~(0x7000), %%rax\n" |
| "pushq %%rax\n" |
| "popfq\n" |
| : |
| : |
| : "%rax" |
| ::: "%rax" |
| ); |
| } |
| |
| 88,16 → 89,31 |
|---|
| */ |
| static void clean_AM_flag(void) |
| { |
| asm ( |
| asm volatile ( |
| "mov %%cr0, %%rax\n" |
| "and $~(0x40000), %%rax\n" |
| "mov %%rax, %%cr0\n" |
| : |
| : |
| : "%rax" |
| ::: "%rax" |
| ); |
| } |
| |
| /** Perform amd64-specific initialization before main_bsp() is called. |
| * |
| * @param signature Should contain the multiboot signature. |
| * @param mi Pointer to the multiboot information structure. |
| */ |
| void arch_pre_main(uint32_t signature, const multiboot_info_t *mi) |
| { |
| /* Parse multiboot information obtained from the bootloader. */ |
| multiboot_info_parse(signature, mi); |
| |
| #ifdef CONFIG_SMP |
| /* Copy AP bootstrap routines below 1 MB. */ |
| memcpy((void *) AP_BOOT_OFFSET, (void *) BOOT_OFFSET, |
| (size_t) &_hardcoded_unmapped_size); |
| #endif |
| } |
| |
| void arch_pre_mm_init(void) |
| { |
| /* Enable no-execute pages */ |
| 133,13 → 149,17 |
|---|
| |
| /* hard clock */ |
| i8254_init(); |
| |
| |
| #ifdef CONFIG_FB |
| if (vesa_present()) |
| vesa_init(); |
| else |
| #endif |
| ega_init(); /* video */ |
| #ifdef CONFIG_EGA |
| ega_init(EGA_BASE, EGA_VIDEORAM); /* video */ |
| #else |
| {} |
| #endif |
| |
| /* Enable debugger */ |
| debugger_init(); |
| 172,8 → 192,28 |
|---|
| |
| void arch_post_smp_init(void) |
| { |
| /* keyboard controller */ |
| i8042_init(device_assign_devno(), IRQ_KBD, device_assign_devno(), IRQ_MOUSE); |
| #ifdef CONFIG_PC_KBD |
| /* |
| * Initialize the i8042 controller. Then initialize the keyboard |
| * module and connect it to i8042. Enable keyboard interrupts. |
| */ |
| indev_t *kbrdin = i8042_init((i8042_t *) I8042_BASE, IRQ_KBD); |
| if (kbrdin) { |
| kbrd_init(kbrdin); |
| trap_virtual_enable_irqs(1 << IRQ_KBD); |
| } |
| |
| /* |
| * This is the necessary evil until the userspace driver is entirely |
| * self-sufficient. |
| */ |
| sysinfo_set_item_val("kbd", NULL, true); |
| sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD); |
| sysinfo_set_item_val("kbd.address.physical", NULL, |
| (uintptr_t) I8042_BASE); |
| sysinfo_set_item_val("kbd.address.kernel", NULL, |
| (uintptr_t) I8042_BASE); |
| #endif |
| } |
| |
| void calibrate_delay_loop(void) |
| 208,15 → 248,38 |
|---|
| */ |
| void arch_grab_console(void) |
| { |
| i8042_grab(); |
| #ifdef CONFIG_FB |
| if (vesa_present()) |
| vesa_redraw(); |
| else |
| #endif |
| #ifdef CONFIG_EGA |
| ega_redraw(); |
| #else |
| {} |
| #endif |
| } |
| |
| /** Return console to userspace |
| * |
| */ |
| void arch_release_console(void) |
| { |
| i8042_release(); |
| } |
| |
| /** Construct function pointer |
| * |
| * @param fptr function pointer structure |
| * @param addr function address |
| * @param caller calling function address |
| * |
| * @return address of the function pointer |
| * |
| */ |
| void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller) |
| { |
| return addr; |
| } |
| |
| /** @} |
| */ |