diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2007-10-21 20:56:19 -0400 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2007-10-23 01:49:47 -0400 |
commit | ee8e7cfe9d330d6f1ce0b9b1620d6df5d9cf6b70 (patch) | |
tree | a9534bac7060e546c0c3e6ea34d0469d8903bf0e /include/asm-x86/bootparam.h | |
parent | 9525ca0286afd54a5cd69d9ded741b4df8d0c554 (diff) |
Make asm-x86/bootparam.h includable from userspace.
To actually write a bootloader (or, say, the lguest launcher)
currently requires duplication of these structures. Making them
includable from userspace is much nicer.
We merge the common userspace-required definitions of e820_32/64.h
into e820.h for export.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'include/asm-x86/bootparam.h')
-rw-r--r-- | include/asm-x86/bootparam.h | 108 |
1 files changed, 54 insertions, 54 deletions
diff --git a/include/asm-x86/bootparam.h b/include/asm-x86/bootparam.h index dc031cf44633..19f3ddf2df4b 100644 --- a/include/asm-x86/bootparam.h +++ b/include/asm-x86/bootparam.h | |||
@@ -10,85 +10,85 @@ | |||
10 | #include <video/edid.h> | 10 | #include <video/edid.h> |
11 | 11 | ||
12 | struct setup_header { | 12 | struct setup_header { |
13 | u8 setup_sects; | 13 | __u8 setup_sects; |
14 | u16 root_flags; | 14 | __u16 root_flags; |
15 | u32 syssize; | 15 | __u32 syssize; |
16 | u16 ram_size; | 16 | __u16 ram_size; |
17 | #define RAMDISK_IMAGE_START_MASK 0x07FF | 17 | #define RAMDISK_IMAGE_START_MASK 0x07FF |
18 | #define RAMDISK_PROMPT_FLAG 0x8000 | 18 | #define RAMDISK_PROMPT_FLAG 0x8000 |
19 | #define RAMDISK_LOAD_FLAG 0x4000 | 19 | #define RAMDISK_LOAD_FLAG 0x4000 |
20 | u16 vid_mode; | 20 | __u16 vid_mode; |
21 | u16 root_dev; | 21 | __u16 root_dev; |
22 | u16 boot_flag; | 22 | __u16 boot_flag; |
23 | u16 jump; | 23 | __u16 jump; |
24 | u32 header; | 24 | __u32 header; |
25 | u16 version; | 25 | __u16 version; |
26 | u32 realmode_swtch; | 26 | __u32 realmode_swtch; |
27 | u16 start_sys; | 27 | __u16 start_sys; |
28 | u16 kernel_version; | 28 | __u16 kernel_version; |
29 | u8 type_of_loader; | 29 | __u8 type_of_loader; |
30 | u8 loadflags; | 30 | __u8 loadflags; |
31 | #define LOADED_HIGH (1<<0) | 31 | #define LOADED_HIGH (1<<0) |
32 | #define KEEP_SEGMENTS (1<<6) | 32 | #define KEEP_SEGMENTS (1<<6) |
33 | #define CAN_USE_HEAP (1<<7) | 33 | #define CAN_USE_HEAP (1<<7) |
34 | u16 setup_move_size; | 34 | __u16 setup_move_size; |
35 | u32 code32_start; | 35 | __u32 code32_start; |
36 | u32 ramdisk_image; | 36 | __u32 ramdisk_image; |
37 | u32 ramdisk_size; | 37 | __u32 ramdisk_size; |
38 | u32 bootsect_kludge; | 38 | __u32 bootsect_kludge; |
39 | u16 heap_end_ptr; | 39 | __u16 heap_end_ptr; |
40 | u16 _pad1; | 40 | __u16 _pad1; |
41 | u32 cmd_line_ptr; | 41 | __u32 cmd_line_ptr; |
42 | u32 initrd_addr_max; | 42 | __u32 initrd_addr_max; |
43 | u32 kernel_alignment; | 43 | __u32 kernel_alignment; |
44 | u8 relocatable_kernel; | 44 | __u8 relocatable_kernel; |
45 | u8 _pad2[3]; | 45 | __u8 _pad2[3]; |
46 | u32 cmdline_size; | 46 | __u32 cmdline_size; |
47 | u32 hardware_subarch; | 47 | __u32 hardware_subarch; |
48 | u64 hardware_subarch_data; | 48 | __u64 hardware_subarch_data; |
49 | } __attribute__((packed)); | 49 | } __attribute__((packed)); |
50 | 50 | ||
51 | struct sys_desc_table { | 51 | struct sys_desc_table { |
52 | u16 length; | 52 | __u16 length; |
53 | u8 table[14]; | 53 | __u8 table[14]; |
54 | }; | 54 | }; |
55 | 55 | ||
56 | struct efi_info { | 56 | struct efi_info { |
57 | u32 _pad1; | 57 | __u32 _pad1; |
58 | u32 efi_systab; | 58 | __u32 efi_systab; |
59 | u32 efi_memdesc_size; | 59 | __u32 efi_memdesc_size; |
60 | u32 efi_memdesc_version; | 60 | __u32 efi_memdesc_version; |
61 | u32 efi_memmap; | 61 | __u32 efi_memmap; |
62 | u32 efi_memmap_size; | 62 | __u32 efi_memmap_size; |
63 | u32 _pad2[2]; | 63 | __u32 _pad2[2]; |
64 | }; | 64 | }; |
65 | 65 | ||
66 | /* The so-called "zeropage" */ | 66 | /* The so-called "zeropage" */ |
67 | struct boot_params { | 67 | struct boot_params { |
68 | struct screen_info screen_info; /* 0x000 */ | 68 | struct screen_info screen_info; /* 0x000 */ |
69 | struct apm_bios_info apm_bios_info; /* 0x040 */ | 69 | struct apm_bios_info apm_bios_info; /* 0x040 */ |
70 | u8 _pad2[12]; /* 0x054 */ | 70 | __u8 _pad2[12]; /* 0x054 */ |
71 | struct ist_info ist_info; /* 0x060 */ | 71 | struct ist_info ist_info; /* 0x060 */ |
72 | u8 _pad3[16]; /* 0x070 */ | 72 | __u8 _pad3[16]; /* 0x070 */ |
73 | u8 hd0_info[16]; /* obsolete! */ /* 0x080 */ | 73 | __u8 hd0_info[16]; /* obsolete! */ /* 0x080 */ |
74 | u8 hd1_info[16]; /* obsolete! */ /* 0x090 */ | 74 | __u8 hd1_info[16]; /* obsolete! */ /* 0x090 */ |
75 | struct sys_desc_table sys_desc_table; /* 0x0a0 */ | 75 | struct sys_desc_table sys_desc_table; /* 0x0a0 */ |
76 | u8 _pad4[144]; /* 0x0b0 */ | 76 | __u8 _pad4[144]; /* 0x0b0 */ |
77 | struct edid_info edid_info; /* 0x140 */ | 77 | struct edid_info edid_info; /* 0x140 */ |
78 | struct efi_info efi_info; /* 0x1c0 */ | 78 | struct efi_info efi_info; /* 0x1c0 */ |
79 | u32 alt_mem_k; /* 0x1e0 */ | 79 | __u32 alt_mem_k; /* 0x1e0 */ |
80 | u32 scratch; /* Scratch field! */ /* 0x1e4 */ | 80 | __u32 scratch; /* Scratch field! */ /* 0x1e4 */ |
81 | u8 e820_entries; /* 0x1e8 */ | 81 | __u8 e820_entries; /* 0x1e8 */ |
82 | u8 eddbuf_entries; /* 0x1e9 */ | 82 | __u8 eddbuf_entries; /* 0x1e9 */ |
83 | u8 edd_mbr_sig_buf_entries; /* 0x1ea */ | 83 | __u8 edd_mbr_sig_buf_entries; /* 0x1ea */ |
84 | u8 _pad6[6]; /* 0x1eb */ | 84 | __u8 _pad6[6]; /* 0x1eb */ |
85 | struct setup_header hdr; /* setup header */ /* 0x1f1 */ | 85 | struct setup_header hdr; /* setup header */ /* 0x1f1 */ |
86 | u8 _pad7[0x290-0x1f1-sizeof(struct setup_header)]; | 86 | __u8 _pad7[0x290-0x1f1-sizeof(struct setup_header)]; |
87 | u32 edd_mbr_sig_buffer[EDD_MBR_SIG_MAX]; /* 0x290 */ | 87 | __u32 edd_mbr_sig_buffer[EDD_MBR_SIG_MAX]; /* 0x290 */ |
88 | struct e820entry e820_map[E820MAX]; /* 0x2d0 */ | 88 | struct e820entry e820_map[E820MAX]; /* 0x2d0 */ |
89 | u8 _pad8[48]; /* 0xcd0 */ | 89 | __u8 _pad8[48]; /* 0xcd0 */ |
90 | struct edd_info eddbuf[EDDMAXNR]; /* 0xd00 */ | 90 | struct edd_info eddbuf[EDDMAXNR]; /* 0xd00 */ |
91 | u8 _pad9[276]; /* 0xeec */ | 91 | __u8 _pad9[276]; /* 0xeec */ |
92 | } __attribute__((packed)); | 92 | } __attribute__((packed)); |
93 | 93 | ||
94 | #endif /* _ASM_BOOTPARAM_H */ | 94 | #endif /* _ASM_BOOTPARAM_H */ |