Changeset 503 in xtideuniversalbios for trunk

Timestamp:

Feb 13, 2013, 6:12:04 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Optimized AH=0h a bit.

Location:

trunk/XTIDE_Universal_BIOS

Files:

• Inc/RomVars.inc (modified) (2 diffs)
• Src/Device/IDE/IdeIO.asm (modified) (1 diff)
• Src/Handlers/Int13h/AH0h_HReset.asm (modified) (3 diffs)

trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc

@@ -120 +120 @@
 STANDARD_CONTROL_BLOCK_OFFSET           EQU     200h
 XTIDE_CONTROL_BLOCK_OFFSET              EQU     8h
-XTCF_CONTROL_BLOCK_OFFSET               EQU     XTIDE_CONTROL_BLOCK_OFFSET
+XTCF_CONTROL_BLOCK_OFFSET               EQU     (XTIDE_CONTROL_BLOCK_OFFSET << 1)
 
 ; Default values for Port and PortCtrl, shared with the configurator
@@ -134 +134 @@
 
 DEVICE_ATA_TERTIARY_PORT                EQU     1E8h
-DEVICE_ATA_TERTIARY_PORTCTRL            EQU     ((DEVICE_ATA_TERTIARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET) & ~0Fh) ; 3E0h
+DEVICE_ATA_TERTIARY_PORTCTRL            EQU     (DEVICE_ATA_TERTIARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET)
 
 DEVICE_ATA_QUATERNARY_PORT              EQU     168h
-DEVICE_ATA_QUATERNARY_PORTCTRL          EQU     ((DEVICE_ATA_QUATERNARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET) & ~0Fh)   ; 360h
+DEVICE_ATA_QUATERNARY_PORTCTRL          EQU     (DEVICE_ATA_QUATERNARY_PORT + STANDARD_CONTROL_BLOCK_OFFSET)
 
 

trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeIO.asm

@@ -125 +125 @@
 
 .ShlRegisterIndexInDX:
-    add     dl, XTCF_CONTROL_BLOCK_OFFSET
     shl     dx, 1
+    add     dx, BYTE XTCF_CONTROL_BLOCK_OFFSET
     jmp     SHORT OutputALtoRegisterInDX
 

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

@@ -38 +38 @@
 ;--------------------------------------------------------------------
 AH0h_HandlerForDiskControllerReset:
-    xor     bx, bx                      ; Zero BH to assume no errors
-    or      bl, dl                      ; Copy requested drive to BL
+    ; Reset foreign Floppy and Hard Drives (those handled by other BIOSes)
+    xor     bx, bx                                      ; Zero BH to assume no errors
+    or      bl, dl                                      ; Copy requested drive to BL
+    xor     ah, ah                                      ; Disk Controller Reset
+    call    Int13h_CallPreviousInt13hHandler            ; Reset floppy drives only or floppy drives and foreign hard disks
+    call    BackupErrorCodeFromTheRequestedDriveToBH
 
 %ifdef MODULE_SERIAL_FLOPPY
@@ -60 +64 @@
     call    BackupErrorCodeFromTheRequestedDriveToBH    ; only one drive), but doing it again is not harmful.
 %endif
-
-    ; Reset foreign Floppy and Hard Drives (those handled by other BIOSes)
-    call    ResetForeignDrives
     test    bl, bl                                      ; If we were called with a floppy disk, then we are done,
     jns     SHORT .SkipHardDiskReset                    ; don't do hard disks.
@@ -77 +78 @@
     mov     ah, bh
     jmp     Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAH
-
-
-;--------------------------------------------------------------------
-; ResetForeignDrives
-;   Parameters:
-;       BL:     Requested Floppy or Hard Drive (DL when entering AH=00h)
-;       DS:     RAMVARS segment
-;   Returns:
-;       BH:     Error code from requested drive (if available)
-;   Corrupts registers:
-;       AX, DL
-;--------------------------------------------------------------------
-ResetForeignDrives:
-    ; 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, [RAMVARS.bFirstDrv]
-    or      dl, 80h                 ; We may not have our drives at all so change 0 to 80h!
-    MIN_U   dl, bl
-
-    xor     ah, ah                  ; Disk Controller Reset
-    call    Int13h_CallPreviousInt13hHandler
-;;; fall-through to BackupErrorCodeFromTheRequestedDriveToBH