Changeset 244 for trunk/bootcode/special/charset.asm

Timestamp:

Jul 8, 2018, 7:40:47 PM (7 years ago)

Author:

Ben Rietbroek

Message:

Merged "strings-to-es-20180707.txt" provided by Alfredo [v1.1.5-testing]

Translator-build 'AiR-BOOT-v1.1.5-ES-TESTBUILD-20180708' was created
from this commit.

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.4-manual.pdf

File:

• trunk/bootcode/special/charset.asm (modified) (3 diffs)

trunk/bootcode/special/charset.asm

@@ -115 +115 @@
 
         ; Pointer to table with glyphs using compressed format
-        mov    si, offset CHARSET_Cyrillic
-        mov    di, offset CharsetTempBuffer+2048
-
-        mov    dl, 64           ; Decode 64 character bitmaps
-        xor    al, al
-        xor    ch, ch
-        DecodeLoop:             ; This is an uncompressing-loop
-        mov    ah, ds:[si]
-        inc    si
-        mov    cl, ah
-        and    cl, 0Fh
-        rep    stosb            ; Write NULs, count: lower 4 bits
-        mov    cl, ah
-        shr    cl, 4
-        or     cl, cl
-        jz     EndOfStream
-        rep    movsb
-        jmp    DecodeLoop
-        EndOfStream:
-        cmp    di, offset CharsetTempBuffer+3840
-        jae    DecodeDone
-        add    di, 768          ; Skip 3x16 char blocks
-        jmp    DecodeLoop
-
-        DecodeDone:
+        mov     si, offset CHARSET_Cyrillic
+        mov     di, offset CharsetTempBuffer+2048
+
+        mov     dl, 64          ; Decode 64 character bitmaps
+        xor     al, al
+        xor     ch, ch
+    DecodeLoop:                 ; This is an uncompressing-loop
+        mov     ah, ds:[si]
+        inc     si
+        mov     cl, ah
+        and     cl, 0Fh
+        rep     stosb           ; Write NULs, count: lower 4 bits
+        mov     cl, ah
+        shr     cl, 4
+        or      cl, cl
+        jz      EndOfStream
+        rep     movsb
+        jmp     DecodeLoop
+    EndOfStream:
+        cmp     di, offset CharsetTempBuffer+3840
+        jae     DecodeDone
+        add     di, 768         ; Skip 3x16 char blocks
+        jmp     DecodeLoop
+
+    DecodeDone:
         ; Upload the custom charset to the video-adapter
-        call  CHARSET_SetCutsomGlyphs
+        call    CHARSET_SetCutsomGlyphs
 
         popa
@@ -158 +158 @@
 ; -----------------------------------------------------------------------------
 CHARSET_GetRomGlyphs    Proc
-        mov    ax, 1130h
-        mov    bh, 6                ; Get ROM VGA 25x80 charset
-        int    10h                  ; VIDEO BIOS: Get charset table pointer
-        mov    bx, ds
-        mov    ax, es
-        mov    es, bx               ; ES now points to Data-Segment      (dest)
-        mov    ds, ax               ; DS now points to Video-ROM          (src)
-        mov    si, bp               ; SI now points to ROM Font 25x80
-        mov    di, offset CharsetTempBuffer     ; Located in BSS
-        mov    cx, 2048
-        rep    movsw                ; Copy ROM-charset to Temp-Buffer in BSS
-        mov    ds, bx               ; Restore DS (DS==ES==CS)
+        mov     ax, 1130h
+        mov     bh, 6               ; Get ROM VGA 25x80 charset
+        int     10h                 ; VIDEO BIOS: Get charset table pointer
+        mov     bx, ds
+        mov     ax, es
+        mov     es, bx              ; ES now points to Data-Segment      (dest)
+        mov     ds, ax              ; DS now points to Video-ROM          (src)
+        mov     si, bp              ; SI now points to ROM Font 25x80
+        mov     di, offset CharsetTempBuffer    ; Located in BSS
+        mov     cx, 2048
+        rep     movsw               ; Copy ROM-charset to Temp-Buffer in BSS
+        mov     ds, bx              ; Restore DS (DS==ES==CS)
         ret
 CHARSET_GetRomGlyphs    EndP
@@ -185 +185 @@
 ; second video-page. Information from Ralph Brown does state that for 0x1110h
 ; video-page 0 needs to be active, which might not be the case when the custom
-; glyphs are loaded. Switching to 0x1100 solves the problem on the Hp Pavilion
+; glyphs are loaded. Switching to 0x1100 solves the problem on the HP Pavilion
 ; and the other test-laptop, which did not have this quirk, still works fine.
 ; That leaves the question why 0x1110 was chosen by Martin in the first place.