Changeset 621 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/EEPROM.asm

Timestamp:

Nov 21, 2021, 2:15:32 PM (3 years ago)

Author:

Krister Nordvall

Message:

Changes:

• Fixed three different bugs all causing the boot menu to show drives using IRQs even though the BIOS had been built without MODULE_IRQ.
• Fixed two bugs in XTIDECFG where loading a BIOS from file and then loading the old settings from EEPROM would
  • overwrite ROMVARS.wFlags in the loaded BIOS file (in RAM). The possibly resulting mismatch of module flags could make it impossible to change settings for modules included in the BIOS or allow changing settings for modules not included in the BIOS.
  • not copy the color theme over to the loaded BIOS.
• Also fixed two very minor bugs in XTIDECFG in BiosFile_LoadFileFromDSSItoRamBuffer and BiosFile_SaveRamBufferToFileInDSSI where the error handling in these routines would close whatever file handle that happened to match the error code returned by DOS in AX.
• Made significant changes to the new flash ROM programming routines to reduce the size. Also fixed a minor bug that would cause the second verification to be skipped and return success when programming a 64 KB block of data.
• Changed the custom BIOS build file names to the 8.3 format.
• Changed some help strings in XTIDECFG to clarify things.
• Other minor optimizations and fixes.

File:

• trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/EEPROM.asm (modified) (4 diffs)

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/EEPROM.asm

@@ -99 +99 @@
 ALIGN JUMP_ALIGN
 EEPROM_LoadOldSettingsFromRomToRamBuffer:
-    mov     cx, ROMVARS_size - ROMVARS.wFlags   ; Number of bytes to load
-    mov     si, ROMVARS.wFlags                  ; Offset where to start loading
+    mov     cx, ROMVARS_size - ROMVARS.wFlags - 2   ; Number of bytes to load
+    mov     si, ROMVARS.wFlags + 2                  ; Offset where to start loading
     ; Fall to LoadBytesFromRomToRamBuffer
 
@@ -123 +123 @@
     jc      SHORT .XtideUniversalBiosNotFound
     push    es
-    pop     ds                                          ; DS:SI points to ROM
+    pop     ds                                      ; DS:SI points to ROM
 
     call    Buffers_GetFileBufferToESDI
-    mov     di, si                                      ; ES:DI points to RAM buffer
+    mov     di, si                                  ; ES:DI points to RAM buffer
 
 %ifdef CLD_NEEDED
     cld
 %endif
-    call    Memory_CopyCXbytesFromDSSItoESDI            ; Clears CF
+    call    Memory_CopyCXbytesFromDSSItoESDI        ; Clears CF
 
 .XtideUniversalBiosNotFound:
@@ -163 +163 @@
     call    Buffers_IsXtideUniversalBiosSignatureInESDI
     je      SHORT .RomFound         ; If equal, CF=0
-    add     bx, 80h                 ; Increment by 2kB (minimum possible distance from the beginning of one option ROM to the next)
-    jnc     SHORT .SegmentLoop      ; Loop until segment overflows
+    sub     bx, -80h                ; Increment by 2kB (minimum possible distance from the beginning of one option ROM to the next)
+    jc      SHORT .SegmentLoop      ; Loop until segment overflows
+    stc
 .RomFound:
     pop     cx
@@ -185 +186 @@
     push    ds
 
-    mov     ds, [cs:g_cfgVars+CFGVARS.wEepromSegment]
+    eMOVZX  bx, [g_cfgVars+CFGVARS.bEepromType]
+    mov     cx, [bx+g_rgwEepromTypeToSizeInWords]
+    mov     ds, [g_cfgVars+CFGVARS.wEepromSegment]
     xor     si, si
     call    Buffers_GetFlashComparisonBufferToESDI
-    eMOVZX  bx, [cs:g_cfgVars+CFGVARS.bEepromType]
 %ifdef CLD_NEEDED
     cld
 %endif
-    mov     cx, [cs:bx+g_rgwEepromTypeToSizeInWords]
     rep movsw