Changeset 150 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH2h_HRead.asm

Timestamp:

Apr 29, 2011, 7:04:13 PM (14 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Changes to XTIDE Universal BIOS:

• Redesigned Disk Parameter Tables.
• Code generalizations for supporting non-IDE devices in the future.

File:

• trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/AH2h_HRead.asm (modified) (3 diffs)

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

@@ -13 +13 @@
 ;       DL:     Translated Drive number
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
-;       SS:BP:  Ptr to INTPACK
-;   Parameters on INTPACK in SS:BP:
-;       AL:     Number of sectors to read (1...255)
+;       SS:BP:  Ptr to IDEPACK
+;   Parameters on INTPACK:
+;       AL:     Number of sectors to read (1...255, 0=256)
 ;       CH:     Cylinder number, bits 7...0
 ;       CL:     Bits 7...6: Cylinder number bits 9 and 8
@@ -21 +21 @@
 ;       DH:     Starting head number (0...255)
 ;       ES:BX:  Pointer to buffer recieving data
-;   Returns with INTPACK in SS:BP:
+;   Returns with INTPACK:
 ;       AH:     Int 13h/40h floppy return status
 ;       AL:     Burst error length if AH returns 11h, undefined otherwise
@@ -28 +28 @@
 ALIGN JUMP_ALIGN
 AH2h_HandlerForReadDiskSectors:
-    test    al, al                      ; Invalid sector count?
-    jz      SHORT AH2h_ZeroCntErr       ;  If so, return with error
-
-    ; Select sector or block mode command
-    mov     ah, HCMD_READ_SECT          ; Load sector mode command
-    cmp     BYTE [di+DPT.bSetBlock], 1  ; Block mode enabled?
-    eCMOVA  ah, HCMD_READ_MUL           ; Load block mode command
-
-    ; Transfer data
-    call    HCommand_OutputCountAndLCHSandCommand
-    jc      SHORT .ReturnWithErrorCodeInAH
-    mov     bx, [bp+INTPACK.bx]
-    call    HPIO_ReadBlock              ; Read data from IDE-controller
-.ReturnWithErrorCodeInAH:
+    mov     ah, COMMAND_READ_SECTORS    ; Load sector mode command
+    test    WORD [di+DPT.wFlags], FLG_DPT_BLOCK_MODE_SUPPORTED
+    eCMOVNZ ah, COMMAND_READ_MULTIPLE   ; Load block mode command
+    mov     bx, TIMEOUT_AND_STATUS_TO_WAIT(TIMEOUT_DRQ, FLG_STATUS_DRQ)
+    mov     si, [bp+IDEPACK.intpack+INTPACK.bx]
+%ifdef USE_186
+    push    Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAH
+    jmp     Idepack_TranslateOldInt13hAddressAndIssueCommandFromAH
+%else
+    call    Idepack_TranslateOldInt13hAddressAndIssueCommandFromAH
     jmp     Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAH
-
-; Invalid sector count (also for AH=3h and AH=4h)
-AH2h_ZeroCntErr:
-    mov     ah, RET_HD_INVALID          ; Invalid value passed
-    jmp     Int13h_ReturnFromHandlerAfterStoringErrorCodeFromAH
+%endif