Changeset 165

Timestamp:

Apr 8, 2017, 12:28:05 AM (8 years ago)

Author:

Ben Rietbroek

Message:

Reworked the pre-MENU display stuff [v1.1.1-testing]

CAUTION:
This is a testbuild !
AirBoot uses the BIOS to access disks and a small coding error can trash
partition tables or other vital disk structures. You are advised to make
backups of TRACK0 and EBRs before using this testbuild. More info at:
​https://rousseaux.github.io/netlabs.air-boot/pdf/AirBoot-v1.1.0-manual.pdf

Location:

trunk/bootcode

Files:

• airboot.asm (modified) (2 diffs)
• regular/other.asm (modified) (3 diffs)
• regular/std_text.asm (modified) (1 diff)

trunk/bootcode/airboot.asm

@@ -1259 +1259 @@
 
                 ; Display number of physical disks found
-                mov     si, offset DisksFound
-                call    MBR_Teletype
+                IFNDEF  AUX_DEBUG
+                mov     [TextPosY], 3
+                ELSE
+                mov     [TextPosY], 4
+                ENDIF
+                mov     [TextPosX], 0
+                mov     si, offset [DisksFound]
+                call    VideoIO_Print
                 mov     al, [TotalHarddiscs]
-                call    VideoIO_SyncPos
+                mov     [TextColorFore], 0fh
                 call    VideoIO_PrintByteDynamicNumber
-                xor     si,si
-                call    MBR_TeletypeNL
+                mov     [TextColorFore], 07h
 
                 ; Display number of partitions found
-                mov     si, offset PartitionsFound
-                call    MBR_Teletype
+                inc     [TextPosY]
+                mov     [TextPosX], 0
+                mov     si, offset [PartitionsFound]
+                call    VideoIO_Print
                 mov     al, [CFG_Partitions]
-                call    VideoIO_SyncPos
                 call    VideoIO_PrintByteDynamicNumber
 
-                ; Dump summier disk-info for disks found
-                xor     si,si
-                call    MBR_TeletypeNL
-                call    MBR_TeletypeNL
-                call    VideoIO_SyncPos
-                mov     dl,80h
-                call    VideoIO_DumpDiskInfo
-
+                ; Display Phase 1 Indicator
+                inc     [TextPosY]
+                mov     [TextPosX], 0
+                mov     si, offset [Phase1]
+                call    VideoIO_Print
+                mov     si, offset [OS2_InstallVolume]
+                mov     al, [si]
+                test    al,al   ; See if phase 1 is active
+                jnz     @F
+                mov     si, offset [No]
+            @@:
+                call    VideoIO_Print
 
 
@@ -1384 +1394 @@
                 ; by putting this info on the screen.
                 ;
-                xor     si,si
-                call    MBR_TeletypeNL
-                xor     si,si
-                call    MBR_TeletypeNL
+                mov     [TextPosY], 23
+                mov     [TextPosX], 0
+                mov     si, offset [TABMessage]
+                call    VideoIO_Print
+                inc     [TextPosY]
+                mov     [TextPosX], 57
                 call    MBR_TeletypeSyncPos
-                xor     si,si
-                call    MBR_TeletypeNL
-                call    MBR_TeletypeNL
-                mov     si, offset ShowMenu
+                mov     si, offset [PREPMessage]
                 call    MBR_TeletypeBold
-
+                mov     al,30
+                call    TIMER_WaitTicCount
+                mov     cl, sizeof [PREPMessage]
+                mov     al, ' '
+                call    VideoIO_PrintSingleMultiChar
+
+                mov     [TextPosX], 25
+                mov     si, offset [BootEndMsg2]
+                add     si, 39
+                mov     [TextColorFore], 08h
+                call    VideoIO_Print
 
 

trunk/bootcode/regular/other.asm

@@ -148 +148 @@
         ; Copyright
         mov     si, [offset Copyright]
-        call    MBR_Teletype
-        xor     si,si
-        call    MBR_TeletypeNL
-
+        call    VideoIO_Print
+        inc     [TextPosY]
+        mov     [TextPosX], 0
+        call    MBR_TeletypeSyncPos
 
         ;call    SOUND_Beep
@@ -157 +157 @@
         ; Show build info
         call    VideoIO_PrintBuildInfo
+
+        ; Let user know we started scanning...
+IFDEF   AUX_DEBUG
+        xor     si, si
+        call    MBR_TeletypeNL
+ENDIF
+        mov     si, offset [scanning_txt]
+        call    MBR_TeletypeBold
 
 ; Show message if com-port debugging is active
@@ -166 +174 @@
 
         ; Show initialization message
+        mov     ah, [TextPosY]
+        mov     [TextPosY], 2
         mov     si, offset AuxInitMsg
-        call    MBR_Teletype
+        ;~ call    MBR_Teletype
+        call    VideoIO_Print
 
         ; Sync output position
-        call    VideoIO_SyncPos
+        ;~ call    VideoIO_SyncPos
 
         ; Show port number
         mov     al, dl
         call    VideoIO_PrintByteDynamicNumber
-        xor     si, si
-        call    MBR_TeletypeNL
+        mov     [TextPosY], ah
     @@:
 ENDIF
-
-        xor     si,si
-        call    MBR_TeletypeNL
-
-        ;
-        ; Phase 1 Indicator
-        ;
-        mov     si, offset [Phase1]
-        call    MBR_Teletype
-
-        mov     si, offset OS2_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
-
 
         ; Calculate Cooper-Bar Tables

trunk/bootcode/regular/std_text.asm

@@ -109 +109 @@
 wasm_txt        db  'Wasm',0
 tasm_txt        db  'Tasm',0
+scanning_txt    db  'Scanning...',0
 unknown_txt     db  '????',0