[src/trunk]: src/sys/arch/i386/include Correct discrepancy with the Multiboot...

[khorben <khorben%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8587900160db
branches:  trunk
changeset: 361105:8587900160db
user:      khorben <khorben%NetBSD.org@localhost>
date:      Fri Apr 13 01:49:47 2018 +0000

description:
Correct discrepancy with the Multiboot specification

The VBE mode was missing, and the types of the subsequent VBE members
were also wrong. Nothing in NetBSD's base seems to be using this, and
therefore nothing is expected to break as a result of this fix, or any
binary to change for that matter.
The latest specification (as of today) can be found at:
https://www.gnu.org/software/grub/manual/multiboot/multiboot.html

This was already reported in misc/52366, and addresses part of it.

Patch sent to port-i386@. Build-tested on NetBSD/amd64.

diffstat:

 sys/arch/i386/include/multiboot.h |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (23 lines):

diff -r d3d73e2a0856 -r 8587900160db sys/arch/i386/include/multiboot.h
--- a/sys/arch/i386/include/multiboot.h Fri Apr 13 01:20:27 2018 +0000
+++ b/sys/arch/i386/include/multiboot.h Fri Apr 13 01:49:47 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: multiboot.h,v 1.8 2009/02/22 18:05:42 ahoka Exp $      */
+/*     $NetBSD: multiboot.h,v 1.9 2018/04/13 01:49:47 khorben Exp $    */
 
 /*-
  * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
@@ -134,9 +134,10 @@
        /* Valid if mi_flags sets MULTIBOOT_INFO_HAS_VBE. */
        void *          unused_mi_vbe_control_info;
        void *          unused_mi_vbe_mode_info;
-       paddr_t         unused_mi_vbe_interface_seg;
-       paddr_t         unused_mi_vbe_interface_off;
-       uint32_t        unused_mi_vbe_interface_len;
+       uint16_t        unused_mi_vbe_mode;
+       uint16_t        unused_mi_vbe_interface_seg;
+       uint16_t        unused_mi_vbe_interface_off;
+       uint16_t        unused_mi_vbe_interface_len;
 };
 
 /* --------------------------------------------------------------------- */