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

Timestamp:

Jun 10, 2021, 4:56:34 PM (3 years ago)

Author:

krille_n_

Message:

Changes:

• BIOSDRVS should now build again (broke in r613).
• Removed the NO_ATAID_CORRECTION define from the Tiny build.
• Added a new configuration option to skip detection of slave drives.
• Made FLASH_SIGNATURE 2 bytes shorter to free up ROM space.
• "Auto Configure" in XTIDECFG should now detect if running on an Olivetti M24, AT&T PC6300, Xerox 6060 or Logabax Persona 1600 and automatically select the fastest compatible transfer mode/device type for any IDE controllers found in the system.
• Cleaned out some duplicate/unused definitions.

File:

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

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/IdeControllerMenu.asm

@@ -475 +475 @@
 ;--------------------------------------------------------------------
 .EnableOrDisableSerial:
-    mov     bx, g_MenuitemIdeControllerSerialBaud
-    call    DisableMenuitemFromCSBX
-
-    mov     bx, g_MenuitemIdeControllerSerialCOM
-    call    DisableMenuitemFromCSBX
-
-    mov     bx, g_MenuitemIdeControllerSerialPort
-    call    DisableMenuitemFromCSBX
-
     mov     bx, [g_MenuitemIdeControllerDevice+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset]
     call    Buffers_GetRomvarsValueToAXfromOffsetInBX
     cmp     al, DEVICE_SERIAL_PORT
-    jne     SHORT .DisableAllSerial
-
-    mov     bx, g_MenuitemIdeControllerSerialCOM
-    call    EnableMenuitemFromCSBX
-
-    mov     bx, g_MenuitemIdeControllerSerialBaud
-    call    EnableMenuitemFromCSBX
-
+    mov     ax, DisableMenuitemFromCSBX
+    jne     SHORT .DisableSerialControllerMenuitems
+    mov     ax, EnableMenuitemFromCSBX
+    call    .EnableSerialControllerMenuitems
     mov     bx, [g_MenuitemIdeControllerSerialCOM+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset]
     call    Buffers_GetRomvarsValueToAXfromOffsetInBX
+    cmp     al, 'x'
+    mov     ax, DisableMenuitemFromCSBX
+    jne     SHORT .DisableCustomPortMenuitem
+    ret
+.DisableSerialControllerMenuitems:
+.EnableSerialControllerMenuitems:
+    mov     bx, g_MenuitemIdeControllerSerialCOM
+    call    ax
+    mov     bx, g_MenuitemIdeControllerSerialBaud
+    call    ax
+.DisableCustomPortMenuitem:
     mov     bx, g_MenuitemIdeControllerSerialPort
-    cmp     al, 'x'
-    je      SHORT .EnableMenuitemFromCSBX
-    jmp     SHORT .DisableMenuitemFromCSBX
-.DisableAllSerial:
-    ret
+    jmp     ax
 
 
@@ -516 +510 @@
 ALIGN JUMP_ALIGN
 MasterDrive:
+    mov     bx, g_MenuitemMasterSlaveDisableDetection
+    call    DisableMenuitemFromCSBX
     mov     bx, [cs:g_MenuitemIdeControllerMasterDrive+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset]
     jmp     SHORT DisplayMasterSlaveMenu
@@ -521 +517 @@
 ALIGN JUMP_ALIGN
 SlaveDrive:
+    mov     bx, g_MenuitemMasterSlaveDisableDetection
+    call    EnableMenuitemFromCSBX
     mov     bx, [cs:g_MenuitemIdeControllerSlaveDrive+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset]
     ; Fall to DisplayMasterSlaveMenu
 
-ALIGN JUMP_ALIGN
 DisplayMasterSlaveMenu:
-;
-; "Block Mode Transfers" and "Internal Write Cache" are not supported on serial drives, disable/enable the options as appropriate
-;
-    push    bx
-    mov     bx, [cs:g_MenuitemIdeControllerDevice+MENUITEM.itemValue+ITEM_VALUE.wRomvarsValueOffset]
-    call    Buffers_GetRomvarsValueToAXfromOffsetInBX
-    mov     bx, g_MenuitemMasterSlaveBlockModeTransfers
-
-    cmp     al, DEVICE_SERIAL_PORT
-    je      .isSerial
-
-    call    EnableMenuitemFromCSBX
-    mov     bx, g_MenuitemMasterSlaveWriteCache
-    call    EnableMenuitemFromCSBX
-    jmp     .isDone
-
-.isSerial:
-    call    DisableMenuitemFromCSBX
-    mov     bx, g_MenuitemMasterSlaveWriteCache
-    call    DisableMenuitemFromCSBX
-
-.isDone:
-    pop     bx
-
     call    MasterSlaveMenu_InitializeToDrvparamsOffsetInBX
     jmp     MasterSlaveMenu_EnterMenuOrModifyItemVisibility
@@ -657 +630 @@
     mov     ax, DEVICE_XTIDE_DEFAULT_PORT       ; Defaults for 8-bit XTIDE and XT-CF devices
     mov     bx, DEVICE_XTIDE_DEFAULT_PORTCTRL
-    
+
     ; XT-CF does not support IRQ so it must be disabled (IRQ setting is not visible for XT-CF)
     ; XTIDE does not use IRQs by default