Changeset 601 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Menus

Timestamp:

Feb 14, 2019, 7:38:08 PM (5 years ago)

Author:

krille_n_

Message:

Changes:

• Building the BIOS now works again.
• Added a new IDE device type/transfer mode for use only with XT-IDE rev 2+ (or Chuck(G)-modded rev 1) cards installed in any of the following machines: Olivetti M24, AT&T PC6300, Xerox 6060 and Logabax Persona 1600. This new transfer mode is slightly faster than the regular XT-IDE rev 1 device type and requires that the card is configured for High Speed mode (or, in case of the card being a rev 1 card, has the Chuck(G) mod done). The new device type is called "XTIDE rev 2 (Olivetti M24)" in XTIDECFG.
• Made some minor improvements to the library code that handles 'Drive Not Ready' errors in XTIDECFG.
• Optimizations.

Location:

trunk/XTIDE_Universal_BIOS/Src/Menus

Files:

• BootMenu/BootMenuPrintCfg.asm (modified) (10 diffs)
• HotkeyBar.asm (modified) (5 diffs)

trunk/XTIDE_Universal_BIOS/Src/Menus/BootMenu/BootMenuPrintCfg.asm

@@ -4 +4 @@
 ;
 ; Included by BootMenuPrint.asm, this routine is to be inserted into
-; BootMenuPrint_HardDiskRefreshInformation.
+; BootMenuPrint_RefreshInformation.
 ;
 
@@ -26 +26 @@
 SECTION .text
 
-;;; fall-into from BootMenuPrint_HardDiskRefreshInformation.
+;;; fall-into from BootMenuPrint_RefreshInformation.
 
 ;--------------------------------------------------------------------
@@ -32 +32 @@
 ; Cursor is set to configuration header string position.
 ;
-; BootMenuPrintCfg_ForOurDrive
+; .BootMenuPrintCfg_ForOurDrive
 ;   Parameters:
 ;       DS:DI:      Pointer to DPT
@@ -38 +38 @@
 ;       Nothing
 ;   Corrupts registers:
-;       AX, BX, CX, DX
+;       AX, BX, DX
 ;--------------------------------------------------------------------
 .BootMenuPrintCfg_ForOurDrive:
-    eMOVZX  ax, [di+DPT.bIdevarsOffset]
-    xchg    bx, ax                      ; CS:BX now points to IDEVARS
     ; Fall to .PushAddressingMode
 
@@ -49 +47 @@
 ;   Parameters:
 ;       DS:DI:  Ptr to DPT
-;       CS:BX:  Ptr to IDEVARS
 ;   Returns:
 ;       Nothing (falls to next push below)
 ;   Corrupts registers:
-;       AX, CX, DX
+;       AX, BX, DX
 ;--------------------------------------------------------------------
 .PushAddressingMode:
@@ -66 +63 @@
     imul    ax, g_szAddressingModes_Displacement << (8-TRANSLATEMODE_FIELD_POSITION)
 %else
-    mov     cx, g_szAddressingModes_Displacement << (8-TRANSLATEMODE_FIELD_POSITION)
-    mul     cx
+    mov     bx, g_szAddressingModes_Displacement << (8-TRANSLATEMODE_FIELD_POSITION)
+    mul     bx
 %endif
     xchg    al, ah      ; AL = always zero after above multiplication
@@ -78 +75 @@
 ;   Parameters:
 ;       DS:DI:  Ptr to DPT
-;       CS:BX:  Ptr to IDEVARS
 ;   Returns:
 ;       Nothing (falls to next push below)
@@ -97 +93 @@
 ;   Parameters:
 ;       DS:DI:  Ptr to DPT
-;       CS:BX:  Ptr to IDEVARS
 ;   Returns:
 ;       Nothing (falls to next push below)
 ;   Corrupts registers:
-;       AX
+;       AX, BX
 ;--------------------------------------------------------------------
 .PushDeviceType:
+    call    AccessDPT_GetIdevarsToCSBX
 %ifndef MODULE_SERIAL
     mov     al, g_szDeviceTypeValues_Displacement
@@ -155 +151 @@
 ;       Nothing (falls to next push below)
 ;   Corrupts registers:
-;       AX, BX, DX, ES
+;       AL
 ;--------------------------------------------------------------------
 .PushResetStatus:
@@ -161 +157 @@
     push    ax
 
-;;; fall-out to BootMenuPrint_HardDiskRefreshInformation.
+;;; fall-out to BootMenuPrint_RefreshInformation.

trunk/XTIDE_Universal_BIOS/Src/Menus/HotkeyBar.asm

@@ -33 +33 @@
 ;       Nothing
 ;   Corrupts registers:
-;       AX, CX, DX, SI, DI
-;--------------------------------------------------------------------
+;       Nothing
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
 HotkeyBar_TimerTickHandler:
     push    es
@@ -56 +57 @@
     ; Call previous handler
     pushf
-    call far [es:BOOTVARS.hotkeyVars+HOTKEYVARS.fpPrevTimerHandler]
+    call    FAR [es:BOOTVARS.hotkeyVars+HOTKEYVARS.fpPrevTimerHandler]
 
     ; Update Hotkeybar (process key input and draw) every fourth tick
@@ -98 +99 @@
     mov     BYTE [RAMVARS.bTimeoutTicksLeft], 0
 .ContinueDrawing:
-    
     ; Fall to HotkeyBar_DrawToTopOfScreen
 
@@ -141 +141 @@
 
     ; Clear CH if floppy drive is selected for boot
+%if 0 ; Not needed until more flags added
+    mov     ch, FLG_HOTKEY_HD_FIRST
+    and     ch, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFlags]
+%else
     mov     ch, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.bFlags]
-    ;and        ch, FLG_HOTKEY_HD_FIRST; Not needed until more flags added
+%endif
     call    FormatDriveHotkeyString
 
@@ -428 +432 @@
 
     ; Store system 1Ch Timer Tick handler and install our hotkeybar handler
-    mov     ax, [SYSTEM_TIMER_TICK*4]
+    mov     ax, [BIOS_SYSTEM_TIMER_TICK_INTERRUPT_1Ch*4]
     mov     [BOOTVARS.hotkeyVars+HOTKEYVARS.fpPrevTimerHandler], ax
-    mov     ax, [SYSTEM_TIMER_TICK*4+2]
+    mov     ax, [BIOS_SYSTEM_TIMER_TICK_INTERRUPT_1Ch*4+2]
     mov     [BOOTVARS.hotkeyVars+HOTKEYVARS.fpPrevTimerHandler+2], ax
-    mov     al, SYSTEM_TIMER_TICK
+    mov     al, BIOS_SYSTEM_TIMER_TICK_INTERRUPT_1Ch
     mov     si, HotkeyBar_TimerTickHandler
     call    Interrupts_InstallHandlerToVectorInALFromCSSI