vgabios: Check that the PCI BDF passed in is valid before using.

[seabios.git] / vgasrc / vgaentry.S

diff --git a/vgasrc/vgaentry.S b/vgasrc/vgaentry.S
index b99cf6f3566b24c0da91c1fb04ff511e2f1c58fe..112857b0c91c7318903176ec9493617c17d5a9c0 100644 (file)
--- a/vgasrc/vgaentry.S
+++ b/vgasrc/vgaentry.S
@@ -10,8 +10,9 @@
  ****************************************************************/
 
         .code16gcc
-.include "out/vgaccode.16.s"
+#include "vgaccode.16.s"
 
+#include "config.h" // CONFIG_*
 #include "entryfuncs.S" // ENTRY_*
 
 
@@ -30,7 +31,19 @@ _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"
 
 
 /****************************************************************