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

* include/grub/i386/openbsd_bootarg.h: Add addr and frequency fields.

Browse source 
* grub-core/loader/i386/bsd.c (grub_cmd_openbsd): Fill addr field.

	Suggested by: Markus Müller.
This commit is contained in:
Vladimir Serbinenko 2014-02-28 10:50:05 +01:00
parent bec35dad2a
commit 86402b4e0f
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2014-02-28 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/i386/openbsd_bootarg.h: Add addr and frequency fields.
* grub-core/loader/i386/bsd.c (grub_cmd_openbsd): Fill addr field.
Suggested by: Markus Müller.
2014-02-28 Vladimir Serbinenko <phcoder@gmail.com> 2014-02-28 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/i386/pc/mmap.c: Fallback to EISA memory map * grub-core/kern/i386/pc/mmap.c: Fallback to EISA memory map

2
grub-core/loader/i386/bsd.c
View file

@ -1646,6 +1646,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
serial.device = (GRUB_OPENBSD_COM_MAJOR << 8) | port; serial.device = (GRUB_OPENBSD_COM_MAJOR << 8) | port;
serial.speed = speed; serial.speed = speed;
serial.addr = grub_ns8250_hw_get_port (port);
grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (serial)); grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (serial));
bootflags |= OPENBSD_RB_SERCONS; bootflags |= OPENBSD_RB_SERCONS;
@ -1656,6 +1657,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
grub_memset (&serial, 0, sizeof (serial)); grub_memset (&serial, 0, sizeof (serial));
serial.device = (GRUB_OPENBSD_VGA_MAJOR << 8); serial.device = (GRUB_OPENBSD_VGA_MAJOR << 8);
serial.addr = 0xffffffff;
grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (serial)); grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (serial));
bootflags &= ~OPENBSD_RB_SERCONS; bootflags &= ~OPENBSD_RB_SERCONS;
} }

2
include/grub/i386/openbsd_bootarg.h
View file

@ -75,6 +75,8 @@ struct grub_openbsd_bootarg_console
{ {
grub_uint32_t device; grub_uint32_t device;
grub_uint32_t speed; grub_uint32_t speed;
grub_uint32_t addr;
grub_uint32_t frequency;
}; };
struct grub_openbsd_bootarg_pcibios struct grub_openbsd_bootarg_pcibios