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.

diff --git a/ChangeLog.kernel-font b/ChangeLog.kernel-font
index e7ca2a3747df15fbcb0328fcf9ea1552c621a3b5..36c3b695b97db06e8d70d3cf45dae383a7e29c58 100644 (file)
--- a/ChangeLog.kernel-font
+++ b/ChangeLog.kernel-font
@@ -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>
 
        * font/font.c: Update copyright years.

diff --git a/Makefile.in b/Makefile.in
index f30264b00315ce4fbb2e15854631ffc1a1fca138..ff59c4efdf342526b8402ee75b06d9df1e97a2be 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -250,7 +250,7 @@ font/ascii.bitmaps: $(FONT_SOURCE) grub-mkfont
        $(builddir)/grub-mkfont --ascii-bitmaps -o $@ $(FONT_SOURCE)
 
 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
 

diff --git a/font/font.c b/font/font.c
index a00aef94f530c1066b415541643ab37781f58b2c..7aef1b163c745e5a97b0119f6a883b3614d985b1 100644 (file)
--- a/font/font.c
+++ b/font/font.c
@@ -17,7 +17,7 @@
  *  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/dl.h>
@@ -29,7 +29,7 @@
 #include <grub/video.h>
 #include <grub/bitmap.h>
 
-#ifdef GENERATE_ASCII
+#ifdef USE_ASCII_FAILBACK
 #include "ascii.h"
 #endif
 
@@ -136,14 +136,14 @@ static struct grub_font null_font;
 /* Flag to ensure module is initialized only once.  */
 static grub_uint8_t font_loader_initialized;
 
-#ifdef GENERATE_ASCII
+#ifdef USE_ASCII_FAILBACK
 static struct grub_font_glyph *ascii_font_glyph[0x80];
 #endif
 
 static struct grub_font_glyph *
 ascii_glyph_lookup (grub_uint32_t code)
 {
-#ifdef GENERATE_ASCII
+#ifdef USE_ASCII_FAILBACK 
   static int ascii_failback_initialized = 0;
 
   if (code >= 0x80)