Changeset 30 for trunk/BOOTCODE/REGULAR

Timestamp:

May 6, 2011, 4:25:19 AM (15 years ago)

Author:

Ben Rietbroek

Message:

AiR-BOOT v1.07 -- As released with eCS v2.1. [2011-05-06]
Signature-date: 2006-03-13. (incorrect)
Trunk contains buildable v1.07 version as distributed with eCS v2.1.
Directory 'tags' contains v1.06 & v1.07 reference versions
built for all languages. Note that language ID for 'Dutch' changed
from 'DT' to 'NL' in v1.07 and that the v1.06 reference version also
uses 'NL' for 'Dutch'.
Also note that helper programs like the installer and setaboot are
are only modified for the OS/2 versions in v1.07.
The signature-date for v1.07 incorrectly states the same
date as for v1.06. The signature-version is correct.
Removed other binaries. (cd-rom images, old releases, etc.)
The tags serve as reference versions:

• v1.06: rebuilt from source. (tags/v1.06r)
• v1.07: built as released with eCS v2.1. (tags/v1.07r)

Location:

trunk/BOOTCODE/REGULAR

Files:

• AUXIO.ASM (added)
• BOOTMENU.ASM (modified) (27 diffs)
• CONV.ASM (added)
• DEBUG.ASM (added)
• DRIVEIO.ASM (modified) (14 diffs)
• MATH.ASM (added)
• OTHER.ASM (modified) (9 diffs)
• PARTMAIN.ASM (modified) (25 diffs)
• PARTSCAN.ASM (modified) (21 diffs)
• PASSWORD.ASM (modified) (2 diffs)
• STD_TEXT.ASM (modified) (2 diffs)
• TIMER.ASM (modified) (5 diffs)
• VIDEOIO.ASM (modified) (18 diffs)

trunk/BOOTCODE/REGULAR/BOOTMENU.ASM

@@ -20 +20 @@
 ;---------------------------------------------------------------------------
 
+IFDEF ModuleNames
+DB 'BOOTMENU',0
+ENDIF
+
 BOOTMENU_BuildBackground        Proc Near   Uses es di
    call    VideoIO_CursorOff
@@ -32 +36 @@
 BOOTMENU_BuildBackground        EndP
 
+CLR_COPYRIGHT_CLASSIC   = 0f00h
+CLR_COPYRIGHT_BM  = 0700h
+
 BOOTMENU_BuildMain              Proc Near   Uses es di
    ; 1st line with Copyright information...
    mov     cx, 0101h
    call    VideoIO_Locate
-   mov     cx, 0F00h
+   mov     cx, CLR_COPYRIGHT_BM
    call    VideoIO_Color
    mov     si, offset Copyright
@@ -42 +49 @@
 
    ; Boot-Window...
-   mov     cx, 0901h
+CLR_BOOT_WINDOW_CLASSIC    = 0901h
+CLR_BOOT_WINDOW_BM         = 0701h
+
+   mov     cx, CLR_BOOT_WINDOW_BM
    call    VideoIO_Color
    mov     bx, 0201h
@@ -53 +63 @@
    mov     al, TextChar_WinLineRight
    mov     cl, 78
-   call    VideoIO_Internal_MakeWinRight 
+   call    VideoIO_Internal_MakeWinRight
 
    mov     dl, 18h
@@ -63 +73 @@
 
    ; Display Top-Infos in Boot-Window
-   mov     cx, 0B01h
+
+CLR_TOP_INFOS_CLASSIC    = 0b01h
+CLR_TOP_INFOS_BM  = 0301h
+
+   mov     cx, CLR_TOP_INFOS_BM
    call    VideoIO_Color
    mov     ch, 03h
@@ -91 +105 @@
 
    ; Now make the separating vertical lines...
-   mov     cx, 0901h
+CLR_SEP_VERT_LINES_CLASSIC    = 0901h
+CLR_SEP_VERT_LINES_BM   = 0701h
+
+   mov     cx, CLR_SEP_VERT_LINES_BM
    call    VideoIO_Color
    mov     ch, 03h
@@ -157 +174 @@
    ; Boot-Window is DONE
 
-   mov     cx, 0C04h
-   call    VideoIO_Color
+; Rousseau: = Colors =
+; FG
+; BG
+; 7 = grey
+; 6 = brown
+; 5 = magenta
+; 4 = red
+; 3 = cyan
+; 2 = green
+; 1 = blue
+
+CLR_INFO_WINDOW_CLASSIC    = 0c04h
+CLR_INFO_WINDOW_BM   = 0701h
+
+   mov     cx, CLR_INFO_WINDOW_BM
+   ;mov     cx, 0C06h ; brown, main background
+   call    VideoIO_Color                                                         ; Rousseau: color info window
+
    mov     bx, 1401h
    mov     dx, 1950h
@@ -173 +206 @@
    mov     cx, 1703h
    call    VideoIO_Locate
-   mov     cx, 0F04h
-   call    VideoIO_Color
+
+CLR_INFO_TEXT_CLASSIC   = 0f04h
+CLR_INFO_TEXT_BM   = 0701h
+
+   mov     cx, CLR_INFO_TEXT_BM                   ; Info text
+   call    VideoIO_Color                                                         ; Rousseau: color info text
+
    mov     si, offset TXT_BootMenuHelpText1
    call    VideoIO_Print
@@ -182 +220 @@
    call    VideoIO_Print
 
-   mov     cx, 0C04h
+
+CLR_F10_SETUP_CLASSIC   = 0c04h
+CLR_F10_SETUP_BM        = 0901h
+
+   mov     cx, CLR_F10_SETUP_BM                            ; background F10 enter Setup
    call    VideoIO_Color
 
@@ -198 +240 @@
    call    VideoIO_PrintSingleChar
    ; HelpWindow done...
+
+
+   ; Rousseau: Debug Stuff, put here after building Main Menu
+   ;call    VideoIO_DBG_WriteString
+   ;call    VideoIO_DBG_WriteString2
+
    ret
 BOOTMENU_BuildMain              EndP
+
+
 
 BOOTMENU_BuildGoodBye           Proc Near   Uses es di
@@ -209 +259 @@
    rep     stosw
    ; -------------------------------------------
-   mov     cx, 0D05h
+
+CLR_GOODBYE_WINDOW_CLASSIC = 0d05h
+CLR_GOODBYE_WINDOW_BM   = 0f01h
+
+   mov     cx, CLR_GOODBYE_WINDOW_BM
    call    VideoIO_Color
    mov     bx, 0101h
@@ -221 +275 @@
    mov     cx, 9
    mov     al, WinCharRight
-   mov     ah, 05Dh
+
+   ; Little part before version in goodbye-window
+   ; Does not use color-function
+   ;mov     ah, 05Dh
+   mov     ah, 01fh
    rep     stosw
+
    mov     cx, 010Bh
    call    VideoIO_Locate
@@ -240 +299 @@
    mov     al, TextChar_WinRep4
    call    VideoIO_PrintSingleChar
-   mov     cx, 0E01h
+
+CLR_GOODBYE_AB_VERSION_CLASSIC   = 0e01h
+CLR_GOODBYE_AB_VERSION_BM  = 0e03h
+
+   mov     cx, CLR_GOODBYE_AB_VERSION_BM
    call    VideoIO_Color
    mov     si, offset Copyright
    mov     cl, 11+CopyrightVersionLen
    call    VideoIO_FixedPrint
-   mov     cx, 0D05h
+
+   mov     cx, CLR_GOODBYE_WINDOW_BM
+
    call    VideoIO_Color
    mov     al, TextChar_WinRep5
@@ -251 +316 @@
    mov     cx, 020Dh
    call    VideoIO_Locate
-   mov     cx, 0F05h
+
+   CLR_GOODBYE_WINDOW_CLASSIC_2    = 0f05h
+   CLR_GOODBYE_WINDOW_BM_2   = 0701h
+
+   mov     cx,  CLR_GOODBYE_WINDOW_BM_2
    call    VideoIO_Color
    inc     si
@@ -272 +341 @@
 BOOTMENU_BuildGoodBye           EndP
 
+
+
 ; Must preserve AX!
 BOOTMENU_BuildTimedBootText     Proc Near   Uses ax cx si es di
-   mov     cx, 1503h
-   call    VideoIO_Locate
-   mov     cx, 0E04h
+   mov     cx, 1503h ;
+   call    VideoIO_Locate
+
+CLR_NON_TIMED_BAR_CLASSIC  = 0e04h
+CLR_NON_TIMED_BAR_BM = 0701h
+
+   mov     cx, CLR_NON_TIMED_BAR_BM                      ; non-timed time bar
    call    VideoIO_Color
    call    VideoIO_Internal_SetRegs
@@ -294 +369 @@
    mov     cx, 1503h
    call    VideoIO_Locate
-   mov     cx, 0E04h
+
+CLR_TIMED_BAR_CLASSIC   = 0e04h
+CLR_TIMED_BAR_BM  = 0e04h
+
+   mov     cx, CLR_TIMED_BAR_BM ; timed time bar, yellow on red
    call    VideoIO_Color
    mov     si, offset TXT_TimedBootLine  ; will print TimedBootEntryName too
@@ -325 +404 @@
 BOOTMENU_RefreshPartitionText   EndP
 
+
+CLR_VOLUME_INDEX_CLASSIC   = 0f01h
+CLR_VOLUME_INDEX_BM  = 0f01h
+
 ; Writes Partition-Information to Screen (Boot-Menu)
 ;        In: CH - Line to print info
@@ -339 +422 @@
    mov     dh, cl
    call    VideoIO_Locate
-   mov     cx, 0F01h                     ; Bwhite, blue
+   mov     cx, CLR_VOLUME_INDEX_BM                     ; Bwhite, blue
    call    VideoIO_Color
    mov     al, dl
@@ -347 +430 @@
    ; === Display Drive-Number and Size (Size only in detailed view) ===
    add     dh, 5
-   movzx   cx, dh
-   call    VideoIO_Locate
-   mov     cx, 0D01h
+   ;movzx   cx, dh
+   mov   cl,dh
+   mov   ch,0
+
+   call    VideoIO_Locate
+
+CLR_HD_INDEX_CLASSIC    = 0d01h
+CLR_HD_INDEX_BM   = 0701h
+
+   mov     cx, CLR_HD_INDEX_BM
    call    VideoIO_Color                 ; Violet, blue
    mov     si, PartPointer
@@ -367 +457 @@
      BMBPT_IsHarddrive:
       ; Now display Size-Element...
-      mov     cx, 0501h
+
+CLR_HD_SIZE_CLASSIC  = 0501h
+CLR_HD_SIZE_BM = 0701h
+
+      mov     cx, CLR_HD_SIZE_BM
       call    VideoIO_Color              ; Dark-Violet, Blue
       mov     al, '/'
       call    VideoIO_PrintSingleChar
-      mov     cx, 0D01h
+      mov     cx, CLR_HD_SIZE_BM
       call    VideoIO_Color              ; Violet, Blue
       mov     ax, PartPointer            ; Get Size-Element from PartPtr (AX)
@@ -383 +477 @@
 
    ; === Display Label ===
-   movzx   cx, dh
-   call    VideoIO_Locate
-   mov     cx, 0E01h
+   ;movzx   cx, dh
+   mov   cl,dh
+   mov   ch,0
+
+   call    VideoIO_Locate
+
+CLR_LABEL_CLASSIC    = 0e01h
+CLR_LABEL_BM   = 0f01h
+
+   mov     cx, CLR_LABEL_BM
    call    VideoIO_Color                 ; Yellow, blue
    mov     si, PartPointer
@@ -394 +495 @@
    ; === Display Type ===
    add     dh, 14
-   movzx   cx, dh
+   ;movzx   cx, dh
+   mov   cl,dh
+   mov   ch,0
+
    call    VideoIO_Locate
    mov     si, PartPointer
    mov     al, [si+LocIPT_SystemID]
    call    PART_SearchFileSysName
-   mov     cx, 0C01h
+
+CLR_FS_NAME_CLASSIC  =  0c01h
+CLR_FS_NAME_BM =  0701h
+
+   mov     cx, CLR_FS_NAME_BM
    call    VideoIO_Color                 ; Hrot, Blau
    mov     cl, 8
@@ -410 +518 @@
 ;       Out: DX - will get returned (fixed, if needed)
 BOOTMENU_BuildChoiceBar         Proc near   Uses ax es di
+
+   ;call  SOUND_Beep
+
    call    VideoIO_WaitRetrace
+
+
+   ;call  SOUND_Beep
+
    mov     cl, 10h    ; Color BLUE, Partition DL
    call    BOOTMENU_ReColorPart
+
+   ;call  SOUND_Beep
 
    ; Check, if clipping needed...
@@ -448 +565 @@
    call    BOOTMENU_RefreshPartitionText
 
