Changeset 621 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/IdeControllerMenu.asm

Timestamp:

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

Author:

krille_n_

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/Menupages/IdeControllerMenu.asm (modified) (4 diffs)

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/IdeControllerMenu.asm

@@ -300 +300 @@
 IdeControllerMenu_InitializeToIdevarsOffsetInBX:
     lea     ax, [bx+IDEVARS.drvParamsMaster]
-    mov     [cs:g_MenuitemIdeControllerMasterDrive+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
+    mov     [g_MenuitemIdeControllerMasterDrive+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
 
     lea     ax, [bx+IDEVARS.drvParamsSlave]
-    mov     [cs:g_MenuitemIdeControllerSlaveDrive+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
+    mov     [g_MenuitemIdeControllerSlaveDrive+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
 
     lea     ax, [bx+IDEVARS.bDevice]
-    mov     [cs:g_MenuitemIdeControllerDevice+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
+    mov     [g_MenuitemIdeControllerDevice+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
 
 %ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
 %if IDEVARS.wBasePort = 0
-    mov     [cs:g_MenuitemIdeControllerCommandBlockAddress+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], bx
+    mov     [g_MenuitemIdeControllerCommandBlockAddress+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], bx
 %else
     lea     ax, [bx+IDEVARS.wBasePort]
-    mov     [cs:g_MenuitemIdeControllerCommandBlockAddress+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
+    mov     [g_MenuitemIdeControllerCommandBlockAddress+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
 %endif
 
 %if IDEVARS.bSerialPort = 0
-    mov     [cs:g_MenuitemIdeControllerSerialPort+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], bx
+    mov     [g_MenuitemIdeControllerSerialPort+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], bx
 %else
     lea     ax, [bx+IDEVARS.bSerialPort]
-    mov     [cs:g_MenuitemIdeControllerSerialPort+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
+    mov     [g_MenuitemIdeControllerSerialPort+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
 %endif
 %endif
 
     lea     ax, [bx+IDEVARS.bSerialBaud]
-    mov     [cs:g_MenuitemIdeControllerSerialBaud+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
+    mov     [g_MenuitemIdeControllerSerialBaud+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
 
     lea     ax, [bx+IDEVARS.wControlBlockPort]
-    mov     [cs:g_MenuitemIdeControllerControlBlockAddress+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
+    mov     [g_MenuitemIdeControllerControlBlockAddress+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
 
     lea     ax, [bx+IDEVARS.bSerialCOMPortChar]
-    mov     [cs:g_MenuitemIdeControllerSerialCOM+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
+    mov     [g_MenuitemIdeControllerSerialCOM+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
 
     lea     ax, [bx+IDEVARS.bIRQ]
-    mov     [cs:g_MenuitemIdeControllerEnableInterrupt+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
-    mov     [cs:g_MenuitemIdeControllerIdeIRQ+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
+    mov     [g_MenuitemIdeControllerEnableInterrupt+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
+    mov     [g_MenuitemIdeControllerIdeIRQ+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset], ax
 
     ret
@@ -512 +512 @@
     mov     bx, g_MenuitemMasterSlaveDisableDetection
     call    DisableMenuitemFromCSBX
-    mov     bx, [cs:g_MenuitemIdeControllerMasterDrive+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset]
+    mov     bx, [g_MenuitemIdeControllerMasterDrive+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset]
     jmp     SHORT DisplayMasterSlaveMenu
 
@@ -519 +519 @@
     mov     bx, g_MenuitemMasterSlaveDisableDetection
     call    EnableMenuitemFromCSBX
-    mov     bx, [cs:g_MenuitemIdeControllerSlaveDrive+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset]
+    mov     bx, [g_MenuitemIdeControllerSlaveDrive+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset]
     ; Fall to DisplayMasterSlaveMenu
 
@@ -566 +566 @@
     ; Standard ATA controllers, including 8-bit mode
 .StandardIdeDevice:
-    ; Enable IRQ for standard ATA
+    ; Enable IRQ for standard ATA, but only if MODULE_IRQ is included
 
     lea     ax, [di-ROMVARS.ideVars0+IDEVARS.wBasePort]
     mov     bl, IDEVARS_size
     div     bl
+
+    test    BYTE [es:ROMVARS.wFlags+1], FLG_ROMVARS_MODULE_IRQ >> 8
+    jz      SHORT .DoNotEnableIrq
+
+    mov     bx, .rgbDefaultIrqForStdIde         ; Enable interrupt for primary and secondary IDE
     push    ax
-    mov     bx, .rgbDefaultIrqForStdIde         ; Enable interrupt for primary and secondary IDE
     xlat
     mov     [es:di+IDEVARS.bIRQ-IDEVARS.wBasePort], al
     pop     ax
-    sub     bx, BYTE .rgbDefaultIrqForStdIde - .rgbLowByteOfStdIdeInterfacePorts
-    xlat                                        ; DS=CS so no segment override needed
+
+.DoNotEnableIrq:
+    mov     bx, .rgbLowByteOfStdIdeInterfacePorts
+    xlat
     mov     ah, 1                               ; DEVICE_ATA_*_PORT >> 8
     mov     bh, 3                               ; DEVICE_ATA_*_PORTCTRL >> 8