2006-06-07 Jeroen Dekkers <jeroen@dekkers.cx>
* include/grub/types.h (grub_host_addr_t): Rename to grub_target_addr_t. (grub_host_off_t): Rename to grub_target_off_t. (grub_host_size_t): Rename to grub_target_size_t. (grub_host_ssize_t): Rename to grub_target_ssize_t. Refer to GRUB_TARGET_SIZEOF_VOID_P to define those variables. * include/grub/kernel.h (struct grub_module_header): Change type of OFFSET to grub_target_off_t and type of SIZE to grub_target_size_t. (grub_module_info): Likewise.
This commit is contained in:
parent
051988bb87
commit
b786f3b5c3
3 changed files with 26 additions and 13 deletions
13
ChangeLog
13
ChangeLog
|
@ -1,3 +1,16 @@
|
||||||
|
2006-06-07 Jeroen Dekkers <jeroen@dekkers.cx>
|
||||||
|
|
||||||
|
* include/grub/types.h (grub_host_addr_t): Rename to
|
||||||
|
grub_target_addr_t.
|
||||||
|
(grub_host_off_t): Rename to grub_target_off_t.
|
||||||
|
(grub_host_size_t): Rename to grub_target_size_t.
|
||||||
|
(grub_host_ssize_t): Rename to grub_target_ssize_t.
|
||||||
|
Refer to GRUB_TARGET_SIZEOF_VOID_P to define those variables.
|
||||||
|
|
||||||
|
* include/grub/kernel.h (struct grub_module_header): Change type
|
||||||
|
of OFFSET to grub_target_off_t and type of SIZE to grub_target_size_t.
|
||||||
|
(grub_module_info): Likewise.
|
||||||
|
|
||||||
2006-06-05 Yoshinori K. Okuji <okuji@enbug.org>
|
2006-06-05 Yoshinori K. Okuji <okuji@enbug.org>
|
||||||
|
|
||||||
* loader/i386/pc/linux.c (grub_rescue_cmd_initrd): The conditional
|
* loader/i386/pc/linux.c (grub_rescue_cmd_initrd): The conditional
|
||||||
|
|
|
@ -26,9 +26,9 @@
|
||||||
struct grub_module_header
|
struct grub_module_header
|
||||||
{
|
{
|
||||||
/* The offset of object code. */
|
/* The offset of object code. */
|
||||||
grub_host_off_t offset;
|
grub_target_off_t offset;
|
||||||
/* The size of object code plus this header. */
|
/* The size of object code plus this header. */
|
||||||
grub_host_size_t size;
|
grub_target_size_t size;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* "gmim" (GRUB Module Info Magic). */
|
/* "gmim" (GRUB Module Info Magic). */
|
||||||
|
@ -39,9 +39,9 @@ struct grub_module_info
|
||||||
/* Magic number so we know we have modules present. */
|
/* Magic number so we know we have modules present. */
|
||||||
grub_uint32_t magic;
|
grub_uint32_t magic;
|
||||||
/* The offset of the modules. */
|
/* The offset of the modules. */
|
||||||
grub_host_off_t offset;
|
grub_target_off_t offset;
|
||||||
/* The size of all modules plus this header. */
|
/* The size of all modules plus this header. */
|
||||||
grub_host_size_t size;
|
grub_target_size_t size;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern grub_addr_t grub_arch_modules_addr (void);
|
extern grub_addr_t grub_arch_modules_addr (void);
|
||||||
|
|
|
@ -69,16 +69,16 @@ typedef unsigned long long grub_uint64_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Misc types. */
|
/* Misc types. */
|
||||||
#if SIZEOF_VOID_P == 8
|
#if GRUB_TARGET_SIZEOF_VOID_P == 8
|
||||||
typedef grub_uint64_t grub_host_addr_t;
|
typedef grub_uint64_t grub_target_addr_t;
|
||||||
typedef grub_uint64_t grub_host_off_t;
|
typedef grub_uint64_t grub_target_off_t;
|
||||||
typedef grub_uint64_t grub_host_size_t;
|
typedef grub_uint64_t grub_target_size_t;
|
||||||
typedef grub_int64_t grub_host_ssize_t;
|
typedef grub_int64_t grub_target_ssize_t;
|
||||||
#else
|
#else
|
||||||
typedef grub_uint32_t grub_host_addr_t;
|
typedef grub_uint32_t grub_target_addr_t;
|
||||||
typedef grub_uint32_t grub_host_off_t;
|
typedef grub_uint32_t grub_target_off_t;
|
||||||
typedef grub_uint32_t grub_host_size_t;
|
typedef grub_uint32_t grub_target_size_t;
|
||||||
typedef grub_int32_t grub_host_ssize_t;
|
typedef grub_int32_t grub_target_ssize_t;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if GRUB_CPU_SIZEOF_VOID_P == 8
|
#if GRUB_CPU_SIZEOF_VOID_P == 8
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue