david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

Make vga_font const to avoid warning about large symbol

This commit is contained in:
Michael Brown 2005-05-03 13:17:08 +00:00
parent e91c65bea1
commit 462234f373
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/btext.c
View File

@ -29,12 +29,12 @@
static void scrollscreen(void); static void scrollscreen(void);
#endif #endif
static void draw_byte(unsigned char c, u32 locX, u32 locY); static void draw_byte(const unsigned char c, u32 locX, u32 locY);
#if 0 #if 0
static void draw_byte_32(unsigned char *bits, u32 *base, u32 rb); static void draw_byte_32(const unsigned char *bits, u32 *base, u32 rb);
static void draw_byte_16(unsigned char *bits, u32 *base, u32 rb); static void draw_byte_16(const unsigned char *bits, u32 *base, u32 rb);
#endif #endif
static void draw_byte_8(unsigned char *bits, u32 *base, u32 rb); static void draw_byte_8(const unsigned char *bits, u32 *base, u32 rb);
static u32 g_loc_X; static u32 g_loc_X;
static u32 g_loc_Y; static u32 g_loc_Y;
@ -49,7 +49,7 @@ static u32 g_max_loc_Y;
#define cmapsz (16*96) #define cmapsz (16*96)
#endif #endif
static unsigned char vga_font[cmapsz]; static const unsigned char vga_font[cmapsz];
u32 boot_text_mapped; u32 boot_text_mapped;
@ -275,14 +275,14 @@ btext_drawhex(u32 v)
#endif #endif
static void BTEXT static void BTEXT
draw_byte(unsigned char c, u32 locX, u32 locY) draw_byte(const unsigned char c, u32 locX, u32 locY)
{ {
boot_infos_t* bi = &disp_bi; boot_infos_t* bi = &disp_bi;
unsigned char *base = calc_base(bi, locX << 3, locY << 4); unsigned char *base = calc_base(bi, locX << 3, locY << 4);
#if CHAR_256==1 #if CHAR_256==1
unsigned char *font = &vga_font[(((u32)c)) * 16]; unsigned const char *font = &vga_font[(((u32)c)) * 16];
#else #else
unsigned char *font = &vga_font[(((u32)c-0x20)) * 16]; unsigned const char *font = &vga_font[(((u32)c-0x20)) * 16];
#endif #endif
u32 rb = bi->dispDeviceRowBytes; u32 rb = bi->dispDeviceRowBytes;
@ -331,7 +331,7 @@ static const u32 expand_bits_16[4] BTDATA = {
#endif #endif
#if 0 #if 0
static void BTEXT static void BTEXT
draw_byte_32(unsigned char *font, u32 *base, u32 rb) draw_byte_32(const unsigned char *font, u32 *base, u32 rb)
{ {
u32 l, bits; u32 l, bits;
u32 fg = 0xFFFFFFFF; u32 fg = 0xFFFFFFFF;
@ -353,7 +353,7 @@ draw_byte_32(unsigned char *font, u32 *base, u32 rb)
} }
static void BTEXT static void BTEXT
draw_byte_16(unsigned char *font, u32 *base, u32 rb) draw_byte_16(const unsigned char *font, u32 *base, u32 rb)
{ {
u32 l, bits; u32 l, bits;
u32 fg = 0xFFFFFFFF; u32 fg = 0xFFFFFFFF;
@ -372,7 +372,7 @@ draw_byte_16(unsigned char *font, u32 *base, u32 rb)
} }
#endif #endif
static void BTEXT static void BTEXT
draw_byte_8(unsigned char *font, u32 *base, u32 rb) draw_byte_8(const unsigned char *font, u32 *base, u32 rb)
{ {
u32 l, bits; u32 l, bits;
u32 fg = 0x0F0F0F0F; u32 fg = 0x0F0F0F0F;
@ -450,7 +450,7 @@ INIT_FN ( INIT_CONSOLE, btext_init, NULL, NULL );
/**********************************************/ /**********************************************/
static unsigned char vga_font[cmapsz] BTDATA = { static const unsigned char vga_font[cmapsz] BTDATA = {
#if CHAR_256==1 #if CHAR_256==1
/* 0 0x00 '^@' */ /* 0 0x00 '^@' */
0x00, /* 00000000 */ 0x00, /* 00000000 */