Changeset 593 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS_Configurator_v2

Timestamp:

Jun 30, 2018, 8:27:04 AM (6 years ago)

Author:

aitotat

Message:

Flashing now works again.
Hack to get Windows 95 to work properly (MODULE_WIN95_CMOS_HACK included for 386 builds by default).
Edited makefile to produce large 386 build.
Fixed recovery time for QDI Vision VLB-IDE controllers.
No more warnings with Nasm 2.13.xx and later.
File dialog now properly restores default drive when file selection is cancelled.

Location:

trunk/XTIDE_Universal_BIOS_Configurator_v2

Files:

• Inc/MenuStructs.inc (modified) (2 diffs)
• Src/EEPROM.asm (modified) (1 diff)
• Src/Flash.asm (modified) (3 diffs)
• Src/Main.asm (modified) (3 diffs)
• Src/Menupages/FlashMenu.asm (modified) (1 diff)
• makefile (modified) (1 diff)

trunk/XTIDE_Universal_BIOS_Configurator_v2/Inc/MenuStructs.inc

@@ -20 +20 @@
 %ifndef MENU_STRUCTS_INC
 %define MENU_STRUCTS_INC
+
+struc ITEM_VALUE
+    .wRomvarsValueOffset    resb    2   ; ROMVARS offset to actual value to be configured
+    .szDialogTitle          resb    2   ; Dialog title string
+
+    .szMultichoice          resb    2   ; Multiple choices in one string
+    .rgwChoiceToValueLookup resb    2   ; Ptr to lookup table for translating selected choice to actual value
+    .rgszValueToStringLookup:           ; Ptr to lookup table for translating value to string
+    .rgszChoiceToStringLookup:
+    .wMinValue              resb    2   ; Minimum allowed integer value
+    .wMaxValue:
+    .wValueBitmask          resb    2   ; Bitmask for item value flag or field
+    .fnValueReader          resb    2   ; Called just after ROMVARS is read, providing a hook for further action
+    .fnValueWriter          resb    2   ; Called just before ROMVARS is written, providing a hook for further action
+    .bFieldPosition         resb    1   ; Bit field position
+endstruc
 
 struc MENUPAGE
@@ -61 +77 @@
 
 
-struc ITEM_VALUE
-    .wRomvarsValueOffset    resb    2   ; ROMVARS offset to actual value to be configured
-    .szDialogTitle          resb    2   ; Dialog title string
-
-    .szMultichoice          resb    2   ; Multiple choices in one string
-    .rgwChoiceToValueLookup resb    2   ; Ptr to lookup table for translating selected choice to actual value
-    .rgszValueToStringLookup:           ; Ptr to lookup table for translating value to string
-    .rgszChoiceToStringLookup:
-    .wMinValue              resb    2   ; Minimum allowed integer value
-    .wMaxValue:
-    .wValueBitmask          resb    2   ; Bitmask for item value flag or field
-    .fnValueReader          resb    2   ; Called just after ROMVARS is read, providing a hook for further action
-    .fnValueWriter          resb    2   ; Called just before ROMVARS is written, providing a hook for further action
-    .bFieldPosition         resb    1   ; Bit field position
-endstruc
-
-
 %endif ; MENU_STRUCTS_INC

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/EEPROM.asm

@@ -189 +189 @@
     cld
 %endif
-;%if g_rgwEepromTypeToSizeInWords = 0   ; *FIXME* It really is but NASM won't accept this.
-    mov     cx, [cs:bx]
-;%else
-;   mov     cx, [cs:bx+g_rgwEepromTypeToSizeInWords]
-;%endif
+    mov     cx, [cs:bx+g_rgwEepromTypeToSizeInWords]
     rep movsw
 

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Flash.asm

@@ -292 +292 @@
     loop    .WriteActualDataByteAfterSdpCommand
     sti                     ; Enable interrupts
-    ; Fall to WaitUntilEepromPageWriteHasCompleted
+    ; Fall to .WaitUntilEepromPageWriteHasCompleted
 
 
@@ -305 +305 @@
 ;       AX, BX, DI, DS, ES
 ;--------------------------------------------------------------------
-ALIGN JUMP_ALIGN
-WaitUntilEepromPageWriteHasCompleted:
+.WaitUntilEepromPageWriteHasCompleted:
     push    ss
     pop     ds
@@ -325 +324 @@
     ret
 
+
 ;--------------------------------------------------------------------
 ; DisplayFlashProgressWithPagesLeftInCXandFlashvarsInSSBP

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Main.asm

@@ -85 +85 @@
     ret
 .DosVersionIsOK:
+    mov     [bDosVersionMajor], al                  ; bDosVersionMajor must be initialized by the application (library code depends on it)
+    cmp     al, 5
+    jb      SHORT .DoNotInstallInt2FhHandler
+    ; Since we are installing our Int2Fh handler we must also hook interrupt 23h to ensure a clean exit on ctrl-c/ctrl-break
+    call    HookInterrupt23h
+    call    HookInterrupt2Fh
+.DoNotInstallInt2FhHandler:
 
     mov     ax, SCREEN_BACKGROUND_CHARACTER_AND_ATTRIBUTE
@@ -93 +100 @@
     mov     ax, DOS_BACKGROUND_CHARACTER_AND_ATTRIBUTE
     call    InitializeScreenWithBackgroundCharAndAttrInAX
+
+    call    UnhookInterrupt2Fh
 
     ; Exit to DOS
@@ -156 +165 @@
 ; Section containing uninitialized data
 SECTION .bss
+
+bDosVersionMajor:   resb    1
+

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/FlashMenu.asm

@@ -346 +346 @@
 .GetSelectedEepromSizeInWordsToAX:
     eMOVZX  bx, [cs:g_cfgVars+CFGVARS.bEepromType]
-;%if g_rgwEepromTypeToSizeInWords = 0   ; *FIXME* It really is but NASM won't accept this.
-    mov     ax, [cs:bx]
-;%else
-;   mov     ax, [cs:bx+g_rgwEepromTypeToSizeInWords]
-;%endif
+    mov     ax, [cs:bx+g_rgwEepromTypeToSizeInWords]
     ret
+
 
 ;--------------------------------------------------------------------

trunk/XTIDE_Universal_BIOS_Configurator_v2/makefile

@@ -54 +54 @@
 # Assembler preprocessor defines.                               #
 #################################################################
-DEFINES = EXCLUDE_FROM_XTIDECFG
+DEFINES = EXCLUDE_FROM_XTIDECFG CLD_NEEDED
 DEFINES_XT = ELIMINATE_CGA_SNOW
 DEFINES_XTPLUS = USE_186 ELIMINATE_CGA_SNOW