From 583fa983a9c2f54a5ab27bf73ebee5e6eb5164e6 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 24 Jun 2017 18:42:30 +0200 Subject: printing whole ASCII font in VGA graphics mode --- src/drivers/video/vga.c | 2 +- src/drivers/video/vga_font.c | 21 +-------------------- 2 files changed, 2 insertions(+), 21 deletions(-) (limited to 'src/drivers') diff --git a/src/drivers/video/vga.c b/src/drivers/video/vga.c index b245aad..b0b61f7 100644 --- a/src/drivers/video/vga.c +++ b/src/drivers/video/vga.c @@ -361,7 +361,7 @@ void vga_draw_char( vga_t *vga, const unsigned char c, const int x, const int y, int mask[8] = { 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80 }; // for now, the 34 entry, character height is 16, assuming A-Z - const unsigned char *bmap = &vga_font.Bitmap[(34+c-65)*16]; + const unsigned char *bmap = &vga_font.Bitmap[(c-32)*16]; for( int xx = 0; xx < vga_font.Width; xx++ ) { for( int yy = 0; yy < vga_font.Height; yy++ ) { diff --git a/src/drivers/video/vga_font.c b/src/drivers/video/vga_font.c index 0800dff..36c2f6f 100644 --- a/src/drivers/video/vga_font.c +++ b/src/drivers/video/vga_font.c @@ -5,24 +5,6 @@ /// character bitmap for each encoding static const unsigned char __font_bitmap__[] = { -// 0 $00 'char0' -// width 8, bbx 0, bby -4, bbw 8, bbh 16 - ________, - ________, - XX_XX_X_, - ______X_, - X_______, - X_____X_, - ______X_, - X_______, - X_____X_, - ______X_, - X_______, - X_XX_XX_, - ________, - ________, - ________, - ________, // 32 $20 'space' // width 8, bbx 0, bby -4, bbw 8, bbh 16 ________, @@ -1855,7 +1837,6 @@ static const unsigned char __font_widths__[] = { /// character encoding for each index entry static const unsigned short __font_index__[] = { - 0, 32, 33, 34, @@ -1957,7 +1938,7 @@ static const unsigned short __font_index__[] = { /// bitmap font structure const struct bitmap_font vga_font = { .Width = 8, .Height = 16, - .Chars = 97, + .Chars = 96, .Widths = __font_widths__, .Index = __font_index__, .Bitmap = __font_bitmap__, -- cgit v1.2.3-54-g00ecf