Changeset 502 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/AutoConfigure.asm

Timestamp:

Feb 9, 2013, 5:25:53 PM (11 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to Configurator v2:

• XT-CF port can be selected again.
• Auto Configure should now detect Sound Blaster 16 Tertiary and Quaternary IDE.
• Auto Configure now properly sets Slave Drive variables.

File:

• trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/AutoConfigure.asm (modified) (4 diffs)

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/AutoConfigure.asm

@@ -70 +70 @@
     mov     ax, DISABLE_WRITE_CACHE | (TRANSLATEMODE_AUTO<<TRANSLATEMODE_FIELD_POSITION) | FLG_DRVPARAMS_BLOCKMODE
     mov     [di+ROMVARS.ideVars0+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags], ax
+    mov     [di+ROMVARS.ideVars0+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags], ax
+
     mov     [di+ROMVARS.ideVars1+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags], ax
+    mov     [di+ROMVARS.ideVars1+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags], ax
+
     mov     [di+ROMVARS.ideVars2+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags], ax
+    mov     [di+ROMVARS.ideVars2+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags], ax
+
     mov     [di+ROMVARS.ideVars3+IDEVARS.drvParamsMaster+DRVPARAMS.wFlags], ax
+    mov     [di+ROMVARS.ideVars3+IDEVARS.drvParamsSlave+DRVPARAMS.wFlags], ax
     ret
 
@@ -95 +102 @@
     jz      SHORT .AllPortsAlreadyDetected
     push    cx
-    call    IdeAutodetect_DetectIdeDeviceFromPortDX
+    call    IdeAutodetect_DetectIdeDeviceFromPortDXAndReturnControlBlockInCX
+    mov     bx, cx
     pop     cx
     jc      SHORT .DetectFromNextPort
@@ -101 +109 @@
     ; Device found from port DX, Device Type returned in AL
     inc     cx  ; Increment number of controllers found
-    call    GetControlBlockPortToBXfromDeviceTypeInALandBasePortInDX
     mov     [si+IDEVARS.wBasePort], dx
     mov     [si+IDEVARS.wControlBlockPort], bx
@@ -112 +119 @@
     jmp     SHORT .DetectFromNextPort
 .AllPortsAlreadyDetected:
-    ret
-
-
-;--------------------------------------------------------------------
-; GetControlBlockPortToBXfromDeviceTypeInALandBasePortInDX
-;   Parameters:
-;       AL:     Device Type
-;       DX:     Base port
-;   Returns:
-;       BX:     Control Block Port
-;   Corrupts registers:
-;       Nothing
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-GetControlBlockPortToBXfromDeviceTypeInALandBasePortInDX:
-    mov     bx, dx
-    cmp     al, DEVICE_8BIT_XTIDE_REV1
-    jae     SHORT .NonStandardControlBlockPortLocation
-
-    ; Standard IDE Devices
-    add     bx, STANDARD_CONTROL_BLOCK_OFFSET
-    ret
-
-.NonStandardControlBlockPortLocation:
-    cmp     al, DEVICE_8BIT_JRIDE_ISA
-    je      SHORT .JrIdeIsaDoesNotNeedControlBlockAddress
-
-    ; 8-bit Devices
-    add     bx, BYTE XTIDE_CONTROL_BLOCK_OFFSET ; XT-CF also
-.JrIdeIsaDoesNotNeedControlBlockAddress:
     ret