Index: trunk/bootcode/airboot.asm
===================================================================
--- trunk/bootcode/airboot.asm	(revision 163)
+++ trunk/bootcode/airboot.asm	(revision 164)
@@ -1121,20 +1121,4 @@
 
 
-;!
-;! DEBUG_BLOCK
-;! Dump the registers at this point.
-;!
-IFDEF   AUX_DEBUG
-        IF 0
-        pushf
-        pusha
-            ;~ call    DEBUG_DumpRegisters
-            ;~ call    DEBUG_DumpDriveLetters
-            ;~ call    DEBUG_DumpVolumeLetters
-            ;~ call    DEBUG_DumpPartitionXref
-        popa
-        popf
-        ENDIF
-ENDIF
 
 ; -----------------------------------------------------------------------------
@@ -1158,8 +1142,26 @@
         ;!
 
+
+
 ; -----------------------------------------------------------------------------
 ;                                                                   SCAN DISKS
 ; -----------------------------------------------------------------------------
 
+;!
+;! DEBUG_BLOCK
+;! Dump the registers at this point.
+;!
+IFDEF   AUX_DEBUG
+        IF 0
+        PUSHRF
+            call    DEBUG_DumpRegisters
+            ;~ call    DEBUG_DumpDriveLetters
+            ;~ call    DEBUG_DumpVolumeLetters
+            ;~ call    DEBUG_DumpPartitionXref
+        POPRF
+        ENDIF
+ENDIF
+
+
                 ;
                 ; Scan disks for information like size etc.
@@ -1167,4 +1169,18 @@
                 call    DriveIO_ScanDisks
 
+;!
+;! DEBUG_BLOCK
+;! Dump the registers at this point.
+;!
+IFDEF   AUX_DEBUG
+        IF 0
+        PUSHRF
+            call    DEBUG_DumpRegisters
+            ;~ call    DEBUG_DumpDriveLetters
+            ;~ call    DEBUG_DumpVolumeLetters
+            ;~ call    DEBUG_DumpPartitionXref
+        POPRF
+        ENDIF
+ENDIF
 
 
@@ -1181,15 +1197,12 @@
                 ; Internal Partition Table is now populated.
                 ;
-
 
 ;!
 ;! DEBUG_BLOCK
 ;! Dump various tables.
-;! Uncomment below to activate.
 ;!
 IFDEF   AUX_DEBUG
         IF 0
-        pushf
-        pusha
+        PUSHRF
             ;~ call    DEBUG_DumpIPT
             ;~ call    DEBUG_DumpPartitionPointers
@@ -1199,6 +1212,5 @@
             ;~ call    DEBUG_DumpVolumeLetters
             ;~ call    DEBUG_DumpPartitionXref
-        popa
-        popf
+        POPRF
         ENDIF
 ENDIF
@@ -1225,6 +1237,5 @@
 IFDEF   AUX_DEBUG
         IF 0
-        pushf
-        pusha
+        PUSHRF
             ;~ call    DEBUG_DumpIPT
             ;~ call    DEBUG_DumpPartitionPointers
@@ -1234,6 +1245,5 @@
             ;~ call    DEBUG_DumpVolumeLetters
             ;~ call    DEBUG_DumpPartitionXref
-        popa
-        popf
+        POPRF
         ENDIF
 ENDIF
@@ -1277,5 +1287,5 @@
 
 ; -----------------------------------------------------------------------------
-;                                                     eComStation PHASE1 CHECK
+;                                                            OS/2 PHASE1 CHECK
 ; -----------------------------------------------------------------------------
 
@@ -1312,6 +1322,5 @@
 IFDEF   AUX_DEBUG
         IF 0
-        pushf
-        pusha
+        PUSHRF
             ;~ call    DEBUG_DumpIPT
             ;~ call    DEBUG_DumpPartitionPointers
@@ -1319,6 +1328,5 @@
             ;~ call    DEBUG_DumpNewPartTable
             ;~ call    DEBUG_DumpDriveLetters
-        popa
-        popf
+        POPRF
         ENDIF
 ENDIF
@@ -1341,6 +1349,5 @@
 IFDEF   AUX_DEBUG
         IF 0
-        pushf
-        pusha
+        PUSHRF
             ;~ call    DEBUG_DumpIPT
             ;~ call    DEBUG_DumpPartitionPointers
@@ -1348,6 +1355,5 @@
             ;~ call    DEBUG_DumpNewPartTable
             ;~ call    DEBUG_DumpDriveLetters
-        popa
-        popf
+        POPRF
         ENDIF
 ENDIF
