diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index da98bb6..5701b80 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h @@ -94,7 +94,7 @@ inline static void outportw(unsigned short _port, unsigned short _data) { /** @brief Write a double word (4 bytes) to an IO port * * @param _port The port you want to write to - * @ + */ inline static void outportl(unsigned short _port, unsigned int _data) { asm volatile("outl %1, %0"::"dN"(_port), "a"(_data)); diff --git a/arch/x86/kernel/entry.asm b/arch/x86/kernel/entry.asm index f58877e..e52c7a2 100644 --- a/arch/x86/kernel/entry.asm +++ b/arch/x86/kernel/entry.asm @@ -38,9 +38,8 @@ mboot: ; Multiboot macros to make a few lines more readable later MULTIBOOT_PAGE_ALIGN equ 1<<0 MULTIBOOT_MEMORY_INFO equ 1<<1 - ; MULTIBOOT_AOUT_KLUDGE equ 1<<16 MULTIBOOT_HEADER_MAGIC equ 0x1BADB002 - MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO ; | MULTIBOOT_AOUT_KLUDGE + MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO MULTIBOOT_CHECKSUM equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS) EXTERN code, bss, end @@ -48,14 +47,6 @@ mboot: dd MULTIBOOT_HEADER_MAGIC dd MULTIBOOT_HEADER_FLAGS dd MULTIBOOT_CHECKSUM - - ; AOUT kludge - must be physical addresses. Make a note of these: - ; The linker script fills in the data for these ones! - ; dd mboot - ; dd code - ; dd bss - ; dd end - ; dd start SECTION .text ALIGN 4