From: Vladimir Serbinenko Date: Fri, 28 Feb 2014 09:50:05 +0000 (+0100) Subject: * include/grub/i386/openbsd_bootarg.h: Add addr and frequency fields. X-Git-Tag: 2.02-beta3~658 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=86402b4e0fec7d0e5637f70a3103a4d9c3f62839;p=thirdparty%2Fgrub.git * 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. --- diff --git a/ChangeLog b/ChangeLog index 2e98f3961..770269c9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-02-28 Vladimir Serbinenko + + * 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 * grub-core/kern/i386/pc/mmap.c: Fallback to EISA memory map diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c index ea0edfafe..19985f03e 100644 --- a/grub-core/loader/i386/bsd.c +++ b/grub-core/loader/i386/bsd.c @@ -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.speed = speed; + serial.addr = grub_ns8250_hw_get_port (port); grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (serial)); 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)); serial.device = (GRUB_OPENBSD_VGA_MAJOR << 8); + serial.addr = 0xffffffff; grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (serial)); bootflags &= ~OPENBSD_RB_SERCONS; } diff --git a/include/grub/i386/openbsd_bootarg.h b/include/grub/i386/openbsd_bootarg.h index 01ca4868b..9ebe6b4e4 100644 --- a/include/grub/i386/openbsd_bootarg.h +++ b/include/grub/i386/openbsd_bootarg.h @@ -75,6 +75,8 @@ struct grub_openbsd_bootarg_console { grub_uint32_t device; grub_uint32_t speed; + grub_uint32_t addr; + grub_uint32_t frequency; }; struct grub_openbsd_bootarg_pcibios