devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

strings should be 'unsigned char *' or we will get problemos

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1139 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2002-06-24 07:57:44 +00:00
parent 79e72318c2
commit 28e1d414b1
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
firmware/drivers/lcd.c
View file

@ -495,7 +495,7 @@ extern unsigned char char_dw_8x8_prop[][9];
/* /*
* Return width and height of a given font. * 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 width=0;
int height=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 * 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) #if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
/* We make the simulator truncate the string if it reaches the right edge, /* 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 * 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 nx = fonts[thisfont];
int ny = fontheight[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 */ /* no LCD defined, no code to use */
#endif #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; struct scrollinfo* s = &scroll;
#ifdef HAVE_LCD_CHARCELLS #ifdef HAVE_LCD_CHARCELLS

6
firmware/drivers/lcd.h
View file

@ -28,8 +28,8 @@
extern void lcd_init(void); extern void lcd_init(void);
extern void lcd_clear_display(void); extern void lcd_clear_display(void);
extern void lcd_backlight(bool on); extern void lcd_backlight(bool on);
extern void lcd_puts(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, char* string ); extern void lcd_puts_scroll(int x, int y, unsigned char* string );
extern void lcd_stop_scroll(void); extern void lcd_stop_scroll(void);
extern void lcd_scroll_speed( int speed ); 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_WIDTH 112 /* Display width in pixels */
#define LCD_HEIGHT 64 /* Display height 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_setfont(int font);
extern void lcd_getfontsize(unsigned int font, int *width, int *height); extern void lcd_getfontsize(unsigned int font, int *width, int *height);
extern void lcd_setmargins(int xmargin, int ymargin); extern void lcd_setmargins(int xmargin, int ymargin);