narenas
/
opengnsys_ipxe
mirror of https://github.com/ipxe/ipxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoid namespace clashes

pull/1/head
Michael Brown 2007-01-11 19:42:26 +00:00
parent bcc98c78b8
commit 200d92c76d
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/arch/i386/include/multiboot.h
View File

@ -59,22 +59,22 @@ typedef struct multiboot_header
} multiboot_header_t; } multiboot_header_t;
/* The symbol table for a.out. */ /* The symbol table for a.out. */
typedef struct aout_symbol_table typedef struct multiboot_aout_symbol_table
{ {
unsigned long tabsize; unsigned long tabsize;
unsigned long strsize; unsigned long strsize;
unsigned long addr; unsigned long addr;
unsigned long reserved; unsigned long reserved;
} aout_symbol_table_t; } multiboot_aout_symbol_table_t;
/* The section header table for ELF. */ /* The section header table for ELF. */
typedef struct elf_section_header_table typedef struct multiboot_elf_section_header_table
{ {
unsigned long num; unsigned long num;
unsigned long size; unsigned long size;
unsigned long addr; unsigned long addr;
unsigned long shndx; unsigned long shndx;
} elf_section_header_table_t; } multiboot_elf_section_header_table_t;
/* The Multiboot information. */ /* The Multiboot information. */
typedef struct multiboot_info typedef struct multiboot_info
@ -88,8 +88,8 @@ typedef struct multiboot_info
unsigned long mods_addr; unsigned long mods_addr;
union union
{ {
aout_symbol_table_t aout_sym; multiboot_aout_symbol_table_t aout_sym;
elf_section_header_table_t elf_sec; multiboot_elf_section_header_table_t elf_sec;
} u; } u;
unsigned long mmap_length; unsigned long mmap_length;
unsigned long mmap_addr; unsigned long mmap_addr;
@ -107,17 +107,17 @@ typedef struct multiboot_info
} multiboot_info_t; } multiboot_info_t;
/* The module structure. */ /* The module structure. */
typedef struct module typedef struct multiboot_module
{ {
unsigned long mod_start; unsigned long mod_start;
unsigned long mod_end; unsigned long mod_end;
unsigned long string; unsigned long string;
unsigned long reserved; unsigned long reserved;
} module_t; } multiboot_module_t;
/* The memory map. Be careful that the offset 0 is base_addr_low /* The memory map. Be careful that the offset 0 is base_addr_low
but no size. */ but no size. */
typedef struct memory_map typedef struct multiboot_memory_map
{ {
unsigned long size; unsigned long size;
unsigned long base_addr_low; unsigned long base_addr_low;
@ -125,7 +125,7 @@ typedef struct memory_map
unsigned long length_low; unsigned long length_low;
unsigned long length_high; unsigned long length_high;
unsigned long type; unsigned long type;
} memory_map_t; } multiboot_memory_map_t;
#endif /* ! ASM */ #endif /* ! ASM */