Merge branch 'master' into develop

This commit is contained in:
Enrico Fraccaroli (Galfurian)
2022-03-03 10:18:25 -05:00
2 changed files with 3 additions and 3 deletions
+2 -2
View File
@@ -67,7 +67,7 @@
///
/// You can have both 16 bit and 32 bit selectors at once.
///
typedef enum gdt_bits_t {
enum gdt_bits_t {
/// @brief `0b10000000U` (Present): This must be 1 for all valid selectors.
GDT_PRESENT = 128U,
/// @brief `0b00000000U` (Privilege): Sets the 2 privilege bits (ring level) to 0 = highest (kernel).
@@ -92,7 +92,7 @@ typedef enum gdt_bits_t {
GDT_GRANULARITY = 128U,
/// @brief `0b01000000U` (Size): If 0 the selector defines 16 bit protected mode. If 1 it defines 32 bit protected mode. You can have both 16 bit and 32 bit selectors at once.
GDT_OPERAND_SIZE = 64U,
} gdt_bits_t;
};
/// @brief Used in IDT for padding.
#define IDT_PADDING 14U // `0b00001110U
+1 -1
View File
@@ -23,7 +23,7 @@ MULTIBOOT_VIDEO_MODE equ 0x00000004
; This is the flag combination that we prepare for Grub
; to read at kernel load time.
MULTIBOOT_HEADER_FLAGS equ (MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_VIDEO_MODE)
MULTIBOOT_HEADER_FLAGS equ (MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO)
; Grub reads this value to make sure it loads a kernel
; and not just garbage.
MULTIBOOT_CHECKSUM equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)