Changeset 47

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

Location:

trunk

Files:

• BOOTCODE/.build (modified) (1 diff)
• BOOTCODE/AIR-BOOT.ASM (modified) (4 diffs)
• BOOTCODE/AIR-BOOT.HIS (modified) (1 diff)
• BOOTCODE/BLDLEVEL.INC (modified) (1 diff)
• BOOTCODE/Makefile (modified) (1 diff)
• BOOTCODE/REGULAR/DEBUG.ASM (modified) (1 diff)
• BOOTCODE/REGULAR/DRIVEIO.ASM (modified) (6 diffs)
• BOOTCODE/REGULAR/STD_TEXT.ASM (modified) (1 diff)
• BOOTCODE/VERSION.INC (modified) (1 diff)
• BOOTCODE/_build.cmd (modified) (1 diff)
• INSTALL/C/.build (modified) (1 diff)
• INSTALL/C/INSTALL.C (modified) (20 diffs)
• INSTALL/C/INSTALL.H (modified) (3 diffs)
• INSTALL/C/Makefile (modified) (1 diff)
• INSTALL/INST_X86/INSTALL.INC (modified) (2 diffs)
• TOOLS/INTERNAL/FIXCODE.C (modified) (6 diffs)
• TOOLS/OS2/SETABOOT/SETABOOT.H (modified) (1 diff)

trunk/BOOTCODE/.build

@@ -3 +3 @@
 export ASM=jwasm
 make dev
+make dist

trunk/BOOTCODE/AIR-BOOT.ASM

@@ -1316 +1316 @@
                 ;
                 ; Critical end of code marker.
-                ;
-                db  'DEAD'
-                db  'FACE'
+                ; Should always be in the image, otherwise something
+                ; is very wrong.
+                ;
+                db      'DEAD'
+                db      'FACE'
 
 ;
@@ -1341 +1343 @@
 
 ; If we are debugging, we overwrite the FX code.
-; As long as no FX is disabled this will do no harm.
+; As long as FX is disabled this will do no harm.
 IFDEF   AUX_DEBUG
                 ORG     06780h
 ENDIF
+
 
 bld_level:
@@ -1353 +1356 @@
                 ; It is unique for each release of AiR-BOOT.
                 ;
+                ; ?? When AUX_DEBUG is enabled and the above org is active,
+                ; the BLDLEVEL gets corrupted eventhough it gets inserted here
+                ; explicitly. The effect is almost like an 'OR' or a merge
+                ; with the already generated FX code.
+                ; Tasm and JWasm produce different results.
+                ; ??
+                ;
                 InsertBuildLevel
 
+                ;bliep <>
+
                 ;
                 ; End of code marker.
+                ; If this one vanishes in the image, the FX code will not
+                ; be operational.
+                ; Will happen with debugging enabled.
                 ;
                 db      'BABE'
@@ -1371 +1386 @@
                 ORIGIN  06800h
 
+zzz_code_space = $ - code_end
                 ;
                 ; This is the AiR-BOOT MBR-Protection Image.

trunk/BOOTCODE/AIR-BOOT.HIS

@@ -23 +23 @@
 ; Rousseau: Fixes and Enhancements
 ; ---------------------------------
-; v1.0.8-rc2-bld201204??+
-; ---------------------
-
-
+;
+; v1.0.8-rc2-bld2012042?
+; ----------------------
+; # Fixed Installer to handle packed hideparttable #
+;   Hide partition configuration is now preserved when upgrading
+;   Implemented upgrading from v1.06 to v1.0.8
+;   Implemented upgrading from v1.07 to v1.0.8
+;
+; # 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.
+;
 ; v1.0.8-pre-rc2-bld20120330
 ; --------------------------

trunk/BOOTCODE/BLDLEVEL.INC

@@ -50 +50 @@
 
 
+
+;~ bliep   struct
+    ;~ db  '@#'
+    ;~ db  BLDLVL_VENDOR
+    ;~ db  ':'
+    ;~ db  BLDLVL_MAJOR_VERSION
+    ;~ db  '.'
+    ;~ db  BLDLVL_MIDDLE_VERSION
+    ;~ db  '.'
+    ;~ db  BLDLVL_MINOR_VERSION
+    ;~ db  '#@##1## '
+;~ bld_level_date_start    db  BLDLVL_YEAR
+    ;~ db  '/'
+    ;~ db  BLDLVL_MONTH
+    ;~ db  '/'
+    ;~ db  BLDLVL_DAY
+    ;~ db  ' '
+    ;~ db  BLDLVL_HOURS
+    ;~ db  ':'
+    ;~ db  BLDLVL_MINUTES
+    ;~ db  ':'
+    ;~ db  BLDLVL_SECONDS
+;~ bld_level_date_end    db  '      '
+    ;~ db  BLDLVL_MACHINE
+    ;~ db  '::'
+    ;~ ; Wasm can only process the reference to 'lang' in pass 2 because it comes
+    ;~ ; from an included file which it has not processed yet at pass 1.
+    ;~ IFDEF   WASM
+        ;~ IF2
+            ;~ db  BLDLVL_LANGUAGE
+        ;~ ENDIF
+    ;~ ; The other assemblers process 'lang' correctly in pass 1.
+    ;~ ELSE
+        ;~ db  BLDLVL_LANGUAGE
+    ;~ ENDIF
+    ;~ db  '::'
+    ;~ db  BLDLVL_MINOR_VERSION
+    ;~ db  '::@@'
+    ;~ db  BLDLVL_DESCRIPTION
+    ;~ db  0
+;~ bliep   ends
+
+
 ;
 ; This macro inserts the BLDLEVEL string at the place where it is invoked.

trunk/BOOTCODE/Makefile

@@ -105 +105 @@
 # will run out-of-space sooner that the other languages.
 # If that happens at least the others will be built.
-BLD_LANGUAGES=EN DE NL FR IT SW #RU
+BLD_LANGUAGES=EN DE NL FR IT SW RU
 #BLD_LANGUAGES=EN DE NL
 

trunk/BOOTCODE/REGULAR/DEBUG.ASM

@@ -426 +426 @@
 db_curlvmsec        db 'Current LVM Sector:',0
 
+
+drive                   db 'drive                    : ',0
+before_lvm_adjust       db 'before lvm adjust        : ',0
+after_lvm_adjust        db 'after lvm adjust         : ',0
+before_lvm_adjust_log   db 'before lvm logical adjust: ',0
+after_lvm_adjust_log    db 'after lvm logical adjust : ',0
+spt_used                db 'spt used                 : ',0

trunk/BOOTCODE/REGULAR/DRIVEIO.ASM

@@ -248 +248 @@
 
             ; Dump drive
-            mov      si,offset drive
+            ;mov      si,offset drive
             ;call     AuxIO_Print
-            xchg     al,dl
+            ;xchg     al,dl
             ;call     AuxIO_TeletypeHexByte
             ;call     AuxIO_TeletypeNL
-            xchg     dl,al
+            ;xchg     dl,al
 
             ; Dump SPT
-            mov      si,offset spt_used
+            ;mov      si,offset spt_used
             ;call     AuxIO_Print
             push     dx
@@ -300 +300 @@
 
             ; LBA
-            mov     si,offset before_lvm_adjust
+            ;mov     si,offset before_lvm_adjust
             ;call    AuxIO_Print
 
-            xchg    dx,bx
+            ;xchg    dx,bx
             ;call    AuxIO_TeletypeHexDWord
             ;call    AuxIO_TeletypeNL
-            xchg    bx,dx
+            ;xchg    bx,dx
         popa
 
@@ -317 +317 @@
 
 
-        pusha
-            mov      si,offset before_lvm_adjust_log
+        ;pusha
+            ;mov      si,offset before_lvm_adjust_log
             ;call     AuxIO_Print
             ; LBA
-            xchg     dx,bx
+            ;xchg     dx,bx
             ;call     AuxIO_TeletypeHexDWord
             ;call     AuxIO_TeletypeNL
-            xchg     bx,dx
-        popa
+            ;xchg     bx,dx
+        ;popa
 
 
@@ -346 +346 @@
 
 
-        pusha
-            mov     si,offset after_lvm_adjust_log
+        ;pusha
+            ;mov     si,offset after_lvm_adjust_log
             ;call    AuxIO_Print
             ; LBA
-            xchg    dx,bx
+            ;xchg    dx,bx
             ;call    AuxIO_TeletypeHexDWord
             ;call    AuxIO_TeletypeNL
-            xchg    bx,dx
-        popa
+            ;xchg    bx,dx
+        ;popa
 
         jmp      done
@@ -427 +427 @@
     done:
 
-        pusha
-            mov     si,offset after_lvm_adjust
+        ;pusha
+            ;mov     si,offset after_lvm_adjust
             ;~ call    AuxIO_Print
             ; LBA
-            xchg    dx,bx
+            ;xchg    dx,bx
             ;~ call    AuxIO_TeletypeHexDWord
             ;~ call    AuxIO_TeletypeNL
-            xchg    bx,dx
-        popa
+            ;xchg    bx,dx
+        ;popa
 
         ;~ pusha
@@ -466 +466 @@
 
 
-drive                   db 'drive                    : ',0
-before_lvm_adjust       db 'before lvm adjust        : ',0
-after_lvm_adjust        db 'after lvm adjust         : ',0
-before_lvm_adjust_log   db 'before lvm logical adjust: ',0
-after_lvm_adjust_log    db 'after lvm logical adjust : ',0
-spt_used                db 'spt used                 : ',0
 
 

trunk/BOOTCODE/REGULAR/STD_TEXT.ASM

@@ -55 +55 @@
              db BLDLVL_MINOR_VERSION,' - (c) '
              db BLDLVL_YEAR
-             db ' M. Kiewitz  <<Internal Release 2p>> (bld: '
+             db ' M. Kiewitz  <<Internal Release 2q>> (bld: '
              db BLDLVL_YEAR
              db BLDLVL_MONTH

trunk/BOOTCODE/VERSION.INC

@@ -17 +17 @@
 AB_YEAR             EQU     2012h
 AB_MONTH            EQU     04h
-AB_DAY              EQU     14h
+AB_DAY              EQU     21h
 
 ; The Hours, Minutes and Seconds, again in BCD for easy manipulation.
-AB_HOURS            EQU     01h
-AB_MINUTES          EQU     30h
+AB_HOURS            EQU     08h
+AB_MINUTES          EQU     35h
 AB_SECONDS          EQU     00h
 

trunk/BOOTCODE/_build.cmd

@@ -1 +1 @@
 @SET ASM=tasm
 @wmake dev
+@wmake dist

trunk/INSTALL/C/.build

@@ -3 +3 @@
 make clean 
 make
+make dist

trunk/INSTALL/C/INSTALL.C

@@ -29 +29 @@
 
 
-//CHAR     Track0[SECTOR_COUNT * BYTES_PER_SECTOR];                                  // current track 0 from harddrive
-//CHAR     Bootcode[SECTOR_COUNT * BYTES_PER_SECTOR];                                // bootcode image from airboot.bin
+//CHAR     Track0[SECTOR_COUNT * BYTES_PER_SECTOR];     // current track 0 from harddrive
+//CHAR     Bootcode[SECTOR_COUNT * BYTES_PER_SECTOR];   // bootcode image from airboot.bin
 
 /*
 // With the addition of the C DOS-version, a static buffer for both
-// Track0 and Bootcode would overflow the DGROUP segment.
-// Placing the buffers in another segment would increase the executable
-// image on disk, so we would like it to be (FAR) BSS data.
+// Track0 and Bootcode would overflow the DGROUP segment. (>64kB)
+// Placing the buffers in another segment does not work with Open Watcom v1.9.
+// While the buffers are BSS and should be in segments like FAR_BSS,
+// Open Watcom places the buffers in FAR_DATA and produces a bloated DOS
+// executable. Using the same source and then building an OS/2 v1.x
+// executable does not produce a bloated .EXE, eventhough the segments are
+// called FAR_DATA and in the middle of the image.
+// Microsoft C v6.0 displays the same behavior; DOS bloated, OS/2 v1.x ok.
+// An interesting feat is that when building an OS/2 v1.x executable and then
+// binding that to produce a FAPI executable does not produce a bloated .EXE
 //
-// When experimenting with segments and #pragma data_seg(), some
+// Also, when experimenting with segments and #pragma data_seg(), some
 // strange behavior was observed.
 // WCC:
 // Explicitly naming a segment and class for the static buffers caused
-// wcc to generate it's default SS: based addressing.
-// Only the -zu flag corrects this.
+// wcc to keep generating it's default SS: based addressing, eventhough
+// the segments are not part of DGROUP.
+// Only the -zu flag corrects this. (DS!=SS)
 // WPP:
 // C++ wpp used correct addressing but the segment class in the #pragma
@@ -49 +57 @@
 //
 // In both cases the volatile (transient) data would occupy space in the
-// disk-image because.
+// disk-image.
 // The only way seems to be putting the buffers in a separate segment using
 // pragma's, using wcc with the -zu flag and use the wlink ORDER directive
 // to place the FAR BSS data above the stack acompanied by a NOEMIT modifier.
 // For this all the class names of the previous segments must be included
-// in the wlink ORDER directive which would make the link phase dependent
+// in the wlink ORDER directive which would make the link phase dependend
 // on segment names. This solution does not work for wpp because it mangles
 // the segment name and overrides the custom class name to FAR_DATA.
 //
 // So, these buffers are now dynamically allocated.
-// Currently they are only freed after succesful program termination,
-// but the RTS should free them in other situations.
-// This will be corrected later.
 */
 PCHAR   Track0      = NULL;     // Buffer for Track0 from harddisk.