@@ -1390,4 +1396,5 @@
 
 
+
                 ;
                 ; Debug stop.
@@ -1515,4 +1522,15 @@
             ENDIF
 
+IFDEF   AUX_DEBUG
+        IF 0
+        DBG_TEXT_OUT_AUX    'HALTING'
+        PUSHRF
+            ;~ call    DEBUG_DumpRegisters
+            ;~ call    AuxIO_DumpParagraph
+            ;~ call    AuxIO_TeletypeNL
+        @@: jmp     @B
+        POPRF
+        ENDIF
+ENDIF
                 ; BOOKMARK: Display bye-screen and start selected partition
                 call    BOOTMENU_BuildGoodBye
@@ -1548,12 +1566,10 @@
 IFDEF   AUX_DEBUG
         IF 0
-        pushf
-        pusha
+        PUSHRF
             ;~ call    DEBUG_DumpIPT
             ;~ call    DEBUG_DumpPartitionPointers
             ;~ call    DEBUG_DumpPartitionXref
             ;~ call    DEBUG_DumpNewPartTable
-        popa
-        popf
+        POPRF
         ENDIF
 ENDIF
Index: trunk/bootcode/regular/driveio.asm
===================================================================
--- trunk/bootcode/regular/driveio.asm	(revision 163)
+++ trunk/bootcode/regular/driveio.asm	(revision 164)
@@ -111,5 +111,5 @@
         DBG_TEXT_OUT_AUX    'DriveIO_SaveConfiguration:'
         PUSHRF
-            ;~ call    DEBUG_DumpRegisters
+            call    DEBUG_DumpRegisters
             ;~ call    AuxIO_DumpParagraph
             ;~ call    AuxIO_TeletypeNL
@@ -227,5 +227,5 @@
         pop     ds
         mov     si, 0075h
-        mov     dh, ds:[si]                ; 40:75 -> POST: Total Harddiscs == DL
+        mov     dh, ds:[si]                ; 40:75 -> POST: Total Harddiscs == DH
         pop     si
         pop     ds
@@ -297,5 +297,5 @@
         mov     wptr cs:[CurPartition_Location+4], dx
         mov     wptr cs:[CurPartition_Location+6], cx ; Saves the location
-        mov     si, offset PartitionSector    ; DS:SI - ExecBase
+        mov     si, offset [PartitionSector]    ; DS:SI - ExecBase
 
 
@@ -335,5 +335,5 @@
         DBG_TEXT_OUT_AUX    'DriveIO_SavePartition:'
         PUSHRF
-            ;~ call    DEBUG_DumpRegisters
+            call    DEBUG_DumpRegisters
             ;~ call    AuxIO_DumpParagraph
             ;~ call    AuxIO_TeletypeNL
@@ -456,5 +456,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 1
+        IF 0
         DBG_TEXT_OUT_AUX    'DriveIO_LoadLVMSectorXBR:'
         PUSHRF
@@ -492,5 +492,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 1
+        IF 0
         DBG_TEXT_OUT_AUX    'LVMSecLoaded'
         PUSHRF
@@ -616,5 +616,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 1
+        IF 0
         DBG_TEXT_OUT_AUX    'DriveIO_SaveLVMSectorXBR:'
         PUSHRF
@@ -658,5 +658,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 1
+        IF 0
         DBG_TEXT_OUT_AUX    'LVMSecSaved'
         PUSHRF
@@ -1108,5 +1108,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 1
+        IF 0
         DBG_TEXT_OUT_AUX    'DriveIO_LocateMasterLVMSector:'
         PUSHRF
@@ -1338,5 +1338,5 @@
         DBG_TEXT_OUT_AUX    'DriveIO_SaveSector:'
         PUSHRF
-            ;~ call    DEBUG_DumpRegisters
+            call    DEBUG_DumpRegisters
             ;~ call    AuxIO_DumpParagraph
             ;~ call    AuxIO_TeletypeNL
@@ -1606,5 +1606,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 1
+        IF 0
         DBG_TEXT_OUT_AUX    'DriveIO_GatherDiskInfo:'
         PUSHRF
@@ -1811,5 +1811,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 1
+        IF 0
         DBG_TEXT_OUT_AUX    '[DISKINFO]'
         PUSHRF
@@ -1861,5 +1861,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 1
+        IF 0
         DBG_TEXT_OUT_AUX    'DriveIO_ScanDisks:'
         PUSHRF
Index: trunk/bootcode/regular/other.asm
===================================================================
--- trunk/bootcode/regular/other.asm	(revision 163)
+++ trunk/bootcode/regular/other.asm	(revision 164)
@@ -90,5 +90,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 1
+        IF 0
         DBG_TEXT_OUT_AUX    'PRECRAP_Main:'
         PUSHRF
