Changeset 37

trunk/1README.TXT

-              r32
+              r37
 Note:
 -----
 This is the "eComStation fork" of AiR-BOOT and it is maintained by a
 different developer. The file you are currently reading, 1README.TXT,
 replaces the original README.TXT as created by Martin Kiewitz.
+This is the "eComStation fork" of AiR-BOOT and it is maintained by a
+different developer. The file you are currently reading, 1README.TXT,
+replaces the original README.TXT as created by Martin Kiewitz.
 The latter can be found in README.MKW but note that the information
 there about building AiR-BOOT is possibly outdated.
+in there about building AiR-BOOT is completely outdated.
+Building AiR-BOOT
+-----------------
+- Checkout the sources from http://svn.netlabs.org/air-boot.
+- Setup your Open Watcom build-environment for your OS.
+- Download JWasm for your OS.
+- Run wmake help to see a list of build options -or-
+- Run wmake without paramaters to build AiR-BOOT for all languages.
+See BUILD.NFO for more information.
+Rousseau.

trunk/BOOTCODE/AIR-BOOT.ASM

-              r36
+              r37
+;IFDEF   JWASM
+;    db  'JWASM'
+;ENDIF
+;IFDEF   TASM
+;    db  'TASM'
+;ENDIF
+;IF  DEBUG_LEVEL EQ  0
+;    db  'L0'
+;ELSE
+;    db  'Lx'
+;ENDIF
 ; ---------------------------------
 …
 ; ---------------------------------
+;
+; v1.0.8
+; ------
+; v1.0.8-rc2-bld20120213
+;-----------------------
+; # Removed requirement for LVM P and V name to be the same to edit #
+;   However, when both are the same before the edit, the V name will be
+;   synved to the P name to have them both the same again after the edit.
+;   If they differ, only the V name is updated.
+;
+; # Trying to edit the label of a type 0x35 partition now shows a popup #
+;   The user is informed that type 0x35 labels cannot be edited.
+;
+; # Type 0x35 partitions cannot be added to the AB-menu anymore #
+;   They are not bootable anyway. The user is informed by a popup.
+;
+; # De-tasemized the Assembler sources for JWasm compatibility #
+;   AiR-BOOT can now be built using JWasm, which is now the preferred
+;   assembler.
+;
+; # Completely reworked the build-system #
+;   Everything is now done with Makefiles using WMake, Wlink and the
+;   C/C++ Compilers from the Open Watcom development tools together with JWasm.
+;   This obsoletes tasm, tlink and exe2bin.
+;
+; # Cross-Platform support #
+;   AiR-BOOT and it's helpers can now be built on: DOS, Win32, OS/2 and Linux.
+;
+; # Rewrote FIXCODE.ASM in C so the tool-chain is not dependent on a DOS .COM
+;   program for embedding the MBR-protection. DOS,Win32,OS/2 and Linux
+;   versions of FIXCODE are now used. (EXE[MZ|PE|LX] and ELF)
+;
+; v1.0.8-rc1-bld20120124
+; ----------------------
 ; # Changed version format to be more WarpIN compatible #
 ;   This is a cosmetic change only, the internal format has not changed.
 …
 ; It should be off in release code.
+;
+;ModuleNames                equ      1
+;ModuleNames             equ     1
+;
+; An ORG directive resets the location counter where code and data is
+; generated. If the location counter is reset back to a point where
+; code or data already has been generated, this will be overwritten
+; without warning.
+; This macro is run at every ORG directive to check for this condition,
+; and when it occurs further assembly is terminated.
+; FIXME: Get JWasm and Tasm use some common ECHO/%OUT method.
+;        (Tasm only pases first word of non-quoted string to a macro)
+;
+check_overlap   MACRO   loc
+    ; Exit macro immediately if no overlap.
+    ; We don't want to assign values to z_last_... if there is no
+    ; overlap because they would then hold the values the last time this
+    ; macro was called and not those of the last overlap.
+    IF (loc - $) LE 0
+        EXITM
+    ENDIF
+    ; Calculate the overlap.
+    z_last_overlap_location = loc
+    z_last_overlap_size = (loc - $)
+    IFDEF   JWASM
+        ; Output message.
+        ECHO
+        ECHO ** ERROR: LOCATION OVERLAP DETECTED [JWASM] ! **
+        ECHO .         THIS IS MOST LIKELY CAUSED BY CODE / DATA
+        ECHO .         EXPANSION TOWARDS AN 'ORG' DIRECTIVE.
+        ECHO .         LOOK AT 'z_last_overlap_location' TO SEE WHERE.
+        ECHO .         LOOK AT 'z_last_overlap_size' TO SEE SIZE.
+        ECHO .         FORCING ERROR...
+        ECHO
+    ENDIF
+    IFDEF   TASM
+        IF2
+            ; Output message (only on pass2).
+            %OUT
+            %OUT ** ERROR: LOCATION OVERLAP DETECTED [TASM] ! **
+            %OUT .         THIS IS MOST LIKELY CAUSED BY CODE / DATA
+            %OUT .         EXPANSION TOWARDS AN 'ORG' DIRECTIVE.
+            %OUT .         LOOK AT 'z_last_overlap_location' TO WHERE.
+            %OUT .         LOOK AT 'z_last_overlap_size' TO SEE SIZE.
+            %OUT .         FORCING ERROR...
+            %OUT
+        ENDIF
+    ENDIF
+    ; Terminate assembly by forcing an error.
+    .ERR
+ENDM
 …
 ; in the BSS.
+;
 MaxDisks                   equ      64
+MaxDisks                equ     64
+;
 ; If defined then include DEBUG.ASM and output debug-info to serial-port.
+;
 ;AuxDebug                   equ      1
+;AuxDebug                equ     1
 ; Com-port for debugging, 0 is disabled
 BiosComPort                equ      0
+BiosComPort             equ     0
 …
 ; 9600 bps, no parity, 1 stop-bit, 8 bits per char
 AuxInitParms               equ      11100011b
+AuxInitParms            equ     11100011b
 ; Default word value for BIOS_AuxParms variable
 ; Note that is has moved since v1.07
 BIOS_AuxParmsDefault       equ      (AuxInitParms SHL 8) OR BiosComPort
+BIOS_AuxParmsDefault    equ     (AuxInitParms SHL 8) OR BiosComPort
+;
 ; If ReleaseCode is not defined, it will produce debug-able code...
+;
 ReleaseCode                equ      -1
+;
 ; All Special Equs for this project
+ReleaseCode             equ     -1
+;
+; All Special Equ's for this project
+;
 ; Use different addresses depending on whether in pre-boot
 ; or debug environment.
+; or debug (dos) environment.
 IFDEF ReleaseCode
+   StartBaseSeg             equ     00000h   ; Pre-boot, we are in low memory
+   StartBasePtr             equ     07C00h   ; BIOS starts our MBR at 0:7C00
+  ELSE
+   StartBaseSeg             equ     03A98h   ; Adjust to DOS segment
+                                             ; Rousseau: where does this value
+                                             ; come from ?
+                                             ; Should be CS;
+                                             ; Rectified in actual code by
+                                             ; ignoring this value.
+   StartBasePtr             equ     00100h   ; We are a .com file,DOS is active
+    StartBaseSeg    equ     00000h  ; Pre-boot, we are in low memory
+    StartBasePtr    equ     07C00h  ; BIOS starts our MBR at 0:7C00
+ELSE
+    ; Rousseau: where does this value come from ?
+    ; Should be CS.
+    ; Rectified in actual code by ignoring this value.
+    StartBaseSeg    equ     03A98h  ; Adjust to DOS segment
+    StartBasePtr    equ     00100h  ; We are a .COM file, DOS is active
 ENDIF
 …
 ; Include
+Include ..\INCLUDE\asm.inc
+;Include ..\INCLUDE\DOS\airboot.inc    ; does not exist anymore
+Include ../INCLUDE/ASM.INC
 ; Special line-drawing characters
+TextChar_WinLineRight       equ       0C4h ; 'Ã'
+TextChar_WinLineDown        equ       0B3h ; 'Â³'
+TextChar_WinRep1            equ       0D1h ; 'Ã'
+TextChar_WinRep2            equ       0C5h ; 'Ã
+'
+TextChar_WinRep3            equ       0CFh ; 'Ã'
+TextChar_WinRep4            equ       0B5h ; 'Âµ'
+TextChar_WinRep5            equ       0C6h ; 'Ã'
+TextChar_WinRep6            equ       0D8h ; 'Ã'
+TextChar_WinLineRight       equ     0C4h ; 'Ä'
+TextChar_WinLineDown        equ     0B3h ; '³'
+TextChar_WinRep1            equ     0D1h ; 'Ñ'
+TextChar_WinRep2            equ     0C5h ; 'Å'
+TextChar_WinRep3            equ     0CFh ; 'Ï'
+TextChar_WinRep4            equ     0B5h ; 'µ'
+TextChar_WinRep5            equ     0C6h ; 'Æ'
+TextChar_WinRep6            equ     0D8h ; 'Ø'
 ; Offsets for Partition-Entries in MBR/EPRs
 LocBRPT_LenOfEntry          equ         16   ; Length of a standard MBR or EPR entry
 LocBRPT_Flags               equ          0   ; Bootable, Hidden, etc.
 LocBRPT_BeginCHS            equ          1   ; Combined 10-bits cyl with 6 bits
 LocBRPT_BeginHead           equ          1   ; Start head      (0<=H<255)    255 is invalid !
 LocBRPT_BeginSector         equ          2   ; Start sector    (1<=S<=255)
 LocBRPT_BeginCylinder       equ          3   ; Start cylinder  (0<=C<[1024,16384,65536,n])
 LocBRPT_SystemID            equ          4   ; Type of system using the partition
 LocBRPT_EndCHS              equ          5   ; Same for end of partition
 LocBRPT_EndHead             equ          5
 LocBRPT_EndSector           equ          6
 LocBRPT_EndCylinder         equ          7
 LocBRPT_RelativeBegin       equ          8
 LocBRPT_AbsoluteLength      equ         12
 LocBR_Magic                 equ        510
+LocBRPT_LenOfEntry          equ     16  ; Length of a standard MBR or EPR entry
+LocBRPT_Flags               equ     0   ; Bootable, Hidden, etc.
+LocBRPT_BeginCHS            equ     1   ; Combined 10-bits cyl with 6 bits
+LocBRPT_BeginHead           equ     1   ; Start head      (0<=H<255)    255 is invalid !
+LocBRPT_BeginSector         equ     2   ; Start sector    (1<=S<=255)
+LocBRPT_BeginCylinder       equ     3   ; Start cylinder  (0<=C<[1024,16384,65536,n])
+LocBRPT_SystemID            equ     4   ; Type of system using the partition
+LocBRPT_EndCHS              equ     5   ; Same for end of partition
+LocBRPT_EndHead             equ     5
+LocBRPT_EndSector           equ     6
+LocBRPT_EndCylinder         equ     7
+LocBRPT_RelativeBegin       equ     8
+LocBRPT_AbsoluteLength      equ     12
+LocBR_Magic                 equ     510
 ; Used as a quick compare in LVM.ASM
 LocLVM_SignatureByte0       equ         02h
+LocLVM_SignatureByte0       equ     02h
 ; Offsets for LVM Information Sector.
 ; These are relative to the start of the LVM sector.
 LocLVM_SignatureStart       equ         00h ; 02h,'RMBPMFD' (8 bytes)
 LocLVM_CRC                  equ         08h ; CRC is a DWORD
 LocLVM_Heads                equ         1ch ; Number of heads
 LocLVM_Secs                 equ         20h ; Sectors per Track
 LocLVM_DiskName             equ         24h ; Name of the disk
 LocLVM_StartOfEntries       equ         3ch ; (contains maximum of 4 entries)
 LocLVM_LenOfEntry           equ         3ch ; Length of an LVM-entry
+LocLVM_SignatureStart       equ     00h ; 02h,'RMBPMFD' (8 bytes)
+LocLVM_CRC                  equ     08h ; CRC is a DWORD
+LocLVM_Heads                equ     1ch ; Number of heads
+LocLVM_Secs                 equ     20h ; Sectors per Track
+LocLVM_DiskName             equ     24h ; Name of the disk
+LocLVM_StartOfEntries       equ     3ch ; (contains maximum of 4 entries)
+LocLVM_LenOfEntry           equ     3ch ; Length of an LVM-entry
 ; An LVM info-sector can contain information on max. 4 partitions.
 …
 ; of the logical partition and only one LVM entry is used in that logical
 ; LVM info-sector.
 LocLVM_MaxEntries           equ          4  ; Max entries in an LVM-sector
+LocLVM_MaxEntries           equ     4   ; Max entries in an LVM-sector
 ; Offsets for LVM entry.
 ; These are relative to the start of the entry.
+LocLVM_VolumeID             equ         00h ; is DWORD
+LocLVM_PartitionID          equ         04h ; is DWORD
+LocLVM_PartitionSize        equ         08h ; is DWORD
+LocLVM_PartitionStart       equ         0ch ; is DWORD
+LocLVM_OnBootMenu           equ         10h ; is on IBM BM Bootmenu
+LocLVM_Startable            equ         11h ; is Startable (newly installed system)
+LocLVM_VolumeLetter         equ         12h ; is Drive Letter for partition (C-Z or 0)
+LocLVM_Unknown              equ         13h ; unknown BYTE
+LocLVM_VolumeID             equ     00h ; is DWORD
+LocLVM_PartitionID          equ     04h ; is DWORD
+LocLVM_PartitionSize        equ     08h ; is DWORD
+LocLVM_PartitionStart       equ     0ch ; is DWORD
+LocLVM_OnBootMenu           equ     10h ; is on IBM BM Bootmenu
+LocLVM_Startable            equ     11h ; is Startable (newly installed system)
+LocLVM_VolumeLetter         equ     12h ; is Drive Letter for partition (C-Z or 0)
+LocLVM_Unknown              equ     13h ; unknown BYTE
 ; Truncated to 11 chars when  displayed in menu.
 ; MiniLVM sets both to the same value.
 ; Also, MiniLVM uses a 0-byte terminator, so the maximum length is 19d.
 ; Same goes for LocLVM_DiskName.
 LocLVM_VolumeName           equ         14h ; 20 bytes
 LocLVM_PartitionName        equ         28h ; 20 bytes (Used in menu)
+LocLVM_VolumeName           equ     14h ; 20 bytes
+LocLVM_PartitionName        equ     28h ; 20 bytes (Used in menu)
 ; Offsets for IPT (Internal Partition Table)
 LocIPT_MaxPartitions        equ         partition_count   ; 45 in v1.07
 LocIPT_LenOfSizeElement     equ          6   ; Size of one Size-Element
 LocIPT_LenOfIPT             equ         34   ; Length of an IPT-entry
 LocIPT_Serial               equ          0   ; Serial from MBR ?
 LocIPT_Name                 equ          4   ; Name from FS or LVM  (part/vol)
 LocIPT_Drive                equ         15   ; Drive-ID             (80h,81h)
 LocIPT_SystemID             equ         16   ; Partition-Type       (06,07,etc)
 LocIPT_Flags                equ         17   ; AiR-BOOT Flags for partition (see below)
 LocIPT_BootRecordCRC        equ         18   ; CRC of Boot-Record
 LocIPT_LocationBegin        equ         20   ; Begin of Partition
 LocIPT_LocationPartTable    equ         23   ; PartitionTable of Partition
 LocIPT_AbsoluteBegin        equ         26   ; Absolute Sector of Begin
 LocIPT_AbsolutePartTable    equ         30   ; Absolute Sector of PartTable
+LocIPT_MaxPartitions        equ     partition_count ; 45 in v1.07
+LocIPT_LenOfSizeElement     equ     6   ; Size of one Size-Element
+LocIPT_LenOfIPT             equ     34  ; Length of an IPT-entry
+LocIPT_Serial               equ     0   ; Serial from MBR ?
+LocIPT_Name                 equ     4   ; Name from FS or LVM  (part/vol)
+LocIPT_Drive                equ     15  ; Drive-ID             (80h,81h)
+LocIPT_SystemID             equ     16  ; Partition-Type       (06,07,etc)
+LocIPT_Flags                equ     17  ; AiR-BOOT Flags for partition (see below)
+LocIPT_BootRecordCRC        equ     18  ; CRC of Boot-Record
+LocIPT_LocationBegin        equ     20  ; Begin of Partition
+LocIPT_LocationPartTable    equ     23  ; PartitionTable of Partition
+LocIPT_AbsoluteBegin        equ     26  ; Absolute Sector of Begin
+LocIPT_AbsolutePartTable    equ     30  ; Absolute Sector of PartTable
 ; AiR-BOOT IPT-Flags
 LocIPT_DefaultFlags         equ   00000011b  ; Don't know if boot-able :)
 LocIPT_DefaultNonBootFlags  equ   00000010b  ; ...VIBR Detection is always on
 Flags_BootAble              equ   00000001b
 Flags_VIBR_Detection        equ   00000010b
 Flags_HideFeature           equ   00000100b
 Flags_DriveLetter           equ   00001000b  ; OS/2 FAT16/HPFS only
 Flags_ExtPartMShack         equ   00010000b  ; Extended Partition M$-Hack req ?
 Flags_NoPartName            equ   01000000b
 Flags_NowFound              equ   10000000b  ; temp only in OldPartTable
 Flags_SpecialMarker         equ   10000000b  ; temp only for HiddenSetup
 FileSysFlags_BootAble       equ   00000001b  ; Is this Partition boot-able ?
 FileSysFlags_FAT32          equ   00010000b  ; FAT 32 specific name getting
 FileSysFlags_NoName         equ   00100000b  ; No Name - use PartitionName
 FileSysFlags_DriveLetter    equ   01000000b  ; DriveLetter Feature possible
+LocIPT_DefaultFlags         equ     00000011b   ; Don't know if boot-able :)
+LocIPT_DefaultNonBootFlags  equ     00000010b   ; ...VIBR Detection is always on
+Flags_Bootable              equ     00000001b
+Flags_VIBR_Detection        equ     00000010b
+Flags_HideFeature           equ     00000100b
+Flags_DriveLetter           equ     00001000b   ; OS/2 FAT16/HPFS only
+Flags_ExtPartMShack         equ     00010000b   ; Extended Partition M$-Hack req ?
+Flags_NoPartName            equ     01000000b
+Flags_NowFound              equ     10000000b   ; temp only in OldPartTable
+Flags_SpecialMarker         equ     10000000b   ; temp only for HiddenSetup
+FileSysFlags_BootAble       equ     00000001b   ; Is this Partition boot-able ?
+FileSysFlags_FAT32          equ     00010000b   ; FAT 32 specific name getting
+FileSysFlags_NoName         equ     00100000b   ; No Name - use PartitionName
+FileSysFlags_DriveLetter    equ     01000000b   ; DriveLetter Feature possible
 ; Navigation keys
+Keys_Up                     equ         48h
+Keys_Down                   equ         50h
+Keys_Left                   equ         4Bh
+Keys_Right                  equ         4Dh
+Keys_PageUp                 equ         49h
+Keys_PageDown               equ         51h
+Keys_GrayPlus               equ         4Eh
+Keys_GrayMinus              equ         4Ah
+Keys_Plus                   equ         1Bh
+Keys_Minus                  equ         35h
+Keys_Enter                  equ         1Ch
+Keys_ESC                    equ          1h
+Keys_F1                     equ         3Bh
+Keys_F10                    equ         44h
+Keys_C                      equ         2Eh ; Add. Check auf Ctrl!
+Keys_Y                      equ         2Ch
+Keys_Z                      equ         15h
+Keys_N                      equ         31h
+Keys_TAB                    equ         0Fh
+Keys_Delete                 equ         53h
+Keys_Backspace              equ         0Eh
+Keys_Space                  equ         20h
+Keys_Flags_EnterSetup       equ       1100b ; Strg+Alt (AL)
+      ; ------------------------------------------
+      ; Rousseau: # Changed this from .386 to .286
+      ; ------------------------------------------
+      ; Because of the TASM-bug the processor had to be changed to turn JUMPS
+      ; off. Existing movzx instructions were replaced with 286 equivalent code.
+      ; Out of range relative jumps have been recoded.
+      ; AiR-BOOT can now run on a 286 processor :-)
+                .286
+               ; This influences the uses directive and other stuff,
+               ; like calling-style.
+               ; The model itself,large, has no effect because we generate
+               ; a binairy image and not a segmented executable.
+               .model large, basic
+Keys_Up                     equ     48h
+Keys_Down                   equ     50h
+Keys_Left                   equ     4Bh
+Keys_Right                  equ     4Dh
+Keys_PageUp                 equ     49h
+Keys_PageDown               equ     51h
+Keys_GrayPlus               equ     4Eh
+Keys_GrayMinus              equ     4Ah
+Keys_Plus                   equ     1Bh
+Keys_Minus                  equ     35h
+Keys_ENTER                  equ     1Ch
+Keys_ESC                    equ     1h
+Keys_F1                     equ     3Bh
+Keys_F10                    equ     44h
+Keys_C                      equ     2Eh     ; Add. Check auf Ctrl!
+Keys_Y                      equ     2Ch
+Keys_Z                      equ     15h
+Keys_N                      equ     31h
+Keys_TAB                    equ     0Fh
+Keys_Delete                 equ     53h
+Keys_Backspace              equ     0Eh
+Keys_Space                  equ     20h
+Keys_Flags_EnterSetup       equ     1100b   ; Strg+Alt (AL)
+                ; ------------------------------------------
+                ; Rousseau: # Changed this from .386 to .286
+                ; ------------------------------------------
+                ; Because of the TASM-bug the processor had to be changed to turn JUMPS
+                ; off. Existing movzx instructions were replaced with 286 equivalent code.
+                ; Out of range relative jumps have been recoded.
+                ; TASM still generates an extra NOP after test [mem],1
+                ; instructions.
+                ; JWasm produces tighter code.
+                ; JWasm:
+                ; With segment overrides, the address is expanded to the bit-width.
+                ; So, .386 will generate a 32-bit address, even in a USE16 segment.
+                .286
+                ; This influences the uses directive and other stuff,
+                ; like calling-style and local variables.
+                ; The model itself,large, has no effect because we generate
+                ; a binairy image and not a segmented executable.
+                ; Tasm needs a memory model for USES on PROC to work.
+                IFDEF   TASM
+                ;.model large, basic
+                .model  tiny,c
+                ENDIF
+;
+; This is used to switch between the original 1-segment (code_seg) and the
+; 2-segment (code_seg and bss_data).
+; The 2-segment layout was needed for JWasm because it does not treat
+; db ? in a code segment as bss-data, even if at the end of the code segment.
+; Therefore, a true BSS segment is now used.
+; Both the code_seg and the bss_data are grouped to the logical airboot
+; segment.
+; Note that this influences the offsets in the BSS in the list-file and
+; the wdis disassembly file (.WDA).
+; They are now segment-relative. The true offset is resolved at link
+; time.
+;
+SEGMENTED   EQU 1
+IFDEF   SEGMENTED
+            AIRBOOT     GROUP   IMAGE,VOLATILE
+ENDIF
 ; Our code-segment starts here.
+; We are running in 16-bit and we like it
+code_seg        segment public use16
+                assume  cs:code_seg, ds:code_seg, es:nothing, ss:nothing
+IMAGE       SEGMENT     USE16   PUBLIC  'MIXED'
+IFDEF   SEGMENTED
+            ASSUME      CS:AIRBOOT, DS:AIRBOOT, ES:nothing, SS:nothing
+ELSE
+            ASSUME      CS:IMAGE,   DS:IMAGE,   ES:nothing, SS:nothing
+ENDIF
 …
                            ; We are not a .com file at 100h but a binary image
                            ; of which only the 1st sector gets loaded at 07c00h.
                            org 00000h                          ; Sector 1
+                ; We are not a .com file at 100h but a binary image
+                ; of which only the 1st sector gets loaded at 07c00h.
+                org 00000h                          ; Sector 1
 ; Start of sector 1
 …
 ;------------------------------------------------------------------------------
+AiR_BOOT:     cli                         ; Some M$ operating systems need a CLI
+                                          ;  here otherwise they will go beserk
+                                          ;  and will do funny things during
+                                          ;  boot phase, it's laughable!
+              db      0EBh                ; JMP-Short -> MBR_Start
+              ; Uses the 'A' as the displacement !
+              db      'AiRBOOT', 24h, 01h, 20h, 12h, 01h, 08h, TXT_LanguageID
+              ; ID String, Date (DD,MM,CC,YY), Version Number, Language ID
+              db      1                   ; Total Sectors Count,
+                                          ; Will get overwritten by FIXBSET.exe
+MBR_CheckCode dw      0                   ; Check-Sum for Code
+AiR_BOOT:
+                ; Some M$ operating systems need a CLI
+                ; here otherwise they will go beserk
+                ; and will do funny things during
+                ; boot phase, it's laughable!
+                cli
+                ; JMP-Short -> MBR_Start
+                ; Uses the 'A' from the signature as the displacement !
+                db      0EBh
+                ; ID String, Date (DD,MM,CC,YY), Version Number, Language ID
+                db      'AiRBOOT', 15h, 02h, 20h, 12h, 01h, 08h, TXT_LanguageID
+                ; Total Sectors Count.
+                ; Will get overwritten by FIXCODE.
+                db      1
+                ; Total Sectors Count,
+                ; Dynamic calculation.
+                ;~ db      (CODE_END-$)/512
+MBR_CheckCode   dw      0               ; Check-Sum for Code
+;
 …
 ; below as this will cause the jump-link to go haywire.
+;
+MBR_Start:    sti                         ;    This opcode is dedicated to:
+              cld                         ;    =MICROSOFT JUMP DEPARTMENT=
+              ; Setup some base stuff
+              ; AX got loaded wrongly for debug, changed the instructions
+              ; without modifying the number of bytes.
+              ; Don't comment-out the redundant instruction below because this
+              ; *will* change the number of bytes and break the jump-chain.
+              mov     ax, StartBaseSeg    ; The segment we are moving ourself from (NOT USED)
+              ;mov     ds, ax
+              push   cs
+              pop    ds
+              mov     si, StartBasePtr    ; The offset we are moving ourself from
+              mov     ax, BootBaseSeg     ; The target segment we are moving ourself to
+              mov     es, ax
+              mov     di, BootBasePtr     ; The target offset we are moving ourself to
+              ; Depending on pre-boot or debug,
+              ; only move first 512 bytes or the whole she-bang++ (65400 bytes)
+              IFDEF ReleaseCode
+                 mov     cx, 256          ; Pre-boot environment
+                ELSE
+                 mov     cx, 32700        ; Debug environment (move ~64kB)
+              ENDIF
+              ;
+              ; LET's MOVE OURSELVES !
+              ;
+              rep     movsw
+              ; Code an intersegment jump to the new location
+              db      0EAh
+              dw      BootBaseExec        ; This is MBR_RealStart + BootBasePtr
+              dw      BootBaseSeg         ; This is 08000h
+              ; jmp     far ptr BootBaseSeg:BootBaseExec
+MBR_Start:
+                sti                     ;    This opcode is dedicated to:
+                cld                     ;    =MICROSOFT JUMP DEPARTMENT=
+                ; Setup some base stuff
+                ; AX got loaded wrongly for debug, changed the instructions
+                ; without modifying the number of bytes.
+                ; Don't comment-out the redundant instruction below because this
+                ; *will* change the number of bytes and break the jump-chain.
+                mov     ax, StartBaseSeg    ; The segment we are moving ourself from (NOT USED)
+                ;mov     ds, ax
+                push    cs
+                pop     ds
+                mov     si, StartBasePtr    ; The offset we are moving ourself from
+                mov     ax, BootBaseSeg     ; The target segment we are moving ourself to
+                mov     es, ax
+                mov     di, BootBasePtr     ; The target offset we are moving ourself to
+            ; Depending on pre-boot or debug,
+            ; only move first 512 bytes or the whole she-bang++ (65400 bytes)
+            IFDEF ReleaseCode
+                mov     cx, 256          ; Pre-boot environment
+            ELSE
+                mov     cx, 32700        ; Debug environment (move ~64kB)
+            ENDIF
+                ;
+                ; LET's MOVE OURSELVES !
+                ;
+                rep     movsw
+                ; Code an intersegment jump to the new location
+                db      0EAh
+                dw      BootBaseExec        ; This is MBR_RealStart + BootBasePtr
+                dw      BootBaseSeg         ; This is 08000h
+                ;jmp     far ptr BootBaseSeg:BootBaseExec
 …
+;
 MBR_HaltSystem:
               mov     ax, 8600h
               xor     cx, cx
               mov     dx, 500
               int     15h                ; Wait to display the whole screen :]
 MBR_HaltSys:  cli
               jmp     MBR_HaltSys
                      ; Comport settings
                      ; It had to be moved to create room for the double I13X
                      ; signature.
                      ; It cannot be in the config-area (sector 55)
                      ; because that area
                      ; is crc-protected.
 BIOS_AuxParms        dw     BIOS_AuxParmsDefault
+                mov     ax, 8600h
+                xor     cx, cx
+                mov     dx, 500
+                int     15h                 ; Wait to display the whole screen :]
+MBR_HaltSys:    cli
+                jmp     MBR_HaltSys
+; Comport settings
+; It had to be moved to create room for the double I13X
+; signature.
+; It cannot be in the config-area (sector 55)
+; because that area
+; is crc-protected.
+BIOS_AuxParms   dw      BIOS_AuxParmsDefault
+;
 …
 ; Should check overflow here, later...
+;
+reserved       db     6 dup(0)
+               ;
+               ; We jump here after the first instructions of the
+               ; AiR-BOOT signature.
+               ; So we ensure the jump is always at this offset.
+               org      044h
+               jmp      MBR_Start      ; We jump here, because I needed to
+                                       ; insert a CLI on start and did not
+                                       ; want to change AiR-BOOT detection
+                                       ; because of Microsoft inventions...
+reserved        db      6   dup('X')
+                ;
+                ; We arrive here after the first jump using the 'A' of the
+                ; AiR-BOOT signature.
+                ; So we ensure the jump is always at this offset.
+                ; We jump here, because Martin needed to
+                ; insert a CLI on start and did not
+                ; want to change the AiR-BOOT signature
+                ; because of Microsoft inventions...
+here = $
+                org     044h
+                check_overlap   here
+                ; Jump again...
+                ; This time to the setup-code.
+                jmp     MBR_Start
+;
 ; Entry-point when loading fails.
+;
               db      'LOAD ERROR!', 0
 MBR_LoadError                 Proc Near
       mov      si, offset $-12
       push     cs
       pop      ds
       call     MBR_Teletype
    MBRLE_Halt:
       jmp      MBRLE_Halt
 MBR_LoadError                 EndP
+                db      'LOAD ERROR!', 0
+MBR_LoadError   Proc Near
+        mov     si, offset $-12
+        push    cs
+        pop     ds
+        call    MBR_Teletype
+    MBRLE_Halt:
+        jmp     MBRLE_Halt
+MBR_LoadError   EndP
 …
 ; Entry-point when saving fails.
+;
               db      'SAVE ERROR!', 0
 MBR_SaveError                 Proc Near
       mov      si, offset $-12
       push     cs
       pop      ds
       call     MBR_Teletype
    MBRSE_Halt:
       jmp      MBRSE_Halt
 MBR_SaveError                 EndP
+                db      'SAVE ERROR!', 0
+MBR_SaveError   Proc Near
+        mov     si, offset $-12
+        push    cs
+        pop     ds
+        call    MBR_Teletype
+    MBRSE_Halt:
+        jmp     MBRSE_Halt
+MBR_SaveError   EndP
 …
 ;        In: SI - Pointer to begin of string (EOS is 0)
 ; Destroyed: SI
 MBR_Teletype                    Proc Near   Uses ax bx cx
       mov      ah, 0Eh
       mov      bx, 7
    MBRT_Loop:
       lodsb
       or       al, al
       jz       MBRT_End
       int      10h
       jmp      MBRT_Loop
    MBRT_End:
       ret
 MBR_Teletype                    EndP
+MBR_Teletype    Proc Near   Uses ax bx cx
+        mov     ah, 0Eh
+        mov     bx, 7
+    MBRT_Loop:
+        lodsb
+        or      al, al
+        jz      MBRT_End
+        int     10h
+        jmp     MBRT_Loop
+    MBRT_End:
+        ret
+MBR_Teletype    EndP
+;
 …
 ;       Out: BX - Base Check Result
 ; Destroyed: SI will get updated (+512)
 MBR_GetCheckOfSector            Proc Near   Uses ax cx
    mov    cx, 256
   MBRGCOS_Loop:
        lodsw
        xor    ax, 0BABEh
        xor    bx, ax
    loop   MBRGCOS_Loop
    or     bx, bx
    jnz    MBRGCOS_NoFixUp
    mov    bx, 1                          ; dont allow 0, cause 0 == empty
   MBRGCOS_NoFixUp:
    ret
 MBR_GetCheckOfSector            EndP
+MBR_GetCheckOfSector    Proc Near   Uses ax cx
+        mov     cx, 256
+    MBRGCOS_Loop:
+        lodsw
+        xor     ax, 0BABEh
+        xor     bx, ax
+        loop    MBRGCOS_Loop
+        or      bx, bx
+        jnz     MBRGCOS_NoFixUp
+        mov     bx, 1                   ; dont allow 0, cause 0 == empty
+    MBRGCOS_NoFixUp:
+        ret
+MBR_GetCheckOfSector    EndP
 …
 ;------------------------------------------------------------------------------
 MBR_RealStart:
