Changeset 334 in xtideuniversalbios for trunk/XTIDE_Universal_BIOS/Src/Main.asm

Timestamp:

Mar 13, 2012, 5:29:34 AM (13 years ago)

Author:

gregli@…

google:author:

gregli@hotmail.com

Message:

Serial server DPT flag optimization, remove Serial/IDE specific header on drive scan results, added GNU GPL v2 banner at boot.

File:

• trunk/XTIDE_Universal_BIOS/Src/Main.asm (modified) (2 diffs)

trunk/XTIDE_Universal_BIOS/Src/Main.asm

@@ -158 +158 @@
 iend
 
+    ; Strings are first to avoid them moving unnessarily when code is turned on and off with %ifdef's
+    ; since some groups of strings need to be on the same 256-byte page.
+    ;
+%ifdef MODULE_STRINGS_COMPRESSED
+    %define STRINGSCOMPRESSED_STRINGS
+    %include "StringsCompressed.asm" 
+%else
+    %include "Strings.asm"          ; For BIOS message strings
+%endif
+
     ; Libraries, data, Initialization and drive detection
+
     %include "AssemblyLibrary.asm"
+
+    ; String compression tables need to come after the AssemblyLibrary (since they depend on addresses
+    ; established in the assembly library), and are unncessary if strings are not compressed.
+    ;
+%ifdef MODULE_STRINGS_COMPRESSED
+    %undef  STRINGSCOMPRESSED_STRINGS       
+    %define STRINGSCOMPRESSED_TABLES
+    %include "StringsCompressed.asm"
+%endif
+        
     %include "Initialize.asm"       ; For BIOS initialization
     %include "Interrupts.asm"       ; For Interrupt initialization
@@ -165 +186 @@
     %include "CreateDPT.asm"        ; For creating DPTs
     %include "FindDPT.asm"          ; For finding DPTs
-%ifdef MODULE_STRINGS_COMPRESSED
-    %include "StringsCompressed.asm"
-%else
-    %include "Strings.asm"          ; For BIOS message strings
-%endif
     %include "AccessDPT.asm"        ; For accessing DPTs
     %include "BootMenuInfo.asm"     ; For creating BOOTMENUINFO structs