--- qemu/roms/seabios/vgasrc/vgaentry.S	2018/04/24 17:51:42	1.1.1.2
+++ qemu/roms/seabios/vgasrc/vgaentry.S	2018/04/24 19:43:20	1.1.1.4
@@ -1,17 +1,11 @@
 // Rom layout and bios assembler to C interface.
 //
-// Copyright (C) 2009  Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2009-2012  Kevin O'Connor <kevin@koconnor.net>
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
 
-/****************************************************************
- * Include of 16bit C code
- ****************************************************************/
-
-        .code16gcc
-.include "out/vgaccode.16.s"
-
+#include "config.h" // CONFIG_*
 #include "entryfuncs.S" // ENTRY_*
 
 
@@ -20,6 +14,7 @@
  ****************************************************************/
 
         .section .rom.header
+        .code16gcc
         .global _rom_header, _rom_header_size, _rom_header_checksum
 _rom_header:
         .word 0xaa55
@@ -30,13 +25,30 @@ _rom_header_entry:
 _rom_header_checksum:
         .byte 0
 _rom_header_other:
-        .space 21
+        .space 17
+_rom_header_pcidata:
+#if CONFIG_VGA_PCI == 1
+        .word rom_pci_data
+#else
+        .word 0
+#endif
+_rom_header_pnpdata:
+        .word 0
+_rom_header_other2:
+        .word 0
+_rom_header_signature:
+        .asciz "IBM"
 
 
 /****************************************************************
  * Entry points
  ****************************************************************/
 
+        DECLFUNC entry_104f05
+entry_104f05:
+        ENTRY_ARG vbe_104f05
+        lretw
+
         DECLFUNC _optionrom_entry
 _optionrom_entry:
         ENTRY_ARG vga_post