Changeset 400 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeCommand.asm

Timestamp:

Apr 20, 2012, 2:30:16 PM (12 years ago)

Author:

aitotat@…

google:author:

aitotat@gmail.com

Message:

Changes to XTIDE Universal BIOS:

• Moved 8-bit device support to MODULE_8BIT_IDE.
• JR-IDE/ISA support requires a lot less bytes.
• AT builds now always use full operating mode.

File:

• trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeCommand.asm (modified) (11 diffs)

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

@@ -31 +31 @@
 ;       AL, BX, CX, DX
 ;--------------------------------------------------------------------
-IDEDEVICE%+Command_ResetMasterAndSlaveController:
+IdeCommand_ResetMasterAndSlaveController:
     ; HSR0: Set_SRST
     call    AccessDPT_GetDeviceControlByteToAL
@@ -49 +49 @@
     ; HSR2: Check_status
     mov     bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_MOTOR_STARTUP, FLG_STATUS_BSY)
-    jmp     IDEDEVICE%+Wait_PollStatusFlagInBLwithTimeoutInBH
+    jmp     IdeWait_PollStatusFlagInBLwithTimeoutInBH
 
 
@@ -65 +65 @@
 ;       AL, BL, CX, DX, SI, DI, ES
 ;--------------------------------------------------------------------
-IDEDEVICE%+Command_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH:
+IdeCommand_IdentifyDeviceToBufferInESSIwithDriveSelectByteInBH:
     ; Create fake DPT to be able to use Device.asm functions
     call    FindDPT_ForNewDriveToDSDI
@@ -72 +72 @@
     mov     [di+DPT.bIdevarsOffset], bp
     mov     BYTE [di+DPT_ATA.bBlockSize], 1 ; Block = 1 sector
-%ifdef MODULE_ADVANCED_ATA
     call    IdeDPT_StoreDeviceTypeFromIdevarsInCSBPtoDPTinDSDI
-%endif
-%ifdef ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS
-    call    IdeDPT_StoreReversedAddressLinesFlagIfNecessary
-%endif
 
     ; Wait until drive motors have reached max speed
     cmp     bp, BYTE ROMVARS.ideVars0
     jne     SHORT .SkipLongWaitSinceDriveIsNotPrimaryMaster
-    test    al, FLG_DRVNHEAD_DRV
+    test    bh, FLG_DRVNHEAD_DRV
     jnz     SHORT .SkipLongWaitSinceDriveIsNotPrimaryMaster
     mov     bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_MOTOR_STARTUP, FLG_STATUS_BSY)
-    call    IDEDEVICE%+Wait_PollStatusFlagInBLwithTimeoutInBH
+    call    IdeWait_PollStatusFlagInBLwithTimeoutInBH
 .SkipLongWaitSinceDriveIsNotPrimaryMaster:
 
@@ -120 +115 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-IDEDEVICE%+Command_OutputWithParameters:
+IdeCommand_OutputWithParameters:
     push    bx                      ; Store status register bits to poll
 
     ; Select Master or Slave drive and output head number or LBA28 top bits
-    call    IDEDEVICE%+Command_SelectDrive
+    call    IdeCommand_SelectDrive
     jc      SHORT .DriveNotReady
 
     ; Output Device Control Byte to enable or disable interrupts
     mov     al, [bp+IDEPACK.bDeviceControl]
-%ifdef ASSEMBLE_SHARED_IDE_DEVICE_FUNCTIONS ; JR-IDE/ISA
+%ifdef MODULE_IRQ
     test    al, FLG_DEVCONTROL_nIEN ; Interrupts disabled?
     jnz     SHORT .DoNotSetInterruptInServiceFlag
@@ -151 +146 @@
     eMOVZX  ax, [bp+IDEPACK.bLbaLowExt]     ; Zero sector count
     mov     cx, [bp+IDEPACK.wLbaMiddleAndHighExt]
-    call    IDEDEVICE%+OutputSectorCountAndAddress
+    call    OutputSectorCountAndAddress
 %endif
 
@@ -157 +152 @@
     mov     ax, [bp+IDEPACK.wSectorCountAndLbaLow]
     mov     cx, [bp+IDEPACK.wLbaMiddleAndHigh]
-    call    IDEDEVICE%+OutputSectorCountAndAddress
+    call    OutputSectorCountAndAddress
 
     ; Output command
@@ -164 +159 @@
 
     ; Wait until command completed
-    pop     bx                      ; Pop status and timeout for polling
-    cmp     bl, FLG_STATUS_DRQ      ; Data transfer started?
-    je      SHORT IDEDEVICE%+Transfer_StartWithCommandInAL
+    pop     bx                              ; Pop status and timeout for polling
+    cmp     bl, FLG_STATUS_DRQ              ; Data transfer started?
+    jne     SHORT .WaitUntilNonTransferCommandCompletes
+%ifdef MODULE_JRIDE
+    cmp     BYTE [di+DPT_ATA.bDevice], DEVICE_8BIT_JRIDE_ISA
+    je      SHORT JrIdeTransfer_StartWithCommandInAL
+%endif
+    jmp     IdeTransfer_StartWithCommandInAL
+
+.WaitUntilNonTransferCommandCompletes:
+%ifdef MODULE_IRQ
     test    BYTE [bp+IDEPACK.bDeviceControl], FLG_DEVCONTROL_nIEN
-    jz      SHORT .WaitForIrqOrRdy
-    jmp     IDEDEVICE%+Wait_PollStatusFlagInBLwithTimeoutInBH
-
-ALIGN JUMP_ALIGN
-.WaitForIrqOrRdy:
-    jmp     IDEDEVICE%+Wait_IRQorStatusFlagInBLwithTimeoutInBH
+    jz      SHORT .PollStatusFlagInsteadOfWaitIrq
+    jmp     IdeWait_IRQorStatusFlagInBLwithTimeoutInBH
+.PollStatusFlagInsteadOfWaitIrq:
+%endif
+    jmp     IdeWait_PollStatusFlagInBLwithTimeoutInBH
 
 .DriveNotReady:
@@ -192 +194 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-IDEDEVICE%+Command_SelectDrive:
-    ; Wait until neither Master or Slave Drive is busy.
-    ; I don't think this wait is necessary.
-    ;mov        bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_BSY, FLG_STATUS_BSY)
-    ;cmp        BYTE [bp+IDEPACK.bCommand], COMMAND_IDENTIFY_DEVICE
-    ;eCMOVE bh, TIMEOUT_IDENTIFY_DEVICE
-    ;call   IDEDEVICE%+Wait_PollStatusFlagInBLwithTimeoutInBH
-
+IdeCommand_SelectDrive:
     ; Select Master or Slave Drive
     mov     al, [bp+IDEPACK.bDrvAndHead]
@@ -206 +201 @@
     cmp     BYTE [bp+IDEPACK.bCommand], COMMAND_IDENTIFY_DEVICE
     eCMOVE  bh, TIMEOUT_IDENTIFY_DEVICE
-    call    IDEDEVICE%+Wait_PollStatusFlagInBLwithTimeoutInBH
+    call    IdeWait_PollStatusFlagInBLwithTimeoutInBH
 
     ; Ignore errors from IDE Error Register (set by previous command)
@@ -232 +227 @@
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
-IDEDEVICE%+OutputSectorCountAndAddress:
+OutputSectorCountAndAddress:
     OUTPUT_AL_TO_IDE_REGISTER   SECTOR_COUNT_REGISTER