core: remove bozo typedef for types

This commit is contained in:
2025-02-07 12:35:32 +01:00
parent 70739744ac
commit 3b798e5daa
55 changed files with 59841 additions and 1789 deletions

View File

@ -93,71 +93,71 @@
#ifndef ASM_FILE
typedef unsigned char multiboot_u8;
typedef unsigned short multiboot_u16;
typedef unsigned int multiboot_u32;
typedef unsigned long long multiboot_u64;
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. */
multiboot_u32 magic;
multiboot_uint32_t magic;
/* Feature flags. */
multiboot_u32 flags;
multiboot_uint32_t flags;
/* The above fields plus this one must equal 0 mod 2^32. */
multiboot_u32 checksum;
multiboot_uint32_t checksum;
/* These are only valid if MULTIBOOT_AOUT_KLUDGE is set. */
multiboot_u32 header_addr;
multiboot_u32 load_addr;
multiboot_u32 load_end_addr;
multiboot_u32 bss_end_addr;
multiboot_u32 entry_addr;
multiboot_uint32_t header_addr;
multiboot_uint32_t load_addr;
multiboot_uint32_t load_end_addr;
multiboot_uint32_t bss_end_addr;
multiboot_uint32_t entry_addr;
/* These are only valid if MULTIBOOT_VIDEO_MODE is set. */
multiboot_u32 mode_type;
multiboot_u32 width;
multiboot_u32 height;
multiboot_u32 depth;
multiboot_uint32_t mode_type;
multiboot_uint32_t width;
multiboot_uint32_t height;
multiboot_uint32_t depth;
};
/* The symbol table for a.out. */
struct multiboot_aout_symbol_table {
multiboot_u32 tabsize;
multiboot_u32 strsize;
multiboot_u32 addr;
multiboot_u32 reserved;
multiboot_uint32_t tabsize;
multiboot_uint32_t strsize;
multiboot_uint32_t addr;
multiboot_uint32_t reserved;
};
typedef struct multiboot_aout_symbol_table multiboot_aout_symbol_table_t;
/* The section header table for ELF. */
struct multiboot_elf_section_header_table {
multiboot_u32 num;
multiboot_u32 size;
multiboot_u32 addr;
multiboot_u32 shndx;
multiboot_uint32_t num;
multiboot_uint32_t size;
multiboot_uint32_t addr;
multiboot_uint32_t shndx;
};
typedef struct multiboot_elf_section_header_table
multiboot_elf_section_header_table_t;
struct multiboot_info {
/* Multiboot info version number */
multiboot_u32 flags;
multiboot_uint32_t flags;
/* Available memory from BIOS */
multiboot_u32 mem_lower;
multiboot_u32 mem_upper;
multiboot_uint32_t mem_lower;
multiboot_uint32_t mem_upper;
/* "root" partition */
multiboot_u32 boot_device;
multiboot_uint32_t boot_device;
/* Kernel command line */
multiboot_u32 cmdline;
multiboot_uint32_t cmdline;
/* Boot-Module list */
multiboot_u32 mods_count;
multiboot_u32 mods_addr;
multiboot_uint32_t mods_count;
multiboot_uint32_t mods_addr;
union {
multiboot_aout_symbol_table_t aout_sym;
@ -165,105 +165,104 @@ struct multiboot_info {
} u;
/* Memory Mapping buffer */
multiboot_u32 mmap_length;
multiboot_u32 mmap_addr;
multiboot_uint32_t mmap_length;
multiboot_uint32_t mmap_addr;
/* Drive Info buffer */
multiboot_u32 drives_length;
multiboot_u32 drives_addr;
multiboot_uint32_t drives_length;
multiboot_uint32_t drives_addr;
/* ROM configuration table */
multiboot_u32 config_table;
multiboot_uint32_t config_table;
/* Boot Loader Name */
multiboot_u32 boot_loader_name;
multiboot_uint32_t boot_loader_name;
/* APM table */
multiboot_u32 apm_table;
multiboot_uint32_t apm_table;
/* Video */
multiboot_u32 vbe_control_info;
multiboot_u32 vbe_mode_info;
multiboot_u16 vbe_mode;
multiboot_u16 vbe_interface_seg;
multiboot_u16 vbe_interface_off;
multiboot_u16 vbe_interface_len;
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;
multiboot_u64 framebuffer_addr;
multiboot_u32 framebuffer_pitch;
multiboot_u32 framebuffer_width;
multiboot_u32 framebuffer_height;
multiboot_u8 framebuffer_bpp;
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_u8 framebuffer_type;
multiboot_uint8_t framebuffer_type;
union {
struct {
multiboot_u32 framebuffer_palette_addr;
multiboot_u16 framebuffer_palette_num_colors;
multiboot_uint32_t framebuffer_palette_addr;
multiboot_uint16_t framebuffer_palette_num_colors;
};
struct {
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;
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;
};
};
};
typedef struct multiboot_info multiboot_info_t;
struct multiboot_color {
multiboot_u8 red;
multiboot_u8 green;
multiboot_u8 blue;
multiboot_uint8_t red;
multiboot_uint8_t green;
multiboot_uint8_t blue;
};
struct multiboot_mmap_entry {
multiboot_u32 size;
multiboot_u64 addr;
multiboot_u64 len;
multiboot_uint32_t size;
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_u32 type;
multiboot_uint32_t type;
} __attribute__((packed));
typedef struct multiboot_mmap_entry multiboot_memory_map_t;
struct multiboot_mod_list {
/* the memory used goes from bytes mod_start to mod_end-1 inclusive
*/
multiboot_u32 mod_start;
multiboot_u32 mod_end;
multiboot_uint32_t mod_start;
multiboot_uint32_t mod_end;
/* Module command line */
multiboot_u32 cmdline;
multiboot_uint32_t cmdline;
/* padding to take it to 16 bytes (must be zero) */
multiboot_u32 pad;
multiboot_uint32_t pad;
};
typedef struct multiboot_mod_list multiboot_module_t;
/* APM BIOS info. */
struct multiboot_apm_info {
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;
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;
};
#endif /* ! ASM_FILE */
#include "types.h"
#include <stdint.h>
void init_multiboot(multiboot_info_t *mbd, u32 magic);
void init_multiboot(multiboot_info_t *mbd, uint32_t magic);