Changeset 140 in xtideuniversalbios for trunk

Timestamp:

Mar 14, 2011, 11:38:26 AM (14 years ago)

Author:

Tomi Tilli

google:author:

aitotat

Message:

Changes to XTIDE Universal BIOS:

• INT 13h functions should no longer use Assembly Library.
• Boot menu now properly displays swapped drive numbers.

Location:

trunk/XTIDE_Universal_BIOS/Src

Files:

• Boot/BootMenuEvent.asm (modified) (1 diff)
• Handlers/Int13h/Common/HStatus.asm (modified) (2 diffs)
• Handlers/Int13h/Common/HTimer.asm (added)
• Main.asm (modified) (1 diff)

trunk/XTIDE_Universal_BIOS/Src/Boot/BootMenuEvent.asm

@@ -85 +85 @@
 .ItemHighlightedFromCX:
     push    cx
-    push    dx
     call    RamVars_GetSegmentToDS
     call    DriveXlate_Reset
     call    BootMenu_GetDriveToDXforMenuitemInCX
     call    DriveXlate_SetDriveToSwap
-    pop     ax      ; Update previous item
+
+    xor     ax, ax  ; Update first floppy drive (for translated drive number)
     CALL_MENU_LIBRARY RefreshItemFromAX
-    pop     ax      ; Update new item
+    mov     dl, 80h
+    call    BootMenu_GetMenuitemToDXforDriveInDL
+    xchg    ax, dx  ; Update first hard disk (for translated drive number)
+    CALL_MENU_LIBRARY RefreshItemFromAX
+    pop     ax      ; Update new item (for translated drive number)
     CALL_MENU_LIBRARY RefreshItemFromAX
     CALL_MENU_LIBRARY RefreshInformation

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int13h/Common/HStatus.asm

@@ -172 +172 @@
 ALIGN JUMP_ALIGN
 HStatus_PollBsyAndFlg:
-    call    InitializeTimeoutWithTicksInCL      ; Initialize timeout counter
-    in      al, dx                              ; Discard contents for first read
-                                                ; (should read Alternate Status Register)
+    call    HTimer_InitializeTimeoutWithTicksInCL   ; Initialize timeout counter
+    in      al, dx                                  ; Discard contents for first read
+                                                    ; (should read Alternate Status Register)
 ALIGN JUMP_ALIGN
 .PollLoop:
-    in      al, dx                              ; Load IDE Status Register
-    test    al, FLG_IDE_ST_BSY                  ; Controller busy?
-    jnz     SHORT .UpdateTimeout                ;  If so, jump to timeout update
-    test    al, ah                              ; Test secondary flag
-    jnz     SHORT GetErrorCodeFromPollingToAH   ; If set, break loop
+    in      al, dx                                  ; Load IDE Status Register
+    test    al, FLG_IDE_ST_BSY                      ; Controller busy?
+    jnz     SHORT .UpdateTimeout                    ;  If so, jump to timeout update
+    test    al, ah                                  ; Test secondary flag
+    jnz     SHORT GetErrorCodeFromPollingToAH       ; If set, break loop
 ALIGN JUMP_ALIGN
 .UpdateTimeout:
-    call    SetCFifTimeout
-    jnc     SHORT .PollLoop                     ; Loop if time left (sets CF on timeout)
+    call    HTimer_SetCFifTimeout
+    jnc     SHORT .PollLoop                         ; Loop if time left (sets CF on timeout)
     jmp     HError_ProcessTimeoutAfterPollingBSYandSomeOtherStatusBit
 
@@ -206 +206 @@
 ALIGN JUMP_ALIGN
 HStatus_PollBsy:
-    call    InitializeTimeoutWithTicksInCL      ; Initialize timeout counter
-    in      al, dx                              ; Discard contents for first read
-                                                ; (should read Alternate Status Register)
+    call    HTimer_InitializeTimeoutWithTicksInCL   ; Initialize timeout counter
+    in      al, dx                                  ; Discard contents for first read
+                                                    ; (should read Alternate Status Register)
 ALIGN JUMP_ALIGN
 .PollLoop:
-    in      al, dx                              ; Load IDE Status Reg
-    test    al, FLG_IDE_ST_BSY                  ; Controller busy?
-    jz      SHORT GetErrorCodeFromPollingToAH   ;  If not, jump to check errors
-    call    SetCFifTimeout                      ; Update timeout counter
-    jnc     SHORT .PollLoop                     ; Loop if time left (sets CF on timeout)
+    in      al, dx                                  ; Load IDE Status Reg
+    test    al, FLG_IDE_ST_BSY                      ; Controller busy?
+    jz      SHORT GetErrorCodeFromPollingToAH       ;  If not, jump to check errors
+    call    HTimer_SetCFifTimeout                   ; Update timeout counter
+    jnc     SHORT .PollLoop                         ; Loop if time left (sets CF on timeout)
 ALIGN JUMP_ALIGN
 GetErrorCodeFromPollingToAH:
     jmp     HError_ProcessErrorsAfterPollingBSY
-
-
-;--------------------------------------------------------------------
-; InitializeTimeoutWithTicksInCL
-;   Parameters:
-;       CL:     Timeout value in system timer ticks
-;       DS:     Segment to RAMVARS
-;   Returns:
-;       Nothing
-;   Corrupts registers:
-;       CX
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-InitializeTimeoutWithTicksInCL:
-    push    bx
-    xchg    cx, ax
-
-    xor     ah, ah      ; Timeout ticks now in AX
-    mov     bx, RAMVARS.wTimeoutCounter
-    call    TimerTicks_InitializeTimeoutFromAX
-
-    xchg    ax, cx      ; Restore AX
-    pop     bx
-    ret
-
-;--------------------------------------------------------------------
-; SetCFifTimeout
-;   Parameters:
-;       DS:     Segment to RAMVARS
-;   Returns:
-;       CF:     Set if timeout
-;               Cleared if time left
-;   Corrupts registers:
-;       CX
-;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-SetCFifTimeout:
-    push    bx
-    xchg    cx, ax
-
-    mov     bx, RAMVARS.wTimeoutCounter
-    call    TimerTicks_GetTimeoutTicksLeftToAXfromDSBX
-
-    xchg    ax, cx      ; Restore AX
-    pop     bx
-    ret

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -135 +135 @@
 %include "HDrvSel.asm"          ; For selecting drive to access
 %include "HCommand.asm"         ; For outputting command and parameters
+%include "HTimer.asm"           ; For timeout and delay
 
 ; Include .asm files (Interrupt handlers)