Commit 7d36709d authored by Leif Lindholm's avatar Leif Lindholm Committed by Daniel Kiper

i386: make struct linux_kernel_header architecture specific

struct linux_kernel_header -> struct linux_i386_kernel_header
Signed-off-by: default avatarLeif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: default avatarDaniel Kiper <daniel.kiper@oracle.com>
parent 3245f02d
...@@ -497,7 +497,7 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args) ...@@ -497,7 +497,7 @@ grub_cmd_file (grub_extcmd_context_t ctxt, int argc, char **args)
case IS_X86_LINUX32: case IS_X86_LINUX32:
case IS_X86_LINUX: case IS_X86_LINUX:
{ {
struct linux_kernel_header lh; struct linux_i386_kernel_header lh;
if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh)) if (grub_file_read (file, &lh, sizeof (lh)) != sizeof (lh))
break; break;
if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55)) if (lh.boot_flag != grub_cpu_to_le16_compile_time (0xaa55))
......
...@@ -678,7 +678,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), ...@@ -678,7 +678,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
int argc, char *argv[]) int argc, char *argv[])
{ {
grub_file_t file = 0; grub_file_t file = 0;
struct linux_kernel_header lh; struct linux_i386_kernel_header lh;
grub_uint8_t setup_sects; grub_uint8_t setup_sects;
grub_size_t real_size, prot_size, prot_file_size; grub_size_t real_size, prot_size, prot_file_size;
grub_ssize_t len; grub_ssize_t len;
......
...@@ -121,7 +121,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)), ...@@ -121,7 +121,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
int argc, char *argv[]) int argc, char *argv[])
{ {
grub_file_t file = 0; grub_file_t file = 0;
struct linux_kernel_header lh; struct linux_i386_kernel_header lh;
grub_uint8_t setup_sects; grub_uint8_t setup_sects;
grub_size_t real_size; grub_size_t real_size;
grub_ssize_t len; grub_ssize_t len;
...@@ -387,7 +387,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), ...@@ -387,7 +387,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
{ {
grub_size_t size = 0; grub_size_t size = 0;
grub_addr_t addr_max, addr_min; grub_addr_t addr_max, addr_min;
struct linux_kernel_header *lh; struct linux_i386_kernel_header *lh;
grub_uint8_t *initrd_chunk; grub_uint8_t *initrd_chunk;
grub_addr_t initrd_addr; grub_addr_t initrd_addr;
grub_err_t err; grub_err_t err;
...@@ -405,7 +405,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)), ...@@ -405,7 +405,7 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
goto fail; goto fail;
} }
lh = (struct linux_kernel_header *) grub_linux_real_chunk; lh = (struct linux_i386_kernel_header *) grub_linux_real_chunk;
if (!(lh->header == grub_cpu_to_le32_compile_time (GRUB_LINUX_I386_MAGIC_SIGNATURE) if (!(lh->header == grub_cpu_to_le32_compile_time (GRUB_LINUX_I386_MAGIC_SIGNATURE)
&& grub_le_to_cpu16 (lh->version) >= 0x0200)) && grub_le_to_cpu16 (lh->version) >= 0x0200))
......
...@@ -26,7 +26,7 @@ grub_elf_t ...@@ -26,7 +26,7 @@ grub_elf_t
grub_xen_file (grub_file_t file) grub_xen_file (grub_file_t file)
{ {
grub_elf_t elf; grub_elf_t elf;
struct linux_kernel_header lh; struct linux_i386_kernel_header lh;
grub_file_t off_file; grub_file_t off_file;
grub_uint32_t payload_offset, payload_length; grub_uint32_t payload_offset, payload_length;
grub_uint8_t magic[6]; grub_uint8_t magic[6];
......
...@@ -85,7 +85,7 @@ enum ...@@ -85,7 +85,7 @@ enum
}; };
/* For the Linux/i386 boot protocol version 2.10. */ /* For the Linux/i386 boot protocol version 2.10. */
struct linux_kernel_header struct linux_i386_kernel_header
{ {
grub_uint8_t code1[0x0020]; grub_uint8_t code1[0x0020];
grub_uint16_t cl_magic; /* Magic number 0xA33F */ grub_uint16_t cl_magic; /* Magic number 0xA33F */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment