Changeset 47 for trunk/TOOLS/INTERNAL/FIXCODE.C

Timestamp:

Apr 12, 2014, 11:24:51 AM (11 years ago)

Author:

Ben Rietbroek

Message:

Fixed Installer to handle packed hideparttable [2012-04-23]

WARNING!!

All commits upto and including the commit of [2012-05-13] contain
a severe bug!! Building from these sources and then disabling
the 'force LBA' feature while also using the drive-letter feature or
editing the label can DESTROY THE MBR on ALL ATTACHED DISKS!!
DO NOT DISABLE 'FORCE LBA USAGE' WHEN BUILT FROM THE THESE COMMITS!!

Changes

o Installer can now handle packed hideparttable
o Implemented upgrading from v1.06 directly to v1.0.8
o Fixed minor stuff when upgrading from v1.06 to v1.07
o Implemented DOS code in C cross-platform installer

There is now one C source for 4 platforms:
DOS,WIN32,OS2 and LINUX (Linux portion not ready yet)
This obsoletes AIRBOOT.ASM/AIRBOOT.COM.
DOS Installer is now AIRBOOTD.EXE.

o This commit is prepairing for v1.0.8-rc2

File:

• trunk/TOOLS/INTERNAL/FIXCODE.C (modified) (6 diffs)

trunk/TOOLS/INTERNAL/FIXCODE.C

@@ -22 +22 @@
 //  It is a quick-and-dirty translation of the original DOS-only ASM file.
 //  Of course it's not as small but it's much easier to maintain across
-//  multiple platforms.
+//  multiple platforms. A small change with regard to the old ASM version is
+//  that it directly writes AIRBOOT.BIN instead of writing AIR-BOOT.COM.
+//  This way the pre and post situations are kept valid.
 */
 
@@ -49 +51 @@
 #define     IN_FILE     "AIR-BOOT.COM"              // Target from assembly.
 #ifdef      PLATFORM_LINUX
-#define     MERGE_FILE  "MBR-PROT/MBR-PROT.BIN"     // MBR protection TSR.
+#define     MERGE_FILE  "MBR-PROT/MBR-PROT.BIN"     // MBR Protection Image.
 #else
-#define     MERGE_FILE  "MBR-PROT\\MBR-PROT.BIN"    // MBR protection TSR.
+#define     MERGE_FILE  "MBR-PROT\\MBR-PROT.BIN"    // MBR Protection Image.
 #endif
 #define     OUT_FILE    "AIRBOOT.BIN"               // Generated loader image.
@@ -158 +160 @@
     /*
     // Find Protection Image Signature.
-    // Note that this signature must reside on a sector boundary.
+    // Note that this signature must reside on a sector boundary in the
+    // AIR-BOOT.COM image.
     */
     for (i=0; i<55; i++) {
@@ -168 +171 @@
 
     /*
-    // Merge Protection Image.
+    // Abort if not found.
     */
     printf("%s",MergeMBR);
@@ -175 +178 @@
         exit(2);
     }
+
+    /*
+    // Merge Protection Image.
+    */
     memcpy(&BootCode[i*SECSIZE], MBRProtection, MBRPROT_SIZE);
     printf("%s", Okay);
@@ -181 +188 @@
     /*
     // Count Code Sectors.
-    // Obsolete now since the Protection Image has moved just below the
-    // Configuration and the code is always max. size.
+    // Obsolete now because since v1.0.8 the Protection Image has moved just
+    // below the Configuration and the code is always max. size.
     // Overlap checking is done while assembling AIR-BOOT.ASM.
+    // So we just write the max. code sectors here.
     */
     printf("%s", CountCode);