+
+; Keuze bar
+; 00h black
+; 10h blue
+; 20h green (also nice)
+; 30h cyan (also nice)
+; 40h red
+; 50h magenta
+; 60h brown (nice)
+; 70h white
+; 80h grey
+; 90h light blue (nice)
+; 0a0h bright green
+; 0b0h bright cyan
+; 0c0h bright red
+; 0d0h bright magenta
+; 0e0h bright yellow
+; 0f0h bright white
+
+
+CLR_SELECTION_BAR_CLASSIC  = 50h
+CLR_SELECTION_BAR_BM = 090h
+
+
+
   BMBCB_AfterScrolling:
-   mov     cl, 50h    ; Color PINK, Partition DL
+   mov     cl, CLR_SELECTION_BAR_BM    ; Color PINK, Partition DL
    call    BOOTMENU_ReColorPart
    ret
@@ -457 +599 @@
 ; Destroyed: None, but Locate-Pointer gets set
 BOOTMENU_ReColorPart            Proc Near   Uses bx cx es di
+
+  ; call  SOUND_Beep
+
    mov     bh, cl     ; Color to BH
    ; First calculate location of bar
@@ -475 +620 @@
       and     al, 0Fh
       or      al, bh                     ; Adds background color (from BH)
+
+      ;mov      al,97h
+
       mov     es:[di], al
       add     di, 2
@@ -615 +763 @@
    ; Got it, so display bar...
    mov     dh, dl
+
+   ;call  SOUND_Beep
+
    call    BOOTMENU_BuildChoiceBar       ; DH - Active, DL - Last Active
+
+   ;call  SOUND_Beep
+
    call    SOUND_PreBootMenu
 
+
   BME_MainLoop:
+
+     ;call    VideoIO_DBG_WriteString2    ; Rousseau
+
    test    TimedBootEnable, 1
    jz      BME_NoTimedBoot

trunk/BOOTCODE/REGULAR/DRIVEIO.ASM

@@ -19 +19 @@
 ;                                                      AiR-BOOT / DRIVE I/O
 ;---------------------------------------------------------------------------
+
+
+
+IFDEF ModuleNames
+DB 'DRIVEIO',0
+ENDIF
 
 ; Note: Some routines set DS/ES to CS or even address via CS, even if its not
@@ -141 +147 @@
 ;  This is calculated by Sector*Heads. Comparing will get done with Bit 25-10
 ;  on LBA sectors, so we actually divide sector number by 1024.
-DriveIO_InitLBASwitchTable      Proc Near   Uses es di
+DriveIO_InitLBASwitchTable      Proc Near   Uses es di                           ; Rousseau: LBA !
    mov     di, offset LBASwitchTable
    mov     dh, TotalHarddiscs
@@ -152 +158 @@
          jc      DIOILUT_Error
          and     cl, 111111b    ; Isolate lower 6 bits of CL -> sector count
-         movzx   ax, cl
-         mov     bl, dh         ; DH -> head count
+
+         ; huge disk 127 sec/track on <1TB using DANI
+;         mov     cl, 07Fh
+
+         ;movzx   ax, cl
+         mov   al,cl
+         mov   ah,0
+
+         mov     bl, dh         ; DH -> head count                               ; Rousseau: nope, it's max head number !
          mul     bl             ; AX = Sectors*Heads
          shl     ah, 1
@@ -168 +181 @@
 DriveIO_InitLBASwitchTable      EndP
 
+
+
+
 ; Adjusts BX:AX / CX:DX to meet LVM sector location
 ;  Destroys SI
-DriveIO_LVMAdjustToInfoSector   Proc Near   Uses
-   push    cx
-      xor     ch, ch
-      and     cl, 63                     ; Isolate lower bits, because upper
-      mov     si, 63                     ;  ones may be used for cylinder
-      sub     si, cx
-   pop     cx
-   add     ax, si
-   adc     bx, 0                         ; Adjust LBA Sector (BX:AX)
-   or      cl, 63                        ; Set Sector to 63
-   ret
+; Rousseau: Enhanced to handle sector-numbers 127 and 255 besides 63 for LVM-info sectors.
+;           Ugly, need to cleanup.
+DriveIO_LVMAdjustToInfoSector   Proc Near   Uses                                 ; Rousseau: LVM stuff !
+
+
+
+;      pusha
+;      call     AuxIO_TeletypeNL
+
+      ; LBA
+;      xchg     dx,bx
+;      call     AuxIO_TeletypeHexDWord
+;      call     AuxIO_TeletypeNL
+;      xchg     bx,dx
+
+      ; CYL
+;      mov      al,ch
+;      call     AuxIO_TeletypeHexByte
+;      call     AuxIO_TeletypeNL
+
+      ; HEAD
+;      mov      al,dh
+;      call     AuxIO_TeletypeHexByte
+;      call     AuxIO_TeletypeNL
+
+      ; SEC
+;      mov      al,cl
+;      call     AuxIO_TeletypeHexByte
+;      call     AuxIO_TeletypeNL
+
+      ; DRIVE
+;      mov      al,dl
+;      call     AuxIO_TeletypeHexByte
+;      call     AuxIO_TeletypeNL
+
+;      popa
+
+
+      ;local ts:word
+      ;local ts2:word
+
+      pusha
+
+         ; Dump drive
+         mov      si,offset drive
+         call     AuxIO_Print
+         xchg     al,dl
+         call     AuxIO_TeletypeHexByte
+         call     AuxIO_TeletypeNL
+         xchg     dl,al
+
+         ; Dump SPT
+         mov      si,offset spt_used
+         call     AuxIO_Print
+         push     dx
+         push     bx
+            xor      dh,dh
+            and      dl,01111111b
+            shl      dx,1
+            shl      dx,1
+            mov      bx, offset TrueSecs
+            add      bx,dx
+            mov      ax,word ptr [bx]
+
+            ;mov      [ts],ax
+
+            call     AuxIO_TeletypeHexWord
+            call     AuxIO_TeletypeNL
+         pop      bx
+         pop      dx
+
+         pusha
+            push     dx
+               ; Location of extended position
+               mov      dx,word ptr [ExtendedAbsPos+02]
+               mov      ax,word ptr [ExtendedAbsPos+00]
+               call     AuxIO_TeletypeHexDWord
+               call     AuxIO_TeletypeNL
+            pop      dx
+
+            xor      dh,dh
+            and      dl,01111111b
+            shl      dx,1
+            shl      dx,1
+            mov      bx, offset TrueSecs
+            add      bx,dx
+
+            mov      ax, word ptr[bx]
+            call     AuxIO_TeletypeHexWord
+            call     AuxIO_TeletypeNL
+            mov      al,[ExtendedAbsPosSet]           ; if true -> 1st sector of extpart (EBR), not logpart(BPB)
+            call     AuxIO_TeletypeHexByte
+            call     AuxIO_TeletypeNL
+      ;      mov      si,offset PartitionSector
+      ;      call     AuxIO_DumpSector
+         popa
+
+         ; LBA
+         mov      si,offset before_lvm_adjust
+         call     AuxIO_Print
+
+         xchg     dx,bx
+         call     AuxIO_TeletypeHexDWord
+         call     AuxIO_TeletypeNL
+         xchg     bx,dx
+      popa
+
+
+      ;or       bx,ax
+      test     [ExtendedAbsPosSet],1
+      jz       pri
+
+
+
+
+      pusha
+         mov      si,offset before_lvm_adjust_log
+         call     AuxIO_Print
+         ; LBA
+         xchg     dx,bx
+         call     AuxIO_TeletypeHexDWord
+         call     AuxIO_TeletypeNL
+         xchg     bx,dx
+      popa
+
+
+      push     dx
+      push     bx
+         xor      dh,dh
+         and      dl,01111111b
+         shl      dx,1
+         shl      dx,1
+         mov      bx,offset TrueSecs
+         add      bx,dx
+         mov      dx,[bx]
+         dec      dx
+         add      ax,dx
+      pop      bx
+      pop      dx
+      adc      bx,0
+
+
+      pusha
+         mov      si,offset after_lvm_adjust_log
+         call     AuxIO_Print
+         ; LBA
+         xchg     dx,bx
+         call     AuxIO_TeletypeHexDWord
+         call     AuxIO_TeletypeNL
+         xchg     bx,dx
+      popa
+
+      jmp      done
+
+
+
+
+pri:
+
+
+      push     ax
+      push     cx
+         xor      ch, ch                           ; Zero out upper-byte
+
+         push     dx
+            xor      dh,dh
+            and      dl,01111111b
+            shl      dx,1
+            shl      dx,1
+            push     bx
+               mov      bx,offset TrueSecs
+               add      bx,dx
+               mov      ax,[bx]
+               ;mov      [ts2],ax
+            pop      bx
+         pop      dx
+
+
+
+         ;mov      al, 63
+         ;call VideoIO_PrintByteDynamicNumber
+         ;self: jmp self
+
+
+
+         ; DEZE WERKT SOMS NIET GOED
+         ; ROMMELT MET CYLINDERS
+         ; ALLEEN TOEPASSEN ALS INT13X NIET ACTIEF !
+
+         and      cl, al                           ; Isolate lower bits, because upper
+         mov      ah, 0
+         mov      si, ax                           ;  ones may be used for cylinder
+         sub      si, cx
+
+      pop      cx
+      pop      ax
+
+      or       cl, al                           ; Set sector to last sector
+
+      add      ax, si                           ; Adjust lower LBA
+      adc      bx, 0                            ; Adjust LBA Sector (BX:AX)
+
+
+
+      ;push     ax
+      ;call     AuxIO_TeletypeHexWord
+      ;call     AuxIO_TeletypeNL
+      ;mov      ax,[ts]
+      ;call     AuxIO_TeletypeHexWord
+      ;call     AuxIO_TeletypeNL
+      ;mov      ax,[ts2]
+      ;call     AuxIO_TeletypeHexWord
+      ;call     AuxIO_TeletypeNL
+      ;pop      ax
+
+      ;and      ax,[ts]
+
+      jmp done
+
+
+
+done:
+
+
+
+      pusha
+         mov      si,offset after_lvm_adjust
+         call     AuxIO_Print
+         ; LBA
+         xchg     dx,bx
+         call     AuxIO_TeletypeHexDWord
+         call     AuxIO_TeletypeNL
+         xchg     bx,dx
+      popa
+
+
+
+;      pusha
+;      call     AuxIO_TeletypeNL
+
+      ; CYL
+;      mov      al,ch
+;      call     AuxIO_TeletypeHexByte
+;      call     AuxIO_TeletypeNL
+
+      ; HEAD
+;      mov      al,dh
+;      call     AuxIO_TeletypeHexByte
+;      call     AuxIO_TeletypeNL
+
+      ; SEC
+;      mov      al,cl
+;      call     AuxIO_TeletypeHexByte
+;      call     AuxIO_TeletypeNL
+
+      ; DRIVE
+;      mov      al,dl
+;      call     AuxIO_TeletypeHexByte
+;      call     AuxIO_TeletypeNL
+
+;      popa
+
+
+
+      ret
 DriveIO_LVMAdjustToInfoSector   EndP
 
-Comment *ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
- Routine: Loads partition to ExecBase and checks for validity
- ÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ
- Calling : bx:ax - Absolute sector
-           cx:dx - Cylinder/Sector, Side/Drive (hi/lo-byte)
- Returns : Carry Set if invalid partition encountered
- Preserve: all registers
- ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ*
+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
+
+
+
+; #########################################################################
+; Routine: Loads partition to ExecBase and checks for validity
+; #########################################################################
+; Calling : bx:ax - Absolute sector
+;           cx:dx - Cylinder/Sector, Side/Drive (hi/lo-byte)
+; Returns : Carry Set if invalid partition encountered
+; Preserve: all registers
+; #########################################################################
 DriveIO_LoadPartition           Proc Near  Uses si
    mov     wptr cs:[CurPartition_Location+0], ax
@@ -209 +488 @@
    stc                                   ; Set carry, so no partition table
   DIOLP_Success:
+
+IFDEF AuxDebug
+   ; show current partition location
+   pushf
+   pusha
+      call     AuxIO_TeletypeNL
+      mov      si,offset db_curpartloc
+      call     AuxIO_Print
+      mov      dx,word ptr [CurPartition_Location+02]
+      mov      ax,word ptr [CurPartition_Location+00]
+      call     AuxIO_TeletypeHexDWord
+      call     AuxIO_TeletypeNL
+      mov      si,offset PartitionSector
+      call     AuxIO_DumpSector
+      call     AuxIO_TeletypeNL
+   popa
+   popf
+ENDIF
+
    ret
   DIOLP_Failed:
@@ -214 +512 @@
 DriveIO_LoadPartition           EndP
 