+              mov     ax, StackSeg        ; 07000h, below the moved code
+              mov     ss, ax
+              ;mov     sp, 7FFFh          ; Odd stack-pointer ??
+              mov     sp, 7FFEh           ; Even is better
+              mov     ax, es              ; ES holds segment where we moved to
+              mov     ds, ax              ; Set DS==ES to Code Segment
+              ; If we are in debug-mode, all code is moved already,
+              ; so we can directly jump to it.
+              ; One difference is that in debug-mode, the whole .com image is
+              ; loaded by dos while when air-boot is active from the MBR it
+              ; does the loading itself.
+              IFNDEF ReleaseCode
+                 jmp     AiR_BOOT_Start
+              ENDIF
+              ; Load missing parts from harddrive...
+;              mov     ax, cs              ; actually obsolete
+;              mov     es, ax              ; actually obsolete
+              ; Load the configuration-sectors from disk.
+              mov     bx, offset Configuration
+              mov     dx, 0080h           ; First harddrive, Sector 55
+              mov     cx, 0037h           ; Is 55d is config-sector
+              ; Call the i/o-part
+              call MBR_LoadConfig
+              jnc     MBR_ConfigCopy_NoError
+              ; Some error occured
+             MBR_ConfigCopy_LoadError:
+              call    MBR_LoadError       ; Will Abort BootUp
+              ; Load the code sectors
+             MBR_ConfigCopy_NoError:
+              mov     bx, offset FurtherMoreLoad
+              mov     dx, 0080h           ; First harddrive
+              mov     cx, 0002h           ; Second sector
+              mov     ah, 02h
+              mov     al, ds:[10h]        ; Number of code sectors
+              int     13h
+              jnc     MBR_RealStart_NoError
+              jmp     MBR_ConfigCopy_LoadError
+              ; [v1.05+]
+              ; Signature for IBM's LVM to detect our "powerful" features ;)
+              ; [v1.0.8+]
+              ; Reworked MBR code to be able to create a double 'I13X' signature.
+              ; MBR's created with LVM eCS v1.x have the signature at 0d5h
+              ; MBR's created with LVM eCS v2.x have the signature at 0d0h
+              ; See eCS bugtracker issue #3002
+              db      0,'I13X',0,'I13X'
+             MBR_RealStart_NoError:
+              ; Now Check Code with CheckSum
+              mov     si, offset FurtherMoreLoad
+              ;movzx   cx, bptr ds:[10h]
+              mov    cl, ds:[10h]
+              mov    ch,0
+              xor     bx, bx
+             MBR_RealStart_CheckCodeLoop:
+                 call    MBR_GetCheckOfSector
+              loop    MBR_RealStart_CheckCodeLoop
+              cmp     MBR_CheckCode, bx
+              je      MBR_RealStart_CheckSuccess
+              mov     si, offset TXT_ERROR_Attention
+              call    MBR_Teletype
+              mov     si, offset TXT_ERROR_CheckCode
+              call    MBR_Teletype
+              mov     si, offset TXT_ERROR_CheckFailed
+              call    MBR_Teletype
+              jmp     MBR_HaltSystem
+             MBR_RealStart_CheckSuccess:
+              jmp     AiR_BOOT_Start
+                mov     ax, StackSeg    ; 07000h, below the moved code
+                mov     ss, ax
+                ;mov     sp, 7FFFh      ; Odd stack-pointer ??
+                mov     sp, 7FFEh       ; Even is better
+                mov     ax, es          ; ES holds segment where we moved to
+                mov     ds, ax          ; Set DS==ES to Code Segment
+            ; If we are in debug-mode, all code is moved already,
+            ; so we can directly jump to it.
+            ; One difference is that in debug-mode, the whole .com image is
+            ; loaded by dos while when air-boot is active from the MBR it
+            ; does the loading itself.
+            IFNDEF ReleaseCode
+                jmp     AiR_BOOT_Start
+            ENDIF
+                ; Load missing parts from harddrive...
+                ;mov     ax, cs          ; actually obsolete
+                ;mov     es, ax          ; actually obsolete
+                ; Load the configuration-sectors from disk.
+                mov     bx, offset Configuration
+                mov     dx, 0080h       ; First harddrive, Sector 55
+                mov     cx, 0037h       ; Is 55d is config-sector
+                ; Call the i/o-part
+                call    MBR_LoadConfig
+                jnc     MBR_ConfigCopy_NoError
+                ; Some error occured
+    MBR_ConfigCopy_LoadError:
+                call    MBR_LoadError   ; Will Abort BootUp
+                ; Load the code sectors
+    MBR_ConfigCopy_NoError:
+                mov     bx, offset FurtherMoreLoad
+                mov     dx, 0080h       ; First harddrive
+                mov     cx, 0002h       ; Second sector
+                mov     ah, 02h
+                ; This location is in the code-segment.
+                ; When segment overrides are applied, the address is
+                ; expanded to the bit-with.
+                ; So the .286 or .386 directive influences the length
+                ; of the instruction, even with a USE16 segment.
+                mov     al, ds:[10h]    ; Number of code sectors
+                int     13h
+                jnc     MBR_RealStart_NoError
+                jmp     MBR_ConfigCopy_LoadError
+                ; [v1.05+]
+                ; Signature for IBM's LVM to detect our "powerful" features ;)
+                ; [v1.0.8+]
+                ; Reworked MBR code to be able to create a
+                ; double 'I13X' signature.
+                ; MBR's created with LVM eCS v1.x have the signature at 0d5h
+                ; MBR's created with LVM eCS v2.x have the signature at 0d0h
+                ; See eCS bugtracker issue #3002
+                ; Update: These are actually MOV EAX,'X31I' instructions
+                ; in the eCS LVM MBR-code. They are at different places in
+                ; the v1.x and v2.x LVM code.
+                ; Let's protect them with an org directive.
+here = $
+                org     00d0h
+                check_overlap   here
+                ;org     00d0h
+                db      'I13X',0,'I13X',0
+    MBR_RealStart_NoError:
+                ; Now Check Code with CheckSum
+                mov     si, offset FurtherMoreLoad
+                ;movzx   cx, bptr ds:[10h]
+                mov     cl, ds:[10h]
+                mov     ch,0
+                xor     bx, bx
+    MBR_RealStart_CheckCodeLoop:
+                call    MBR_GetCheckOfSector
+                loop    MBR_RealStart_CheckCodeLoop
+                cmp     MBR_CheckCode, bx
+                je      MBR_RealStart_CheckSuccess
+                mov     si, offset TXT_ERROR_Attention
+                call    MBR_Teletype
+                mov     si, offset TXT_ERROR_CheckCode
+                call    MBR_Teletype
+                mov     si, offset TXT_ERROR_CheckFailed
+                call    MBR_Teletype
+                jmp     MBR_HaltSystem
+    MBR_RealStart_CheckSuccess:
+                jmp     AiR_BOOT_Start
 …
 ;------------------------------------------------------------------------------
    Include TEXT\TXTMBR.asm                     ; All translateable Text in MBR
+   Include TEXT/TXTMBR.ASM                     ; All translateable Text in MBR
 ;------------------------------------------------------------------------------
+eot:
+; Check for overlap
+slack00 = eos1 - eot
+IF slack00 LT 0
+   .ERR2 "Location Overlap slack00 !"
+ENDIF
+; bios aux
+eos1:
 ; This is an ugly kludge function to create space for the
 …
 ; in this function. That's done around line 500.
 ; Putting this few bytes here creates just enough room.
+MBR_LoadConfig                Proc Near
+              ; Changed from conditional assembler to calculated value
+              ; Fixes issue: #2987 -- "air-boot doesn't remember drive letter"
+              ; Size of the ab-configuration in 512 byte sectors
+              mov     al, (MBR_BackUpMBR - Configuration) / 200h
+              mov     ah,02h
+              int     13h
+      ret
+MBR_LoadConfig                EndP
+                           org   001B8h
+                           ; Disk Signature
+                           ; Note that in an LVM 2.x MBR this collides
+                           ; with the dummy PTE that it used to look for IBM-BM
+                           ; on the second harddisk.
+                           db    'DSIG'
+                           ; Unused word at 01BCh
+                           ; An LVM 2.x MBR puts 'CC33' here.
+                           dw    '$$'
+                           ; Partition Table
+                           db    16    dup('0')
+                           db    16    dup('1')
+                           db    16    dup('2')
+                           db    16    dup('3')
+                           ; Boot Sigbature
+                           dw    0aa55h
+                           org   00200h
+MBR_LoadConfig  Proc Near
+        ; Changed from conditional assembler to calculated value
+        ; Fixes issue: #2987 -- "air-boot doesn't remember drive letter"
+        ; Size of the ab-configuration in 512 byte sectors
+        mov     al, (MBR_BackUpMBR - Configuration) / 200h
+        mov     ah,02h
+        int     13h
+        ret
+MBR_LoadConfig  EndP
+here = $
+                org     001b8h
+                check_overlap   here
+                ; Disk Signature
+                ; Note that in an LVM 2.x MBR this collides
+                ; with the dummy PTE that it uses to look for IBM-BM
+                ; on the second harddisk.
+                db      'DSIG'
+                ; Unused word at 01BCh
+                ; An LVM 2.x MBR puts 'CC33' here.
+                dw      '$$'
+                ; Partition Table
+                db      16  dup('0')
+                db      16  dup('1')
+                db      16  dup('2')
+                db      16  dup('3')
+                ; Boot Sigbature
+                dw      0aa55h
 ; End of sector 1
 eos1a:
+; Check for overlap
+slack01 = sos2 - eos1a
+IF slack01 LT 0
+   .ERR2 "Location Overlap slack01 !"
+ENDIF
 …
                                                                     ; Sector 2
+                           ;
                            ; Here starts the second sector, sector 2
+                           ;
                             org 00200h
+                ;
+                ; Here starts the second sector, sector 2
+                ;
+                org     00200h
 ; Start of sector 2.
 sos2:
 …
+;
                         ; first Normal-Partition-ID, Hidden-Partition-ID
                         ;  and Default-Partition-Flags.
                         ; 01h -> Boot-Able
                         ; 10h -> FAT32 - Name Getting Scheme
                         ; 20h -> No Name To Get (use Partition Name from IPT)
                         ; 40h -> 'L' flag possible
+                ; first Normal-Partition-ID, Hidden-Partition-ID
+                ;  and Default-Partition-Flags.
+                ; 01h -> Boot-Able
+                ; 10h -> FAT32 - Name Getting Scheme
+                ; 20h -> No Name To Get (use Partition Name from IPT)
+                ; 40h -> 'L' flag possible
                 db      'AiRSYS-TABLE'
 FileSysIDs:     db      01h, 11h,01h, 04h,014h,01h, 06h,016h,41h, 0Eh,00Eh,01h
+FileSysIDs      db      01h, 11h,01h, 04h,014h,01h, 06h,016h,41h, 0Eh,00Eh,01h
                 db      07h, 17h,41h, 08h,017h,21h, 35h,035h,20h,0FCh,017h,41h
                 db      09h, 19h,11h, 0Bh,01Bh,11h, 0Ch,01Ch,11h,0EBh,0EBh,01h
 …
                 db      16 dup (0)
 FileSysNames:   db      'FAT12   ', 'FAT16   ', 'FAT16Big', 'FAT16Big'
+FileSysNames    db      'FAT12   ', 'FAT16   ', 'FAT16Big', 'FAT16Big'
                 db      'HPFS    ', 'NTFS    ', 'LVM-Data', 'JFS     '
                 db      'FAT32   ', 'FAT32   ', 'FAT32   ', 'BeOS    '
 …
-; Check for overlap
-slack02 = sos3 - eos2
-IF slack02 LT 0
-   .ERR2 "Location Overlap slack02 !"
-ENDIF
 …
 ;==============================================================================
                                                                     ; Sector 3
+                            org 00400h
+here = $
+                org     00400h
+                check_overlap   here
 ; Start of sector 3.
 sos3:
 …
                   ; ##############################################
                   ; ## ENTRY-POINT AFTER ALL THE INITIAL HASSLE ##
                   ; ##############################################
+                ; ##############################################
+                ; ## ENTRY-POINT AFTER ALL THE INITIAL HASSLE ##
+                ; ##############################################
 …
         ; segment.
+        ;
+        pusha
+        push    es
+        xor     ax,ax
+        mov     es,ax
+        mov     si,offset BootBasePtr
+        mov     di,7e00h
+        mov     cx,100h
+        cld
+        rep     movsw
+        pop     es
+        popa
+               ;jmp skip
+               ; Rousseau:
+               ; I should cleanup my garbage here...
+                 ; Initialize Variable-Tables, Detections, etc.
+                 call    PRECRAP_Main
+                 ; Number of harddisks is now known
+                 call    PARTSCAN_ScanForPartitions
+                  ; Number of disks found
+                 mov     si, offset DisksFound
+                 call    MBR_Teletype
+                 mov     al, [TotalHarddiscs]
+                 call    VideoIO_SyncPos
+                 call    VideoIO_PrintByteDynamicNumber
+                 xor     si,si
+                 call    MBR_TeletypeNL
+                  ; Number of bootable systems indicator
+                 mov     si, offset PartitionsFound
+                 call    MBR_Teletype
+                 mov     al, [CFG_Partitions]
+                 call    VideoIO_SyncPos
+                 call    VideoIO_PrintByteDynamicNumber
+                  xor     si,si
+                  call  MBR_TeletypeNL
+                  call  MBR_TeletypeNL
+                  call  VideoIO_SyncPos
+                  mov   dl,80h
+                  call  VideoIO_DumpDiskInfo
+                 ;
+                 ; Enumberate Bootable Systems by name
+                 ; and prepare Phase 1 if active.
+                 ;
+                 ; This can also be implemented using the
+                 ; Installable LVM-flag I think.
+                 ; But at the time I had lesser knowledge about LVM...
+                 ;
+                 mov     si, offset PartitionTable
+                 xor     cx,cx
+                 mov     cl,[CFG_Partitions]
+               MBR_Parts:
+                 add     si, 4
+                 push    si
+                 push    si
+                 ;call    MBR_TeletypeVolName
+                 pop     si
+                 call    PART_IsInstallVolume
+                 jnc     MBR_Parts_NI
+                 ; Install Volume
+                 mov     al,' '
+                 mov     bl,7
+                 mov     ah, 0eh
+                 int     10h
+                 mov     al,'('
+                 mov     bl,7
+                 mov     ah, 0eh
+                 int     10h
+                 mov     al,[CFG_Partitions]
+                 sub     al,cl
+                 ;inc     al
+                 ;mov     [Menu_EntryAutomatic],al
+                 mov     [CFG_PartAutomatic],al       ; Setup entry for install-volume
+                 mov     [CFG_PartLast],al
+                 mov     ah, [eCS_InstallVolume]      ; 1st byte is 0 if no phase 1 active
+                 test    ah,ah                        ; test the byte, ZF is 0 if phase 1 active
+                 lahf                                 ; flags in ah
+                 xor     ah, 40h                      ; complement ZF
+                 and     ah, 40h                      ; mask ZF
+                 shr     ah, 6                        ; move ZF to LSB
+                 mov     [CFG_AutomaticBoot], ah      ; automatic boot if phase 1 is active
+                 add     al,'1'
+                 mov     bl,7
+                 mov     ah, 0eh
+                 int     10h
+                  mov     al,')'
+                 mov     bl,7
+                 mov     ah, 0eh
+                 int     10h
+                 mov     bx,cx
+               MBR_Parts_NI:
+                 xor     si,si
+                 ;call    MBR_TeletypeNL
+                 pop     si
+                 add     si, 30
+                 loop    MBR_Parts
+                  ; Index of automatic start partition
+;                 mov     si, offset AutoStartPart
+                 ;call    MBR_Teletype
+                 ;mov     al, [CFG_PartAutomatic]
+                 ;add     al, 31h
+                 ;mov     ah, 09h
+                 ;mov     bx, 15
+                 ;mov     cx, 1
+                 ;int     10h
+                 ;mov     al, [CFG_PartAutomatic]
+                 ;add     al, 31h
+                 ;mov     ah, 0eh
+                 ;mov     bx, 15
+                 ;mov     cx, 1
+                 ;int     10h
+                 xor     si,si
+                 call    MBR_TeletypeNL
+                 xor     si,si
+                 call    MBR_TeletypeNL
+                 ;mov    ax,[BIOS_AuxParms]
+                 ;call   VideoIO_SyncPos
+                 ;push   ax
+                 ;add    al,'0'
+                 ;mov     bl,7
+                 ;mov     ah, 0eh
+                 ;int     10h
+                 ;pop    ax
+                 ;xchg   al,ah
+                 ;sub    al,0a2h
+                 ;mov     bl,7
+                 ;mov     ah, 0eh
+                 ;int     10h
+                 call      MBR_TeletypeSyncPos
+                  xor      si,si
+                  call     MBR_TeletypeNL
+                  call     MBR_TeletypeNL
+                 mov       si, offset ShowMenu
+                 call      MBR_TeletypeBold
+        pusha                           ; Save all the general purpose regs
+        push    es                      ; We need ES too, so save its value
+        xor     ax,ax                   ; Segment 0000h
+        mov     es,ax                   ; Make ES point to it
+        mov     si,offset BootBasePtr   ; Start of AiR-BOOT which has the MBR
+        mov     di,7e00h                ; Destination for the MBR for IBM-BM
+        mov     cx,100h                 ; 256 words = 512 bytes
+        cld                             ; Direction from low to high
+        rep     movsw                   ; Copy the 256 words of the MBR
+        pop     es                      ; Restore previous value of ES
+        popa                            ; Restore all the general purpose regs
+                ;jmp skip
+                ; Rousseau:
+                ; I should cleanup my garbage here...
+                ; Initialize Variable-Tables, Detections, etc.
+                call    PRECRAP_Main
+                ; Number of harddisks is now known
+                call    PARTSCAN_ScanForPartitions
+                ; Number of disks found
+                mov     si, offset DisksFound
+                call    MBR_Teletype
+                mov     al, [TotalHarddiscs]
+                call    VideoIO_SyncPos
+                call    VideoIO_PrintByteDynamicNumber
+                xor     si,si
+                call    MBR_TeletypeNL
+                ; Number of bootable systems indicator
+                mov     si, offset PartitionsFound
+                call    MBR_Teletype
+                mov     al, [CFG_Partitions]
+                call    VideoIO_SyncPos
+                call    VideoIO_PrintByteDynamicNumber
+                xor     si,si
+                call    MBR_TeletypeNL
+                call    MBR_TeletypeNL
+                call    VideoIO_SyncPos
+                mov     dl,80h
+                call    VideoIO_DumpDiskInfo
+                ;
+                ; Enumberate Bootable Systems by name
+                ; and prepare Phase 1 if active.
+                ;
+                ; This can also be implemented using the
+                ; Installable LVM-flag I think.
+                ; But at the time I had lesser knowledge about LVM...
+                ; So this algorithm may change in the future.
+                ;
+                mov     si, offset PartitionTable
+                xor     cx,cx
+                mov     cl,[CFG_Partitions]
+    MBR_Parts:
+                add     si, 4
+                push    si
+                push    si
+                ;call    MBR_TeletypeVolName
+                pop     si
+                call    PART_IsInstallVolume
+                jnc     MBR_Parts_NI
+                ; Install Volume
+                mov     al,' '
+                mov     bl,7
+                mov     ah, 0eh
+                int     10h
+                mov     al,'('
+                mov     bl,7
+                mov     ah, 0eh
+                int     10h
+                mov     al,[CFG_Partitions]
+                sub     al,cl
+                ;inc     al
+                ;mov     [Menu_EntryAutomatic],al
+                mov     [CFG_PartAutomatic],al  ; Setup entry for install-volume
+                mov     [CFG_PartLast],al
+                mov     ah, [eCS_InstallVolume] ; 1st byte is 0 if no phase 1 active
+                test    ah,ah                   ; test the byte, ZF is 0 if phase 1 active
+                lahf                            ; flags in ah
+                xor     ah, 40h                 ; complement ZF
+                and     ah, 40h                 ; mask ZF
+                shr     ah, 6                   ; move ZF to LSB
+                mov     [CFG_AutomaticBoot], ah ; automatic boot if phase 1 is active
+                add     al,'1'
+                mov     bl,7
+                mov     ah, 0eh
+                int     10h
+                mov     al,')'
+                mov     bl,7
+                mov     ah, 0eh
+                int     10h
+                mov     bx,cx
+    MBR_Parts_NI:
+                xor     si,si
+                ;call    MBR_TeletypeNL
+                pop     si
+                add     si, 30
+                loop    MBR_Parts
+                ; Index of automatic start partition
+                ;mov     si, offset AutoStartPart
+                ;call    MBR_Teletype
+                ;mov     al, [CFG_PartAutomatic]
+                ;add     al, 31h
+                ;mov     ah, 09h
+                ;mov     bx, 15
+                ;mov     cx, 1
+                ;int     10h
+                ;mov     al, [CFG_PartAutomatic]
+                ;add     al, 31h
+                ;mov     ah, 0eh
+                ;mov     bx, 15
+                ;mov     cx, 1
+                ;int     10h
+                xor     si,si
+                call    MBR_TeletypeNL
+                xor     si,si
+                call    MBR_TeletypeNL
+                ;mov    ax,[BIOS_AuxParms]
+                ;call   VideoIO_SyncPos
+                ;push   ax
+                ;add    al,'0'
+                ;mov     bl,7
+                ;mov     ah, 0eh
+                ;int     10h
+                ;pop    ax
+                ;xchg   al,ah
+                ;sub    al,0a2h
+                ;mov     bl,7
+                ;mov     ah, 0eh
+                ;int     10h
+                call    MBR_TeletypeSyncPos
+                xor     si,si
+                call    MBR_TeletypeNL
+                call    MBR_TeletypeNL
+                mov     si, offset ShowMenu
+                call    MBR_TeletypeBold
 …
+               ;
                ; ####################### WAIT FOR KEY #########################
+               ;
                ; Rousseau:
                ; Wait for key so we can see debug log if ab-menu hangs.
                ;;xor     ax, ax
                ;;int     16h
                ;call     SOUND_Beep
                   ; Rousseau: delayed save of video-page
                  mov     ax, VideoIO_Page1
                  call    VideoIO_BackUpTo   ; Copy BIOS POST to Second Page
                ;call     SOUND_Beep
+               ;
                ; COM-PORT DEBUG
+               ;
 ;               call     AuxIO_TeletypeNL
                mov      si, offset PartitionTable
 ;               call     AuxIO_DumpSector
 ;               call     AuxIO_TeletypeNL
                  ; Save configuration so phase1 boot-through is disabled
                  ; on next boot.
                  ; Moved here to fix that Esc out of SETUP would also save.
                  ; So moved above the MBR_Main_ReEnterSetup label.
                  mov     [eCS_InstallVolume], 0       ; disable phase 1 for next boot
                  call    DriveIO_SaveConfiguration
+               ;
                ; RE-ENTER SETUP
+               ;
                 MBR_Main_ReEnterSetup:
                  call    SETUP_CheckEnterSETUP
                ;call     SOUND_Beep
                  ; Rousseau: Every time I see "AfterCrap" I have to laugh :-)
                  call    AFTERCRAP_Main
 ; [Linux support removed since v1.02]
 ;                 ; Now get FAT16-Linux Kernel Partition, If requested
 ;                 cmp     [CFG_LinuxKrnlPartition], 0FFh
 ;                 je      MBR_Main_NoLinuxKrnlPartition
 ;                 call    LINUX_InitFAT16access
 ;                MBR_Main_NoLinuxKrnlPartition:
 MBR_Main_ReEnterBootMenuPre:
                  ; SetUp PartitionPointers for BootMenu (filter non-bootable)
                  call    PART_CalculateMenuPartPointers
                  ; ...and count that one...
                  cmp     PartitionPointerCount, 0
                  jne     MBR_Main_SomethingBootAble
                  mov     si, offset TXT_NoBootAble
                  call    MBR_Teletype
                  jmp     MBR_HaltSystem
                 MBR_Main_SomethingBootAble:
                  ; FixUp Values, define Timed Setup booting, etc.
                  call    PART_FixUpDefaultPartitionValues
                  ; -------------------------------------------------- BOOT-MENU
                 MBR_Main_ReEnterBootMenu:
                  call    BOOTMENU_ResetMenuVars ; reset has to be done
                  test    CFG_AutomaticBoot, 1
                  jz      MBR_Main_NoAutomaticBooting
                  ; ------------------------------------------ AUTOMATIC BOOTING
                  ; Select automatic partition, disable automatic booting for
                  ;  next time and boot system...
                  mov     CFG_AutomaticBoot, 0
                  call    PASSWORD_AskSystemPwd
                  mov     al, Menu_EntryAutomatic
                  ;mov     al, 2
                  mov     Menu_EntrySelected, al    ; zero based
                  jmp     MBR_Main_NoBootMenu
+                ;
+                ; ####################### WAIT FOR KEY ########################
+                ;
+                ; Rousseau:
+                ; Wait for key so we can see debug log if ab-menu hangs.
+                ;;xor     ax, ax
+                ;;int     16h
+                ;call     SOUND_Beep
+                ; Rousseau: delayed save of video-page
+                mov     ax, VideoIO_Page1
+                call    VideoIO_BackUpTo    ; Copy BIOS POST to Second Page
+                ;call     SOUND_Beep
+                ;
+                ; COM-PORT DEBUG
+                ;
+                ;call    AuxIO_TeletypeNL
+                mov     si, offset PartitionTable
+                ;call    AuxIO_DumpSector
+                ;call    AuxIO_TeletypeNL
+                ; Save configuration so phase1 boot-through is disabled
+                ; on next boot.
+                ; Moved here to fix that Esc out of SETUP would also save.
+                ; So moved above the MBR_Main_ReEnterSetup label.
+                mov     [eCS_InstallVolume], 0  ; disable phase 1 for next boot
+                call    DriveIO_SaveConfiguration
+                ;
+                ; RE-ENTER SETUP
+                ;
+    MBR_Main_ReEnterSetup:
+                call    SETUP_CheckEnterSETUP
+                ;call    SOUND_Beep
+                ; Rousseau: Every time I see "AfterCrap" I have to laugh :-)
+                call    AFTERCRAP_Main
+                ; [Linux support removed since v1.02]
+                ; Now get FAT16-Linux Kernel Partition, If requested
+                ;cmp     [CFG_LinuxKrnlPartition], 0FFh
+                ;je      MBR_Main_NoLinuxKrnlPartition
+                ;call    LINUX_InitFAT16access
+    ;MBR_Main_NoLinuxKrnlPartition:
+    MBR_Main_ReEnterBootMenuPre:
+                ; SetUp PartitionPointers for BootMenu (filter non-bootable)
+                call    PART_CalculateMenuPartPointers
+                ; ...and count that one...
+                cmp     PartitionPointerCount, 0
+                jne     MBR_Main_SomethingBootAble
+                mov     si, offset TXT_NoBootAble
+                call    MBR_Teletype
+                jmp     MBR_HaltSystem
+    MBR_Main_SomethingBootAble:
+                ; FixUp Values, define Timed Setup booting, etc.
+                call    PART_FixUpDefaultPartitionValues
+                ; -------------------------------------------------- BOOT-MENU
+    MBR_Main_ReEnterBootMenu:
+                call    BOOTMENU_ResetMenuVars ; reset has to be done
+                test    CFG_AutomaticBoot, 1
+                jz      MBR_Main_NoAutomaticBooting
+                ; ------------------------------------------ AUTOMATIC BOOTING
+                ; Select automatic partition, disable automatic booting for
+                ;  next time and boot system...
+                mov     CFG_AutomaticBoot, 0
+                call    PASSWORD_AskSystemPwd
+                mov     al, Menu_EntryAutomatic
+                ;mov     al, 2
+                mov     Menu_EntrySelected, al      ; zero based
+                jmp     MBR_Main_NoBootMenu
                 MBR_Main_NoAutomaticBooting:
                  ;call   SOUND_Beep
                  test    CFG_BootMenuActive, 0FFh
                  jnz     MBR_Main_GotBootMenu
                  ; ----------------------------------------------- NO BOOT-MENU
                  ; Select default partition and boot system...
                  call    PASSWORD_AskSystemPwd
                  ;call    VideoIO_DBG_WriteString2
                  mov     al, Menu_EntryDefault
                  ;mov al,0                         ; zero based
                  mov     Menu_EntrySelected, al
                  jmp     MBR_Main_NoBootMenu
                 MBR_Main_GotBootMenu:
                  ; ------------------------------------------ BOOT-MENU VISUALS
                  call    FX_StartScreen
                  ;call   SOUND_Beep
                  call    BOOTMENU_BuildBackground
                  call    BOOTMENU_BuildMain
                  call    FX_EndScreenRight
                  call    PASSWORD_AskSystemPwd
                  call    BOOTMENU_ResetTimedBoot
                  ;call   SOUND_Beep
                  call    BOOTMENU_Execute
                  ;call   SOUND_Beep
                  jc      MBR_Main_ReEnterSetup
                  call    BOOTMENU_SetVarsAfterMenu
                  ;call   SOUND_Beep
                  ; ---------------------------------------------------- BOOTING
                 MBR_Main_NoBootMenu:
                  call    FX_StartScreen
                  call    BOOTMENU_BuildGoodBye
                  call    FX_EndScreenRight
                  call    PASSWORD_AskChangeBootPwd
                  IFNDEF ReleaseCode
                     ; Debug Code to terminate DOS .COM program - used for
                     ;  testing AiR-BOOT
                     int 3
                     mov     ax, 6200h
                     int     21h
                     mov     es, bx
                     mov     ax, 4C00h    ; Quit program
                     int     21h
                  ENDIF
                  call    ANTIVIR_SaveBackUpMBR
                  mov     dl, Menu_EntrySelected
                  ; -------------------------------------------- START PARTITION
                  call    PART_StartPartition
+                ;call   SOUND_Beep
+                test    CFG_BootMenuActive, 0FFh
+                jnz     MBR_Main_GotBootMenu
+                ; ----------------------------------------------- NO BOOT-MENU
+                ; Select default partition and boot system...
+                call    PASSWORD_AskSystemPwd
+                ;call    VideoIO_DBG_WriteString2
+                mov     al, Menu_EntryDefault
+                ;mov     al,0                         ; zero based
+                mov     Menu_EntrySelected, al
+                jmp     MBR_Main_NoBootMenu
+    MBR_Main_GotBootMenu:
+                ; ------------------------------------------ BOOT-MENU VISUALS
+                call    FX_StartScreen
+                ;call    SOUND_Beep
+                call    BOOTMENU_BuildBackground
+                call    BOOTMENU_BuildMain
+                call    FX_EndScreenRight
+                call    PASSWORD_AskSystemPwd
+                call    BOOTMENU_ResetTimedBoot
+                ;call    SOUND_Beep
+                call    BOOTMENU_Execute
+                ;call    SOUND_Beep
+                jc      MBR_Main_ReEnterSetup
+                call    BOOTMENU_SetVarsAfterMenu
+                ;call    SOUND_Beep
+                ; ---------------------------------------------------- BOOTING
+    MBR_Main_NoBootMenu:
+                call    FX_StartScreen
+                call    BOOTMENU_BuildGoodBye
+                call    FX_EndScreenRight
+                call    PASSWORD_AskChangeBootPwd
+            IFNDEF ReleaseCode
+                ; Debug Code to terminate DOS .COM program - used for
+                ;  testing AiR-BOOT
+                int     3
+                mov     ax, 6200h
+                int     21h
+                mov     es, bx
+                mov     ax, 4C00h    ; Quit program
+                int     21h
+            ENDIF
+                call    ANTIVIR_SaveBackUpMBR
+                mov     dl, Menu_EntrySelected
+                ; -------------------------------------------- START PARTITION
+                call    PART_StartPartition
 …
+;
 b_std_txt:
 Include REGULAR\STD_TEXT.asm     ; Standard (non-translateable text)
+Include REGULAR/STD_TEXT.ASM    ; Standard (non-translateable text)
 size_std_txt = $-b_std_txt
 b_driveio:
 Include REGULAR\DRIVEIO.asm      ; Drive I/O, Config Load/Save
+Include REGULAR/DRIVEIO.ASM     ; Drive I/O, Config Load/Save
 size_driveio = $-b_driveio
 b_videoio:
 Include REGULAR\ViDEOIO.asm      ; Video I/O
+Include REGULAR/VIDEOIO.ASM     ; Video I/O
 size_videoio = $-b_videoio
 b_timer:
 Include REGULAR\TIMER.asm        ; Timer
+Include REGULAR/TIMER.ASM       ; Timer
 size_timer = $-b_timer
 b_partmain:
 Include REGULAR\PARTMAIN.asm     ; Regular Partition Routines
+Include REGULAR/PARTMAIN.ASM    ; Regular Partition Routines
 size_partmain = $-b_partmain
 b_partscan:
 Include REGULAR\PARTSCAN.asm     ; Partition Scanning
+Include REGULAR/PARTSCAN.ASM    ; Partition Scanning
 size_partscan = $-b_partscan
 b_bootmenu:
 Include REGULAR\BOOTMENU.asm     ; Boot-Menu
+Include REGULAR/BOOTMENU.ASM    ; Boot-Menu
 size_bootmenu = $-b_bootmenu
 b_password:
 Include REGULAR\PASSWORD.asm     ; Password related
+Include REGULAR/PASSWORD.ASM    ; Password related
 size_password = $-b_password
 b_other:
 Include REGULAR\OTHER.asm        ; Other Routines
+Include REGULAR/OTHER.ASM       ; Other Routines
 size_other = $-b_other
 ; Rousseau: Special modules moved upwards.
 b_main:
 Include SETUP\MAiN.ASM           ; The whole AiR-BOOT SETUP
+Include SETUP/MAIN.ASM          ; The whole AiR-BOOT SETUP
 size_main = $-b_main
 …
 IFDEF TXT_IncludeCyrillic
 b_ccharset:
    Include SPECiAL\CHARSET.asm   ; Charset Support (e.g. Cyrillic)
+   Include SPECIAL/CHARSET.ASM  ; Charset Support (e.g. Cyrillic)
 size_ccharset = $-b_ccharset
 ENDIF
 b_math:
 Include REGULAR\MATH.ASM         ; Math functions (like 32-bit multiply)
+Include REGULAR/MATH.ASM        ; Math functions (like 32-bit multiply)
 size_math = $-b_math
 …
 IFDEF AuxDebug
 b_debug:
 ;   Include REGULAR\DEBUG.ASM     ; Various debugging routines,
                                  ; uses AUXIO and CONV
+;   Include REGULAR/DEBUG.ASM     ; Various debugging routines,
+                                ; uses AUXIO and CONV
 size_debug = $-b_debug
 ENDIF
 b_auxio:
 ;Include REGULAR\AUXIO.ASM        ; Com-port support for debugging
+;Include REGULAR/AUXIO.ASM       ; Com-port support for debugging
 size_auxio = $-b_auxio
 ; Rousseau: moved upwards
 ;IFDEF TXT_IncludeCyrillic
 ;   Include SPECiAL\CHARSET.asm           ; Charset Support (e.g. Cyrillic)
+;   Include SPECIAL/CHARSET.ASM  ; Charset Support (e.g. Cyrillic)
 ;ENDIF
 b_lvm:
 Include SPECiAL\LVM.asm                  ; LVM-specific code
+Include SPECIAL/LVM.ASM         ; LVM-specific code
 size_lvm = $-b_lvm
 …
+; Check for overlap
+slack03 = sos36 - eos3
+IF slack03 LT 0
+   .ERR2 "Location Overlap slack03 !"
+ENDIF
 ;==============================================================================
+                           ;
+                           ; This is the AiR-BOOT MBR-Protection Image.
+                           ; 04600 / 200h = 23h = 35d sectors are before this point.
+                           ; The stuff generated here gets overwritten when the MBR_PROT.ASM
+                           ; module, which is assembled separately, gets merged.
+                           ; So you won't find the string below in the generated binary.
+                           ;
+                            org 04600h                          ; Sector 36-37
+                ;
+                ; This is the AiR-BOOT MBR-Protection Image.
+                ; 04600 / 200h = 23h = 35d sectors are before this point.
+                ; The stuff generated here gets overwritten when the MBR_PROT.ASM
+                ; module, which is assembled separately, gets merged.
+                ; So you won't find the string below in the generated binary.
+                ;
+                ; MOVED TO 6800h to create space and have a continuous
+                ; code block.
+                ; This makes the RU version buildable again with Tasm.
+                ;
+                ;org     04600h                                  ; Sector 36-37
 ; Start of sector 36.
 sos36:
+MBR_Protection:              db 'AiR-BOOT MBR-Protection Image'
+; Hardcoded to 1k (1024 bytes)
+   db 1024-($-MBR_Protection)  dup('X')
 ; End of sector 37, yes this section is 2 sectors long.
 …
+; Check for overlap
+slack04 = sos38 - eos37
+IF slack04 LT 0
+   .ERR2 "Location Overlap slack04 !"
+ENDIF
 …
 ;==============================================================================
                                                                  ; Sector 38-x
+                           ;
                            ; This section contains translatable texts.
+                           ;
                            org 04A00h
+                ;
+                ; This section contains translatable texts.
+                ;
+                ;org     04A00h
 ; Start of sector 28.
 …
 b_txtother:
 Include TEXT\TXTOTHER.asm                ; All translateable Text-Strings
+Include TEXT/TXTOTHER.ASM       ; All translateable Text-Strings
 size_txtother = $-b_txtother
 b_txtmenus:
 Include TEXT\TXTMENUS.asm                ; All translateable Menu-text
+Include TEXT/TXTMENUS.ASM       ; All translateable Menu-text
 size_txtmenus = $-b_txtmenus
 b_charset:
 Include TEXT\CHARSET.asm                 ; Special Video Charsets (if needed)
+Include TEXT/CHARSET.ASM        ; Special Video Charsets (if needed)
 size_charset = $-b_charset
 b_conv:
 Include REGULAR\CONV.ASM                 ; Various conversion routines
+Include REGULAR/CONV.ASM        ; Various conversion routines
 size_conv = $-b_conv
 b_virus:
 Include SPECiAL\ViRUS.asm                ; Virus Detection / Anti-Virus
