Changeset 520 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src

Timestamp:

Mar 9, 2013, 3:36:37 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Slave drives are again initialized properly
• Delay for Hotkeybar now works properly

Location:

trunk/XTIDE_Universal_BIOS/Src

Files:

• Handlers/Int13h/AH0h_HReset.asm (modified) (3 diffs)
• Handlers/Int19h.asm (modified) (1 diff)
• Initialization/AdvancedAta/AdvAtaInit.asm (modified) (1 diff)
• VariablesAndDPTs/BootVars.asm (modified) (1 diff)

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

@@ -122 +122 @@
 
     mov     si, ControllerResetForDPTinDSDI
-    call    .CallSIforEveryDrive                        ; Reset all drives to power on settings
-    mov     si, AH9h_InitializeDriveForUse
-    ; Fall to .CallSIforEveryDrive                      ; Initialize all drives
-
-.CallSIforEveryDrive:                                   ; BH will be garbage on exit if this entry point is used,
+    call    .CallSIforEveryController                   ; Reset all drives to power on settings
+    mov     si, ControllerInitForMasterOrSingleDPTinDSDI
+    ; Fall to .CallSIforEveryController                 ; Initialize all controllers (Master and Slave drives)
+
+.CallSIforEveryController:                              ; BH will be garbage on exit if this entry point is used,
                                                         ; but reset of all drives will still happen
 
@@ -166 +166 @@
 ;   Returns:
 ;       AH:     Int 13h return status
-;       CF:     0 if successful, 1 if error
 ;   Corrupts registers:
 ;       AL, BX, CX, DX
@@ -180 +179 @@
     jmp     Device_ResetMasterAndSlaveController
 %endif
+
+
+;--------------------------------------------------------------------
+; ControllerInitForMasterOrSingleDPTinDSDI
+;   Parameters:
+;       DS:DI:  Ptr to DPT for Master or Single Drive (initializes both Master and Slave drive)
+;       SS:BP:  Ptr to IDEPACK
+;   Returns:
+;       AH:     Int 13h return status
+;   Corrupts registers:
+;       AL, BX, CX, DX
+;--------------------------------------------------------------------
+ControllerInitForMasterOrSingleDPTinDSDI:
+    call    AH9h_InitializeDriveForUse          ; Init Master or Single drive
+    push    ax                                  ; Store error code
+
+    eMOVZX  ax, BYTE [di+DPT.bIdevarsOffset]    ; Clear AH
+    add     di, BYTE LARGEST_DPT_SIZE           ; Slave drive or next controller
+    cmp     [di+DPT.bIdevarsOffset], al
+    jne     SHORT .NoSlaveDrivePresent
+
+    call    AH9h_InitializeDriveForUse          ; Init Slave drive
+.NoSlaveDrivePresent:
+    pop     bx
+    MAX_U   ah, bh                              ; Return error code from either drive
+    ret

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int19h.asm

@@ -80 +80 @@
 %ifdef MODULE_HOTKEYS
     call    TimerTicks_ReadFromBdaToAX
-    add     ax, MIN_TIME_TO_DISPLAY_HOTKEY_BAR
+    add     ax, BYTE MIN_TIME_TO_DISPLAY_HOTKEY_BAR
     mov     [es:BOOTVARS.hotkeyVars+HOTKEYVARS.wTimeToClose], ax
 %endif

trunk/XTIDE_Universal_BIOS/Src/Initialization/AdvancedAta/AdvAtaInit.asm

@@ -101 +101 @@
 ;       DS:DI:  Ptr to DPT for Single or Slave Drive
 ;   Returns:
-;       DS:DI:  Ptr to DPT for Single or Slave Drive
 ;       SI:     Offset to Master DPT if Slave Drive present
 ;               Zero if Slave Drive not present

trunk/XTIDE_Universal_BIOS/Src/VariablesAndDPTs/BootVars.asm

@@ -39 +39 @@
     mov     al, DRVDETECTINFO_size
     mul     BYTE [cs:ROMVARS.bIdeCnt]
-    mov     di, BOOTVARS.clearToZeroFromThisPoint   ; We must not initialize anything before this!
+%ifdef MODULE_HOTKEYS ; We must not initialize anything before this!
+    mov     di, BOOTVARS.hotkeyVars + HOTKEYVARS.clearToZeroFromThisPoint   
+%else
+    mov     di, BOOTVARS.clearToZeroFromThisPoint
+%endif
     add     ax, BOOTVARS_size
     sub     ax, di