@@ -89 +94 @@
 PSZ     ImpossibleCause         = NULL;
 
-
+CHAR    TempHidPartTable[45 * 34];
 
 
@@ -198 +203 @@
 // hideparttable. A 'record' in the hideparttable is 34 bytes long and it
 // can store 45 partition numbers using 6-bits per partition number.
-// Bitfield widths from 1 to 8 are supported and the maxumum buffersize is
+// Bitfield widths from 1 to 8 are supported and the maximum buffersize is
 // 256 bytes.
 */
 char    get_bitfield(char* buffer, char index, char fieldwidth) {
+    char    rv = 0;
     // These are used to break-up the far pointer in large-data model 16-bit
     // code so the buffer can be addressed correctly.
@@ -285 +291 @@
         mov     ah,ch       ; Get mask in AH.
         and     al,ah       ; Mask value.
-        ;ret
     }
 
@@ -291 +296 @@
     // Epilog code.
     // Restore caller's DS.
+    // Store return value.
     _asm {
         pop     ds
-    }
-
-    return;
+        mov     [rv],al
+    }
+
+    return rv;
 }
 
@@ -306 +313 @@
 // hideparttable. A 'record' in the hideparttable is 34 bytes long and it
 // can store 45 partition numbers using 6-bits per partition number.
-// Bitfield widths from 1 to 8 are supported and the maxumum buffersize is
+// Bitfield widths from 1 to 8 are supported and the maximum buffersize is
 // 256 bytes.
 */
@@ -439 +446 @@
         mov     ah,ch       ; Get mask in AH.
         and     al,ah       ; Mask value.
-        ;ret
     }
 
@@ -469 +475 @@
     USHORT CountHarddrives (void) {
         USHORT NumDrives = 0;
-        // Implement !
+        /* Return the byte at 0040:0075 that contains the nr. of harddisks */
+        _asm {
+            push    es              ; We use ES to address the 40h segment.
+            mov     ax,40h          ; Segment address of DOS BIOS DATA.
+            mov     es,ax           ; Make ES address it.
+            xor     ax,ax           ; Clear AX to receive return value.
+            mov     al,es:[0075h]   ; Nr. of harddisks in AL.
+            pop     es              ; Restore ES.
+            mov     [NumDrives],ax  ; Return this value.
+        }
         return NumDrives;
     }
 
