diff options
| -rw-r--r-- | src/bootloader/grub.cfg | 4 | ||||
| -rw-r--r-- | src/kernel/acpi/acpi.c | 8 | ||||
| -rw-r--r-- | src/kernel/boot.asm | 33 | ||||
| -rw-r--r-- | src/kernel/fs/load.c | 10 | ||||
| -rw-r--r-- | src/kernel/fs/vfs.c | 1 | ||||
| -rw-r--r-- | src/kernel/kernel.c | 23 | ||||
| -rw-r--r-- | src/kernel/lib/lib.h | 4 | ||||
| -rw-r--r-- | src/kernel/lib/memory.c | 29 | ||||
| -rw-r--r-- | src/kernel/multiboot.c | 56 | ||||
| -rw-r--r-- | src/kernel/multiboot.h | 471 | ||||
| -rw-r--r-- | src/kernel/system.h | 5 |
11 files changed, 438 insertions, 206 deletions
diff --git a/src/bootloader/grub.cfg b/src/bootloader/grub.cfg index 227030e..57af145 100644 --- a/src/bootloader/grub.cfg +++ b/src/bootloader/grub.cfg @@ -1,6 +1,6 @@ set timeout=0 set default=0 menuentry "Melvix" { - multiboot /boot/kernel.bin + multiboot2 /boot/kernel.bin boot -}
\ No newline at end of file +} diff --git a/src/kernel/acpi/acpi.c b/src/kernel/acpi/acpi.c index 8733987..2bb097a 100644 --- a/src/kernel/acpi/acpi.c +++ b/src/kernel/acpi/acpi.c @@ -89,15 +89,15 @@ int acpi_enable() if (i < 300) { return 0; // Successfully enabled ACPI } else { - log("ACPI couldn't be enabled!"); + warn("ACPI couldn't be enabled!"); return -1; // ACPI couldn't be enabled } } else { - log("ACPI is not supported!"); + warn("ACPI is not supported!"); return -1; // ACPI is not supported } } else { - log("ACPI was already enabled!"); + warn("ACPI was already enabled!"); return 0; // ACPI was already enabled } } @@ -174,7 +174,7 @@ int acpi_install() ptr++; } // Else: no valid FADT present } else { - log("ACPI is not supported!"); + warn("ACPI is not supported!"); } return success == 1 ? 0 : -1; diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm index 968a824..9086dbd 100644 --- a/src/kernel/boot.asm +++ b/src/kernel/boot.asm @@ -1,14 +1,25 @@ -%define ALIGN 1 ; Align loaded modules on page boundaries -%define MEMINFO 2 ; Provide memory map -%define FLAGS 3 ; Flags (ALIGN | MEMINFO) -%define MAGIC 0x1BADB002 -%define CHECKSUM -(MAGIC + FLAGS) - section .multiboot - align 4 - dd MAGIC - dd FLAGS - dd CHECKSUM + header_start: + dd 0xe85250d6 + dd 0 + dd header_end - header_start + dd 0x100000000 - (0xe85250d6 + 0 + (header_end - header_start)) + mb2_tag_info_start: + dw 1 + dw 0 ; Non-optional + dd mb2_tag_info_end - mb2_tag_info_start + dd 1 + dd 2 + dd 4 + dd 6 + mb2_tag_info_end: + align 8 + mb2_tag_end_start: + dw 0 + dw 0 + dd mb2_tag_end_end - mb2_tag_end_start + mb2_tag_end_end: + header_end: section .start_section dd _start @@ -70,4 +81,4 @@ section .text section .end_section global ASM_KERNEL_END ASM_KERNEL_END: - ; Kernel size detection
\ No newline at end of file + ; Kernel size detection diff --git a/src/kernel/fs/load.c b/src/kernel/fs/load.c index 0206401..ed8e042 100644 --- a/src/kernel/fs/load.c +++ b/src/kernel/fs/load.c @@ -9,10 +9,9 @@ void load_binaries() userspace = (uint32_t)kmalloc(10000); font = (struct font *)kmalloc(100000); // High quality shit - if (multiboot_header->boot_device != 0xE0FFFFFF) { + /*if (multiboot_header->boot_device != 0xE0FFFFFF) { panic("Unsupported boot drive!"); } else { - /* char *font_p[] = { "FONT.BIN" }; struct iso9660_entity *font_e = ISO9660_get(font_p, 1); if (!font_e) @@ -28,10 +27,9 @@ void load_binaries() kfree(user_e); if (font->magic != 0xf0f0f0f0) { - log("0x%x: WRONG FONT MAGIC!", font->magic); + warn("0x%x: WRONG FONT MAGIC!", font->magic); halt_loop(); } - */ - } + }*/ vga_log("Successfully loaded binaries"); -}
\ No newline at end of file +} diff --git a/src/kernel/fs/vfs.c b/src/kernel/fs/vfs.c index 9dc684c..4d35926 100644 --- a/src/kernel/fs/vfs.c +++ b/src/kernel/fs/vfs.c @@ -1,5 +1,4 @@ #include <kernel/system.h> -#include <kernel/fs/ext2.h> #include <kernel/fs/vfs.h> #include <kernel/lib/data/list.h> #include <kernel/lib/data/generic_tree.h> diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index 3339381..6a9bc09 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -19,12 +19,18 @@ #include <kernel/fs/ext2.h> #include <kernel/fs/vfs.h> -void kernel_main(uint32_t magic, multiboot_info_t *grub_header) +void kernel_main(uint32_t magic, uint32_t multiboot_address) { if (magic != MULTIBOOT_BOOTLOADER_MAGIC) { vga_log("Invalid boot magic!"); halt_loop(); } + + if (multiboot_address & 7) { + vga_log("Unaligned mbi!"); + halt_loop(); + } + vga_log("Installing basic features of Melvix..."); // Install features @@ -34,10 +40,16 @@ void kernel_main(uint32_t magic, multiboot_info_t *grub_header) idt_install(); isrs_install(); irq_install(); - memory_init(grub_header); + + multiboot_parse(); paging_install(); + memory_print(); + vfs_init(); + ata_init(); + ext2_init("/dev/hda", "/"); + load_binaries(); set_optimal_resolution(); @@ -50,18 +62,11 @@ void kernel_main(uint32_t magic, multiboot_info_t *grub_header) network_install(); sti(); - vfs_init(); - ata_init(); - ext2_init("/dev/hda", "/"); // tasking_install(); // Get hardware information // get_smbios(); - // Print total memory - info("Total memory found: %dMiB", (memory_get_all() >> 10) + 1); - log("Total memory found: %dMiB", (memory_get_all() >> 10) + 1); - #ifdef INSTALL_MELVIX panic("Installation isn't supported right now!"); #endif diff --git a/src/kernel/lib/lib.h b/src/kernel/lib/lib.h index ae8ee9c..8f4e13f 100644 --- a/src/kernel/lib/lib.h +++ b/src/kernel/lib/lib.h @@ -32,10 +32,10 @@ void *memset(void *dest, char val, size_t count); */ int memcmp(const void *a_ptr, const void *b_ptr, size_t size); -void memory_init(multiboot_info_t *grub_header); +void memory_init(struct multiboot_tag_basic_meminfo *tag); void memory_print(); uint32_t memory_get_all(); -#endif
\ No newline at end of file +#endif diff --git a/src/kernel/lib/memory.c b/src/kernel/lib/memory.c index 3202691..2544ee0 100644 --- a/src/kernel/lib/memory.c +++ b/src/kernel/lib/memory.c @@ -35,29 +35,32 @@ int memcmp(const void *a_ptr, const void *b_ptr, size_t size) return 0; } -multiboot_info_t *multiboot_header; +struct multiboot_tag_basic_meminfo *meminfo = NULL; -void memory_print() +uint32_t memory_get_all() { - if (multiboot_header->flags & MULTIBOOT_INFO_MEMORY) { - log("Mem lower: 0x%x", multiboot_header->mem_lower); - log("Mem upper: 0x%x", multiboot_header->mem_upper); + if (meminfo != NULL) { + return meminfo->mem_lower + meminfo->mem_upper; } else { - log("No memory information available!"); + warn("Got no memory info, guessing size!"); + return 42000; // This should not happen on a modern pc but well idk, 42MB? } } -void memory_init(multiboot_info_t *grub_header) +uint32_t memory_get_free() { - multiboot_header = grub_header; + return memory_get_all() - paging_get_used_pages() * 4; } -uint32_t memory_get_free() +void memory_print() { - return multiboot_header->mem_upper - paging_get_used_pages() * 4; + info("Mem lower: 0x%x", meminfo->mem_lower); + info("Mem upper: 0x%x", meminfo->mem_upper); + info("Total memory found: %dMiB", (memory_get_all() >> 10) + 1); + info("Total free memory: %dMiB", (memory_get_free() >> 10) + 1); } -uint32_t memory_get_all() +void memory_init(struct multiboot_tag_basic_meminfo *tag) { - return multiboot_header->mem_upper; -}
\ No newline at end of file + meminfo = tag; +} diff --git a/src/kernel/multiboot.c b/src/kernel/multiboot.c new file mode 100644 index 0000000..a8fdc3c --- /dev/null +++ b/src/kernel/multiboot.c @@ -0,0 +1,56 @@ +#include <stdint.h> +#include <kernel/system.h> +#include <kernel/multiboot.h> +#include <kernel/lib/lib.h> +#include <kernel/lib/stdio.h> + +void multiboot_parse(uint32_t multiboot_address) +{ + struct multiboot_tag *tag; + + for (tag = (struct multiboot_tag *)(multiboot_address + 8); + tag->type != MULTIBOOT_TAG_TYPE_END; + tag = (struct multiboot_tag *)((multiboot_uint8_t *)tag + ((tag->size + 7) & ~7))) { + //log("Tag 0x%x, Size 0x%x", tag->type, tag->size); + switch (tag->type) { + case MULTIBOOT_TAG_TYPE_CMDLINE: + //info("Command line: %s", ((struct multiboot_tag_string *)tag)->string); + break; + case MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME: + //info("Bootloader name: %s", ((struct multiboot_tag_string *)tag)->string); + break; + case MULTIBOOT_TAG_TYPE_MODULE: + break; + case MULTIBOOT_TAG_TYPE_BASIC_MEMINFO: + log("YAY"); + memory_init((struct multiboot_tag_basic_meminfo *)tag); + break; + case MULTIBOOT_TAG_TYPE_BOOTDEV: + break; + case MULTIBOOT_TAG_TYPE_MMAP: + break; + case MULTIBOOT_TAG_TYPE_VBE: + break; + case MULTIBOOT_TAG_TYPE_FRAMEBUFFER: + break; + case MULTIBOOT_TAG_TYPE_APM: + break; + case MULTIBOOT_TAG_TYPE_EFI32: + break; + case MULTIBOOT_TAG_TYPE_ACPI_OLD: + break; + case MULTIBOOT_TAG_TYPE_ACPI_NEW: + break; + case MULTIBOOT_TAG_TYPE_NETWORK: + break; + case MULTIBOOT_TAG_TYPE_EFI_MMAP: + break; + case MULTIBOOT_TAG_TYPE_EFI_BS: + break; + case MULTIBOOT_TAG_TYPE_EFI32_IH: + break; + case MULTIBOOT_TAG_TYPE_LOAD_BASE_ADDR: + break; + } + } +} diff --git a/src/kernel/multiboot.h b/src/kernel/multiboot.h index 5a98a00..95bde38 100644 --- a/src/kernel/multiboot.h +++ b/src/kernel/multiboot.h @@ -1,216 +1,381 @@ -/* multiboot.h - Multiboot header file. */ -/* Copyright (C) 1999,2003,2007,2008,2009 Free Software Foundation, Inc. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY - * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR - * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ +/* Copyright (C) 1999,2003,2007,2008,2009,2010 Free Software Foundation, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ANY + * DEVELOPER OR DISTRIBUTOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR + * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ #ifndef MULTIBOOT_HEADER #define MULTIBOOT_HEADER 1 -/* How many bytes from the start of the file we search for the header. */ -#define MULTIBOOT_SEARCH 8192 +/* How many bytes from the start of the file we search for the header. */ +#define MULTIBOOT_SEARCH 32768 +#define MULTIBOOT_HEADER_ALIGN 8 -/* The magic field should contain this. */ -#define MULTIBOOT_HEADER_MAGIC 0x1BADB002 +/* The magic field should contain this. */ +#define MULTIBOOT_HEADER_MAGIC 0xe85250d6 -/* This should be in %eax. */ -#define MULTIBOOT_BOOTLOADER_MAGIC 0x2BADB002 +/* This should be in %eax. */ +#define MULTIBOOT_BOOTLOADER_MAGIC 0x36d76289 -/* The bits in the required part of flags field we don't support. */ -#define MULTIBOOT_UNSUPPORTED 0x0000fffc - -/* Alignment of multiboot modules. */ +/* Alignment of multiboot modules. */ #define MULTIBOOT_MOD_ALIGN 0x00001000 -/* Alignment of the multiboot info structure. */ -#define MULTIBOOT_INFO_ALIGN 0x00000004 - -/* Flags set in the 'flags' member of the multiboot header. */ - -/* Align all boot modules on i386 page (4KB) boundaries. */ -#define MULTIBOOT_PAGE_ALIGN 0x00000001 - -/* Must pass memory information to OS. */ -#define MULTIBOOT_MEMORY_INFO 0x00000002 - -/* Must pass video information to OS. */ -#define MULTIBOOT_VIDEO_MODE 0x00000004 - -/* This flag indicates the use of the address fields in the header. */ -#define MULTIBOOT_AOUT_KLUDGE 0x00010000 - -/* Flags to be set in the 'flags' member of the multiboot info structure. */ - -/* is there basic lower/upper memory information? */ -#define MULTIBOOT_INFO_MEMORY 0x00000001 -/* is there a boot device set? */ -#define MULTIBOOT_INFO_BOOTDEV 0x00000002 -/* is the command-line defined? */ -#define MULTIBOOT_INFO_CMDLINE 0x00000004 -/* are there modules to do something with? */ -#define MULTIBOOT_INFO_MODS 0x00000008 - -/* These next two are mutually exclusive */ - -/* is there a symbol table loaded? */ -#define MULTIBOOT_INFO_AOUT_SYMS 0x00000010 -/* is there an ELF section header table? */ -#define MULTIBOOT_INFO_ELF_SHDR 0X00000020 - -/* is there a full memory map? */ -#define MULTIBOOT_INFO_MEM_MAP 0x00000040 - -/* Is there drive info? */ -#define MULTIBOOT_INFO_DRIVE_INFO 0x00000080 - -/* Is there a config table? */ -#define MULTIBOOT_INFO_CONFIG_TABLE 0x00000100 - -/* Is there a boot loader name? */ -#define MULTIBOOT_INFO_BOOT_LOADER_NAME 0x00000200 - -/* Is there a APM table? */ -#define MULTIBOOT_INFO_APM_TABLE 0x00000400 - -/* Is there video information? */ -#define MULTIBOOT_INFO_VIDEO_INFO 0x00000800 +/* Alignment of the multiboot info structure. */ +#define MULTIBOOT_INFO_ALIGN 0x00000008 + +/* Flags set in the ’flags’ member of the multiboot header. */ + +#define MULTIBOOT_TAG_ALIGN 8 +#define MULTIBOOT_TAG_TYPE_END 0 +#define MULTIBOOT_TAG_TYPE_CMDLINE 1 +#define MULTIBOOT_TAG_TYPE_BOOT_LOADER_NAME 2 +#define MULTIBOOT_TAG_TYPE_MODULE 3 +#define MULTIBOOT_TAG_TYPE_BASIC_MEMINFO 4 +#define MULTIBOOT_TAG_TYPE_BOOTDEV 5 +#define MULTIBOOT_TAG_TYPE_MMAP 6 +#define MULTIBOOT_TAG_TYPE_VBE 7 +#define MULTIBOOT_TAG_TYPE_FRAMEBUFFER 8 +#define MULTIBOOT_TAG_TYPE_ELF_SECTIONS 9 +#define MULTIBOOT_TAG_TYPE_APM 10 +#define MULTIBOOT_TAG_TYPE_EFI32 11 +#define MULTIBOOT_TAG_TYPE_EFI64 12 +#define MULTIBOOT_TAG_TYPE_SMBIOS 13 +#define MULTIBOOT_TAG_TYPE_ACPI_OLD 14 +#define MULTIBOOT_TAG_TYPE_ACPI_NEW 15 +#define MULTIBOOT_TAG_TYPE_NETWORK 16 +#define MULTIBOOT_TAG_TYPE_EFI_MMAP 17 +#define MULTIBOOT_TAG_TYPE_EFI_BS 18 +#define MULTIBOOT_TAG_TYPE_EFI32_IH 19 +#define MULTIBOOT_TAG_TYPE_EFI64_IH 20 +#define MULTIBOOT_TAG_TYPE_LOAD_BASE_ADDR 21 + +#define MULTIBOOT_HEADER_TAG_END 0 +#define MULTIBOOT_HEADER_TAG_INFORMATION_REQUEST 1 +#define MULTIBOOT_HEADER_TAG_ADDRESS 2 +#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS 3 +#define MULTIBOOT_HEADER_TAG_CONSOLE_FLAGS 4 +#define MULTIBOOT_HEADER_TAG_FRAMEBUFFER 5 +#define MULTIBOOT_HEADER_TAG_MODULE_ALIGN 6 +#define MULTIBOOT_HEADER_TAG_EFI_BS 7 +#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI32 8 +#define MULTIBOOT_HEADER_TAG_ENTRY_ADDRESS_EFI64 9 +#define MULTIBOOT_HEADER_TAG_RELOCATABLE 10 + +#define MULTIBOOT_ARCHITECTURE_I386 0 +#define MULTIBOOT_ARCHITECTURE_MIPS32 4 +#define MULTIBOOT_HEADER_TAG_OPTIONAL 1 + +#define MULTIBOOT_LOAD_PREFERENCE_NONE 0 +#define MULTIBOOT_LOAD_PREFERENCE_LOW 1 +#define MULTIBOOT_LOAD_PREFERENCE_HIGH 2 + +#define MULTIBOOT_CONSOLE_FLAGS_CONSOLE_REQUIRED 1 +#define MULTIBOOT_CONSOLE_FLAGS_EGA_TEXT_SUPPORTED 2 #ifndef ASM_FILE +typedef unsigned char multiboot_uint8_t; typedef unsigned short multiboot_uint16_t; typedef unsigned int multiboot_uint32_t; typedef unsigned long long multiboot_uint64_t; struct multiboot_header { - /* Must be MULTIBOOT_MAGIC - see above. */ + /* Must be MULTIBOOT_MAGIC - see above. */ multiboot_uint32_t magic; - /* Feature flags. */ - multiboot_uint32_t flags; + /* ISA */ + multiboot_uint32_t architecture; + + /* Total header length. */ + multiboot_uint32_t header_length; - /* The above fields plus this one must equal 0 mod 2^32. */ + /* The above fields plus this one must equal 0 mod 2^32. */ multiboot_uint32_t checksum; +}; - /* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */ +struct multiboot_header_tag { + multiboot_uint16_t type; + multiboot_uint16_t flags; + multiboot_uint32_t size; +}; + +struct multiboot_header_tag_information_request { + multiboot_uint16_t type; + multiboot_uint16_t flags; + multiboot_uint32_t size; + multiboot_uint32_t requests[0]; +}; + +struct multiboot_header_tag_address { + multiboot_uint16_t type; + multiboot_uint16_t flags; + multiboot_uint32_t size; multiboot_uint32_t header_addr; multiboot_uint32_t load_addr; multiboot_uint32_t load_end_addr; multiboot_uint32_t bss_end_addr; +}; + +struct multiboot_header_tag_entry_address { + multiboot_uint16_t type; + multiboot_uint16_t flags; + multiboot_uint32_t size; multiboot_uint32_t entry_addr; +}; + +struct multiboot_header_tag_console_flags { + multiboot_uint16_t type; + multiboot_uint16_t flags; + multiboot_uint32_t size; + multiboot_uint32_t console_flags; +}; - /* These are only valid if MULTIBOOT_VIDEO_MODE is set. */ - multiboot_uint32_t mode_type; +struct multiboot_header_tag_framebuffer { + multiboot_uint16_t type; + multiboot_uint16_t flags; + multiboot_uint32_t size; multiboot_uint32_t width; multiboot_uint32_t height; multiboot_uint32_t depth; }; -/* The symbol table for a.out. */ -struct multiboot_aout_symbol_table { - multiboot_uint32_t tabsize; - multiboot_uint32_t strsize; - multiboot_uint32_t addr; - multiboot_uint32_t reserved; +struct multiboot_header_tag_module_align { + multiboot_uint16_t type; + multiboot_uint16_t flags; + multiboot_uint32_t size; }; -typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t; -/* The section header table for ELF. */ -struct multiboot_elf_section_header_table { - multiboot_uint32_t num; +struct multiboot_header_tag_relocatable { + multiboot_uint16_t type; + multiboot_uint16_t flags; multiboot_uint32_t size; - multiboot_uint32_t addr; - multiboot_uint32_t shndx; + multiboot_uint32_t min_addr; + multiboot_uint32_t max_addr; + multiboot_uint32_t align; + multiboot_uint32_t preference; }; -typedef struct multiboot_elf_section_header_table multiboot_elf_section_header_table_t; -struct multiboot_info { - /* Multiboot info version number */ - multiboot_uint32_t flags; +struct multiboot_color { + multiboot_uint8_t red; + multiboot_uint8_t green; + multiboot_uint8_t blue; +}; - /* Available memory from BIOS */ - multiboot_uint32_t mem_lower; - multiboot_uint32_t mem_upper; +struct multiboot_mmap_entry { + multiboot_uint64_t addr; + multiboot_uint64_t len; +#define MULTIBOOT_MEMORY_AVAILABLE 1 +#define MULTIBOOT_MEMORY_RESERVED 2 +#define MULTIBOOT_MEMORY_ACPI_RECLAIMABLE 3 +#define MULTIBOOT_MEMORY_NVS 4 +#define MULTIBOOT_MEMORY_BADRAM 5 + multiboot_uint32_t type; + multiboot_uint32_t zero; +}; +typedef struct multiboot_mmap_entry multiboot_memory_map_t; - /* "root" partition */ - multiboot_uint32_t boot_device; +struct multiboot_tag { + multiboot_uint32_t type; + multiboot_uint32_t size; +}; - /* Kernel command line */ - multiboot_uint32_t cmdline; +struct multiboot_tag_string { + multiboot_uint32_t type; + multiboot_uint32_t size; + char string[0]; +}; - /* Boot-Module list */ - multiboot_uint32_t mods_count; - multiboot_uint32_t mods_addr; +struct multiboot_tag_module { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint32_t mod_start; + multiboot_uint32_t mod_end; + char cmdline[0]; +}; - union { - multiboot_aout_symbol_table_t aout_sym; - multiboot_elf_section_header_table_t elf_sec; - } u; +struct multiboot_tag_basic_meminfo { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint32_t mem_lower; + multiboot_uint32_t mem_upper; +}; - /* Memory Mapping buffer */ - multiboot_uint32_t mmap_length; - multiboot_uint32_t mmap_addr; +struct multiboot_tag_bootdev { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint32_t biosdev; + multiboot_uint32_t slice; + multiboot_uint32_t part; +}; - /* Drive Info buffer */ - multiboot_uint32_t drives_length; - multiboot_uint32_t drives_addr; +struct multiboot_tag_mmap { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint32_t entry_size; + multiboot_uint32_t entry_version; + struct multiboot_mmap_entry entries[0]; +}; - /* ROM configuration table */ - multiboot_uint32_t config_table; +struct multiboot_vbe_info_block { + multiboot_uint8_t external_specification[512]; +}; - /* Boot Loader Name */ - multiboot_uint32_t boot_loader_name; +struct multiboot_vbe_mode_info_block { + multiboot_uint8_t external_specification[256]; +}; - /* APM table */ - multiboot_uint32_t apm_table; +struct multiboot_tag_vbe { + multiboot_uint32_t type; + multiboot_uint32_t size; - /* Video */ - multiboot_uint32_t vbe_control_info; - multiboot_uint32_t vbe_mode_info; multiboot_uint16_t vbe_mode; multiboot_uint16_t vbe_interface_seg; multiboot_uint16_t vbe_interface_off; multiboot_uint16_t vbe_interface_len; + + struct multiboot_vbe_info_block vbe_control_info; + struct multiboot_vbe_mode_info_block vbe_mode_info; }; -typedef struct multiboot_info multiboot_info_t; -struct multiboot_mmap_entry { +struct multiboot_tag_framebuffer_common { + multiboot_uint32_t type; multiboot_uint32_t size; - multiboot_uint64_t addr; - multiboot_uint64_t len; -#define MULTIBOOT_MEMORY_AVAILABLE 1 -#define MULTIBOOT_MEMORY_RESERVED 2 + + multiboot_uint64_t framebuffer_addr; + multiboot_uint32_t framebuffer_pitch; + multiboot_uint32_t framebuffer_width; + multiboot_uint32_t framebuffer_height; + multiboot_uint8_t framebuffer_bpp; +#define MULTIBOOT_FRAMEBUFFER_TYPE_INDEXED 0 +#define MULTIBOOT_FRAMEBUFFER_TYPE_RGB 1 +#define MULTIBOOT_FRAMEBUFFER_TYPE_EGA_TEXT 2 + multiboot_uint8_t framebuffer_type; + multiboot_uint16_t reserved; +}; + +struct multiboot_tag_framebuffer { + struct multiboot_tag_framebuffer_common common; + + union { + struct { + multiboot_uint16_t framebuffer_palette_num_colors; + struct multiboot_color framebuffer_palette[0]; + }; + struct { + multiboot_uint8_t framebuffer_red_field_position; + multiboot_uint8_t framebuffer_red_mask_size; + multiboot_uint8_t framebuffer_green_field_position; + multiboot_uint8_t framebuffer_green_mask_size; + multiboot_uint8_t framebuffer_blue_field_position; + multiboot_uint8_t framebuffer_blue_mask_size; + }; + }; +}; + +struct multiboot_tag_elf_sections { multiboot_uint32_t type; -} __attribute__((packed)); -typedef struct multiboot_mmap_entry multiboot_memory_map_t; + multiboot_uint32_t size; + multiboot_uint32_t num; + multiboot_uint32_t entsize; + multiboot_uint32_t shndx; + char sections[0]; +}; -struct multiboot_mod_list { - /* the memory used goes from bytes 'mod_start' to 'mod_end-1' inclusive */ - multiboot_uint32_t mod_start; - multiboot_uint32_t mod_end; +struct multiboot_tag_apm { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint16_t version; + multiboot_uint16_t cseg; + multiboot_uint32_t offset; + multiboot_uint16_t cseg_16; + multiboot_uint16_t dseg; + multiboot_uint16_t flags; + multiboot_uint16_t cseg_len; + multiboot_uint16_t cseg_16_len; + multiboot_uint16_t dseg_len; +}; + +struct multiboot_tag_efi32 { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint32_t pointer; +}; - /* Module command line */ - multiboot_uint32_t cmdline; +struct multiboot_tag_efi64 { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint64_t pointer; +}; + +struct multiboot_tag_smbios { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint8_t major; + multiboot_uint8_t minor; + multiboot_uint8_t reserved[6]; + multiboot_uint8_t tables[0]; +}; + +struct multiboot_tag_old_acpi { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint8_t rsdp[0]; +}; + +struct multiboot_tag_new_acpi { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint8_t rsdp[0]; +}; + +struct multiboot_tag_network { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint8_t dhcpack[0]; +}; - /* padding to take it to 16 bytes (must be zero) */ - multiboot_uint32_t pad; +struct multiboot_tag_efi_mmap { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint32_t descr_size; + multiboot_uint32_t descr_vers; + multiboot_uint8_t efi_mmap[0]; }; -typedef struct multiboot_mod_list multiboot_module_t; -#endif /* ! ASM_FILE */ +struct multiboot_tag_efi32_ih { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint32_t pointer; +}; + +struct multiboot_tag_efi64_ih { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint64_t pointer; +}; + +struct multiboot_tag_load_base_addr { + multiboot_uint32_t type; + multiboot_uint32_t size; + multiboot_uint32_t load_base_addr; +}; + +void multiboot_parse(); + +#endif -#endif /* ! MULTIBOOT_HEADER */
\ No newline at end of file +#endif diff --git a/src/kernel/system.h b/src/kernel/system.h index b85865c..407cd75 100644 --- a/src/kernel/system.h +++ b/src/kernel/system.h @@ -16,11 +16,6 @@ extern void ASM_KERNEL_END(); uint32_t initial_esp; /** - * Multiboot structure pointer by grub - */ -multiboot_info_t *multiboot_header; - -/** * Initialize the basic features of the OS */ void init(); |