Module Name: src
Committed By: khorben
Date: Fri Apr 13 01:49:47 UTC 2018
Modified Files:
src/sys/arch/i386/include: multiboot.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/include/multiboot.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/include/multiboot.h
diff -u src/sys/arch/i386/include/multiboot.h:1.8 src/sys/arch/i386/include/multiboot.h:1.9
--- src/sys/arch/i386/include/multiboot.h:1.8 Sun Feb 22 18:05:42 2009
+++ src/sys/arch/i386/include/multiboot.h Fri Apr 13 01:49:47 2018
@@ -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 @@ struct multiboot_info {
/* 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;
};
/* --------------------------------------------------------------------- */