-    USHORT OS2_GetIOCTLHandle () {
-        USHORT IOCTLHandle = 0;
-        // Implement !
-        return IOCTLHandle;
-    }
-
-    void OS2_FreeIOCTLHandle (USHORT IOCTLHandle) {
-        // Implement !
+    BOOL HarddriveCheckGeometry (void) {
+        BOOL    rv = FALSE;
+        _asm {
+            ; According to Ralf Brown ES:DI=0000:0000 to avoid BIOS quirks.
+            push    es
+            push    di
+            xor     di,di
+            mov     es,di
+
+            ; Get the disk parameters using normal (non-I13X) access.
+            mov     ah,08h          ; Get Disk Parameters.
+            mov     dl,80h          ; Boot Disk.
+            int     13h             ; Transfer to BIOS.
+
+            ; Check for errors
+            mov     dx,0            ; Assume error.
+            jc      end             ; CY if error.
+            test    ah,ah           ; Double check for return-status.
+            jnz     end             ; AH non-zero if error.
+
+            ; Check sectors per track to be above 62
+            and     cl,00111111b    ; Mask sectors.
+            cmp     cl,SECTOR_COUNT ; Compare with max. AiR-BOOT sectors.
+            jbe     end             ; SECTOR_COUNT or less is not enough.
+
+            inc     dx              ; Set to no error.
+
+        end:
+            mov     ax,dx           ; Status to AX.
+            xor     dx,dx           ; High word to zero.
+
+            ; Store in return value (OS/2 BOOL is 32-bits).
+            mov     word ptr [rv],ax
+            mov     word ptr [rv+2],dx
+
+            ; Restore ES:DI
+            pop     di
+            pop     es
+        }
+
+        return rv;
+    }
+
+
+
+    BOOL Track0Load (void) {
+        BOOL        Success = FALSE;
+
+        _asm {
+
+            push    es              ; ES is used to point to loadbuffer.
+
+            ; Load the complete AiR-BOOT image from Track0.
+            mov     ah,02h          ; Read sectors from disk.
+            mov     al,SECTOR_COUNT ; Number of sectors to read.
+            mov     cx,1            ; Cyl 0, Sector 1.
+            mov     dh,0            ; Head 0.
+            mov     dl,80h          ; Boot Disk.
+            les     bx,[Track0]     ; Buffer in ES:BX.
+            int     13h             ; Transfer to BIOS.
+
+            ; Check for errors
+            mov     dx,0            ; Assume error.
+            jc      end             ; CY if error.
+            test    ah,ah           ; Double check status in AH.
+            jnz     end             ; AH non-zero if error.
+
+            inc     dx              ; Set to no error.
+
+        end:
+            mov     ax,dx           ; Status to AX.
+            xor     dx,dx           ; High word to zero.
+
+            ; Store in return value (OS/2 BOOL is 32-bits).
+            mov     word ptr [Success],ax
+            mov     word ptr [Success+2],dx
+
+            ; Restore ES.
+            pop     es
+        }
+
+        return Success;
+    }
+
+    BOOL Track0Write (void) {
+        BOOL        Success = FALSE;
+
+        _asm {
+
+            push    es              ; ES is used to point to savebuffer.
+
+            ; Save the complete AiR-BOOT image to Track0.
+            mov     ah,03h          ; Write sectors to disk.
+            mov     al,SECTOR_COUNT ; Number of sectors to write.
+            mov     cx,1            ; Cyl 0, Sector 1.
+            mov     dh,0            ; Head 0.
+            mov     dl,80h          ; Boot Disk.
+            les     bx,[Track0]     ; Buffer in ES:BX.
+            int     13h             ; Transfer to BIOS.
+
+            ; Check for errors
+            mov     dx,0            ; Assume error.
+            jc      end             ; CY if error.
+            test    ah,ah           ; Double check status in AH.
+            jnz     end             ; AH non-zero if error.
+
+            inc     dx              ; Set to no error.
+
+        end:
+            mov     ax,dx           ; Status to AX.
+            xor     dx,dx           ; High word to zero.
+
+            ; Store in return value (OS/2 BOOL is 32-bits).
+            mov     word ptr [Success],ax
+            mov     word ptr [Success+2],dx
+
+            ; Restore ES.
+            pop     es
+        }
+
+        return Success;
+    }
+
+    void RebootSystem (void) {
+        _asm {
+            ; 65 * 65536 = 4259840 us = 4.2 sec.
+            mov     ax,8600h        ; BIOS Wait.
+            xor     dx,dx           ; Micro seconds Low.
+            mov     cx,65           ; Micro seconds High.
+            int     15h             ; Transfer to BIOS.
+
+            //~ ; Try reboot via keyboard.
+            //~ mov     al,0feh
+            //~ out     64h,al
+
+            ; Otherwise jump to F000:FFF0.
+            db      0EAh
+            dw      0FFF0h
+            dw      0F000h
+        }
         return;
-    }
-
-
-    BOOL HarddriveCheckGeometry (void) {
-        USHORT               IOCTLHandle;
-
-        IOCTLHandle = OS2_GetIOCTLHandle();
-        // Implement !
-        return FALSE;
-    }
-
-    BOOL Track0Load (void) {
-        USHORT      IOCTLHandle;
-        BOOL        Success = FALSE;
-
-        IOCTLHandle = OS2_GetIOCTLHandle();
-        // Implement !
-        return Success;
-    }
-
-    BOOL Track0Write (void) {
-        USHORT      IOCTLHandle;
-        BOOL        Success = FALSE;
-
-        IOCTLHandle = OS2_GetIOCTLHandle();
-        // Implement !
-        return Success;
-    }
-
-    void RebootSystem (void) {
-
-        // Implement !
     }
 
@@ -577 +692 @@
             SectorsPerTrack = DeviceParmBlock.cSectorsPerTrack;
         OS2_FreeIOCTLHandle (IOCTLHandle);
-        //if (SectorsPerTrack > 61) return TRUE;              // >60 should also be ok for normal image (60 for image 1 for lvm)
-        if (SectorsPerTrack > SECTOR_COUNT) return TRUE;      // Note: This is 1 sector smaller than above !!
+        //if (SectorsPerTrack > 61) return TRUE;
+        if (SectorsPerTrack > SECTOR_COUNT) return TRUE;
         // OS/2 is only able to support 512-byte/sector media, so we dont need to check this
         return FALSE;
@@ -762 +877 @@
     }
 
