1 files changed, 152 insertions, 152 deletions

diff --git a/src/kernel/multiboot.h b/src/kernel/multiboot.h
index b82b457..19ca504 100644
--- a/src/kernel/multiboot.h
+++ b/src/kernel/multiboot.h
@@ -88,183 +88,183 @@
 
 #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;
+typedef unsigned char multiboot_u8;
+typedef unsigned short multiboot_u16;
+typedef unsigned int multiboot_u32;
+typedef unsigned long long multiboot_u64;
 
 struct multiboot_header {
 	/*  Must be MULTIBOOT_MAGIC - see above. */
-	multiboot_uint32_t magic;
+	multiboot_u32 magic;
 
 	/*  ISA */
-	multiboot_uint32_t architecture;
+	multiboot_u32 architecture;
 
 	/*  Total header length. */
-	multiboot_uint32_t header_length;
+	multiboot_u32 header_length;
 
 	/*  The above fields plus this one must equal 0 mod 2^32. */
-	multiboot_uint32_t checksum;
+	multiboot_u32 checksum;
 };
 
 struct multiboot_header_tag {
-	multiboot_uint16_t type;
-	multiboot_uint16_t flags;
-	multiboot_uint32_t size;
+	multiboot_u16 type;
+	multiboot_u16 flags;
+	multiboot_u32 size;
 };
 
 struct multiboot_header_tag_information_request {
-	multiboot_uint16_t type;
-	multiboot_uint16_t flags;
-	multiboot_uint32_t size;
-	multiboot_uint32_t requests[0];
+	multiboot_u16 type;
+	multiboot_u16 flags;
+	multiboot_u32 size;
+	multiboot_u32 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;
+	multiboot_u16 type;
+	multiboot_u16 flags;
+	multiboot_u32 size;
+	multiboot_u32 header_addr;
+	multiboot_u32 load_addr;
+	multiboot_u32 load_end_addr;
+	multiboot_u32 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;
+	multiboot_u16 type;
+	multiboot_u16 flags;
+	multiboot_u32 size;
+	multiboot_u32 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;
+	multiboot_u16 type;
+	multiboot_u16 flags;
+	multiboot_u32 size;
+	multiboot_u32 console_flags;
 };
 
 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;
