Changeset 604 in xtideuniversalbios

Timestamp:

Dec 15, 2020, 10:17:38 PM (4 years ago)

Author:

Krister Nordvall

Message:

Changes:

• HotkeyBar_TimerTickHandler now uses interrupt 08h instead of interrupt 1Ch and that seems to have finally fixed the problem with hangs in MODULE_HOTKEYS from r599.

Location:

trunk/XTIDE_Universal_BIOS/Src

Files:

• Handlers/Int19h.asm (modified) (1 diff)
• Menus/HotkeyBar.asm (modified) (8 diffs)

trunk/XTIDE_Universal_BIOS/Src/Handlers/Int19h.asm

@@ -106 +106 @@
     cli
     mov     ax, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.fpPrevTimerHandler]
-    mov     [es:BIOS_USER_TIMER_TICK_INTERRUPT_1Ch*4], ax
+    mov     [es:BIOS_SYSTEM_TIMER_TICK_INTERRUPT_08h*4], ax
     mov     ax, [es:BOOTVARS.hotkeyVars+HOTKEYVARS.fpPrevTimerHandler+2]
-    mov     [es:BIOS_USER_TIMER_TICK_INTERRUPT_1Ch*4+2], ax
+    mov     [es:BIOS_SYSTEM_TIMER_TICK_INTERRUPT_08h*4+2], ax
     sti
 %endif

trunk/XTIDE_Universal_BIOS/Src/Menus/HotkeyBar.asm

@@ -23 +23 @@
 
 ;--------------------------------------------------------------------
-; Handler for INT 1Ch User Timer Tick.
+; Handler for INT 08h System Timer Tick.
 ; Reads key presses and draws hotkey bar.
 ;
@@ -40 +40 @@
     push    ax
 %endif
-
-    ;!!! Keep interrupts disabled so there won't be another
-    ; timer tick call before we are ready
-
     LOAD_BDA_SEGMENT_TO es, ax
 
@@ -123 +119 @@
 
     ; Move cursor to top left corner (0, 0)
-    xor     ax, ax
+    mov     ax, es
     call    HotkeyBar_SetCursorCoordinatesFromAX
     ; Fall to .PrintFloppyDriveHotkeys
@@ -265 +261 @@
 ; FormatDriveHotkeyString
 ;   Parameters:
-;       CH:         Zero if letter in CL is selected for boot
-;       CL:         Drive letter hotkey from BOOTVARS
-;       AL:         First character for drive key string
-;       AH:         Second character for drive key string (ANGLE_QUOTE_RIGHT)
-;       SI:         Offset to hotkey description string
-;       ES:         BDA segment (zero)
+;       CH:     Zero if letter in CL is selected for boot
+;       CL:     Drive letter hotkey from BOOTVARS
+;       AL:     First character for drive key string
+;       AH:     Second character for drive key string (ANGLE_QUOTE_RIGHT)
+;       SI:     Offset to hotkey description string
+;       ES:     BDA segment (zero)
 ;   Returns:
 ;       Nothing
@@ -292 +288 @@
 ; FormatFunctionHotkeyString
 ;   Parameters:
-;       AL:         Scancode of function key, to know which if any to show as selected
-;                   Later replaced with an 'F' for the call to the output routine
-;       AH:         Second character for drive key string
-;       SI:         Offset to hotkey description string
-;       ES:         BDA segment (zero)
+;       AL:     Scancode of function key, to know which if any to show as selected
+;               Later replaced with an 'F' for the call to the output routine
+;       AH:     Second character for drive key string
+;       SI:     Offset to hotkey description string
+;       ES:     BDA segment (zero)
 ;   Returns:
 ;       Nothing
@@ -350 +346 @@
 ; PushHotkeyParamsAndFormat
 ;   Parameters:
-;       AL:         First character
-;       AH:         Second character
-;       DX:         Description Attribute
-;       CX:         Description string parameter
-;       CS:DI:      Description string
+;       AL:     First character
+;       AH:     Second character
+;       DX:     Description Attribute
+;       CX:     Description string parameter
+;       CS:DI:  Description string
 ;   Returns:
 ;       Nothing
@@ -413 +409 @@
     pop     ds
 
-    ; Store system 1Ch Timer Tick handler and install our hotkeybar handler
-    mov     ax, [BIOS_USER_TIMER_TICK_INTERRUPT_1Ch*4]
+    ; Store System Timer Tick handler and install our hotkeybar handler
+    mov     ax, [BIOS_SYSTEM_TIMER_TICK_INTERRUPT_08h*4]
     mov     [BOOTVARS.hotkeyVars+HOTKEYVARS.fpPrevTimerHandler], ax
-    mov     ax, [BIOS_USER_TIMER_TICK_INTERRUPT_1Ch*4+2]
+    mov     ax, [BIOS_SYSTEM_TIMER_TICK_INTERRUPT_08h*4+2]
     mov     [BOOTVARS.hotkeyVars+HOTKEYVARS.fpPrevTimerHandler+2], ax
-    mov     al, BIOS_USER_TIMER_TICK_INTERRUPT_1Ch
+    mov     al, BIOS_SYSTEM_TIMER_TICK_INTERRUPT_08h
     mov     si, HotkeyBar_TimerTickHandler
     call    Interrupts_InstallHandlerToVectorInALFromCSSI
@@ -424 +420 @@
     ; Store time when hotkeybar is displayed
     ; (it will be displayed after initialization is complete)
-    call    TimerTicks_ReadFromBdaToAX
+    mov     ax, [BDA.dwTimerTicks]
     mov     [BOOTVARS.hotkeyVars+HOTKEYVARS.wTimeWhenDisplayed], ax