+Include SPECIAL/VIRUS.ASM       ; Virus Detection / Anti-Virus
 size_virus = $-b_virus
 ; [Linux support removed since v1.02]
 ;Include SPECiAL\FAT16.asm                ; FAT-16 Support
 ;Include SPECiAL\LINUX.asm                ; Linux Kernel Support
+;Include SPECIAL/FAT16.ASM       ; FAT-16 Support
+;Include SPECIAL/LINUX.ASM       ; Linux Kernel Support
 b_billsuxx:
 Include SPECiAL\F00K\BILLSUXX.asm        ; Extended Partition - Microsoft-Hack
+Include SPECIAL/F00K/BILLSUXX.ASM   ; Extended Partition - Microsoft-Hack
 size_billsuxx = $-b_billsuxx
 b_sound:
 Include SPECiAL\SOUND.asm                ; Sound
+Include SPECIAL/SOUND.ASM       ; Sound
 size_sound = $-b_sound
 b_apm:
 Include SPECiAL\APM.asm                  ; Power Managment Support
+Include SPECIAL/APM.ASM         ; Power Managment Support
 size_apm = $-b_apm
 b_fx:
 Include SPECiAL\FX.asm                   ; l33t Cooper-Bars/Scrolling <bg>
+Include SPECIAL/FX.ASM          ; l33t Cooper-Bars/Scrolling <bg>
 size_fx = $-b_fx
 …
 ; Let's make this always the last module in this section.
+;
 Include BLDDATE.asm                      ; Build Date generated by _build.cmd
+Include BLDDATE.ASM                      ; Build Date generated by _build.cmd
 ; End of sector x depending on size of translatable texts.
 eosx:
+                           org 06A00h - 4
+                           ;db    'BABE'
+                           org 06A00h
+                          ; db    'FACE'
+; Check for overlap
+slack05 = sos55 - eosx
+IF slack05 LT 0
+   .ERR2 "Location Overlap slack05 !"
+ENDIF
+CODE_END:
+                ;org     06A00h - 4
+                db      'BABE'
+                ;org     06A00h
+                db      'FACE'
+                ;
+                ; This is the AiR-BOOT MBR-Protection Image.
+                ; 04600 / 200h = 34h = 52d sectors are before this point.
+                ; The stuff generated here gets overwritten when the MBR_PROT.ASM
+                ; module, which is assembled separately, gets merged.
+                ; So you won't find the string below in the generated binary.
+                ;
+here = $
+                org     06800h
+                check_overlap   here
+MBR_Protection  db 'AiR-BOOT MBR-Protection Image'
+; Hardcoded to 1k (1024 bytes)
+                db  1024-($-MBR_Protection)  dup(0)
+;CODE_SEG        ENDS
+;DATA_SEG        SEGMENT     USE16   PUBLIC  'CODE'
 ;==============================================================================
                                                                    ; Sector 55
+                           ;
+                           ; This section contains the AiR-BOOT configuration.
+                           ; Note that it has a version that should be updated
+                           ; when stuff is added.
+                           ; Also add stuff to the end so that offsets of other
+                           ; variables remain vaild.
+                           ;
+                           org 06C00h
+                ;
+                ; This section contains the AiR-BOOT configuration.
+                ; Note that it has a version that should be updated
+                ; when stuff is added.
+                ; Also add stuff to the end so that offsets of other
+                ; variables remain vaild.
+                ;
+here = $
+                org     06C00h
+                check_overlap   here
 sos55:
+Configuration:               ; THERE IS AN INVISIBLE CHAR HERE !!
+                             ; Your editor may not display the invisible
+                             ; character at the end if the 'AiRCFG-TABLE'
+                             ; string. When this character get's deleted,
+                             ; AiR-BOOT will not function because it cannot
+                             ; find the config-signature which includes this
+                             ; invisible character. The code is: 0x0ad.
+                             db 'AiRCFG-TABLE'
+                             db 01h, 07h, 'U' ; "Compressed" ID String
+                             ; This is now version 1.07 to have it in sync with
+                             ; the new code version for eCS.
+                             ; Version 1.02 was for code 1.06, 1.03 was internal
+                             ; and 1.04,1.05 and 1.06 do not exist.
+                             ; It is not required for the config to have the
+                             ; same version as the code, so in the future
+                             ; the code version might be higher than the
+                             ; config version if there are no changes to the latter.
+CFG_LastTimeEditLow          dw     0    ; Last Time Edited Stamp (will incr every setup)
+CFG_LastTimeEditHi           dw     0    ; second 16 bit part...
+CFG_CheckConfig              dw     0    ; Check-Sum for Configuration
+CFG_Partitions               db     0    ; Count of partitions in IPT
+                             db     0    ; Was BootParts - Removed since v0.28b
+CFG_PartDefault              db     0    ; Default-Partition (Base=0)
+CFG_PartLast                 db     0    ; Which Partition was booted last time ? (Base=0)
+CFG_TimedBoot                db     1    ; Timed Boot Enable (for REAL Enable look TimedBootEnable)
+CFG_TimedSecs                db    15    ; Timed Boot - How Many Seconds Till Boot
+CFG_TimedDelay               dw   123    ; Timed Boot - Delay
+CFG_TimedBootLast            db     1    ; Timed Boot - Boot From Last Drive Booted From
+CFG_RememberBoot             db     1    ; Remember Manual Boot Choice
+CFG_RememberTimed            db     0    ; Remember if Timed Boot (if both disabled: Boot Default)
+CFG_IncludeFloppy            db     1    ; Include Floppy Drives in Boot-Menu
+CFG_BootMenuActive           db     1    ; Display Boot-Menu (if Disabled: Boot Default)
+Configuration:
+                ; THERE IS AN INVISIBLE CHAR HERE !!
+                ; Your editor may not display the invisible
+                ; character at the end if the 'AiRCFG-TABLE'
+                ; string. When this character get's deleted,
+                ; AiR-BOOT will not function because it cannot
+                ; find the config-signature which includes this
+                ; invisible character. The code is: 0x0ad.
+                db  'AiRCFG-TABLE'
+                db  01h, 07h, 'U' ; "Compressed" ID String
+                ; This is now version 1.07 to have it in sync with
+                ; the new code version for eCS.
+                ; Version 1.02 was for code 1.06, 1.03 was internal
+                ; and 1.04,1.05 and 1.06 do not exist.
+                ; It is not required for the config to have the
+                ; same version as the code, so in the future
+                ; the code version might be higher than the
+                ; config version if there are no changes to the latter.
+CFG_LastTimeEditLow     dw  0   ; Last Time Edited Stamp (will incr every setup)
+CFG_LastTimeEditHi      dw  0   ; second 16 bit part...
+CFG_CheckConfig         dw  0   ; Check-Sum for Configuration
+CFG_Partitions          db  0   ; Count of partitions in IPT
+                        db  0   ; Was BootParts - Removed since v0.28b
+CFG_PartDefault         db  0   ; Default-Partition (Base=0)
+CFG_PartLast            db  0   ; Which Partition was booted last time ? (Base=0)
+CFG_TimedBoot           db  0   ; Timed Boot Enable (for REAL Enable look TimedBootEnable)
+CFG_TimedSecs           db  15  ; Timed Boot - How Many Seconds Till Boot
+CFG_TimedDelay          dw  123 ; Timed Boot - Delay
+CFG_TimedBootLast       db  1   ; Timed Boot - Boot From Last Drive Booted From
+CFG_RememberBoot        db  1   ; Remember Manual Boot Choice
+CFG_RememberTimed       db  0   ; Remember if Timed Boot (if both disabled: Boot Default)
+CFG_IncludeFloppy       db  1   ; Include Floppy Drives in Boot-Menu
+CFG_BootMenuActive      db  1   ; Display Boot-Menu (if Disabled: Boot Default)
                                          ; v0.29+ -> 2 - Detailed Bootmenu
 CFG_PartitionsDetect         db     1    ; Autodetect New Partitions (Auto-Add!)
 CFG_PasswordSetup            db     0    ; Ask Password when entering Setup
 CFG_PasswordSystem           db     0    ; Ask Password when booting System
 CFG_PasswordChangeBoot       db     0    ; Ask Password when changing boot partition
 CFG_ProtectMBR               db     0    ; Protect MBR via TSR ?
 CFG_IgnoreWriteToMBR         db     0    ; Just ignore writes to MBR, otherwise crash
 CFG_FloppyBootGetName        db     0    ; Gets floppy name for display purposes
 CFG_DetectVirus              db     0    ; Detect Virus ?
 CFG_DetectStealth            db     0    ; Detect Stealth-Virus ?
 CFG_DetectVIBR               db     0    ; Detect BootRecord-Virus ?
 CFG_AutoEnterSetup           db     0    ; Automatic Enter Setup (first install!)
 CFG_MasterPassword           dw 0101Fh   ; Encoded Password (this is just CR)
                              dw 07A53h
                              dw 0E797h
                              dw 0A896h
 CFG_BootPassword             dw 0101Fh   ; Another CR... ;-)
                              dw 07A53h
                              dw 0E797h
                              dw 0A896h
                              db     0    ; Rude-Protection - Removed since v0.28b
 CFG_LinuxRootPartition       db     0    ; Linux Root Partition (Base=0)
 CFG_TimedKeyHandling         db     0    ; Timed Key Handling (for Timed Boot)
                                          ; 0 - Do Nothing
                                          ; 1 - Reset Time
                                          ; 2 - Stop Time
 CFG_MakeSound                db     0    ; Should be clear ;)
 CFG_FloppyBootGetTimer       db     0    ; Floppy Name will get updated every 2 secs
 CFG_ResumeBIOSbootSeq        db     0    ; If BIOS Boot Sequence should be resumed
                                          ; 0 - Disabled
                                          ; 1 - CD-ROM
                                          ; 2 - Network
                                          ; 3 - ZIP/LS120
 CFG_CooperBars               db     0    ; If Cooper Bars should be shown
 CFG_LinuxCommandLine         db    75 dup (0) ; Linux Command Line
 CFG_LinuxKrnlPartition       db   0FFh   ; FAT-16 Linux Kernel Partition (Base=0)
                                          ;  FFh -> Disabled
 CFG_LinuxDefaultKernel       db 'DEFAULT', 4 dup (32), 0 ; Default Kernel Name
 CFG_LinuxLastKernel          db    11 dup (32), 0 ; Last-Booted Kernel Name
 CFG_ExtPartitionMShack       db     0    ; Extended Partition M$-Hack Global Enable
 CFG_AutomaticBoot            db     0    ; Automatic Booting (only one bootup)
 CFG_PartAutomatic            db     0    ; Partition-No for automatic booting
 CFG_ForceLBAUsage            db     1    ; LBA-BIOS-API forced on any HDD I/O
 CFG_IgnoreLVM                db     0    ; Ignores any LVM-Information
+CFG_PartitionsDetect    db  1   ; Autodetect New Partitions (Auto-Add!)
+CFG_PasswordSetup       db  0   ; Ask Password when entering Setup
+CFG_PasswordSystem      db  0   ; Ask Password when booting System
+CFG_PasswordChangeBoot  db  0   ; Ask Password when changing boot partition
+CFG_ProtectMBR          db  0   ; Protect MBR via TSR ?
+CFG_IgnoreWriteToMBR    db  0   ; Just ignore writes to MBR, otherwise crash
+CFG_FloppyBootGetName   db  0   ; Gets floppy name for display purposes
+CFG_DetectVirus         db  0   ; Detect Virus ?
+CFG_DetectStealth       db  0   ; Detect Stealth-Virus ?
+CFG_DetectVIBR          db  0   ; Detect BootRecord-Virus ?
+CFG_AutoEnterSetup      db  0   ; Automatic Enter Setup (first install!)
+CFG_MasterPassword      dw  0101Fh  ; Encoded Password (this is just CR)
+                        dw  07A53h
+                        dw  0E797h
+                        dw  0A896h
+CFG_BootPassword        dw  0101Fh  ; Another CR... ;-)
+                        dw  07A53h
+                        dw  0E797h
+                        dw  0A896h
+                        db  0   ; Rude-Protection - Removed since v0.28b
+CFG_LinuxRootPartition  db  0   ; Linux Root Partition (Base=0)
+CFG_TimedKeyHandling    db  0   ; Timed Key Handling (for Timed Boot)
+                                    ; 0 - Do Nothing
+                                    ; 1 - Reset Time
+                                    ; 2 - Stop Time
+CFG_MakeSound           db  0   ; Should be clear ;)
+CFG_FloppyBootGetTimer  db  0   ; Floppy Name will get updated every 2 secs
+CFG_ResumeBIOSbootSeq   db  0   ; If BIOS Boot Sequence should be resumed
+                                    ; 0 - Disabled
+                                    ; 1 - CD-ROM
+                                    ; 2 - Network
+                                    ; 3 - ZIP/LS120
+CFG_CooperBars          db  0   ; If Cooper Bars should be shown
+CFG_LinuxCommandLine    db  75 dup (0)  ; Linux Command Line
+CFG_LinuxKrnlPartition  db  0FFh    ; FAT-16 Linux Kernel Partition (Base=0)
+                                        ;  FFh -> Disabled
+CFG_LinuxDefaultKernel  db  'DEFAULT', 4 dup (32), 0    ; Default Kernel Name
+CFG_LinuxLastKernel     db  11 dup (32), 0  ; Last-Booted Kernel Name
+CFG_ExtPartitionMShack  db  0   ; Extended Partition M$-Hack Global Enable
+CFG_AutomaticBoot       db  0   ; Automatic Booting (only one bootup)
+CFG_PartAutomatic       db  0   ; Partition-No for automatic booting
+CFG_ForceLBAUsage       db  1   ; LBA-BIOS-API forced on any HDD I/O
+CFG_IgnoreLVM           db  0   ; Ignores any LVM-Information
 …
+;
+; 6cae
 eoc:
+; Check for overlap
+slack05a = soiv - eoc
+IF slack05a LT 0
+   .ERR2 "Location Overlap slack05a !"
+ENDIF
+                              ; Allways have the name of the installation volume
+                              ; at this offset.
+                              ; So future config changes will not break auto-install.
+                              org   06D00h
+                ; Allways have the name of the installation volume
+                ; at this offset.
+                ; So future config changes will not break auto-install.
+here = $
+                org     06D00h
+                check_overlap   here
 soiv:
 …
 ; It is truncated to 11 chars because AiR-BOOT currently does not support
 ; longer labelnames. The name is also capitalized.
 ;eCS_InstallVolume            db     12 dup (0)
 ;eCS_InstallVolume            db     'HIGHLOG' ,0
 eCS_InstallVolume            db     0,'NOPHASEONE' ,0
 ;eCS_InstallVolume            db     'ECS-MIDDLE',0,0
 ;eCS_InstallVolume            db     'ECS-HIGH',0,0,0,0
 ;eCS_InstallVolume            db     'ECS-HIGH',0,'NO',0
+;eCS_InstallVolume       db  12 dup (0)
+;eCS_InstallVolume       db  'HIGHLOG' ,0
+eCS_InstallVolume       db  0,'NOPHASEONE' ,0
+;eCS_InstallVolume       db  'ECS-MIDDLE',0,0
+;eCS_InstallVolume       db  'ECS-HIGH',0,0,0,0
+;eCS_InstallVolume       db  'ECS-HIGH',0,'NO',0
+; 6d0c
 ; End of sector 55.
 eos55:
 …
+; Check for overlap
+slack06 = sosvs - eos55
+IF slack06 LT 0
+   .ERR2 "Location Overlap slack06 !"
+ENDIF
+;
+; THERE IS ROOM RESERVED HERE FOR MORE VARIABLES
+;
+                ;
+                ; 06DABh - 06C00h = 01ABh = 427 bytes.
+                ; Entries allocated down from 06E00 boundary.
+                ;
+here = $
+                org     06DABh                                  ; 427 Boundry
+                check_overlap   here
+sosvs:
+; (432 - 5 = 427)
+AutoDrvLetter           db  0
+AutoDrvLetterSerial     dd  0
+; This entry is also 34 bytes long (466 - 34 = 432)
+BIOScontIPTentry:
+                        db  0, 0, 0, 0, '           '
+                        db  0, 0FEh, Flags_Bootable
+                        dw  0     ; No Checksum :)
+                        db  0, 1, 0
+                        db  0, 1, 0 ; Location of Partition/Boot Record
+                        dd  0, 0
 ; VIR variables are for the AiR-BOOT Anti Virus Code
 …
 ; off or just reset it by switching 'VIBR Detection'.
+                           ;
+                           ; 06DABh - 06C00h = 01ABh = 427 bytes.
+                           ;
+                            org 06DABh                          ; 427 Boundry
+sosvs:
+AutoDrvLetter                db     0
+AutoDrvLetterSerial          dd     0
+; 478 - 12 = 466                                                ; 466 Sub-Part
+CFG_VIR_INT08           dd  0    ; pointer to saved 08h entry point
+CFG_VIR_INT13           dd  0    ; pointer to saved 13h entry point
+CFG_VIR_INT1C           dd  0    ; pointer to saved 1Ch entry point
+; 478 Boundry (512-34)
 ; This entry is also 34 bytes long
+BIOScontIPTentry:
+                             db     0, 0, 0, 0, '           '
+                             db     0, 0FEh, Flags_BootAble
+                             dw     0     ; No Checksum :)
+                             db     0, 1, 0
+                             db     0, 1, 0 ; Location of Partition/Boot Record
+                             dd     0, 0
+                                                                ; 466 Sub-Part
+CFG_VIR_INT08                dd     0    ; pointer to saved 08h entry point
+CFG_VIR_INT13                dd     0    ; pointer to saved 13h entry point
+CFG_VIR_INT1C                dd     0    ; pointer to saved 1Ch entry point
+; 478 Boundry
+; This entry is also 34 bytes long
+FloppyIPTentry:              db     0, 0, 0, 0, 'FloppyDrive'
+                             db     0, 0FFh, Flags_BootAble
+                             dw     0     ; No Checksum :)
+                             db     0, 1, 0
+                             db     0, 1, 0 ; Location of Partition/Boot Record
+                             dd     0, 0
+FloppyIPTentry          db  0, 0, 0, 0, 'FloppyDrive'
+                        db  0, 0FFh, Flags_Bootable
+                        dw  0           ; No Checksum :)
+                        db  0, 1, 0
+                        db  0, 1, 0     ; Location of Partition/Boot Record
+                        dd  0, 0
 ;------------------------------------------------------------------------------
 eosvs:
+; Check for overlap
+slack07 = sos56 - eosvs
+IF slack07 LT 0
    .ERR2 "Location Overlap slack07 !"
+ENDIF
                             ;org 06E00h                         ; Sector 56-57
+                            org image_size - 0a00h - (image_size - image_size_60secs)
+                ;org 06E00h                                     ; Sector 56-57
+here = $
+                org     image_size - 0a00h - (image_size - image_size_60secs)
+                check_overlap   here
 sos56:
 …
 ; Rousseau: This is the start of the AiR-BOOT IPT
 PartitionTable: ; no-partitions detected... :]
+PartitionTable:  ; no-partitions detected... :]
 ;                             db    1, 0, 0, 0, 'Harddisc  1'
 ;                             db    0, 0FFh, Flags_BootAble
 …
 ;                             dd    0, 0
+                ; Format is:
+                ;============
+                ; SerialNumber    * 4
+                ; PartitionName   * 11
+                ; Drive           * 1
+                ; SystemID        * 1 (means the partition type)
+                ; Flags           * 1
+                ; Checksum        * 2 (for virus checking)
+                ; LocationBegin   * 3 (where the partition begins)
+                ; LocationPartTab * 3 (where the partition table is)
+                ; AbsoluteBegin   * 4 (where the partition begins, in absolute sectors)
+                ; AbsolutePartTab * 4 (where the partition table is, in absolute sectors)
+                ; --------------------> 34 Bytes (total maximum partition-entries = 30)
+   db (partition_count * 34) dup ('0')
+    ; Format is:
+    ;============
+    ; SerialNumber    * 4
+    ; PartitionName   * 11
+    ; Drive           * 1
+    ; SystemID        * 1 (means the partition type)
+    ; Flags           * 1
+    ; Checksum        * 2 (for virus checking)
+    ; LocationBegin   * 3 (where the partition begins)
+    ; LocationPartTab * 3 (where the partition table is)
+    ; AbsoluteBegin   * 4 (where the partition begins, in absolute sectors)
+    ; AbsolutePartTab * 4 (where the partition table is, in absolute sectors)
+    ; --------------------> 34 Bytes (total maximum partition-entries = 30)
+    db  (partition_count * 34) dup (0)
+; 73fa !!!!!!!!!!!!!!
 eos56:
+; Check for overlap
+slack08 = eoiptsig - eos56
+IF slack08 LT 0
+   .ERR2 "Location Overlap slack08 !"
+ENDIF
+                            ;org 071F6h
+                            org image_size - 600h - (image_size - image_size_60secs) / 2 - 0ah
+                ;org 071F6h
+; 73F6
+                ; No need to check overlap here because this string will
+                ; be overwritten if the maximum partition count is reached.
+                ; So this is not a critical boundary.
+                org     image_size - 600h - (image_size - image_size_60secs) / 2 - 0ah
 soiptsig:
                              db 'AiRBOOTPAR' ; 1K internal partition table
+                db 'AiRBOOTPAR' ; 1K internal partition table
 …
 eoiptsig:
+; Check for overlap
+slack09 = soipt - eoiptsig
+IF slack09 LT 0
+   .ERR2 "Location Overlap slack09 !"
+ENDIF
 ;------------------------------------------------------------------------------
                             ;org 07200h                            ; Sector 58
+                            org image_size - 600h - (image_size - image_size_60secs) / 2
+here = $
+                org image_size - 600h - (image_size - image_size_60secs) / 2
+                check_overlap   here
 soipt:
 sos58:
 HidePartitionTable:          db   (partition_count * 30) dup (0FFh)
                                          ; Format is:
                                          ;============
                                          ; PartitionPtr : BYTE * 30
                                          ; --------------------> 30 Bytes * 30
 DriveLetters:                db    partition_count dup (0)
                                          ; Format is:
                                          ;============
                                          ; Drive-Letter : BYTE (80h-C:, 81h-D:)
                                          ; --------------------> 1 Byte * 30
+; 7400h
+HidePartitionTable      db  (partition_count * 30) dup (0FFh)
+                        ; Format is:
+                        ;============
+                        ; PartitionPtr : BYTE * 30
+                        ; --------------------> 30 Bytes * 30
+DriveLetters            db  partition_count dup ('L')
+                        ; Format is:
+                        ;============
+                        ; Drive-Letter : BYTE (80h-C:, 81h-D:)
+                        ; --------------------> 1 Byte * 30
+        ;
 …
 eoipt:
+; Check foroverlap
+slack10 = sohidsig - eoipt
+IF slack10 LT 0
+   .ERR2 "Location Overlap slack10 !"
+ENDIF
+                            ;org 075F6h
+                            org image_size - 200h -0ah
+                ;org 075F6h
+                ; No need to check overlap here because this string will
+                ; be overwritten if the maximum partition count is reached.
+                ; So this is not a critical boundary.
+                org     image_size - 200h -0ah
+                check_overlap   here
 sohidsig:
+                             db 'AiRBOOTHID' ; 1K internal Hide-partition table
+;
+                        db  'AiRBOOTHID'    ; 1K internal Hide-partition table
 eohidsig:
+; Check for overlap
+slack11 = sohid - eohidsig
+IF slack11 LT 0
+   .ERR2 "Location Overlap slack11 !"
+ENDIF
 …
 ;------------------------------------------------------------------------------
+                            ;org 07600h                            ; Sector 60
+                            org image_size - 200h                  ; Sector 60
+                ;org 07600h
+here = $
+                org     image_size - 200h                       ; Sector 60
+                check_overlap   here
 sohid:
 sos60:
 MBR_BackUpMBR                db 'AiR-BOOT MBR-BackUp - Just to fill this sector with something',0
 AirBootRocks                 db     'AiR-BOOT Rocks!',0
                              db 512-($-sohid)-2  dup(0)
+MBR_BackUpMBR           db  'AiR-BOOT MBR-BackUp - Just to fill this sector with something',0
+AirBootRocks            db  'AiR-BOOT Rocks!',0
+                        db  512-($-sohid)-2  dup(0)
 eos60:
 eohid:
+; Check for overlap
+slack12 = eoab - eohid -2
+IF slack12 LT 0
+   .ERR2 "Location Overlap slack12 !"
+                ;org 077FEh
+here = $
+                org     image_size - 2
+                check_overlap   here
+                        dw      0BABEh
+eoab:
+IFDEF   SEGMENTED
+;
+; End of AiR-BOOT code and data.
+;
+IMAGE           ENDS
+;DATA_SEG        ENDS
+;
+; Uninitialized Data (BSS)
+;
+VOLATILE        SEGMENT     USE16   PUBLIC  'BSS'
 ENDIF
-                           ;org 077FEh
-                           org image_size - 2
-                           dw     0BABEh
-eoab:
+;
-; End of AiR-BOOT code and data.
+;
+;
-; Below functions like a BSS segment, thus uninitialized data.
+;
 sobss:
 ;------------------------------------------------------------------------------
+                            org 0A000h                         ; Uninitialized
+                            ;
+                            ; Disabling the org, so it comes directly after the
+                            ; image, does not work. All floppy entries.
+                            ; Something goes wrong, so we offset the BSS for
+                            ; now.
+                            ;
+                            org 02000h                         ; Uninitialized
 ; This space actually gets initialized in PreCrap to NUL (till EndOfVariables)
 BeginOfVariables:
 PartitionSector              db   512 dup (?) ; Temporary Sector for Partition
 JfsPBR                       db   512 dup (?) ; Temporary Sector for JFS PBR writeback
 LVMSector:                   db   512 dup (?) ; Temporary Sector for LVM
 TmpSector:                   db   512 dup (?) ; Temporary Sector
+PartitionSector             db  512 dup (?) ; Temporary Sector for Partition
+JfsPBR                      db  512 dup (?) ; Temporary Sector for JFS PBR writeback
+LVMSector                   db  512 dup (?) ; Temporary Sector for LVM
+TmpSector                   db  512 dup (?) ; Temporary Sector
 ; Everything used to build a new IPT and reference it to the old one
 NewPartTable:                db  1536 dup (?)                  ; New Partition Table
 NewHidePartTable:            db   partition_count * 30 dup (?) ; New Hide-Partition Table
 NewDriveLetters:             db    partition_count dup (?)     ; Logical Drive-Letters
 PartitionSizeTable:          db   partition_count * 6 dup (?) ; Size-Table (6 bytes per partition)
 PartitionPointers            dw    52 dup (?)   ; Maximum is 52 entries till now
 PartitionPointerCount        db     ?           ; Count of total Partition Pointers
 PartitionXref                db    partition_count dup (?) ; X-Reference Table
 PartitionVolumeLetters       db    partition_count dup (?) ; Volume-Letters
+NewPartTable                db  1536 dup (?)                    ; New Partition Table
+NewHidePartTable            db  partition_count * 30 dup (?)    ; New Hide-Partition Table
+NewDriveLetters             db  partition_count dup (?)         ; Logical Drive-Letters
+PartitionSizeTable          db  partition_count * 6 dup (?) ; Size-Table (6 bytes per partition)
+PartitionPointers           dw  52 dup (?)  ; Maximum is 52 entries till now
+PartitionPointerCount       db  ?           ; Count of total Partition Pointers
+PartitionXref               db  partition_count dup (?) ; X-Reference Table
+PartitionVolumeLetters      db  partition_count dup (?) ; Volume-Letters
                                                 ;  0 - no LVM support
                                                 ;  1 - LVM support, but no letter
                                                 ;  'C'-'Z' - assigned drive letter
 TotalHarddiscs               db     ?           ; Total harddrives (by POST)
 LBASwitchTable               db   128 dup (?)   ; Bit 25-18 for CHS/LBA Switching
 NewPartitions                db     ?           ; Freshly found partitions
                                                 ; Independent of SaveConfiguration
 VideoIO_Segment              dw     ?           ; Segment for Video I/O
 ExtendedAbsPos               dd     ?           ; Extended Partition Absolute Position
 ExtendedAbsPosSet            db     ?           ; If Absolute Position set
 CurPartition_Location        dw     4 dup (?)   ; Where did current partition come from?
 CurIO_UseExtension           db     ?           ; 1-Use INT 13h EXTENSIONS
                                                 ; (filled out by PreCrap)
 CurIO_Scanning               db     ?           ; 1-AiR-BOOT is scanning partitions
                                                 ; (for detailed error message)
+TotalHarddiscs              db  ?           ; Total harddrives (by POST)
+LBASwitchTable              db  128 dup (?) ; Bit 25-18 for CHS/LBA Switching
+NewPartitions               db  ?           ; Freshly found partitions
+                                            ; Independent of SaveConfiguration
+VideoIO_Segment             dw  ?           ; Segment for Video I/O
+ExtendedAbsPos              dd  ?           ; Extended Partition Absolute Position
+ExtendedAbsPosSet           db  ?           ; If Absolute Position set
+CurPartition_Location       dw  4 dup (?)   ; Where did current partition come from?
+CurIO_UseExtension          db  ?           ; 1-Use INT 13h EXTENSIONS
+                                            ; (filled out by PreCrap)
+CurIO_Scanning              db  ?           ; 1-AiR-BOOT is scanning partitions
+                                            ; (for detailed error message)
 ; [Linux support removed since v1.02]
 ;GotLinux                     db     ?    ; 1-Linux found
 Menu_EntrySelected           db     ?    ; Which partition we boot this time...
 Menu_UpperPart               db     ?    ; Which number (Base=0) is the partition upper pos
 Menu_AbsoluteX               db     ?    ; Pos where Menu stuff starts
 Menu_TotalParts              db     ?    ; Copy of CFG_BootParts
 Menu_TotalLines              db     ?    ; Total Lines on Screen used for BootMenu
 Menu_EntryDefault            db     ?    ; Default Entry in filtered View
 Menu_EntryLast               db     ?    ; LastBooted Entry in filtered View
 Menu_EntryAutomatic          db     ?    ; Automatic Entry in filtered View
+Menu_EntrySelected          db  ?   ; Which partition we boot this time...
+Menu_UpperPart              db  ?   ; Which number (Base=0) is the partition upper pos
+Menu_AbsoluteX              db  ?   ; Pos where Menu stuff starts
+Menu_TotalParts             db  ?   ; Copy of CFG_BootParts
+Menu_TotalLines             db  ?   ; Total Lines on Screen used for BootMenu
+Menu_EntryDefault           db  ?   ; Default Entry in filtered View
+Menu_EntryLast              db  ?   ; LastBooted Entry in filtered View
+Menu_EntryAutomatic         db  ?   ; Automatic Entry in filtered View
                                          ;  - All adjusted to menu locations
 PartSetup_UpperPart          db     ?    ; Partition-Setup (like Menu_UpperPart)
 PartSetup_ActivePart         db     ?    ; Active Partition
 PartSetup_HiddenUpper        db     ?    ; (like Menu_UpperPart)
 PartSetup_HiddenX            db     ?    ; Pos for Hidden-Setup
 PartSetup_HiddenAdd          db     ?    ; Adjust for Hidden-Setup
 TimedBootEnable              db     ?    ; Local Enable/Disable for timed boot
 TimedTimeOut                 dd     ?    ; TimeOut Timer for TimedBoot (too much time here ;)
 TimedSecondLeft              db     ?    ; How many seconds are left till boom ?
 TimedSecondBack              db     ?    ; To get a modification noticed
 TimedBootUsed                db     ?    ; Timed Boot used for bootup ?
 FloppyGetNameTimer           dd     ?    ; Timer for Floppy-Get-Name
 SETUP_KeysOnEntry            db     ?    ; which Shift Status was there, when booting ?
 SETUP_ExitEvent              db     ?    ; Exit Event to end SETUP
 TempPasswordEntry            db    17 dup (?)
 SETUP_OldPwd                 db    17 dup (?)
 SETUP_NewPwd                 db    17 dup (?)
 SETUP_VerifyPwd              db    17 dup (?)
 StartSoundPlayed             db     ?
 ChangePartNameSave           db     ?
 FX_UseCount                  dw     ?
 FX_OverallTimer              dw     ?
 FX_WideScrollerTimer         dw     ?
 FX_WideScrollerCurPos        dw     ?
 FX_WideScrollerSpeed         db     ?
 FX_WideScrollerSpeedState    db     ?
 FX_WideScrollerDirection     db     ?
 FX_WideScrollerAbsDirection  db     ?
 FX_WideScrollerBounceSpeed   db     ?
 FX_CooperBarsTimer           dw     ?
+PartSetup_UpperPart         db  ?   ; Partition-Setup (like Menu_UpperPart)
+PartSetup_ActivePart        db  ?   ; Active Partition
+PartSetup_HiddenUpper       db  ?   ; (like Menu_UpperPart)
+PartSetup_HiddenX           db  ?   ; Pos for Hidden-Setup
+PartSetup_HiddenAdd         db  ?   ; Adjust for Hidden-Setup
+TimedBootEnable             db  ?   ; Local Enable/Disable for timed boot
+TimedTimeOut                dd  ?   ; TimeOut Timer for TimedBoot (too much time here ;)
+TimedSecondLeft             db  ?   ; How many seconds are left till boom ?
+TimedSecondBack             db  ?   ; To get a modification noticed
+TimedBootUsed               db  ?   ; Timed Boot used for bootup ?
+FloppyGetNameTimer          dd  ?   ; Timer for Floppy-Get-Name
+SETUP_KeysOnEntry           db  ?   ; which Shift Status was there, when booting ?
+SETUP_ExitEvent             db  ?   ; Exit Event to end SETUP
+TempPasswordEntry           db  17 dup (?)
+SETUP_OldPwd                db  17 dup (?)
+SETUP_NewPwd                db  17 dup (?)
+SETUP_VerifyPwd             db  17 dup (?)
+StartSoundPlayed            db  ?
+ChangePartNameSave          db  ?
+FX_UseCount                 dw  ?
+FX_OverallTimer             dw  ?
+FX_WideScrollerTimer        dw  ?
+FX_WideScrollerCurPos       dw  ?
+FX_WideScrollerSpeed        db  ?
+FX_WideScrollerSpeedState   db  ?
+FX_WideScrollerDirection    db  ?
+FX_WideScrollerAbsDirection db  ?
+FX_WideScrollerBounceSpeed  db  ?
+FX_CooperBarsTimer          dw  ?
 ; [Linux support removed since v1.02]
 …
 ; Dynamically Generated Tables - do not need to get initialized with NUL
 FX_CooperColors              db   672 dup (?) ; 7 cooper bars*96 - runtime calculated
 FX_CooperState:              db     7 dup (?)
 FX_SinusPos:                 db     7 dup (?)
 FX_CooperPos:                dw     7 dup (?)
 CharsetTempBuffer            db  4096 dup (?) ; Uninitialized Charset buffer
 LVM_CRCTable:                dd   256 dup (?) ; LVM-CRC (->SPECiAL\LVM.asm)
+FX_CooperColors             db   672 dup (?) ; 7 cooper bars*96 - runtime calculated
+FX_CooperState              db     7 dup (?)
+FX_SinusPos                 db     7 dup (?)
+FX_CooperPos                dw     7 dup (?)
+CharsetTempBuffer           db  4096 dup (?) ; Uninitialized Charset buffer
+LVM_CRCTable                dd   256 dup (?) ; LVM-CRC (->SPECiAL\LVM.asm)
 …
                               ;EVEN
 HugeDisk                      db    MaxDisks  dup(?)
 TrueSecs                      dd    MaxDisks  dup(?)
