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

Fix compilation errors.

Browse source 
* grub-core/term/ns8250.c (serial_get_divisor): Declare 'port' as
	potentially unused.
	* grub-core/loader/i386/linux.c (grub_linux_setup_video):
	Handle GRUB_VIDEO_DRIVER_SIS315PRO.
	* grub-core/bus/cs5536.c (grub_cs5536_init_geode): Restrict DIVIL init
	to loongson machines.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-05-15 12:32:37 +02:00
parent b756f75f07
commit 67b1e5c907
4 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2011-05-15 Vladimir Serbinenko <phcoder@gmail.com>
Fix compilation errors.
* grub-core/term/ns8250.c (serial_get_divisor): Declare 'port' as
potentially unused.
* grub-core/loader/i386/linux.c (grub_linux_setup_video):
Handle GRUB_VIDEO_DRIVER_SIS315PRO.
* grub-core/bus/cs5536.c (grub_cs5536_init_geode): Restrict DIVIL init
to loongson machines.
2011-05-15 Vladimir Serbinenko <phcoder@gmail.com> 2011-05-15 Vladimir Serbinenko <phcoder@gmail.com>
Several FS mtime support. Several FS mtime support.

2
grub-core/bus/cs5536.c
View file

@ -269,6 +269,7 @@ grub_cs5536_init_geode (grub_pci_device_t dev)
GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_PM); GRUB_CS5536_LBAR_TURN_ON | GRUB_CS5536_LBAR_PM);
/* Setup DIVIL. */ /* Setup DIVIL. */
#ifdef GRUB_MACHINE_MIPS_LOONGSON
switch (grub_arch_machine) switch (grub_arch_machine)
{ {
case GRUB_ARCH_MACHINE_YEELOONG: case GRUB_ARCH_MACHINE_YEELOONG:
@ -288,6 +289,7 @@ grub_cs5536_init_geode (grub_pci_device_t dev)
| GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1); | GRUB_CS5536_MSR_DIVIL_LEG_IO_RTC_ENABLE1);
break; break;
} }
#endif
grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_PRIMARY_MASK, grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_PRIMARY_MASK,
(~GRUB_CS5536_DIVIL_LPC_INTERRUPTS) & 0xffff); (~GRUB_CS5536_DIVIL_LPC_INTERRUPTS) & 0xffff);
grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK, grub_cs5536_write_msr (dev, GRUB_CS5536_MSR_DIVIL_IRQ_MAPPER_LPC_MASK,

1
grub-core/loader/i386/linux.c
View file

@ -367,6 +367,7 @@ grub_linux_setup_video (struct linux_kernel_params *params)
/* FIXME: check if better id is available. */ /* FIXME: check if better id is available. */
case GRUB_VIDEO_DRIVER_SM712: case GRUB_VIDEO_DRIVER_SM712:
case GRUB_VIDEO_DRIVER_SIS315PRO:
case GRUB_VIDEO_DRIVER_VGA: case GRUB_VIDEO_DRIVER_VGA:
case GRUB_VIDEO_DRIVER_CIRRUS: case GRUB_VIDEO_DRIVER_CIRRUS:
case GRUB_VIDEO_DRIVER_BOCHS: case GRUB_VIDEO_DRIVER_BOCHS:

2
grub-core/term/ns8250.c
View file

@ -37,7 +37,7 @@ static const grub_port_t serial_hw_io_addr[] = GRUB_MACHINE_SERIAL_PORTS;
/* Convert speed to divisor. */ /* Convert speed to divisor. */
static unsigned short static unsigned short
serial_get_divisor (const struct grub_serial_port *port, serial_get_divisor (const struct grub_serial_port *port __attribute__ ((unused)),
const struct grub_serial_config *config) const struct grub_serial_config *config)
{ {
unsigned int i; unsigned int i;