Changeset 158 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Device/IDE

Timestamp:

May 2, 2011, 9:41:51 AM (14 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Changes to XTIDE Universal BIOS:

• Optimized few bytes.

Location:

trunk/XTIDE_Universal_BIOS/Src/Device/IDE

Files:

• IdeCommand.asm (modified) (9 diffs)
• IdeIrq.asm (modified) (1 diff)
• IdeTransfer.asm (modified) (3 diffs)

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

@@ -54 +54 @@
     ; Create fake DPT to be able to use Device.asm functions
     call    FindDPT_ForNewDriveToDSDI
-    xor     ax, ax
+    eMOVZX  ax, bh
     cmp     BYTE [cs:bp+IDEVARS.bDevice], DEVICE_XTIDE_WITH_REVERSED_A3_AND_A0
-    eCMOVE  ax, FLG_DPT_REVERSED_A0_AND_A3
-    or      al, bh
+    eCMOVE  ah, FLGH_DPT_REVERSED_A0_AND_A3
     mov     [di+DPT.wFlags], ax
     mov     [di+DPT.bIdevarsOffset], bp
@@ -65 +64 @@
     cmp     bp, BYTE ROMVARS.ideVars0
     jne     SHORT .SkipLongWaitSinceDriveIsNotPrimaryMaster
-    test    bh, FLG_DRVNHEAD_DRV
+    test    al, FLG_DRVNHEAD_DRV
     jnz     SHORT .SkipLongWaitSinceDriveIsNotPrimaryMaster
     mov     bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_MOTOR_STARTUP, FLG_STATUS_BSY)
@@ -82 +81 @@
 
     ; Clean stack and return
-    lea     sp, [bp+SIZE_OF_FAKE_IDEPACK]   ; This assumes BP hasn't changed between Idepack_FakeToSSBP and here
+    lea     sp, [bp+EXTRA_BYTES_FOR_INTPACK]    ; This assumes BP hasn't changed between Idepack_FakeToSSBP and here
     pop     bp
     ret
@@ -103 +102 @@
 ALIGN JUMP_ALIGN
 IdeCommand_OutputWithParameters:
-    push    bx                          ; Store status register bits to poll
+    push    bx                      ; Store status register bits to poll
 
     ; Select Master or Slave drive and output head number or LBA28 top bits
@@ -110 +109 @@
 
     ; Output Device Control Byte to enable or disable interrupts
-    mov     dl, DEVICE_CONTROL_REGISTER_out
     mov     al, [bp+IDEPACK.bDeviceControl]
-    test    al, FLG_DEVCONTROL_nIEN
+    test    al, FLG_DEVCONTROL_nIEN ; Interrupts disabled?
     jnz     SHORT .DoNotSetInterruptInServiceFlag
-    or      WORD [di+DPT.wFlags], FLG_DPT_INTERRUPT_IN_SERVICE
+
+    ; Clear Task Flag and set Interrupt In-Service Flag
+    or      BYTE [di+DPT.bFlagsHigh], FLGH_DPT_INTERRUPT_IN_SERVICE
     push    ds
-    LOAD_BDA_SEGMENT_TO ds, cx, !       ; Also zero CX
-    mov     [BDA.bHDTaskFlg], al
+    LOAD_BDA_SEGMENT_TO ds, dx, !   ; Also zero DX
+    mov     [BDA.bHDTaskFlg], dl
     pop     ds
 .DoNotSetInterruptInServiceFlag:
+    mov     dl, DEVICE_CONTROL_REGISTER_out
     call    Device_OutputALtoIdeControlBlockRegisterInDL
 
@@ -143 +144 @@
 
     ; Wait until command completed
-    pop     bx                          ; Pop status and timeout for polling
-    cmp     bl, FLG_STATUS_DRQ          ; Data transfer started?
-    je      SHORT .StartDataTransfer
+    pop     bx                      ; Pop status and timeout for polling
+    cmp     bl, FLG_STATUS_DRQ      ; Data transfer started?
+    je      SHORT IdeTransfer_StartWithCommandInAL
     test    BYTE [bp+IDEPACK.bDeviceControl], FLG_DEVCONTROL_nIEN
     jz      SHORT .WaitForIrqOrRdy
@@ -153 +154 @@
 .WaitForIrqOrRdy:
     jmp     IdeWait_IRQorStatusFlagInBLwithTimeoutInBH
-ALIGN JUMP_ALIGN
-.StartDataTransfer:
-    jmp     IdeTransfer_StartWithCommandInAL
 
 .DriveNotReady:
@@ -179 +177 @@
     mov     bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_BSY, FLG_STATUS_BSY)
     cmp     BYTE [bp+IDEPACK.bCommand], COMMAND_IDENTIFY_DEVICE
-    eCMOVE  bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_IDENTIFY_DEVICE, FLG_STATUS_BSY)
+    eCMOVE  bh, TIMEOUT_IDENTIFY_DEVICE
     call    IdeWait_PollStatusFlagInBLwithTimeoutInBH
     jc      SHORT ReturnSinceTimeoutWhenPollingBusy
@@ -189 +187 @@
     mov     bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_DRDY, FLG_STATUS_DRDY)
     cmp     BYTE [bp+IDEPACK.bCommand], COMMAND_IDENTIFY_DEVICE
-    eCMOVE  bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_IDENTIFY_DEVICE, FLG_STATUS_DRDY)
+    eCMOVE  bh, TIMEOUT_IDENTIFY_DEVICE
     jmp     IdeWait_PollStatusFlagInBLwithTimeoutInBH
 

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

@@ -114 +114 @@
 
     ; Clear Interrupt In-Service Flag from DPT
-    and     WORD [di+DPT.wFlags], ~FLG_DPT_INTERRUPT_IN_SERVICE
+    and     BYTE [di+DPT.bFlagsHigh], ~FLGH_DPT_INTERRUPT_IN_SERVICE
 
     ; Set Task Flag

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

@@ -166 +166 @@
 ; InitializePiovarsInSSBPwithSectorCountInAX
 ;   Parameters:
-;       AX:     Number of sectors to transfer (0=65536)
+;       AX:     Number of sectors to transfer (1...65535)
 ;       BX:     Offset to transfer function lookup table
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
@@ -179 +179 @@
     ; Store number of blocks to transfer
     eMOVZX  cx, BYTE [di+DPT_ATA.bSetBlock]     ; Block size in sectors
-    xor     dx, dx
-    test    ax, ax
-    eCMOVZ  dl, 1       ; DX:AX = Sectors to transfer (1...65536)
+    xor     dx, dx      ; DX:AX = Sectors to transfer (1...65535)
     div     cx          ; AX = Full blocks to transfer
     test    dx, dx
@@ -197 +195 @@
 
     ; Get transfer function based on bus type
-    xchg    ax, bx
+    xchg    ax, bx                              ; Lookup table offset to AX
     eMOVZX  bx, BYTE [di+DPT.bIdevarsOffset]    ; CS:BX now points to IDEVARS
     mov     dx, [cs:bx+IDEVARS.wPort]           ; Load IDE Data port address