+HugeDisk                    db      MaxDisks  dup(?)
+TrueSecs                    dd      MaxDisks  dup(?)
 ; BIOS geometry of the boot-drive
 ; Note that heads cannot be 256 due to legacy DOS/BIOS bug
 ; If Int13X is supported those values are used, otherwise the legacy values.
 BIOS_Cyls                     dd    MaxDisks  dup(?)
 BIOS_Heads                    dd    MaxDisks  dup(?)
 BIOS_Secs                     dd    MaxDisks  dup(?)
 BIOS_Bytes                    dw    MaxDisks  dup(?)
 BIOS_TotalSecs                dq    MaxDisks  dup(?)
+BIOS_Cyls                   dd      MaxDisks  dup(?)
+BIOS_Heads                  dd      MaxDisks  dup(?)
+BIOS_Secs                   dd      MaxDisks  dup(?)
+BIOS_Bytes                  dw      MaxDisks  dup(?)
+BIOS_TotalSecs              dq      MaxDisks  dup(?)
 ; LBA geometry of the boot-drive
 ; Note that these values are taken from the BPB of a partition boot-record
 LVM_Cyls                      dd    MaxDisks  dup(?)
 LVM_Heads                     dd    MaxDisks  dup(?)
 LVM_Secs                      dd    MaxDisks  dup(?)
 LVM_Bytes                     dw    MaxDisks  dup(?)
 LVM_TotalSecs                 dq    MaxDisks  dup(?)
+LVM_Cyls                    dd      MaxDisks  dup(?)
+LVM_Heads                   dd      MaxDisks  dup(?)
+LVM_Secs                    dd      MaxDisks  dup(?)
+LVM_Bytes                   dw      MaxDisks  dup(?)
+LVM_TotalSecs               dq      MaxDisks  dup(?)
 ; OS/2 geometry of the boot-drive
 ; Note that these values are taken from the BPB of a partition boot-record
 LOG_Cyls                      dd    MaxDisks  dup(?)
 LOG_Heads                     dd    MaxDisks  dup(?)
 LOG_Secs                      dd    MaxDisks  dup(?)
 LOG_Bytes                     dw    MaxDisks  dup(?)
 LOG_TotalSecs                 dq    MaxDisks  dup(?)
+LOG_Cyls                    dd      MaxDisks  dup(?)
+LOG_Heads                   dd      MaxDisks  dup(?)
+LOG_Secs                    dd      MaxDisks  dup(?)
+LOG_Bytes                   dw      MaxDisks  dup(?)
+LOG_TotalSecs               dq      MaxDisks  dup(?)
 ; Rousseau: moved here
 …
            ;db     1  dup(?)
 i13xbuf    dw     1  dup (?)                       ; Size of the buffer;
                                                    ; this param *must* be present.
                                                    ; Code inserts it.
            db     126 dup(?)                       ; The buffer itself.
            i13xbuf_size = $-offset i13xbuf-2       ; Size of buffer
                                                    ; (excluding the size word at the start).
+i13xbuf     dw  1   dup (?)     ; Size of the buffer;
+                                ; this param *must* be present.
+                                ; Code inserts it.
+            db  126 dup(?)      ; The buffer itself.
+            i13xbuf_size = $-offset i13xbuf-2   ; Size of buffer
+                                                ; (excluding the size word at the start).
 eobss:
+code_seg        ends
+                end     air_boot
+IFDEF   SEGMENTED
+VOLATILE    ENDS
+ELSE
+CODE_SEG    ENDS
+ENDIF
+            END     AIR_BOOT

trunk/BOOTCODE/MBR-PROT/MBR_PROT.ASM

-              r30
+              r37
 ;                         AiR-BOOT SETUP / GENERIC & GENERAL SETUP ROUTINES
 ;---------------------------------------------------------------------------
+                ;
+                ; First define processor so when a model is specified
+                ; the correct default segments are created.
+                ;
+                .286
+                ;.model large,c
+;_TEXT           SEGMENT     USE16   PUBLIC  'CODE'
+;_TEXT           ENDS
+MBRPROT         GROUP       CODE_SEG
+;DGROUP          GROUP       CODE_SEG
+CODE_SEG        SEGMENT     USE16   PUBLIC  'CODE'
+                ;assume cs:MBRPROT, ds:MBRPROT, es:nothing, ss:nothing
+                assume cs:MBRPROT, ds:MBRPROT, es:nothing, ss:nothing
+                org 0000h
                 .386p
-                .model large, basic
-code_seg        segment public use16
-                assume cs:code_seg, ds:nothing, es:nothing, ss:nothing
-                org 0000h
 ; Yes you are :-)
 …
     jmp     WindowsProcessing
 MBRProt_WriteLine              Proc Near
+MBRProt_WriteLine              Proc Near    Uses ax bx cx dx
     add     di, 26
     mov     ah, 4Ch                      ; red/brightred
 …
 MBRProt_WriteBorderLine        EndP
 MBRP_Line1:     db      'ÕÍÍŽ!ATTENTION! -> A V1RU5 WAS FOUND <- !ATTENTION!ÃÍÍž'
 MBRP_EmptyLine: db      '³                                                     ³'
+MBRP_Line1      db      'ÕÍÍŽ!ATTENTION! -> A V1RU5 WAS FOUND <- !ATTENTION!ÃÍÍž'
+MBRP_EmptyLine  db      '³                                                     ³'
                 db      '³ A program tried to write to your Master Boot Record ³'
                 db      '³     AiR-BOOT supposes this as a viral act, so it    ³'
                 db      '³        intercepted it and crashed the system.       ³'
 MBRP_Line2:     db      '³ If you tried to install a OS or something like that ³'
+MBRP_Line2      db      '³ If you tried to install a OS or something like that ³'
                 db      '³  you have to deactivate MBR PROTECTION in AiR-BOOT  ³'
                 db      '³             or contact your supervisor.             ³'
 ;MBRP_Line3:     db      'ÔÍÍÍŽAiR-BOOT (c) Copyright by M. Kiewitz 1999-2009ÃÍÍŸ'
 MBRP_Line3:     db      'ÔÍÍÍŽAiR-BOOT (c) Copyright by M. Kiewitz 1999-2011ÃÍÍŸ'
+;MBRP_Line3      db      'ÔÍÍÍŽAiR-BOOT (c) Copyright by M. Kiewitz 1999-2009ÃÍÍŸ'
+MBRP_Line3      db      'ÔÍÍÍŽAiR-BOOT (c) Copyright by M. Kiewitz 1999-2012ÃÍÍŸ'
 org             1023
                 db 0
 code_seg        EndS
+CODE_SEG        ENDS
                 end

trunk/BOOTCODE/REGULAR/BOOTMENU.ASM

-              r31
+              r37
 ; Will Set some Vars after user selected entry to boot...
 ;  ...don't select Straight View !
 BOOTMENU_SetVarsAfterMenu Proc Near  Uses
+BOOTMENU_SetVarsAfterMenu Proc Near
    ; No Straight View in here...we got filtered view since BootMenu-Startup...
    mov     al, CFG_RememberTimed
 …
    jz      BME_NoTimedBoot
       ; ------------------------------------------------ TIMED BOOT
+      push    ax dx
+      push    ax
+      push    dx
          call    TIMER_GetTicCount
          mov     dx, word ptr [TimedTimeOut]
 …
          cmp     al, 0
          jne     BME_NoTimeOut
+      pop     dx ax
+      pop     dx
+      pop     ax
       mov     dl, Menu_EntryDefault
       and     CFG_TimedBootLast, 1
 …
      BME_NoTimeOut:
+      pop     dx ax
+      pop     dx
+      pop     ax
   BME_NoTimedBoot:
    ; ------------------------------------------------ FLOPPY-NAME TIMER
 …
    jz      BME_NoFloppyNameTimer
       ; Wait 2 Seconds everytime
+      push    ax dx
+      push    ax
+      push    dx
          call    TIMER_GetTicCount
          cmp     dx, wptr [FloppyGetNameTimer+2]
 …
         BME_ExpiredGetFloppy:
          call    BOOTMENU_ResetGetFloppy
+      pop     dx ax
+      pop     dx
+      pop     ax
       jmp     BME_RefreshFloppyName
         BME_NoFloppyNameExpired:
+      pop     dx ax
+      pop     dx
+      pop     ax
   BME_NoFloppyNameTimer:
    ; ------------------------------------------------ KEYBOARD
 …
       int     16h
    pop     dx
    cmp     ah, Keys_Enter
+   cmp     ah, Keys_ENTER
    je      BME_KeyEnter
    cmp     ah, Keys_F10

trunk/BOOTCODE/REGULAR/DRIVEIO.ASM

-              r36
+              r37
 DriveIO_GetHardDriveCount       Proc Near   Uses ds si
+   push    ds si
+   push    ds
+   push    si
       push    0040h
       pop     ds
       mov     si, 0075h
       mov     dh, ds:[si]                ; 40:75 -> POST: Total Harddiscs == DL
+   pop     si ds
+   pop     si
+   pop     ds
    mov     TotalHarddiscs, dh
    ret
 …
    mov     dl, 80h
   DIOILUT_DriveLoop:
+      push    dx di
+      push    dx
+      push    di
          mov     ah, 08h
          int     13h            ; DISK - GET DRIVE PARAMETERS
 …
                                 ;  bit 16-23 of the LBA address
         DIOILUT_Error:
+      pop     di dx
+      pop     di
+      pop     dx
       mov     bptr ds:[di], ah  ; Save that value
       inc     di                ; Go to next BYTE
 …
 ; Rousseau: Enhanced to handle sector-numbers 127 and 255 besides 63 for LVM-info sectors.
 ;           Ugly, need to cleanup.
 DriveIO_LVMAdjustToInfoSector   Proc Near   Uses
+DriveIO_LVMAdjustToInfoSector   Proc Near
 …
 DriveIO_LVMAdjustToInfoSector   EndP
 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
+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
 …
 ; Keeps DS:SI for caller
 DriveIO_LoadTmpSector           Proc Near  Uses
+DriveIO_LoadTmpSector           Proc Near
    mov     si, offset TmpSector
    call    DriveIO_LoadSector                                                    ; Uses INT13X if needed
 …
 ; Keeps DS:SI for caller
 DriveIO_SaveTmpSector           Proc Near  Uses
+DriveIO_SaveTmpSector           Proc Near
    mov     si, offset TmpSector
    call    DriveIO_SaveSector
 …
 ; Memory-Block that holds information for LBA-access via INT 13h
 DriveIO_DAP:               db       10h  ; Size of paket
+DriveIO_DAP                db       10h  ; Size of paket
                            db        0   ; Reserved
 DriveIO_DAP_NumBlocks      dw        0   ; Number of blocks
 …
    mov     bptr [si+5], dl
    call    MBR_Teletype
+   jmp     MBRLE_Halt
+   ; JWasm: cannot jump to local label in procedure.
+   ; Changed to halt here.
+   ;jmp     MBRLE_Halt
+  DriveIO_GotLoadError_halt:
+   jmp     DriveIO_GotLoadError_halt
 DriveIO_GotLoadError            EndP
 …
 ; Values for sectors per track table corresponding to DriveIO_IsHugeDrive return value.
 secs_per_track_table:   db    63,127,255,255,255,255
+secs_per_track_table    db    63,127,255,255,255,255
 ;db_lmlvm:   db 'Load Master LVM -- disk: ',0

trunk/BOOTCODE/REGULAR/OTHER.ASM

-              r36
+              r37
 GetLenOfStrings                EndP
 PRECRAP_Main                    Proc Near  Uses
+PRECRAP_Main                    Proc Near
    ; First initialize Variable-Area (everything with NUL)
    mov     di, offset BeginOfVariables
 …
                MBR_Main_BootThrough:
                  call    MBR_TeleType
+                 call    MBR_Teletype
                  xor     si,si
                  call    MBR_TeletypeNL
 …
 AFTERCRAP_Main                  Proc Near  Uses
+AFTERCRAP_Main                  Proc Near
    ; ===================================================
    ;  Now get volume label of FloppyDrive, if wanted...

trunk/BOOTCODE/REGULAR/PARTMAIN.ASM

-              r36
+              r37
       call    PART_GetPartitionPointer   ; Gets SI for partition DL
       mov     al, ds:[si+LocIPT_Flags]
       and     al, Flags_BootAble
+      and     al, Flags_Bootable
       jnz     PFUPN_Found
       dec     cl
 …
 ;        In: DL - Number of partition in filtered view
 ;       Out: DL - Number of partition in straight view
 PART_ConvertToStraight          Proc Near   Uses
+PART_ConvertToStraight          Proc Near
    ;movzx   bx, dl
    mov   bl,dl                                  ; partition number to bl
 …
   PSP_ForceI13X:
+        push    es di si
+        push    es
+        push    di
+        push    si
         ; Setup ES and FS.
 …
         mov     wptr es:[di+06], ax
+        pop     si di es
+        pop     si
+        pop     di
+        pop     es
 …
    jz      PSP_NoMBRprotect
    ; -------------------------------------------------- INSTALLS MBR-PROTECTION
+   push    ds si                         ; We need DS:SI later...
+   ; We need DS:SI later...
+   push    ds
+   push    si
       ; First subtract 1024 bytes from Base-Memory...
       push    ds
 …
       mov     ds:[si+2], dx              ; Vector hardcoded at DS:0009
       ; MBR-Protection now active :)
+   pop     si ds                         ; Restore DS:SI
+   ; Restore DS:SI
+   pop     si
+   pop     ds
 …
         mov     ax,bx
         call    VideoIO_PrintHexWord
+        mov     ax,[si+LocIPT_AbsolutePartTable+02]
+        call    VideoIO_PrintHexWord
+        mov     ax,[si+LocIPT_AbsolutePartTable+00]
+        call    VideoIO_PrintHexWord
+        mov     al,[ExtendedAbsPosSet]
+        call    VideoIO_PrintHexByte
         popa
 …
+        ;
+        ; Update the phys-drive field
+        ; Update the phys-disk field
+        ; DI points to PartitionSector
+        ; BX holds index to phys-disk field
+        ;
         mov     al,byte ptr [si+LocIPT_Drive]
 …
         ;popa
+        ; About 1.5 seconds
+        mov     al,30
+        ;~ jmp     skip_delay
+        ;
+        ; Show "wait dots"
+        ;
+        pusha
+        ; Color white on black
+        mov     ch,7
+        mov     cl,0
+        call    VideoIO_Color
+        ; Locate cursor for output of debug-info
+        mov     ch,8
+        mov     cl,1
+        call    VideoIO_Locate
+        ; Print dots with interval.
+        mov     cx,10
+    print_next_dot:
+        mov     al,'.'
+        call    VideoIO_PrintSingleChar
+        ; Value 30 is about 1.5 seconds
+        mov     al,1
         call    TIMER_WaitTicCount
+        loop    print_next_dot
+        popa
+    ;
+    ; Enter here to skip delay.
+    ;
+    skip_delay:
+        ;
 …
 ; CY    = Set if BOOTMGR found, clear if not
+;
 PART_IsWinBMGR  Proc Near  Uses ax bx cx dx si di ds es
         ; Load specified LBA sector (BX:CX) from the disk in DL
         mov     di,ds
         mov     si,offset [TmpSector]
         call    DriveIO_LoadSectorLBA
         ; Point to location of 'BOOTMGR' signature.
         add     si,169h
         ; DL holds equality status
         xor     dl,dl
         cld
         ; Load letter into AL, xor with letter will result 0 if the same.
         ; Then or to DL.
         ; If at the end of the sequence DL is zero, the signature is present.
         lodsb
         xor     al,'B'
         or      dl,al
         lodsb
         xor     al,'O'
         or      dl,al
         lodsb
         xor     al,'O'
         or      dl,al
         lodsb
         xor     al,'T'
         or      dl,al
         lodsb
         xor     al,'M'
         or      dl,al
         lodsb
         xor     al,'G'
         or      dl,al
         lodsb
         xor     al,'R'
         or      dl,al
         ; Assume not present
         clc
         jnz     PART_IsWinBMGR_exit
         ; BOOTMGR signature found
         stc
     PART_IsWinBMGR_exit:
         ret
 PART_IsWinBMGR  Endp
+;PART_IsWinBMGR  Proc Near  Uses ax bx cx dx si di ds es
+;
+;        ; Load specified LBA sector (BX:CX) from the disk in DL
+;        mov     di,ds
+;        mov     si,offset [TmpSector]
+;        call    DriveIO_LoadSectorLBA
+;        ; Point to location of 'BOOTMGR' signature.
+;        add     si,169h
+;        ; DL holds equality status
+;        xor     dl,dl
+;        cld
+;        ; Load letter into AL, xor with letter will result 0 if the same.
+;        ; Then or to DL.
+;        ; If at the end of the sequence DL is zero, the signature is present.
+;        lodsb
+;        xor     al,'B'
+;        or      dl,al
+;        lodsb
+;        xor     al,'O'
+;        or      dl,al
+;        lodsb
+;        xor     al,'O'
+;        or      dl,al
+;        lodsb
+;        xor     al,'T'
+;        or      dl,al
+;        lodsb
+;        xor     al,'M'
+;        or      dl,al
+;        lodsb
+;        xor     al,'G'
+;        or      dl,al
+;        lodsb
+;        xor     al,'R'
+;        or      dl,al
+;        ; Assume not present
+;        clc
+;        jnz     PART_IsWinBMGR_exit
+;        ; BOOTMGR signature found
+;        stc
+;    PART_IsWinBMGR_exit:
+;        ret
+;PART_IsWinBMGR  Endp

trunk/BOOTCODE/REGULAR/PARTSCAN.ASM

-              r36
+              r37
 ;        here.
 PARTSCAN_ScanForPartitions      Proc Near  Uses
+PARTSCAN_ScanForPartitions      Proc Near
    ; Reset X-Reference
    call    PARTSCAN_ResetXref
 …
 ; Falls eine fehlerhafte Partition gefunden wird, wird abgebrochen.
 ; falls eine Extended Partition (DOS) gefunden wird, wird erneut gescannt.
 PARTSCAN_ScanDriveForPartitions Proc Near  Uses
+PARTSCAN_ScanDriveForPartitions Proc Near
    xor     ax, ax
    xor     bx, bx     ; Location Absoluter Sektor 0
 …
    ; First check, if LVM Information Sector is available and this partition
    ;  is supported.
+   push    ax dx si di
+   push    ax
+   push    dx
+   push    si
+   push    di
       mov     si, wptr [PartPtr]
       mov     ax, wptr [si+LocBRPT_RelativeBegin] ; Absolute Sector
 …
    PCCTP_NoIbmBm:
+   pop     di si dx ax
+   pop     di
+   pop     si
+   pop     dx
+   pop     ax
    mov     si, offset MBR_NoName_Patched
    xor     ah, ah                        ; no Flags_NoPartName
 …
      PCCTP_CheckBootRecord:
+   pop     di si dx ax
+   pop     di
+   pop     si
+   pop     dx
+   pop     ax
    test    ah, FileSysFlags_NoName       ; No-Name-Flag ? -> No Partition Name
 …
          ; Now compare IPT with current Partition
          mov     cx, 15                  ; Serial&Name (15-Bytes)
+         push    si di
+         push    si
+         push    di
             repz    cmpsb
+         pop     di si
+         pop     di
+         pop     si
          jne   PCCTP_NoMatchYet
 …
          ; Now compare IPT with current Partition
          mov     cx, 11                  ; Name only (11-Bytes)
+         push    si di
+         push    si
+         push    di
             add     si, 4
             add     di, 4                ; Skip over Serial-Field
             repz    cmpsb
+         pop     di si
+         pop     di
+         pop     si
          jne     PCCTP_NameNoMatch
          mov     cx, [si+0]           ; Get Serial
 …
       ; Build a standard-Volume Label from FileSystemNamePtr
       ;  We have to call SearchFileSysName again because of NTFS
+      push    ax cx
+      push    ax
+      push    cx
          mov     al, dh
          call    PART_SearchFileSysName   ; We want SI here <- FileSystemNamePtr
 …
          stosb                           ; Fill last 3 bytes with "NUL"
          mov     si, offset MBR_NoName_Patched
+      pop     cx ax
+      pop     cx
+      pop     ax
       ;=======================================================
       ; LOCATION SEARCH in IPT-Table
 …
 PARTSCAN_SyncHideConfigWithXref EndP
 ibm_bm_name:   db 'OS2 BootMgr',0
 ;win_bm_name:   db 'BOOTMGR',0
+ibm_bm_name     db 'OS2 BootMgr',0
+;win_bm_name:    db 'BOOTMGR',0

trunk/BOOTCODE/REGULAR/PASSWORD.ASM

r30	r37
142	142	PASSWORD_AskSpecifiedPassword EndP
143	143
144		PasswordSpace: db 16 dup (0) ; Space for Password-Encoding...
	144	PasswordSpace db 16 dup (0) ; Space for Password-Encoding...
145	145	dw 0BABEh ; All of these 8 bytes are insider
146	146	dw 0FC77h ; jokes. I bet no one will solve

trunk/BOOTCODE/REGULAR/STD_TEXT.ASM

-              r36
+              r37
 ;Copyright             db ' AiR-BOOT v1.0.8-internal-beta - ** !! NOT FOR DISTRIBUTION !! **', 0
 ;Copyright             db ' AiR-BOOT v1.0.8 - (c) 2012 M. Kiewitz    <<Release Candidate>>    (build: #18)', 0
+Copyright             db ' AiR-BOOT v1.0.8 - (c) 2012 M. Kiewitz  <<Release Candidate 1>> (bld: 20120124)', 0
+;Copyright             db ' AiR-BOOT v1.0.8 - (c) 2012 M. Kiewitz  <<Release Candidate 1>> (bld: 20120124)', 0
+Copyright             db ' AiR-BOOT v1.0.8 - (c) 2012 M. Kiewitz  <<Release Candidate 2>> (bld: 20120214)', 0
 ;Copyright             db ' AiR-BOOT v1.0.8 - (c) 1998-2012 M. Kiewitz, Dedicated to Gerd Kiewitz', 0
+; Message in case the user wants to edit the label of a type 0x35 partition
+TXT_SETUP_NoEditType35         db 'The label of an LVM-Data partition cannot be edited', 0
+; Message in case the user wants to make a type 0x35 partition bootable
+TXT_SETUP_NoBootType35         db 'An LVM-Data partition cannot be set bootable', 0
 ; Rousseau: switch around

trunk/BOOTCODE/REGULAR/VIDEOIO.ASM

-              r36
+              r37
 ENDIF
 VideoIO_WaitRetrace             Proc Near   Uses ax dx
    mov     dx, 3DAh
  VIOWR_Jump1:
    in      al, dx
    test    al, 8
    jnz     VIOWR_Jump1
  VIOWR_Jump2:
    in      al, dx
    test    al, 8
    jz      VIOWR_Jump2
    ret
 VideoIO_WaitRetrace             EndP
+VideoIO_WaitRetrace Proc Near   Uses ax dx
+        mov     dx, 3DAh
+    VIOWR_Jump1:
+        in      al, dx
+        test    al, 8
+        jnz     VIOWR_Jump1
+    VIOWR_Jump2:
+        in      al, dx
+        test    al, 8
+        jz      VIOWR_Jump2
+        ret
+VideoIO_WaitRetrace EndP
 …
 ; Holds the current position. Yeah, I know this is in the code area, but who
 ;  cares :))
 TextPosY                     db     0h
 TextPosX                     db     0h
 TextColorFore                db     7h
 TextColorBack                db     0h
+TextPosY                    db  0h
+TextPosX                    db  0h
+TextColorFore               db  7h
+TextColorBack               db  0h
 ;        In: CH - Cursor Column, CL - Cursor Row (Start at 1,1)
 ; Destroyed: None
 VideoIO_Locate                  Proc Near   Uses cx
    or      ch, ch
    jz      VIOL_IgnoreY
    dec     ch
    mov     TextPosY, ch
   VIOL_IgnoreY:
    or      cl, cl
    jz      VIOL_IgnoreX
    dec     cl
    mov     TextPosX, cl
   VIOL_IgnoreX:
    ret
 VideoIO_Locate                  EndP
+VideoIO_Locate  Proc Near   Uses cx
+        or      ch, ch
+        jz      VIOL_IgnoreY
+        dec     ch
+        mov     TextPosY, ch
+    VIOL_IgnoreY:
+        or      cl, cl
+        jz      VIOL_IgnoreX
+        dec     cl
+        mov     TextPosX, cl
+    VIOL_IgnoreX:
+        ret
+VideoIO_Locate  EndP
 ;        In: CH - Cursor Column, CL - Center Cursor Row (Start at 1,1)
 …
          cmp     ah, Keys_ESC
          je      VIOLUES_KeyESC
          cmp     ah, Keys_Enter
+         cmp     ah, Keys_ENTER
          je      VIOLUES_KeyENTER
          cmp     ah, Keys_Backspace
 …
 ; Disk Info to Dump to AB LogScreen
 Disk:             db "DISK ",0
 ;BiosCyls:         db "Cyls    :",0
 BiosHeads:        db "Heads   :",0
 BiosSecs:         db "Secs    :",0
 LvmSecs:          db "SecsLVM :",0
 BiosLBA:          db "LBA Secs:",0
 HugeBootDisk:     db "Boot Disk is Huge    : ",0
 DisksFound:       db "Disks Found          : ",0
 PartitionsFound:  db "Partitions Found     : ",0
 ;AutoStartPart:    db "Auto Start Partition : ",0
 Phase1:           db "eCS Install Phase 1  : ",0
 ShowMenu:         db "Press TAB to return to the AiR-BOOT Menu",0
 ;ShowBootLog:      db "Press TAB to see the Boot Log...",0
 Yes:              db "YES",0
 No:               db "NO",0
 On:               db "ON",0
 Off:              db "OFF",0
 None:             db "NONE",0
 Active:           db "ACTIVE",0
 NotActive:        db "NOT ACTIVE",0
+Disk              db "DISK ",0
+;BiosCyls          db "Cyls    :",0
+BiosHeads         db "Heads   :",0
+BiosSecs          db "Secs    :",0
+LvmSecs           db "SecsLVM :",0
+BiosLBA           db "LBA Secs:",0
+HugeBootDisk      db "Boot Disk is Huge    : ",0
+DisksFound        db "Disks Found          : ",0
+PartitionsFound   db "Partitions Found     : ",0
+;AutoStartPart     db "Auto Start Partition : ",0
+Phase1            db "eCS Install Phase 1  : ",0
+ShowMenu          db "Press TAB to return to the AiR-BOOT Menu",0
+;ShowBootLog       db "Press TAB to see the Boot Log...",0
+Yes               db "YES",0
+No                db "NO",0
+On                db "ON",0
+Off               db "OFF",0
+None              db "NONE",0
+Active            db "ACTIVE",0
+NotActive         db "NOT ACTIVE",0
 ; New Line for use by MBR_Teletype
 NL:         db 0dh, 0ah, 0
+NL          db 0dh, 0ah, 0

trunk/BOOTCODE/SETUP/MAIN.ASM

-              r30
+              r37
 LocMENU_ItemPack             equ          8 ; only if VariablePtr>0
 SETUP_UpperFixString:         db 'SETUP ',0 ; AddOn fr "AiR-BOOT SETUP vX.XX"
 Include SETUP\MENUS.ASM                  ; Menu structures
 Include SETUP\PART_SET.ASM               ; Partition Setup (in extra file)
+SETUP_UpperFixString          db 'SETUP ',0 ; AddOn for "AiR-BOOT SETUP vX.XX"
+Include SETUP/MENUS.ASM                  ; Menu structures
+Include SETUP/PART_SET.ASM               ; Partition Setup (in extra file)
 ;            CH - Current Item Number
 …
 SETUP_SwitchToSelectedItem      EndP
 SETUP_CheckEnterSETUP           Proc Near   Uses
+SETUP_CheckEnterSETUP           Proc Near
 …
 ;        In: BP - Pointer to Menu
 ;   CurMenu: Left Side 0-6, Right Side 8-14 (Bit 3!)
 SETUP_MenuTask                  Proc Near   Uses ; the main-menu routine
+SETUP_MenuTask                  Proc Near   ; the main-menu routine
    cmp     SETUP_ExitEvent, 1
    jne     SMT_NoImmediateExit
 …
    mov     ax, ds:[bp+1]   ; Help Pointer
    cmp     ax, offset TXT_SETUPHELP_MAIN ; ask only in main-menu...
+   cmp     ax, offset TXT_SETUPHELP_Main ; ask only in main-menu...
    jne     SMT_NotMainMenu
    call    FX_EndScreenLeft              ; Do FX, if requested...
 …
       cmp     ah, Keys_Right
       je      SMT_KeyLeftRight
       cmp     ah, Keys_Enter
       je      SMT_KeyEnter
+      cmp     ah, Keys_ENTER
+      je      SMT_KeyENTER
       cmp     ah, Keys_Plus
       je      SMT_KeyPlus
 …
    jmp     SMT_FixUpModify
   SMT_KeyEnter:                          ; Enters Menu, if no ItemPack available
+  SMT_KeyENTER:                          ; Enters Menu, if no ItemPack available
    mov     ch, dh
    call    SETUP_SwitchToSelectedItem    ; Calculates SI for Item-No (CH)
 …
   SMT_KeyEsc:
    mov     ax, ds:[bp+1]                 ; Help Pointer
    cmp     ax, offset TXT_SETUPHELP_MAIN ; embarassing? ;-)
+   cmp     ax, offset TXT_SETUPHELP_Main ; embarassing? ;-)
    jne     SMT_ReturnPrev
    jmp     SMT_ExitWithoutSaving
 …
 ;        In: BP - Pointer to Menu
 ;       Out: DH - Active Item on Screen
 SETUP_DrawMenuOnScreen          Proc Near   Uses
+SETUP_DrawMenuOnScreen          Proc Near
    call    SETUP_DrawMenuWindow
    mov     cx, CLR_MENU_WINDOW_BM
 …
    add     ch, 6                         ; Fix coordinate...
    ; Display the Name and a double-point first
+   push    cx si                         ; BackUp Coordinates and ItemPackPtr
+   ; BackUp Coordinates and ItemPackPtr
+   push    cx
+   push    si
       push    cx
          cmp     cl, 40
 …
       call    VideoIO_PrintSingleChar    ; Write double-point
       mov     word ptr TextColorFore, dx
+   pop     si cx
+   pop     si
+   pop     cx
    add     cl, 26                        ; Fix X-coordinate (for ItemPack)
    call    VideoIO_Locate
 …
 SETUP_DrawMenuWindow            EndP
 SETUP_DrawMenuBase              Proc Near   Uses
    call    BOOTMENU_BuildBackGround
+SETUP_DrawMenuBase              Proc Near
+   call    BOOTMENU_BuildBackground
    ; -------------------------------------------- Upper Copyright...
    mov     cx, 0F00h
 …
 ;SETUP_EnterMenu_LinuxCommandLine EndP
 SETUP_EnterMenu_DefineMasterPassword Proc Near Uses
+SETUP_EnterMenu_DefineMasterPassword Proc Near
    mov     di, offset CFG_MasterPassword
    call    SETUP_EnterMenu_DefinePassword
 …
 SETUP_EnterMenu_DefineMasterPassword EndP
 SETUP_EnterMenu_DefineBootPassword Proc Near Uses
+SETUP_EnterMenu_DefineBootPassword Proc Near
    mov     di, offset CFG_BootPassword
    call    SETUP_EnterMenu_DefinePassword
 …
 ; [Linux support removed since v1.02]
 ;SETUP_EnterMenu_EnterLinuxCmdLine Proc Near Uses
+;SETUP_EnterMenu_EnterLinuxCmdLine Proc Near
 ;   mov     cx, 0D05h
 ;   call    VideoIO_Color
 …
    mov     ax, VideoIO_Page2
    call    VideoIO_BackUpTo
+   push    ax di
+   push    ax
+   push    di
       mov     ax, 20h                    ; Space
       mov     cx, 16
       rep     stosb                      ; Kill new password
       mov     es:[di], ah                ; ending NUL
+   pop     di ax
+   pop     di
+   pop     ax
    cmp     ax, 0ABABh                    ; Magic Processing...
    je      SLEP_MagicLayOut
 …
   SEMSAES_DoThis:
    xor     al, al
    mov     CFG_AutoEnterSETUP, al
+   mov     CFG_AutoEnterSetup, al
    add     CFG_LastTimeEditLow, 1
    adc     CFG_LastTimeEditHi, 0         ; Update Time-Stamp
 …
    jnz     SEMEWS_UserAbort
    ; If we were forced to enter Setup, save configuration anyway...
    test    CFG_AutoEnterSETUP, 1
+   test    CFG_AutoEnterSetup, 1
    jz      SEMEWS_DoThis
    jmp     SEMEWS_DoThis                 ; Cross-Jump to SaveAndExitSetup!
 …
 ;       Out: Non-Zero Flag set -> User is sure
 ; Destroyed: None
 SETUP_Warning_AreYouSure        Proc Near Uses
+SETUP_Warning_AreYouSure        Proc Near
    mov     cx, 0C04h
    call    VideoIO_Color
 …
 ; Cur Value in DL, Maximum Value in DH. Add/Sub in CL
 SETUPMAGIC_InternalCheckUp      Proc Near   Uses
+SETUPMAGIC_InternalCheckUp      Proc Near
    or      cl, cl                        ; CL==0?    -> Decrease
    jz      SMICU_Substract               ; otherwise -> Increase
 …
    mov     al, dl
    call    VideoIO_PrintByteDynamicNumber
+   push    ds es
+   pop     ds es                         ; Pseudo-(XCHG DS, ES)
+   ; Pseudo-(XCHG DS, ES)
+   push    ds
+   push    es
+   pop     ds
+   pop     es
    mov     di, si
    add     di, LocMENU_ItemPack          ; ES:DI - ItemPack
    mov     si, 4000                      ; DS:SI - Screen Page 1
+   push    es di
+   push    es
+   push    di
       mov     cx, 4
      SMCBD_Loop:
 …
          stosb
       loop    SMCBD_Loop                 ; okay we got it...trick!
+   pop     si ds                         ; DS:SI - ItemPack
+   ; DS:SI - ItemPack
+   pop     si
+   pop     ds
    mov     cx, 12
    call    GetLenOfName                  ; Gets the length of the number
 …
       call    PART_GetPartitionPointer
       mov     ax, ds:[si+LocIPT_Flags]
       test    ax, Flags_BootAble
+      test    ax, Flags_Bootable
       jz      SMCP_Inc_RejectPartition
       jmp     SMCP_GotSelection
 …
       call    PART_GetPartitionPointer
       mov     ax, ds:[si+LocIPT_Flags]
       test    ax, Flags_BootAble
+      test    ax, Flags_Bootable
       jz      SMCP_Dec_RejectPartition

trunk/BOOTCODE/SETUP/MENUS.ASM

-              r30
+              r37
 SETUP_MainMenu:
                 db      0                ; Where Current Item will get saved
                 dw      offset TXT_SETUPHELP_MAIN ; Pointer to help information
+                dw      offset TXT_SETUPHELP_Main ; Pointer to help information
                 ; The Menu-Items start here...
                 dw      offset SETUP_EnterMenu_PartitionSetup, 0
 …
 SETUP_BasicOptions:
                 db      0                ; Where Current Item will get saved
                 dw      offset TXT_SETUPHELP_SUBMENU ; Pointer to help info
+                dw      offset TXT_SETUPHELP_SubMenu ; Pointer to help info
                 ; The Menu-Items start here...
                 dw      offset SETUPMAGIC_ChangeDefaultSelection, offset CFG_PartDefault
 …
                 dw      0, 0
                 dw      offset SETUPMAGIC_EnableDisable, offset CFG_ProtectMBR
                 dw      offset TXT_SETUP_MBRprotection, offset TXT_SETUPHELP_MBRprotection
+                dw      offset TXT_SETUP_MbrProtection, offset TXT_SETUPHELP_MbrProtection
                 dw      6 dup (0)
                 dw      offset SETUPMAGIC_EnableDisable, offset CFG_IgnoreWriteToMBR
                 dw      offset TXT_SETUP_IgnoreMBRwrites, offset TXT_SETUPHELP_IGNOREMBRWRITES
+                dw      offset TXT_SETUP_IgnoreMbrWrites, offset TXT_SETUPHELP_IgnoreMbrWrites
                 dw      6 dup (0)
                 dw      0, 0
 …
 SETUP_AdvancedOptions:
                 db      0                ; Where Current Item will get saved
                 dw      offset TXT_SETUPHELP_SUBMENU ; Pointer to help info
+                dw      offset TXT_SETUPHELP_SubMenu ; Pointer to help info
                 ; The Menu-Items start here...
                 dw      offset SETUPMAGIC_ChangeBootMenu, offset CFG_BootMenuActive
 …
                 ; Separator Line
                 dw      0, 0
                 dw      offset TXT_SETUP_SECURITYOPTIONS, 0
+                dw      offset TXT_SETUP_SecurityOptions, 0
                 dw      offset SETUPMAGIC_EnableDisable, offset CFG_PasswordSetup
                 dw      offset TXT_SETUP_PasswordedSetup, offset TXT_SETUPHELP_PasswordedSetup
 …
 SETUP_ExtendedBootOptions:
                 db      0                ; Where Current Item will get saved
                 dw      offset TXT_SETUPHELP_SUBMENU ; Pointer to help information
+                dw      offset TXT_SETUPHELP_SubMenu ; Pointer to help information
                 ; The Menu-Items start here...
 ; [Linux support removed since v1.02]

trunk/BOOTCODE/SETUP/PART_SET.ASM

-              r36
+              r37
 ; This here is called from Menu in AIR-BSET.asm
 PARTSETUP_Main                  Proc Near   Uses
+PARTSETUP_Main                  Proc Near
    ; Build Fixed Content...
    call    PARTSETUP_DrawMenuBase
 …
       cmp     ah, Keys_F1
       je      PSM_KeyF1
       cmp     ah, Keys_Enter
+      cmp     ah, Keys_ENTER
       je      PSM_KeyENTER
       ; Flags-Change
 …
    jmp     PSM_MainLoop
+    ; Disabling editing for type 0x35 is currently implemented
+    ; in PARTSETUP_ChangePartitionName.
   PSM_KeyENTER:
    call    PARTSETUP_ChangePartitionName
 …
   PSM_KeyBootAble:
    call    PART_GetPartitionPointer      ; Gets Partition (DL) Pointer -> SI
+   ; See if this is an eCS LVM Volume.
+   ; In that case, we don't allow it to be made bootable.
+   ; We also show a popup to inform the user.
+   call    PARTSETUP_IsType35
+   je      PSM_KeyBootAble_istype35
+  PSM_KeyBootAble_notype35:
    mov     al, [si+LocIPT_Flags]
    xor     al, Flags_BootAble
+   xor     al, Flags_Bootable
    mov     [si+LocIPT_Flags], al
    call    PARTSETUP_DrawPartitionInfo
    call    PARTSETUP_BuildChoiceBar
+  PSM_KeyBootAble_istype35:
    jmp     PSM_MainLoop
 …
 PARTSETUP_Main                  EndP
+; See if this is a partition of type 0x35 and display error
+; when user tries to set it as bootable.
+; IN:   SI = Pointer to partition
+; OUT:  ZF = Set if 0x35, clear otherwise
+PARTSETUP_IsType35      Proc    Near
+   mov     al, [si+LocIPT_SystemID]
+   cmp     al, 35h
+   jne     PARTSETUP_IsType35_end
+   pushf
+   pusha
+   ; Cannot boot LVM-Data partitions
+   mov     cx, 0C04h
+   mov     si, offset TXT_SETUP_NoBootType35
+   call    SETUP_ShowErrorBox
+   popa
+   call    PARTSETUP_DrawMenuBase
+   call    PARTSETUP_RefreshPartitions
+   call    PARTSETUP_BuildChoiceBar
+   popf
+  PARTSETUP_IsType35_end:
+   ret
+PARTSETUP_IsType35      EndP
 ; Draw all standard-things for Partition Setup, dynamic content not included.
 PARTSETUP_DrawMenuBase          Proc Near   Uses dx
 …
    call    VideoIO_FixedPrint
    mov     si, offset TXT_SETUPHELP_PARTSETUP
+   mov     si, offset TXT_SETUPHELP_PartSetup
    call    SETUP_DrawMenuHelp
    ret
 …
          mov     cl, 11
          call    VideoIO_FixedPrint
+   pop     si cx
+   pop     si
+   pop     cx
    ; Display "Flags" field aka "BVHL"
 …
    mov     bh, bl
    mov     al, TXT_SETUP_FlagLetterBootable
    and     bl, Flags_BootAble
+   and     bl, Flags_Bootable
    call    PARTSETUP_DrawOneFlag
    mov     bl, bh
 …
 ;            DH - New Active (to be activated)
 ; Destroyed: None
 PARTSETUP_BuildChoiceBar        Proc Near   Uses
+PARTSETUP_BuildChoiceBar        Proc Near
    cmp     dl, dh
    je      PSBCB_SkipRetrace
 …
         cmp     byte ptr [si+LocIPT_SystemID], 035h
         jnz     no_type_35h
+   ; Cannot boot LVM-Data partitions
+   pusha
+   mov     cx, 0C04h
+   mov     si, offset TXT_SETUP_NoEditType35
+   call    SETUP_ShowErrorBox
+   popa
         jmp     PSCPN_AllDone
     no_type_35h:
    mov     cx, 11                        ; Partition-Name-Length = 11 Bytes
+   push    si di
+   push    si
+   push    di
       add     si, LocIPT_Name            ; DS:SI -> Partition-Name
       repz    cmpsb
+   pop     di si
+   pop     di
+   pop     si
    jne     PSCPN_LetUserEditPartName     ; -> No BR/LVM Changing/Saving
 …
    ; ----------------------------------------------[LVM SAVE PARTITION NAME]---
    ; Copy 11 bytes from IPT into LVM PartitonName, back-padd with zero's
+   ; Copy 11 bytes from IPT into LVM PartitionName, back-padd with zero's
    mov     cx, 11
    push    si
 …
       cmp     ah, Keys_F1
       je      PHSM_KeyF1
       cmp     ah, Keys_Enter
+      cmp     ah, Keys_ENTER
       je      PHSM_KeyToogle
       cmp     ah, Keys_Plus
 …
    sub     dl, cl                        ; Adjust position
    sub     dl, 2
+   push    cx si                         ; SI == Label Field
+   push    cx
+   push    si                         ; SI == Label Field
       mov     cx, dx
       call    VideoIO_Locate
 …
       mov     si, offset TXT_SETUP_HideFeature2
       call    VideoIO_Print
+   pop     si cx
+   pop     si
+   pop     cx
    call    VideoIO_FixedPrint
    mov     al, '>'
 …
 ;            DH - New Active (to be activated)
 ; Destroyed: None
 PARTHIDESETUP_BuildChoiceBar    Proc Near   Uses
+PARTHIDESETUP_BuildChoiceBar    Proc Near
    cmp     dl, dh
    je      PHSBCB_SkipRetrace
 …
    mov     di, offset HidePartitionTable
    add     di, ax                        ; We got the pointer
+   push    di di
+   push    di
+   push    di
       mov     cx, LocIPT_MaxPartitions
       mov     al, 0FFh
 …
          cmp     ah, Keys_ESC
          je      PSDLS_KeyDONE
          cmp     ah, Keys_Enter
+         cmp     ah, Keys_ENTER
          je      PSDLS_KeyDONE
          ; Direct-Letter-Input

trunk/BOOTCODE/SPECIAL/F00K/BILLSUXX.ASM

-              r30
+              r37
    jz      MSHPPT_NoMShack
   MSHPPT_HarddriveLoop:
+      push    ax bx cx dx
+      push    ax
+      push    bx
+      push    cx
+      push    dx
          xor     ax, ax
          xor     bx, bx     ; Location Absolute Sector 0
 …
          xor     dh, dh     ; Location Cylinder 0, Head 0, Sector 1 MBR/PPT
          call    DriveIO_LoadPartition
+      pop     dx cx bx ax
+      pop     dx
+      pop     cx
+      pop     bx
+      pop     ax
       jc      MSHPPT_Failure

trunk/BOOTCODE/SPECIAL/FAT16.ASM

-              r30
+              r37
    xor    di, di
   FAT16SE_SearchLoop:
+      push   si di
+      push   si
+      push   di
          mov    cx, 11
          repe   cmpsb                    ; Compare total 11-bytes
+      pop    di si
+      pop    di
+      pop    si
       je     FAT16SE_EntryFound
       add    di, 32                      ; Skip 1 FAT16-Entry now :)
 …
       ; Set Size-Entry in KernelSizeTable
+      push   ds si di
+      push   ds
+      push   si
+      push   di
          mov    bx, ds:[si+30]
          mov    ax, ds:[si+28]           ; BX:AX - Size of file in Bytes
 …
          mov    di, si
          call   PART_FillOutSizeElement  ; BX:AX -> ES:DI (Size Element)
+      pop    di si ds
+      pop    di
+      pop    si
+      pop    ds
       ; Copy entry and make append extension to basename

trunk/BOOTCODE/SPECIAL/FX.ASM

-              r30
+              r37
 ;  If you rip this code, I will ./ your ass. =]
 Include SPECIAL\FXTABLES.asm
+Include SPECIAL/FXTABLES.ASM
 FX_MaxScanLine                equ 384
 FX_TotalCooperBars            equ   7
 FX_CalculateTables              Proc Near   Uses
+FX_CalculateTables              Proc Near
    ; Calculate the Cooper-Bar Color-Table -> FX_CooperColors
    mov    di, offset FX_CooperColors
 …
 ;       Out: *none*
 ; Destroyed: DI - updated, +96
 FX_MakeCooperBarColors          Proc Near   Uses
+FX_MakeCooperBarColors          Proc Near
    mov    bh, ah
    shl    bh, 4
 …
       add    di, 3
    loop   FX_MCBC_BuildColorLoop1
+   push   ax bx
+   push   ax
+   push   bx
       add    ax, 0101h
       add    bl, 01h
 …
       mov    es:[di+5], bl
       add    di, 6
+   pop    bx ax
+   pop    bx
+   pop    ax
    mov    cx, 15
   FX_MCBC_BuildColorLoop2:
 …
 ;  If FX is active, we will modify the base segment for videoio to page 2,
 ;  so the screen will be generated there instead of the current page.
 FX_StartScreen                  Proc Near   Uses
+FX_StartScreen                  Proc Near
    test    CFG_CooperBars, 1
    jz      FXSS_NoFX
 …
 ;  If FX is active, we will copy the new screen to scroll area, do the FX,
 ;  copy the new screen to Page 0 and activate it.
 FX_EndScreenLeft                Proc Near   Uses
+FX_EndScreenLeft                Proc Near
    test    CFG_CooperBars, 1
    jnz     FXESL_Go
 …
 FX_EndScreenLeft                EndP
 FX_ScrollScreenLeft             Proc Near   Uses
+FX_ScrollScreenLeft             Proc Near
    mov     FX_WideScrollerCurPos, 640
    mov     FX_WideScrollerDirection, 0
 …
 FX_ScrollScreenLeft             EndP
 FX_EndScreenRight               Proc Near   Uses
+FX_EndScreenRight               Proc Near
    test    CFG_CooperBars, 1
    jnz     FXESR_Go
 …
 FX_EndScreenRight               EndP
 FX_ScrollScreenRight            Proc Near   Uses
+FX_ScrollScreenRight            Proc Near
    mov     FX_WideScrollerCurPos, 0
    mov     FX_WideScrollerDirection, 1
 …
 FX_ScrollScreenRight            EndP
 FX_EndScreenInternalGo          Proc Near   Uses
+FX_EndScreenInternalGo          Proc Near
    mov     FX_WideScrollerSpeed, 1
    mov     FX_WideScrollerSpeedState, 1
 …
 FX_EndScreenInternalGo          EndP
 FX_EndScreenInternalCleanUp     Proc Near   Uses
+FX_EndScreenInternalCleanUp     Proc Near
    mov     ax, -1
    call    FX_SetVideoStart
 …
 ;       Out: *none*
 ; Destroyed: all
 FX_CalculateCoopers             Proc Near   Uses
+FX_CalculateCoopers             Proc Near
    ; Logic: When Intro-State: Increase CooperPos by 1 till 256 -> then active
    ;             Active-State: Use SinusTable, till SinusPos=7Fh -> then Extro
 …
 FX_CalculateCoopers             EndP
 FX_CalculateWideScroller        Proc Near   Uses
+FX_CalculateWideScroller        Proc Near
    mov     bx, FX_WideScrollerCurPos
    ;movzx   cx, FX_WideScrollerSpeed
 …
 FX_CalculateWideScroller        EndP
 FX_WaitRetrace                  Proc Near   Uses
+FX_WaitRetrace                  Proc Near
    mov    dx, 3DAh
   FX_WR1:
 …
 FX_WaitRetrace                  EndP
 FX_WaitVRetrace                 Proc Near   Uses
+FX_WaitVRetrace                 Proc Near
    mov    dx, 3DAh
   FX_WVR1:

trunk/BOOTCODE/SPECIAL/LINUX.ASM

-              r30
+              r37
    add     di, LocIPT_Name
   LSKN_SearchLoop:
+      push    cx si di
+      push    cx
+      push    si
+      push    di
          mov     cx, 11
          repe    cmpsb                   ; Compare total 11-bytes
+      pop     di si cx
+      pop     di
+      pop     si
+      pop     cx
       je      LSKN_Found
       add     di, LocIPT_LenOfIPT
 …
    ; Linux has 1 'BR' (which is crap) and some setup sectors
    ; we load them at 9000:0, what a luck, we are at 8000:0 :-))
+   push    ds es
+   push    ds
+   push    es
       mov     ax, 9000h
       mov     es, ax
 …
       mov     ax, 6000h
       mov     es, ax
+      push    cx si                      ; Push Kernel-Entry-Pointer
+      ; Push Kernel-Entry-Pointer
+      push    cx
+      push    si
          mov     si, di
          shl     cx, 9                   ; Sectors to Byte Count
 …
          shr     cx, 1
          rep     movsw                   ; Copy Data...
+      pop     si cx                      ; Get Kernel-Entry-Pointer back
+      ; Get Kernel-Entry-Pointer back
+      pop     si
+      pop     cx
      LLL_GotAll:
+   pop     es ds
+   push    cx dx                          ; Push Missing-Sectors, StartCluster
+   pop     es
+   pop     ds
+   ; Push Missing-Sectors, StartCluster
+   push    cx
+   push    dx
       mov     ax, 9000h
       mov     ds, ax
 …
          stosb                            ; Write another NUL
       pop     cx
+   pop     dx bx                          ; Pop StartCluster, Missing-Sectors
+   ; Pop StartCluster, Missing-Sectors
+   pop     dx
+   pop     bx
    ; CX - Sector-Count of Kernel Image, DX - Starting Cluster of Kernel Image
    ; BX - Sector-Count left over in 6000:0 area from Setup Code loading

trunk/BOOTCODE/SPECIAL/LVM.ASM

-              r36
+              r37
 ENDIF
 LVM_InitCRCTable                Proc Near   Uses
+LVM_InitCRCTable                Proc Near
    ; Initializes our LVM-CRC-Table
    xor    cl, cl
 …
 ;       Out: Carry set, if valid LVM signature found
 ; Destroyed: None
 LVM_CheckSectorSignature        Proc Near   Uses
+LVM_CheckSectorSignature        Proc Near
    test    [CFG_IgnoreLVM], 1            ; We are supposed to ignore LVM, so
    jnz     LVMCSS_InvalidSignature       ;  any sector is bad!
 …
 LVM_GetDriveLetter      Proc Near   Uses bx cx dx si di ds es
         ; For primary partitions this information is stored in the last
         ; sector of track0; for all four partition entries should they
         ; all be primary ones.
+        ; sector of track0; for all four partition entries in case they
+        ; they are all primary ones.
+        ;
         ; LVM DLAT info for logical partitions is stored in the sector

trunk/BOOTCODE/SPECIAL/VIRUS.ASM

-              r30
+              r37
    mov     di, offset CFG_VIR_INT08
    push    di
       rep     scasb
+      repe     scasb
    pop     di
    jne     VCFS_AlreadyInitiated
 …
    int     16h                           ; Waits for any keystroke
    jmp     VCFS_InitNow
   VCFS_WhewThisIsOne:
+   mov     si, offset TXT_VirusFoundMain
+   call    MBR_Teletype
+   ; Now check BackUp MBR for validation (AiRBOOT signature), do this
+   ; using direct-calls to original bios handler.
+   call    ANTIVIR_RestoreMBR
+   jnc     VCFS_ValidRestore
+   mov     si, offset TXT_VirusFound1damn
+   call    MBR_Teletype
+   call    MBR_Teletype                  ; VirusFound1any
+   mov     si, offset TXT_VirusFoundEnd
+   call    MBR_Teletype
+   jmp     MBR_HaltSystem
+  VCFS_ValidRestore:
+   mov     si, offset TXT_VirusFound1ok
+   call    MBR_Teletype
+   mov     si, offset TXT_VirusFound1any
+   call    MBR_Teletype
+   mov     si, offset TXT_VirusFoundEnd
+   call    MBR_Teletype
+   jmp     MBR_HaltSystem
+   call    VIRUS_TryRestore
+   ; Code should no reach this since we halt the system in VIRUS_TryRestore.
+   ret
 VIRUS_CheckForStealth           EndP
+;
+; This procedure is created to avoid jumping to labels that are local to
+; procedures. JWasm does not allow that.
+; Should be fixed better later.
+;
+VIRUS_TryRestore    Proc Near
+        mov     si, offset TXT_VirusFoundMain
+        call    MBR_Teletype
+        ; Now check BackUp MBR for validation (AiRBOOT signature), do this
+        ; using direct-calls to original bios handler.
+        call    ANTIVIR_RestoreMBR
+        jnc     VIRUS_TryRestore_ValidRestore
+        mov     si, offset TXT_VirusFound1damn
+        call    MBR_Teletype
+        call    MBR_Teletype                  ; VirusFound1any
+        mov     si, offset TXT_VirusFoundEnd
+        call    MBR_Teletype
+        jmp     MBR_HaltSystem
+    VIRUS_TryRestore_ValidRestore:
+        mov     si, offset TXT_VirusFound1ok
+        call    MBR_Teletype
+        mov     si, offset TXT_VirusFound1any
+        call    MBR_Teletype
+        mov     si, offset TXT_VirusFoundEnd
+        call    MBR_Teletype
+        jmp     MBR_HaltSystem
+        ; Code should not reach this since we halt the system.
+VIRUS_TryRestore    Endp
 ; Checks system for normal-MBR-virus... (done by comparing current MBR with
 …
 ; Segment Registers preserved
 VIRUS_CheckForVirus             Proc Near  Uses ds si es di
+   push    cs cs
+   pop     ds es
+   push    cs
+   push    cs
+   pop     ds
+   pop     es
    mov     bx, offset TmpSector
    mov     dx, 0080h
 …
    mov     cx, 223                       ; Compare 446 bytes
    repz    cmpsw                         ; if fail: Cross call to Stealth-Virus
+   jne     VCFS_WhewThisIsOne
+   ;jne     VCFS_WhewThisIsOne
+   je      VIRUS_CheckForVirus_end
+   call    VIRUS_TryRestore
+  VIRUS_CheckForVirus_end:
    ret
 VIRUS_CheckForVirus             EndP
 …
 ; Will report Carry-Clear, if BackUp MBR is valid (supposingly)
+ANTIVIR_CheckBackUpMBR          Proc Near  Uses
+   push    cs cs
+   pop     es ds
+ANTIVIR_CheckBackUpMBR          Proc Near
+   push    cs
+   push    cs
+   pop     es
+   pop     ds
    mov     bx, offset TmpSector
    mov     dx, 0080h
 …
 ANTIVIR_CheckBackUpMBR          EndP
 ANTIVIR_RestoreMBR              Proc Near  Uses
+ANTIVIR_RestoreMBR              Proc Near
    call    ANTIVIR_CheckBackUpMBR
    jnc     ARMBR_DoIt

trunk/BOOTCODE/TEXT/DE/MENUS.ASM

-              r36
+              r37
 ; Setup Control Help - Max Length: 33
 ;----------------------------------|-------------------------------|--------
 TXT_SETUPHELP_Main:            db 24,32,25,32,26,32,27,' : Aktion Auswhlen', 0
+TXT_SETUPHELP_Main             db 24,32,25,32,26,32,27,' : Aktion Auswhlen', 0
                                db               'Enter   : Aktion Besttigen', 0
                                db               'F10 : Speichern&Beenden', 0
                                db               'Esc : Beenden', 0
 TXT_SETUPHELP_SubMenu:         db 24,32,25,32,26,32,27,' : Option Auswhlen', 0
+TXT_SETUPHELP_SubMenu          db 24,32,25,32,26,32,27,' : Option Auswhlen', 0
                                db               'Bild ',24,25,' : Option ndern', 0
                                db               'F1  : Zeige Hilfe ber Option', 0
                                db               'Esc : Zurck ins Hauptmen', 0
 TXT_SETUPHELP_PartSetup:       db 24,32,25,32,26,32,27,' : Partition Auswhlen', 0
+TXT_SETUPHELP_PartSetup        db 24,32,25,32,26,32,27,' : Partition Auswhlen', 0
                                db               'Enter   : Label editieren', 0
                                db               'F1  : Optionen', 0
 …
                                   ;1234567890123456789012
 ;----------------------------------|--------------------|-------------------
 TXT_SETUPHELP_PartitionSetup:  db 'Partionen als Bootbar', 0
+TXT_SETUPHELP_PartitionSetup   db 'Partionen als Bootbar', 0
                                db 'definieren, Namen', 0
                                db 'ndern und einiges', 0
                                db 'mehr.', 0
                                db 0
 TXT_SETUPHELP_BasicOptions:    db 'Diese Optionen sind', 0
+TXT_SETUPHELP_BasicOptions     db 'Diese Optionen sind', 0
                                db 'fr unerfahrene User.', 0
                                db 0
 TXT_SETUPHELP_AdvOptions:      db 'Diese Optionen sind', 0
+TXT_SETUPHELP_AdvOptions       db 'Diese Optionen sind', 0
                                db 'fr erfahrene User.', 0
                                db 'Verndern Sie nichts,', 0
 …
                                db 0
 ;----------------------------------|--------------------|-------------------
 TXT_SETUPHELP_ExtOptions:      db 'Spezial Optionen fr', 0
+TXT_SETUPHELP_ExtOptions       db 'Spezial Optionen fr', 0
                                db 'bestimmte Betriebs-', 0
                                db 'system.', 0
                                db 0
 TXT_SETUPHELP_DefMasterPwd:    db 'Definiert ein Passwort', 0
+TXT_SETUPHELP_DefMasterPwd     db 'Definiert ein Passwort', 0
                                db 'fr Setup und System.', 0
                                db 0
 TXT_SETUPHELP_DefBootPwd:      db 'Definiert ein Passwort', 0
+TXT_SETUPHELP_DefBootPwd       db 'Definiert ein Passwort', 0
                                db 'frs Booten.', 0
                                db 0
 TXT_SETUPHELP_SaveAndExit:     db 'Mit dem Boot-Prozess', 0
+TXT_SETUPHELP_SaveAndExit      db 'Mit dem Boot-Prozess', 0
                                db 'fortfahren und die', 0
                                db 'Optionen speichern.', 0
                                db 0
 TXT_SETUPHELP_JustExit:        db 'Mit dem Boot-Prozess', 0
+TXT_SETUPHELP_JustExit         db 'Mit dem Boot-Prozess', 0
                                db 'fortfahren und die', 0
                                db 'nderungen verwerfen.', 0
 …
                                db 0
 TXT_SETUPHELP_HideSetup:       db 'Status whlen, indem', 0
+TXT_SETUPHELP_HideSetup        db 'Status whlen, indem', 0
                                db 'sich die Partitionen', 0
                                db 'befinden sollen, wenn', 0

trunk/BOOTCODE/TEXT/DE/OTHER.ASM

-              r36
+              r37
 ; Maximum 2/10/11/6 chars
 ;----------------------------------||---------------------------------------
 TXT_TopInfos_No:               db 'Nr', 0
 TXT_TopInfos_Hd:               db 'Hd', 0
+TXT_TopInfos_No                db 'Nr', 0
+TXT_TopInfos_Hd                db 'Hd', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_HdSize:           db 'Hd/Gráe:', 0
+TXT_TopInfos_HdSize            db 'Hd/Gráe:', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_Label:            db 'Name:', 0
+TXT_TopInfos_Label             db 'Name:', 0
 ;----------------------------------|---------|------------------------------
 TXT_TopInfos_Type:             db 'Typ:', 0
+TXT_TopInfos_Type              db 'Typ:', 0
 ;----------------------------------|----|-----------------------------------
 TXT_TopInfos_Flags:            db 'Flags:', 0      ; <-- for Partition Setup
+TXT_TopInfos_Flags             db 'Flags:', 0      ; <-- for Partition Setup
 ; Will be added together to one line, maximum 76 chars
 TXT_TimedBootLine:             db 'Zeitgesteuerter Boot aktiviert. System ldt '''
+TXT_TimedBootLine              db 'Zeitgesteuerter Boot aktiviert. System ldt '''
 TXT_TimedBootEntryName         db 12 dup (0) ; Space for Default-Entry-Name
 TXT_TimedBootLine2:            db      ''' in ', 0
 TXT_TimedBootSeconds:          db ' Sekunden. ', 0
 TXT_TimedBootSecond:           db ' Sekunde. ', 0 ; if only one is left, ELiTE :]
+TXT_TimedBootLine2             db      ''' in ', 0
+TXT_TimedBootSeconds           db ' Sekunden. ', 0
+TXT_TimedBootSecond            db ' Sekunde. ', 0 ; if only one is left, ELiTE :]
 ; Maximum 76 chars
 ;----------------------------------|--------------------------------------------------------------------------|
 TXT_TimedBootDisabled:         db 'Zeitgesteuerter Boot deaktiviert.', 0
 TXT_BootMenuHelpText1:         db '[Esc] um Automatischen Boot an/auszuschalten, [Enter] um Auswahl zu booten', 0
 TXT_BootMenuHelpText2:         db 'Mit den Pfeiltasten auswhlen oder [TAB] fr den BIOS POST Bildschirm.', 0
+TXT_TimedBootDisabled          db 'Zeitgesteuerter Boot deaktiviert.', 0
+TXT_BootMenuHelpText1          db '[Esc] um Automatischen Boot an/auszuschalten, [Enter] um Auswahl zu booten', 0
+TXT_BootMenuHelpText2          db 'Mit den Pfeiltasten auswhlen oder [TAB] fr den BIOS POST Bildschirm.', 0
 ; Maximum 30 chars
 ;----------------------------------|----------------------------|
 …
 ; Dynamic Length (till 80 chars)
 TXT_BrokenPartitionTable:      db 13, 10, ' - Mindestens einer Ihrer Partitionseintrge ist ungltig oder Ihre Festplatte'
+TXT_BrokenPartitionTable       db 13, 10, ' - Mindestens einer Ihrer Partitionseintrge ist ungltig oder Ihre Festplatte'
                                db 13, 10, '   beinhaltet defekte Sektoren. System angehalten.', 0
 TXT_TooManyPartitions:         db 13, 10, ' - Zuviele Partitionen gefunden. AiR-BOOT untersttzt maximal 45.', 0
 TXT_NoBootAble:                db 13, 10, ' - Keine bootbare Partition definiert. System angehalten.', 0
 TXT_BIOSchanged:               db 13, 10, ' - BIOS HAT SICH VERNDERT. berprfen Sie ihr System auf Viren.'
+TXT_TooManyPartitions          db 13, 10, ' - Zuviele Partitionen gefunden. AiR-BOOT untersttzt maximal 45.', 0
+TXT_NoBootAble                 db 13, 10, ' - Keine bootbare Partition definiert. System angehalten.', 0
+TXT_BIOSchanged                db 13, 10, ' - BIOS HAT SICH VERNDERT. berprfen Sie ihr System auf Viren.'
                                db 13, 10, '   Drcken Sie eine Taste um fortzufahren...', 0
 TXT_VirusFoundMain:            db 13, 10, ' - !ACHTUNG! -> EIN VIRUS WURDE GEFUNDEN <- !ACHTUNG!', 13, 10, 0
 TXT_VirusFound1ok:             db '    Er wurde zerstrt, es kann allerdings sein, daá Ihr System nicht mehr', 13, 10
+TXT_VirusFoundMain             db 13, 10, ' - !ACHTUNG! -> EIN VIRUS WURDE GEFUNDEN <- !ACHTUNG!', 13, 10, 0
+TXT_VirusFound1ok              db '    Er wurde zerstrt, es kann allerdings sein, daá Ihr System nicht mehr', 13, 10
                                db '    hochfhrt. In diesem Fall booten Sie bitte von der AiR-BOOT Install-Disk.', 13, 10, 0
 TXT_VirusFound1damn:           db '    Leider hat er das BackUp von AiR-BOOT zerstrt. Sie mssen mit der AiR-BOOT', 13, 10
+TXT_VirusFound1damn            db '    Leider hat er das BackUp von AiR-BOOT zerstrt. Sie mssen mit der AiR-BOOT', 13, 10
                                db '    Install-Diskette booten.', 13, 10, 0
 TXT_VirusFound1any:            db '    Sicherheitshalber sollten Sie Ihre Festplatte auf Viren untersuchen.', 13, 10, 0
 TXT_VirusFound2:               db '    Er ist im Boot-Record der Partition, die Sie gerade booten wollten.', 13, 10
+TXT_VirusFound1any             db '    Sicherheitshalber sollten Sie Ihre Festplatte auf Viren untersuchen.', 13, 10, 0
+TXT_VirusFound2                db '    Er ist im Boot-Record der Partition, die Sie gerade booten wollten.', 13, 10
                                db '    Bentzen Sie einen Viren-Scanner. Es knnte sich auch um einen falschen', 13, 10
                                db '    Alarm handeln. Sie knnen diese Fehlermeldung unterbinden, indem Sie ins', 13, 10
 …
                                db '    Falls diese Meldung dann wieder erscheint, sollten Sie VIBR fr diese', 13, 10
                                db '    Partition ausschaltet lassen.', 13, 10, 0
 TXT_VirusFoundEnd:             db '    System angehalten. Bitte drcken Sie RESET.', 0
 TXT_HowEnterSetup:             db 13, 10, ' - Drcken und halten Sie Strg/Ctrl oder Alt um ins AiR-BOOT SETUP zu gelangen.', 0
+TXT_VirusFoundEnd              db '    System angehalten. Bitte drcken Sie RESET.', 0
+TXT_HowEnterSetup              db 13, 10, ' - Drcken und halten Sie Strg/Ctrl oder Alt um ins AiR-BOOT SETUP zu gelangen.', 0
 TXT_BootingNow1:               db 'Booten des Systems durch ', 0
+TXT_BootingNow1                db 'Booten des Systems durch ', 0
 ; DO NOT MODIFY HERE
 TXT_BootingNow2:               db '''', 0
 TXT_BootingNowPartName:        db 12 dup (0) ; Space for BootThisPart-Name
+TXT_BootingNow2                db '''', 0
+TXT_BootingNowPartName         db 12 dup (0) ; Space for BootThisPart-Name
 ; DO NOT MODIFY TILL HERE
 TXT_BootingNowPartition:       db ' Partition', 0
 TXT_BootingNowKernel:          db ' Kernel', 0
 TXT_BootingNow3:               db '''', 0
 TXT_BootingHide:               db '; Hide aktiv', 0
 TXT_BootingWait:               db '; Bitte warten...', 13, 10, 13, 10, 0
+TXT_BootingNowPartition        db ' Partition', 0
+TXT_BootingNowKernel           db ' Kernel', 0
+TXT_BootingNow3                db '''', 0
+TXT_BootingHide                db '; Hide aktiv', 0
+TXT_BootingWait                db '; Bitte warten...', 13, 10, 13, 10, 0
 ; FIXED LENGTH - 11 chars each string
 ;----------------------------------|---------|------------------------------
 TXT_Floppy_NoName:             db 'kein Name  '
 TXT_Floppy_Drive:              db 'Floppy-Disk'
 TXT_Floppy_NoDisc:             db 'Keine Disk '
+TXT_Floppy_NoName              db 'kein Name  '
+TXT_Floppy_Drive               db 'Floppy-Disk'
+TXT_Floppy_NoDisc              db 'Keine Disk '
 ; Maximum 60 chars (should not be reached)

trunk/BOOTCODE/TEXT/EN/MENUS.ASM

-              r36
+              r37
 ; Setup Control Help - Max Length: 33
 ;----------------------------------|-------------------------------|--------
 TXT_SETUPHELP_Main:            db 24,32,25,32,26,32,27,' : Choose Action', 0
+TXT_SETUPHELP_Main             db 24,32,25,32,26,32,27,' : Choose Action', 0
                                db               'Enter   : Select Action', 0
                                db               'F10 : Save&Exit Setup', 0
                                db               'Esc : Quit Setup', 0
 TXT_SETUPHELP_SubMenu:         db 24,32,25,32,26,32,27,' : Choose Item', 0
+TXT_SETUPHELP_SubMenu          db 24,32,25,32,26,32,27,' : Choose Item', 0
                                db               'PgUp/Dn : Change Item', 0
                                db               'F1  : Show help for Item', 0
                                db               'Esc : Return to main-menu', 0
 TXT_SETUPHELP_PartSetup:       db 24,32,25,32,26,32,27,' : Choose partition', 0
+TXT_SETUPHELP_PartSetup        db 24,32,25,32,26,32,27,' : Choose partition', 0
                                db               'Enter   : Edit label', 0
                                db               'F1  : Flags (press key to toogle)', 0
 …
                                   ;1234567890123456789012
 ;----------------------------------|--------------------|-------------------
 TXT_SETUPHELP_PartitionSetup:  db 'Make your partitions', 0
+TXT_SETUPHELP_PartitionSetup   db 'Make your partitions', 0
                                db 'bootable, change their', 0
                                db 'name, define hiding', 0
                                db 'and much more.', 0
                                db 0
 TXT_SETUPHELP_BasicOptions:    db 'These options are for', 0
+TXT_SETUPHELP_BasicOptions     db 'These options are for', 0
                                db 'non-experienced users.', 0
                                db 0
 TXT_SETUPHELP_AdvOptions:      db 'These are for advanced', 0
+TXT_SETUPHELP_AdvOptions       db 'These are for advanced', 0
                                db 'users. If you do not', 0
                                db 'what they do, leave', 0
                                db 'them like they are.', 0
                                db 0
 TXT_SETUPHELP_ExtOptions:      db 'Extended options for', 0
+TXT_SETUPHELP_ExtOptions       db 'Extended options for', 0
                                db 'specific OSes.', 0
                                db 0
 TXT_SETUPHELP_DefMasterPwd:    db 'Define a password for', 0
+TXT_SETUPHELP_DefMasterPwd     db 'Define a password for', 0
                                db 'access to setup and', 0
                                db 'system.', 0
                                db 0
 TXT_SETUPHELP_DefBootPwd:      db 'Define a password for', 0
+TXT_SETUPHELP_DefBootPwd       db 'Define a password for', 0
                                db 'access to system.', 0
                                db 0
 TXT_SETUPHELP_SaveAndExit:     db 'Will continue boot-', 0
+TXT_SETUPHELP_SaveAndExit      db 'Will continue boot-', 0
                                db 'process and save the', 0
                                db 'current options.', 0
                                db 0
 TXT_SETUPHELP_JustExit:        db 'Will continue, but', 0
