vgabios: Use vesa style memory model flags in stdvga code.

[seabios.git] / vgasrc / vgaentry.S

diff --git a/vgasrc/vgaentry.S b/vgasrc/vgaentry.S
index 48264cf6ae28f7ff91845c989cfa60b0f1bdebf9..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_*
 
 
@@ -28,7 +29,21 @@ _rom_header_size:
 _rom_header_entry:
         jmp _optionrom_entry
 _rom_header_checksum:
-        .space 22
+        .byte 0
+_rom_header_other:
+        .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"
 
 
 /****************************************************************
@@ -40,4 +55,7 @@ _optionrom_entry:
         ENTRY_ARG vga_post
         lretw
 
-        DECL_IRQ_ENTRY_ARG 10
+        DECLFUNC entry_10
+entry_10:
+        ENTRY_ARG handle_10
+        iretw