Changeset 433 in xtideuniversalbios

Timestamp:

Jun 19, 2012, 4:24:36 PM (13 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Cleaned AH=00h a bit.

Location:

trunk/XTIDE_Universal_BIOS

Files:

• Inc/RamVars.inc (modified) (1 diff)
• Src/Handlers/Int13h/AH0h_HReset.asm (modified) (8 diffs)
• Src/VariablesAndDPTs/FindDPT.asm (modified) (2 diffs)
• Src/VariablesAndDPTs/RamVars.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Inc/RamVars.inc

@@ -42 +42 @@
     .bLastTimeoutUpdate resb    1
 
-    .wDrvCntAndFirst:
+    .wFirstDrvAndCount:
     .bFirstDrv          resb    1   ; Number of first drive for this BIOS
     .wDrvCntAndFlopCnt:             ; Both the hard disk and floppy counts in one word

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH0h_HReset.asm

@@ -38 +38 @@
 ;--------------------------------------------------------------------
 AH0h_HandlerForDiskControllerReset:
-    eMOVZX  bx, dl                      ; Copy requested drive to BL, zero BH to assume no errors
-    call    ResetFloppyDrivesWithInt40h
+    ; Reset Floppy Drives with INT 40h
+    xor     bx, bx                      ; Zero BH to assume no errors
+    or      bl, dl                      ; Copy requested drive to BL
+    eCMOVS  dl, bh                      ; Reset Floppy Drive 00h since DL has Hard Drive number
+
+    xor     ah, ah                      ; Disk Controller Reset
+    int     BIOS_DISKETTE_INTERRUPT_40h
+    call    BackupErrorCodeFromTheRequestedDriveToBH
+    ; We do not reset Hard Drives if DL was 0xh on entry
+
 
 %ifdef MODULE_SERIAL_FLOPPY
@@ -61 +69 @@
 %endif
 
+    ; Reset foreign Hard Drives (those handled by other BIOSes)
     test    bl, bl                                      ; If we were called with a floppy disk, then we are done,
     jns     SHORT .SkipHardDiskReset                    ; don't do hard disks.
-
     call    ResetForeignHardDisks
 
@@ -80 +88 @@
 
 ;--------------------------------------------------------------------
-; ResetFloppyDrivesWithInt40h
-;   Parameters:
-;       BL:     Requested drive (DL when entering AH=00h)
-;   Returns:
-;       BH:     Error code from requested drive (if available)
-;   Corrupts registers:
-;       AX, DL, DI
-;--------------------------------------------------------------------
-ResetFloppyDrivesWithInt40h:
-    call    GetDriveNumberForForeignHardDiskHandlerToDL
-    and     dl, 7Fh                     ; Clear hard disk bit
-    xor     ah, ah                      ; Disk Controller Reset
-    int     BIOS_DISKETTE_INTERRUPT_40h
-    jmp     SHORT BackupErrorCodeFromTheRequestedDriveToBH
-
-
-;--------------------------------------------------------------------
 ; ResetForeignHardDisks
 ;   Parameters:
@@ -104 +95 @@
 ;       BH:     Error code from requested drive (if available)
 ;   Corrupts registers:
-;       AX, DL, DI
+;       AX, DL
 ;--------------------------------------------------------------------
 ResetForeignHardDisks:
-    call    GetDriveNumberForForeignHardDiskHandlerToDL
-    xor     ah, ah                      ; Disk Controller Reset
+    ; If there are drives after our drives, those are already reset
+    ; since our INT 13h was called by some other BIOS.
+    ; We only need to reset drives from the previous INT 13h handler.
+    ; There could be more in chain but let the previous one handle them.
+    mov     dl, 80h
+    cmp     [RAMVARS.bFirstDrv], dl
+    je      SHORT NoForeignDrivesToReset
+
+    xor     ah, ah                  ; Disk Controller Reset
     call    Int13h_CallPreviousInt13hHandler
 ;;; fall-through to BackupErrorCodeFromTheRequestedDriveToBH
@@ -130 +128 @@
 
 
-;--------------------------------------------------------------------
-; GetDriveNumberForForeignHardDiskHandlerToDL
-;   Parameters:
-;       BL:     Requested drive (DL when entering AH=00h)
-;       DS:     RAMVARS segment
-;   Returns:
-;       DS:DI:  Ptr to DPT if our drive (or Null if foreign drive)
-;       DL:     BL if foreign drive
-;               80h if our drive
-;--------------------------------------------------------------------
-GetDriveNumberForForeignHardDiskHandlerToDL:
-    mov     dl, bl
-    test    di, di
-    jz      SHORT .Return
-    mov     dl, 80h             ; First possible Hard Disk should be safe value
-.Return:
-    ret
 
+; This defines what is called when resetting our drives at the end of drive detection.
 AH0h_ResetAllOurHardDisksAtTheEndOfDriveInitialization equ ResetHardDisksHandledByOurBIOS.ErrorCodeNotUsed
 
@@ -165 +147 @@
     xor     bl, bl                                      ; Assume Null IdevarsOffset for now, assuming foreign drive
     test    di, di
-    jz      .ErrorCodeNotUsed
+    jz      SHORT .ErrorCodeNotUsed
     mov     bl, [di+DPT.bIdevarsOffset]                 ; replace drive number with Idevars pointer for cmp with dl
 
@@ -182 +164 @@
 .loop:
     call    FindDPT_ForIdevarsOffsetInDL                ; look for the first drive on this controller, if any
-    jc      .notFound
+    jc      SHORT .notFound
 
     call    AHDh_ResetDrive                             ; reset master and slave on that controller
@@ -192 +174 @@
 
 .done:
+NoForeignDrivesToReset:
     ret

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/FindDPT.asm

@@ -43 +43 @@
 ; Check Our Hard Disks
 ;
-    mov     ax, [RAMVARS.wDrvCntAndFirst]       ; Drive count to AH, First number to AL
+    mov     ax, [RAMVARS.wFirstDrvAndCount]     ; Drive count to AH, First number to AL
     add     ah, al                              ; One past last drive to AH
 
@@ -97 +97 @@
 
 %ifdef MODULE_SERIAL_FLOPPY
-    mov     ax, [RAMVARS.wDrvCntAndFirst]
+    mov     ax, [RAMVARS.wFirstDrvAndCount]
 
     test    dl, dl

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/RamVars.asm

@@ -188 +188 @@
 ALIGN JUMP_ALIGN
 RamVars_GetCountOfKnownDrivesToAX:
-    mov     ax, [RAMVARS.wDrvCntAndFirst]
+    mov     ax, [RAMVARS.wFirstDrvAndCount]
     add     al, ah
     and     ax, BYTE 7fh