-Comment *ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
- Routine: Writes a partition from ExecBase to its original sector
- ÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ
- Calling : none
- Returns : none
- Preserve: all registers
- ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ*
+; #########################################################################
+; Routine: Writes a partition from ExecBase to its original sector
+; #########################################################################
+; Calling : none
+; Returns : none
+; Preserve: all registers
+; #########################################################################
 DriveIO_SavePartition           Proc Near  Uses ax bx cx dx si
    mov     ax, wptr cs:[CurPartition_Location+0]
@@ -237 +535 @@
 DriveIO_LoadTmpSector           Proc Near  Uses
    mov     si, offset TmpSector
-   call    DriveIO_LoadSector
+   call    DriveIO_LoadSector                                                    ; Uses INT13X if needed
    ret
 DriveIO_LoadTmpSector           EndP
@@ -256 +554 @@
    mov     dx, wptr cs:[CurPartition_Location+4]
    mov     cx, wptr cs:[CurPartition_Location+6] ; Gets cur. partition location
-   call    DriveIO_LVMAdjustToInfoSector
+
+   call    DriveIO_LVMAdjustToInfoSector                                         ; Rousseau: LVM stuff !
+
    mov     si, offset LVMSector
    call    DriveIO_LoadSector
-   call    LVM_CheckSectorSignature
+
+IFDEF AuxDebug
+   ; show current partition location
+   pushf
+   pusha
+      call     AuxIO_TeletypeNL
+      mov      si,offset db_curlvmsec
+      call     AuxIO_Print
+      mov      dx,bx
+      call     AuxIO_TeletypeHexDWord
+      call     AuxIO_TeletypeNL
+      mov      si,offset LVMSector
+      call     AuxIO_DumpSector
+      call     AuxIO_TeletypeNL
+   popa
+   popf
+ENDIF
+
+   ; Rousseau
+   ;pushf
+   ;pusha
+   ;mov   si, offset MyText4
+   ;call  VideoIO_Print
+   ;mov   si, offset LVMSector
+   ;mov   al, [si+LocLVM_VolumeLetter2]
+   ;call  VideoIO_PrintByteDynamicNumber
+   ;mov   al, [si+LocLVM_Startable]
+   ;call  VideoIO_PrintByteDynamicNumber
+   ;mov   al, [si+LocLVM_OnBootMenu]
+   ;call  VideoIO_PrintByteDynamicNumber
+   ;;self: jmp self
+   ;popa
+   ;popf
+
+   call    LVM_CheckSectorSignature                                              ; Rousseau: LVM stuff !
    jnc     DIOLLVMS_NoLVMSector
-   call    LVM_CheckSectorCRC
+   call    LVM_CheckSectorCRC                                                    ; Rousseau: LVM stuff !
    jnc     DIOLLVMS_NoLVMSector
    ret
@@ -303 +637 @@
    jnz     InScanMode
    jmp     MBR_LoadError
-  InScanMode:   
+  InScanMode:
    mov     si, offset TXT_BrokenPartitionTable
    push    cs
@@ -319 +653 @@
 DriveIO_GotLoadError            EndP
 
-Comment *ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
- Routine: Loads a specified sector to DS:DI
- ÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ
- Calling : bx:ax - Absolute sector
-           cx:dx - Cylinder/Sector, Side/Drive (hi/lo-byte)
-           ds:si - Destination-Adress
- Returns : none
- Preserve: all registers
- ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ*
-DriveIO_LoadSector              Proc Near  Uses ax bx ds si es di
+; #########################################################################
+; Routine: Loads a specified sector to DS:DI
+; #########################################################################
+; Calling : bx:ax - Absolute sector
+;           cx:dx - Cylinder/Sector, Side/Drive (hi/lo-byte)
+;           ds:si - Destination-Adress
+; Returns : none
+; Preserve: all registers
+; #########################################################################
+DriveIO_LoadSector              Proc Near  Uses ax bx ds si es di                ; Rousseau: Disk IO
    test     cs:[CurIO_UseExtension], 1
    jz       DIOLS_UseNormal
    ; Are we forced do use LBA via Setting?
-   test     cs:[CFG_ForceLBAUsage], 1
+   test     cs:[CFG_ForceLBAUsage], 1                                            ; Rousseau: LBA
    jnz      DIOLS_UseExtension
    ; Is the drive not a harddrive?
@@ -351 +685 @@
          pop      es
          mov      bx, si                     ; ES:BX - Destination
-         mov      ax, 0201h                  ; Function 2 - Load Sector
+         mov      ax, 0201h                  ; Function 2 - Load Sector          ; Rousseau: Disk IO -- legacy BIOS call
          int      13h
          jnc      DIOLS_Success
@@ -370 +704 @@
       pop     ds
       mov     si, offset DriveIO_DAP
-      mov     ah, 42h                        ; Extended Read
+      mov     ah, 42h                        ; Extended Read                     ; Rousseau: Disk IO -- extended BIOS call
       int     13h
    pop     cx
@@ -381 +715 @@
 DriveIO_LoadSector              EndP
 
-Comment *ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ
- Routine: Writes DS:SI to a specified sector
- ÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍÍ
- Calling : bx:ax - Absolute sector
-           cx:dx - Cylinder/Sector, Side/Drive (hi/lo-byte)
-           ds:si - Source-Adress
- Returns : none
- Preserve: all registers
- ÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄÄ*
+; #########################################################################
+; Routine: Writes DS:SI to a specified sector
+; #########################################################################
+; Calling : bx:ax - Absolute sector
+;           cx:dx - Cylinder/Sector, Side/Drive (hi/lo-byte)
+;           ds:si - Source-Adress
+; Returns : none
+; Preserve: all registers
+; #########################################################################
 DriveIO_SaveSector              Proc Near  Uses ax bx cx ds si es di
    test     cs:[CurIO_UseExtension], 1
    jz       DIOSS_UseNormal
    ; Are we forced do use LBA via Setting?
-   test     cs:[CFG_ForceLBAUsage], 1
+   test     cs:[CFG_ForceLBAUsage], 1                                            ; Rousseau: LBA
    jnz      DIOSS_UseExtension
    ; Is the drive not a harddrive?
@@ -440 +774 @@
    ret
 DriveIO_SaveSector              EndP
