From 5e3e8162ec9bf43b996817f13b1f0bb1ede9997d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Stenberg?= <bjorn@haxx.se>
Date: Tue, 13 Aug 2002 20:29:09 +0000
Subject: If we're having loadable/proportional fonts, use them for everything

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1722 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/drivers/lcd.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c
index b67be4e..ff02783 100644
--- a/firmware/drivers/lcd.c
+++ b/firmware/drivers/lcd.c
@@ -322,7 +322,7 @@ static void lcd_write(bool command, int byte)
 #endif /* ASM_IMPLEMENTATION */
 #endif /* !SIMULATOR */
 
-unsigned char icon_mirror[11];
+static unsigned char icon_mirror[11];
 
 /*** model specific code */
 
@@ -424,7 +424,7 @@ void lcd_define_pattern (int which,char *pattern,int length)
     int i;
     lcd_write(true,LCD_PRAM|which);
     for (i=0;i<length;i++)
-    lcd_write(false,pattern[i]);
+        lcd_write(false,pattern[i]);
 }
 
 void lcd_double_height(bool on)
@@ -881,12 +881,18 @@ void lcd_puts(int x, int y, unsigned char *str)
 }
 
 
+void lcd_putsxy(int x, int y, unsigned char *str, int thisfont)
+{
+#ifdef LOADABLE_FONTS
+    lcd_putsldfxy(x,y,str);
+    (void)thisfont;
+#elif LCD_PROPFONTS
+    lcd_putspropxy(x,y,str,thisfont);
+#else
 /*
  * Put a string at specified bit position
  */
 
-void lcd_putsxy(int x, int y, unsigned char *str, int thisfont)
-{
     int nx = fonts[thisfont];
     int ny = fontheight[thisfont];
     int ch;
@@ -919,6 +925,7 @@ void lcd_putsxy(int x, int y, unsigned char *str, int thisfont)
         lcd_x += nx;
 
     }
+#endif
 }
 
 /*
-- 
cgit v1.1