Changeset 624 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Inc

Timestamp:

Oct 2, 2022, 7:30:02 PM (2 years ago)

Author:

Krister Nordvall

Message:

Changes:

• The BIOS version string has been changed to show the repository revision number instead of the useless "v2.0.0 beta 3+" string. In other words, the seemingly never ending beta is finally over! The version string is now updated by TortoiseSVN client side hook scripts (residing in \Tools) to be used when committing changes to the repository. It should also be possible to use these scripts with other subversion clients under Windows since they are essentially just regular batch (cmd) files!
• The eSEG_STR macro has been changed to always disable interrupts. The workaround used for the buggy, early revisions of the 8088/8086 CPUs apparently does not work. Many thanks to Jim Leonard (Trixter) for reporting this problem!
• Minor optimizations to the eBSF and eBSR macros.

Location:

trunk/XTIDE_Universal_BIOS/Inc

Files:

• Revision.inc (added)
• RomVars.inc (modified) (2 diffs)
• Version.inc (modified) (3 diffs)

trunk/XTIDE_Universal_BIOS/Inc/RomVars.inc

@@ -142 +142 @@
     .rgbSign            resb    6   ; Signature for XTIDE Configurator Program (must be even length)
     .szTitle            resb    31  ; BIOS title string
-    .szVersion          resb    25  ; BIOS version string
+    .szVersion          resb    19  ; BIOS version string (supports up to r9999)
 
     .wFlags             resb    2   ; Word for ROM flags
@@ -154 +154 @@
     .bIdleTimeout       resb    1   ; Standby timer value
 
+                        alignb  2   ; WORD align the IDEVARS structures
     .ideVarsBegin:
     .ideVars0           resb    IDEVARS_size

trunk/XTIDE_Universal_BIOS/Inc/Version.inc

@@ -1 @@
-; /*
 ; Project name  :   XTIDE Universal BIOS
 ; Description   :   Version information.
@@ -20 +19 @@
 
 ; Flash signature revisions:
+; XUB209    Shortened the BIOS version string (ROMVARS.szVersion) and WORD aligned the IDEVARS structures
 ; XUB208    Added option to skip slave drive detection
 ; XTIDE207  Added device type DEVICE_8BIT_XTIDE_REV2_OLIVETTI
@@ -27 +27 @@
 ;
 
-;--------------------------------------------------------------------------------
-;
-; Assembler Version
-;
-
 %ifndef VERSION_INC
 %define VERSION_INC
 
 
-%define TITLE_STRING_START  "-=XTIDE Universal BIOS "
+%define TITLE_STRING_START      "-=XTIDE Universal BIOS "
 %ifdef USE_AT
     %ifdef USE_386
-        %define TITLE_STRING_END    "(386)=-",NULL
+        %define TITLE_STRING_END    "(386)=-"
     %else
-        %define TITLE_STRING_END    "(AT)=-",NULL
+        %define TITLE_STRING_END    "(AT)=-"
     %endif
 %elifdef USE_186
-    %define TITLE_STRING_END    "(XT+)=-",NULL
+    %define TITLE_STRING_END    "(XT+)=-"
 %else
-    %define TITLE_STRING_END    "(XT)=-",NULL
+    %define TITLE_STRING_END    "(XT)=-"
 %endif
 
-%define TITLE_STRING            TITLE_STRING_START, TITLE_STRING_END
-%define ROM_VERSION_STRING      "v2.0.0",BETA,"3+ (",__DATE__,")",NULL
-%define FLASH_SIGNATURE         "XUB208"    ; Do not terminate with NULL
+%define TITLE_STRING            TITLE_STRING_START,TITLE_STRING_END,NULL
+%define ROM_VERSION_STRING      incbin "Revision.inc"   ; This file must include a trailing space
+; Note!
+; NASM will throw weird errors when using ROM_VERSION_STRING if it's not a single statement on its own line.
+; This is likely due to the "unusual" way it is defined above. Make sure to not have any additional strings
+; 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         "XUB209"    ; Do not terminate with NULL
 
 
 %endif ; VERSION_INC
-
-%if 0           ; equivalent of a NASM comment block
-;*/
-
-//--------------------------------------------------------------------------------
-//
-// C/C++ Version
-//
-
-#define BETA " Beta "
-
-#define ROM_VERSION_STRING      "v2.0.0" BETA "3 (" __DATE__ ")"
-
-/*
-%endif
-;*/