vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

2010-01-11 Carles Pina i Estany <carles@pina.cat>

Browse source 
* font/font.c (GENERATE_ASCII): Change the name to USE_ASCII_FAILBACK.
	By default: disabled.
	* Makefile.in (font/ascii.h): Remove the non-needed grub/bin2h size
	parameter.
This commit is contained in:
carles 2010-01-11 20:43:11 +00:00
parent d1fb0f65de
commit d0230c2119
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog.kernel-font
View file

@ -1,3 +1,10 @@
2010-01-11 Carles Pina i Estany <carles@pina.cat>
* font/font.c (GENERATE_ASCII): Change the name to USE_ASCII_FAILBACK.
By default: disabled.
* Makefile.in (font/ascii.h): Remove the non-needed grub/bin2h size
parameter.
2010-01-10 Carles Pina i Estany <carles@pina.cat> 2010-01-10 Carles Pina i Estany <carles@pina.cat>
* font/font.c: Update copyright years. * font/font.c: Update copyright years.

2
Makefile.in
View file

@ -250,7 +250,7 @@ font/ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
$(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE) $(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
font/ascii.h: font/ascii.bitmaps grub-bin2h font/ascii.h: font/ascii.bitmaps grub-bin2h
$(builddir)/grub-bin2h ascii_bitmaps 2048 < font/ascii.bitmaps > font/ascii.h $(builddir)/grub-bin2h ascii_bitmaps < font/ascii.bitmaps > font/ascii.h
endif endif
endif endif

8
font/font.c
View file

@ -17,7 +17,7 @@
* along with GRUB. If not, see <http://www.gnu.org/licenses/>. * along with GRUB. If not, see <http://www.gnu.org/licenses/>.
*/ */
#define GENERATE_ASCII //#define USE_ASCII_FAILBACK 0
#include <grub/bufio.h> #include <grub/bufio.h>
#include <grub/dl.h> #include <grub/dl.h>
@ -29,7 +29,7 @@
#include <grub/video.h> #include <grub/video.h>
#include <grub/bitmap.h> #include <grub/bitmap.h>
#ifdef GENERATE_ASCII #ifdef USE_ASCII_FAILBACK
#include "ascii.h" #include "ascii.h"
#endif #endif
@ -136,14 +136,14 @@ static struct grub_font null_font;
/* Flag to ensure module is initialized only once. */ /* Flag to ensure module is initialized only once. */
static grub_uint8_t font_loader_initialized; static grub_uint8_t font_loader_initialized;
#ifdef GENERATE_ASCII #ifdef USE_ASCII_FAILBACK
static struct grub_font_glyph *ascii_font_glyph[0x80]; static struct grub_font_glyph *ascii_font_glyph[0x80];
#endif #endif
static struct grub_font_glyph * static struct grub_font_glyph *
ascii_glyph_lookup (grub_uint32_t code) ascii_glyph_lookup (grub_uint32_t code)
{ {
#ifdef GENERATE_ASCII #ifdef USE_ASCII_FAILBACK
static int ascii_failback_initialized = 0; static int ascii_failback_initialized = 0;
if (code >= 0x80) if (code >= 0x80)