+
+
+; See if a LVM-sector is valid.
+; In  : si, pointer to sector
+; Out : ZF=true, not valid; ZF=false, valid
+DriveIO_LVMSectorValid           Proc  Near
+      pusha
+
+      call     LVM_CheckSectorSignature
+      mov      al,0
+      rcl      al,1                          ; Move CY to AL.0
+      call     AuxIO_TeletypeHexByte
+      call     AuxIO_TeletypeNL
+      or       al,al                         ; Zero if not a valid sector
+      jz       DriveIO_LVMSectorValid_End    ; Not a valid sector
+
+      call     LVM_CheckSectorCRC
+      stc
+      mov      al,0
+      rcl      al,1                          ; Move CY to AL.0
+      call     AuxIO_TeletypeHexByte
+      call     AuxIO_TeletypeNL
+      or       al,al                         ; Zero if not a valid sector
+
+   DriveIO_LVMSectorValid_End:
+
+      popa
+      ret
+DriveIO_LVMSectorValid           EndP
+
+; ------------------------------------------------------
+; Rousseau: # Load the master LVM-sector is one exists #
+; ------------------------------------------------------
+; Load the master LVM-sector to get the number of sectors per track as eCS views the drive.
+; If no master LVM-sector is found it is assumed eCS is not installed.
+; The master LVM-sector can be located at three different places according to drive size
+; and partitioning scheme and driver used.
+; When DANIS506.ADD is used, the eCS extended geometry will be 255/127 for drives >502GiB but <1TiB.
+; Then the location will be sector 127 which is LBA 126 (7Eh).
+; IBM1S506.ADD will always use 255/255 for the extended eCS geometry.
+; DANIS506.ADD will use 255/255 for drives >1TiB.
+; Then the location of the master LVM-sector will be 255 which is LBA 254 (FEh).
+; When eCS is installed on a huge drive that alread had a system on it, eCS will be confined to the
+; lower 502GiB of the drive. In this case the normal geometry from Int13X will be used.
+; This is also the case when no valid master LVM-sector can be found.
+;
+; Return ZF=true if not found, ZF=false when valid master LVM-sector found.
+DriveIO_LoadMasterLVMSector      Proc  Near
+      pusha
+
+      mov      si,offset db_lmlvm
+      ;call     AuxIO_Print
+
+      mov      al,dl
+      ;call     AuxIO_TeletypeHexByte
+      ;call     AuxIO_TeletypeNL
+
+
+      ; Loop over the sector-translation table,
+      ; process the first three values from high (255) to low (bios spt, most likely 63)
+      mov      cx,3
+DriveIO_LoadMasterLVMSector_NextTry:
+      mov      bx,offset secs_per_track_table         ; sector translation table that corresponds with IsHugeDrive
+      mov      si, offset LVMSector                   ; space to load the master LVM-sector
+      mov      [DriveIO_DAP_NumBlocks],1              ; number of sectors to read
+      mov      wptr [DriveIO_DAP_Transfer+0],si       ; low part of transfer address
+      mov      ax, ds
+      mov      wptr [DriveIO_DAP_Transfer+2],ax       ; high part of transfer address
+      mov      ax,cx                                  ; use the counter...
+      dec      ax                                     ; as an index into the table
+      xlatb                                           ; translate to number of sectors
+      dec      al                                     ; LBA is zero-based, so adjust
+
+IFDEF AuxDebug
+      ; Dump the value
+      ;call     AuxIO_TeletypeHexByte
+      ;call     AuxIO_TeletypeNL
+ENDIF
+
+      mov      wptr [DriveIO_DAP_Absolute+0],ax       ; LBA low      ;
+      mov      wptr [DriveIO_DAP_Absolute+2],00h      ; LBA high
+      mov      si, offset DriveIO_DAP                 ; address request packet
+      mov      ah, 42h
+      int      13h                                    ; do the i/o
+      jc       DriveIO_LoadMasterLVMSector_NotFound   ; oops, there was an error
+
+IFDEF AuxDebug
+      ; Dump title
+      mov      si,offset db_masterlvm
+      ;call     AuxIO_Print
+
+      ; Dum sector
+      mov      si, offset LVMSector
+      ;call     AuxIO_DumpSector
+      ;call     AuxIO_TeletypeNL
+ENDIF
+      ; See is this is a valid LVM-sector
+      call     DriveIO_LVMSectorValid
+
+IFDEF AuxDebug
+      pushf
+      ;call     AuxIO_TeletypeNL
+      popf
+ENDIF
+      ; Yep, we found the master LVM-sector
+      jnz      DriveIO_LoadMasterLVMSector_Found
+      ; Try next location
+      loop     DriveIO_LoadMasterLVMSector_NextTry
+
+   ; No master LVM-sector found, set ZF=true
+   DriveIO_LoadMasterLVMSector_NotFound:
+      xor      ax,ax
+
+   ; Jump here with ZF=false if found
+   DriveIO_LoadMasterLVMSector_Found:
+
+      popa
+      ret
+DriveIO_LoadMasterLVMSector     Endp
+
+
+
+
+; ---------------------------------------------------
+; Rousseau ## Large drives, (eCS) geometry and LBA ##
+; ---------------------------------------------------
+; A sector size of 512 bytes is assumed in the below calculations.
+; Note that this scheme changes when the sector size will be 4096 or larger,
+; like with modern drives that do not translate to 512 bytes per sector anymore.
+; These drives will have a capacity above the 2TiB LBA32 boundary.
+; For now, we assume drives <=2TiB with a sector size of 512 bytes.
+
+; There are a few boundaries that are of importance.
+; Note that these are disk-boundaries and not partition boundaries.
+; Even with a small partition, like <502GiB, OS/2 will use extended geometry on an
+; empty huge disk.
+; These boundaries are (from high to low):
+
+; (code 5)
+; 2^32 = 4294967296 = 100000000 sectors = 2048 GiB
+;   This is the LBA32 2TiB boundary.
+;   Everything above it must be addressed using LBA48.
+;   OS/2 can currently not address this space above.
+
+; (code4)
+; 65536*255*255 = 4261478400 = FE010000 sectors ~ 2032 GiB
+;   This is the max OS/2 boundary using 255/255 extended geometry.
+;   OS/2 can currently not address this space above.
+
+; (code 3)
+; 2^31 = 2147483648 = 80000000 sectors = 1024 GiB
+;   This is the LBA32 1TiB boundary.
+;   OS/2 can address this space and will use 255/255 extended geometry.
+
+; (code 2)
+; 65536*255*127 = 2122383360 = 7E810000 sectors ~ 1012 GiB
+;   This is the DANI 1TiB boundary.
+;   OS/2 can address this space and will use 255/255 extended geometry.
+;   Below this DANI will use 255/127 extended geometry.
+;   This matters on where the LVM-sectors are located !
+
+; (code 1)
+; 65536*255*63  = 1052835840 = 3EC10000 sectors ~ 502 GiB
+;   This is the current OS/2 limit using this geometry because OS/2 can currently
+;   not address more than 65536 cylinders.
+;   DANI will address space above with 255/127 extended geometry up until the DANI 1TiB boundary (code 2)
+
+; (code 0)
+; Everything below 65536*255*63 will be addressed using standard geometry.
+
+
+;
+; This function will return the following values:
+;
+
+; 5 = This drive is above the 2^32 LBA32 (2TB) boundary and has more than 4294967296 sectors.
+;     LBA48 addressing is needed to access the complete capacity of the drive.
+;     OS/2 is currently unable to do so.
+
+; 4 = This drive is above the 65536*255*255 (4261478400) boundary but below 2^32.
+;     This is an OS/2 boundary and OS/2 is not able to access the drive above this boundary.
+
+; 3 = This drive is above the 2^31 (1TB) boundary and has more than 2147483648 sectors.
+;     OS/2 is able to access the drive using it's extended geometry.
+;     Both DANIS506 and IBM1S506 will use the 255/255 scheme.
+
+; 2 = This drive is above the 65536*255*127 (2122383360) boundary but below 2^31.
+;     OS/2 is able to access the drive using it's extended geometry.
+;     Both DANIS506 and IBM1S506 will use the 255/255 scheme.
+
+; 1 = This drive is above the 65536*255*63 (1052835840) boundary but below 65536*255*127.
+;     OS/2 is able to access the drive using it's extended geometry.
+;     Note that DANIS506 will use 255/127 and IBM1S506 will use 255/255 geometry !
+;     Using DANI or IBM influences the location of the LVM info-sectors !
+
+; 0 = This drive is below the 65536*255*63 (1052835840) boundary.
+;     OS/2 is able to access this drive using the standard 255/63 geometry.
+
+; So, any return value >0 means OS/2 extended geometry will be used.
+; Value 1 will use 255/127 with DANIS506 but 255/255 with IBM1S506.
+; Values 2 and 3 will use 255/255 on both drivers.
+; You can or with 0x01 and check for 3 in this case.
+; Any value above 3 will be a drive who's capacity cannot be fully used by OS/2
+; The upper limit of 65536*255*255 will be in effect here.
+
+; Note this function currently handles the boot-drive only !
+; It should be extended and use dl for the drive-number as a parameter.
+; Because we use this function to get this info in a number of places,
+; all regs and flags except AX are saved and restored.
+
+; DL contains BIOS disk-number; 80h for first, 81h for second, etc.
+DriveIO_GatherDiskInfo  Proc Near
+      pushf
+      push    bx
+      push    cx
+      push    dx
+      push    si
+      push    di
+      push    es
+
+      ; Set ES to CS for buffer clearing
+      push    cs
+      pop     es
+
+      ; Clear the buffer
+      ; Don't overwrite the word of the buffersize at index 0 !
+      ; Old Phoenix BIOSses require word (flags) at 02 to be zero,
+      ; so we clear the whole buffer to be sure.
+      mov     cx, i13xbuf_size
+      mov     di, offset i13xbuf
+      mov     [di],cx
+      inc     di
+      inc     di
+      xor     ah,ah
+      cld
+      rep stosb
+
+      ; Get the drive parameters
+      mov     ah, 48h                                 ; Get Drive Parameters (extended version)
+      ;mov     dl, 80h                                ; Drive number
+      mov     si, offset i13xbuf                      ; Buffer for result-info
+      push    dx
+      int     13h                                     ; Call the BIOS-function
+      pop     dx
+
+      ; Do some error-checking
+      or      ah,ah                                   ; AH is zero if no error (ZF=1 if no error)
+      mov     ax,0                                    ; Setup code for non-huge drive (does not influence ZF)
+      jz      DriveIO_GatherDiskInfo_ok               ; Return if error (AL<>0 thus ZF=0) but CY not set, assuming non-huge drive
+      jnc     DriveIO_GatherDiskInfo_ok               ; Return if error (CY=1), assuming non-huge drive
+      jmp     DriveIO_GatherDiskInfo_ret
+
+
+   DriveIO_GatherDiskInfo_ok:
+
+      ;
+      ; Store the drive geometry
+      ;
+
+      mov      si, offset i13xbuf
+
+      xor      dh,dh
+      and      dl,01111111b
+      shl      dx,1
+      shl      dx,1
+
+      ; Store number of cylinders on disk
+      mov      bx, offset BIOS_Cyls
+      add      bx,dx
+      mov      ax,[si+04h]
+
+      mov      word ptr [bx+00],ax
+      mov      ax,[si+06]
+      mov      word ptr [bx+02],ax
+
+      ; Store number of heads per cylinder
+      mov      bx, offset BIOS_Heads
+      add      bx,dx
+      mov      ax,[si+08h]
+      mov      word ptr [bx+00],ax
+      mov      ax,[si+0ah]
+      mov      word ptr [bx+02],ax
+
+      ; Store number of sectors per track
+      mov      bx, offset BIOS_Secs
+      add      bx,dx
+      mov      ax,[si+0ch]
+      mov      word ptr [bx+00],ax
+
+      ; Update first byte of translation-table to conform to BIOS SPT
+      mov      byte ptr [secs_per_track_table], al
+
+      mov      ax,[si+0eh]
+      mov      word ptr [bx+02],ax
+
+      ; Store total secs
+      mov      bx, offset BIOS_TotalSecs
+      add      bx,dx
+      add      bx,dx
+      mov      ax,[si+10h]
+
+      mov      word ptr [bx+00],ax
+      mov      ax,[si+12h]
+      mov      word ptr [bx+02],ax
+      mov      ax,[si+14h]
+      mov      word ptr [bx+04],ax
+      mov      ax,[si+18h]
+      mov      word ptr [bx+06],ax
+
+      ; Store number of bytes per sector
+      mov      bx, offset BIOS_Bytes
+      add      bx,dx
+      mov      ax,[si+18h]
+      mov      [bx],ax
+
+
+      ;
+      ; See of it's a huge drive of not
+      ;
+
+      ; Drive is larger than 2TiB
+      mov     ax,5                                    ; Drive code (5)
+      mov     bx, [si+14h]                            ; Low word of high dword of sector-count
+      or      bx, [si+16h]                            ; High word of high dword of sector-count
+      jnz     DriveIO_GatherDiskInfo_ret              ; If non-zero we have a drive with >2^32 sectors and thus LBA48 addressing
+
+      ; Drive is larger than max OS/2 capacity
+      dec     ax                                      ; Drive code (4)
+      mov     bx, [si+12h]                            ; High word of low dword of sector-count
+      cmp     bx, 0fe01h                              ; Boundary
+      jae     DriveIO_GatherDiskInfo_ret              ; If above or equal to boundary,
+                                                      ; we have a drive larger than to 65536*255*255 = FE010000 sectors
+
+      ; Drive can be completely utilized by OS/2
+      dec     ax                                      ; Drive code (3)
+      cmp     bx, 8000h                               ; Boundary
+      jae     DriveIO_GatherDiskInfo_ret              ; If above or equal to boundary,
+                                                      ; we have a drive larger than 2^31 sectors but smaller than 65536*255*255
+
+      ; This is the small area between DANI 1TiB and LBA 1TiB
+      dec     ax                                      ; Drive code (2)
+      cmp     bx, 7e81h                               ; Boundary
+      jae     DriveIO_GatherDiskInfo_ret              ; If above or equal to boundary,
+                                                      ; we have a drive larger than 65536*255*127 but <65536*255*255
+                                                      ; DANIS506.ADD will use 255/255 extended geometry
+
+      ; DANI will use 255/127 in this area, this could impact the location of LVM-sectors ! (last sec on track)
+      dec     ax                                      ; Drive code (1)
+      cmp     bx, 3ec1h                               ; Boundary
+      jae     DriveIO_GatherDiskInfo_ret              ; If above or equal to boundary,
+                                                      ; we have a drive larger than 65536*255*63 sectors (OS/2 502GiB Limit!)
+                                                      ; DANIS506.ADD will use 255/127 extended geometry !
+                                                      ; IBM1S506.ADD will use 255/255 extended geometry !
+
+      ; We have a drive that can be addressed using standard 255/63 geometry
+      dec     ax                                      ; Drive code (0)
+                                                      ; We have a drive smaller than 65536*255*63 = 3EC10000 sectors
+
+   DriveIO_GatherDiskInfo_ret:
+      pop     es
+      pop     di
+      pop     si
+      pop     dx
+      pop     cx
+      pop     bx
+
+      mov      [CurIO_UseExtension],1
+
+      popf
+      ret
+DriveIO_GatherDiskInfo  EndP
+
+
+
+; Values for sectors per track table corresponding to DriveIO_IsHugeDrive return value.
+secs_per_track_table:   db    63,127,255,255,255,255
+
+db_lmlvm:   db 'Load Master LVM -- disk: ',0

trunk/BOOTCODE/REGULAR/OTHER.ASM

@@ -20 +20 @@
 ;---------------------------------------------------------------------------
 
+IFDEF ModuleNames
+DB 'OTHER',0
+ENDIF
+
 ;        In: DS:SI - Pointer to begin of string
 ;            CX - Len of string
@@ -72 +76 @@
    dec     dh
    jnz     GLOSS_StringsLoop
-   movzx   cx, dl
+   ;movzx   cx, dl
+   mov   cl,dl
+   mov   ch,0
+
    ret
 GetLenOfStrings                EndP
@@ -87 +94 @@
    mov     VideoIO_Segment, VideoIO_Page0
 
+   ; Don't use blinking attribute
+   call     VideoIO_NoBlinking
+
+   ; Get HardDriveCount
+   call    DriveIO_GetHardDriveCount
+
+
+               ; Rousseau: added
+               call    VideoIO_ClearScreen
+
+               ; Cursor to upper-left
+               mov     TextPosX, 0
+               mov     TextPosY, 0
+               call    VideoIO_CursorSet
+
+               ;mov     ax, VideoIO_Page1
+               ;call    VideoIO_BackUpTo   ; Copy BIOS POST to Second Page
+
+               ; Copyright
+               mov     si, offset Copyright
+               call    MBR_Teletype
+               xor     si,si
+               call    MBR_TeletypeNL
+
+
+               ;call    SOUND_Beep
+
+               ; Build Date
+               mov     si, offset BUILD_DATE
+               call    MBR_TeletypeNL
+
+               ; Initialize the com-port for debugging
+               call     AuxIO_Init
+
+               xor     si,si
+               call    MBR_TeletypeNL
+
+               xor      cx,cx
+            PRECRAP_Main_next_disk:
+
+               mov      dl,cl
+               or       dl,80h
+
+               call     DriveIO_GatherDiskInfo              ; Also used to fill the geo, should be separate function
+
+               mov      bx,offset HugeDisk
+               add      bx,cx
+               mov      [bx], al
+
+               call     DriveIO_LoadMasterLVMSector         ; returns ZF=1 if no valid LVM record found
+
+               pushf
+               mov      bx, offset TrueSecs
+               add      bx,cx
+               add      bx,cx
+               add      bx,cx
+               add      bx,cx
+               popf
+
+               ; bx now contains pointer to truesecs for this drive
+
+               jz       NoValidMasterLVM
+
+               mov      si,offset LVMSector
+               mov      ax,[si+LocLVM_Secs]
+               mov      word ptr [bx],ax
+               jmp      SkipUseBiosSecs
+
+
+            NoValidMasterLVM:
+               push     bx                   ; push truesecs pointer
+               mov      bx, offset BIOS_Secs
+               add      bx,cx
+               add      bx,cx
+               add      bx,cx
+               add      bx,cx
+
+               mov      ax,[bx]              ; get biossecs
+               pop      bx
+               mov      word ptr [bx],ax     ; store bios secs in truesecs
+
+
+            SkipUseBiosSecs:
+               inc      cx
+               cmp      cl,[TotalHarddiscs]
+               jb       PRECRAP_Main_next_disk
+
+
+
+IFDEF AuxDebug
+               ; Write some debug-info to the com-port
+               call     DEBUG_Dump1
+ENDIF
+
+              ; jz       NoValidMasterLVM
+
+
+               ; A valid Master LVM has been found.
+               ; We use the values in here to determine the number of sectors per track,
+               ; since this could be OS/2 extended geometry.
+
+              ; jmp      Continue1
+
+
+               ;mov      word ptr [LOG_Secs],63
+
+               mov      al,[HugeDisk]           ;; fout, moet nog index bij
+               call     AuxIO_TeletypeHexByte
+               call     AuxIO_TeletypeNL
+
+               mov      ax,word ptr [TrueSecs]  ;; fout, moet nog index bij
+               call     AuxIO_TeletypeHexWord
+               call     AuxIO_TeletypeNL
+
+
+
+                 ; Huge Disk indicator
+                 mov     si, offset HugeBootDisk
+                 call    MBR_Teletype
+                 mov     al,[HugeDisk]
+                 mov     si, offset No
+                 test    al,al
+                 jz      MBR_HugeDriveIndicator
+                 mov     si, offset Yes
+
+               MBR_HugeDriveIndicator:
+                 call    MBR_Teletype
+                 xor     si,si
+                 call    MBR_TeletypeNL
+
+
+
+
+
+                 ;
+                 ; Phase 1 Indicator
+                 ;
+                 mov     si, offset Phase1
+                 call    MBR_Teletype
+
+                 mov     si, offset eCS_InstallVolume
+                 mov     al, [si]
+                 test    al,al                                 ; See if phase 1 is active
+                 jnz     MBR_Main_BootThrough
+                 mov     si, offset NotActive
+
+               MBR_Main_BootThrough:
+                 call    MBR_TeleType
+                 xor     si,si
+                 call    MBR_TeletypeNL                                          ; ALP barks undefined symbol; must use prototypes ?
+
+
    ; Calculate Cooper-Bar Tables
    call    FX_CalculateTables