+TXT_SETUPHELP_JustExit         db 'Will continue, but', 0
                                db 'discard any changes', 0
                                db 'done to options.', 0
 …
                                db 0
 TXT_SETUPHELP_HideSetup:       db 'Select the state at', 0
+TXT_SETUPHELP_HideSetup        db 'Select the state at', 0
                                db 'which the partitions', 0
                                db 'shall be, when the', 0
 …
 TXT_SETUP_NoLDLpartition       db 'The selected partition is not HPFS/FAT16/JFS', 0
+;;;;;;;;;
 ; Maximum 34 chars (should not be reached)
 ;----------------------------------|--------------------------------|-------

trunk/BOOTCODE/TEXT/EN/OTHER.ASM

-              r36
+              r37
 ; Maximum 2/10/11/6 chars
 ;----------------------------------||---------------------------------------
 TXT_TopInfos_No:               db 'No', 0
 TXT_TopInfos_Hd:               db 'Hd', 0
+TXT_TopInfos_No                db 'No', 0
+TXT_TopInfos_Hd                db 'Hd', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_HdSize:           db 'Hd/Size:', 0
+TXT_TopInfos_HdSize            db 'Hd/Size:', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_Label:            db 'Label:', 0
+TXT_TopInfos_Label             db 'Label:', 0
 ;----------------------------------|---------|------------------------------
 TXT_TopInfos_Type:             db 'Type:', 0
+TXT_TopInfos_Type              db 'Type:', 0
 ;----------------------------------|----|-----------------------------------
 TXT_TopInfos_Flags:            db 'Flags:', 0      ; <-- for Partition Setup
+TXT_TopInfos_Flags             db 'Flags:', 0      ; <-- for Partition Setup
 ; Will be added together to one line, maximum 76 chars
 TXT_TimedBootLine:             db 'Timed boot enabled. System will boot '''
+TXT_TimedBootLine              db 'Timed boot enabled. System will boot '''
 TXT_TimedBootEntryName         db 12 dup (0) ; Space for Default-Entry-Name
 TXT_TimedBootLine2:            db      ''' in ', 0
 TXT_TimedBootSeconds:          db ' seconds. ', 0
 TXT_TimedBootSecond:           db ' second. ', 0 ; if only one is left, ELiTE :]
+TXT_TimedBootLine2             db      ''' in ', 0
+TXT_TimedBootSeconds           db ' seconds. ', 0
+TXT_TimedBootSecond            db ' second. ', 0 ; if only one is left, ELiTE :]
 ; Maximum 76 chars
 ;----------------------------------|--------------------------------------------------------------------------|
 TXT_TimedBootDisabled:         db 'Timed boot disabled; no timeout will occur.', 0
 TXT_BootMenuHelpText1:         db 'Press [Esc] to toggle timed boot, [Enter] to accept current selection.', 0
 TXT_BootMenuHelpText2:         db 'Select another with the arrow keys, or press [TAB] to see BIOS POST message.', 0
+TXT_TimedBootDisabled          db 'Timed boot disabled; no timeout will occur.', 0
+TXT_BootMenuHelpText1          db 'Press [Esc] to toggle timed boot, [Enter] to accept current selection.', 0
+TXT_BootMenuHelpText2          db 'Select another with the arrow keys, or press [TAB] to see BIOS POST message.', 0
 ; Maximum 30 chars
 ;----------------------------------|----------------------------|
 …
 ; Dynamic Length (till 80 chars)
 TXT_BrokenPartitionTable:      db 13, 10, ' - Your system has at least one broken partition table entry or your harddrive'
+TXT_BrokenPartitionTable       db 13, 10, ' - Your system has at least one broken partition table entry or your harddrive'
                                db 13, 10, '   contains bad sectors. System halted.', 0
 TXT_TooManyPartitions:         db 13, 10, ' - Too many partitions found. AiR-BOOT is supporting up to 45.', 0
 TXT_NoBootAble:                db 13, 10, ' - No bootable partition defined. System halted.', 0
 TXT_BIOSchanged:               db 13, 10, ' - BIOS CHANGED, please check your system for any virus, just to be sure.'
+TXT_TooManyPartitions          db 13, 10, ' - Too many partitions found. AiR-BOOT is supporting up to 45.', 0
+TXT_NoBootAble                 db 13, 10, ' - No bootable partition defined. System halted.', 0
+TXT_BIOSchanged                db 13, 10, ' - BIOS CHANGED, please check your system for any virus, just to be sure.'
                                db 13, 10, '   Press any key to continue...', 0
 TXT_VirusFoundMain:            db 13, 10, ' - !ATTENTION! -> A V1RU5 WAS FOUND <- !ATTENTION!', 13, 10, 0
 TXT_VirusFound1ok:             db '    It got squashed, but the system may not reboot correctly. If this happens,', 13, 10
+TXT_VirusFoundMain             db 13, 10, ' - !ATTENTION! -> A V1RU5 WAS FOUND <- !ATTENTION!', 13, 10, 0
+TXT_VirusFound1ok              db '    It got squashed, but the system may not reboot correctly. If this happens,', 13, 10
                                db '    use your AiR-BOOT system disc.', 13, 10, 0
 TXT_VirusFound1damn:           db '    Unfortunately it destroyed AiR-BOOTs backup. You have to reboot using your', 13, 10
+TXT_VirusFound1damn            db '    Unfortunately it destroyed AiR-BOOTs backup. You have to reboot using your', 13, 10
                                db '    AiR-BOOT system disc.', 13, 10, 0
 TXT_VirusFound1any:            db '    For security, you should check your harddisc against remaining virus parts.', 13, 10, 0
 TXT_VirusFound2:               db '    It is located in the boot-record of the partition, you wanted to boot.', 13, 10
+TXT_VirusFound1any             db '    For security, you should check your harddisc against remaining virus parts.', 13, 10, 0
+TXT_VirusFound2                db '    It is located in the boot-record of the partition, you wanted to boot.', 13, 10
                                db '    Use a virus-checking program. It could be false alarm either.', 13, 10
                                db '    After removal, you have to reinit the detection variables, go into ', 13, 10
                                db '    ''PARTITION SETUP'' and switch VIBR-detection two times (off/on).', 13, 10
                                db '    If this was just a false alarm, leave it in off-state.', 13, 10, 0
 TXT_VirusFoundEnd:             db '    System halted. Please press RESET.', 0
 TXT_HowEnterSetup:             db 13, 10, ' - Press and hold Strg/Ctrl or Alt to enter AiR-BOOT Setup.', 0
+TXT_VirusFoundEnd              db '    System halted. Please press RESET.', 0
+TXT_HowEnterSetup              db 13, 10, ' - Press and hold Strg/Ctrl or Alt to enter AiR-BOOT Setup.', 0
 TXT_BootingNow1:               db 'Booting the system using ', 0
+TXT_BootingNow1                db 'Booting the system using ', 0
 ; DO NOT MODIFY HERE
 TXT_BootingNow2:               db '''', 0
 TXT_BootingNowPartName:        db 12 dup (0) ; Space for BootThisPart-Name
+TXT_BootingNow2                db '''', 0
+TXT_BootingNowPartName         db 12 dup (0) ; Space for BootThisPart-Name
 ; DO NOT MODIFY TILL HERE
 TXT_BootingNowPartition:       db ' partition', 0
 TXT_BootingNowKernel:          db ' kernel', 0
 TXT_BootingHide:               db '; hide active', 0
 TXT_BootingWait:               db '; please wait...', 13, 10, 13, 10, 0
+TXT_BootingNowPartition        db ' partition', 0
+TXT_BootingNowKernel           db ' kernel', 0
+TXT_BootingHide                db '; hide active', 0
+TXT_BootingWait                db '; please wait...', 13, 10, 13, 10, 0
 ; FIXED LENGTH - 11 chars each string
 ;----------------------------------|---------|------------------------------
 TXT_Floppy_NoName:             db 'No Name    '
 TXT_Floppy_Drive:              db 'FloppyDrive'
 TXT_Floppy_NoDisc:             db 'No Disc    '
+TXT_Floppy_NoName              db 'No Name    '
+TXT_Floppy_Drive               db 'FloppyDrive'
+TXT_Floppy_NoDisc              db 'No Disc    '
 ; Maximum 60 chars (should not be reached)

trunk/BOOTCODE/TEXT/FR/MENUS.ASM

-              r36
+              r37
 ; Setup Control Help - Max Length: 33
 ;----------------------------------|-------------------------------|--------
 TXT_SETUPHELP_Main:            db 24,32,25,32,26,32,27,' : Choisir Action', 0
+TXT_SETUPHELP_Main             db 24,32,25,32,26,32,27,' : Choisir Action', 0
                                db 'Enter   : Slectionner Action', 0
                                db 'F10 : Sauver & Sortir', 0
                                db 'Esc : Quitter', 0
 TXT_SETUPHELP_SubMenu:         db 24,32,25,32,26,32,27,' : Choisir Item', 0
+TXT_SETUPHELP_SubMenu          db 24,32,25,32,26,32,27,' : Choisir Item', 0
                                db 'PgUp/Dn : Changer Item', 0
                                db 'F1  : Afficher Aide', 0
                                db 'Esc : Retour au menu principal', 0
 TXT_SETUPHELP_PartSetup:       db 24,32,25,32,26,32,27,' : Choisir partition', 0
+TXT_SETUPHELP_PartSetup        db 24,32,25,32,26,32,27,' : Choisir partition', 0
                                db 'Enter   : Editer tiquette', 0
                                db 'F1  : Drapeaux (lettre=bascule)', 0
 …
                                   ;1234567890123456789012
 ;----------------------------------|--------------------|-------------------
 TXT_SETUPHELP_PartitionSetup:  db 'Mettre vos partitions', 0
+TXT_SETUPHELP_PartitionSetup   db 'Mettre vos partitions', 0
                                db 'amorables, changer', 0
                                db 'les noms, dfinir', 0
                                db 'cach et plus encore.', 0
                                db 0
 TXT_SETUPHELP_BasicOptions:    db 'Ces options sont pour', 0
+TXT_SETUPHELP_BasicOptions     db 'Ces options sont pour', 0
                                db 'les usagers dbutants.', 0
                                db 0
 TXT_SETUPHELP_AdvOptions:      db 'Pour usagers avancs.', 0
+TXT_SETUPHELP_AdvOptions       db 'Pour usagers avancs.', 0
                                db 'Si vous ignorez leurs', 0
                                db 'fonctions, ne les', 0
                                db 'modifiez pas.', 0
                                db 0
 TXT_SETUPHELP_ExtOptions:      db 'Options tendues pour', 0
+TXT_SETUPHELP_ExtOptions       db 'Options tendues pour', 0
                                db 'S.E. spcifiques.', 0
                                db 0
 TXT_SETUPHELP_DefMasterPwd:    db 'Dfinir mot de passe', 0
+TXT_SETUPHELP_DefMasterPwd     db 'Dfinir mot de passe', 0
                                db 'pour accs au', 0
                                db 'paramtrage et au', 0
                                db 'systme.', 0
                                db 0
 TXT_SETUPHELP_DefBootPwd:      db 'Dfinir mot de passe', 0
+TXT_SETUPHELP_DefBootPwd       db 'Dfinir mot de passe', 0
                                db 'pour accs au systme.', 0
                                db 0
 TXT_SETUPHELP_SaveAndExit:     db 'Continuera amorage-', 0
+TXT_SETUPHELP_SaveAndExit      db 'Continuera amorage-', 0
                                db 'traite et sauve les', 0
                                db 'options courantes.', 0
                                db 0
 TXT_SETUPHELP_JustExit:        db 'Continuera, mais', 0
+TXT_SETUPHELP_JustExit         db 'Continuera, mais', 0
                                db 'annulera tout', 0
                                db 'changement aux', 0
 …
                                db 0
 TXT_SETUPHELP_HideSetup:       db 'Choisir l''tat des', 0
+TXT_SETUPHELP_HideSetup        db 'Choisir l''tat des', 0
                                db 'partitions lorsque', 0
                                db 'la partition prsen-', 0

trunk/BOOTCODE/TEXT/FR/OTHER.ASM

-              r36
+              r37
 ; Maximum 2/10/11/6 chars
 ;----------------------------------||---------------------------------------
 TXT_TopInfos_No:               db 'No', 0
 TXT_TopInfos_Hd:               db 'Dd', 0
+TXT_TopInfos_No                db 'No', 0
+TXT_TopInfos_Hd                db 'Dd', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_HdSize:           db 'Dd/Cap.:', 0
+TXT_TopInfos_HdSize            db 'Dd/Cap.:', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_Label:            db 'tiq.:', 0
+TXT_TopInfos_Label             db 'tiq.:', 0
 ;----------------------------------|---------|------------------------------
 TXT_TopInfos_Type:             db 'Type:', 0
+TXT_TopInfos_Type              db 'Type:', 0
 ;----------------------------------|----|-----------------------------------
 TXT_TopInfos_Flags:            db 'Drap.:', 0      ; <-- for Partition Setup
+TXT_TopInfos_Flags             db 'Drap.:', 0      ; <-- for Partition Setup
 ; Will be added together to one line, maximum 76 chars
 TXT_TimedBootLine:             db 'Amorage temporis actif. Dmarrage de '''
+TXT_TimedBootLine              db 'Amorage temporis actif. Dmarrage de '''
 TXT_TimedBootEntryName         db 12 dup (0) ; Space for Default-Entry-Name
 TXT_TimedBootLine2:            db      ''' dans ', 0
 TXT_TimedBootSeconds:          db ' secondes. ', 0
 TXT_TimedBootSecond:           db ' seconde. ', 0 ; if only one is left, ELiTE :]
+TXT_TimedBootLine2             db      ''' dans ', 0
+TXT_TimedBootSeconds           db ' secondes. ', 0
+TXT_TimedBootSecond            db ' seconde. ', 0 ; if only one is left, ELiTE :]
 ; Maximum 76 chars
 ;----------------------------------|--------------------------------------------------------------------------|
 TXT_TimedBootDisabled:         db 'Amorage temporis dsactiv; aucune temporisation n''arrivera.', 0
 TXT_BootMenuHelpText1:         db '[Esc] bascule l''amorage temporis, [Enter] accepte la slection courante.', 0
 TXT_BootMenuHelpText2:         db 'Flches pour choisir une autre, ou [TAB] pour voir les messages POST BIOS.', 0
+TXT_TimedBootDisabled          db 'Amorage temporis dsactiv; aucune temporisation n''arrivera.', 0
+TXT_BootMenuHelpText1          db '[Esc] bascule l''amorage temporis, [Enter] accepte la slection courante.', 0
+TXT_BootMenuHelpText2          db 'Flches pour choisir une autre, ou [TAB] pour voir les messages POST BIOS.', 0
 ; Maximum 30 chars
 ;----------------------------------|----------------------------|
 …
 ; Dynamic Length (till 80 chars)
 TXT_BrokenPartitionTable:      db 13, 10, ' - Votre systme a au moins d''une entre mauvaise de table de partition, ou'
+TXT_BrokenPartitionTable       db 13, 10, ' - Votre systme a au moins d''une entre mauvaise de table de partition, ou'
                                db 13, 10, '   la disque dr a des casse secteurs. Systme arrt.', 0
 TXT_TooManyPartitions:         db 13, 10, ' - Trop de partitions trouves. AiR-BOOT supporte un maximum de 45.', 0
 TXT_NoBootAble:                db 13, 10, ' - Aucune partition amorable dfinie. Systme arrt.', 0
 TXT_BIOSchanged:               db 13, 10, ' - BIOS CHANG! Veuillez vrifier votre systme contre un virus.'
+TXT_TooManyPartitions          db 13, 10, ' - Trop de partitions trouves. AiR-BOOT supporte un maximum de 45.', 0
+TXT_NoBootAble                 db 13, 10, ' - Aucune partition amorable dfinie. Systme arrt.', 0
+TXT_BIOSchanged                db 13, 10, ' - BIOS CHANG! Veuillez vrifier votre systme contre un virus.'
                                db 13, 10, '   Appuyez sur une touche pour continuer...', 0
 TXT_VirusFoundMain:            db 13, 10, ' - !ATTENTION! -> UN VIRUS A T TROUV <- !ATTENTION!', 13, 10, 0
 TXT_VirusFound1ok:             db '    Il est radiqu, mais le systme peut ne pas redmarrer correctement.', 13, 10
+TXT_VirusFoundMain             db 13, 10, ' - !ATTENTION! -> UN VIRUS A T TROUV <- !ATTENTION!', 13, 10, 0
+TXT_VirusFound1ok              db '    Il est radiqu, mais le systme peut ne pas redmarrer correctement.', 13, 10
                                db '    Si c''est le cas, utiliser votre disquette systme AiR-BOOT.', 13, 10, 0
 TXT_VirusFound1damn:           db '    Malheureusement, il a dtruit la copie de sauvgarde de AiR-BOOT. Vous', 13, 10
+TXT_VirusFound1damn            db '    Malheureusement, il a dtruit la copie de sauvgarde de AiR-BOOT. Vous', 13, 10
                                db '    devez redmarrer en utilisant votre disquette systme AiR-BOOT.', 13, 10, 0
 TXT_VirusFound1any:            db '    Pour plus de sret, vrifiez votre disque contre des rsidus du virus.', 13, 10, 0
 TXT_VirusFound2:               db '    Il est localis dans le secteur d amorage de la partition dsire.', 13, 10
+TXT_VirusFound1any             db '    Pour plus de sret, vrifiez votre disque contre des rsidus du virus.', 13, 10, 0
+TXT_VirusFound2                db '    Il est localis dans le secteur d amorage de la partition dsire.', 13, 10
                                db '    Utilisez un logiciel antivirus. Ce peut tre aussi une fausse alerte.', 13, 10
                                db '    Aprs radiquation, rinitialiser les variables de dtection. Allez dans', 13, 10
                                db '    ''PARAMTRAGE PARTITION'' et basculez Dtection-VIBR deux fois (off/on).', 13, 10
                                db '    Si c''tait une fausse alerte, laissez-le dsactiv.', 13, 10, 0
 TXT_VirusFoundEnd:             db '    Systme arrt. Veuillez appuyez sur RESET.', 0
 TXT_HowEnterSetup:             db 13, 10, ' - Appuyez et tenez Strg/Ctrl ou Alt pour configurer AiR-BOOT.', 0
+TXT_VirusFoundEnd              db '    Systme arrt. Veuillez appuyez sur RESET.', 0
+TXT_HowEnterSetup              db 13, 10, ' - Appuyez et tenez Strg/Ctrl ou Alt pour configurer AiR-BOOT.', 0
 TXT_BootingNow1:               db 'Amorage du systme avec ', 0
+TXT_BootingNow1                db 'Amorage du systme avec ', 0
 ; DO NOT MODIFY HERE
 TXT_BootingNow2:               db '''', 0
 TXT_BootingNowPartName:        db 12 dup (0) ; Space for BootThisPart-Name
+TXT_BootingNow2                db '''', 0
+TXT_BootingNowPartName         db 12 dup (0) ; Space for BootThisPart-Name
 ; DO NOT MODIFY TILL HERE
 TXT_BootingNowPartition:       db '', 0
 TXT_BootingNowKernel:          db '', 0
 TXT_BootingHide:               db '; cach actif', 0
 TXT_BootingWait:               db '; veuillez patienter...', 13, 10, 13, 10, 0
+TXT_BootingNowPartition        db '''', 0
+TXT_BootingNowKernel           db '''', 0
+TXT_BootingHide                db '; cach actif', 0
+TXT_BootingWait                db '; veuillez patienter...', 13, 10, 13, 10, 0
 ; FIXED LENGTH - 11 chars each string
 ;----------------------------------|---------|------------------------------
 TXT_Floppy_NoName:             db 'Sans nom   '
 TXT_Floppy_Drive:              db 'Disquette  '
 TXT_Floppy_NoDisc:             db 'Sans Disq. '
+TXT_Floppy_NoName              db 'Sans nom   '
+TXT_Floppy_Drive               db 'Disquette  '
+TXT_Floppy_NoDisc              db 'Sans Disq. '
 ; Maximum 60 chars (should not be reached)

trunk/BOOTCODE/TEXT/IT/MENUS.ASM

-              r36
+              r37
 ; Setup Control Help - Max Length: 33
 ;----------------------------------|-------------------------------|--------
 TXT_SETUPHELP_Main:            db 24,32,25,32,26,32,27,' : Scelta Azione', 0
+TXT_SETUPHELP_Main             db 24,32,25,32,26,32,27,' : Scelta Azione', 0
                                db               'Enter   : Conferma Azione', 0
                                db               'F10 : Salva Config. & Esci', 0
                                db               'Esc : Abbandona Config.', 0
 TXT_SETUPHELP_SubMenu:         db 24,32,25,32,26,32,27,' : Scelta Opzione', 0
+TXT_SETUPHELP_SubMenu          db 24,32,25,32,26,32,27,' : Scelta Opzione', 0
                                db               'PgUp/Dn : Cambio Opzione', 0
                                db               'F1  : Mostra Aiuto Opzione', 0
                                db               'Esc : Ritorna al Menu Principale', 0
 TXT_SETUPHELP_PartSetup:       db 24,32,25,32,26,32,27,' : Scelta Partizione', 0
+TXT_SETUPHELP_PartSetup        db 24,32,25,32,26,32,27,' : Scelta Partizione', 0
                                db               'Enter   : Modifica Etichetta', 0
                                db               'F1  : Opz. (premi tasto x camb.)', 0
 …
                                   ;1234567890123456789012
 ;----------------------------------|--------------------|-------------------
 TXT_SETUPHELP_PartitionSetup:  db 'Rende le partizioni ', 0
+TXT_SETUPHELP_PartitionSetup   db 'Rende le partizioni ', 0
                                db 'avviabili, cambia il', 0
                                db 'loro nome, le nasconde', 0
                                db 'etc.', 0
                                db 0
 TXT_SETUPHELP_BasicOptions:    db 'Opzioni disponibili', 0
+TXT_SETUPHELP_BasicOptions     db 'Opzioni disponibili', 0
                                db 'per utenti anche non', 0
                                db 'esperti', 0
                                db 0
 TXT_SETUPHELP_AdvOptions:      db 'Opzioni solo per', 0
+TXT_SETUPHELP_AdvOptions       db 'Opzioni solo per', 0
                                db 'utenti esperti. Se si', 0
                                db 'ignora come agiscono', 0
                                db 'non utilizzarle', 0
                                db 0
 TXT_SETUPHELP_ExtOptions:      db 'Opzioni speciali per', 0
+TXT_SETUPHELP_ExtOptions       db 'Opzioni speciali per', 0
                                db 'specifici sistemi', 0
                                db 'operativi', 0
                                db 0
 TXT_SETUPHELP_DefMasterPwd:    db 'Definisce la password', 0
+TXT_SETUPHELP_DefMasterPwd     db 'Definisce la password', 0
                                db 'per accedere alla', 0
                                db 'configurazione del', 0
                                db 'sistema', 0
                                db 0
 TXT_SETUPHELP_DefBootPwd:      db 'Definisce la password', 0
+TXT_SETUPHELP_DefBootPwd       db 'Definisce la password', 0
                                db 'per accedere al', 0
                                db 'sistema', 0
                                db 0
 TXT_SETUPHELP_SaveAndExit:     db 'Continua l''avvio e', 0
+TXT_SETUPHELP_SaveAndExit      db 'Continua l''avvio e', 0
                                db 'salva le impostazioni', 0
                                db 'correnti', 0
                                db 0
 TXT_SETUPHELP_JustExit:        db 'Continua l''avvio, ', 0
+TXT_SETUPHELP_JustExit         db 'Continua l''avvio, ', 0
                                db 'ma non salva', 0
                                db 'le impostazioni', 0
 …
                                db 0
 TXT_SETUPHELP_HideSetup:       db 'Definisce lo stato', 0
+TXT_SETUPHELP_HideSetup        db 'Definisce lo stato', 0
                                db 'delle altre partizioni', 0
                                db 'quando la partizione', 0
 …
 ;                               db 'root di Linux', 0
 ;                               db 0
 ;TXT_SETUPHELP_DefLinuxCmd:     db 'Definisce la linea di', 0
+;TXT_SETUPHELP_DefLinuxCmd      db 'Definisce la linea di', 0
 ;                               db 'comando per Linux, se', 0
 ;                               db 'disponibile', 0

trunk/BOOTCODE/TEXT/IT/OTHER.ASM

-              r36
+              r37
 ; Maximum 2/10/11/6 chars
 ;----------------------------------||---------------------------------------
 TXT_TopInfos_No:               db 'Nr', 0
 TXT_TopInfos_Hd:               db 'Hd', 0
+TXT_TopInfos_No                db 'Nr', 0
+TXT_TopInfos_Hd                db 'Hd', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_HdSize:           db 'Hd/Size:', 0
+TXT_TopInfos_HdSize            db 'Hd/Size:', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_Label:            db 'Etichetta:', 0
+TXT_TopInfos_Label             db 'Etichetta:', 0
 ;----------------------------------|---------|------------------------------
 TXT_TopInfos_Type:             db 'Tipo:', 0
+TXT_TopInfos_Type              db 'Tipo:', 0
 ;----------------------------------|----|-----------------------------------
 TXT_TopInfos_Flags:            db 'Flags:', 0      ; <-- for Partition Setup
+TXT_TopInfos_Flags             db 'Flags:', 0      ; <-- for Partition Setup
 ; Will be added together to one line, maximum 76 chars
 TXT_TimedBootLine:             db 'Timer di Avvio Attivato. Avvio con '''
+TXT_TimedBootLine              db 'Timer di Avvio Attivato. Avvio con '''
 TXT_TimedBootEntryName         db 12 dup (0) ; Space for Default-Partition-Name
 TXT_TimedBootLine2:            db      ''' tra ', 0
 TXT_TimedBootSeconds:          db ' secondi. ', 0
 TXT_TimedBootSecond:           db ' secondo. ', 0 ; if only one is left, ELiTE :]
+TXT_TimedBootLine2             db      ''' tra ', 0
+TXT_TimedBootSeconds           db ' secondi. ', 0
+TXT_TimedBootSecond            db ' secondo. ', 0 ; if only one is left, ELiTE :]
 ; Maximum 76 chars
 ;----------------------------------|--------------------------------------------------------------------------|
 TXT_TimedBootDisabled:         db 'Avvio Temporizzato Disabilitato. Pausa.', 0
 TXT_BootMenuHelpText1:         db 'Premere [Esc] per resettare il timer, [Invio] per accettare la selezione.', 0
 TXT_BootMenuHelpText2:         db 'Selezionare con i tasti freccia, oppure [TAB] per i messaggi POST del BIOS.', 0
+TXT_TimedBootDisabled          db 'Avvio Temporizzato Disabilitato. Pausa.', 0
+TXT_BootMenuHelpText1          db 'Premere [Esc] per resettare il timer, [Invio] per accettare la selezione.', 0
+TXT_BootMenuHelpText2          db 'Selezionare con i tasti freccia, oppure [TAB] per i messaggi POST del BIOS.', 0
 ; Maximum 30 chars
 ;----------------------------------|----------------------------|
 …
 ; Dynamic Length (till 80 chars)
 TXT_BrokenPartitionTable:      db 13, 10, ' - Il sistema ha almeno una partizione corrotta nel tuo hard-disk contiene'
+TXT_BrokenPartitionTable       db 13, 10, ' - Il sistema ha almeno una partizione corrotta nel tuo hard-disk contiene'
                                db 13, 10, '   settori danneggiati. Sistema bloccato.', 0
 TXT_TooManyPartitions:         db 13, 10, ' - Trovate troppe partizioni. AiR-BOOT ne supporta fino a 45.', 0
 TXT_NoBootAble:                db 13, 10, ' - Nessuna partizione avviabile definita. Sistema bloccato.', 0
 TXT_BIOSchanged:               db 13, 10, ' - BIOS MODIFICATO! Controllare il sistema contro eventuali virus.'
+TXT_TooManyPartitions          db 13, 10, ' - Trovate troppe partizioni. AiR-BOOT ne supporta fino a 45.', 0
+TXT_NoBootAble                 db 13, 10, ' - Nessuna partizione avviabile definita. Sistema bloccato.', 0
+TXT_BIOSchanged                db 13, 10, ' - BIOS MODIFICATO! Controllare il sistema contro eventuali virus.'
                                db 13, 10, '   Premere un tasto per continuare...', 0
 TXT_VirusFoundMain:            db 13, 10, ' - !ATTENZIONE! -> RILEVATO UN VIRUS <- !ATTENZIONE!', 13, 10, 0
 TXT_VirusFound1ok:             db '    Ora sara'' sovrascritto, ma il sistema potrebbe non riavviarsi', 13, 10
+TXT_VirusFoundMain             db 13, 10, ' - !ATTENZIONE! -> RILEVATO UN VIRUS <- !ATTENZIONE!', 13, 10, 0
+TXT_VirusFound1ok              db '    Ora sara'' sovrascritto, ma il sistema potrebbe non riavviarsi', 13, 10
                                db '    correttamente. In tal caso utilizzare il dischetto di AiR-BOOT.', 13, 10, 0
 TXT_VirusFound1damn:           db '    Purtroppo il backup di AiR-BOOT non funziona. Riavviare con il', 13, 10
+TXT_VirusFound1damn            db '    Purtroppo il backup di AiR-BOOT non funziona. Riavviare con il', 13, 10
                                db '    dischetto di AiR-BOOT.', 13, 10, 0
 TXT_VirusFound1any:            db '    Per sicurezza, controllare i dischi in caso di altre tracce virali. ', 13, 10, 0
 TXT_VirusFound2:               db '    Il virus risiede nel boot-record della partizione in avvio.', 13, 10
+TXT_VirusFound1any             db '    Per sicurezza, controllare i dischi in caso di altre tracce virali. ', 13, 10, 0
+TXT_VirusFound2                db '    Il virus risiede nel boot-record della partizione in avvio.', 13, 10
                                db '    Usare un programma antivirus. Potrebbe anche essere un falso allarme.', 13, 10
                                db '    Dopo la rimozione occorre reinizializzare il rilevamento virus. Andare', 13, 10
                                db '    in ''CONFIGURAZIONE PARTIZIONI'' e modificare due volte Rilevamento VIBR', 13, 10
                                db '     (off/on). Se si tratta di falso allarme, lasciarlo disinserito (off).', 13, 10, 0
 TXT_VirusFoundEnd:             db '    Sistema bloccato. Premere RESET.', 0
 TXT_HowEnterSetup:             db 13, 10, ' - Premere e tenere premuto Ctrl o Alt per configurare AiR-BOOT.', 0
+TXT_VirusFoundEnd              db '    Sistema bloccato. Premere RESET.', 0
+TXT_HowEnterSetup              db 13, 10, ' - Premere e tenere premuto Ctrl o Alt per configurare AiR-BOOT.', 0
 TXT_BootingNow1:               db 'Avvio del sistema con ', 0
+TXT_BootingNow1                db 'Avvio del sistema con ', 0
 ; DO NOT MODIFY HERE
 TXT_BootingNow2:               db ''''
 TXT_BootingNowPartName:        db 12 dup (0) ; Space for BootThisPart-Name
+TXT_BootingNow2                db ''''
+TXT_BootingNowPartName         db 12 dup (0) ; Space for BootThisPart-Name
 ; DO NOT MODIFY TILL HERE
 TXT_BootingNowPartition:       db '', 0
 TXT_BootingNowKernel:          db ' kernel', 0
 TXT_BootingHide:               db '; part. attiva nascosta', 0
 TXT_BootingWait:               db '; attendere, prego...', 13, 10, 13, 10, 0
+TXT_BootingNowPartition        db '''', 0
+TXT_BootingNowKernel           db ' kernel', 0
+TXT_BootingHide                db '; part. attiva nascosta', 0
+TXT_BootingWait                db '; attendere, prego...', 13, 10, 13, 10, 0
 ; FIXED LENGTH - 11 chars each string
 ;----------------------------------|---------|------------------------------
 TXT_Floppy_NoName:             db 'Nessun Nome'
 TXT_Floppy_Drive:              db 'FloppyDrive'
 TXT_Floppy_NoDisc:             db 'No Disco   '
+TXT_Floppy_NoName              db 'Nessun Nome'
+TXT_Floppy_Drive               db 'FloppyDrive'
+TXT_Floppy_NoDisc              db 'No Disco   '
 ; Maximum 60 chars (should not be reached)

trunk/BOOTCODE/TEXT/NL/MBR.ASM

r30	r37
21	21	;------------------------------------------------------------------------------
22	22
23		TXT_LanguageID equ 'D'
	23	TXT_LanguageID equ 'N'
24	24
25	25	; Those strings are saved within MBR.

trunk/BOOTCODE/TEXT/NL/MENUS.ASM

-              r36
+              r37
 ; Setup Control Help - Max Length: 33
 ;----------------------------------|-------------------------------|--------
 TXT_SETUPHELP_Main:            db 24,32,25,32,26,32,27,' : Maak uw keuze', 0
+TXT_SETUPHELP_Main             db 24,32,25,32,26,32,27,' : Maak uw keuze', 0
                                db 'Enter   : Keuze bevestigen', 0
                                db 'F10 : Opslaan en afsluiten', 0
                                db 'Esc : Setup afsluiten', 0
 TXT_SETUPHELP_SubMenu:         db 24,32,25,32,26,32,27,' : Item kiezen', 0
+TXT_SETUPHELP_SubMenu          db 24,32,25,32,26,32,27,' : Item kiezen', 0
                                db 'PgUp/Dn : Onderdelen van het item', 0
                                db 'F1  : Hulp voor dit item', 0
                                db 'Esc : Terug naar het hoofdmenu', 0
 TXT_SETUPHELP_PartSetup:       db 24,32,25,32,26,32,27,' : Partitie kiezen', 0
+TXT_SETUPHELP_PartSetup        db 24,32,25,32,26,32,27,' : Partitie kiezen', 0
                                db 'Enter   : Label bewerken', 0
                                db 'F1  : Uitleg bij de toetsen', 0
 …
                                   ;1234567890123456789012
 ;----------------------------------|--------------------|--------------------
 TXT_SETUPHELP_PartitionSetup:  db 'Partities opstartbaar', 0
+TXT_SETUPHELP_PartitionSetup   db 'Partities opstartbaar', 0
                                db 'maken, label wijzigen,', 0
                                db 'partities verbergen of', 0
 …
                                db 'en nog veel meer.', 0
                                db 0
 TXT_SETUPHELP_BasicOptions:    db 'Opties voor minder', 0
+TXT_SETUPHELP_BasicOptions     db 'Opties voor minder', 0
                                db 'ervaren gebruikers.', 0
                                db 0
 TXT_SETUPHELP_AdvOptions:      db 'Opties voor ervaren', 0
+TXT_SETUPHELP_AdvOptions       db 'Opties voor ervaren', 0
                                db 'gebruikers. Stel hier', 0
                                db 'niets in tenzij u goed', 0
                                db 'weet waarover het gaat.', 0
                                db 0
 TXT_SETUPHELP_ExtOptions:      db 'Opties enkel bedoeld', 0
+TXT_SETUPHELP_ExtOptions       db 'Opties enkel bedoeld', 0
                                db 'voor een bepaald sy-', 0
                                db 'steem.', 0
                                db 0
 TXT_SETUPHELP_DefMasterPwd:    db 'Wachtwoord instellen', 0
+TXT_SETUPHELP_DefMasterPwd     db 'Wachtwoord instellen', 0
                                db 'voor de setup en voor', 0
                                db 'het systeem.', 0
                                db 0
 TXT_SETUPHELP_DefBootPwd:      db 'Wachtwoord instellen', 0
+TXT_SETUPHELP_DefBootPwd       db 'Wachtwoord instellen', 0
                                db 'voor de toegang', 0
                                db 'tot het systeeem.', 0
                                db 0
 TXT_SETUPHELP_SaveAndExit:     db 'Het opstarten wordt nu', 0
+TXT_SETUPHELP_SaveAndExit      db 'Het opstarten wordt nu', 0
                                db 'verder gezet terwijl', 0
                                db 'de nieuwe instellingen' , 0
                                db 'bewaard worden.', 0
                                db 0
 TXT_SETUPHELP_JustExit:        db 'Het opstarten wordt nu', 0
+TXT_SETUPHELP_JustExit         db 'Het opstarten wordt nu', 0
                                db 'verder gezet terwijl', 0
                                db 'de nieuwe instellingen' , 0
 …
                                db 0
 TXT_SETUPHELP_HideSetup:       db 'Bepaal hoe de andere', 0
+TXT_SETUPHELP_HideSetup        db 'Bepaal hoe de andere', 0
                                db 'partities moeten wor-', 0
                                db 'den getoond wanneer', 0

trunk/BOOTCODE/TEXT/NL/OTHER.ASM

-              r36
+              r37
 ; Maximum 2/10/11/6 chars
 ;----------------------------------||---------------------------------------
 TXT_TopInfos_No:               db 'Nr', 0
 TXT_TopInfos_Hd:               db 'Hd', 0
+TXT_TopInfos_No                db 'Nr', 0
+TXT_TopInfos_Hd                db 'Hd', 0
 ;----------------------------------|----------|-----------------------------
 TXT_TopInfos_HdSize:           db 'Hd/Grootte:', 0
+TXT_TopInfos_HdSize            db 'Hd/Grootte:', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_Label:            db 'Benamimg:', 0
+TXT_TopInfos_Label             db 'Benamimg:', 0
 ;----------------------------------|---------|------------------------------
 TXT_TopInfos_Type:             db 'Type:', 0
+TXT_TopInfos_Type              db 'Type:', 0
 ;----------------------------------|----|-----------------------------------
 TXT_TopInfos_Flags:            db 'Flags:', 0      ; <-- for Partition Setup
+TXT_TopInfos_Flags             db 'Flags:', 0      ; <-- for Partition Setup
 ; Will be added together to one line, maximum 76 chars
 TXT_TimedBootLine:             db 'Tijd over: er wordt opgestart van '''
