Changeset 95 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Handlers

Timestamp:

Jan 28, 2011, 11:55:34 AM (14 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Changes to XTIDE Universal BIOS:

• Smaller boot sector loading string.
• Cleaned boot code a bit.

Location:

trunk/XTIDE_Universal_BIOS/Src/Handlers

Files:

• Int19h.asm (modified) (6 diffs)
• Int19hMenu.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int19h.asm

@@ -25 +25 @@
 Int19h_TryToLoadBootSectorFromDL:
     call    BootPrint_TryToBootFromDL
-    call    Int19h_LoadFirstSectorFromDL
+    call    LoadFirstSectorFromDriveDL
     jc      SHORT .FailedToLoadFirstSector
 
@@ -33 +33 @@
     jne     SHORT .FirstHardDiskSectorNotBootable
 .AlwaysBootFromFloppyDriveForBooterGames:
-    call    BootPrint_BootSectorLoaded
+    mov     bx, g_szFound
+    call    BootPrint_BootSectorResultStringFromBX
     stc
     ret
@@ -41 +42 @@
     ret
 .FirstHardDiskSectorNotBootable:
-    call    BootPrint_FirstSectorNotBootable
+    mov     bx, g_szNotFound
+    call    BootPrint_BootSectorResultStringFromBX
     clc
     ret
 
 ;--------------------------------------------------------------------
-; Reads first sector (boot sector) from drive DL.
-;
-; Int19h_LoadFirstSectorFromDL
+; LoadFirstSectorFromDriveDL
 ;   Parameters:
 ;       DL:     Drive to boot from (translated, 00h or 80h)
@@ -60 +60 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-Int19h_LoadFirstSectorFromDL:
+LoadFirstSectorFromDriveDL:
     LOAD_BDA_SEGMENT_TO es, bx              ; ES:BX now points to...
     mov     bx, BOOTVARS.rgbBootSect        ; ...boot sector location
-    mov     di, B_READ_RETRY_TIMES          ; Retry counter
+    mov     di, B_READ_RETRY_TIMES          ; Initialize retry counter
 ALIGN JUMP_ALIGN
 .ReadRetryLoop:
@@ -90 +90 @@
     xor     ax, ax                          ; AH=0h, Disk Controller Reset
     test    dl, 80h                         ; Floppy drive?
-    jz      SHORT .ResetDriveFromDL         ;  If so, jump to reset
-    mov     ah, 0Dh                         ; AH=Dh, Reset Hard Disk (Alternate reset)
-.ResetDriveFromDL:
+    eCMOVNZ ah, 0Dh                         ; AH=Dh, Reset Hard Disk (Alternate reset)
     int     INTV_DISK_FUNC
     ret
@@ -155 +153 @@
     mov     es, ax
     ret
-
-
-;--------------------------------------------------------------------
-; Calls INT 18h (ROM Basic or Boot Failure). Called after booting from
-; floppy drive or hard disk fails.
-;
-; Int19h_BootFailure
-;   Parameters:
-;       Nothing
-;   Returns:
-;       Should never return (but might)
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-Int19h_BootFailure:
-    call    Int19h_ClearSegmentsForBoot
-    int     INTV_BOOT_FAILURE
-    ret

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int19hMenu.asm

@@ -53 +53 @@
 ALIGN JUMP_ALIGN
 Int19hMenu_ProcessMenuSelectionsUntilBootable:
-    call    Int19hMenu_GetDriveOrFunctionFromBootMenu
-    jc      SHORT Int19hMenu_ExecuteSelectedFunction
+    call    BootMenu_DisplayAndReturnSelection
+    call    DriveXlate_ToOrBack         ; Translate drive number
     call    Int19h_TryToLoadBootSectorFromDL
-    jnc     SHORT Int19hMenu_ProcessMenuSelectionsUntilBootable ; Boot failure
+    jnc     SHORT Int19hMenu_ProcessMenuSelectionsUntilBootable ; Boot failure, show menu again
     call    BootVars_SwitchBackToPostStack
-    jmp     SHORT Int19h_JumpToBootSector
+    jmp     Int19h_JumpToBootSector
 
 
 ;--------------------------------------------------------------------
-; Selects Floppy or Hard Disk Drive to boot from or some function.
-;
-; Int19hMenu_GetDriveOrFunctionFromBootMenu
+; Int19hMenu_RomBoot
 ;   Parameters:
 ;       DS:     RAMVARS segment
 ;   Returns:
-;       DX:     Drive number (translated, 00h or 80h) or
-;               Function ID
-;       CF:     Cleared if drive selected
-;               Set if function selected
-;   Corrupts registers:
-;       All non segment regs
+;       Never returns
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-Int19hMenu_GetDriveOrFunctionFromBootMenu:
-    call    BootMenu_DisplayAndReturnSelection
-    jc      SHORT .ReturnFunction
-    call    DriveXlate_ToOrBack         ; Translate drive number
-    clc
-ALIGN JUMP_ALIGN
-.ReturnFunction:
-    ret
-
-
-;--------------------------------------------------------------------
-; Executes any function (non-drive) selected from Boot Menu.
-;
-; Int19hMenu_ExecuteSelectedFunction
-;   Parameters:
-;       DX:     Function ID (selected from Boot Menu)
-;       DS:     RAMVARS segment
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       All non segment regs
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-Int19hMenu_ExecuteSelectedFunction:
-    ePUSH_T ax, Int19hMenu_ProcessMenuSelectionsUntilBootable
-    test    dx, dx                      ; 0, IDF_BOOTMNU_ROM
-    jz      SHORT .Int18hRomBoot
-    ret
-ALIGN JUMP_ALIGN
-.Int18hRomBoot:
+Int19hMenu_RomBoot:
     call    BootVars_SwitchBackToPostStack
-    jmp     Int19h_BootFailure          ; Never returns
+    call    Int19h_ClearSegmentsForBoot
+    int     INTV_BOOT_FAILURE       ; Never returns