@@ -108 +267 @@
 
    call    PRECRAP_CheckFor13extensions
+
    IFNDEF ReleaseCode
       ret
    ENDIF
+
    call    PRECRAP_CheckConfiguration
+
    ; =======================================
    ; Checks for MBR Virii :) I love that job
@@ -123 +285 @@
       call    VIRUS_CheckForVirus
   PCM_NoVirusDetection:
+
+
    ; ============================================
    ;  Delay for some time and get Strg/Alt State
@@ -132 +296 @@
    jz      PCM_LongDelay
   PCM_ShortDelay:
+
    mov     al, 13                        ; shorten delay,if floppy gets accessed
   PCM_LongDelay:
+
    call    TIMER_WaitTicCount
+
    ; First check, if any normal key got pressed...
    mov     ah, 1
@@ -143 +310 @@
    call    MBR_Teletype
    mov     al, 54                        ; about 3 seconds, delay again
+
    call    TIMER_WaitTicCount
+
   PCM_NoNormalKeyPressed:
    ; Now get keyboard Strg/Alt State
@@ -156 +325 @@
    ret
 PRECRAP_Main                    EndP
+
+
 
 AFTERCRAP_Main                  Proc Near  Uses
@@ -209 +380 @@
    jmp     MBR_HaltSystem
 PRECRAP_CheckConfiguration      EndP
+
+
+; Rousseau: added
+;        In: SI - Pointer to begin of string (EOS is 0)
+; Destroyed: SI
+; Fixme: Uses double writes to use attribute with teletype-function.
+MBR_TeletypeBold                Proc Near   Uses ax bx cx
+  MBRT_LoopBold:
+   lodsb
+   or      al, al
+   jz      MBRT_EndBold
+   push    ax
+   mov     ah,09h
+   mov     bx,15
+   mov     cx,1
+   int     10h
+   pop     ax
+   mov     ah,0eh
+   mov     bx,7            ; Does not do anything in text-modus
+   mov     cx,1
+   int     10h
+   jmp     MBRT_LoopBold
+  MBRT_EndBold:
+   ret
+MBR_TeletypeBold                EndP
+
+;        In: SI - Pointer to begin of string (EOS is 0)
+; Destroyed: SI
+; Fixme: Uses double writes to use attribute with teletype-function.
+MBR_TeletypeVolName             Proc Near   Uses ax bx cx
+   mov     cx, 11
+  MBRT_LoopVolName:
+   mov     dx,cx           ; Backup counter
+   lodsb
+   or      al, al
+   jz      MBRT_EndVolName
+   push    ax
+   mov     ah,09h
+   mov     bx,15
+   mov     cx,1
+   int     10h             ; DX is preserved
+   pop     ax
+   mov     ah,0eh
+   mov     bx,7            ; Does not do anything in text-modus
+   mov     cx,1
+   int     10h             ; DX is preserved
+   mov     cx,dx           ; Restore counter
+   loop    MBRT_LoopVolName
+  MBRT_EndVolName:
+   ret
+MBR_TeletypeVolName             EndP
+
+; Rousseau: added
+; Move cursor to next line
+; Just do a new-line if SI==0
+MBR_TeletypeNL                  Proc Near   Uses ax bx cx
+   test    si,si
+   jz      MBR_TeletypeNL_NL
+   call    MBR_Teletype
+  MBR_TeletypeNL_NL:
+   push    si
+   mov     si, offset NL
+   call    MBR_Teletype
+   pop     si
+   ret
+MBR_TeletypeNL                  EndP
+
+; Sync teletype position to VideoIO
+MBR_TeletypeSyncPos     Proc Near   Uses ax bx cx dx
+   pushf
+   mov   bh, 0
+   mov   ah, 02h
+   mov   dh,[TextPosY]
+   mov   dl,[TextPosX]
+   int   10h
+   popf
+   ret
+MBR_TeletypeSyncPos     EndP

trunk/BOOTCODE/REGULAR/PARTMAIN.ASM

@@ -20 +20 @@
 ;---------------------------------------------------------------------------
 
+IFDEF ModuleNames
+DB 'PARTMAIN',0
+ENDIF
+
 PART_FixUpDefaultPartitionValues Proc Near  Uses dx si di
    ; Fix-Up Default and Last Partition - If lost, search for Bootable
@@ -140 +144 @@
 ; Copies the device-name to the Resume-BIOS IPT entry
 PART_UpdateResumeBIOSName       Proc Near Uses ax bx cx si di
-   movzx   bx, CFG_ResumeBIOSbootSeq
+   ;movzx   bx, CFG_ResumeBIOSbootSeq
+   mov   bl,CFG_ResumeBIOSbootSeq
+   mov   bh,0
+
    dec     bx
    shl     bx, 1
@@ -213 +220 @@
 ;  PCMPP_NoLinuxKernels:
 
-   movzx   cx, CFG_Partitions ; LocIPT_MaxPartitions
+   ;movzx   cx, CFG_Partitions ; LocIPT_MaxPartitions
+   mov   cl,CFG_Partitions ; LocIPT_MaxPartitions
+   mov   ch,0
+
    or      cx, cx
    jz      PCMPP_NoPartitions
@@ -240 +250 @@
    je      PGPP_IsBIOSbootSeq            ; FEh -> Resume BIOS boot Sequence
    ja      PGPP_IsFloppy                 ; FFh -> Floppy
-   movzx   bx, dl
+   ;movzx   bx, dl
+   mov   bl,dl
+   mov   bh,0
+
    shl     bx, 1
    mov     si, wptr [PartitionPointers+bx]
@@ -278 +291 @@
 ;       Out: DL - Number of partition in straight view
 PART_ConvertToStraight          Proc Near   Uses
-   movzx   bx, dl
-   shl     bx, 1
-   mov     ax, wptr cs:[PartitionPointers+bx]
+   ;movzx   bx, dl
+   mov   bl,dl                                  ; partition number to bl
+   mov   bh,0                                   ; zero extend to word
+
+   shl     bx, 1                                ; convert to word index
+   mov     ax, wptr cs:[PartitionPointers+bx]   ; get the partition pointer
    cmp     ax, offset FloppyIPTentry
    jb      PCTS_IsBIOSbootSeq
@@ -315 +331 @@
   PCFS_IsPartition:
    ; First we get Partition-Offset in AX
-   movzx   ax, dl
+   ;movzx   ax, dl
+   mov   al,dl
+   mov   ah,0
+
    mov     bl, LocIPT_LenOfIPT
    mul     bl
@@ -354 +373 @@
    mov     bl, LocIPT_LenOfIPT
    div     bl                            ; Divide with IPTlength
-   movzx   bx, al
+   ;movzx   bx, al
+   mov   bl,al
+   mov   bh,0
+
    shl     ax, 1
    shl     bx, 2
@@ -409 +431 @@
       dec     di                         ; Go to previous char
       jmp     PFOSE_DigitLoop
-      
+
   PFOSE_EndOfDigitLoop:
    ret
 PART_FillOutSizeElement         EndP
+
+
+
+
+; ###################
+; # START PARTITION #
+; ###################
 
 ; Starts Partition DL from Internal Partition Table.
@@ -454 +483 @@
          mov     di, offset TXT_BootingNowPartName
          jz      PSP_NoName
-         rep     movsb
+         rep     movsb                                                           ; Copy label-name to boot
         PSP_NoName:
          xor     al, al
          stosb              ; Ending Zero
-      mov     si, offset TXT_BootingNow1
+      mov     si, offset TXT_BootingNow1                                         ; "Booting the system using "
       call    MBR_Teletype
 ; [Linux support removed since v1.02]
@@ -484 +513 @@
       IFDEF ReleaseCode
          ; Save configuration on HDD boots (save CFG_PartLast)
-         call    DriveIO_SaveConfiguration
+         call    DriveIO_SaveConfiguration                                       ; Rouaaseu: SAVE CONFIGURATION !
       ENDIF
       call    MBR_Teletype     ; Prints out BootingNow2 including PartitionName
@@ -496 +525 @@
    mov     dh, bptr [si+LocIPT_LocationPartTable+0]
    mov     dl, [si+LocIPT_Drive]
-   call    DriveIO_LoadPartition         ; Load Table...
+   call    DriveIO_LoadPartition         ; Load Table...                         ; Rousseau: LOAD PARTITION !
    ; --------------------------------------------------- MODIFY PARTITION TABLE
    push    cs
@@ -536 +565 @@
    or      byte ptr es:[di+LocBRPT_Flags], 80h ; set ACTIVE partition
    IFDEF ReleaseCode
-      call    DriveIO_SavePartition      ; Saves the Partition-Table
+      call    DriveIO_SavePartition      ; Saves the Partition-Table             ; Rousseau: SAVE PARTITION !
    ENDIF
 
@@ -549 +578 @@
    ; BX:AX -> Absolute End-Position of Partition
 
-   test    CFG_ForceLBAUsage, 1
+   test    CFG_ForceLBAUsage, 1                                                  ; Rousseau: LBA
    jnz     PSP_ForceI13X
-   ; LBA-boundary at 16450560 (FB0400h)
+   ; LBA-boundary at 16450560 (FB0400h) (16320x16x63)
    cmp     bx, 00FBh
    jb      PSP_NoI13X
   PSP_ForceI13X:
-   push    es di
+   push    es di si
       mov     ax, 3000h
       mov     es, ax
       xor     di, di
+      ; Blokkeert starten van IBM BM !!
       mov     wptr es:[di], '1I'
       mov     wptr es:[di+2], 'X3'
-   pop     di es
+
+      ;mov      si,3000h
+      ;call     AuxIO_DumpSector
+
+   pop     si di es
   PSP_NoI13X:
 
@@ -607 +641 @@
       mov     cx, 0001h                  ; Cylinder 0, Sector 1
       mov     dx, 0080h                  ; First HD, Head 0
-      call    DriveIO_LoadPartition      ; Load Primary Partition Table
+      call    DriveIO_LoadPartition      ; Load Primary Partition Table          ; Rousseau: LOAD MBR !
       call    PART_MarkFirstGoodPrimary
       IFDEF ReleaseCode
-         call    DriveIO_SavePartition   ; Saves the Partition-Table
+         call    DriveIO_SavePartition   ; Saves the Partition-Table             ; Rousseau: SAVE MBR !
       ENDIF
      PSP_NoHideAdjustPrimaryMark:
@@ -622 +656 @@
       test    byte ptr [si+LocIPT_Flags], Flags_DriveLetter
       jz      PSP_NoLVMReassignment
-      movzx   bx, BootPartNo             ; EntryNumber is straight view
+      ;movzx   bx, BootPartNo             ; EntryNumber is straight view
+      mov   bl,BootPartNo             ; EntryNumber is straight view
+      mov   bh,0
+
       mov     al, bptr [DriveLetters+bx]
       sub     al, 3Dh                    ; Convert e.g. 80h -> 'C'
@@ -679 +716 @@
    mov     dh, [si+LocIPT_LocationBegin+0]
    mov     dl, [si+LocIPT_Drive]
-   call    DriveIO_LoadPartition         ; Loads boot-sector...
+   call    DriveIO_LoadPartition         ; Loads boot-sector...                  ; Rousseau: LOAD PART BOOT-SECTOR !!
 
    test    CFG_DetectVIBR, 1
@@ -734 +771 @@
       mov     si, 10h*4
       xor     di, di                     ; INT 10h Vector to MBR Protection
-      movsd
+      ;movsd
+      movsw
+      movsw
+
       mov     si, 13h*4                  ; INT 13h Vector to MBR Protection
-      movsd
+      ;movsd
+      movsw
+      movsw
+
       mov     al, CFG_IgnoreWriteToMBR   ; Option to MBR Protection
       stosb
@@ -753 +796 @@
   PSP_NoMBRprotect:
    cmp     bptr [si+LocIPT_SystemID], 08 ; I hate Microsuck NTFS check
