From 28e1d414b14b8ac8afc5ed05a532c10b9c9afcf1 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 24 Jun 2002 07:57:44 +0000
Subject: strings should be 'unsigned char *' or we will get problemos

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1139 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/drivers/lcd.c | 8 ++++----
 firmware/drivers/lcd.h | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'firmware/drivers')

diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c
index 352de748fd..46642bcc5c 100644
--- a/firmware/drivers/lcd.c
+++ b/firmware/drivers/lcd.c
@@ -495,7 +495,7 @@ extern unsigned char char_dw_8x8_prop[][9];
 /*
  * Return width and height of a given font.
  */
-int lcd_getstringsize(char *str, unsigned int font, int *w, int *h)
+int lcd_getstringsize(unsigned char *str, unsigned int font, int *w, int *h)
 {
     int width=0;
     int height=0;
@@ -563,7 +563,7 @@ void lcd_putspropxy(int x, int y, unsigned char *str, int thisfont)
 /*
  * Put a string at specified character position
  */
-void lcd_puts(int x, int y, char *str)
+void lcd_puts(int x, int y, unsigned char *str)
 {
 #if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
     /* We make the simulator truncate the string if it reaches the right edge,
@@ -600,7 +600,7 @@ void lcd_puts(int x, int y, char *str)
  * Put a string at specified bit position
  */
 
-void lcd_putsxy(int x, int y, char *str, int thisfont)
+void lcd_putsxy(int x, int y, unsigned char *str, int thisfont)
 {
     int nx = fonts[thisfont];
     int ny = fontheight[thisfont];
@@ -911,7 +911,7 @@ void lcd_getfontsize(unsigned int font, int *width, int *height)
 /* no LCD defined, no code to use */
 #endif
 
-void lcd_puts_scroll(int x, int y, char* string )
+void lcd_puts_scroll(int x, int y, unsigned char* string )
 {
     struct scrollinfo* s = &scroll;
 #ifdef HAVE_LCD_CHARCELLS
diff --git a/firmware/drivers/lcd.h b/firmware/drivers/lcd.h
index bdbdd1c5be..69fe3a8288 100644
--- a/firmware/drivers/lcd.h
+++ b/firmware/drivers/lcd.h
@@ -28,8 +28,8 @@
 extern void lcd_init(void);
 extern void lcd_clear_display(void);
 extern void lcd_backlight(bool on);
-extern void lcd_puts(int x, int y, char *string);
-extern void lcd_puts_scroll(int x, int y, char* string );
+extern void lcd_puts(int x, int y, unsigned char *string);
+extern void lcd_puts_scroll(int x, int y, unsigned char* string );
 extern void lcd_stop_scroll(void);
 extern void lcd_scroll_speed( int speed );
 
@@ -79,7 +79,7 @@ extern void lcd_double_height (bool on);
 #define LCD_WIDTH       112   /* Display width in pixels */
 #define LCD_HEIGHT      64    /* Display height in pixels */
 
-extern void lcd_putsxy(int x, int y, char *string, int font);
+extern void lcd_putsxy(int x, int y, unsigned char *string, int font);
 extern void lcd_setfont(int font);
 extern void lcd_getfontsize(unsigned int font, int *width, int *height);
 extern void lcd_setmargins(int xmargin, int ymargin);
-- 
cgit v1.2.3