Changeset 50160 in vbox

Timestamp:

Jan 22, 2014 3:39:46 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

91723

Message:

BIOS: Rearranged POST to initialize video earlier.

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• Makefile.kmk (modified) (1 diff)
• biosint.h (modified) (1 diff)
• makefile (modified) (1 diff)
• orgs.asm (modified) (8 diffs)
• post.c (added)

trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

@@ -42 +42 @@
           segment BIOSSEG segaddr=0xF000 offset=0xE000
  VBoxPcBios_SOURCES = \
+        post.c \
         bios.c \
         print.c \

trunk/src/VBox/Devices/PC/BIOS/biosint.h

@@ -66 +66 @@
 #define DEBUG_PCI       0
 #define DEBUG_APM       0
+#define DEBUG_POST      0
 
 #define FP_OFF(p)   ((unsigned)(p))

trunk/src/VBox/Devices/PC/BIOS/makefile

@@ -30 +30 @@
         wasm -fo=.obj $(AFLAGS) $(DEFS) $<
 
-OBJS =  bios.obj print.obj ata.obj floppy.obj floppyt.obj eltorito.obj &
+OBJS =  bios.obj post.obj ata.obj floppy.obj floppyt.obj eltorito.obj &
         boot.obj keyboard.obj disk.obj serial.obj system.obj invop.obj &
         timepci.obj logo.obj ps2mouse.obj parallel.obj scsi.obj &
         ahci.obj apm.obj apm_pm.obj pcibios.obj pciutil.obj vds.obj &
-        pcibio32.obj pci32.obj orgs.obj
+        print.obj pcibio32.obj pci32.obj orgs.obj
 
 vbxbios.rom : vbxbios.bin

trunk/src/VBox/Devices/PC/BIOS/orgs.asm

@@ -128 +128 @@
 extrn           _print_bios_banner:near
 extrn           _inv_op_handler:near
+extrn           rom_scan_:near
 
 
@@ -169 +170 @@
 public          int15_handler_mouse
 public          iret_modify_cf
-public          rom_scan
-public          rom_checksum
 public          init_pic
 public          floppy_post
@@ -393 +392 @@
                 call    ebda_post
 
+                ;; Initialize PCI devices. This can and should be done early.
+                call    pcibios_init_iomem_bases
+                call    pcibios_init_irqs
+
                 ;; PIT setup
                 SET_INT_VECTOR 08h, BIOSSEG, int08_handler
@@ -400 +403 @@
                 out     40h, al
                 out     40h, al
+
+                ;; video setup - must be done before POSTing VGA ROM
+                SET_INT_VECTOR 10h, BIOSSEG, int10_handler
 
                 ;; keyboard setup
@@ -425 +431 @@
                 push    ds
                 C_SETUP
+
+                ;; Scan for video ROMs in the C000-C800 range. This is done
+                ;; early so that errors are displayed on the screen.
+                mov     ax, 0C000h
+                mov     dx, 0C800h
+                call    rom_scan_
+
+                ;; Initialize the keyboard
                 call    _keyboard_init
                 pop     ds
@@ -484 +498 @@
                 SET_INT_VECTOR 75h, BIOSSEG, int75_handler
 
-                ;; Video setup
-                SET_INT_VECTOR 10h, BIOSSEG, int10_handler
-
                 call    init_pic
-
-                call    pcibios_init_iomem_bases
-                call    pcibios_init_irqs
-
-                call    rom_scan
 
                 jmp     norm_post_cont
@@ -562 +568 @@
                 C_SETUP                 ; in case assembly code changed things
                 call    _print_bios_banner
+
+                ;; Scan for additional ROMs in the C800-EFFF range
+                mov     ax, 0C800h
+                mov     dx, 0F000h
+                call    rom_scan_
 
                 ;; El Torito floppy/hard disk emulation
@@ -732 +743 @@
 
 
-rom_checksum    proc    near
-                push    ax
-ifdef CHECKSUM_ROMS
-                push    bx
-                push    cx
-                xor     ax, ax
-                xor     bx, bx
-                xor     cx, cx
-                mov     ch, ds:[2]
-                shl     cx, 1
-checksum_loop:
-                add     al, [bx]
-                inc     bx
-                loop    checksum_loop
-                and     al, 0FFh        ; set flags
-                pop     cx
-                pop     bx
-else
-                xor     al, al
-endif
-                pop     ax
-                ret
-rom_checksum    endp
-
-
-;;
-;; ROM scan - scan for valid ROMs and initialize them
-;;
-rom_scan:
-                mov     cx, 0C000h      ; start at C000
-rom_scan_loop:
-                mov     ds, cx
-                mov     ax, 4           ; scan in 2K increments
-                cmp     word ptr ds:[0], 0AA55h ; look for signature
-                jne     rom_scan_increment
-
-                call    rom_checksum
-                jnz     rom_scan_increment
-
-                mov     al, ds:[2]      ; set increment to ROM length
-                test    al, 3
-                jz      block_count_rounded
-
-                and     al, 0FCh        ; round up
-                add     al, 4           ; to nearest 2K
-block_count_rounded:
-                xor     bx, bx
-                mov     ds, bx
-                push    ax
-                push    cx              ; push segment...
-                push    3               ; ...and offset of ROM entry
-                mov     bp, sp
-                call    dword ptr [bp]  ; call ROM init routine
-                cli                     ; in case ROM enabled interrupts
-                add     sp, 2           ; get rid of offset
-                pop     cx              ; restore registers
-                pop     ax
-rom_scan_increment:
-                shl     ax, 5           ; convert to 16-byte increments
-                add     cx, ax
-                cmp     cx, 0E800h      ; must encompass VBOX_LANBOOT_SEG!
-                jbe     rom_scan_loop
-
-                xor     ax, ax          ; DS back to zero
-                mov     ds, ax
-                ret
-
 init_pic        proc    near