+TXT_TimedBootLine              db 'Tijd over: er wordt opgestart van '''
 TXT_TimedBootEntryName         db 12 dup (0) ; Space for Default-Entry-Name
 TXT_TimedBootLine2:            db      ''' de partitie na ', 0
 TXT_TimedBootSeconds:          db ' seconden. ', 0
 TXT_TimedBootSecond:           db ' second. ', 0 ; if only one is left, ELiTE :]
+TXT_TimedBootLine2             db      ''' de partitie na ', 0
+TXT_TimedBootSeconds           db ' seconden. ', 0
+TXT_TimedBootSecond            db ' second. ', 0 ; if only one is left, ELiTE :]
 ; Maximum 76 chars
 ;----------------------------------|--------------------------------------------------------------------------|
 TXT_TimedBootDisabled:         db 'Het opstarten werd onderbroken. Tik op [Esc] om verder te gaan.', 0
 TXT_BootMenuHelpText1:         db '[Esc] om te onderbreken/vervolgen.[Enter] om de keuze te starten.', 0
 TXT_BootMenuHelpText2:         db 'Andere keuze met de pijltjestoetsen, tik [TAB] om de bios uitvoer te zien.', 0
+TXT_TimedBootDisabled          db 'Het opstarten werd onderbroken. Tik op [Esc] om verder te gaan.', 0
+TXT_BootMenuHelpText1          db '[Esc] om te onderbreken/vervolgen.[Enter] om de keuze te starten.', 0
+TXT_BootMenuHelpText2          db 'Andere keuze met de pijltjestoetsen, tik [TAB] om de bios uitvoer te zien.', 0
 ; Maximum 30 chars
 ;----------------------------------|----------------------------|
 …
 ; Dynamic Length (till 80 chars)
 TXT_BrokenPartitionTable:      db 13, 10, ' - U hard disk bevat minstens 1 beschadigde paritietabel element of u hard disk'
+TXT_BrokenPartitionTable       db 13, 10, ' - U hard disk bevat minstens 1 beschadigde paritietabel element of u hard disk'
                                db 13, 10, '   bevat bad sector. Systeem is gestopt.', 0
 TXT_TooManyPartitions:         db 13, 10, ' - Er zijn teveel partities aanwezig. Het maximum is 45.', 0
 TXT_NoBootAble:                db 13, 10, ' - Geen opstartpartitie beschikbaar. Systeem is gestopt.', 0
 TXT_BIOSchanged:               db 13, 10, ' - Het BIOS werd gewijzigd! Controleer eerst op virussen.'
+TXT_TooManyPartitions          db 13, 10, ' - Er zijn teveel partities aanwezig. Het maximum is 45.', 0
+TXT_NoBootAble                 db 13, 10, ' - Geen opstartpartitie beschikbaar. Systeem is gestopt.', 0
+TXT_BIOSchanged                db 13, 10, ' - Het BIOS werd gewijzigd! Controleer eerst op virussen.'
                                db 13, 10, '   Tik op een toets om verder te gaan...', 0
 ;----------------------------------|--------------------------------------------------------------------------|
 TXT_VirusFoundMain:            db 13, 10, ' - !OPGELET! -> Virusje gevonden! <- !OPGELET!', 13, 10, 0
 TXT_VirusFound1ok:             db '    verwijderd, maar er kan misschien niet meer juist worden opgestart. Is,', 13, 10
+TXT_VirusFoundMain             db 13, 10, ' - !OPGELET! -> Virusje gevonden! <- !OPGELET!', 13, 10, 0
+TXT_VirusFound1ok              db '    verwijderd, maar er kan misschien niet meer juist worden opgestart. Is,', 13, 10
                                db '    dit het geval, herstart vanaf de AiR-BOOT systeem diskette.', 13, 10, 0
 TXT_VirusFound1damn:           db '    Ook uw AiR-BOOT backup werd vernietigd. U moet dus terug opstarten', 13, 10
+TXT_VirusFound1damn            db '    Ook uw AiR-BOOT backup werd vernietigd. U moet dus terug opstarten', 13, 10
                                db '    vanaf uw AiR-BOOT systeem diskette.', 13, 10, 0
 TXT_VirusFound1any:            db '    U doet er best aan eerst te controleren virus achterblijvertjes.', 13, 10, 0
 TXT_VirusFound2:               db '    Deze bevinden zich in het MBR van de partitie die u wou opstarten.', 13, 10
+TXT_VirusFound1any             db '    U doet er best aan eerst te controleren virus achterblijvertjes.', 13, 10, 0
+TXT_VirusFound2                db '    Deze bevinden zich in het MBR van de partitie die u wou opstarten.', 13, 10
                                db '    Gebruik hiervoor een anti-virusprogramma. Mogelijks slechts alarm.', 13, 10
                                db '    Na de vewijdering moet u een en ander opnieuw instellen. Ga naar', 13, 10
                                db '    ''Partities instellen'' en schakel VIBR-detectie tweemaal (aan/uit).', 13, 10
                                db '    Indien slechts vals alarm, "uit" laten staan.', 13, 10, 0
 TXT_VirusFoundEnd:             db '    Afgebroken! Tik op de RESET knop.', 0
 TXT_HowEnterSetup:             db 13, 10, ' - Shift/Ctrl of Alt ingeduwd houden voor de AiR-BOOT Setup.', 0
+TXT_VirusFoundEnd              db '    Afgebroken! Tik op de RESET knop.', 0
+TXT_HowEnterSetup              db 13, 10, ' - Shift/Ctrl of Alt ingeduwd houden voor de AiR-BOOT Setup.', 0
 TXT_BootingNow1:               db 'Er wordt nu opgestart van de ', 0
+TXT_BootingNow1                db 'Er wordt nu opgestart van de ', 0
 ; DO NOT MODIFY HERE
 TXT_BootingNow2:               db '''', 0
 TXT_BootingNowPartName:        db 12 dup (0) ; Space for BootThisPart-Name
+TXT_BootingNow2                db '''', 0
+TXT_BootingNowPartName         db 12 dup (0) ; Space for BootThisPart-Name
 ; DO NOT MODIFY TILL HERE
 TXT_BootingNowPartition:       db ' partitie', 0
 TXT_BootingNowKernel:          db ' kernel', 0
 TXT_BootingHide:               db '; actieve verbergen', 0
 TXT_BootingWait:               db '; Wachten graag...', 13, 10, 13, 10, 0
+TXT_BootingNowPartition        db ' partitie', 0
+TXT_BootingNowKernel           db ' kernel', 0
+TXT_BootingHide                db '; actieve verbergen', 0
+TXT_BootingWait                db '; Wachten graag...', 13, 10, 13, 10, 0
 ; FIXED LENGTH - 11 chars each string
 ;----------------------------------|---------|------------------------------
 TXT_Floppy_NoName:             db 'Geen label '
 TXT_Floppy_Drive:              db 'Station A: '
 TXT_Floppy_NoDisc:             db 'Geen media '
+TXT_Floppy_NoName              db 'Geen label '
+TXT_Floppy_Drive               db 'Station A: '
+TXT_Floppy_NoDisc              db 'Geen media '
 ; Maximum 60 chars (should not be reached)

trunk/BOOTCODE/TEXT/RU/MENUS.ASM

-              r36
+              r37
 ; Setup Control Help - Max Length: 33
 ;----------------------------------|-------------------------------|--------
 TXT_SETUPHELP_Main:            db 24,32,25,32,26,32,27,' : ë¡®à €¥©áâ¢šï', 0
+TXT_SETUPHELP_Main             db 24,32,25,32,26,32,27,' : ë¡®à €¥©áâ¢šï', 0
                                db               'Enter   : ®€â¢¥àŠ€¥š¥', 0
                                db               'F10 : ®åà šâì š ¢ë©âš', 0
                                db               'Esc : ë©âš', 0
 TXT_SETUPHELP_SubMenu:         db 24,32,25,32,26,32,27,' : ë¡®à ¯ãªâ', 0
+TXT_SETUPHELP_SubMenu          db 24,32,25,32,26,32,27,' : ë¡®à ¯ãªâ', 0
                                db               'PgUp/Dn : ¬¥  ¯ãªâ ', 0
                                db               'F1  : ®ª § âì ¯®¬®éì', 0
                                db               'Esc : « ¢®¥ ¬¥î', 0
 TXT_SETUPHELP_PartSetup:       db 24,32,25,32,26,32,27,' : ë¡®à à §€¥« ', 0
+TXT_SETUPHELP_PartSetup        db 24,32,25,32,26,32,27,' : ë¡®à à §€¥« ', 0
                                db               'Enter   : ¬¥  ¬¥âªš', 0
                                db               'F1  : « £š (ª«îçš)', 0
 …
 ;----------------------------------|--------------------|-------------------
 TXT_SETUPHELP_PartitionSetup:  db '®Š¥â¥ § € âì à §€¥«ë', 0
+TXT_SETUPHELP_PartitionSetup   db '®Š¥â¥ § € âì à §€¥«ë', 0
                                db '§ £àãŠ ¥¬ë¬š, á¬¥šâì', 0
                                db 'šå  §¢ š¥, á¯àïâ âì', 0
                                db 'š ¬®£®¥ €àã£®¥.', 0
                                db 0
 TXT_SETUPHELP_BasicOptions:    db 'â®  áâà®©ªš €«ï', 0
+TXT_SETUPHELP_BasicOptions     db 'â®  áâà®©ªš €«ï', 0
                                db ' çš îéšå ¯®«ì§®-.', 0
                                db '¢ â¥«¥©.', 0
                                db 0
 TXT_SETUPHELP_AdvOptions:      db 'âš  áâà®©ªš €«ï', 0
+TXT_SETUPHELP_AdvOptions       db 'âš  áâà®©ªš €«ï', 0
                                db '®¯ëâëå ¯®«ì§®¢ â¥«¥©.', 0
                                db '
 …
                                db '¬¥ï©â¥.', 0
                                db 0
 TXT_SETUPHELP_ExtOptions:      db ' áèšà¥ë¥ ®¯æšš €«ï', 0
+TXT_SETUPHELP_ExtOptions       db ' áèšà¥ë¥ ®¯æšš €«ï', 0
                                db 'à §ëå ášáâ¥¬.', 0
                                db 0
 TXT_SETUPHELP_DefMasterPwd:    db ' € š¥ ¯ à®«ï €«ï', 0
+TXT_SETUPHELP_DefMasterPwd     db ' € š¥ ¯ à®«ï €«ï', 0
                                db '€®áâã¯  ª  áâà®©ª ¬', 0
                                db 'š ášáâ¥¬¥.', 0
                                db 0
 TXT_SETUPHELP_DefBootPwd:      db ' € š¥ ¯ à®«ï €«ï', 0
+TXT_SETUPHELP_DefBootPwd       db ' € š¥ ¯ à®«ï €«ï', 0
                                db '€®áâã¯  ª ášáâ¥¬¥.', 0
                                db 0
 TXT_SETUPHELP_SaveAndExit:     db 'à®€®«Ššâì § £àã§ªã š', 0
+TXT_SETUPHELP_SaveAndExit      db 'à®€®«Ššâì § £àã§ªã š', 0
                                db 'á®å šâì â¥ªãéš¥', 0
                                db ' áâà®©ªš.', 0
                                db 0
 TXT_SETUPHELP_JustExit:        db 'à®€®«Ššâì § £àã§ªã,', 0
+TXT_SETUPHELP_JustExit         db 'à®€®«Ššâì § £àã§ªã,', 0
                                db '® ®â¬¥šâì ¢á¥', 0
                                db 'š§¬¥¥šï  áâà®¥ª.', 0
 …
                                db 0
 TXT_SETUPHELP_HideSetup:       db 'ë¡¥àšâ¥ á®áâ®ïš¥,', 0
+TXT_SETUPHELP_HideSetup        db 'ë¡¥àšâ¥ á®áâ®ïš¥,', 0
                                db '¢ ª®â®à®¬ à §€¥«', 0
                                db '€®«Š¥ ¡ëâì, ª®£€ ', 0

trunk/BOOTCODE/TEXT/RU/OTHER.ASM

-              r36
+              r37
 ; Maximum 2/10/11/6 chars
 ;----------------------------------||---------------------------------------
 TXT_TopInfos_No:               db 'No', 0
 TXT_TopInfos_Hd:               db 'Hd', 0
+TXT_TopInfos_No                db 'No', 0
+TXT_TopInfos_Hd                db 'Hd', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_HdSize:           db 'Hd/ §¬¥à:', 0
+TXT_TopInfos_HdSize            db 'Hd/ §¬¥à:', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_Label:            db '¬ï:', 0
+TXT_TopInfos_Label             db '¬ï:', 0
 ;----------------------------------|---------|------------------------------
 TXT_TopInfos_Type:             db 'š¯:', 0
+TXT_TopInfos_Type              db 'š¯:', 0
 ;----------------------------------|----|-----------------------------------
 TXT_TopInfos_Flags:            db '« £š:', 0      ; <-- for Partition Setup
+TXT_TopInfos_Flags             db '« £š:', 0      ; <-- for Partition Setup
 ; Will be added together to one line, maximum 76 chars
 TXT_TimedBootLine:             db '¢â®§ £àã§ª  ¢ª«çî¥ . ã€¥â § £àãŠ¥  '''
+TXT_TimedBootLine              db '¢â®§ £àã§ª  ¢ª«çî¥ . ã€¥â § £àãŠ¥  '''
 TXT_TimedBootEntryName         db 12 dup (0) ; Space for Default-Entry-Name
 TXT_TimedBootLine2:            db      ''' ç¥à¥§ ', 0
 TXT_TimedBootSeconds:          db ' á¥ªã€. ', 0
 TXT_TimedBootSecond:           db ' á¥ªã€ã. ', 0 ; if only one is left, ELiTE :]
+TXT_TimedBootLine2             db      ''' ç¥à¥§ ', 0
+TXT_TimedBootSeconds           db ' á¥ªã€. ', 0
+TXT_TimedBootSecond            db ' á¥ªã€ã. ', 0 ; if only one is left, ELiTE :]
 ; Maximum 76 chars
 ;----------------------------------|--------------------------------------------------------------------------|
 TXT_TimedBootDisabled:         db '¢â®§ £àã§ª  ®âª«îç¥ , â ©¬¥à ®âª«îç¥.', 0
 TXT_BootMenuHelpText1:         db ' Š¬šâ¥ [Esc] €«ï ¯¥à¥ª«îç¥šï  ¢â®§ £àã§ªš, [Enter] €«ï ¢ë¡®à  à §€¥« .', 0
 TXT_BootMenuHelpText2:         db 'ë¡¥àšâ¥ à §€¥« š«š  Š¬šâ¥ [TAB], çâ®¡ë ã¢š€¥âì á®®¡é¥šï BIOS POST.', 0
+TXT_TimedBootDisabled          db '¢â®§ £àã§ª  ®âª«îç¥ , â ©¬¥à ®âª«îç¥.', 0
+TXT_BootMenuHelpText1          db ' Š¬šâ¥ [Esc] €«ï ¯¥à¥ª«îç¥šï  ¢â®§ £àã§ªš, [Enter] €«ï ¢ë¡®à  à §€¥« .', 0
+TXT_BootMenuHelpText2          db 'ë¡¥àšâ¥ à §€¥« š«š  Š¬šâ¥ [TAB], çâ®¡ë ã¢š€¥âì á®®¡é¥šï BIOS POST.', 0
 ; Maximum 30 chars
 ;----------------------------------|----------------------------|
 …
 ; Dynamic Length (till 80 chars)
 TXT_BrokenPartitionTable:      db 13, 10, ' - ¡ àãŠ¥ ¬šš¬ã¬ ®€š šá¯®àç¥ë© à §€¥«, «š¡® â ¡«šæ  à §€¥«®¢ á®€¥àŠšâ'
+TXT_BrokenPartitionTable       db 13, 10, ' - ¡ àãŠ¥ ¬šš¬ã¬ ®€š šá¯®àç¥ë© à §€¥«, «š¡® â ¡«šæ  à §€¥«®¢ á®€¥àŠšâ'
                                db 13, 10, '   á¡®©ë¥ ¡«®ªš. šáâ¥¬  ®áâ ®¢«¥ .', 0
 TXT_TooManyPartitions:         db 13, 10, ' - «šèª®¬ ¬®£® à §€¥«®¢  ©€¥®. AiR-BOOT ¯®€€¥àŠš¢ ¥â €® 45.', 0
 TXT_NoBootAble:                db 13, 10, ' - ¥  ©€¥® § £àãŠ ¥¬ëå à §€¥«®¢. šáâ¥¬  ®áâ ®¢«¥ .', 0
 TXT_BIOSchanged:               db 13, 10, ' - BIOS
+TXT_TooManyPartitions          db 13, 10, ' - «šèª®¬ ¬®£® à §€¥«®¢  ©€¥®. AiR-BOOT ¯®€€¥àŠš¢ ¥â €® 45.', 0
+TXT_NoBootAble                 db 13, 10, ' - ¥  ©€¥® § £àãŠ ¥¬ëå à §€¥«®¢. šáâ¥¬  ®áâ ®¢«¥ .', 0
+TXT_BIOSchanged                db 13, 10, ' - BIOS
 , ¯à®¢¥àìâ¥ á¢®î ášáâ¥¬ã   ¯à¥€¬¥â ¢šàãá®¢.'
                                db 13, 10, '    Š¬šâ¥ «î¡ãî ª« ¢šèã €«ï ¯à®€®«Š¥šï...', 0
 TXT_VirusFoundMain:            db 13, 10, ' - !
+TXT_VirusFoundMain             db 13, 10, ' - !
 ! ->
   <- !
 !', 13, 10, 0
 TXT_VirusFound1ok:             db '     ¡ë« ãâšçâ®Š¥, ® ášáâ¥¬  ¬®Š¥â ¥ § £àã§šâìáï ¯à ¢š«ì®.
+TXT_VirusFound1ok              db '     ¡ë« ãâšçâ®Š¥, ® ášáâ¥¬  ¬®Š¥â ¥ § £àã§šâìáï ¯à ¢š«ì®.
 á«š íâ®', 13, 10
                                db '    íâ® ¯à®š§®©€¥â, šá¯®«ì§ã©â¥  è €šáª AiR-BOOT.', 13, 10, 0
 TXT_VirusFound1damn:           db '     á®Š «¥šî, ® áâ¥à  áâà®©ªš AiR-BOOT. ë €®«Šë § £àã§šâìáï, šá¯®«ì§ãï', 13, 10
+TXT_VirusFound1damn            db '     á®Š «¥šî, ® áâ¥à  áâà®©ªš AiR-BOOT. ë €®«Šë § £àã§šâìáï, šá¯®«ì§ãï', 13, 10
                                db '     è €šáª AiR-BOOT.', 13, 10, 0
 TXT_VirusFound1any:            db '    «ï ¡¥§®¯ á®áâš,  ¬ á«¥€ã¥â ¯à®¢¥àšâì  èš Š¥áâªš¥ €šáªš   ¢šàãáë.', 13, 10, 0
 TXT_VirusFound2:               db '    šàãá  å®€šâáï ¢ MBR à §€¥« , ª®â®àë© ë å®âšâ¥ § £àã§šâì.', 13, 10
+TXT_VirusFound1any             db '    «ï ¡¥§®¯ á®áâš,  ¬ á«¥€ã¥â ¯à®¢¥àšâì  èš Š¥áâªš¥ €šáªš   ¢šàãáë.', 13, 10, 0
+TXT_VirusFound2                db '    šàãá  å®€šâáï ¢ MBR à §€¥« , ª®â®àë© ë å®âšâ¥ § £àã§šâì.', 13, 10
                                db '    á¯®«ì§ã©â¥ ¯à®£à ¬¬ë ¯®šáª  ¢šàãá®¢.  ªŠ¥ íâ® ¬®Š¥â ¡ëâì ®èš¡®çë¬', 13, 10
                                db '    ¯à¥€ã¯à¥Š€¥š¥¬. ®á«¥ ã€ «¥šï ¢šàãá , ë €®«Šë ¯¥à¥§ € âì ¯¥à¥¬¥ë¥', 13, 10
 …
 á«š íâ® ¡ë«® ®èš¡®ç®¥ ¯à¥€ã¯à¥Š€¥š¥', 13, 10
                                db '    ®áâ ¢ìâ¥ ¥£® ¢ "¢ëª«".', 13, 10, 0
 TXT_VirusFoundEnd:             db '    šáâ¥¬  ®áâ ®¢«¥ . ®Š «ã©áâ ,  Š¬šâ¥ RESET.', 0
 TXT_HowEnterSetup:             db 13, 10, ' -  Š¬šâ¥ š €¥àŠšâ¥ Ctrl š«š Alt €«ï ¢å®€  ¢  áâà®©ªš AiR-BOOT.', 0
+TXT_VirusFoundEnd              db '    šáâ¥¬  ®áâ ®¢«¥ . ®Š «ã©áâ ,  Š¬šâ¥ RESET.', 0
+TXT_HowEnterSetup              db 13, 10, ' -  Š¬šâ¥ š €¥àŠšâ¥ Ctrl š«š Alt €«ï ¢å®€  ¢  áâà®©ªš AiR-BOOT.', 0
 TXT_BootingNow1:               db ' £àã§ª  ášáâ¥¬ë, šá¯®«ì§ãï ', 0
+TXT_BootingNow1                db ' £àã§ª  ášáâ¥¬ë, šá¯®«ì§ãï ', 0
 ; DO NOT MODIFY HERE
 TXT_BootingNow2:               db '''', 0
 TXT_BootingNowPartName:        db 12 dup (0) ; Space for BootThisPart-Name
+TXT_BootingNow2                db '''', 0
+TXT_BootingNowPartName         db 12 dup (0) ; Space for BootThisPart-Name
 ; DO NOT MODIFY TILL HERE
 TXT_BootingNowPartition:       db ' à §€¥«', 0
 TXT_BootingNowKernel:          db ' ï€à®', 0
 TXT_BootingHide:               db '; á®ªàëâš¥  ªâš¢®', 0
 TXT_BootingWait:               db '; ¯®Š «ã©áâ , ¯®€®Š€šâ¥...', 13, 10, 13, 10, 0
+TXT_BootingNowPartition        db ' à §€¥«', 0
+TXT_BootingNowKernel           db ' ï€à®', 0
+TXT_BootingHide                db '; á®ªàëâš¥  ªâš¢®', 0
+TXT_BootingWait                db '; ¯®Š «ã©áâ , ¯®€®Š€šâ¥...', 13, 10, 13, 10, 0
 ; FIXED LENGTH - 11 chars each string
 ;----------------------------------|---------|------------------------------
 TXT_Floppy_NoName:             db '¥§ š¬¥š  '
 TXT_Floppy_Drive:              db 'šáª®¢®€   '
 TXT_Floppy_NoDisc:             db '¥â €šáª   '
+TXT_Floppy_NoName              db '¥§ š¬¥š  '
+TXT_Floppy_Drive               db 'šáª®¢®€   '
+TXT_Floppy_NoDisc              db '¥â €šáª   '
 ; Maximum 60 chars (should not be reached)

trunk/BOOTCODE/TEXT/SW/MENUS.ASM

-              r36
+              r37
 ; Setup Control Help - Max Length: 33
 ;----------------------------------|-------------------------------|--------
 TXT_SETUPHELP_Main:            db 24,32,25,32,26,32,27,' : Vlj Aktion', 0
+TXT_SETUPHELP_Main             db 24,32,25,32,26,32,27,' : Vlj Aktion', 0
                                db               'Enter   : Vlj Aktion', 0
                                db               'F10 : Spara&Avsluta Setup', 0
                                db               'Esc : Lmna Setup', 0
 TXT_SETUPHELP_SubMenu:         db 24,32,25,32,26,32,27,' : Vlj Post', 0
+TXT_SETUPHELP_SubMenu          db 24,32,25,32,26,32,27,' : Vlj Post', 0
                                db               'PgUp/Dn : ndra Post', 0
                                db               'F1  : Visa hjlp fr post', 0
                                db               'Esc : tervnd till huvud-menyn', 0
 TXT_SETUPHELP_PartSetup:       db 24,32,25,32,26,32,27,' : Vlj partition', 0
+TXT_SETUPHELP_PartSetup        db 24,32,25,32,26,32,27,' : Vlj partition', 0
                                db               'Enter   : Editera etikett', 0
                                db               'F1  : Flagga (tryck tg fr vxl)', 0
 …
                                   ;1234567890123456789012
 ;----------------------------------|--------------------|-------------------
 TXT_SETUPHELP_PartitionSetup:  db 'Gr dina partitioner', 0
+TXT_SETUPHELP_PartitionSetup   db 'Gr dina partitioner', 0
                                db 'bootningsbara, ndra', 0
                                db 'deras namn, definiera', 0
 …
                                db 'annat.', 0
                                db 0
 TXT_SETUPHELP_BasicOptions:    db 'Dessa optioner r fr', 0
+TXT_SETUPHELP_BasicOptions     db 'Dessa optioner r fr', 0
                                db 'oerfarna anvndare.', 0
 TXT_SETUPHELP_AdvOptions:      db 'Dessa r fr', 0
+TXT_SETUPHELP_AdvOptions       db 'Dessa r fr', 0
                                db 'avancerade anvndare.', 0
                                db 'Om du inte vet vad de', 0
                                db 'gr, lmna som de r.', 0
                                db 0
 TXT_SETUPHELP_ExtOptions:      db 'Utkade optioner fr', 0
+TXT_SETUPHELP_ExtOptions       db 'Utkade optioner fr', 0
                                db 'specifika OS.', 0
                                db 0
 TXT_SETUPHELP_DefMasterPwd:    db 'Definiera ett', 0
+TXT_SETUPHELP_DefMasterPwd     db 'Definiera ett', 0
                                db 'lsenord fr access', 0
                                db 'till setup och', 0
                                db 'system.', 0
                                db 0
 TXT_SETUPHELP_DefBootPwd:      db 'Definiera ett', 0
+TXT_SETUPHELP_DefBootPwd       db 'Definiera ett', 0
                                db 'lsenord fr access', 0
                                db 'till system.',0
                                db 0
 TXT_SETUPHELP_SaveAndExit:     db 'Kommer att forstta', 0
+TXT_SETUPHELP_SaveAndExit      db 'Kommer att forstta', 0
                                db 'bootprocessen och', 0
                                db 'spara de aktuella', 0
                                db 'optionerna.',0
                                db 0
 TXT_SETUPHELP_JustExit:        db 'Kommer att forstta', 0
+TXT_SETUPHELP_JustExit         db 'Kommer att forstta', 0
                                db 'men ignorerar alla', 0
                                db 'ndringar som gjorts', 0
 …
                                db 0
 TXT_SETUPHELP_HideSetup:       db 'Vlj status fr', 0
+TXT_SETUPHELP_HideSetup        db 'Vlj status fr', 0
                                db 'vilka partitioner', 0
                                db 'som skall dljas,', 0
 …
                                db 'Annars kommer den', 0
                                db 'att anvnda standard', 0
                                db 0
+                                           db 0
 TXT_SETUPHELP_RememberLastBoot db 'AiR-BOOT kommer att', 0
                                db 'hlla meny-raden p', 0
 …
                                db 'raden ocks fr', 0
                                db 'Tidsstyrd Bootning.', 0
                                db 0
+                                           db 0
 TXT_SETUPHELP_IncludeFloppy    db 'AiR-BOOT kommer att', 0
                                db 'tillta booting', 0
 …
                                db 'Kan vara inkompatibelt', 0
                                db 'med vissa OS.', 0
                                db 0
+                                           db 0
 TXT_SETUPHELP_IgnoreMbrWrites  db 'Om det r aktiverat,', 0
                                db 'kommer all skrivning', 0
 …
                                db 'kommer systemet att', 0
                                db '"krascha".', 0
                                db 0
+                               db 0
 TXT_SETUPHELP_MakeSounds       db 'AiR-BOOT kan fs att', 0
                                db 'utfra ljud med din', 0

trunk/BOOTCODE/TEXT/SW/OTHER.ASM

-              r36
+              r37
 ; Maximum 2/10/11/6 chars
 ;----------------------------------||---------------------------------------
 TXT_TopInfos_No:               db 'No', 0
 TXT_TopInfos_Hd:               db 'Hd', 0
+TXT_TopInfos_No                db 'No', 0
+TXT_TopInfos_Hd                db 'Hd', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_HdSize:           db 'Hd/Storl:', 0
+TXT_TopInfos_HdSize            db 'Hd/Storl:', 0
 ;----------------------------------|--------|-------------------------------
 TXT_TopInfos_Label:            db 'Etikett:', 0
+TXT_TopInfos_Label             db 'Etikett:', 0
 ;----------------------------------|---------|------------------------------
 TXT_TopInfos_Type:             db 'Typ:', 0
+TXT_TopInfos_Type              db 'Typ:', 0
 ;----------------------------------|----|-----------------------------------
 TXT_TopInfos_Flags:            db 'Flag:', 0      ; <-- for Partition Setup
+TXT_TopInfos_Flags             db 'Flag:', 0      ; <-- for Partition Setup
 ; Will be added together to one line, maximum 76 chars
 TXT_TimedBootLine:             db 'Tidsbootning aktiverad. Systemet kommer att boota '''
+TXT_TimedBootLine              db 'Tidsbootning aktiverad. Systemet kommer att boota '''
 TXT_TimedBootEntryName         db 12 dup (0)
 TXT_TimedBootLine2:            db      ''' om ', 0
 TXT_TimedBootSeconds:          db ' sekunder. ', 0
 TXT_TimedBootSecond:           db ' sekund. ', 0
+TXT_TimedBootLine2             db      ''' om ', 0
+TXT_TimedBootSeconds           db ' sekunder. ', 0
+TXT_TimedBootSecond            db ' sekund. ', 0
 ; Maximum 76 chars
 ;----------------------------------|--------------------------------------------------------------------------|
 TXT_TimedBootDisabled:         db 'Tidstyrd bootning avaktiverad; ingen tidsgrns kommer att upptrda.', 0
 TXT_BootMenuHelpText1:         db 'Tryck [Esc] fr att vxla tidsboot, [Enter] fr att acceptera aktuellt val.', 0
 TXT_BootMenuHelpText2:         db 'Vlj annan med pilarna, eller tryck [TAB] fr att se BIOS POST meddelande.', 0
+TXT_TimedBootDisabled          db 'Tidstyrd bootning avaktiverad; ingen tidsgrns kommer att upptrda.', 0
+TXT_BootMenuHelpText1          db 'Tryck [Esc] fr att vxla tidsboot, [Enter] fr att acceptera aktuellt val.', 0
+TXT_BootMenuHelpText2          db 'Vlj annan med pilarna, eller tryck [TAB] fr att se BIOS POST meddelande.', 0
 ; Maximum 30 chars
 ;----------------------------------|----------------------------|
 …
 ; Dynamic Length (till 80 chars)
 TXT_BrokenPartitionTable:      db 13, 10, ' - Ditt system har minst en bruten partitionstabellspost eller har din hrddisk'
+TXT_BrokenPartitionTable       db 13, 10, ' - Ditt system har minst en bruten partitionstabellspost eller har din hrddisk'
                                db 13, 10, '   trasiga sektorer. Systemet haltat.', 0
 TXT_TooManyPartitions:         db 13, 10, ' - Fr mnga partitioner hittades. AiR-BOOT stder endast upp till 45.', 0
 TXT_NoBootAble:                db 13, 10, ' - Ingen bootningsbar partition definierad. Systemet haltat.', 0
 TXT_BIOSchanged:               db 13, 10, ' - BIOS NDRAT, var vnlig kontrollera ditt system efter virus, fr att vara sker.'
+TXT_TooManyPartitions          db 13, 10, ' - Fr mnga partitioner hittades. AiR-BOOT stder endast upp till 45.', 0
+TXT_NoBootAble                 db 13, 10, ' - Ingen bootningsbar partition definierad. Systemet haltat.', 0
+TXT_BIOSchanged                db 13, 10, ' - BIOS NDRAT, var vnlig kontrollera ditt system efter virus, fr att vara sker.'
                                db 13, 10, '   Tryck ngon tangent fr att fortstta...', 0
 TXT_VirusFoundMain:            db 13, 10, ' - !VARNING! -> ETT VIRUS HITTADES <- !VARNING!', 13, 10, 0
 TXT_VirusFound1ok:             db '    Det frstrdes, men systemet kanske inte bootas om korrekt. Om det intrffar,', 13, 10
+TXT_VirusFoundMain             db 13, 10, ' - !VARNING! -> ETT VIRUS HITTADES <- !VARNING!', 13, 10, 0
+TXT_VirusFound1ok              db '    Det frstrdes, men systemet kanske inte bootas om korrekt. Om det intrffar,', 13, 10
                                db '    anvnd din AiR-BOOT systemdisk.', 13, 10, 0
 TXT_VirusFound1damn:           db '    Olyckligtvis frstrdes AiR-BOOTs backup. Du mste boota om genom att anvnda din', 13, 10
+TXT_VirusFound1damn            db '    Olyckligtvis frstrdes AiR-BOOTs backup. Du mste boota om genom att anvnda din', 13, 10
                                db '    AiR-BOOT systemdisk.', 13, 10, 0
 TXT_VirusFound1any:            db '    Fr skerhets skull, br du kontrollera din hrddisk mot ytterligare virus.', 13, 10, 0
 TXT_VirusFound2:               db '    Det finns i boot-sektorn hos den partition, som du ville boota.', 13, 10
