dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0065-include-grub-i386-openbsd_bootarg.h-Add-addr-and-fre.patch

23d2ea
From 738e0c73073b27de660696d32c2030bc683de2a2 Mon Sep 17 00:00:00 2001
39700a
From: Vladimir Serbinenko <phcoder@gmail.com>
39700a
Date: Fri, 28 Feb 2014 10:50:05 +0100
27a4da
Subject: [PATCH 065/260] * include/grub/i386/openbsd_bootarg.h: Add addr and
23d2ea
 frequency fields. * grub-core/loader/i386/bsd.c (grub_cmd_openbsd): Fill addr
23d2ea
 field.
39700a
MIME-Version: 1.0
39700a
Content-Type: text/plain; charset=UTF-8
39700a
Content-Transfer-Encoding: 8bit
39700a
39700a
	Suggested by: Markus Müller.
39700a
---
39700a
 ChangeLog                           | 7 +++++++
39700a
 grub-core/loader/i386/bsd.c         | 2 ++
39700a
 include/grub/i386/openbsd_bootarg.h | 2 ++
39700a
 3 files changed, 11 insertions(+)
39700a
39700a
diff --git a/ChangeLog b/ChangeLog
27a4da
index 97cf57e25..f571f6653 100644
39700a
--- a/ChangeLog
39700a
+++ b/ChangeLog
39700a
@@ -1,5 +1,12 @@
39700a
 2014-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
39700a
 
39700a
+	* include/grub/i386/openbsd_bootarg.h: Add addr and frequency fields.
39700a
+	* grub-core/loader/i386/bsd.c (grub_cmd_openbsd): Fill addr field.
39700a
+
39700a
+	Suggested by: Markus Müller.
39700a
+
39700a
+2014-02-28  Vladimir Serbinenko  <phcoder@gmail.com>
39700a
+
39700a
 	* grub-core/kern/i386/pc/mmap.c: Fallback to EISA memory map
39700a
 	if E820 failed to return any regions.
39700a
 
39700a
diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
27a4da
index ea0edfafe..19985f03e 100644
39700a
--- a/grub-core/loader/i386/bsd.c
39700a
+++ b/grub-core/loader/i386/bsd.c
39700a
@@ -1646,6 +1646,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
39700a
 
39700a
       serial.device = (GRUB_OPENBSD_COM_MAJOR << 8) | port;
39700a
       serial.speed = speed;
39700a
+      serial.addr = grub_ns8250_hw_get_port (port);
39700a
 	  
39700a
       grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (serial));
39700a
       bootflags |= OPENBSD_RB_SERCONS;
39700a
@@ -1656,6 +1657,7 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
39700a
 
39700a
       grub_memset (&serial, 0, sizeof (serial));
39700a
       serial.device = (GRUB_OPENBSD_VGA_MAJOR << 8);
39700a
+      serial.addr = 0xffffffff;
39700a
       grub_bsd_add_meta (OPENBSD_BOOTARG_CONSOLE, &serial, sizeof (serial));
39700a
       bootflags &= ~OPENBSD_RB_SERCONS;
39700a
     }
39700a
diff --git a/include/grub/i386/openbsd_bootarg.h b/include/grub/i386/openbsd_bootarg.h
27a4da
index 01ca4868b..9ebe6b4e4 100644
39700a
--- a/include/grub/i386/openbsd_bootarg.h
39700a
+++ b/include/grub/i386/openbsd_bootarg.h
39700a
@@ -75,6 +75,8 @@ struct grub_openbsd_bootarg_console
39700a
 {
39700a
   grub_uint32_t device;
39700a
   grub_uint32_t speed;
39700a
+  grub_uint32_t addr;
39700a
+  grub_uint32_t frequency;
39700a
 };
39700a
 
39700a
 struct grub_openbsd_bootarg_pcibios
39700a
-- 
27a4da
2.13.0
39700a