vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/commands/lsacpi.c (disp_acpi_xsdt_table): #if'-out the

Browse source 
checks which are always false on some platforms.
	(grub_cmd_lsacpi): Likewise.
	* grub-core/kern/misc.c (grub_strtoul): Likewise.
	* grub-core/loader/multiboot.c (grub_multiboot_set_video_mode):
	Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-02-09 23:48:34 +01:00
parent def9fc1bb2
commit a4ea2dff4b
4 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2012-02-09 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/commands/lsacpi.c (disp_acpi_xsdt_table): #if'-out the
checks which are always false on some platforms.
(grub_cmd_lsacpi): Likewise.
* grub-core/kern/misc.c (grub_strtoul): Likewise.
* grub-core/loader/multiboot.c (grub_multiboot_set_video_mode):
Likewise.
2012-02-09 Vladimir Serbinenko <phcoder@gmail.com> 2012-02-09 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/diskfilter.c (read_segment): Renome unreachable code. * grub-core/disk/diskfilter.c (read_segment): Renome unreachable code.

10
grub-core/commands/lsacpi.c
View file

@ -132,11 +132,13 @@ disp_acpi_xsdt_table (struct grub_acpi_table_header *t)
desc = (grub_uint64_t *) (t + 1); desc = (grub_uint64_t *) (t + 1);
for (; len > 0; desc++, len -= sizeof (*desc)) for (; len > 0; desc++, len -= sizeof (*desc))
{ {
if (sizeof (grub_addr_t) == 4 && *desc >= (1ULL << 32)) #if GRUB_CPU_SIZEOF_VOID_P == 4
if (*desc >= (1ULL << 32))
{ {
grub_printf ("Unreachable table\n"); grub_printf ("Unreachable table\n");
continue; continue;
} }
#endif
t = (struct grub_acpi_table_header *) (grub_addr_t) *desc; t = (struct grub_acpi_table_header *) (grub_addr_t) *desc;
if (t == NULL) if (t == NULL)
@ -222,9 +224,11 @@ grub_cmd_lsacpi (struct grub_extcmd_context *ctxt,
grub_printf ("No RSDPv2\n"); grub_printf ("No RSDPv2\n");
else else
{ {
if (sizeof (grub_addr_t) == 4 && rsdp2->xsdt_addr >= (1ULL << 32)) #if GRUB_CPU_SIZEOF_VOID_P == 4
grub_printf ("Unreachable RSDPv2\n"); if (rsdp2->xsdt_addr >= (1ULL << 32))
grub_printf ("Unreachable RSDPv2\n");
else else
#endif
{ {
grub_printf ("RSDPv2 signature:"); grub_printf ("RSDPv2 signature:");
disp_acpi_rsdpv2 (rsdp2); disp_acpi_rsdpv2 (rsdp2);

2
grub-core/kern/misc.c
View file

@ -370,11 +370,13 @@ grub_strtoul (const char *str, char **end, int base)
unsigned long long num; unsigned long long num;
num = grub_strtoull (str, end, base); num = grub_strtoull (str, end, base);
#if GRUB_CPU_SIZEOF_LONG != 8
if (num > ~0UL) if (num > ~0UL)
{ {
grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow is detected"); grub_error (GRUB_ERR_OUT_OF_RANGE, "overflow is detected");
return ~0UL; return ~0UL;
} }
#endif
return (unsigned long) num; return (unsigned long) num;
} }

6
grub-core/loader/multiboot.c
View file

@ -90,7 +90,9 @@ grub_multiboot_set_video_mode (void)
grub_err_t err; grub_err_t err;
const char *modevar; const char *modevar;
if (accepts_video || !GRUB_MACHINE_HAS_VGA_TEXT) #if GRUB_MACHINE_HAS_VGA_TEXT
if (accepts_video)
#endif
{ {
modevar = grub_env_get ("gfxpayload"); modevar = grub_env_get ("gfxpayload");
if (! modevar || *modevar == 0) if (! modevar || *modevar == 0)
@ -105,8 +107,10 @@ grub_multiboot_set_video_mode (void)
grub_free (tmp); grub_free (tmp);
} }
} }
#if GRUB_MACHINE_HAS_VGA_TEXT
else else
err = grub_video_set_mode ("text", 0, 0); err = grub_video_set_mode ("text", 0, 0);
#endif
return err; return err;
} }