+TXT_VirusFound1any             db '    Fr skerhets skull, br du kontrollera din hrddisk mot ytterligare virus.', 13, 10, 0
+TXT_VirusFound2                db '    Det finns i boot-sektorn hos den partition, som du ville boota.', 13, 10
                                db '    Anvnd ett antivirus program. Det kan vara falskt alarm eller.', 13, 10
                                db '    Efter avlgsnande, mste du initiera om upptcktsvariablerna, g till ', 13, 10
                                db '    ''PARTITION SETUP'' och vxla VIBR-upptckt tv gnger (av/p).', 13, 10
                                db '    Om det bara var ett falskt alarm, lmna det i av-lge.', 13, 10, 0
 TXT_VirusFoundEnd:             db '    Systemet haltat. Var vnlig tryck RESET.', 0
 TXT_HowEnterSetup:             db 13, 10, ' - Tryck och hll Ctrl eller Alt fr att komma till AiR-BOOT Setup.', 0
+TXT_VirusFoundEnd              db '    Systemet haltat. Var vnlig tryck RESET.', 0
+TXT_HowEnterSetup              db 13, 10, ' - Tryck och hll Ctrl eller Alt fr att komma till AiR-BOOT Setup.', 0
 TXT_BootingNow1:               db 'Bootar systemet anvndande ', 0
+TXT_BootingNow1                db 'Bootar systemet anvndande ', 0
 ; DO NOT MODIFY HERE
 TXT_BootingNow2:               db '''', 0
 TXT_BootingNowPartName:        db 12 dup (0) ; Space for BootThisPart-Name
+TXT_BootingNow2                db '''', 0
+TXT_BootingNowPartName         db 12 dup (0) ; Space for BootThisPart-Name
 ; DO NOT MODIFY TILL HERE
 TXT_BootingNowPartition:       db ' partition', 0
 TXT_BootingNowKernel:          db ' krna', 0
 TXT_BootingHide:               db '; dlj aktiv', 0
 TXT_BootingWait:               db '; var vnlig vnta...', 13, 10, 13, 10, 0
+TXT_BootingNowPartition        db ' partition', 0
+TXT_BootingNowKernel           db ' krna', 0
+TXT_BootingHide                db '; dlj aktiv', 0
+TXT_BootingWait                db '; var vnlig vnta...', 13, 10, 13, 10, 0
 ; FIXED LENGTH - 11 chars each string
 ;----------------------------------|---------|------------------------------
 TXT_Floppy_NoName:             db 'Inget Namn '
 TXT_Floppy_Drive:              db 'Diskett    '
 TXT_Floppy_NoDisc:             db 'Ingen Disk '
+TXT_Floppy_NoName              db 'Inget Namn '
+TXT_Floppy_Drive               db 'Diskett    '
+TXT_Floppy_NoDisc              db 'Ingen Disk '
 ; Maximum 60 chars (should not be reached)

trunk/BOOTCODE/TEXT/TXTMBR.ASM

r29	r37
1		Include TEXT~~\EN\MBR.asm~~
	1	Include TEXT/EN/MBR.ASM

trunk/BOOTCODE/TEXT/TXTMENUS.ASM

r29	r37
1		Include TEXT~~\EN\MENUS.asm~~
	1	Include TEXT/EN/MENUS.ASM

trunk/BOOTCODE/TEXT/TXTOTHER.ASM

r29	r37
1		Include TEXT~~\EN\OTHER.asm~~
	1	Include TEXT/EN/OTHER.ASM

trunk/BOOTCODE/_build.cmd

-              r32
+              r37
+/* REXX */
+date_file = 'BLDDATE.ASM';
+/*
+The language to build is passed by the master Makefile.
+Supported languages are: EN,DE,FR,SW,IT,NL,RU.
+Change lang to 'ALL' to build all language versions.
+*/
+parse arg lang
+if (lang='') then do
+        lang='EN';
+end
+/* Generate BUILD_DATE.ASM  */
+"@echo: BUILD_DATE: db 'Build Date: "||Date()||" at "||Time()||"',0    ; Generated by _build.cmd > "||date_file;
+'@CALL MAKEALL.BAT '||lang;
+Say '';
+Say '';
+Say '';
+Say '#';
+Say '# Language versions are in: RELEASE\BOOTCODE';
+Say '# If ALL languages are built the English version is copied to RELEASE\<PLATFORM> as AIRBOOT.BIN';
+Say '# If ONE language  is built this Language version is copied to RELEASE\<PLATFORM> as AIRBOOT.BIN';
+Say '#';
+Say '';
+'rem @pause';
+@wmake dev

trunk/BOOTCODE/_clean.cmd

-              r32
+              r37
+/* REXX */
+'@if exist air-boot.com del air-boot.com';
+'@if exist air-boot.obj del air-boot.obj';
+'@if exist air-boot.lst del air-boot.lst';
+'@if exist air-boot.map del air-boot.map';
+'@if exist airboot.bin del airboot.bin';
+'@if exist blddate.asm del blddate.asm';
+'@if exist mbr-prot\*.obj del mbr-prot\*.obj';
+'@if exist mbr-prot\*.lst del mbr-prot\*.lst';
+'@if exist mbr-prot\*.com del mbr-prot\*.com';
+'@if exist mbr-prot\*.exe del mbr-prot\*.exe';
+'@if exist ..\RELEASE\BOOTCODE\AIRBT-*.BIN del ..\RELEASE\BOOTCODE\AIRBT-*.BIN';
+'@if exist ..\RELEASE\DOS\AIRBOOT.BIN del ..\RELEASE\DOS\AIRBOOT.BIN';
+'@if exist ..\RELEASE\DOS\*.COM del ..\RELEASE\DOS\*.COM';
+'@if exist ..\TOOLS\DOS\INITHDD\*.LST del ..\TOOLS\DOS\INITHDD\*.LST';
+'@if exist ..\INSTALL\DOS\*.LST del ..\INSTALL\DOS\*.LST';
+'@if exist ..\INSTALL\FLOPPY\*.LST del ..\INSTALL\FLOPPY\*.LST';
+'@if exist ..\TOOLS\INTERNAL\*.LST del ..\TOOLS\INTERNAL\*.LST';
+'@if exist ..\TOOLS\INTERNAL\*.COM del ..\TOOLS\INTERNAL\*.COM';
+'@if exist ..\RELEASE\OS2\AIRBOOT.BIN del ..\RELEASE\OS2\AIRBOOT.BIN';
+'@if exist ..\RELEASE\WINNT\AIRBOOT.BIN del ..\RELEASE\WINNT\AIRBOOT.BIN';
+'@if exist ..\RELEASE\LINUX\AIRBOOT.BIN del ..\RELEASE\LINUX\AIRBOOT.BIN';
+@wmake clean rmbin

trunk/BUILD.NFO

-              r32
+              r37
 ======================================================
+Building AiR-BOOT and the support tools has been completely revamped
+in this version. The code has been "de-tasmized" so it can now also
+be assembled with JWasm, which is the preferred assembler as of this version.
+The DOS batch-files have been replaced by Open Watcom Makefiles that
+can be used on: DOS, Windows, OS/2 and Linux.
+This greatly enhances the build-environment, which was previously DOS-only.
+The Open Watcom Linker is now used, which obsoletes the use of the (DOS-only)
+exe2bin and tlink programs. WLink replaces the functionality of both while
+also adding extensive cross-platform support.
+The (DOS-only) FIXCODE.COM program that is used to embed the MBR-protection
+in the AiR-BOOT image has been replaced by platform specific versions.
+This does away with the need to run a DOS-only program in the tool-chain,
+and thus enables building AiR-BOOT on Linux.
+The preferred assembler is now JWasm.
+Note however that JWasm/DOS does not work so this environment will use
+Tasm/DOS. The DOS build-environment will probably be discontinued in
+the future due to it's many restrictions. DOS specific targets can
+be built on the other platforms.
+The Open Watcom tool-chain in combination with JWasm is now the
+default tool-chain. No syntax or operational compatibility with other
+assemblers or compilers is attempted.
 Building AiR-BOOT v1.0.8 requires the following tools:
+- Borland Turbo Assembler v4.1 for DOS
+  (TASM.EXE 136.018 bytes)
+- Borland Turbo Linker v4.0 for DOS
+  (TLINK.EXE 72.585 bytes)
+- Caldera Exe2Bin R1.01 for DOS
+  (EXE2BIN.EXE 9.845 bytes)
+- Open Watcom C/C++ v1.9
+  (Used to build the installer and setaboot etc.)
+- Open Watcom Make Utility v1.9 or higher
+- Open Watcom 16-bits C-Compiler v1.9 or higher
+- Open Watcom 32-bits C-Compiler v1.9 or higher
+- Open Watcom Linker v1.9 or higher
+- JWasm Assembler v2.06d
+Put these DOS executables (not Open Watcom) in a directory
+and append that directory to the PATH as defined in ?:\AUTOEXEC.BAT.
+This will enable DOS sessions to find them when called
+by the Rexx build scripts from an OS2 CMD session.
+As a convenience a simple GNUmakefile also exists where a Makefile exists.
+The GNUmakefile forwards to the normal Makefile enabing Linux users to run the
+familiar "make" command. Target passing is supported.
 Note that only the loader, installer and setaboot targets are built.

trunk/COPYING

-              r32
+              r37
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+Mass Ave, Cambridge, MA 02139, USA
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
+                            Preamble
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+                            Preamble
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
 your programs, too.
 …
 price.  Our General Public Licenses are designed to make sure that you
 have the freedom to distribute copies of free software (and charge for
 this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
 in new free programs; and that you know you can do these things.
   To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
 distribute copies of the software, or if you modify it.
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
   For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
   The precise terms and conditions for copying, distribution and
 modification follow.
+                    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+and 2 above on a medium customarily used for software interchange; or,
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+                       TERMS AND CONDITIONS
+. Definitions.
+  "This License" refers to version 3 of the GNU General Public License.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+. Source Code.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+  The Corresponding Source for a work in source code form is that
+same work.
+. Basic Permissions.
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+. Protecting Users' Legal Rights From Anti-Circumvention Law.
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+. Conveying Verbatim Copies.
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+. Conveying Modified Source Versions.
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+. Conveying Non-Source Forms.
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+. Additional Terms.
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+. Termination.
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+. Acceptance Not Required for Having Copies.
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+. Automatic Licensing of Downstream Recipients.
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+. Patents.
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
 this License.
+. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+. No Surrender of Others' Freedom.
+  If conditions are imposed on you (whether by court order, agreement or
 otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+. Use with the GNU Affero General Public License.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+. Revised Versions of this License.
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
 be similar in spirit to the present version, but may differ in detail to
 address new problems or concerns.
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+                            NO WARRANTY
+. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+                     END OF TERMS AND CONDITIONS
+        Appendix: How to Apply These Terms to Your New Programs
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+. Disclaimer of Warranty.
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+. Limitation of Liability.
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+. Interpretation of Sections 15 and 16.
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+                     END OF TERMS AND CONDITIONS
+            How to Apply These Terms to Your New Programs
   If you develop a new program, and you want it to be of the greatest
 …
   To do so, attach the following notices to the program.  It is safest
 to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
+state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
     <one line to give the program's name and a brief idea of what it does.>
     Copyright (C) 19yy  <name of author>
     This program is free software; you can redistribute it and/or modify
+    Copyright (C) <year>  <name of author>
+    This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 …
     You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 Also add information on how to contact you by electronic and paper mail.
+If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
     Gnomovision version 69, Copyright (C) 19yy name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
 The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

trunk/ENV/DOS.BAT

-              r30
+              r37
 rem This file sets Assembler, Linker and EXE2BIN for DOS environment
 set assembler=tasm.exe /m9 /dReal /l
+set assembler=tasm.exe /m9 /dReal /dTASM /l
 rem set assembler=tasm.exe /m9 /dReal /t
 set linker=tlink.exe /3 /x
+set linker=tlink.exe /3
 set exe2bin=exe2bin.exe

trunk/INSTALL/DOS/AIRBOOT.ASM

-              r35
+              r37
+;
 JUMPS
 Include ..\..\include\asm.inc
+;JUMPS
+Include ../../INCLUDE/ASM.INC
                 .386p
+                model large, basic
+                .model small, basic
+airboot         group code_seg,bss_data
 code_seg        segment public use16
+                assume  cs:code_seg, ds:code_seg, es:nothing, ss:nothing
+                ;assume  cs:code_seg, ds:code_seg, es:nothing, ss:nothing
+                assume  cs:airboot, ds:airboot, es:nothing, ss:nothing
                 org     100h
 COM_StartUp:    jmp     COM_Init
 …
                 push    es
                 mov     es, bx           ; ES points now to PSP-Segment
+                movzx   dx, es:[80h]     ; CX - Length of Command-Line
+                xor     dh,dh
+                mov     byte ptr dl, es:[80h]     ; CX - Length of Command-Line
                 or      dx, dx
                 jz      COM_CmdLineDone
 …
 COM_CheckCmdParm:
+                push    cx si di
+                push    cx
+                push    si
+                push    di
                    repe    cmpsb
+                pop     di si cx
+                pop     di
+                pop     si
+                pop     cx
                 retn
 …
 ; =============================================================================
 ; DS:SI - NUL-terminated message to display to console
+APIShowMessage: push    ax dx si
+APIShowMessage: push    ax
+                push    dx
+                push    si
                    mov     ah, 02h
 ASM_Loop:          lodsb
 …
                    int     21h           ; DOS: WRITE CHARACTER TO CONSOLE
                    jmp     ASM_Loop
+ASM_Done:       pop     si dx ax
+                retn
+; =============================================================================
+APIShowChar:    push    ax dx
+ASM_Done:       pop     si
+                pop     dx
+                pop     ax
+                retn
+; =============================================================================
+APIShowChar:    push    ax
+                push    dx
                    mov     ah, 02h
                    mov     dl, al
                    int     21h           ; DOS: WRITE CHARACTER TO CONSOLE
+                pop     dx ax
+                pop     dx
+                pop     ax
                 retn
 …
                 retn
+APILockVolume:  push    ax bx cx dx
+APILockVolume:  push    ax
+                push    bx
+                push    cx
+                push    dx
                    mov     ax, 3000h
                    int     21h           ; DOS: GET DOS VERSION
 …
                    int     21h           ; DOS 7.0: LOCK PHYSICAL DRIVE
 ALV_SkipLock:
+                pop     dx cx bx ax
+                pop     dx
+                pop     cx
+                pop     bx
+                pop     ax
                 jc      ALV_Error
                 retn
 …
                 call    APIShowError
                 Include ..\INST_X86\install.inc ; Execute generic code
+                Include ../INST_X86/INSTALL.INC ; Execute generic code
 COM_EndOfSegment:
 code_seg        ends
+bss_data    segment  public use16   'BSS'
+; Space for bootcode-image
+BootImage       db 31744 dup (?)
+bss_data    ends
                 end     COM_StartUp

trunk/INSTALL/DOS/MAKE.BAT

r36	r37
8	8	%exe2bin% airboot.exe airboot.com >nul
9	9	if errorlevel 1 goto Failed
10		copy airboot.com ..\..\RELEASE\DOS\~~airboot.com~~
	10	copy airboot.com ..\..\RELEASE\DOS\AIRBOOT.COM
11	11
12	12	@ren airboot.LST airboot.TSL

trunk/INSTALL/DOS/MAKE.CMD

-              r36
+              r37
 @echo off
 rem Do actual build...
 call ..\..\env\dos.bat
+call ..\..\env\os2.cmd
 %assembler% airboot.asm
 if errorlevel 1 goto Failed
 %linker% airboot.obj >nul
+%linker% airboot.obj; >nul
 if errorlevel 1 goto Failed
 %exe2bin% airboot.exe airboot.com >nul
 if errorlevel 1 goto Failed
 copy airboot.com ..\..\RELEASE\DOS\airboot.com
+copy airboot.com ..\..\RELEASE\DOS\AIRBOOT.COM
 @ren airboot.LST airboot.TSL

trunk/INSTALL/FLOPPY/KERNEL.ASM

-              r29
+              r37
 StackSeg        equ     7000h
 Include ..\..\include\asm.inc
+Include ../../INCLUDE/ASM.INC
                 .386p
 …
 ; =============================================================================
 ; DS:SI - NUL-terminated message to display to console
+APIShowMessage: push    ax bx si
+APIShowMessage: push    ax
+                push    bx
+                push    si
                    mov     ah, 0Eh
                    mov     bx, 7
 …
                    int     10h           ; BIOS: TELETYPE
                    jmp     ASM_Loop
+ASM_Done:       pop     si bx ax
+ASM_Done:       pop     si
+                pop     bx
+                pop     ax
                 retn
 ; =============================================================================
+APIShowChar:    push    ax bx
+APIShowChar:    push    ax
+                push    bx
                    mov     ah, 0Eh
                    mov     bx, 7
                    int     10h           ; BIOS: TELETYPE
+                pop     bx ax
+                pop     bx
+                pop     ax
                 retn
 …
 APILockVolume:  retn
                 Include ..\INST_X86\install.inc ; Execute generic code
+                Include ../INST_X86/INSTALL.INC ; Execute generic code
 COM_EndOfSegment:

trunk/INSTALL/FLOPPY/MAKEDISK.ASM

-              r29
+              r37
                 call    APIShowError
+ReadFloppyDone: push    bx dx
+ReadFloppyDone: push    bx
+                push    dx
                    mov     dx, offset TXT_Okay
                    call    APIShowMessage
+                pop     dx bx
+                pop     dx
+                pop     bx
                 ; Check, if floppy is formated using FAT
                 mov     si, bx
 …
                 call    APIShowError
+FloppyIsFAT:    push    bx cx dx
+FloppyIsFAT:    push    bx
+                push    cx
+                push    dx
                    mov     dx, offset TXT_WritingFloppy
                    call    APIShowMessage
 …
                    mov     cx, 450/2     ; Copy rest of FreeDOS BR
                    rep     movsw
+                pop     dx cx bx
+                pop     dx
+                pop     cx
+                pop     bx
                 ; Now we write it back...
                 mov     ax, 0301h
 …
                 mov     dx, offset TXT_Done
                 call    APIShowMessage
                 ; Terminate ourselves...
 GoByeBye:       mov     ax, 4C00h

trunk/INSTALL/INST_X86/INSTALL.INC

-              r36
+              r37
                 call    APIAfterQuit
 MenuWaitForEnter               Proc Near  Uses
+MenuWaitForEnter               Proc Near
    cmp     Option_Silent, 1
    je      MWFE_Skip
 …
 MenuWaitForEnter               EndP
 ProcessADD                     Proc Near  Uses
+ProcessADD                     Proc Near
    mov     si, offset TXT_PROCESS_Add
    call    APIShowMessage
 …
 ProcessADD                     EndP
 InstallCode                    Proc Near  Uses
+InstallCode                    Proc Near
    ; Calculates new code checksum...
    mov     si, offset BootImage+512  ; Sector 2 (Start of Code-Image)
 …
 InstallCode_MergeMBRs          Proc Near  Uses ds si es di
+   push    ds es
+   pop     ds es                     ; Exchange DS&ES, DS==HDD, ES==New BootCode
+   ; Exchange DS&ES, DS==HDD, ES==New BootCode
+   push    ds
+   push    es
+   pop     ds
+   pop     es
    xor     si, si
    mov     di, offset BootImage
 …
 InstallCode_MergeMBRs          EndP
 InstallConfig                  Proc Near  Uses
+InstallConfig                  Proc Near
    ; Calculate new Config-CheckSum
    mov     si, offset BootImage+6C00h    ; Configuration location
 …
 ;       Out: Carry Flag SET if Harddisc failed 62-sectors test
 Init_CheckHarddisc             Proc Near  Uses
+Init_CheckHarddisc             Proc Near
    mov     ah, 08h
    mov     dl, 80h
 …
 LoadHDDSector                  Proc Near  Uses ax es
   LHDDS_Retry:
+   push    bx cx dx
+   push    bx
+   push    cx
+   push    dx
       mov     ax, 0201h  ; load one sector
       int     13h
 …
       xor     dl, dl
       int     13h              ; BIOS: READ SECTOR VIA CHS
+   pop     dx cx bx
+   pop     dx
+   pop     cx
+   pop     bx
    jmp     LHDDS_Retry
   LHDDS_Success:
+   pop     dx cx bx
+   pop     dx
+   pop     cx
+   pop     bx
    add     bx, 512
    inc     cl               ; sector fixing must be done manual
 …
    mov     bx, si                        ; ES:BX - sector buffer to write
   SIS_Retry:
+   push    bx cx dx
+   push    bx
+   push    cx
+   push    dx
       mov     ax, 0301h
       int     13h                        ; BIOS: WRITE SECTOR
 …
       mov     dl, 00h
       int     13h
+   pop     dx cx bx
+   pop     dx
+   pop     cx
+   pop     bx
    jmp     SIS_Retry
   SIS_Success:
+   pop     dx cx bx
+   pop     dx
+   pop     cx
+   pop     bx
    add     si, 512                       ; go to next sector
    inc     cl                            ; add 1 to sector
 …
 ; Verifies our bootcode installation image
 Init_VerifyImage               Proc Near   Uses
+Init_VerifyImage               Proc Near
    ; First we verify the image, this is done by using the same checksum method
    ;  as on real harddrive images. This is mainly for detecting, that we are
 …
    mov     InstalledVersion_Code, cx      ; remember installed code version
    cmp     cx, dx                         ; If version number in image is higher
    jb      IVC_MGU                        ;  -> Upgradeable
+   jb      IVC_MGU_a                      ;  -> Upgradeable
    mov     iStatus_Code, Status_Installed
    ret
   IVC_MGU:
+  IVC_MGU_a:
    mov     iStatus_Code, Status_InstalledMGU
    ret
 Init_VerifyCode                EndP
 Init_CheckForEZSETUP           Proc Near  Uses
+Init_CheckForEZSETUP           Proc Near
    mov     si, offset MBR_EZSETUPCodeSig
    mov     di, 8Fh
 …
   IVC_NoUpgradeConfig:
    ; We exchange DS and ES, be careful from now on!
+   push    ds es
+   pop     ds es                         ; DS = HDD, ES = BootCode
+   push    ds
+   push    es
+   pop     ds
+   pop     es                         ; DS = HDD, ES = BootCode
    cmp     cx, 0027h
    jbe     IVC_Upgrade027
 …
    ; ==========================================================================
    ; Exchange DS and ES, so DS == HDD and ES == New BootCode
+   push    ds es
+   pop     ds es
+   push    ds
+   push    es
+   pop     ds
+   pop     es
    mov     si, 7000h                     ; Current - Sector 57 (Prior config)
    mov     di, 6C00h                     ; -> Current - Sector 55 (cur. config)
 …
    rep     movsw
    ; Exchange DS and ES again, so state is normal...
+   push    ds es
+   pop     ds es
+   jmp     IVC_CheckSumOK         ; Resume to upgrade config more
+   push    ds
+   push    es
+   pop     ds
+   pop     es
+   ;jmp     IVC_CheckSumOK         ; Resume to upgrade config more
+   ; Duplicated from Init_VerifyCode to remove jump
+   ; to procedure-local label. JWasm doesn't like that.
+   ; FIXME: Restructure...
+   mov     al, es:[000Fh]                 ; Current Language ID
+   mov     InstalledLanguageID, al
+   mov     cx, es:[000Dh]                 ; Current Version ID
+   mov     dx, ImageVersion               ; My Image Version ID
+   xchg    ch, cl
+   mov     InstalledVersion_Code, cx      ; remember installed code version
+   cmp     cx, dx                         ; If version number in image is higher
+   jb      IVC_MGU_b                        ;  -> Upgradeable
+   mov     iStatus_Code, Status_Installed
+   ret
+  IVC_MGU_b:
+   mov     iStatus_Code, Status_InstalledMGU
+   ret
 Init_VerifyConfig              EndP
 …
 ; Internal
 Init_CheckThisMBR              Proc Near  Uses
+Init_CheckThisMBR              Proc Near
    cmp     wptr es:[si+01FEh], 0AA55h
    jne     ICTM_InvalidMBR
 …
 ; Copies BackUp MBR into current MBR area, so it will get installed
 Init_CopyBackupMBR             Proc Near  Uses ds si es di
+   push    ds es
+   pop     ds es                         ; Exchange DS&ES so DS==HDD, ES==New BootCode
+   push    ds
+   push    es
+   pop     ds
+   pop     es                         ; Exchange DS&ES so DS==HDD, ES==New BootCode
    mov     si, 7600h                     ; Sector 60...
    mov     di, offset BootImage          ;  -> to Sector 1 of New BootCode
 …
 ; ---------------------------
-; Space for bootcode-image
-BootImage       db 31744 dup (?)

trunk/Makefile

-              r36
+              r37
+###############################################################################
+# Makefile :: Builds AiR-BOOT for all supported Languages.                    #
+###############################################################################
+#
+# MAKEFILE -- Wrapper around the DOS .BAT files.
+# The default language for the loader code is EN.
+# Supported languages are: EN,DE,FR,SW,IT,NL,RU.
+# The 1.06 version used 'DT' for the Dutch language,
+# this has been changed to 'NL'.
+# To build all languages, set the LANGUAGE macro below to ALL.
+#
 LANGUAGE=EN
 …
+#
 # Build the loader code, the installers and SETABOOT.
+#
-# The default language for the loader code is EN.
-# To build another language, edit BOOTCODE\_build.cmd and change the lang variable.
-# Supported languages are: EN,DE,FR,SW,IT,NL,RU.
-# To build all languages, edit BOOTCODE\_build.cmd and set the lang variable to 'ALL'.
-# The 1.06 version used 'DT' for the Dutch language, this has been changed to 'NL'.
+#
 all: .SYMBOLIC
 …
         cd BOOTCODE
         call _clean.cmd
+        cd MBR-PROT
+        call _clean.cmd
+        cd ..
         cd ..
 …
         call _clean.cmd
         cd ..\..\..
+        cd TOOLS\INTERNAL
+        call _clean.cmd
+        cd ..\..

trunk/TOOLS/DOS/INITHDD/INITHDD.ASM

-              r30
+              r37
+;
 JUMPS
+;JUMPS
+Include ..\..\..\include\asm.inc
+;include ..\..\..\include\dos\airboot.inc
+Include ../../../INCLUDE/ASM.INC
                 .386p
                 model large, basic
+                .model large, basic
 code_seg        segment public use16
 …
 air_boot_setup: jmp     INITHDD_Start
 Introduction:           db 'INITHDD - AiR-BOOT Initialize HDD Utility (DOS) - (c) 2004 by M. Kiewitz',13,10
+Introduction            db 'INITHDD - AiR-BOOT Initialize HDD Utility (DOS) - (c) 2004 by M. Kiewitz',13,10
                         db 0
 …
    dw 00000h, 00000h, 00000h, 0AA55h
 ;   Include ..\..\..\include\DOS\Const.asm
+;   Include ../../../INCLUDE\DOS\CONST.ASM
 INITHDD_Start:  mov     ax, cs

trunk/TOOLS/DOS/INITHDD/MAKE.BAT

-              r30
+              r37
 %exe2bin% inithdd.exe inithdd.com >nul
 if errorlevel 1 goto Failed
+copy inithdd.com ..\..\..\RELEASE\DOS\inithdd.com
+copy inithdd.com ..\..\..\RELEASE\DOS\INITHDD.COM
+@ren inithdd.LST inithdd.TSL
+@ren inithdd.TSL INITHDD.LST
 rem Cleanup

trunk/TOOLS/DOS/INITHDD/MAKE.CMD

-              r36
+              r37
 @echo off
 rem Do actual build...
 call ..\..\..\env\dos.bat
+call ..\..\..\env\os2.cmd
 %assembler% inithdd.asm
 if errorlevel 1 goto Failed
 %linker% inithdd.obj >nul
+%linker% inithdd.obj; >nul
 if errorlevel 1 goto Failed
 %exe2bin% inithdd.exe inithdd.com >nul
 if errorlevel 1 goto Failed
+copy inithdd.com ..\..\..\RELEASE\DOS\inithdd.com
+copy inithdd.com ..\..\..\RELEASE\DOS\INITHDD.COM
+@ren inithdd.LST inithdd.TSL
+@ren inithdd.TSL INITHDD.LST
 rem Cleanup

trunk/TOOLS/DOS/SETABOOT/SETABOOT.ASM

-              r29
+              r37
 JUMPS
 Include ..\..\..\Include\asm.inc
 include ..\..\..\include\dos\airboot.inc
+Include ../../../INCLUDE/ASM.INC
+include ../../../INCLUDE/DOS/AIRBOOT.INC
                 .386p
 …
                         db ' detected.', 13, 10, 0
    Include ..\..\..\include\dos\Const.asm
+   Include ../../../INCLUDE/DOS/CONST.ASM
 AiRBOOTdetected         db 0
 …
                 ;  DL holds total IPT entries to go
                 ;  DH holds current partition number (base 0)
+                push    cx es di
+                push    cx
+                push    es
+                push    di
                    mov     ax, ds
                    mov     es, ax        ; ES == DS for now
 …
                    mov     di, offset TrackZero+6E00h ; Starting at sector 56
                   CmdLine_RebootToSearchLoop:
+                      push    si di
+                      push    si
+                      push    di
                          add     di, 4   ; Seek to "PartitionName" item
                          mov     cx, bx
                          rep     cmpsb
+                      pop     di si
+                      pop     di
+                      pop     si
                       je      CmdLine_RebootToSearchDone
                       add     di, 34     ; Length of IPT entry
 …
                   CmdLine_RebootToSearchDone:
                    mov     bl, ds:[di+17] ; Get "Flags"
+                pop     di es cx
+                pop     di
+                pop     es
+                pop     cx
                 or      dl, dl           ; If no partitions left -> not found
                 jz      CmdLine_RebootToNotFound

trunk/TOOLS/INTERNAL/FIXCODE.ASM

-              r31
+              r37
 ;  b) it writes totally used sectors to byte at offset 10h in the image
+JUMPS
+Include ..\..\include\asm.inc
+; include ..\..\include\dos\airboot.inc
+                .386p
+                model large, basic
+code_seg        segment public use16
+                assume  cs:code_seg, ds:code_seg, es:nothing, ss:nothing
+;JUMPS
+Include ../../INCLUDE/ASM.INC
+                .286p
+                .model small, basic
+fixcode         group code_seg,bss_data
+code_seg        segment  use16 public 'CODE'
+                ;assume  cs:code_seg, ds:code_seg, es:nothing, ss:nothing
+                assume  cs:fixcode, ds:fixcode, es:nothing, ss:nothing
                 org     100h
 COM_StartUp:    jmp     COM_Init
 …
 ShowMessage     EndP
 ShowError       Proc Near  Uses
+ShowError       Proc Near
    mov     ah, 09h
    int     21h              ; DOS: WRITE STRING DS:DX TO CONSOLE
+  EndProgram:
+   mov     ax, 4C00h
+   int     21h              ; DOS: TERMINATE PROGRAM
+   jmp     EndProgram
+   ret
 ShowError       EndP
+COM_Init:       mov     ax, cs
+COM_Init:
+                ; Setup and Copyright.
+                mov     ax, cs
                 mov     ds, ax
                 mov     es, ax           ; CS==DS==ES
 …
                 call    ShowMessage
                 ; =========================================== Load air-boot.bin
+                ; Open AIR-BOOT.COM
                 mov     dx, offset COM_LoadCode
                 call    ShowMessage
 …
 DoneOpenCode:   mov     bx, ax           ; BX = Filehandle
+                ; Load AIR-BOOT.COM
                 mov     ah, 3Fh
                 mov     cx, image_size   ; Image size
 …
                 call    ShowError
+DoneReadCode:   cmp     ax, image_size
+DoneReadCode:
+                ; See if at least 'image-size' is loaded.
+                cmp     ax, image_size
                 je      DoneReadCode2
 InvalidCode:    mov     dx, offset COM_FailedInvalidCode
                 call    ShowError
+                ; Try to read again which is expected to fail.
+                ; Otherwise image is too large.
 DoneReadCode2:  mov     ah, 3Fh
                 mov     cx, 1
 …
                 jmp     InvalidCode
+                ; It's loaded now, close it.
 DoneReadCode3:  mov     ah, 3Eh
                 int     21h              ; DOS: CLOSE FILE
 …
                 call    ShowMessage
                 ; =================================== Load MBR-protection image
+                ; Open MBR_PROT.COM
                 mov     dx, offset COM_LoadMBR
                 call    ShowMessage
 …
 DoneOpenMBR:    mov     bx, ax           ; BX = Filehandle
+                ; Load MBR_PROT.COM
                 mov     ah, 3Fh
                 mov     cx, 1024         ; Image size
 …
                 call    ShowError
+DoneReadMBR:    cmp     ax, 1024
+DoneReadMBR:
+                ; See if at least 1kB is loaded.
+                cmp     ax, 1024
                 je      DoneReadMBR2
 InvalidMBR:     mov     dx, offset COM_FailedInvalidMBR
                 call    ShowError
+                ; Try to read again which is expected to fail.
+                ; Otherwise image is too large.
 DoneReadMBR2:   mov     ah, 3Fh
                 mov     cx, 1
 …
                 jmp     InvalidMBR
+                ; It's loaded now, close file.
 DoneReadMBR3:   mov     ah, 3Eh
                 int     21h              ; DOS: CLOSE FILE
 …
                 call    ShowMessage
                 ; ========================== Merge MBR-Protection into Bootcode
                 mov     dx, offset COM_MergeMBR
 …
                 ; Search for signature in Bootcode
+                ; Note the search is with sector granularity.
+                ; This means the signature must be 512 bytes aligned.
                 mov     si, offset BootCode
                 mov     di, offset MBRProtectionSignature
                 mov     cx, MBRProtectionSignatureLen
+                mov     dx, 54 ; 54 sectors where signature may be (all sectors preceding config sector)
+                ; 54 sectors where signature may be.
+                ; (all sectors preceding config sector)
+                mov     dx, 54
 COM_SignatureLoop:
+                push    cx si di
+                push    cx
+                push    si
+                push    di
                    repe    cmpsb
+                pop     di si cx
+                pop     di
+                pop     si
+                pop     cx
                 je      COM_GotSignature
                 add     si, 512
 …
                 mov     cx, 256
                 mov     dx, 53
+COM_CodeEndLoop:push    cx si di
+COM_CodeEndLoop:push    cx
+                push    si
+                push    di
 COM_CodeEndLoop2:
                    cmp     wptr ds:[si], 0
 …
                    jnz     COM_CodeEndLoop2
 COM_ExitCodeEndLoop:
+                pop     di si cx
+                pop     di
+                pop     si
+                pop     cx
                 jne     COM_FoundCodeEnd
                 sub     si, 512
 …
                 jmp     EndProgram
+EndProgram:
+   ; DOS: TERMINATE PROGRAM
+   mov     ax, 4C00h
+   int     21h
+COM_EndOfSegment:
+code_seg        ends
+bss_data    segment  use16 public   'BSS'
 ; Buffers for files
 BootCode        db  image_size dup (?)
 MBRProtection   db  1024 dup (?)
+COM_EndOfSegment:
+code_seg        ends
+bss_data    ends
                 end     COM_StartUp

trunk/WARNING.TXT

r31	r37
3	3	a severe bug!! Building from these sources and then disabling
4	4	the 'force LBA' feature while also using the drive-letter feature or
5		editing the label can ~~destroy the MBR on all attached disks~~!!
6		DO NOT DISABLE 'FORCE LBA USAGE' WHEN BUILT FROM THE ~~ABOV~~E COMMITS!!
	5	editing the label can DESTROY THE MBR on ALL ATTACHED DISKS!!
	6	DO NOT DISABLE 'FORCE LBA USAGE' WHEN BUILT FROM THE THESE COMMITS!!

trunk/_build.cmd

r30	r37
1		/* REXX */
	1	@wmake
2	2
3		~~'wmake';~~

trunk/_clean.cmd

r30	r37
1		/* REXX */
2
3		'wmake clean';
	1	@wmake clean

Context Navigation

Legend:

Download in other formats: