Changeset 638 in xtideuniversalbios

Timestamp:

Jun 9, 2026, 10:36:36 AM (7 weeks ago)

Author:

Krister Nordvall

Message:

Changes:

• Created MODULE_ATAPI which adds a very simplistic detection of ATAPI devices. This is WIP so it's not included in any builds because I'm not able to test it and the chances of it working are slim to none.
• The ATAID validation failing for a drive was very confusing because the BIOS would just say "not found" as if the drive had not been detected at all. This has now been changed to "failed validation" instead. This doesn't actually change anything for users of the official builds since the NO_ATAID_VALIDATION define is still enabled for these builds due to several models of WD Caviar drives being incompatible with (failing) the validation check.
• Added a special set of defines to the BIOS makefile specifically for use with 'make strings' - it used to depend on the set of defines for the Large AT-build. This allows adding new defines/build options as needed to ensure compression of all strings that should be compressed without otherwise affecting any of the BIOS builds.
• Another major change to the BIOS makefile is that BIOS build sizes are no longer sent as parameters to NASM or checksum.pl. NASM will compute BIOS_SIZE and CNT_ROM_BLOCKS itself which means that all BIOS builds are now always made with the minimum possible size regardless of their designation as Tiny, Small or Large builds.
• This also required changes to checksum.pl since it expected the size as the second parameter - it will now extract the size from the BIOS binary instead. A couple of bugs was also fixed; 1) the error handling for opening the BIOS files did not work (at least not on my system) - the "file not found" message could not be triggered. 2) the compatibility fix for 3Com 3C503 cards would not be applied if the BIOS file size was exactly 8189 bytes.
• Added a proper ROMVARS flag for MODULE_MFM_COMPATIBILITY (FLG_ROMVARS_MODULE_MFM_COMPATIBILITY) and made the visibility of the 'Remove other hard drives' Boot settings menu item depend on it. If this module is included in the BIOS build then the menu item will not be available simply because they can't be used together. Also added a check to 'Auto Configure' to warn users when using BIOS builds with this module included if it conflicts with the need for having 'Remove other hard drives' set to YES.
• The visibility of the Color Theme menu item now depends on the Display Mode setting in addition to MODULE_BOOT_MENU being included in the BIOS build. Selecting the Monochrome mode or one of the Black & White modes will hide it.
• Added five new color themes.
• Removed a sentence in g_szHelpBootTimeout stating that the Boot Menu timeout can be disabled by setting it to zero when in fact doing so is not even possible.
• BIOS builds made with USE_386 but without USE_AT will now identify themselves as (386), not (XT+).
• The macros in IdeIO.inc handling IDE registers (OUTPUT_AL_TO_IDE_REGISTER, OUTPUT_AL_TO_IDE_CONTROL_BLOCK_REGISTER and INPUT_TO_AL_FROM_IDE_REGISTER) has been extended to also accept DX and DL as parameters.
• A few minor optimizations and fixes.

Location:

trunk

Files:

• Assembly_Library/Src/Display/DisplayCursor.asm (modified) (2 diffs)
• Assembly_Library/Src/Menu/MenuAttributes.asm (modified) (2 diffs)
• Assembly_Library/Src/Menu/MenuCharOut.asm (modified) (3 diffs)
• Tools/checksum.pl (modified) (5 diffs)
• XTIDE_Universal_BIOS/Inc/IdeIO.inc (modified) (13 diffs)
• XTIDE_Universal_BIOS/Inc/IdeRegisters.inc (modified) (3 diffs)
• XTIDE_Universal_BIOS/Inc/ModuleDependency.inc (modified) (2 diffs)
• XTIDE_Universal_BIOS/Inc/Revision.inc (modified) (1 diff)
• XTIDE_Universal_BIOS/Inc/RomVars.inc (modified) (3 diffs)
• XTIDE_Universal_BIOS/Inc/Version.inc (modified) (4 diffs)
• XTIDE_Universal_BIOS/Src/Device/Device.asm (modified) (3 diffs)
• XTIDE_Universal_BIOS/Src/Device/IDE/IdeCommand.asm (modified) (7 diffs)
• XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm (modified) (5 diffs)
• XTIDE_Universal_BIOS/Src/Initialization/DetectPrint.asm (modified) (2 diffs)
• XTIDE_Universal_BIOS/Src/Main.asm (modified) (2 diffs)
• XTIDE_Universal_BIOS/Src/Strings.asm (modified) (3 diffs)
• XTIDE_Universal_BIOS/Src/StringsCompressed.asm (modified) (10 diffs)
• XTIDE_Universal_BIOS/makefile (modified) (7 diffs)
• XTIDE_Universal_BIOS_Configurator_v2/Src/AutoConfigure.asm (modified) (2 diffs)
• XTIDE_Universal_BIOS_Configurator_v2/Src/Menupage.asm (modified) (2 diffs)
• XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/BootMenuSettingsMenu.asm (modified) (9 diffs)
• XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm (modified) (5 diffs)

trunk/Assembly_Library/Src/Display/DisplayCursor.asm

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2013 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -77 +77 @@
 DisplayCursor_SetCoordinatesFromAX:
     xchg    dx, ax
-    mov     ax, [VIDEO_BDA.wColumns]        ; Column count, 40 or 80
+    mov     al, [VIDEO_BDA.wColumns]        ; Column count, 40 or 80
     mul     dh                              ; AX = Column count * row index
     xor     dh, dh

trunk/Assembly_Library/Src/Menu/MenuAttributes.asm

@@ -107 +107 @@
     jc      SHORT .LoadColorAttribute
 
+%ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
 %if (rgcColorAttributes-$$) & 0FF00h = (rgcMonochromeAttributes-$$) & 0FF00h    ; Are the base addresses of all three strucs on the same page?
 %ifndef ORIGIN
@@ -143 +144 @@
 .LoadAttributeAndReturn:
 %endif
+%endif ; CHECK_FOR_UNUSED_ENTRYPOINTS
     cs lodsb                            ; Load from [CS:SI] to AL
 

trunk/Assembly_Library/Src/Menu/MenuCharOut.asm

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2025 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -50 +50 @@
 MenuCharOut_MenuTeletypeOutput:
     cmp     al, CR
-    je      SHORT PrintCRandAdjustOffsetForStartOfLine
+    je      SHORT PrintCRandAdjustOffsetForStartOfLine.CRinAL
     jmp     DisplayCharOut_TeletypeOutputWithAttribute
 
@@ -77 +77 @@
 PrintCRandAdjustOffsetForStartOfLine:
     mov     al, CR
+.CRinAL:
     call    DisplayCharOut_BiosTeletypeOutput
     eMOVZX  ax, BYTE [VIDEO_BDA.displayContext+DISPLAY_CONTEXT.wCharOutParam]

trunk/Tools/checksum.pl

@@ -6 +6 @@
 #!perl
 #
-# Add checksum byte to ROM image
+# Add checksum byte(s) to PC Option ROM image
 #
-# Use a size of 0 to skip this script entirely (file is not modified)
-#
-# On Windows, this file can be renamed to a batch file and invoked directly (for example, "c:\>checksum file size")
+# On Windows, this file can be renamed to a batch file and invoked directly (for example, "C:\>checksum filename")
 #
 
 #
 # XTIDE Universal BIOS and Associated Tools
-# Copyright (C) 2009-2010 by Tomi Tilli, 2011-2013 by XTIDE Universal BIOS Team.
+# Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -29 +27 @@
 #
 
-($ARGV[0] ne "" && $ARGV[1] ne "") || die "usage: checksum filename size\n";
+$ARGV[0] ne "" || die "usage: checksum filename\n";
 
-$desiredSize = int($ARGV[1]);
-
-if( $desiredSize == 0 )
+$ok = open ( FILE, "+<".$ARGV[0] );
+if( $ok == 0 )
 {
-    exit( 0 );
+    die "ERROR: failed to open ".$ARGV[0]."\n";
 }
 
-open FILE, "+<".$ARGV[0] || die "file not found\n";
 binmode FILE;
-$cs = 0;
-$last = 0;
-$bytes = 0;
+seek( FILE, 2, 0 );
+read( FILE, $biosSize, 1 );
+$biosSize = ord($biosSize) << 9;
+if( $biosSize & 2047 )
+{
+    die "ERROR: image is not a valid PC Option ROM BIOS\n";
+}
+
+seek( FILE, 0, 0 );
 while( ($n = read( FILE, $d, 1 )) != 0 )
 {
-    $cs = $cs + ord($d);
-    $cs = $cs % 256;
-    $bytes = $bytes + 1;
+    $cs = ($cs + ord($d)) & 255;
+    $bytes++;
 }
 $oldBytes = $bytes;
 
-if( $bytes > $desiredSize - 1 )
+if( $bytes > $biosSize - 1 )
 {
-    die "ERROR: image is bigger than ".($desiredSize-1).": $bytes\n";
+    die "ERROR: image is bigger than ".($biosSize-1).": $bytes\n";
 }
 
 $fixzero = chr(0);
+$fixl = ($cs == 0 ? 0 : 256 - $cs);
 
 #
 # Compatibility fix for 3Com 3C503 cards. They use 8 KB ROMs and return 8080h as the last word of the ROM.
 #
-if( $desiredSize == 8192 ) {
-    if( $bytes < $desiredSize - 3 ) {
-        while( $bytes < $desiredSize - 3 ) {
+if( $biosSize == 8192 ) {
+    if( $bytes <= $biosSize - 3 ) {
+        while( $bytes < $biosSize - 3 ) {
             print FILE $fixzero;
             $bytes++;
         }
-        $fixl = ($cs == 0 ? 0 : 256 - $cs);
         $fix = chr($fixl).chr($cs);
         print FILE $fix;
         $bytes += 2;
+    } elsif ( $bytes < $biosSize - 1 ) {
+        print "Warning! ".$ARGV[0]." cannot be used on a 3Com 3C503 card unless it can be checksummed manually!\n";
     } else {
         print "Warning! ".$ARGV[0]." cannot be used on a 3Com 3C503 card!\n";
@@ -76 +79 @@
 }
 
-while( $bytes < $desiredSize - 1 )
+while( $bytes < $biosSize - 1 )
 {
     print FILE $fixzero;
@@ -82 +85 @@
 }
 
-$fixl = ($cs == 0 ? 0 : 256 - $cs);
 $fix = chr($fixl);
 print FILE $fix;
@@ -91 +93 @@
 binmode FILE;
 $cs = 0;
-$newBytes = 0;
 while( ($n = read( FILE, $d, 1 )) != 0 )
 {
-    $cs = $cs + ord($d);
-    $cs = $cs % 256;
+    $cs = ($cs + ord($d)) & 255;
     $newBytes++;
 }
-$cs == 0 || die "Checksum verification failed\n";
+$cs == 0 || die "ERROR: checksum verification failed\n";
 
 print "checksum: ".$ARGV[0].": $oldBytes bytes before, $newBytes bytes after\n";

trunk/XTIDE_Universal_BIOS/Inc/IdeIO.inc

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2025 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -26 +26 @@
 ;   Parameters:
 ;       AL:     Byte to output
-;       %1:     IDE Register                (OUTPUT_AL_TO_IDE_REGISTER)
+;       %1:     DX, DL or
+;               IDE Register                (OUTPUT_AL_TO_IDE_REGISTER)
 ;               IDE Control Block Register  (OUTPUT_AL_TO_IDE_CONTROL_BLOCK_REGISTER)
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
@@ -40 +41 @@
         %ifndef previous_parameter
             %ifnidni %1, dx
-                mov     dx, %1
+                %ifidni %1, dl
+                    xor     dh, dh
+                %else
+                    mov     dx, %1
+                %endif
             %endif
             add     dx, [di+DPT.wBasePort]
@@ -50 +55 @@
         %else
             %ifnidni %1, dx
-                mov     dx, %1
+                %ifidni %1, dl
+                    xor     dh, dh
+                %else
+                    mov     dx, %1
+                %endif
             %endif
             add     dx, [di+DPT.wBasePort]
@@ -59 +68 @@
         %undef previous_parameter
         %ifnidni %1, dx
-            mov     dx, %1
+            %ifidni %1, dl
+                xor     dh, dh
+            %else
+                mov     dx, %1
+            %endif
         %endif
         add     dx, [di+DPT.wBasePort]
@@ -67 +80 @@
 %else   ; Register translations required
 
-    %ifnidni %1, dl
-        mov     dl, %1
+    %ifnidni %1, dx
+        %ifnidni %1, dl
+            mov     dl, %1
+        %endif
     %endif
     call    IdeIO_OutputALtoIdeRegisterInDL
@@ -83 +98 @@
             eMOVZX  bx, BYTE [di+DPT.bIdevarsOffset]
             %ifnidni %1, dx
-                mov     dx, %1
+                %ifidni %1, dl
+                    xor     dh, dh
+                %else
+                    mov     dx, %1
+                %endif
             %endif
             add     dx, [cs:bx+IDEVARS.wControlBlockPort]
@@ -94 +113 @@
             eMOVZX  bx, BYTE [di+DPT.bIdevarsOffset]
             %ifnidni %1, dx
-                mov     dx, %1
+                %ifidni %1, dl
+                    xor     dh, dh
+                %else
+                    mov     dx, %1
+                %endif
             %endif
             add     dx, [cs:bx+IDEVARS.wControlBlockPort]
@@ -104 +127 @@
         eMOVZX  bx, BYTE [di+DPT.bIdevarsOffset]
         %ifnidni %1, dx
-            mov     dx, %1
+            %ifidni %1, dl
+                xor     dh, dh
+            %else
+                mov     dx, %1
+            %endif
         %endif
         add     dx, [cs:bx+IDEVARS.wControlBlockPort]
@@ -112 +139 @@
 %else   ; Register translations required
 
-    %ifnidni %1, dl
-        mov     dl, %1
+    %ifnidni %1, dx
+        %ifnidni %1, dl
+            mov     dl, %1
+        %endif
     %endif
     call    IdeIO_OutputALtoIdeControlBlockRegisterInDL
@@ -124 +153 @@
 ; INPUT_TO_AL_FROM_IDE_REGISTER
 ;   Parameters:
-;       %1:     IDE Register
+;       %1:     DX, DL or IDE Register
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
 ;   Returns:
@@ -135 +164 @@
 
     %ifnidni %1, dx
-        mov     dx, %1
+        %ifidni %1, dl
+            xor     dh, dh
+        %else
+            mov     dx, %1
+        %endif
     %endif
     add     dx, [di+DPT.wBasePort]
@@ -142 +175 @@
 %else   ; Register translations required
 
-    %ifnidni %1, dl
-        mov     dl, %1
+    %ifnidni %1, dx
+        %ifnidni %1, dl
+            mov     dl, %1
+        %endif
     %endif
     call    IdeIO_InputToALfromIdeRegisterInDL

trunk/XTIDE_Universal_BIOS/Inc/IdeRegisters.inc

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2013 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -100 +100 @@
 COMMAND_IDLE                            EQU     0E3h
 
-
 ; Subcommands for COMMAND_SET_FEATURES
 FEATURE_ENABLE_8BIT_PIO_TRANSFER_MODE       EQU     01h     ; CFA feature set only
@@ -113 +112 @@
     PIO_FLOW_CONTROL_MODE_xxx               EQU     (1<<3)  ; Bits 2...0 hold the PIO mode
 
+; ATAPI device specific stuff (should probably be in its own include file)
+ATAPI_SIGNATURE                             EQU     0EB14h  ; Read from LBA_HIGH_REGISTER and LBA_MIDDLE_REGISTER
 
 %endif ; IDEREGISTERS_INC

trunk/XTIDE_Universal_BIOS/Inc/ModuleDependency.inc

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2023 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -157 +157 @@
 %endif
 
-MASK_ROMVARS_INCLUDED_MODULES   EQU MAIN_FLG_MODULE_8BIT_IDE | MAIN_FLG_MODULE_ADVANCED_ATA | MAIN_FLG_MODULE_BOOT_MENU | MAIN_FLG_MODULE_EBIOS | MAIN_FLG_MODULE_HOTKEYS | MAIN_FLG_MODULE_IRQ | MAIN_FLG_MODULE_SERIAL | MAIN_FLG_MODULE_SERIAL_FLOPPY | MAIN_FLG_MODULE_STRINGS_COMPRESSED | MAIN_FLG_MODULE_POWER_MANAGEMENT | MAIN_FLG_MODULE_8BIT_IDE_ADVANCED
+%ifdef MODULE_MFM_COMPATIBILITY
+    MAIN_FLG_MODULE_MFM_COMPATIBILITY   EQU FLG_ROMVARS_MODULE_MFM_COMPATIBILITY
+%else
+    MAIN_FLG_MODULE_MFM_COMPATIBILITY   EQU 0
+%endif
+
+MASK_ROMVARS_INCLUDED_MODULES   EQU MAIN_FLG_MODULE_8BIT_IDE | MAIN_FLG_MODULE_ADVANCED_ATA | MAIN_FLG_MODULE_BOOT_MENU | MAIN_FLG_MODULE_EBIOS | MAIN_FLG_MODULE_HOTKEYS | MAIN_FLG_MODULE_IRQ | MAIN_FLG_MODULE_SERIAL | MAIN_FLG_MODULE_SERIAL_FLOPPY | MAIN_FLG_MODULE_STRINGS_COMPRESSED | MAIN_FLG_MODULE_POWER_MANAGEMENT | MAIN_FLG_MODULE_8BIT_IDE_ADVANCED | MAIN_FLG_MODULE_MFM_COMPATIBILITY

trunk/XTIDE_Universal_BIOS/Inc/Revision.inc

@@ -1 @@
-637 
+638 

trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc

@@ -5 +5 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2025 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -198 +198 @@
 ; Here in case the configuration needs to know functionality is present. Note! Changing the order/location of these flags
 ; also requires changes elsewhere as they are usually tested using byte-accesses for efficiency.
+FLG_ROMVARS_MODULE_MFM_COMPATIBILITY    EQU (1<<4)
 FLG_ROMVARS_MODULE_POWER_MANAGEMENT     EQU (1<<5)
 FLG_ROMVARS_MODULE_8BIT_IDE             EQU (1<<6)
@@ -203 +204 @@
 FLG_ROMVARS_MODULE_ADVANCED_ATA         EQU (1<<8)
 FLG_ROMVARS_MODULE_BOOT_MENU            EQU (1<<9)
-FLG_ROMVARS_MODULE_EBIOS                EQU (1<<10)
+FLG_ROMVARS_MODULE_EBIOS                EQU (1<<10) ; Currently unused
 FLG_ROMVARS_MODULE_HOTKEYS              EQU (1<<11)
 FLG_ROMVARS_MODULE_IRQ                  EQU (1<<12)
 FLG_ROMVARS_MODULE_SERIAL               EQU (1<<13)
-FLG_ROMVARS_MODULE_SERIAL_FLOPPY        EQU (1<<14)
-FLG_ROMVARS_MODULE_STRINGS_COMPRESSED   EQU (1<<15)
+FLG_ROMVARS_MODULE_SERIAL_FLOPPY        EQU (1<<14) ; Currently unused
+FLG_ROMVARS_MODULE_STRINGS_COMPRESSED   EQU (1<<15) ; Currently unused
 
 

trunk/XTIDE_Universal_BIOS/Inc/Version.inc

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2025 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -19 +19 @@
 
 ; Flash signature revisions:
+; XUB212    Added a proper ROMVARS flag for MODULE_MFM_COMPATIBILITY (FLG_ROMVARS_MODULE_MFM_COMPATIBILITY).
+;           Added 5 new color themes.
 ; XUB211    Added device type DEVICE_8BIT_JUKO_D16X
 ; XUB210    Moved pColorTheme so it's not copied when loading old settings from EEPROM.
@@ -44 +46 @@
         %define TITLE_STRING_END    "(AT)=-"
     %endif
+%elifdef USE_386
+    %define TITLE_STRING_END    "(386)=-"
 %elifdef USE_186
     %define TITLE_STRING_END    "(XT+)=-"
@@ -57 +61 @@
 ; on the same line, either before or after. In fact, do not even put a preceding label on the same line!
 %define BUILD_DATE_STRING       "(",__DATE__,")"
-%define FLASH_SIGNATURE         "XUB211"    ; Also known as the ROMVARS version. Do not terminate with NULL.
+%define FLASH_SIGNATURE         "XUB212"    ; Also known as the ROMVARS version. Do not terminate with NULL.
 
 

trunk/XTIDE_Universal_BIOS/Src/Device/Device.asm

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2013 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -182 +182 @@
 ;--------------------------------------------------------------------
 ; Device_ReadLBAlowRegisterToAL
+;
 ; Returns LBA low register / Sector number register contents.
 ; Note that this returns valid value only after transfer command (read/write/verify)
 ; has stopped to an error. Do not call this otherwise.
+;
 ;   Parameters:
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
@@ -190 +192 @@
 ;       AL:     Byte read from the device register
 ;   Corrupts registers:
-;       BX, DX
+;       BX, DX (only DX if MODULE_ATAPI is included)
 ;--------------------------------------------------------------------
 ;%ifdef MODULE_SERIAL   ; IDE + Serial

trunk/XTIDE_Universal_BIOS/Src/Device/IDE/IdeCommand.asm

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2024 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -79 +79 @@
 ;   Returns:
 ;       AH:     INT 13h Error Code
-;       CF:     Cleared if success, Set if error
+;       CF:     Cleared if success, Set if error or ATAPI device detected
 ;   Corrupts registers:
 ;       AL, BX, CX, DX, SI, DI, ES
@@ -92 +92 @@
     mov     BYTE [di+DPT_ATA.bBlockSize], 1 ; Block = 1 sector
 
+%ifdef MODULE_ATAPI
+    push    dx
+    mov     dl, LBA_HIGH_REGISTER
+    call    IdeCommand_ReadIdeRegisterInDLtoAL
+    mov     ah, al
+    mov     dl, LBA_MIDDLE_REGISTER
+    call    IdeCommand_ReadIdeRegisterInDLtoAL
+    pop     dx
+    cmp     ax, ATAPI_SIGNATURE
+    stc
+    je      SHORT .AtapiDeviceDetected
+%endif
+
     ; Wait until drive motors have reached full speed
     cmp     bp, BYTE ROMVARS.ideVars0   ; First controller?
@@ -128 +141 @@
     lea     sp, [bp+SIZE_OF_IDEPACK_WITHOUT_INTPACK]    ; This assumes BP hasn't changed between Idepack_FakeToSSBP and here
     pop     bp
+.AtapiDeviceDetected:
     ret
 
@@ -296 +310 @@
 ;--------------------------------------------------------------------
 ; IdeCommand_ReadLBAlowRegisterToAL
+;
 ; Returns LBA low register / Sector number register contents.
 ; Note that this returns valid value only after transfer command (read/write/verify)
 ; has stopped to an error. Do not call this otherwise.
+;
 ;   Parameters:
 ;       DS:DI:  Ptr to DPT (in RAMVARS segment)
@@ -304 +320 @@
 ;       AL:     Byte read from the register
 ;   Corrupts registers:
-;       BX, DX
+;       BX, DX (only DX if MODULE_ATAPI is included)
 ;--------------------------------------------------------------------
 ALIGN JUMP_ALIGN
@@ -310 +326 @@
     ; HOB bit (defined in 48-bit address feature set) should be zero by default
     ; so we get the correct value for CHS, LBA28 and LBA48 drives and commands
+%ifndef MODULE_ATAPI
     INPUT_TO_AL_FROM_IDE_REGISTER   LBA_LOW_REGISTER
     ret
+%else
+    mov     dl, LBA_LOW_REGISTER
+    ; Fall to IdeCommand_ReadIdeRegisterInDLtoAL
+
+;--------------------------------------------------------------------
+; IdeCommand_ReadIdeRegisterInDLtoAL
+;
+;   Parameters:
+;       DL:     IDE register to read
+;       DS:DI:  Ptr to DPT (in RAMVARS segment)
+;   Returns:
+;       AL:     Byte read from the register
+;   Corrupts registers:
+;       DX
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+IdeCommand_ReadIdeRegisterInDLtoAL:
+    push    bx
+    INPUT_TO_AL_FROM_IDE_REGISTER   dl
+    pop     bx
+    ret
+%endif ; MODULE_ATAPI
+

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectDrives.asm

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2013 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -151 +151 @@
     mov     al, [es:BDA.bHDCount]
 %ifndef MODULE_MFM_COMPATIBILITY
-    ; This is excluded when MODULE_MFM_COMPATIBILITY is included because it doesn't make sense to use both at the same time anyway.
-    ; Note that the option to "Remove other hard drives" is still visible in XTIDECFG.COM for builds including MODULE_MFM_COMPATIBILITY.
-    ; Changing that option just won't do anything. We might want to remove the option for builds that contain MODULE_MFM_COMPATIBILITY
-    ; but that would require a ROMVARS flag that is probably better spent on other things.
+    ; This is excluded when MODULE_MFM_COMPATIBILITY is included because it doesn't make sense to use both at the same time.
     test    BYTE [cs:ROMVARS.wFlags], FLG_ROMVARS_CLEAR_BDA_HD_COUNT    ; Clears CF
     jz      SHORT .ContinueInitialization
@@ -263 +260 @@
 
 .ReadAtapiInfoFromDrive:                    ; Not yet implemented
+%ifdef MODULE_ATAPI
+    cmp     ax, ATAPI_SIGNATURE
+    je      SHORT DetectDrives_AtapiDeviceFound
+%endif
     ;call   ReadAtapiInfoFromDrive          ; Assume CD-ROM
     ;jnc    SHORT _CreateBiosTablesForCDROM
-
-    ;jmp    short DetectDrives_DriveNotFound
-;;; fall-through instead of previous jmp instruction
+    ; Fall to DetectDrives_DriveNotFound
+
 ;--------------------------------------------------------------------
 ; DetectDrives_DriveNotFound
+; DetectDrives_AtapiDeviceFound
+; DetectDrives_ValidationFailed
 ;   Parameters:
 ;       Nothing
@@ -275 +277 @@
 ;       CF:     Set (from DetectPrint_NullTerminatedStringFromCSSIandSetCF)
 ;   Corrupts registers:
-;       AX, SI
+;       AX, SI, DI
 ;--------------------------------------------------------------------
 DetectDrives_DriveNotFound:
     mov     si, g_szNotFound
     jmp     DetectPrint_NullTerminatedStringFromCSSIandSetCF
+
+%ifdef MODULE_ATAPI
+DetectDrives_AtapiDeviceFound:
+    mov     si, g_szAtapiDevice
+    jmp     DetectPrint_NullTerminatedStringFromCSSIandSetCF
+%endif
+
+%ifndef NO_ATAID_VALIDATION
+DetectDrives_ValidationFailed:
+    mov     si, g_szValidationFailed
+    jmp     DetectPrint_NullTerminatedStringFromCSSIandSetCF
+%endif
 
 
@@ -301 +315 @@
     call    AtaID_VerifyFromESSI
     pop     bx
-    jnz     SHORT DetectDrives_DriveNotFound
+    jnz     SHORT DetectDrives_ValidationFailed
 %endif
     call    CreateDPT_FromAtaInformation
-    jc      SHORT DetectDrives_DriveNotFound
     call    DriveDetectInfo_CreateForHardDisk
     jmp     SHORT DetectPrint_DriveNameFromDrvDetectInfoInESBX

trunk/XTIDE_Universal_BIOS/Src/Initialization/DetectPrint.asm

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2013 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -118 +118 @@
     push    dx                              ; Push low order digit, or N/A
 
-    mov     si, g_szDetectOuter             ; Load SI with default wrapper string "IDE %s at %s: "
+    mov     si, g_szDetectOuter             ; Load SI with default wrapper string "%s at %s: "
 
     jmp     SHORT DetectPrint_FormatCSSIfromParamsInSSBP

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -65 +65 @@
 
 ; ROM variables (must start at offset 0)
-CNT_ROM_BLOCKS      EQU     BIOS_SIZE / 512                 ; number of 512B blocks, 16 = 8kB BIOS
 istruc ROMVARS
-    at  ROMVARS.wRomSign,       dw  0AA55h                  ; PC ROM signature
-    at  ROMVARS.bRomSize,       db  CNT_ROM_BLOCKS          ; ROM size in 512B blocks
-    at  ROMVARS.rgbJump,        jmp Initialize_FromMainBiosRomSearch
+    at  ROMVARS.wRomSign,       dw  0AA55h                  ; PC Option ROM BIOS signature
+    at  ROMVARS.bRomSize,       db  CNT_ROM_BLOCKS          ; ROM BIOS size in 512B blocks (defined below at the very end of the BIOS)
+    at  ROMVARS.rgbJump,        jmp Initialize_FromMainBiosRomSearch    ; Required to be a jump for compatibility with PhoenixBIOS 4.0 (see BIOS Programmer's Guide v10.pdf)
     at  ROMVARS.rgbSign,        db  FLASH_SIGNATURE
     at  ROMVARS.szTitle,        db  TITLE_STRING
@@ -346 +345 @@
 %endif
 
-
+    BIOS_SIZE       EQU     (($-$$) + 2047) & ~2047 ; Align the size to a 2 kB boundary (required for compatibility reasons)
+    CNT_ROM_BLOCKS  EQU     BIOS_SIZE >> 9          ; BIOS_SIZE / 512
 %ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
 ; Although it's very unlikely to happen, we give warnings for builds that cannot be automatically checksummed due to the size being too large.
 ; In some cases it's theoretically possible to checksum the build anyway (manually) which is why these are warnings and not errors.
 %if BIOS_SIZE = 8192                ; A small build, possibly a candidate for the ROM socket on a 3Com 3C503 card.
-    %if ($-$$) <= BIOS_SIZE         ; Only give warnings when the problem isn't obvious anyway.
-        %if ($-$$) > BIOS_SIZE - 3
-            %warning "This build is too large to be auto-checksummed!"
-        %endif
+    %if ($-$$) > BIOS_SIZE - 3
+        %warning "This build is too large to be auto-checksummed!"
     %endif
 %elif ($-$$) = BIOS_SIZE            ; A large or tiny build.

trunk/XTIDE_Universal_BIOS/Src/Strings.asm

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2025 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -36 +36 @@
 g_szDetectCOM:          db  "COM%c%s",NULL
 g_szDetectCOMAuto:      db  " Detect",NULL
-g_szDetectCOMSmall:     db  "/%u%u00",NULL                  ; IDE Master at COM1/9600:
-g_szDetectCOMLarge:     db  "/%u.%uK",NULL                  ; IDE Master at COM1/19.2K:
+g_szDetectCOMSmall:     db  "/%u%u00",NULL                  ; Master at COM1/9600:
+g_szDetectCOMLarge:     db  "/%u.%uK",NULL                  ; Master at COM1/19.2K:
 %endif
 g_szDetectEnd:
-g_szDetectPort:         db  "%x",NULL                       ; IDE Master at 1F0h:
+g_szDetectPort:         db  "%x",NULL                       ; Master at 1F0h:
 
 %ifndef CHECK_FOR_UNUSED_ENTRYPOINTS
@@ -67 +67 @@
 
 
-; Boot loader strings
+; Boot loader and drive detection strings
 g_szTryToBoot:          db  "Booting %c",ANGLE_QUOTE_RIGHT,"%c",LF,CR,NULL
 g_szBootSectorNotFound: db  "Boot sector "          ; String fall through...
 g_szNotFound:           db  "not found",LF,CR,NULL
 g_szReadError:          db  "Error %x!",LF,CR,NULL
+%ifdef MODULE_ATAPI
+g_szAtapiDevice:        db  "ATAPI device",LF,CR,NULL
+%endif
+%ifndef NO_ATAID_VALIDATION
+g_szValidationFailed:   db  "failed validation",LF,CR,NULL
+%endif
 
 

trunk/XTIDE_Universal_BIOS/Src/StringsCompressed.asm

@@ -14 +14 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2025 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -61 +61 @@
                           db     20h,  4ah,  6bh,  7ah,  6bh,  69h, 0bah          ; compressed
 
-g_szDetectCOMSmall:     ; db    "/%u%u00",NULL                  ; IDE Master at COM1/9600:
+g_szDetectCOMSmall:     ; db    "/%u%u00",NULL                  ; Master at COM1/9600:
                         ; db     2fh,  25h,  75h,  25h,  75h,  30h,  30h,  00h    ; uncompressed
                           db     2ah,  35h,  35h,  33h,  13h                      ; compressed
 
-g_szDetectCOMLarge:     ; db    "/%u.%uK",NULL                  ; IDE Master at COM1/19.2K:
+g_szDetectCOMLarge:     ; db    "/%u.%uK",NULL                  ; Master at COM1/19.2K:
                         ; db     2fh,  25h,  75h,  2eh,  25h,  75h,  4bh,  00h    ; uncompressed
                           db     2ah,  35h,  29h,  35h,  91h                      ; compressed
@@ -71 +71 @@
 %endif
 g_szDetectEnd:
-g_szDetectPort:         ; db    "%x",NULL                       ; IDE Master at 1F0h:
+g_szDetectPort:         ; db    "%x",NULL                       ; Master at 1F0h:
                         ; db     25h,  78h,  00h    ; uncompressed
                           db     17h                ; compressed
@@ -128 +128 @@
 
 
-; Boot loader strings
+; Boot loader and drive detection strings
 g_szTryToBoot:          ; db    "Booting %c",ANGLE_QUOTE_RIGHT,"%c",LF,CR,NULL
                         ; db     42h,  6fh,  6fh,  74h,  69h,  6eh,  67h,  20h,  25h,  63h, 0afh,  25h,  63h,  0ah,  0dh,  00h    ; uncompressed
@@ -145 +145 @@
                           db     4bh,  78h,  78h,  75h, 0f8h,  37h,  25h,  19h                            ; compressed
 
+%ifdef MODULE_ATAPI
+g_szAtapiDevice:        ; db    "ATAPI device",LF,CR,NULL
+                        ; db     41h,  54h,  41h,  50h,  49h,  20h,  64h,  65h,  76h,  69h,  63h,  65h,  0ah,  0dh,  00h    ; uncompressed
+                          db     47h,  5ah,  47h,  56h, 0cfh,  6ah,  6bh,  7ch,  6fh,  69h,  6bh,  19h                      ; compressed
+
+%endif
+%ifndef NO_ATAID_VALIDATION
+g_szValidationFailed:   ; db    "failed validation",LF,CR,NULL
+                        ; db     66h,  61h,  69h,  6ch,  65h,  64h,  20h,  76h,  61h,  6ch,  69h,  64h,  61h,  74h,  69h,  6fh,  6eh,  0ah,  0dh,  00h    ; uncompressed
+                          db     6ch,  67h,  6fh,  72h,  6bh, 0eah,  7ch,  67h,  72h,  6fh,  6ah,  67h,  7ah,  6fh,  75h,  74h,  19h                      ; compressed
+
+%endif
 
 
@@ -615 +627 @@
 
 ;; translated usage stats
+;; 48:2
+;; 181:1
+;; 172:2
+;; 175:1
+;; 49:3
+;; 54:3
 ;; 56:9
-;; 48:2
+;; 33:1
+;; 51:3
+;; 200:1
+;; 53:2
+;; 46:3
+;; 44:1
+;; 34:3
+;; 45:2
 ;; 32:34
-;; 34:3
-;; 33:1
-;; 49:3
+;; 50:2
 ;; 47:2
-;; 172:2
-;; 53:2
-;; 54:3
-;; 45:2
+;; 171:2
 ;; 179:8
-;; 46:3
-;; 51:3
-;; 171:2
-;; 50:2
-;; 181:1
-;; 200:1
-;; 175:1
-;; 44:1
 ;; total translated: 20
 
 ;; format usage stats
+;; 2-I:1
+;; nl:14
+;; c:13
+;; x:5
 ;; u:6
-;; 2-I:1
+;; z:2
 ;; 5-u:2
-;; z:2
-;; nl:12
+;; s:14
+;; 2-u:1
 ;; 5-x:1
-;; s:14
-;; x:5
 ;; A:4
-;; 2-u:1
-;; c:13
 ;; total format: 11
 
@@ -659 +671 @@
 ;; 63,?:
 ;; 64,@:1
-;; 65,A:5
+;; 65,A:7
 ;; 66,B:11
 ;; 67,C:3
@@ -667 +679 @@
 ;; 71,G:3
 ;; 72,H:2
-;; 73,I:1
+;; 73,I:2
 ;; 74,J:1
 ;; 75,K:1
@@ -674 +686 @@
 ;; 78,N:2
 ;; 79,O:3
-;; 80,P:1
+;; 80,P:2
 ;; 81,Q:1
 ;; 82,R:7
 ;; 83,S:3
-;; 84,T:2
+;; 84,T:3
 ;; 85,U:2
 ;; 86,V:
@@ -691 +703 @@
 ;; 95,_:
 ;; 96,`:
-;; 97,a:7
+;; 97,a:10
 ;; 98,b:
-;; 99,c:6
-;; 100,d:6
-;; 101,e:15
-;; 102,f:1
+;; 99,c:7
+;; 100,d:9
+;; 101,e:18
+;; 102,f:2
 ;; 103,g:2
 ;; 104,h:
-;; 105,i:9
+;; 105,i:13
 ;; 106,j:
 ;; 107,k:4
-;; 108,l:5
+;; 108,l:7
 ;; 109,m:2
-;; 110,n:11
-;; 111,o:20
+;; 110,n:12
+;; 111,o:21
 ;; 112,p:3
 ;; 113,q:
 ;; 114,r:11
 ;; 115,s:7
-;; 116,t:15
+;; 116,t:16
 ;; 117,u:4
-;; 118,v:3
+;; 118,v:5
 ;; 119,w:1
 ;; 120,x:

trunk/XTIDE_Universal_BIOS/makefile

@@ -6 +6 @@
 # small     Builds only binaries smaller than or equal to 8 kiB (without checksums)                #
 # large     Builds only binaries larger than 8 kiB (without checksums)                             #
-# custom    Builds custom binary without checksum (change DEFINES_CUSTOM / BIOS_SIZE_CUSTOM first) #
+# custom    Builds custom binary without checksum (make sure to change DEFINES_CUSTOM first)       #
 # clean     Removes all files from \Build                                                          #
 # checksum* Same as 'all' but also applies checksums to the binaries                               #
@@ -20 +20 @@
 # MODULE_8BIT_IDE_ADVANCED    Support for memory mapped and DMA based cards like JRIDE and XTCF    #
 # MODULE_ADVANCED_ATA         Native support for some VLB IDE controllers (requires USE_386)       #
+# MODULE_ATAPI                Very simplistic detection of ATAPI devices                           #
 # MODULE_COMPATIBLE_TABLES    Support for ill behaving software that tries to access DPT directly  #
 # MODULE_BOOT_MENU            Boot Menu for selection of drive to boot from                        #
@@ -52 +53 @@
 #                                                                                                  #
 # ** AT Builds only (when USE_AT is defined)                                                       #
-# *** Use this only when certain known good drives are not being detected (eg WD Caviars)          #
+# *** Some known good drives fails validation (e.g. WD Caviars)                                    #
 ####################################################################################################
 
@@ -131 +132 @@
 DEFINES_CUSTOM = ?
 
+# This set of defines is used only for 'make strings'. Include or exclude defines as needed. The combination of defines doesn't have
+# to make sense. This is just to ensure that all relevant strings are compressed when converting Strings.asm to StringsCompressed.asm.
+DEFINES_STRINGSCOMPRESSED = MODULE_STRINGS_COMPRESSED MODULE_BOOT_MENU MODULE_HOTKEYS MODULE_ADVANCED_ATA MODULE_8BIT_IDE MODULE_8BIT_IDE_ADVANCED MODULE_SERIAL MODULE_ATAPI
+
 
 ###################
@@ -136 +141 @@
 ###################
 
-# Target size of the BIOS, used in Main.asm for number of 512B blocks (CNT_ROM_BLOCKS) and by checksum Perl script below ('make checksum').
-# Note! The size must be a multiple of 2 KB for compatibility reasons.
-BIOS_SIZE_TINY = 4096
-BIOS_SIZE_SMALL = 8192
-BIOS_SIZE_LARGE = 12288
-BIOS_SIZE_CUSTOM = ?
-
 # Add -D in front of every preprocessor define declaration
-DEFS_XT = $(DEFINES_XT:%=-D%) -DBIOS_SIZE=$(BIOS_SIZE_SMALL)
-DEFS_XTPLUS = $(DEFINES_XTPLUS:%=-D%) -DBIOS_SIZE=$(BIOS_SIZE_SMALL)
-DEFS_AT = $(DEFINES_AT:%=-D%) -DBIOS_SIZE=$(BIOS_SIZE_SMALL)
-DEFS_386 = $(DEFINES_386:%=-D%) -DBIOS_SIZE=$(BIOS_SIZE_SMALL)
-DEFS_PS2 = $(DEFINES_PS2:%=-D%) -DBIOS_SIZE=$(BIOS_SIZE_SMALL)
-DEFS_XT_LARGE = $(DEFINES_XT_LARGE:%=-D%) -DBIOS_SIZE=$(BIOS_SIZE_LARGE)
-DEFS_XTPLUS_LARGE = $(DEFINES_XTPLUS_LARGE:%=-D%) -DBIOS_SIZE=$(BIOS_SIZE_LARGE)
-DEFS_AT_LARGE = $(DEFINES_AT_LARGE:%=-D%) -DBIOS_SIZE=$(BIOS_SIZE_LARGE)
-DEFS_386_LARGE = $(DEFINES_386_LARGE:%=-D%) -DBIOS_SIZE=$(BIOS_SIZE_LARGE)
-DEFS_PS2_LARGE = $(DEFINES_PS2_LARGE:%=-D%) -DBIOS_SIZE=$(BIOS_SIZE_LARGE)
-DEFS_XT_TINY = $(DEFINES_XT_TINY:%=-D%) -DBIOS_SIZE=$(BIOS_SIZE_TINY)
-DEFS_CUSTOM = $(DEFINES_CUSTOM:%=-D%) -DBIOS_SIZE=$(BIOS_SIZE_CUSTOM)
+DEFS_XT = $(DEFINES_XT:%=-D%)
+DEFS_XTPLUS = $(DEFINES_XTPLUS:%=-D%)
+DEFS_AT = $(DEFINES_AT:%=-D%)
+DEFS_386 = $(DEFINES_386:%=-D%)
+DEFS_PS2 = $(DEFINES_PS2:%=-D%)
+DEFS_XT_LARGE = $(DEFINES_XT_LARGE:%=-D%)
+DEFS_XTPLUS_LARGE = $(DEFINES_XTPLUS_LARGE:%=-D%)
+DEFS_AT_LARGE = $(DEFINES_AT_LARGE:%=-D%)
+DEFS_386_LARGE = $(DEFINES_386_LARGE:%=-D%)
+DEFS_PS2_LARGE = $(DEFINES_PS2_LARGE:%=-D%)
+DEFS_XT_TINY = $(DEFINES_XT_TINY:%=-D%)
+DEFS_CUSTOM = $(DEFINES_CUSTOM:%=-D%)
+DEFS_STRINGSCOMPRESSED = $(DEFINES_STRINGSCOMPRESSED:%=-D%)
 
 # Add -I in front of all header directories
@@ -251 +250 @@
 
 strings: src\Strings.asm
-    @$(AS) src\Strings.asm $(ASFLAGS) $(DEFS_AT_LARGE) -DCHECK_FOR_UNUSED_ENTRYPOINTS -DMODULE_STRINGS_COMPRESSED_PRECOMPRESS -o build\Strings.bin -l build\StringsPrecompress.lst
+    @$(AS) src\Strings.asm $(ASFLAGS) $(DEFS_STRINGSCOMPRESSED) -DCHECK_FOR_UNUSED_ENTRYPOINTS -DMODULE_STRINGS_COMPRESSED_PRECOMPRESS -o build\Strings.bin -l build\StringsPrecompress.lst
     @perl ..\Tools\StringsCompress.pl < build\StringsPrecompress.lst > src\StringsCompressed.asm
     @echo StringsCompressed.asm updated!
@@ -260 +259 @@
 
 checksum: all
-    @perl ..\Tools\checksum.pl $(TARGET)_tiny.bin $(BIOS_SIZE_TINY)
-    @perl ..\Tools\checksum.pl $(TARGET)_xt.bin $(BIOS_SIZE_SMALL)
-    @perl ..\Tools\checksum.pl $(TARGET)_xtp.bin $(BIOS_SIZE_SMALL)
-    @perl ..\Tools\checksum.pl $(TARGET)_at.bin $(BIOS_SIZE_SMALL)
-    @perl ..\Tools\checksum.pl $(TARGET)_386.bin $(BIOS_SIZE_SMALL)
-    @perl ..\Tools\checksum.pl $(TARGET)_ps2.bin $(BIOS_SIZE_SMALL)
-    @perl ..\Tools\checksum.pl $(TARGET)_xtl.bin $(BIOS_SIZE_LARGE)
-    @perl ..\Tools\checksum.pl $(TARGET)_xtpl.bin $(BIOS_SIZE_LARGE)
-    @perl ..\Tools\checksum.pl $(TARGET)_atl.bin $(BIOS_SIZE_LARGE)
-    @perl ..\Tools\checksum.pl $(TARGET)_386l.bin $(BIOS_SIZE_LARGE)
-    @perl ..\Tools\checksum.pl $(TARGET)_ps2l.bin $(BIOS_SIZE_LARGE)
+    @perl ..\Tools\checksum.pl $(TARGET)_tiny.bin
+    @perl ..\Tools\checksum.pl $(TARGET)_xt.bin
+    @perl ..\Tools\checksum.pl $(TARGET)_xtp.bin
+    @perl ..\Tools\checksum.pl $(TARGET)_at.bin
+    @perl ..\Tools\checksum.pl $(TARGET)_386.bin
+    @perl ..\Tools\checksum.pl $(TARGET)_ps2.bin
+    @perl ..\Tools\checksum.pl $(TARGET)_xtl.bin
+    @perl ..\Tools\checksum.pl $(TARGET)_xtpl.bin
+    @perl ..\Tools\checksum.pl $(TARGET)_atl.bin
+    @perl ..\Tools\checksum.pl $(TARGET)_386l.bin
+    @perl ..\Tools\checksum.pl $(TARGET)_ps2l.bin
 
 unused:

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/AutoConfigure.asm

@@ -5 +5 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2013 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -85 +85 @@
     cmp     ax, dx
     jne     SHORT .NextChecksum
+    test    BYTE [di+ROMVARS.wFlags], FLG_ROMVARS_MODULE_MFM_COMPATIBILITY
+    mov     dx, g_szDlgIncompatibleBuild
+    jnz     SHORT .DisplayNotificationFromCSDX
     or      BYTE [di+ROMVARS.wFlags], FLG_ROMVARS_CLEAR_BDA_HD_COUNT
     mov     dx, g_szDlgBadBiosFound
+.DisplayNotificationFromCSDX:
     jmp     Dialogs_DisplayNotificationFromCSDX
 

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupage.asm

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2013 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -88 +88 @@
     xor     ax, ax
     mov     cx, [di+MENUPAGE.wMenuitems]
-    lea     bx, [di+MENUPAGE.rgMenuitem]
+    lea     bx, [di+MENUPAGE.rgMenuitem+MENUITEM.bFlags]
 
 ALIGN JUMP_ALIGN
-.CheckVisibilityFromNextMenuitem:
-    test    BYTE [bx+MENUITEM.bFlags], FLG_MENUITEM_VISIBLE
+.CheckVisibilityForNextMenuitem:
+    test    BYTE [bx], FLG_MENUITEM_VISIBLE
     jz      SHORT .PrepareToLoop
     inc     ax
 .PrepareToLoop:
     add     bx, BYTE MENUITEM_size
-    loop    .CheckVisibilityFromNextMenuitem
+    loop    .CheckVisibilityForNextMenuitem
     ret
 

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Menupages/BootMenuSettingsMenu.asm

@@ -4 +4 @@
 ;
 ; XTIDE Universal BIOS and Associated Tools
-; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2023 by XTIDE Universal BIOS Team.
+; Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team.
 ;
 ; This program is free software; you can redistribute it and/or modify
@@ -46 +46 @@
     at  MENUITEM.szQuickInfo,       dw  g_szNfoDispMode
     at  MENUITEM.szHelp,            dw  g_szNfoDispMode
-    at  MENUITEM.bFlags,            db  FLG_MENUITEM_VISIBLE
+    at  MENUITEM.bFlags,            db  FLG_MENUITEM_VISIBLE | FLG_MENUITEM_MODIFY_MENU
     at  MENUITEM.bType,             db  TYPE_MENUITEM_MULTICHOICE
     at  MENUITEM.itemValue + ITEM_VALUE.wRomvarsValueOffset,        dw  ROMVARS.wDisplayMode
@@ -62 +62 @@
     at  MENUITEM.szQuickInfo,       dw  g_szNfoColorTheme
     at  MENUITEM.szHelp,            dw  g_szHelpColorTheme
-    at  MENUITEM.bFlags,            db  FLG_MENUITEM_VISIBLE | FLG_MENUITEM_MODIFY_MENU
+    at  MENUITEM.bFlags,            db  FLG_MENUITEM_MODIFY_MENU
     at  MENUITEM.bType,             db  TYPE_MENUITEM_MULTICHOICE
     at  MENUITEM.itemValue + ITEM_VALUE.wRomvarsValueOffset,        dw  ROMVARS.pColorTheme     ; Only ever read - never modified
@@ -142 +142 @@
     at  MENUITEM.szQuickInfo,       dw  g_szNfoClearBdaDriveCount
     at  MENUITEM.szHelp,            dw  g_szHelpClearBdaDriveCount
-    at  MENUITEM.bFlags,            db  FLG_MENUITEM_VISIBLE | FLG_MENUITEM_FLAGVALUE
+    at  MENUITEM.bFlags,            db  FLG_MENUITEM_FLAGVALUE
     at  MENUITEM.bType,             db  TYPE_MENUITEM_MULTICHOICE
     at  MENUITEM.itemValue + ITEM_VALUE.wRomvarsValueOffset,        dw  ROMVARS.wFlags
@@ -183 +183 @@
     dw  g_szValueColorTheme4
     dw  g_szValueColorTheme5
+    dw  g_szValueColorTheme6
+    dw  g_szValueColorTheme7
+    dw  g_szValueColorTheme8
+    dw  g_szValueColorTheme9
+    dw  g_szValueColorTheme10
 
 ColorThemeTable:
 ; Note! If there's ever a need to add, remove or change a theme or reorder the themes then the ROMVARS version must be incremented.
     ; Classic (default)
-    db  COLOR_ATTRIBUTE(COLOR_YELLOW, COLOR_BLUE)                           ; .cBordersAndBackground
-    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                            ; .cShadow
-    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLUE)                     ; .cTitle
-    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLUE)                            ; .cItem
-    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_CYAN)                     ; .cHighlightedItem
-    db  COLOR_ATTRIBUTE(COLOR_RED, COLOR_BLUE) | FLG_COLOR_BLINK            ; .cHurryTimeout
-    db  COLOR_ATTRIBUTE(COLOR_GREEN, COLOR_BLUE)                            ; .cNormalTimeout
+    db  COLOR_ATTRIBUTE(COLOR_YELLOW, COLOR_BLUE)                               ; .cBordersAndBackground
+    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                                ; .cShadow
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLUE)                         ; .cTitle
+    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLUE)                                ; .cItem
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_CYAN)                         ; .cHighlightedItem
+    db  COLOR_ATTRIBUTE(COLOR_RED, COLOR_BLUE) | FLG_COLOR_BLINK                ; .cHurryTimeout
+    db  COLOR_ATTRIBUTE(COLOR_GREEN, COLOR_BLUE)                                ; .cNormalTimeout
     ; Argon Blue
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_BLUE, COLOR_BLACK)                      ; .cBordersAndBackground
-    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                            ; .cShadow
-    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLACK)                    ; .cTitle
-    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLACK)                           ; .cItem
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_BLUE, COLOR_BLACK)                      ; .cHighlightedItem
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_BLUE, COLOR_BLACK) | FLG_COLOR_BLINK    ; .cHurryTimeout
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_BLUE, COLOR_BLACK)                      ; .cNormalTimeout
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_BLUE, COLOR_BLACK)                          ; .cBordersAndBackground
+    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                                ; .cShadow
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLACK)                        ; .cTitle
+    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLACK)                               ; .cItem
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_BLUE, COLOR_BLACK)                          ; .cHighlightedItem
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_BLUE, COLOR_BLACK) | FLG_COLOR_BLINK        ; .cHurryTimeout
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_BLUE, COLOR_BLACK)                          ; .cNormalTimeout
     ; Neon Red
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_BLACK)                       ; .cBordersAndBackground
-    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                            ; .cShadow
-    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLACK)                    ; .cTitle
-    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLACK)                           ; .cItem
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_BLACK)                       ; .cHighlightedItem
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_BLACK) | FLG_COLOR_BLINK     ; .cHurryTimeout
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_BLACK)                       ; .cNormalTimeout
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_BLACK)                           ; .cBordersAndBackground
+    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                                ; .cShadow
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLACK)                        ; .cTitle
+    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLACK)                               ; .cItem
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_BLACK)                           ; .cHighlightedItem
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_BLACK) | FLG_COLOR_BLINK         ; .cHurryTimeout
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_BLACK)                           ; .cNormalTimeout
     ; Phosphor Green
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_BLACK)                     ; .cBordersAndBackground
-    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                            ; .cShadow
-    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLACK)                    ; .cTitle
-    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLACK)                           ; .cItem
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_BLACK)                     ; .cHighlightedItem
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_BLACK) | FLG_COLOR_BLINK   ; .cHurryTimeout
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_BLACK)                     ; .cNormalTimeout
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_BLACK)                         ; .cBordersAndBackground
+    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                                ; .cShadow
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLACK)                        ; .cTitle
+    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLACK)                               ; .cItem
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_BLACK)                         ; .cHighlightedItem
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_BLACK) | FLG_COLOR_BLINK       ; .cHurryTimeout
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_BLACK)                         ; .cNormalTimeout
     ; Moon Surface
-    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                            ; .cBordersAndBackground
-    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                            ; .cShadow
-    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLACK)                    ; .cTitle
-    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLACK)                           ; .cItem
-    db  COLOR_ATTRIBUTE(COLOR_BROWN, COLOR_BLACK)                           ; .cHighlightedItem
-    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLACK) | FLG_COLOR_BLINK  ; .cHurryTimeout
-    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLACK)                           ; .cNormalTimeout
+    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                                ; .cBordersAndBackground
+    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                                ; .cShadow
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLACK)                        ; .cTitle
+    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLACK)                               ; .cItem
+    db  COLOR_ATTRIBUTE(COLOR_BROWN, COLOR_BLACK)                               ; .cHighlightedItem
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLACK) | FLG_COLOR_BLINK      ; .cHurryTimeout
+    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLACK)                               ; .cNormalTimeout
     ; Toxic Waste
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_BLACK)                     ; .cBordersAndBackground
-    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                            ; .cShadow
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_BLACK)                     ; .cTitle
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_CYAN, COLOR_BLACK)                      ; .cItem
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_CYAN, COLOR_BLUE)                       ; .cHighlightedItem
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_BLACK) | FLG_COLOR_BLINK     ; .cHurryTimeout
-    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_BLACK)                       ; .cNormalTimeout
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_BLACK)                         ; .cBordersAndBackground
+    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                                ; .cShadow
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_BLACK)                         ; .cTitle
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_CYAN, COLOR_BLACK)                          ; .cItem
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_CYAN, COLOR_BLUE)                           ; .cHighlightedItem
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_BLACK) | FLG_COLOR_BLINK         ; .cHurryTimeout
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_BLACK)                           ; .cNormalTimeout
+    ; Amethyst
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_MAGENTA, COLOR_MAGENTA)                     ; .cBordersAndBackground
+    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                                ; .cShadow
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_MAGENTA)                      ; .cTitle
+    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_MAGENTA)                             ; .cItem
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_MAGENTA)                      ; .cHighlightedItem
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_MAGENTA) | FLG_COLOR_BLINK    ; .cHurryTimeout
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_MAGENTA)                      ; .cNormalTimeout
+    ; Emerald
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_GREEN, COLOR_GREEN)                         ; .cBordersAndBackground
+    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                                ; .cShadow
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_GREEN)                        ; .cTitle
+    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_GREEN)                               ; .cItem
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_GREEN)                        ; .cHighlightedItem
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_GREEN) | FLG_COLOR_BLINK      ; .cHurryTimeout
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_GREEN)                        ; .cNormalTimeout
+    ; Sapphire
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_BLUE, COLOR_BLUE)                           ; .cBordersAndBackground
+    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                                ; .cShadow
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLUE)                         ; .cTitle
+    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_BLUE)                                ; .cItem
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLUE)                         ; .cHighlightedItem
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLUE) | FLG_COLOR_BLINK       ; .cHurryTimeout
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_BLUE)                         ; .cNormalTimeout
+    ; Ruby
+    db  COLOR_ATTRIBUTE(COLOR_LIGHT_RED, COLOR_RED)                             ; .cBordersAndBackground
+    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                                ; .cShadow
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_RED)                          ; .cTitle
+    db  COLOR_ATTRIBUTE(COLOR_WHITE, COLOR_RED)                                 ; .cItem
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_RED)                          ; .cHighlightedItem
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_RED) | FLG_COLOR_BLINK        ; .cHurryTimeout
+    db  COLOR_ATTRIBUTE(COLOR_BRIGHT_WHITE, COLOR_RED)                          ; .cNormalTimeout
+    ; Liquid Crystal Display
+    db  COLOR_ATTRIBUTE(COLOR_BLUE, COLOR_GREEN)                                ; .cBordersAndBackground
+    db  COLOR_ATTRIBUTE(COLOR_GRAY, COLOR_BLACK)                                ; .cShadow
+    db  COLOR_ATTRIBUTE(COLOR_BLUE, COLOR_GREEN)                                ; .cTitle
+    db  COLOR_ATTRIBUTE(COLOR_BLUE, COLOR_GREEN)                                ; .cItem
+    db  COLOR_ATTRIBUTE(COLOR_GREEN, COLOR_BLUE)                                ; .cHighlightedItem
+    db  COLOR_ATTRIBUTE(COLOR_GREEN, COLOR_BLUE) | FLG_COLOR_BLINK              ; .cHurryTimeout
+    db  COLOR_ATTRIBUTE(COLOR_GREEN, COLOR_BLUE)                                ; .cNormalTimeout
 EndOfColorThemeTable:
 CountOfThemes   equ     (EndOfColorThemeTable-ColorThemeTable) / ATTRIBUTE_CHARS_size
@@ -259 +304 @@
     call    .EnableOrDisableColorThemeSelection
     call    .EnableOrDisableBootMenuSelectionTimeout
+    call    .EnableOrDisableRemoveOtherHardDrives
     mov     si, g_MenupageForBootMenuSettingsMenu
     jmp     Menupage_ChangeToNewMenupageInDSSI
@@ -309 +355 @@
 ALIGN JUMP_ALIGN
 .EnableOrDisableColorThemeSelection:
+    push    ax
+    test    ax, FLG_ROMVARS_MODULE_BOOT_MENU
+    jz      SHORT .NoModuleBootMenu
+    mov     bx, ROMVARS.wDisplayMode
+    call    Buffers_GetRomvarsValueToAXfromOffsetInBX
+    cmp     al, 4
+    je      SHORT .ColorMode            ; Actually default video mode which might be a color mode
+    cmp     al, 7
+    je      SHORT .NotColorMode
+    test    al, 1
+    jnz     SHORT .ColorMode
+.NoModuleBootMenu:
+.NotColorMode:
+    stc
+.ColorMode:
+    pop     ax
     mov     bx, g_MenuitemBootMnuStngsColorTheme
-    test    ax, FLG_ROMVARS_MODULE_BOOT_MENU
-    jmp     SHORT .DisableMenuitemFromCSBXifZFset
+    jnc     SHORT .EnableMenuitemFromCSBX
+    jmp     SHORT .DisableMenuitemFromCSBX
 
 
@@ -350 +412 @@
 .DisableMenuitemFromCSBX:
     jmp     DisableMenuitemFromCSBX
+
+
+;--------------------------------------------------------------------
+; .EnableOrDisableRemoveOtherHardDrives
+;   Parameters:
+;       AX:     ROMVARS.wFlags
+;       SS:BP:  Menu handle
+;   Returns:
+;       Nothing
+;   Corrupts registers:
+;       BX
+;--------------------------------------------------------------------
+ALIGN JUMP_ALIGN
+.EnableOrDisableRemoveOtherHardDrives:
+    test    al, FLG_ROMVARS_MODULE_MFM_COMPATIBILITY
+    mov     bx, g_MenuitemBootMnuStngsClearBdaDriveCount
+    jz      SHORT .EnableMenuitemFromCSBX
+    jmp     SHORT .DisableMenuitemFromCSBX
 
 
@@ -398 +478 @@
     jne     SHORT .SkipCopy
 
-    ; Copy the color theme fron the loaded BIOS overwriting XTIDECFG's own theme
+    ; Copy the color theme from the loaded BIOS overwriting XTIDECFG's own theme
     inc     si
     mov     di, ColorTheme              ; ES:DI now points to ColorTheme in XTIDECFG

trunk/XTIDE_Universal_BIOS_Configurator_v2/Src/Strings.asm

@@ -45 +45 @@
 
 ; General Yes/No response type dialog messages
-g_szDlgExitToDos:       db  "Exit to DOS?",NULL
-g_szDlgSaveChanges:     db  "Do you want to save changes to XTIDE Universal BIOS image file?",NULL
-g_szDlgDriveNotReady:   db  "Drive not ready! Retry?",NULL
+g_szDlgExitToDos:           db  "Exit to DOS?",NULL
+g_szDlgSaveChanges:         db  "Do you want to save changes to XTIDE Universal BIOS image file?",NULL
+g_szDlgDriveNotReady:       db  "Drive not ready! Retry?",NULL
 
 ; Generic dialog strings
-g_szNotificationDialog: db  "Notification.",NULL
-g_szErrorDialog:        db  "Error!",NULL
-g_szGenericDialogInfo:  db  "Press ENTER or ESC to close dialog.",NULL
+g_szNotificationDialog:     db  "Notification.",NULL
+g_szErrorDialog:            db  "Error!",NULL
+g_szGenericDialogInfo:      db  "Press ENTER or ESC to close dialog.",NULL
 
 ; Flashing related strings
@@ -71 +71 @@
 
 ; Strings for main menu
-g_szItemMainExitToDOS:  db  "Exit to DOS",NULL
-g_szItemMainLoadFile:   db  "Load BIOS from file",NULL
-g_szItemMainLoadROM:    db  "Load BIOS from EEPROM",NULL
-g_szItemMainLoadStngs:  db  "Load old settings from EEPROM",NULL
-g_szItemMainConfigure:  db  "Configure XTIDE Universal BIOS",NULL
-g_szItemMainFlash:      db  "Flash EEPROM",NULL
-g_szItemMainSave:       db  "Save BIOS back to original file",NULL
-g_szItemMainLicense:    db  "Copyright and License Information",NULL
-g_szItemMainHomePage:   db  "Web Links",NULL
-
-g_szDlgMainLoadROM:     db  "Successfully loaded XTIDE Universal BIOS from EEPROM.",NULL
-g_szDlgMainLoadStngs:   db  "Successfully loaded settings from EEPROM.",NULL
-g_szDlgMainLoadFile:    db  "Successfully loaded file for flashing.",NULL
-g_szDlgMainSaveFile:    db  "Successfully saved XTIDE Universal BIOS to file.",NULL
-g_szDlgMainFileTooBig:  db  "Selected file is too big to be loaded for flashing!",NULL
-g_szDlgMainLoadErr:     db  "Failed to load file!",NULL
-g_szDlgMainSaveErr:     db  "Failed to save file!",NULL
-g_szDlgFileTitle:       db  "Select file to be flashed.",NULL
-g_szDlgFileFilter:      db  "*.*",NULL
-
-g_szNfoMainExitToDOS:   db  "Quits XTIDE Universal BIOS Configurator.",NULL
-g_szNfoMainLoadFile:    db  "Load BIOS file to be configured or flashed.",NULL
-g_szNfoMainLoadROM:     db  "Load BIOS from EEPROM to be reconfigured.",NULL
-g_szNfoMainLoadStngs:   db  "Load old XTIDE Universal BIOS settings from EEPROM.",NULL
-g_szNfoMainConfigure:   db  "Configure XTIDE Universal BIOS settings.",NULL
-g_szNfoMainFlash:       db  "Flash loaded BIOS image to EEPROM.",NULL
-g_szNfoMainSave:        db  "Save BIOS changes back to original file from which it was loaded.",NULL
-g_szNfoMainLicense:     db  "XTIDE Universal BIOS and XTIDECFG Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team."
-                        db  " Released under GNU GPL v2, with ABSOLUTELY NO WARRANTY. Press ENTER for more details...",NULL
-g_szNfoMainHomePage:    db  "Visit http://xtideuniversalbios.org (home page) and http://forum.vcfed.org (support)",NULL
-
-g_szHelpMainLicense:    db  "XTIDE Universal BIOS and XTIDECFG Configuration program are Copyright 2009-2010 by Tomi Tilli,"
-                        db  " 2011-2026 by XTIDE Universal BIOS Team. Released under GNU GPL v2. This software comes with ABSOLUTELY NO WARRANTY."
-                        db  " This is free software, and you are welcome to redistribute it under certain conditions."
-                        db  " See the LICENSE.TXT file that was included with this distribution,"
-                        db  " visit http://www.gnu.org/licenses/ gpl-2.0.html, or visit http://xtideuniversalbios.org.",NULL
+g_szItemMainExitToDOS:      db  "Exit to DOS",NULL
+g_szItemMainLoadFile:       db  "Load BIOS from file",NULL
+g_szItemMainLoadROM:        db  "Load BIOS from EEPROM",NULL
+g_szItemMainLoadStngs:      db  "Load old settings from EEPROM",NULL
+g_szItemMainConfigure:      db  "Configure XTIDE Universal BIOS",NULL
+g_szItemMainFlash:          db  "Flash EEPROM",NULL
+g_szItemMainSave:           db  "Save BIOS back to original file",NULL
+g_szItemMainLicense:        db  "Copyright and License Information",NULL
+g_szItemMainHomePage:       db  "Web Links",NULL
+
+g_szDlgMainLoadROM:         db  "Successfully loaded XTIDE Universal BIOS from EEPROM.",NULL
+g_szDlgMainLoadStngs:       db  "Successfully loaded settings from EEPROM.",NULL
+g_szDlgMainLoadFile:        db  "Successfully loaded file for flashing.",NULL
+g_szDlgMainSaveFile:        db  "Successfully saved XTIDE Universal BIOS to file.",NULL
+g_szDlgMainFileTooBig:      db  "Selected file is too big to be loaded for flashing!",NULL
+g_szDlgMainLoadErr:         db  "Failed to load file!",NULL
+g_szDlgMainSaveErr:         db  "Failed to save file!",NULL
+g_szDlgFileTitle:           db  "Select file to be flashed.",NULL
+g_szDlgFileFilter:          db  "*.*",NULL
+
+g_szNfoMainExitToDOS:       db  "Quits XTIDE Universal BIOS Configurator.",NULL
+g_szNfoMainLoadFile:        db  "Load BIOS file to be configured or flashed.",NULL
+g_szNfoMainLoadROM:         db  "Load BIOS from EEPROM to be reconfigured.",NULL
+g_szNfoMainLoadStngs:       db  "Load old XTIDE Universal BIOS settings from EEPROM.",NULL
+g_szNfoMainConfigure:       db  "Configure XTIDE Universal BIOS settings.",NULL
+g_szNfoMainFlash:           db  "Flash loaded BIOS image to EEPROM.",NULL
+g_szNfoMainSave:            db  "Save BIOS changes back to original file from which it was loaded.",NULL
+g_szNfoMainLicense:         db  "XTIDE Universal BIOS and XTIDECFG Copyright (C) 2009-2010 by Tomi Tilli, 2011-2026 by XTIDE Universal BIOS Team."
+                            db  " Released under GNU GPL v2, with ABSOLUTELY NO WARRANTY. Press ENTER for more details...",NULL
+g_szNfoMainHomePage:        db  "Visit http://xtideuniversalbios.org (home page) and http://forum.vcfed.org (support)",NULL
+
+g_szHelpMainLicense:        db  "XTIDE Universal BIOS and XTIDECFG Configuration program are Copyright 2009-2010 by Tomi Tilli,"
+                            db  " 2011-2026 by XTIDE Universal BIOS Team. Released under GNU GPL v2. This software comes with ABSOLUTELY NO WARRANTY."
+                            db  " This is free software, and you are welcome to redistribute it under certain conditions."
+                            db  " See the LICENSE.TXT file that was included with this distribution,"
+                            db  " visit http://www.gnu.org/licenses/ gpl-2.0.html, or visit http://xtideuniversalbios.org.",NULL
 
 ; Strings for XTIDE Universal BIOS configuration menu
-g_szItemCfgBackToMain:  db  "Back to Main Menu",NULL
-g_szItemCfgIde1:        db  "Primary IDE Controller",NULL
-g_szItemCfgIde2:        db  "Secondary IDE Controller",NULL
-g_szItemCfgIde3:        db  "Tertiary IDE Controller",NULL
-g_szItemCfgIde4:        db  "Quaternary IDE Controller",NULL
-g_szItemCfgBootMenu:    db  "Boot settings",NULL
-g_szItemAutoConfigure:  db  "Auto Configure",NULL
-g_szItemCfgFullMode:    db  "Full operating mode",NULL
-g_szItemCfgRamVars:     db  "Use UMB for variables",NULL
-g_szItemCfgStealSize:   db  "kiB to steal from RAM",NULL
-g_szItemCfgIdeCnt:      db  "IDE controllers",NULL
-g_szItemCfgIdleTimeout: db  "Power Management",NULL
-
-g_szDlgAutoConfigure:   db  "Found "
-g_bControllersDetected: db  'x'             ; Value stored directly here
-                        db  " controllers.",NULL
-g_szDlgBadBiosFound:    db  "This computer has been identified as being one of the following models:",LF,LF
-                        db  "Zenith Data Systems Z-171",LF
-                        db  "Zenith Data Systems Z-161",LF,LF
-                        db  "The Boot settings menu option 'Remove other hard drives' has been set to YES for this reason.",NULL
-g_szDlgFomEnabled       db  "The loaded file does not support Lite mode - Full operating mode has been enabled.",NULL
-g_szDlgCfgFullMode:     db  "Enable full operating mode?",NULL
-g_szDlgCfgRamVars:      db  "Store variables in UMB?",NULL
-g_szDlgCfgStealSize:    db  "How many kiB of base memory to steal for XTIDE Universal BIOS variables (1...255)?",NULL
-g_szDlgCfgIdeCnt:       db  "How many IDE controllers to manage (1...4)?",NULL
-g_szDlgCfgIdleTimeout:  db  "Select the amount of time before idling drives should enter standby mode.",NULL
-
-g_szNfoCfgIde:          db  "IDE controller and drive configuration.",NULL
-g_szNfoCfgBootMenu:     db  "Boot configuration.",NULL
-g_szNfoAutoConfigure:   db  "Automatically Configure XTIDE Universal BIOS for this system.",NULL
-g_szNfoCfgFullMode:     db  "Full mode supports up to four controllers and has more features.",NULL
-g_szNfoCfgRamVars:      db  "Enter UMB segment address (FFFF=Disable UMB usage and use the top of Conventional memory instead).",NULL
-g_szNfoCfgStealSize:    db  "How many kiB's to steal from Conventional memory for XTIDE Universal BIOS variables.",NULL
-g_szNfoCfgIdeCnt:       db  "Number of IDE controllers to manage.",NULL
-g_szNfoCfgIdleTimeout:  db  "Enable Power Management to set the harddrive(s) to spin down after idling a certain amount of time.",NULL
-
-g_szSerialMoved:        db  "A Serial Controller has been moved to the end of the Controller list."
-                        db  " No further action is required. Serial Controllers must be placed at the end of the list.",NULL
-
-g_szHelpCfgFullMode:    db  "Full mode supports up to 4 IDE controllers (8 drives) and requires 1 kiB of RAM to store hard disk parameters and"
-                        db  " other variables. This bit of RAM can be reserved from the top of Conventional memory, or, if RAM is available in"
-                        db  " the Upper Memory Area (UMA), by configuring the BIOS to use an Upper Memory Block (UMB). Full mode makes it"
-                        db  " possible to use ROM BASIC and other software that requires the memory range where"
-                        db  " XTIDE Universal BIOS parameters would be stored in Lite mode.",LF,LF
-                        db  "Lite mode supports only 2 IDE controllers (4 drives) and stores parameters to the top of the interrupt vectors"
-                        db  " (30:0h) so no Conventional memory needs to be reserved. Lite mode cannot be used if you intend to use"
-                        db  " IBM ROM BASIC or software such as Turbo BASIC or BASICA.",LF,LF
-                        db  "Tandy 1000 models with 640 kiB or less memory need to use Lite mode since the top of Conventional memory gets"
-                        db  " dynamically reserved by video hardware. This happens only with Tandy integrated video controller and not when"
-                        db  " using expansion graphics cards. It is possible to use Full mode if configuring the BIOS to use an UMB or by"
-                        db  " reserving RAM for video memory in addition to what is required for XTIDE Universal BIOS. Most software should"
-                        db  " work with 33 kiB reserved but some will require 65 kiB. Theoretically speaking, a lot more could be required"
-                        db  " - it is just that we are not aware of any software with higher video memory requirements.",NULL
-
-g_szHelpCfgRamVars:     db  "The UMB segment address entered here will be used to store hard disk parameters and other variables leaving all"
-                        db  " of the Conventional memory free for other uses.",LF,LF
-                        db  "Do not use this option unless you know for certain that memory actually exists at this address and that it is"
-                        db  " writable without any prerequisite chipset programming. If you are using any sort of DOS memory manager or UMB"
-                        db  " provider then it is probably a good idea to use whatever memory range exclusion option it provides to prevent it"
-                        db  " from trying to use this memory range. Note that only 1 kiB of the UMB will be used.",NULL
-
-g_szHelpCfgStealSize:   db  "Parameters for detected hard disks and other variables must be stored somewhere. If in Full mode, and the BIOS has"
-                        db  " not been configured to use an UMB, then they are stored at the top of Conventional memory."
-                        db  " 1 kiB is usually enough but you may have to reserve more if you want to use Full mode on a Tandy 1000.",NULL
-
-g_szHelpCfgIdleTimeout: db  "This option enables the standby timer for all harddrives handled by XTIDE Universal BIOS,"
-                        db  " allowing the drives to spin down after idling the selected amount of time."
-                        db  " Note that this does not work with old drives that lack the Power Management feature set."
-                        db  " Also note that timeouts less than 5 minutes may cause unnecessary wear on the drives and is not recommended"
-                        db  " (use for compatibility testing only).",NULL
+g_szItemCfgBackToMain:      db  "Back to Main Menu",NULL
+g_szItemCfgIde1:            db  "Primary IDE Controller",NULL
+g_szItemCfgIde2:            db  "Secondary IDE Controller",NULL
+g_szItemCfgIde3:            db  "Tertiary IDE Controller",NULL
+g_szItemCfgIde4:            db  "Quaternary IDE Controller",NULL
+g_szItemCfgBootMenu:        db  "Boot settings",NULL
+g_szItemAutoConfigure:      db  "Auto Configure",NULL
+g_szItemCfgFullMode:        db  "Full operating mode",NULL
+g_szItemCfgRamVars:         db  "Use UMB for variables",NULL
+g_szItemCfgStealSize:       db  "kiB to steal from RAM",NULL
+g_szItemCfgIdeCnt:          db  "IDE controllers",NULL
+g_szItemCfgIdleTimeout:     db  "Power Management",NULL
+
+g_szDlgAutoConfigure:       db  "Found "
+g_bControllersDetected:     db  'x'             ; Value stored directly here
+                            db  " controllers.",NULL
+g_szDlgBadBiosFound:        db  "This computer has been identified as being one of the following models:",LF,LF
+                            db  "Zenith Data Systems Z-171",LF
+                            db  "Zenith Data Systems Z-161",LF,LF
+                            db  "The Boot settings menu option 'Remove other hard drives' has been set to YES for this reason.",NULL
+g_szDlgIncompatibleBuild:   db  "This computer has been identified as being in need of having the Boot settings menu option"
+                            db  " 'Remove other hard drives' set to YES. However, this is not available on the currently loaded"
+                            db  " BIOS because it includes MODULE_MFM_COMPATIBILITY. As a result, this particular BIOS build"
+                            db  " cannot be used with this computer.",NULL
+g_szDlgFomEnabled:          db  "The loaded file does not support Lite mode - Full operating mode has been enabled.",NULL
+g_szDlgCfgFullMode:         db  "Enable full operating mode?",NULL
+g_szDlgCfgRamVars:          db  "Store variables in UMB?",NULL
+g_szDlgCfgStealSize:        db  "How many kiB of base memory to steal for XTIDE Universal BIOS variables (1...255)?",NULL
+g_szDlgCfgIdeCnt:           db  "How many IDE controllers to manage (1...4)?",NULL
+g_szDlgCfgIdleTimeout:      db  "Select the amount of time before idling drives should enter standby mode.",NULL
+
+g_szNfoCfgIde:              db  "IDE controller and drive configuration.",NULL
+g_szNfoCfgBootMenu:         db  "Boot configuration.",NULL
+g_szNfoAutoConfigure:       db  "Automatically Configure XTIDE Universal BIOS for this system.",NULL
+g_szNfoCfgFullMode:         db  "Full mode supports up to four controllers and has more features.",NULL
+g_szNfoCfgRamVars:          db  "Enter UMB segment address (FFFF=Disable UMB usage and use the top of Conventional memory instead).",NULL
+g_szNfoCfgStealSize:        db  "How many kiB's to steal from Conventional memory for XTIDE Universal BIOS variables.",NULL
+g_szNfoCfgIdeCnt:           db  "Number of IDE controllers to manage.",NULL
+g_szNfoCfgIdleTimeout:      db  "Enable Power Management to set the harddrive(s) to spin down after idling a certain amount of time.",NULL
+
+g_szSerialMoved:            db  "A Serial Controller has been moved to the end of the Controller list."
+                            db  " No further action is required. Serial Controllers must be placed at the end of the list.",NULL
+
+g_szHelpCfgFullMode:        db  "Full mode supports up to 4 IDE controllers (8 drives) and requires 1 kiB of RAM to store hard disk parameters and"
+                            db  " other variables. This bit of RAM can be reserved from the top of Conventional memory, or, if RAM is available in"
+                            db  " the Upper Memory Area (UMA), by configuring the BIOS to use an Upper Memory Block (UMB). Full mode makes it"
+                            db  " possible to use ROM BASIC and other software that requires the memory range where"
+                            db  " XTIDE Universal BIOS parameters would be stored in Lite mode.",LF,LF
+                            db  "Lite mode supports only 2 IDE controllers (4 drives) and stores parameters to the top of the interrupt vectors"
+                            db  " (30:0h) so no Conventional memory needs to be reserved. Lite mode cannot be used if you intend to use"
+                            db  " IBM ROM BASIC or software such as Turbo BASIC or BASICA.",LF,LF
+                            db  "Tandy 1000 models with 640 kiB or less memory need to use Lite mode since the top of Conventional memory gets"
+                            db  " dynamically reserved by video hardware. This happens only with Tandy integrated video controller and not when"
+                            db  " using expansion graphics cards. It is possible to use Full mode if configuring the BIOS to use an UMB or by"
+                            db  " reserving RAM for video memory in addition to what is required for XTIDE Universal BIOS. Most software should"
+                            db  " work with 33 kiB reserved but some will require 65 kiB. Theoretically speaking, a lot more could be required"
+                            db  " - it is just that we are not aware of any software with higher video memory requirements.",NULL
+
+g_szHelpCfgRamVars:         db  "The UMB segment address entered here will be used to store hard disk parameters and other variables leaving all"
+                            db  " of the Conventional memory free for other uses.",LF,LF
+                            db  "Do not use this option unless you know for certain that memory actually exists at this address and that it is"
+                            db  " writable without any prerequisite chipset programming. If you are using any sort of DOS memory manager or UMB"
+                            db  " provider then it is probably a good idea to use whatever memory range exclusion option it provides to prevent it"
+                            db  " from trying to use this memory range. Note that only 1 kiB of the UMB will be used.",NULL
+
+g_szHelpCfgStealSize:       db  "Parameters for detected hard disks and other variables must be stored somewhere. If in Full mode, and the BIOS has"
+                            db  " not been configured to use an UMB, then they are stored at the top of Conventional memory."
+                            db  " 1 kiB is usually enough but you may have to reserve more if you want to use Full mode on a Tandy 1000.",NULL
+
+g_szHelpCfgIdleTimeout:     db  "This option enables the standby timer for all harddrives handled by XTIDE Universal BIOS,"
+                            db  " allowing the drives to spin down after idling the selected amount of time."
+                            db  " Note that this does not work with old drives that lack the Power Management feature set."
+                            db  " Also note that timeouts less than 5 minutes may cause unnecessary wear on the drives and is not recommended"
+                            db  " (use for compatibility testing only).",NULL
 
 g_szMultichoiceIdleTimeout: db  "Disabled",LF
@@ -483 +487 @@
 
 g_szHelpBootTimeout:            db  "Boot Menu selection timeout in BIOS timer ticks (1 second = 18.2 ticks)."
-                                db  " When timer goes to zero, currently selected drive will be booted automatically."
-                                db  " Timeout can be disabled by setting this to 0.",NULL
+                                db  " When timer goes to zero, currently selected drive will be booted automatically.",NULL
 g_szHelpBootDrive:              db  "Drive to be set selected by default when Boot Menu is displayed.",NULL
 g_szHelpColorTheme:             db  "Pick a theme from a list of several pre-defined themes to customize the colors used by the boot menu and, if"
@@ -524 +527 @@
                                 db  "Phosphor Green",LF
                                 db  "Moon Surface",LF
-                                db  "Toxic Waste",NULL
+                                db  "Toxic Waste",LF
+                                db  "Amethyst",LF
+                                db  "Emerald",LF
+                                db  "Sapphire",LF
+                                db  "Ruby",LF
+                                db  "Liquid Crystal Display",NULL
 g_szValueColorTheme0:           db  "Classic",NULL
 g_szValueColorTheme1:           db  "Argon",NULL
@@ -531 +539 @@
 g_szValueColorTheme4:           db  "Moon",NULL
 g_szValueColorTheme5:           db  "Toxic",NULL
+g_szValueColorTheme6:           db  "Amethyst",NULL
+g_szValueColorTheme7:           db  "Emerald",NULL
+g_szValueColorTheme8:           db  "Sapphire",NULL
+g_szValueColorTheme9:           db  "Ruby",NULL
+g_szValueColorTheme10:          db  "LCD",NULL
 
 g_szMultichoiceBootFloppyDrvs:  db  "Autodetect",LF