+	multiboot_u16 type;
+	multiboot_u16 flags;
+	multiboot_u32 size;
+	multiboot_u32 width;
+	multiboot_u32 height;
+	multiboot_u32 depth;
 };
 
 struct multiboot_header_tag_module_align {
-	multiboot_uint16_t type;
-	multiboot_uint16_t flags;
-	multiboot_uint32_t size;
+	multiboot_u16 type;
+	multiboot_u16 flags;
+	multiboot_u32 size;
 };
 
 struct multiboot_header_tag_relocatable {
-	multiboot_uint16_t type;
-	multiboot_uint16_t flags;
-	multiboot_uint32_t size;
-	multiboot_uint32_t min_addr;
-	multiboot_uint32_t max_addr;
-	multiboot_uint32_t align;
-	multiboot_uint32_t preference;
+	multiboot_u16 type;
+	multiboot_u16 flags;
+	multiboot_u32 size;
+	multiboot_u32 min_addr;
+	multiboot_u32 max_addr;
+	multiboot_u32 align;
+	multiboot_u32 preference;
 };
 
 struct multiboot_color {
-	multiboot_uint8_t red;
-	multiboot_uint8_t green;
-	multiboot_uint8_t blue;
+	multiboot_u8 red;
+	multiboot_u8 green;
+	multiboot_u8 blue;
 };
 
 struct multiboot_mmap_entry {
-	multiboot_uint64_t addr;
-	multiboot_uint64_t len;
+	multiboot_u64 addr;
+	multiboot_u64 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;
+	multiboot_u32 type;
+	multiboot_u32 zero;
 };
 typedef struct multiboot_mmap_entry multiboot_memory_map_t;
 
 struct multiboot_tag {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
+	multiboot_u32 type;
+	multiboot_u32 size;
 };
 
 struct multiboot_tag_string {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
+	multiboot_u32 type;
+	multiboot_u32 size;
 	char string[0];
 };
 
 struct multiboot_tag_module {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint32_t mod_start;
-	multiboot_uint32_t mod_end;
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u32 mod_start;
+	multiboot_u32 mod_end;
 	char cmdline[0];
 };
 
 struct multiboot_tag_basic_meminfo {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint32_t mem_lower;
-	multiboot_uint32_t mem_upper;
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u32 mem_lower;
+	multiboot_u32 mem_upper;
 };
 
 struct multiboot_tag_bootdev {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint32_t biosdev;
-	multiboot_uint32_t slice;
-	multiboot_uint32_t part;
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u32 biosdev;
+	multiboot_u32 slice;
+	multiboot_u32 part;
 };
 
 struct multiboot_tag_mmap {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint32_t entry_size;
-	multiboot_uint32_t entry_version;
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u32 entry_size;
+	multiboot_u32 entry_version;
 	struct multiboot_mmap_entry entries[0];
 };
 
 struct multiboot_vbe_info_block {
-	multiboot_uint8_t external_specification[512];
+	multiboot_u8 external_specification[512];
 };
 
 struct multiboot_vbe_mode_info_block {
-	multiboot_uint8_t external_specification[256];
+	multiboot_u8 external_specification[256];
 };
 
 struct multiboot_tag_vbe {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
+	multiboot_u32 type;
+	multiboot_u32 size;
 
-	multiboot_uint16_t vbe_mode;
-	multiboot_uint16_t vbe_interface_seg;
-	multiboot_uint16_t vbe_interface_off;
-	multiboot_uint16_t vbe_interface_len;
+	multiboot_u16 vbe_mode;
+	multiboot_u16 vbe_interface_seg;
+	multiboot_u16 vbe_interface_off;
+	multiboot_u16 vbe_interface_len;
 
 	struct multiboot_vbe_info_block vbe_control_info;
 	struct multiboot_vbe_mode_info_block vbe_mode_info;
 };
 
 struct multiboot_tag_framebuffer_common {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-
-	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;
+	multiboot_u32 type;
+	multiboot_u32 size;
+
+	multiboot_u64 framebuffer_addr;
+	multiboot_u32 framebuffer_pitch;
+	multiboot_u32 framebuffer_width;
+	multiboot_u32 framebuffer_height;
+	multiboot_u8 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;
+	multiboot_u8 framebuffer_type;
+	multiboot_u16 reserved;
 };
 
 struct multiboot_tag_framebuffer {
@@ -272,106 +272,106 @@ struct multiboot_tag_framebuffer {
 
 	union {
 		struct {
-			multiboot_uint16_t framebuffer_palette_num_colors;
+			multiboot_u16 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;
+			multiboot_u8 framebuffer_red_field_position;
+			multiboot_u8 framebuffer_red_mask_size;
+			multiboot_u8 framebuffer_green_field_position;
+			multiboot_u8 framebuffer_green_mask_size;
+			multiboot_u8 framebuffer_blue_field_position;
+			multiboot_u8 framebuffer_blue_mask_size;
 		};
 	};
 };
 
 struct multiboot_tag_elf_sections {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint32_t num;
-	multiboot_uint32_t entsize;
-	multiboot_uint32_t shndx;
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u32 num;
+	multiboot_u32 entsize;
+	multiboot_u32 shndx;
 	char sections[0];
 };
 
 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;
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u16 version;
+	multiboot_u16 cseg;
+	multiboot_u32 offset;
+	multiboot_u16 cseg_16;
+	multiboot_u16 dseg;
+	multiboot_u16 flags;
+	multiboot_u16 cseg_len;
+	multiboot_u16 cseg_16_len;
+	multiboot_u16 dseg_len;
 };
 
-struct multiboot_tag_efi32 {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint32_t pointer;
+struct multiboot_tag_efs32 {
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u32 pointer;
 };
 
 struct multiboot_tag_efi64 {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint64_t pointer;
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u64 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];
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u8 major;
+	multiboot_u8 minor;
+	multiboot_u8 reserved[6];
+	multiboot_u8 tables[0];
 };
 
 struct multiboot_tag_old_acpi {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint8_t rsdp[0];
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u8 rsdp[0];
 };
 
 struct multiboot_tag_new_acpi {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint8_t rsdp[0];
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u8 rsdp[0];
 };
 
 struct multiboot_tag_network {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint8_t dhcpack[0];
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u8 dhcpack[0];
 };
 
 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];
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u32 descr_size;
+	multiboot_u32 descr_vers;
+	multiboot_u8 efi_mmap[0];
 };
 
-struct multiboot_tag_efi32_ih {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint32_t pointer;
+struct multiboot_tag_efs32_ih {
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u32 pointer;
 };
 
 struct multiboot_tag_efi64_ih {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint64_t pointer;
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u64 pointer;
 };
 
 struct multiboot_tag_load_base_addr {
-	multiboot_uint32_t type;
-	multiboot_uint32_t size;
-	multiboot_uint32_t load_base_addr;
+	multiboot_u32 type;
+	multiboot_u32 size;
+	multiboot_u32 load_base_addr;
 };
 
 void multiboot_parse();