-    USHORT OS2_GetIOCTLHandle () {
-        USHORT IOCTLHandle = 0;
-        // Implement !
-        return IOCTLHandle;
-    }
-
-    void OS2_FreeIOCTLHandle (USHORT IOCTLHandle) {
-        // Implement !
-        return;
-    }
-
-
     BOOL HarddriveCheckGeometry (void) {
-        USHORT               IOCTLHandle;
-
-        IOCTLHandle = OS2_GetIOCTLHandle();
+
         // Implement !
         return FALSE;
@@ -783 +884 @@
 
     BOOL Track0Load (void) {
-        USHORT      IOCTLHandle;
         BOOL        Success = FALSE;
 
-        IOCTLHandle = OS2_GetIOCTLHandle();
         // Implement !
         return Success;
@@ -792 +891 @@
 
     BOOL Track0Write (void) {
-        USHORT      IOCTLHandle;
         BOOL        Success = FALSE;
 
-        IOCTLHandle = OS2_GetIOCTLHandle();
         // Implement !
         return Success;
@@ -846 +943 @@
     fseek (FileHandle, 0, SEEK_END);
     BootcodeSize = ftell(FileHandle);
-    if (BootcodeSize!=IMAGE_SIZE) {
+    if (BootcodeSize!=IMAGE_SIZE && BootcodeSize!=IMAGE_SIZE_60SECS) {
         fclose (FileHandle);
         if (!Option_CID) {
@@ -996 +1093 @@
 
 
-        /*
-        // HIER AANPASSEN VOOR 1.06 -> 1.07, 1.07/1.0.8-rc1 -> 1.0.8-rc2+ !
-        // MBR-ProtImg, DriveLetters, Packed hideparttable
-        */
-
-        // UPGRADE all later versions
-        //  We don't need to "upgrade" the configuration, we simply copy it over.
-        //   From Sector 55, 6 sectors in total but never header/version
+        // UPGRADE to v1.06 format.
+        // We don't need to "upgrade" the configuration to move to v1.06, we simply copy it over.
+        // From Sector 55, 6 sectors in total but never header/version.
         // Rousseau: We copy two more sectors (8 in total) in the extended (45 partition) version.
         switch (IMAGE_SIZE) {
@@ -1015 +1107 @@
             }
         }
+
+        /*
+        // Convert v1.06 hideparttable (30x30) to the v1.07 (30x45) format.
+        */
+        if ((Installed_ConfigVersion == 0x102) && (Bootcode_ConfigVersion >= 0x107)) {
+            int     i,j;
+            char    c;
+            //printf("Converting 1.06 -> 1.07 hidepart");
+            memcpy(&Bootcode[0x7400], &Track0[0x7200], 900);
+            memset(TempHidPartTable, 0xff, 45 * 34);
+            for (i=0; i<30; i++) {
+                for (j=0; j<30; j++) {
+                    c = Bootcode[0x7400+i*30+j];
+                    TempHidPartTable[i*45+j] = c;
+                }
+            }
+            memcpy(&Bootcode[0x7400], TempHidPartTable, 30 * 45);
+        }
+
+        /*
+        // Convert v1.07 hideparttable (30x45) to a packed v1.0.8+ (45x45) format.
+        */
+        if ((Installed_ConfigVersion < 0x108) && (Bootcode_ConfigVersion >= 0x108)) {
+            int     i,j;
+            char    c;
+            //printf("Converting to 1.08 packed hidepart");
+            memset(TempHidPartTable, 0xff, 45 * 34);
+            // Unpacked table is 30 rows with 45 columns per row.
+            // Packed table is 45 rows with 45 columns per row packed in 34 bytes.
+            for (i=0; i<30; i++) {
+                for (j=0; j<45; j++) {
+                    c = Bootcode[0x7400+i*45+j];                            // Get unpacked value
+                    c = set_bitfield(&TempHidPartTable[i*34], j, 6, c);     // Store 6-bit packed value
+                }
+            }
+            memcpy(&Bootcode[0x7400], TempHidPartTable, 45 * 34);
+        }
+
         return;
     }
+    // MKW:
     // Check for prior v0.26 signature
     // not supported in C version anymore
-    //  Don't have this version here for testing and I can't risk breaking
-    //  configuration
+    // Don't have this version here for testing and I can't risk breaking
+    // configuration
     return;
 }
@@ -1160 +1291 @@
                 if (!Option_CID) {
                 printf(", but may be updated");
+                }
+            if (!Option_CID) {
                 printf("\n");
-                }
+            }
             break;
+
         case STATUS_IMPOSSIBLE:
             if (!Option_CID) {
-            printf(ImpossibleCause);
+                printf(ImpossibleCause);
             }
             break;
@@ -1264 +1398 @@
 
 
-
+void    DoDebug() {
+    USHORT  t0codv  = 0;
+    USHORT  t0cfgv  = 0;
+    USHORT  bccodv  = 0;
+    USHORT  bccfgv  = 0;
+
+    //do_bf_test();
+
+    printf("\nHardisks : %d\n", CountHarddrives());
+    printf("\nGEO      : %d\n", HarddriveCheckGeometry());
+    printf("\nTrack0   : %d\n", Track0Load());
+    printf("\nBootcode : %d\n", LoadBootcodeFromFile());
+
+
+    // Dump Track0
+    {
+        int i;
+        for (i=0; i<512; i++) {
+            printf("%02X",Track0[i]);
+        }
+    }
+    printf("\n\n");
+    // Dump Bootcode
+    {
+        int i;
+        for (i=0; i<512; i++) {
+            printf("%02X",Bootcode[i]);
+        }
+    }
+    printf("\n\n");
+
+    t0codv = Track0[13] << 8 | Track0[14];
+    printf("t0codv : %04X\n", t0codv);
+
+    t0cfgv = Track0[0x6c00+13] << 8 | Track0[0x6c00+14];
+    printf("t0cfgv : %04X\n", t0cfgv);
+
+    bccodv = Bootcode[13] << 8 | Bootcode[14];
+    printf("bccodv : %04X\n", bccodv);
+
+    bccfgv = Bootcode[0x6c00+13] << 8 | Bootcode[0x6c00+14];
+    printf("bccfgv : %04X\n", bccfgv);
+
+    return;
+
+}
 
 
@@ -1283 +1462 @@
     CHAR    TempSpace[MAXCMDPARMLEN+1];
 
-    char* p = NULL;
-
-
-    do_bf_test();
-    exit(0);
-
-
-//   printf("AiR-BOOT Installer v1.07\n");
-//   printf(" - (c) Copyright 1998-2011 by Martin Kiewitz.\n");
-//   printf("\n-> ...Please wait... <-\n");
+
+    // Show header.
+    if (!Option_CID) {
+        printf("AiR-BOOT Installer v%s.%s.%s for %s\n",
+            BLDLVL_MAJOR_VERSION,
+            BLDLVL_MIDDLE_VERSION,
+            BLDLVL_MINOR_VERSION,
+            PLATFORM_NAME);
+        printf(" - (c) Copyright 1998-2012 by Martin Kiewitz.\n");
+        printf("\n-> ...Please wait... <-\n");
+    }
 
     // Allocate buffers for Track0 and AIRBOOT.BIN.
@@ -1307 +1487 @@
 
 
-    p = (PCHAR) &Track0;
-    p = (PCHAR) Track0;
-    p[0] = 'A';
-
-    {
-        int i=0;
-        for (i=0; i<sizeof(Track0); i++) {
-            Track0[i]='X';
-        }
-        for (i=0; i<sizeof(Bootcode); i++) {
-            Bootcode[i]='Y';
-        }
-        //~ for (i=0; i<sizeof(Bootcode2); i++) {
-            //~ Bootcode2[i]='Z';
-        //~ }
-    }
+    //~ DoDebug();
+    //~ exit(0);
 
 

trunk/INSTALL/C/INSTALL.H

@@ -15 +15 @@
 #define     BLDLVL_YEAR             "2012"
 #define     BLDLVL_MONTH            "04"
-#define     BLDLVL_DAY              "14"
+#define     BLDLVL_DAY              "21"
 // Build time
-#define     BLDLVL_HOURS            "01"
-#define     BLDLVL_MINUTES          "30"
+#define     BLDLVL_HOURS            "08"
+#define     BLDLVL_MINUTES          "35"
 #define     BLDLVL_SECONDS          "00"
 // Build machine
@@ -49 +49 @@
 #if defined(__DOS__)
     // DOS platform
+    #define PLATFORM_DOS
+    #define PLATFORM_NAME   "DOS"
     #include    <os2def.h>      // We use the OS/2 definitions like CHAR etc.
-    #define PLATFORM_DOS
 #elif defined(__OS2__) && !defined(OS2)
     // OS/2 platform
+    #define     PLATFORM_OS2
+    #define     PLATFORM_NAME   "OS/2"
     #define     INCL_NOPMAPI
     #define     INCL_BASE
@@ -59 +62 @@
     #include    <os2.h>
     #include    <malloc.h>                                                      // Rousseau: added to use getenv()
-    #define     PLATFORM_OS2
 #elif defined(__NT__)
     // Win32 platform
+    #define     PLATFORM_WINNT
+    #define     PLATFORM_NAME   "Windows NT/2K/XP/Vista/7"
     #include    <windows.h>
-    #define     PLATFORM_WINNT
+
 #elif defined(__LINUX__)
     // Linux platform
+    #define     PLATFORM_LINUX
+    #define     PLATFORM_NAME   "Linux"
     #include    <os2def.h>      // We use the OS/2 definitions like CHAR etc.
-    #define     PLATFORM_LINUX
 #else
     #error Unsupported platform

trunk/INSTALL/C/Makefile

@@ -327 +327 @@
 #
 
+
+# -----------------------------------------------------------------------------
+# DISTRIBUTE TO RELEASE SPACE
+# -----------------------------------------------------------------------------
+# This distributes all .BIN files to BOOTCODE.
+# Then it installs the English version to RELEASES as AIRBOOT.BIN.
+# -----------------------------------------------------------------------------
+dist:   .SYMBOLIC
+        @if exist *.EXE $(CP) *.EXE ..$(DS)..$(DS)RELEASE$(DS)BOOTCODE
+
+
 #
 # Rebuild all targets.

trunk/INSTALL/INST_X86/INSTALL.INC

@@ -371 +371 @@
 
 
-;       Out: Carry Flag SET if Harddisc failed 62-sectors test
+;       Out: Carry Flag SET if Harddisc failed 63-sectors test
 Init_CheckHarddisc             Proc Near
    mov     ah, 08h
@@ -378 +378 @@
    and     cl, 111111b
    cmp     cl, 62
-   jae     INITCH_Success
+   ja      INITCH_Success
    stc
    ret

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);

trunk/TOOLS/OS2/SETABOOT/SETABOOT.H

@@ -16 +16 @@
 #define     BLDLVL_YEAR             "2012"
 #define     BLDLVL_MONTH            "04"
-#define     BLDLVL_DAY              "14"
+#define     BLDLVL_DAY              "21"
 // Build time
-#define     BLDLVL_HOURS            "01"
-#define     BLDLVL_MINUTES          "30"
+#define     BLDLVL_HOURS            "08"
+#define     BLDLVL_MINUTES          "35"
 #define     BLDLVL_SECONDS          "00"
 // Build machine