Changeset 177

Timestamp:

Nov 7, 2017, 7:12:39 AM (8 years ago)

Author:

Ben Rietbroek

Message:

Fixed display quirk -- track #13 [v1.1.1-testing]

When detailed view was enabled, too much padding was done, which caused
overflow to the next line and the '|' characters to be overwritten.
This should fix trac issue #13:
http://trac.netlabs.org/air-boot/ticket/13

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

Files:

• bootcode/airboot.md5 (modified) (1 diff)
• bootcode/regular/bootmenu.asm (modified) (3 diffs)
• include/version.h (modified) (1 diff)
• include/version.inc (modified) (1 diff)

trunk/bootcode/airboot.md5

@@ -1 @@
-966d84e065c842c29fcf8c77b28f1428 *airboot.bin
+3fbd042146daf016accd81b36e5e6560  airboot.bin

trunk/bootcode/regular/bootmenu.asm

@@ -675 +675 @@
 
 
-        ; Dirty hack to clear remaining line when menu is scrolled.
-        ; Padd with spaces.
+        ; Dirty hack to pad remaining line with spaces.
         ; Should be implemented in scrolling routine.
-        push    word ptr [TextPosX]
-        mov     si, offset spaces
-        mov     cl,24
-        call    VideoIO_FixedPrint
-        pop     word ptr [TextPosX]
-
+        push    word ptr [TextPosY]             ; Quick save X,Y position
+        mov     al, ' '                         ; Filler
+        mov     cl, 79                          ; Index of last column
+        sub     cl, byte ptr [TextPosX]         ; Calculate padding length
+        call    VideoIO_PrintSingleMultiChar    ; Do the padding
+        pop     word ptr [TextPosY]             ; Quick restore X,Y position
+
+        ; Get AiR-BOOT system-ID to see if drive-letters need to be shown
         mov     si, [PartPointer]
         mov     ah, [si+LocIPT_SystemID]
@@ -702 +703 @@
 ENDIF
 
-        mov     al, ah
-
-        cmp     al, 07h
-        je      show_dl
-        cmp     al, 0fch
-        je      show_dl
-
-        jmp     skip_show_dl
+        ; Only show drive-letters when partition is HPFS or JFS
+        mov     al, ah          ; AiR-BOOT system-ID in AL
+        cmp     al, 07h         ; Is HPFS ?
+        je      show_dl         ; Yep, show drive-letters
+        cmp     al, 0fch        ; Is JFS ?
+        je      show_dl         ; Yep, show drive-letters
+
+        jmp     skip_show_dl    ; No HPFS or JFS, skip show drive-letters
 
     show_dl:
@@ -799 +800 @@
 dl_text     db  '   on drive ',0
 dl_hidden   db  '   hidden   ',0
-spaces      db  '                        ',0
 
 ;        In: DL - Active Partition

trunk/include/version.h

@@ -32 +32 @@
 #define     BLDLVL_YEAR             "2017"
 #define     BLDLVL_MONTH            "04"
-#define     BLDLVL_DAY              "08"
+#define     BLDLVL_DAY              "12"
 // Build time
 //~ #define     BLDLVL_HOURS            "01"

trunk/include/version.inc

@@ -70 +70 @@
 AB_YEAR             EQU     2017h
 AB_MONTH            EQU     04h
-AB_DAY              EQU     08h
+AB_DAY              EQU     12h
 
 ; The Hours, Minutes and Seconds, again in BCD for easy manipulation.