From 51e4543079ddb0f25108f182e145d6f5355b13e0 Mon Sep 17 00:00:00 2001 From: "Chloe M." Date: Mon, 22 Jun 2026 02:00:37 +0000 Subject: [PATCH] paw: boot: Use newest limine version Signed-off-by: Chloe M. --- paw/base/boot/limine.conf | 1 - paw/boot/host/deps.sh | 6 +- paw/stos/head/lib/limine.h | 403 ++++++++++++++----------------------- paw/stos/ke/Makefile | 1 + 4 files changed, 154 insertions(+), 257 deletions(-) diff --git a/paw/base/boot/limine.conf b/paw/base/boot/limine.conf index 63da428..949e957 100644 --- a/paw/base/boot/limine.conf +++ b/paw/base/boot/limine.conf @@ -1,5 +1,4 @@ timeout: 16 -interface_branding_color: 5 interface_branding: -- Yiff! -- wallpaper: boot():/boot/wallpaper.jpg diff --git a/paw/boot/host/deps.sh b/paw/boot/host/deps.sh index 7dc252d..d1d9536 100755 --- a/paw/boot/host/deps.sh +++ b/paw/boot/host/deps.sh @@ -5,6 +5,8 @@ # if [ ! -d stand/limine ]; then - git clone https://codeberg.org/Limine/Limine.git --branch=v10.x-binary --depth=1 stand/limine - make -C stand/limine + curl -L https://github.com/Limine-Bootloader/Limine/releases/latest/download/limine-binary.tar.gz | gunzip | tar -xf - + mkdir -p stand/ + mv limine-binary stand/limine/ + make -C stand/limine/ fi diff --git a/paw/stos/head/lib/limine.h b/paw/stos/head/lib/limine.h index 0042907..6dbff55 100644 --- a/paw/stos/head/lib/limine.h +++ b/paw/stos/head/lib/limine.h @@ -1,6 +1,6 @@ -/* BSD Zero Clause License */ +/* SPDX-License-Identifier: 0BSD */ -/* Copyright (C) 2022-2025 Mintsuki and contributors. +/* Copyright (C) 2022-2026 Mintsuki and contributors. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted. @@ -17,12 +17,12 @@ #ifndef LIMINE_H #define LIMINE_H 1 +#include + #ifdef __cplusplus extern "C" { #endif -#include - /* Misc */ #ifdef LIMINE_NO_POINTERS @@ -31,42 +31,16 @@ extern "C" { # define LIMINE_PTR(TYPE) TYPE #endif -#ifndef LIMINE_API_REVISION -# define LIMINE_API_REVISION 0 -#endif +#define LIMINE_REQUESTS_START_MARKER { 0xf6b8f4b39de7d1ae, 0xfab91a6940fcb9cf, \ + 0x785c6ed015d3e316, 0x181e920a7852b9d9 } +#define LIMINE_REQUESTS_END_MARKER { 0xadc0e0531bb10d03, 0x9572709f31764c62 } -#if LIMINE_API_REVISION > 4 -# error "limine.h API revision unsupported" -#endif +#define LIMINE_BASE_REVISION(N) { 0xf9562b2d5c95a6c8, 0x6a7b384944536bdc, (N) } -#ifdef __GNUC__ -# define LIMINE_DEPRECATED __attribute__((__deprecated__)) -# define LIMINE_DEPRECATED_IGNORE_START \ - _Pragma("GCC diagnostic push") \ - _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") -# define LIMINE_DEPRECATED_IGNORE_END \ - _Pragma("GCC diagnostic pop") -#else -# define LIMINE_DEPRECATED -# define LIMINE_DEPRECATED_IGNORE_START -# define LIMINE_DEPRECATED_IGNORE_END -#endif +#define LIMINE_BASE_REVISION_SUPPORTED(VAR) ((VAR)[2] == 0) -#define LIMINE_REQUESTS_START_MARKER \ - UQUAD limine_requests_start_marker[4] = { 0xf6b8f4b39de7d1ae, 0xfab91a6940fcb9cf, \ - 0x785c6ed015d3e316, 0x181e920a7852b9d9 }; -#define LIMINE_REQUESTS_END_MARKER \ - UQUAD limine_requests_end_marker[2] = { 0xadc0e0531bb10d03, 0x9572709f31764c62 }; - -#define LIMINE_REQUESTS_DELIMITER LIMINE_REQUESTS_END_MARKER - -#define LIMINE_BASE_REVISION(N) \ - UQUAD limine_base_revision[3] = { 0xf9562b2d5c95a6c8, 0x6a7b384944536bdc, (N) }; - -#define LIMINE_BASE_REVISION_SUPPORTED (limine_base_revision[2] == 0) - -#define LIMINE_LOADED_BASE_REV_VALID (limine_base_revision[1] != 0x6a7b384944536bdc) -#define LIMINE_LOADED_BASE_REVISION (limine_base_revision[1]) +#define LIMINE_LOADED_BASE_REVISION_VALID(VAR) ((VAR)[1] != 0x6a7b384944536bdc) +#define LIMINE_LOADED_BASE_REVISION(VAR) ((VAR)[1]) #define LIMINE_COMMON_MAGIC 0xc7b1dd30df4c8b88, 0x0a82e883a194f07b @@ -86,14 +60,10 @@ struct limine_file { LIMINE_PTR(VOID *) address; UQUAD size; LIMINE_PTR(CHAR *) path; -#if LIMINE_API_REVISION >= 3 LIMINE_PTR(CHAR *) string; -#else - LIMINE_PTR(CHAR *) cmdline; -#endif ULONG media_type; ULONG unused; - ULONG tftp_ip; + UCHAR tftp_ipv4[4]; ULONG tftp_port; ULONG partition_index; ULONG mbr_disk_id; @@ -104,7 +74,7 @@ struct limine_file { /* Boot info */ -#define LIMINE_BOOTLOADER_INFO_REQUEST { LIMINE_COMMON_MAGIC, 0xf55038d8e2a1202f, 0x279426fcf5f59740 } +#define LIMINE_BOOTLOADER_INFO_REQUEST_ID { LIMINE_COMMON_MAGIC, 0xf55038d8e2a1202f, 0x279426fcf5f59740 } struct limine_bootloader_info_response { UQUAD revision; @@ -120,7 +90,7 @@ struct limine_bootloader_info_request { /* Executable command line */ -#define LIMINE_EXECUTABLE_CMDLINE_REQUEST { LIMINE_COMMON_MAGIC, 0x4b161536e598651e, 0xb390ad4a2f1f303a } +#define LIMINE_EXECUTABLE_CMDLINE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x4b161536e598651e, 0xb390ad4a2f1f303a } struct limine_executable_cmdline_response { UQUAD revision; @@ -135,13 +105,11 @@ struct limine_executable_cmdline_request { /* Firmware type */ -#define LIMINE_FIRMWARE_TYPE_REQUEST { LIMINE_COMMON_MAGIC, 0x8c2f75d90bef28a8, 0x7045a4688eac00c3 } +#define LIMINE_FIRMWARE_TYPE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x8c2f75d90bef28a8, 0x7045a4688eac00c3 } #define LIMINE_FIRMWARE_TYPE_X86BIOS 0 #define LIMINE_FIRMWARE_TYPE_EFI32 1 -# define LIMINE_FIRMWARE_TYPE_UEFI32 1 #define LIMINE_FIRMWARE_TYPE_EFI64 2 -# define LIMINE_FIRMWARE_TYPE_UEFI64 2 #define LIMINE_FIRMWARE_TYPE_SBI 3 struct limine_firmware_type_response { @@ -157,7 +125,7 @@ struct limine_firmware_type_request { /* Stack size */ -#define LIMINE_STACK_SIZE_REQUEST { LIMINE_COMMON_MAGIC, 0x224ef0460a8e8926, 0xe1cb0fc25f46ea3d } +#define LIMINE_STACK_SIZE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x224ef0460a8e8926, 0xe1cb0fc25f46ea3d } struct limine_stack_size_response { UQUAD revision; @@ -172,7 +140,7 @@ struct limine_stack_size_request { /* HHDM */ -#define LIMINE_HHDM_REQUEST { LIMINE_COMMON_MAGIC, 0x48dcf1cb8ad2b852, 0x63984e959a98244b } +#define LIMINE_HHDM_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x48dcf1cb8ad2b852, 0x63984e959a98244b } struct limine_hhdm_response { UQUAD revision; @@ -187,7 +155,7 @@ struct limine_hhdm_request { /* Framebuffer */ -#define LIMINE_FRAMEBUFFER_REQUEST { LIMINE_COMMON_MAGIC, 0x9d5827dcd881dd75, 0xa3148604f6fab11b } +#define LIMINE_FRAMEBUFFER_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x9d5827dcd881dd75, 0xa3148604f6fab11b } #define LIMINE_FRAMEBUFFER_RGB 1 @@ -238,93 +206,69 @@ struct limine_framebuffer_request { LIMINE_PTR(struct limine_framebuffer_response *) response; }; -/* Terminal */ +/* Flanterm FB init params */ -#define LIMINE_TERMINAL_REQUEST { LIMINE_COMMON_MAGIC, 0xc8ac59310c2b0844, 0xa68d0c7265d38878 } +#define LIMINE_FLANTERM_FB_INIT_PARAMS_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x3259399fe7c5f126, 0xe01c1c8c5db9d1a9 } -#define LIMINE_TERMINAL_CB_DEC 10 -#define LIMINE_TERMINAL_CB_BELL 20 -#define LIMINE_TERMINAL_CB_PRIVATE_ID 30 -#define LIMINE_TERMINAL_CB_STATUS_REPORT 40 -#define LIMINE_TERMINAL_CB_POS_REPORT 50 -#define LIMINE_TERMINAL_CB_KBD_LEDS 60 -#define LIMINE_TERMINAL_CB_MODE 70 -#define LIMINE_TERMINAL_CB_LINUX 80 +#define LIMINE_FLANTERM_FB_ROTATE_0 0 +#define LIMINE_FLANTERM_FB_ROTATE_90 1 +#define LIMINE_FLANTERM_FB_ROTATE_180 2 +#define LIMINE_FLANTERM_FB_ROTATE_270 3 -#define LIMINE_TERMINAL_CTX_SIZE ((UQUAD)(-1)) -#define LIMINE_TERMINAL_CTX_SAVE ((UQUAD)(-2)) -#define LIMINE_TERMINAL_CTX_RESTORE ((UQUAD)(-3)) -#define LIMINE_TERMINAL_FULL_REFRESH ((UQUAD)(-4)) - -/* Response revision 1 */ -#define LIMINE_TERMINAL_OOB_OUTPUT_GET ((UQUAD)(-10)) -#define LIMINE_TERMINAL_OOB_OUTPUT_SET ((UQUAD)(-11)) - -#define LIMINE_TERMINAL_OOB_OUTPUT_OCRNL (1 << 0) -#define LIMINE_TERMINAL_OOB_OUTPUT_OFDEL (1 << 1) -#define LIMINE_TERMINAL_OOB_OUTPUT_OFILL (1 << 2) -#define LIMINE_TERMINAL_OOB_OUTPUT_OLCUC (1 << 3) -#define LIMINE_TERMINAL_OOB_OUTPUT_ONLCR (1 << 4) -#define LIMINE_TERMINAL_OOB_OUTPUT_ONLRET (1 << 5) -#define LIMINE_TERMINAL_OOB_OUTPUT_ONOCR (1 << 6) -#define LIMINE_TERMINAL_OOB_OUTPUT_OPOST (1 << 7) - -LIMINE_DEPRECATED_IGNORE_START - -struct LIMINE_DEPRECATED limine_terminal; - -typedef VOID (*limine_terminal_write)(struct limine_terminal *, const CHAR *, UQUAD); -typedef VOID (*limine_terminal_callback)(struct limine_terminal *, UQUAD, UQUAD, UQUAD, UQUAD); - -struct LIMINE_DEPRECATED limine_terminal { - UQUAD columns; - UQUAD rows; - LIMINE_PTR(struct limine_framebuffer *) framebuffer; +struct limine_flanterm_fb_init_params { + LIMINE_PTR(ULONG *) canvas; + UQUAD canvas_size; + ULONG ansi_colours[8]; + ULONG ansi_bright_colours[8]; + ULONG default_bg; + ULONG default_fg; + ULONG default_bg_bright; + ULONG default_fg_bright; + LIMINE_PTR(VOID *) font; + UQUAD font_width; + UQUAD font_height; + UQUAD font_spacing; + UQUAD font_scale_x; + UQUAD font_scale_y; + UQUAD margin; + UQUAD rotation; }; -struct LIMINE_DEPRECATED limine_terminal_response { +struct limine_flanterm_fb_init_params_response { UQUAD revision; - UQUAD terminal_count; - LIMINE_PTR(struct limine_terminal **) terminals; - LIMINE_PTR(limine_terminal_write) write; + UQUAD entry_count; + LIMINE_PTR(struct limine_flanterm_fb_init_params **) entries; }; -struct LIMINE_DEPRECATED limine_terminal_request { +struct limine_flanterm_fb_init_params_request { UQUAD id[4]; UQUAD revision; - LIMINE_PTR(struct limine_terminal_response *) response; - LIMINE_PTR(limine_terminal_callback) callback; + LIMINE_PTR(struct limine_flanterm_fb_init_params_response *) response; }; -LIMINE_DEPRECATED_IGNORE_END - /* Paging mode */ -#define LIMINE_PAGING_MODE_REQUEST { LIMINE_COMMON_MAGIC, 0x95c1a0edab0944cb, 0xa4e5cb3842f7488a } +#define LIMINE_PAGING_MODE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x95c1a0edab0944cb, 0xa4e5cb3842f7488a } -#if defined (__x86_64__) || defined (__i386__) #define LIMINE_PAGING_MODE_X86_64_4LVL 0 #define LIMINE_PAGING_MODE_X86_64_5LVL 1 -#define LIMINE_PAGING_MODE_MIN LIMINE_PAGING_MODE_X86_64_4LVL -#define LIMINE_PAGING_MODE_DEFAULT LIMINE_PAGING_MODE_X86_64_4LVL -#elif defined (__aarch64__) +#define LIMINE_PAGING_MODE_X86_64_MIN LIMINE_PAGING_MODE_X86_64_4LVL +#define LIMINE_PAGING_MODE_X86_64_DEFAULT LIMINE_PAGING_MODE_X86_64_4LVL + #define LIMINE_PAGING_MODE_AARCH64_4LVL 0 #define LIMINE_PAGING_MODE_AARCH64_5LVL 1 -#define LIMINE_PAGING_MODE_MIN LIMINE_PAGING_MODE_AARCH64_4LVL -#define LIMINE_PAGING_MODE_DEFAULT LIMINE_PAGING_MODE_AARCH64_4LVL -#elif defined (__riscv) && (__riscv_xlen == 64) +#define LIMINE_PAGING_MODE_AARCH64_MIN LIMINE_PAGING_MODE_AARCH64_4LVL +#define LIMINE_PAGING_MODE_AARCH64_DEFAULT LIMINE_PAGING_MODE_AARCH64_4LVL + #define LIMINE_PAGING_MODE_RISCV_SV39 0 #define LIMINE_PAGING_MODE_RISCV_SV48 1 #define LIMINE_PAGING_MODE_RISCV_SV57 2 -#define LIMINE_PAGING_MODE_MIN LIMINE_PAGING_MODE_RISCV_SV39 -#define LIMINE_PAGING_MODE_DEFAULT LIMINE_PAGING_MODE_RISCV_SV48 -#elif defined (__loongarch__) && (__loongarch_grlen == 64) -#define LIMINE_PAGING_MODE_LOONGARCH64_4LVL 0 -#define LIMINE_PAGING_MODE_MIN LIMINE_PAGING_MODE_LOONGARCH64_4LVL -#define LIMINE_PAGING_MODE_DEFAULT LIMINE_PAGING_MODE_LOONGARCH64_4LVL -#else -#error Unknown architecture -#endif +#define LIMINE_PAGING_MODE_RISCV_MIN LIMINE_PAGING_MODE_RISCV_SV39 +#define LIMINE_PAGING_MODE_RISCV_DEFAULT LIMINE_PAGING_MODE_RISCV_SV48 + +#define LIMINE_PAGING_MODE_LOONGARCH_4LVL 0 +#define LIMINE_PAGING_MODE_LOONGARCH_MIN LIMINE_PAGING_MODE_LOONGARCH_4LVL +#define LIMINE_PAGING_MODE_LOONGARCH_DEFAULT LIMINE_PAGING_MODE_LOONGARCH_4LVL struct limine_paging_mode_response { UQUAD revision; @@ -340,47 +284,19 @@ struct limine_paging_mode_request { UQUAD min_mode; }; -/* 5-level paging */ - -#define LIMINE_5_LEVEL_PAGING_REQUEST { LIMINE_COMMON_MAGIC, 0x94469551da9b3192, 0xebe5e86db7382888 } - -LIMINE_DEPRECATED_IGNORE_START - -struct LIMINE_DEPRECATED limine_5_level_paging_response { - UQUAD revision; -}; - -struct LIMINE_DEPRECATED limine_5_level_paging_request { - UQUAD id[4]; - UQUAD revision; - LIMINE_PTR(struct limine_5_level_paging_response *) response; -}; - -LIMINE_DEPRECATED_IGNORE_END - /* MP */ -#if LIMINE_API_REVISION >= 1 -# define LIMINE_MP_REQUEST { LIMINE_COMMON_MAGIC, 0x95a67b819a1b857e, 0xa0b61b723b6a73e0 } -# define LIMINE_MP(TEXT) limine_mp_##TEXT -#else -# define LIMINE_SMP_REQUEST { LIMINE_COMMON_MAGIC, 0x95a67b819a1b857e, 0xa0b61b723b6a73e0 } -# define LIMINE_MP(TEXT) limine_smp_##TEXT -#endif +#define LIMINE_MP_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x95a67b819a1b857e, 0xa0b61b723b6a73e0 } -struct LIMINE_MP(info); +struct limine_mp_info; -typedef VOID (*limine_goto_address)(struct LIMINE_MP(info) *); +typedef VOID (*limine_goto_address)(struct limine_mp_info *); #if defined (__x86_64__) || defined (__i386__) -#if LIMINE_API_REVISION >= 1 -# define LIMINE_MP_X2APIC (1 << 0) -#else -# define LIMINE_SMP_X2APIC (1 << 0) -#endif +#define LIMINE_MP_RESPONSE_X86_64_X2APIC (1 << 0) -struct LIMINE_MP(info) { +struct limine_mp_info { ULONG processor_id; ULONG lapic_id; UQUAD reserved; @@ -388,17 +304,17 @@ struct LIMINE_MP(info) { UQUAD extra_argument; }; -struct LIMINE_MP(response) { +struct limine_mp_response { UQUAD revision; ULONG flags; ULONG bsp_lapic_id; UQUAD cpu_count; - LIMINE_PTR(struct LIMINE_MP(info) **) cpus; + LIMINE_PTR(struct limine_mp_info **) cpus; }; #elif defined (__aarch64__) -struct LIMINE_MP(info) { +struct limine_mp_info { ULONG processor_id; ULONG reserved1; UQUAD mpidr; @@ -407,17 +323,17 @@ struct LIMINE_MP(info) { UQUAD extra_argument; }; -struct LIMINE_MP(response) { +struct limine_mp_response { UQUAD revision; UQUAD flags; UQUAD bsp_mpidr; UQUAD cpu_count; - LIMINE_PTR(struct LIMINE_MP(info) **) cpus; + LIMINE_PTR(struct limine_mp_info **) cpus; }; #elif defined (__riscv) && (__riscv_xlen == 64) -struct LIMINE_MP(info) { +struct limine_mp_info { UQUAD processor_id; UQUAD hartid; UQUAD reserved; @@ -425,39 +341,48 @@ struct LIMINE_MP(info) { UQUAD extra_argument; }; -struct LIMINE_MP(response) { +struct limine_mp_response { UQUAD revision; UQUAD flags; UQUAD bsp_hartid; UQUAD cpu_count; - LIMINE_PTR(struct LIMINE_MP(info) **) cpus; + LIMINE_PTR(struct limine_mp_info **) cpus; }; #elif defined (__loongarch__) && (__loongarch_grlen == 64) -struct LIMINE_MP(info) { +struct limine_mp_info { + UQUAD processor_id; + UQUAD phys_id; UQUAD reserved; + LIMINE_PTR(limine_goto_address) goto_address; + UQUAD extra_argument; }; -struct LIMINE_MP(response) { +struct limine_mp_response { + UQUAD revision; + UQUAD flags; + UQUAD bsp_phys_id; UQUAD cpu_count; - LIMINE_PTR(struct LIMINE_MP(info) **) cpus; + LIMINE_PTR(struct limine_mp_info **) cpus; }; #else #error Unknown architecture #endif -struct LIMINE_MP(request) { +#define LIMINE_MP_REQUEST_X86_64_X2APIC (1 << 0) + +struct limine_mp_request { UQUAD id[4]; UQUAD revision; - LIMINE_PTR(struct LIMINE_MP(response) *) response; + LIMINE_PTR(struct limine_mp_response *) response; UQUAD flags; }; /* Memory map */ -#define LIMINE_MEMMAP_REQUEST { LIMINE_COMMON_MAGIC, 0x67cf3d9d378a806f, 0xe304acdfc50c3c62 } +#define LIMINE_MEMMAP_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x67cf3d9d378a806f, 0xe304acdfc50c3c62 } #define LIMINE_MEMMAP_USABLE 0 #define LIMINE_MEMMAP_RESERVED 1 @@ -465,13 +390,9 @@ struct LIMINE_MP(request) { #define LIMINE_MEMMAP_ACPI_NVS 3 #define LIMINE_MEMMAP_BAD_MEMORY 4 #define LIMINE_MEMMAP_BOOTLOADER_RECLAIMABLE 5 -#if LIMINE_API_REVISION >= 2 -# define LIMINE_MEMMAP_EXECUTABLE_AND_MODULES 6 -#else -# define LIMINE_MEMMAP_KERNEL_AND_MODULES 6 -#endif +#define LIMINE_MEMMAP_EXECUTABLE_AND_MODULES 6 #define LIMINE_MEMMAP_FRAMEBUFFER 7 -#define LIMINE_MEMMAP_ACPI_TABLES 8 +#define LIMINE_MEMMAP_RESERVED_MAPPED 8 struct limine_memmap_entry { UQUAD base; @@ -493,7 +414,7 @@ struct limine_memmap_request { /* Entry point */ -#define LIMINE_ENTRY_POINT_REQUEST { LIMINE_COMMON_MAGIC, 0x13d86c035a1cd3e1, 0x2b0caa89d8f3026a } +#define LIMINE_ENTRY_POINT_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x13d86c035a1cd3e1, 0x2b0caa89d8f3026a } typedef VOID (*limine_entry_point)(VOID); @@ -510,53 +431,29 @@ struct limine_entry_point_request { /* Executable File */ -#if LIMINE_API_REVISION >= 2 -# define LIMINE_EXECUTABLE_FILE_REQUEST { LIMINE_COMMON_MAGIC, 0xad97e90e83f1ed67, 0x31eb5d1c5ff23b69 } -#else -# define LIMINE_KERNEL_FILE_REQUEST { LIMINE_COMMON_MAGIC, 0xad97e90e83f1ed67, 0x31eb5d1c5ff23b69 } -#endif +#define LIMINE_EXECUTABLE_FILE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0xad97e90e83f1ed67, 0x31eb5d1c5ff23b69 } -#if LIMINE_API_REVISION >= 2 struct limine_executable_file_response { -#else -struct limine_kernel_file_response { -#endif UQUAD revision; -#if LIMINE_API_REVISION >= 2 LIMINE_PTR(struct limine_file *) executable_file; -#else - LIMINE_PTR(struct limine_file *) kernel_file; -#endif }; -#if LIMINE_API_REVISION >= 2 struct limine_executable_file_request { -#else -struct limine_kernel_file_request { -#endif UQUAD id[4]; UQUAD revision; -#if LIMINE_API_REVISION >= 2 LIMINE_PTR(struct limine_executable_file_response *) response; -#else - LIMINE_PTR(struct limine_kernel_file_response *) response; -#endif }; /* Module */ -#define LIMINE_MODULE_REQUEST { LIMINE_COMMON_MAGIC, 0x3e7e279702be32af, 0xca1c4f3bd1280cee } +#define LIMINE_MODULE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x3e7e279702be32af, 0xca1c4f3bd1280cee } #define LIMINE_INTERNAL_MODULE_REQUIRED (1 << 0) #define LIMINE_INTERNAL_MODULE_COMPRESSED (1 << 1) struct limine_internal_module { LIMINE_PTR(const CHAR *) path; -#if LIMINE_API_REVISION >= 3 LIMINE_PTR(const CHAR *) string; -#else - LIMINE_PTR(const CHAR *) cmdline; -#endif UQUAD flags; }; @@ -578,15 +475,11 @@ struct limine_module_request { /* RSDP */ -#define LIMINE_RSDP_REQUEST { LIMINE_COMMON_MAGIC, 0xc5e77b6b397e7b43, 0x27637845accdcf3c } +#define LIMINE_RSDP_REQUEST_ID { LIMINE_COMMON_MAGIC, 0xc5e77b6b397e7b43, 0x27637845accdcf3c } struct limine_rsdp_response { UQUAD revision; -#if LIMINE_API_REVISION >= 1 && LIMINE_API_REVISION <= 3 - UQUAD address; -#else LIMINE_PTR(VOID *) address; -#endif }; struct limine_rsdp_request { @@ -597,17 +490,12 @@ struct limine_rsdp_request { /* SMBIOS */ -#define LIMINE_SMBIOS_REQUEST { LIMINE_COMMON_MAGIC, 0x9e9046f11e095391, 0xaa4a520fefbde5ee } +#define LIMINE_SMBIOS_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x9e9046f11e095391, 0xaa4a520fefbde5ee } struct limine_smbios_response { UQUAD revision; -#if LIMINE_API_REVISION >= 1 - UQUAD entry_32; - UQUAD entry_64; -#else LIMINE_PTR(VOID *) entry_32; LIMINE_PTR(VOID *) entry_64; -#endif }; struct limine_smbios_request { @@ -618,15 +506,11 @@ struct limine_smbios_request { /* EFI system table */ -#define LIMINE_EFI_SYSTEM_TABLE_REQUEST { LIMINE_COMMON_MAGIC, 0x5ceba5163eaaf6d6, 0x0a6981610cf65fcc } +#define LIMINE_EFI_SYSTEM_TABLE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x5ceba5163eaaf6d6, 0x0a6981610cf65fcc } struct limine_efi_system_table_response { UQUAD revision; -#if LIMINE_API_REVISION >= 1 - UQUAD address; -#else LIMINE_PTR(VOID *) address; -#endif }; struct limine_efi_system_table_request { @@ -635,9 +519,29 @@ struct limine_efi_system_table_request { LIMINE_PTR(struct limine_efi_system_table_response *) response; }; +/* TPM event log */ + +#define LIMINE_TPM_EVENT_LOG_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x98e094fc7e76e979, 0xee8d8775c54e1d1f } + +#define LIMINE_TPM_EVENT_LOG_FORMAT_TCG_1_2 1 +#define LIMINE_TPM_EVENT_LOG_FORMAT_TCG_2 2 + +struct limine_tpm_event_log_response { + UQUAD revision; + UQUAD format; + UQUAD size; + LIMINE_PTR(VOID *) address; +}; + +struct limine_tpm_event_log_request { + UQUAD id[4]; + UQUAD revision; + LIMINE_PTR(struct limine_tpm_event_log_response *) response; +}; + /* EFI memory map */ -#define LIMINE_EFI_MEMMAP_REQUEST { LIMINE_COMMON_MAGIC, 0x7df62a431d6872d5, 0xa4fcdfb3e57306c8 } +#define LIMINE_EFI_MEMMAP_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x7df62a431d6872d5, 0xa4fcdfb3e57306c8 } struct limine_efi_memmap_response { UQUAD revision; @@ -655,74 +559,38 @@ struct limine_efi_memmap_request { /* Date at boot */ -#if LIMINE_API_REVISION >= 3 -# define LIMINE_DATE_AT_BOOT_REQUEST { LIMINE_COMMON_MAGIC, 0x502746e184c088aa, 0xfbc5ec83e6327893 } -#else -# define LIMINE_BOOT_TIME_REQUEST { LIMINE_COMMON_MAGIC, 0x502746e184c088aa, 0xfbc5ec83e6327893 } -#endif +#define LIMINE_DATE_AT_BOOT_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x502746e184c088aa, 0xfbc5ec83e6327893 } -#if LIMINE_API_REVISION >= 3 struct limine_date_at_boot_response { -#else -struct limine_boot_time_response { -#endif UQUAD revision; -#if LIMINE_API_REVISION >= 3 - QUAD timestamp; -#else - QUAD boot_time; -#endif + int64_t timestamp; }; -#if LIMINE_API_REVISION >= 3 struct limine_date_at_boot_request { -#else -struct limine_boot_time_request { -#endif UQUAD id[4]; UQUAD revision; -#if LIMINE_API_REVISION >= 3 LIMINE_PTR(struct limine_date_at_boot_response *) response; -#else - LIMINE_PTR(struct limine_boot_time_response *) response; -#endif }; /* Executable address */ -#if LIMINE_API_REVISION >= 2 -# define LIMINE_EXECUTABLE_ADDRESS_REQUEST { LIMINE_COMMON_MAGIC, 0x71ba76863cc55f63, 0xb2644a48c516a487 } -#else -# define LIMINE_KERNEL_ADDRESS_REQUEST { LIMINE_COMMON_MAGIC, 0x71ba76863cc55f63, 0xb2644a48c516a487 } -#endif +#define LIMINE_EXECUTABLE_ADDRESS_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x71ba76863cc55f63, 0xb2644a48c516a487 } -#if LIMINE_API_REVISION >= 2 struct limine_executable_address_response { -#else -struct limine_kernel_address_response { -#endif UQUAD revision; UQUAD physical_base; UQUAD virtual_base; }; -#if LIMINE_API_REVISION >= 2 struct limine_executable_address_request { -#else -struct limine_kernel_address_request { -#endif UQUAD id[4]; UQUAD revision; -#if LIMINE_API_REVISION >= 2 LIMINE_PTR(struct limine_executable_address_response *) response; -#else - LIMINE_PTR(struct limine_kernel_address_response *) response; -#endif }; /* Device Tree Blob */ -#define LIMINE_DTB_REQUEST { LIMINE_COMMON_MAGIC, 0xb40ddb48fb54bac7, 0x545081493f81ffb7 } +#define LIMINE_DTB_REQUEST_ID { LIMINE_COMMON_MAGIC, 0xb40ddb48fb54bac7, 0x545081493f81ffb7 } struct limine_dtb_response { UQUAD revision; @@ -737,7 +605,7 @@ struct limine_dtb_request { /* RISC-V Boot Hart ID */ -#define LIMINE_RISCV_BSP_HARTID_REQUEST { LIMINE_COMMON_MAGIC, 0x1369359f025525f9, 0x2ff2a56178391bb6 } +#define LIMINE_RISCV_BSP_HARTID_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x1369359f025525f9, 0x2ff2a56178391bb6 } struct limine_riscv_bsp_hartid_response { UQUAD revision; @@ -752,7 +620,7 @@ struct limine_riscv_bsp_hartid_request { /* Bootloader Performance */ -#define LIMINE_BOOTLOADER_PERFORMANCE_REQUEST { LIMINE_COMMON_MAGIC, 0x6b50ad9bf36d13ad, 0xdc4c7e88fc759e17 } +#define LIMINE_BOOTLOADER_PERFORMANCE_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x6b50ad9bf36d13ad, 0xdc4c7e88fc759e17 } struct limine_bootloader_performance_response { UQUAD revision; @@ -767,6 +635,33 @@ struct limine_bootloader_performance_request { LIMINE_PTR(struct limine_bootloader_performance_response *) response; }; +#define LIMINE_X86_64_KEEP_IOMMU_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x8ebaabe51f490179, 0x2aa86a59ffb4ab0f } + +struct limine_x86_64_keep_iommu_response { + UQUAD revision; +}; + +struct limine_x86_64_keep_iommu_request { + UQUAD id[4]; + UQUAD revision; + LIMINE_PTR(struct limine_x86_64_keep_iommu_response *) response; +}; + +/* TSC (Timestamp Counter) Frequency */ + +#define LIMINE_TSC_FREQUENCY_REQUEST_ID { LIMINE_COMMON_MAGIC, 0x10f2ee1d87d195e4, 0xf747a2b78f6ddb31 } + +struct limine_tsc_frequency_response { + UQUAD revision; + UQUAD frequency; +}; + +struct limine_tsc_frequency_request { + UQUAD id[4]; + UQUAD revision; + LIMINE_PTR(struct limine_tsc_frequency_response *) response; +}; + #ifdef __cplusplus } #endif diff --git a/paw/stos/ke/Makefile b/paw/stos/ke/Makefile index e8151de..debcaa9 100644 --- a/paw/stos/ke/Makefile +++ b/paw/stos/ke/Makefile @@ -12,6 +12,7 @@ include ../../mk/stos.mk CFILES = $(shell find ../init -name "*.c") CFILES += $(shell find ../xt -name "*.c") CFILES += $(shell find ../lib -name "*.c") +CFILES += $(shell find bpal -name "*.c") DFILES = $(CFILES:.c=.d) OFILES = $(CFILES:.c=.o)