-   je      PSP_NoSpecialSupport
+
+   ;je      PSP_NoSpecialSupport
 
       mov     di, offset PartitionSector ; ES:DI - Actual Boot-Record
@@ -759 +803 @@
       mov     ax, wptr es:[di+24]
       cmp     ax, 003Fh                  ; Physical Layout-Sectors... Safety check
-      ja      PSP_NoSpecialSupport
+
+
+      ; Rousseau: # Boot Logical Partitions)
+      ; FreeDOS and eCS on extpart on non-huge needs special support. (old ja jump)
+      ; PC-DOS7 on huge pri fat16 2G works with both (XP too) when at start of disk. (also when offset at 20MiB)
+      ; PCD7 bonkt vast als in 2GiB log at start of space. "Starting PC DOS..." verschijnt. PCD Loader probleem.
+      ; Offset van start-of-disk bij PCD7 niet meer dan 2GiB maken.
+      ; Special is needed to boot ECS-CXXVAC (log-part) on Douwskie Box with 40G disk.
+      ; FreeDOS 20G PRI SOD op 400G start niet met special.
+      ; Heeft drive-id op 26h (36d) van 0dh !
+      ; WinXP werkt met special en not-special op 400G normal geo.
+      ; eCS op PRI op 2G met os2 ext geo werkt ook met beide.
+      ; eCS LOG werkt niet zonder special op 400G.
+      ; (hidden secs op 3F en moet 3F00 zijn; BM staat ervoor, 3F00=255*63+63)
+      ; Laatste 63 is MBR.
+      ;
+      ; It seems PRI's already get special treatment in that they get their hidden secs updated.
+      ; (100MB HD, moved 50MB PRI-DOS part UP, DFSee complains about wrong hidden, but AiR-BOOT corrects it before booting)
+
+      ; FreeDOS zet 63 in SPT in BPB op 255/255 geo !!!!
+
+      ; PC-DOS7 wil vaak niet starten als er meerdere pri's actief zijn.
+      ; Logo verschijnt wel maar start niet door.
+
+
+      ; Display volume-name
+      pushf
+      push     si
+      add      si, LocIPT_Name
+      call     MBR_TeletypeVolName
+      xor      si,si
+      call     MBR_TeletypeNL                                                    ; Rousseau: Just before booting the selected partition
+      pop      si
+      popf
+
+
+
+      jmp     special                                                            ; Rousseau: GOT IT !!! (LOG-BOOT) (alleen op huge disks !)
+      ;jmp      PSP_NoSpecialSupport
+      ;ja      PSP_NoSpecialSupport                                              ; Rousseau: original M. Kiewitz...
+      ;jbe     PSP_NoSpecialSupport                                               ;   had to change to opposite !
+
+
       mov     ax, wptr es:[di+26]
       cmp     ax, 00FFh                  ; Physical Layout-Heads... Safety check
       ja      PSP_NoSpecialSupport
       mov     al, bptr es:[di+36]
-      cmp     al, 80h                    ; Drive Letter
+      cmp     al, 80h                    ; Drive Letter (ID)
       jne     PSP_NoSpecialSupport
+
       ; Special Support needed
+special:
+      ; Write actual drive-letter to partition boot-record.
+      ; This is according to BPB.
       mov     al, bptr [si+LocIPT_Drive]
-      mov     bptr es:[di+36], al        ; Write Actual Drive-Letter
+      ; Also an influence with FreeDOS !
+      ; Generates JFS ERROR when not set correctly !!!
+      mov     bptr es:[di+36], al               ; Write Actual Drive-Letter (80h id first drive)        !!!!!!!!!!!!!!!!!!!!!!!
+
+      ; This could be incorrect when a partition is moved,
+      ; or the system installer puts the wrong value here.
+      ; FreeDOS (log-part) i.e. puts 03fH (63d) here, eventhough it is not a the start of the disk.
+      ; This fixing is done by OS/2 BM as well, according to Martin.
       mov     ax, [si+LocIPT_AbsoluteBegin]
-      mov     wptr es:[di+28], ax        ; Fixing Hidden Sectors count
+      mov     wptr es:[di+28], ax               ; low word of hidden sectors
       mov     ax, [si+LocIPT_AbsoluteBegin+2]
-      mov     wptr es:[di+30], ax        ; Done by OS/2 BootMan as well...
+      mov     wptr es:[di+30], ax               ; high word of hidden sectors
 
    ; ------------------------------------------------ LOGICAL PARTITION SUPPORT
   PSP_NoSpecialSupport:
+
+;jmp   PSP_NoLogicalSupport
+
    test    byte ptr [si+LocIPT_Flags], Flags_DriveLetter
    jz      PSP_NoLogicalSupport
 
-      movzx   bx, BootPartNo             ; EntryNumber is straight view
+      ;movzx   bx, BootPartNo             ; EntryNumber is straight view
+      mov   bl,BootPartNo             ; EntryNumber is straight view
+      mov   bh,0
+
       mov     al, bptr [DriveLetters+bx]
       mov     bptr es:[di+37], al        ; Write Drive Letter (OS/2 only)
@@ -793 +896 @@
       rep     movsw
    pop     si
-   ; ---------------------------------------------------- NOW START BOOT-RECORD
+   ; ---------------------------------------------------- NOW START BOOT-RECORD  ; Rousseau: START PARTITION BOOT-RECORD !!
+
+
+IFDEF AuxDebug
+;   call     DEBUG_Dump2
+ENDIF
+
+               ;
+               ; ########################### WAIT FOR KEY ################################
+               ;
+
+   ; Rousseau:
+   ; Wait for key so we can see which volume is going to be started.
+   ;xor     ax, ax
+   ;int     16h
+   ;cmp     al, 1bh                        ; is escape-key ?
+   ;jne   skip_reenter
+
+   ;jmp      MBR_Main_ReEnterBootMenuPre   ; yep, re-enter boot-menu
+
+skip_reenter:
+
+
+
+
+
+
+
+
+   ;
+   ; BYE BYE
+   ;
    xor     ax, ax
    xor     bx, bx
@@ -801 +935 @@
    xor     dh, dh                        ; Drive supported by BIOS
    mov     dl, cs:[si+LocIPT_Drive]      ; Drive Physical No
+
    IFDEF ReleaseCode
-      db      0EAh                          ; JUMP TO Entry Point...Bye Bye
+      db      0EAh                       ; JUMP TO Entry Point...Bye Bye
       dw      StartBasePtr
       dw      StartBaseSeg
    ENDIF
 PART_StartPartition             EndP
+
+
+
+
+
+
+
+
+
+
 
 ; This routine is called to hide a partition
@@ -923 +1068 @@
 ; Destroyed: *none*
 PART_SearchFileSysName          Proc Near  Uses bx dx
-   movzx   bx, al
+   ;movzx   bx, al
+   mov   bl,al
+   mov   bh,0
+
    mov     si, offset FileSysIDs
   PSFSN_SearchLoop:
@@ -943 +1091 @@
    mov     ah, dl
    ; AH is now the FileSystem-Flag
-   movzx   bx, bh
+   ;movzx   bx, bh
+   mov   bl,bh
+   mov   bh,0
+
    shl     bx, 3   ; Offsets * 8
    mov     si, offset FileSysNames
    add     si, bx
-   ret         
+   ret
 PART_SearchFileSysName          EndP
 
@@ -954 +1105 @@
 ;       Out: AL - Hidden File-System-ID
 PART_SearchFileSysHiddenID      Proc Near  Uses bx
-   movzx   bx, al
+   ;movzx   bx, al
+   mov   bl,al
+   mov   bh,0
+
    mov     si, offset FileSysIDs
   PSFSHI_SearchLoop:
@@ -1019 +1173 @@
    ret
 PART_CheckForValidPartName      EndP
+
+
+; Rousseau: added
+; Compare a volume-label in the IPT to the install-volume
+; SI holds pointer to entry in IPT
+; CY set if this entry is also the install-volume
+PART_IsInstallVolume            Proc Near   Uses ax cx dx si di
+      cld                                    ; Advance upwards with lodsb
+      mov   di, offset eCS_InstallVolume     ; Address of install-volume label (max. 11 chars)
+
+      mov   cx, 11                           ; Maximum length of label
+      xor   dl, dl                           ; Not found yet
+
+    ; Compare next character
+    PART_IsInstallVolumeNext:
+      lodsb                                  ; Load byte from SI (IPT-entry)
+      ;cmp      al,' '                        ; If space then use zero
+      ;jne      PART_IsInstallVolume_skip1
+      ;xor      al,al
+   PART_IsInstallVolume_skip1:
+      xchg     ah,al                         ; Save char to AH
+      xchg     si,di                         ; Exchange pointers
+      lodsb                                  ; Load byte from SI (install-volume label)
+      ;cmp      al,' '                        ; If space then use zero
+      ;jne      PART_IsInstallVolume_skip2
+      ;xor      al,al
+   PART_IsInstallVolume_skip2:
+      xchg     si,di                         ; Reexchange pointers
+      call     AuxIO_Teletype
+      call     CONV_ToUpper
+      call     AuxIO_Teletype
+      xchg     al,ah
+      call     AuxIO_Teletype
+      call     CONV_ToUpper
+      call     AuxIO_Teletype
+      call     AuxIO_TeletypeNL
+
+      ; Are both of them zero ?
+      ; Then the names could be the same, but cx must not equal 11
+      ; because that would indicate a null-string.
+      mov      dh,al
+      or       dh,ah
+      jz       PART_IsInstallVolumeFound
+
+      cmp      ah,al                         ; Are the the same ?
+      jnz      PART_IsInstallVolumeNotFound  ; Nope, compare ended
+      loop     PART_IsInstallVolumeNext      ; Yep, Compare next character
+
+   PART_IsInstallVolumeFound:
+      ; If CX is still 11 this was a zero string
+      ; and thus not a valid volume-name.
+      ; This should not occur as this function is only called when the first
+      ; byte is non-zero.
+      cmp      cx,11
+      je       PART_IsInstallVolumeNotFound
+      ; Found !
+      mov      dl,1                          ; Found
+      jmp      PART_IsInstallVolumeEnd
+
+
+   PART_IsInstallVolumeNotFound:
+      mov      dl,0
+      jmp      PART_IsInstallVolumeEnd
+
+
+   PART_IsInstallVolumeEnd:
+      ; Set the status in CY
+      mov      al,dl
+      add      al,'0'
+      call     AuxIO_TeletypeHexByte
+      call     AuxIO_TeletypeNL
+      rcr      dl,1                          ; Put found-flag in CY
+      ret
+PART_IsInstallVolume            EndP

trunk/BOOTCODE/REGULAR/PARTSCAN.ASM

@@ -20 +20 @@
 ;---------------------------------------------------------------------------
 
+
+IFDEF ModuleNames
+DB 'PARTSCAN',0
+ENDIF
+
 ; Note: This is complex code. So make sure that you know what you are doing in
 ;        here.
@@ -48 +53 @@
    mov     si, offset NewPartTable
    mov     di, offset PartitionTable
-   movzx   ax, NewPartitions
+   ;movzx   ax, NewPartitions
+   mov   al,NewPartitions
+   mov   ah,0
+
    mov     CFG_Partitions, al
    mov     bl, LocIPT_LenOfIPT
@@ -58 +66 @@
    mov     si, offset NewDriveLetters
    mov     di, offset DriveLetters
-   mov     cx, LocIPT_MaxPartitions/2
-   rep     movsw
+   mov     cx, LocIPT_MaxPartitions
+   rep     movsb
 
 ; [Linux support removed since v1.02]
@@ -82 +90 @@
    or      dl, dl
    jz      PSSFP_NoAutoDriveLetter
-   movzx   cx, CFG_Partitions
+   ;movzx   cx, CFG_Partitions
+   mov   cl,CFG_Partitions
+   mov   ch,0
+
    or      cx, cx
    jz      PSSFP_NoAutoDriveLetter
@@ -118 +129 @@
    mov     wptr [ExtendedAbsPos+2], ax
   PSSDFP_LoadThisPartition:
-   call    DriveIO_LoadPartition
+
+   call    DriveIO_LoadPartition                                                 ; Rousseau: load a partition record
+
    jc      PSSDFP_InvalidPartition
+
    ; LVM Support - Reads LVM Information Sector
-   call    DriveIO_LoadLVMSector
+   call    DriveIO_LoadLVMSector                                                 ; Rousseau: load LVM sector
+
    call    PARTSCAN_ScanPartition
    IFDEF ReleaseCode
@@ -223 +238 @@
    add     ax, wptr [CurPartition_Location+0] ; +Partition-Absolute
    adc     bx, wptr [CurPartition_Location+2] ;  sectors
-   call    DriveIO_LoadTmpSector         ; Loads Boot record
+   call    DriveIO_LoadTmpSector         ; Loads Boot record                     ; Rousseau: LOAD PARTITION BOOT RECORD !!
    ; Sets up DS:SI - TmpSector
 
@@ -249 +264 @@
    cmp     PartSystemID, 07h          ; We got IFS here?
    jne     PCCTP_IFSdone
-   ; Check, if 'JFS ' is at DWORD offset 36h
+   ; Check, if 'JFS ' is at DWORD offset 36h                                     ; Rousseau: JFS check (LVM / IPT?)
    cmp     wptr [si+36h], 'FJ'
    jne     PCCTP_IFSnoJFS
@@ -284 +299 @@
      PCCTP_HasVolumeLetter:
       ; Save VolumeLetter in separate table
-      movzx   bx, NewPartitions          ; NewPartitions is one behind here, so
+      ;movzx   bx, NewPartitions          ; NewPartitions is one behind here, so
+      mov   bl,NewPartitions          ; NewPartitions is one behind here, so
+      mov   bh,0
+
       mov     [PartitionVolumeLetters+bx], al ; it's already a zero-based offset
       ; Now copy VolumeID and VolumeName to temporary space
@@ -291 +309 @@
       stosw
       mov     ax, [si+LocLVM_PartitionID+2]
-      stosw                              ; Set Serial-Field to LVM-VolumeID
+      stosw
+                              ; Set Serial-Field to LVM-VolumeID
+      push     di
       add     si, LocLVM_PartitionName
+
       mov     cx, 5
       rep     movsw                      ; Copy LVM-PartitionName to Temp Space
-      movsb                              ;  (11 bytes in total)
+      movsb                               ;  (11 bytes in total)
+
+      pop   di
+      cmp   PartSystemID, 0ah
+
+      jne   PCCTP_NoIbmBm
+      mov   si, offset ibm_bm_name
+      mov   cx,5
+      rep   movsw
+      movsb
+
+
+
+   PCCTP_NoIbmBm:
+
+
    pop     di si dx ax
    mov     si, offset MBR_NoName_Patched
@@ -304 +340 @@
    pop     di si dx ax
    test    ah, FileSysFlags_NoName       ; No-Name-Flag ? -> No Partition Name
-   jnz     PCCTP_ThereIsNoName           ;                    available
+
+   jz      PCCTP_ThereIsAName
+   jmp     PCCTP_ThereIsNoName           ;                    available
+
+   PCCTP_ThereIsAName:
+
       ; We check for NTFS (got detected a little bit earlier in this routine)
       cmp     PartSystemID, 08h          ; We got IFS/NTFS here?
@@ -312 +353 @@
       add     si, 2Bh                    ; DS:SI - Partition-Name
       test    ah, FileSysFlags_FAT32     ; FAT32 specific name getting ?
+
       jz      PCCTP_ResumeNormal
+
       add     si, 1Ch                    ; Fix for FAT 32, shiat
      PCCTP_ResumeNormal:
       mov     cx, 11                     ;         11 bytes length
       call    PART_CheckForValidPartName
-      jnc     PCCTP_ThereIsNoName
+      jc    PCCTP_ThereIsAName2
+
+      jmp     PCCTP_ThereIsNoName
+
+   PCCTP_ThereIsAName2:
+
       sub     si, 4                      ; DS:SI -> Serial&Name (15-Bytes)
       xor     ah, ah                     ; no Flags_NoPartName
@@ -343 +391 @@
             repz    cmpsb
          pop     di si
-         je      PCCTP_Match
+
+         jne   PCCTP_NoMatchYet
+
+         jmp      PCCTP_Match
+
+      PCCTP_NoMatchYet:
+
         PCCTP_SerialNameAlreadyFound:
          add     di, LocIPT_LenOfIPT
@@ -477 +531 @@
      PCCTP_LocCompFailed:
       jmp     PCCTP_CompareFailed
-      
+
    ; ==================================
    ; =MATCH=, found partition in IPT...
@@ -557 +611 @@
    ; Calculate Pointer to IPT
    mov     di, offset NewPartTable       ; ES:DI - NewPartTable
-   movzx   ax, NewPartitions
+   ;movzx   ax, NewPartitions
+   mov   al,NewPartitions
+   mov   ah,0
+
    mov     bl, LocIPT_LenOfIPT
    mul     bl
@@ -575 +632 @@
    stosb
    mov     al, cl                        ; Partition-Flags from register...
-   stosb 
+   stosb
    mov     ax, PartCRC                   ; BootRecordCRC...
    stosw
@@ -620 +677 @@
 
    ; Calculate Size of this partition and put it into separate table...
-   movzx   ax, NewPartitions
+   ;movzx   ax, NewPartitions
+   mov   al,NewPartitions
+   mov   ah,0
+
    dec     ax
    mov     bx, ax
@@ -658 +718 @@
 ; Destroyed: None
 PARTSCAN_DefXref                Proc Near   Uses ax bx cx dx si di
-   movzx   bx, dl
+   ;movzx   bx, dl
+   mov   bl,dl
+   mov   bh,0
+
    mov     bptr [PartitionXref+bx], dh      ; X-Reference
    ; Copy Hide-Config of IPT partition to new location in new table
@@ -673 +736 @@
    rep     movsb                            ; Copy Hide-Config to NewHideTable
    ; Process Logical-Drive-Letter table as well...
-   movzx   bx, dl
+   ;movzx   bx, dl
+   mov   bl,dl
+   mov   bh,0
+
    mov     al, bptr [DriveLetters+bx]       ; Get Drv-Letter from org. pos
-   movzx   bx, dh
+   ;movzx   bx, dh
+   mov   bl,dl
+   mov   bh,0
+
    mov     bptr [NewDriveLetters+bx], al    ; Put Drv-Letter to new pos
    ret
@@ -684 +753 @@
 ; Destroyed: None
 PARTSCAN_GetXref                Proc Near   Uses bx
-   movzx   bx, dl
+   ;movzx   bx, dl
+   mov   bl,dl
+   mov   bh,0
+
    mov     dh, bptr [PartitionXref+bx]      ; X-Reference
    ret
@@ -702 +774 @@
          cmp     al, 0FFh
          je      PSSHCWX_SyncEmpty
-         movzx   bx, al
+         ;movzx   bx, al
+         mov   bl,al
+         mov   bh,0
+
          mov     al, [PartitionXref+bx]     ; Translate it
          cmp     al, 0FFh
@@ -729 +804 @@
    ret
 PARTSCAN_SyncHideConfigWithXref EndP
+
+ibm_bm_name:   db 'IBM BootMan',0

trunk/BOOTCODE/REGULAR/PASSWORD.ASM

@@ -19 +19 @@
 ;                                                       AiR-BOOT / PASSWORD
 ;---------------------------------------------------------------------------
+
+IFDEF ModuleNames
+DB 'PASSWORD',0
+ENDIF
+
 
 ; Don't ask me, what I'm doing in here to encode the passwords. I don't even
@@ -164 +169 @@
   PE_ContinueLoop:
       mov     al, ds:[si]
-      movzx   bx, ds:[si+8]
+      ;movzx   bx, ds:[si+8]
+      mov   bl,ds:[si+8]
+      mov   bh,0
+
       add     bl, 16
       mov     ah, ds:[si+bx]

trunk/BOOTCODE/REGULAR/STD_TEXT.ASM

@@ -20 +20 @@
 ;---------------------------------------------------------------------------
 
+IFDEF ModuleNames
+DB 'STD_TEXT',0
+ENDIF
+
 ; If you modify this Copyright and release this under your own name,
 ;  I'm going to sue your cheap ass, rape your dog and blow up your house. =)
 
-CopyrightVersionLen   equ   5
-Copyright             db ' AiR-BOOT v1.06 - (c) 1998-2009 M. Kiewitz, Dedicated to Gerd Kiewitz', 0
-BootEndMsg            db 'Free usage allowed, as long as you dont or have not worked for US government', 0
-BootEndMsg2           db 'This is GPLv3+ software. Please visit http://AiR-BOOT.sourceforge.net', 0
+CopyrightVersionLen   equ   6
+;Copyright             db ' AiR-BOOT v1.06 - (c) 1998-2009 M. Kiewitz, Dedicated to Gerd Kiewitz', 0
+Copyright             db ' AiR-BOOT v1.07 - (c) 1998-2011 M. Kiewitz, Dedicated to Gerd Kiewitz', 0
+;Copyright             db ' AiR-BOOT v1.07 - (c) 2011 M. Kiewitz - Rousseau test-version >502G (build: #24)', 0
+;Copyright             db ' AiR-BOOT v1.07 - (c) 2011 M. Kiewitz   -  Release Candidate 1  -  (build: #25)', 0
+;Copyright             db ' AiR-BOOT v1.07 - (c) 1998-2011 M. Kiewitz, Dedicated to Gerd Kiewitz (rc2-b27)', 0
+;Copyright             db ' AiR-BOOT v1.07 - (c) 1998-2011 M. Kiewitz, Dedicated to Gerd Kiewitz (rc3-b31)', 0
+;Copyright             db ' AiR-BOOT v1.07 - (c) 1998-2011 M. Kiewitz, Dedicated to Gerd Kiewitz (rc4-b33)', 0
+;Copyright             db ' AiR-BOOT v1.07 - (c) 1998-2011 M. Kiewitz, Dedicated to Gerd Kiewitz (rc5-b35)', 0
+
+;BootEndMsg            db 'Free usage allowed, as long as you dont or have not worked for US government', 0
+
+; Rousseau: switch around
+BootEndMsg           db 'This is GPLv3+ software. Please visit http://AiR-BOOT.sourceforge.net', 0
+BootEndMsg2            db 'http://www.gnu.org/licenses/gpl.txt', 0
+
+AuxInitMsg           db 'Initializing Serial Communications on COM',0
 
 CheckID_MBR           db 'AiRBOOT'
@@ -33 +50 @@
 ; Colors for special words hard-coded. Keep all 0s.
 TXT_SETUP_LowerMessage      db 'This software is released under ', 0, 'GPLv3+.', 0
-                            db 'It may not be used by US government', 0
+;                            db 'It may not be used by US government', 0
+                            db 'http://www.gnu.org/licenses/gpl.txt', 0
                             db 'For more information and source, please visit', 0
                             db 'http://AiR-BOOT.sourceforge.net', 0
-                            db 'Contact via e-mail: ', 0, 'm_kiewitz [AT] users.sourceforge.net', 0
+;                            db 'Contact via e-mail: ', 0, 'm_kiewitz [AT] users.sourceforge.net', 0
+                            db 'Contact via e-mail: ', 0, 'airboot@ecomstation.com', 0
 
 ContinueBIOSbootTable dw offset TXT_SETUP_MAGIC_CDROM

trunk/BOOTCODE/REGULAR/TIMER.ASM

@@ -20 +20 @@
 ;---------------------------------------------------------------------------
 
+IFDEF ModuleNames
+DB 'TIMER',0
+ENDIF
+
 ; This here is one of the rare cases that I'm using DIV and MUL opcodes. I
 ;  could have coded around them in here as well, but I was too lazy. Most of
@@ -39 +43 @@
 ;       Out: Nothing
 TIMER_WaitTicCount              Proc Near   Uses ax bx dx
-   movzx   bx, al
+   ;movzx   bx, al
+   mov   bl,al
+   mov   bh,0
+
    call    TIMER_GetTicCount
    add     bx, ax                        ; BX - Required lower Tic
@@ -62 +69 @@
    mul     bl                            ; Result * 91
    mov     dx, ax
-   movzx   ax, bh
+   ;movzx   ax, bh
+   mov   al,bh
+   mov   ah,0
+
    mov     bl, 18
    mul     bl                            ; Remainder * 18
@@ -80 +90 @@
    div     dl                            ; Tics : 91
    mov     dh, al
-   movzx   ax, ah
+   ;movzx   ax, ah
+   mov   al,ah
+   mov   ah,0
+
    mov     dl, 18
    div     dl                            ; Remainder : 18
@@ -87 +100 @@
    mov     bl, 5
    mul     bl                            ; Result * 5
-   movzx   dx, dh
+   ;movzx   dx, dh
+   mov   dl,dh
+   mov   dh,0
+
    add     ax, dx                        ; Add both together...
    ret

trunk/BOOTCODE/REGULAR/VIDEOIO.ASM

@@ -19 +19 @@
 ;                                                      AiR-BOOT / VIDEO I/O
 ;---------------------------------------------------------------------------
+
+IFDEF ModuleNames
+DB 'VIDEOIO',0
+ENDIF
 
 VideoIO_WaitRetrace             Proc Near   Uses ax dx
@@ -32 +36 @@
    ret
 VideoIO_WaitRetrace             EndP
+
+
 
 ; Holds the current position. Yeah, I know this is in the code area, but who
@@ -100 +106 @@
    mov     ax, VideoIO_Segment
    mov     es, ax
-   movzx   ax, TextPosY
+   ;movzx   ax, TextPosY
+   mov   al,TextPosY
+   mov   ah,0
+
    mov     bl, 160
    mul     bl