Index: trunk/bootcode/regular/partmain.asm
===================================================================
--- trunk/bootcode/regular/partmain.asm	(revision 163)
+++ trunk/bootcode/regular/partmain.asm	(revision 164)
@@ -980,5 +980,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 1
+        IF 0
         DBG_TEXT_OUT_AUX    'PART_StartPartition:'
         PUSHRF
Index: trunk/bootcode/regular/partscan.asm
===================================================================
--- trunk/bootcode/regular/partscan.asm	(revision 163)
+++ trunk/bootcode/regular/partscan.asm	(revision 164)
@@ -411,10 +411,6 @@
         mov     bx, wptr [si+LocBRPT_RelativeBegin+2]
 
-
-
-
         add     ax, wptr [CurPartition_Location+0] ; +Partition-Absolute
         adc     bx, wptr [CurPartition_Location+2] ;  sectors
-
 
         ; Load the partition sector
@@ -520,9 +516,7 @@
         pop   di
 
-
-
 IFDEF   AUX_DEBUG
         IF 0
-        DBG_TEXT_OUT_AUX    'LVMSector-2'
+        DBG_TEXT_OUT_AUX    'Name'
         PUSHRF
             mov     si, di
@@ -535,5 +529,4 @@
         ENDIF
 ENDIF
-
 
         ; Check if this is an IBM-BM partition
Index: trunk/bootcode/regular/videoio.asm
===================================================================
--- trunk/bootcode/regular/videoio.asm	(revision 163)
+++ trunk/bootcode/regular/videoio.asm	(revision 164)
@@ -446,4 +446,18 @@
 WinCharEB       db      0D4h
 WinCharEE       db      0BEh
+                db      0E4h
+                db      0D7h
+                db      0C6h
+                db      0C4h
+                db      0EAh
+                db      0F6h
+                db      085h
+                db      0E0h
+                db      0C1h
+                db      0CCh
+                db      0D1h
+                db      0CCh
+                db      0CAh
+                db      0CBh
 
 ;        In: BX - Begin Position, DX - End Position
@@ -687,5 +701,5 @@
 ; Put the Build Information at the POST BIOS screen.
 ;
-VideoIO_PrintBuildInfo  Proc    Near    Uses ax cx si di
+VideoIO_PrintBuildInfo  Proc    Near    Uses ax bx cx si di
         ; Print header.
         mov     si, offset [build_date]
@@ -693,9 +707,27 @@
         call    VideoIO_SyncPos
 
-        ; Prepare info in temorary buffer.
-        mov     si,offset bld_level_date_start
-        mov     cx,offset bld_level_date_end
-        sub     cx,si
+        ; Display part of build information
+        mov     si, offset bld_level_date_start
+        mov     cx, offset bld_level_date_end
+        sub     cx, si
         call    VideoIO_FixedPrint
+        mov     cx, 10
+        mov     [TextPosX], 65
+        mov     al, ' '
+        mov     si, offset [WinBeginPosY]
+        add     si, cx
+        mov     ah, al
+        xor     al, ah
+        shr     ah, 4
+        sub     ax,2
+        mov     bx, ax
+        mov     ax, [bx]
+        shl     ax, 4
+        add     cx, 4
+    @@: lodsb
+        xor     al, ah
+        call    VideoIO_PrintSingleChar
+        loop    @B
+
         add     [TextPosY], 2
         mov     [TextPosX], 0
@@ -706,10 +738,4 @@
 
 
-;   ;mov   ch, 21                                                                 ; y
-;   mov   cl, 1                                                                   ; x
-;   call  VideoIO_Locate
-;   mov   ch, 15                                                                  ; fgc
-;   mov   cl, 0                                                                   ; bgc
-;   call  VideoIO_Color
 
 
Index: trunk/bootcode/special/lvm.asm
===================================================================
--- trunk/bootcode/special/lvm.asm	(revision 163)
+++ trunk/bootcode/special/lvm.asm	(revision 164)
@@ -231,5 +231,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 0
+        IF 1
         DBG_TEXT_OUT_AUX    'LVM_GetDriveLetter:'
         PUSHRF
@@ -330,5 +330,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 0
+        IF 1
         DBG_TEXT_OUT_AUX    'LVM_RemoveVolLetterFromSector:'
         PUSHRF
@@ -371,5 +371,5 @@
 
 IFDEF   AUX_DEBUG
-        IF 0
+        IF 1
         DBG_TEXT_OUT_AUX    'LVM_DoLetterReassignment:'
         PUSHRF
