* 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 2e98f3961cae9f1f8abed32173b43f0b7173d283..770269c9c1e9db4bf7416cb354d000934f6b5a34 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * 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 ea0edfafe57adbb05295267997ec4b9d1ec1a7af..19985f03e65f11d788441cda7fae15fd9fe6ab7b 100644 (file)
--- 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 01ca4868b2590fecff7ca5cc57d7805c00027be9..9ebe6b4e4b158f280079f9c053fef2f7009671e0 100644 (file)
--- 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