@@ -169 +178 @@
 VideoIO_FixedPrint              EndP
 
+; Rousseau:
+; Turn off blinking
+; http://www.ctyme.com/intr/rb-0088.htm does not mention this
+VideoIO_NoBlinking              Proc Near   Uses ax bx
+      mov      bx,0
+      mov      ax,1003h
+      int      10h
+   ret
+VideoIO_NoBlinking              EndP
+
 ;        In: AL - Single Char to Print
 ; Destroyed: None
@@ -179 +198 @@
    ret
 VideoIO_PrintSingleChar         EndP
+
+
+
+; Print hex-byte to screen
+; This outputs two characters
+; In:          AL - byte to send
+; Out:         AL - byte sent
+; Destroyed:   None
+VideoIO_PrintHexByte    Proc     Near  Uses  ax
+      call     CONV_BinToAsc              ; Returns high hex-nibble in AH, low hex-nibble in AL
+      xchg     al,ah                      ; High hex-nibble first
+      call     VideoIO_PrintSingleChar    ; Output to screen
+      xchg     al,ah                      ; Low hex-nibble next
+      call     VideoIO_PrintSingleChar    ; Output to screen
+      ret
+VideoIO_PrintHexByte    EndP
+
+
+; Print hex-word to screen
+; This outputs four characters
+; In:          AX - word to send
+; Out:         AX - word sent
+; Destroyed:   None
+VideoIO_PrintHexWord    Proc     Near
+      xchg     al,ah                      ; High byte first
+      call     VideoIO_PrintHexByte       ; Output to screen
+      xchg     al,ah                      ; low byte next
+      call     VideoIO_PrintHexByte       ; Output to screen
+      ret
+VideoIO_PrintHexWord    EndP
+
+
+; Print hex-dword to screen
+; This outputs eight characters
+; In:          DX:AX - dword to send
+; Out:         DX:AX - dword sent
+; Destroyed:   None
+VideoIO_PrintHexDWord   Proc     Near
+      xchg     ax,dx
+      call     VideoIO_PrintHexWord       ; High word first
+      xchg     ax,dx
+      call     VideoIO_PrintHexWord       ; Low word next
+      ret
+VideoIO_PrintHexDWord   EndP
+
+
+; Print hex-qword to screen
+; This outputs sixteen characters
+; In:          BX:CX:DX:AX - qword to send
+; Out:         BX:CX:DX:AX - qword sent
+; Destroyed:   None
+VideoIO_PrintHexQWord   Proc     Near
+      xchg     dx,bx
+      xchg     ax,cx
+      call     VideoIO_PrintHexDWord      ; High dword first
+      xchg     dx,bx
+      xchg     ax,cx
+      call     VideoIO_PrintHexDWord      ; Low dword next
+      ret
+VideoIO_PrintHexQWord   EndP
+
+
+
+
 
 ;        In: AL - Single Char to Print
@@ -205 +288 @@
    cmp     al, 99
    ja      VIOPBN_DoNotWriteAnything
-   movzx   bx, al
+   ;movzx   bx, al
+   mov   bl,al
+   mov   bh,0
+
    call    VideoIO_Internal_SetRegs
    cmp     bl, 10
    jb      VIOPBN_Lower10
    push    ax
-      movzx   ax, bl
+      ;movzx   ax, bl
+      mov   al,bl
+      mov   ah,0
+
       mov     dl, 10
       div     dl
@@ -231 +320 @@
 ;        In: AL - Single Byte to Print
 ; Destroyed: None
-VideoIO_PrintByteDynamicNumber  Proc Near   Uses ax bx dx es di
+VideoIO_PrintByteDynamicNumber  Proc Near   Uses ax bx cx dx es di               ; Rousseau: cx was missing from push-list
    xor     cl, cl
    mov     bh, al
@@ -240 +329 @@
    cmp     ah, 100
    jb      VIOPBDN_Lower100
-   movzx   ax, ah
+   ;movzx   ax, ah
+   mov   al,ah
+   mov   ah,0
+
    mov     dl, 100
    div     dl
@@ -249 +341 @@
    add     di, 2
  VIOPBDN_Lower100:
-   movzx   ax, ah
+   ;movzx   ax, ah
+   mov   al,ah
+   mov   ah,0
+
    mov     dl, 10
    div     dl
@@ -270 +365 @@
 ; Destroyed: None Important
 VideoIO_Internal_MakeWinDown    Proc Near   Uses dx di
-   movzx   dx, cl
+   ;movzx   dx, cl
+   mov   dl,cl
+   mov   dh,0
+
    mov     bl, al
    call    VideoIO_Internal_SetRegs
@@ -281 +379 @@
    dec     dx
    jnz     VIOIMWD_Loop
-   ret      
+   ret
 VideoIO_Internal_MakeWinDown    EndP
 
@@ -287 +385 @@
 ; Destroyed: None Important
 VideoIO_Internal_MakeWinRight   Proc Near   Uses dx di
-   movzx  dx, cl
+   ;movzx  dx, cl
+   mov   dl,cl
+   mov   dh,0
+
    mov    bl, al
    call   VideoIO_Internal_SetRegs
@@ -298 +399 @@
       dec    dx
    jnz    VIOIMWR_Loop
-   ret      
+   ret
 VideoIO_Internal_MakeWinRight   EndP
 
@@ -366 +467 @@
    sub     bl, WinBeginPosX
    dec     bl
- 
+
   VIOIMW_Loop:
       mov     ch, WinBeginPosY
@@ -439 +540 @@
       call    VideoIO_CursorSet
       call    VideoIO_CursorOn           ; Set and turn cursor on
-      
+
       ; ES:DI - Screen-Position to Start of String
       ; DL    - Position in String (relative to begin, base=0)
@@ -460 +561 @@
          cmp     dl, StringLen           ; String "full" ?
          jae     VIOLUES_Loop
-         movzx   bx, dl
+         ;movzx   bx, dl
+         mov   bl,dl
+         mov   bh,0
+
          shl     bx, 1
          mov     es:[di+bx], al
@@ -476 +580 @@
          mov     al, ' '
          dec     dl
-         movzx   bx, dl
+         ;movzx   bx, dl
+         mov   bl,dl
+         mov   bh,0
+
          shl     bx, 1
          mov     es:[di+bx], al
@@ -502 +609 @@
    ret
 VideoIO_LetUserEditString       EndP
+
+
+
+;
+; Rousseau Additions.
+;
+
+
+; Function Template
+;ProcName                        Proc Near   Uses ax bx cx dx si es di
+;ProcName                        EndP
+
+
+;
+; Clear the current page
+;
+VideoIO_ClearScreen             Proc Near   Uses ax bx cx dx si es di
+   mov   al, 0       ; clear entire window
+   mov   bh,07h      ; Attribute for new lines
+   xor   cx,cx       ; Row, Column ULC
+   xor   dx,dx
+   dec   dx          ; Row, Column LRC (does this corrupt other pages ?)
+   mov   ah, 06h     ; Function Code
+   int   10h         ; Do It !
+   ret
+VideoIO_ClearScreen             EndP
+
+;
+; Rousseau: added
+; Set poosition to teletype cursor
+;
+VideoIO_SyncPos                 Proc Near   Uses ax bx cx dx
+   pushf
+   mov   bh, 0
+   mov   ah, 03h
+   int   10h
+   mov   [TextPosX], dl
+   mov   [TextPosY], dh
+   popf
+   ret
+VideoIO_SyncPos                 EndP
+
+
+
+VideoIO_DBG_WriteString         Proc Near   Uses ax bx cx dx si es di
+   mov   ch, [CFG_Partitions]                                                    ; y
+   add   ch, 7
+   add   ch, [CFG_IncludeFloppy]
+   push cx
+   mov   cl, 1                                                                   ; x
+   call  VideoIO_Locate
+   mov   ch, 15                                                                  ; fgc
+   mov   cl, 0                                                                   ; bgc
+   call  VideoIO_Color
+   mov   si, offset ShowBootLog
+   call  VideoIO_Print
+   pop cx
+   inc   ch
+
+   ;mov   ch, 21                                                                 ; y
+   mov   cl, 1                                                                   ; x
+   call  VideoIO_Locate
+   mov   ch, 15                                                                  ; fgc
+   mov   cl, 0                                                                   ; bgc
+   call  VideoIO_Color
+
+
+   ; Rousseau:
+   mov al, [NewPartitions]
+   ;call  VideoIO_PrintByteDynamicNumber
+   mov al, [CFG_Partitions]
+   ;call  VideoIO_PrintByteDynamicNumber
+   ret
+VideoIO_DBG_WriteString         EndP
+
+
+; Dump the disk-info.
+; Disk number is in DL.
+VideoIO_DumpDiskInfo    Proc Near
+
+   VideoIO_DumpDiskInfo_next_disk:
+      push     dx
+      xor      ax,ax
+      mov      al,[TextPosY]
+      push     ax
+
+      mov      ax,21
+      mov      dh,dl
+      and      dh,01111111b
+      mul      dh
+      mov      dh,al
+
+      mov      [TextPosX],dh
+
+      mov   si, offset Disk
+      call  VideoIO_Print
+      mov   al,dl
+
+      ; NIET GOED, GAAT FOUT > 9, HEX PRINT GEBRUIKEN !!
+      shr      al,4
+      add      al,'0'
+      call     VideoIO_PrintSingleChar
+      mov      al,dl
+      and      al,01111111b
+      add      al,'0'
+      call     VideoIO_PrintSingleChar
+      mov      al,'h'
+      call     VideoIO_PrintSingleChar
+
+      inc      [TextPosY]
+      mov      [TextPosX],dh
+
+      mov      al,'-'
+      mov      cl,17
+      call     VideoIO_PrintSingleMultiChar
+
+      inc      [TextPosY]
+      mov      [TextPosX],dh
+      mov      si, offset BiosCyls
+      call     VideoIO_Print
+
+      push     dx
+      mov      bx,offset BIOS_Cyls
+      xor      dh,dh
+      and      dl,01111111b
+      shl      dx,1
+      shl      dx,1
+      add      bx,dx
+      mov      ax,[bx]
+      mov      dx,[bx+02]
+      call     VideoIO_PrintHexDWord
+      pop      dx
+
+      inc      [TextPosY]
+      mov      [TextPosX],dh
+      mov      si, offset BiosHeads
+      call     VideoIO_Print
+
+      push     dx
+      mov      bx,offset BIOS_Heads
+      xor      dh,dh
+      and      dl,01111111b
+      shl      dx,1
+      shl      dx,1
+      add      bx,dx
+      mov      ax,[bx]
+      mov      dx,[bx+02]
+      call     VideoIO_PrintHexDWord
+      pop      dx
+
+      inc      [TextPosY]
+      mov      [TextPosX],dh
+      mov      si, offset BiosSecs
+      call     VideoIO_Print
+
+      push     dx
+      mov      bx,offset BIOS_Secs
+      xor      dh,dh
+      and      dl,01111111b
+      shl      dx,1
+      shl      dx,1
+      add      bx,dx
+      mov      ax,[bx]
+      mov      dx,[bx+02]
+      call     VideoIO_PrintHexDWord
+      pop      dx
+
+      inc      [TextPosY]
+      mov      [TextPosX],dh
+      mov      si, offset LvmSecs
+      call     VideoIO_Print
+
+      push     dx
+      mov      bx,offset TrueSecs
+      xor      dh,dh
+      and      dl,01111111b
+      shl      dx,1
+      shl      dx,1
+      add      bx,dx
+      mov      ax,[bx]
+      mov      dx,[bx+02]
+      call     VideoIO_PrintHexDWord
+      pop      dx
+
+      inc      [TextPosY]
+      mov      [TextPosX],dh
+      mov      si, offset BiosLBA
+      call     VideoIO_Print
+
+      push     dx
+      mov      bx,offset BIOS_TotalSecs
+      xor      dh,dh
+      and      dl,01111111b
+      shl      dx,1
+      shl      dx,1
+      shl      dx,1
+      add      bx,dx
+      mov      ax,[bx]
+      mov      dx,[bx+02]
+      call     VideoIO_PrintHexDWord
+      pop      dx
+
+      inc      [TextPosY]
+      mov      [TextPosX],dh
+
+      pop      ax
+      mov      [TextPosY],al
+      pop      dx
+
+      inc      dl
+      mov      al,dl
+      and      al,01111111b
+      cmp      al,[TotalHarddiscs]
+      jae      VideoIO_DumpDiskInfo_end
+      jmp      VideoIO_DumpDiskInfo_next_disk
+
+   VideoIO_DumpDiskInfo_end:
+      mov      [TextPosX],0
+      add      [TextPosY],6
+      ret
+VideoIO_DumpDiskInfo    EndP
+
+
+
+; 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
+
+; New Line for use by MBR_Teletype
+NL:         db 0dh, 0ah, 0