diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/lcd.c | 8 | ||||
-rw-r--r-- | firmware/drivers/lcd.h | 6 |
2 files changed, 7 insertions, 7 deletions
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]; | |||
495 | /* | 495 | /* |
496 | * Return width and height of a given font. | 496 | * Return width and height of a given font. |
497 | */ | 497 | */ |
498 | int lcd_getstringsize(char *str, unsigned int font, int *w, int *h) | 498 | int lcd_getstringsize(unsigned char *str, unsigned int font, int *w, int *h) |
499 | { | 499 | { |
500 | int width=0; | 500 | int width=0; |
501 | int height=0; | 501 | int height=0; |
@@ -563,7 +563,7 @@ void lcd_putspropxy(int x, int y, unsigned char *str, int thisfont) | |||
563 | /* | 563 | /* |
564 | * Put a string at specified character position | 564 | * Put a string at specified character position |
565 | */ | 565 | */ |
566 | void lcd_puts(int x, int y, char *str) | 566 | void lcd_puts(int x, int y, unsigned char *str) |
567 | { | 567 | { |
568 | #if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS) | 568 | #if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS) |
569 | /* We make the simulator truncate the string if it reaches the right edge, | 569 | /* 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) | |||
600 | * Put a string at specified bit position | 600 | * Put a string at specified bit position |
601 | */ | 601 | */ |
602 | 602 | ||
603 | void lcd_putsxy(int x, int y, char *str, int thisfont) | 603 | void lcd_putsxy(int x, int y, unsigned char *str, int thisfont) |
604 | { | 604 | { |
605 | int nx = fonts[thisfont]; | 605 | int nx = fonts[thisfont]; |
606 | int ny = fontheight[thisfont]; | 606 | int ny = fontheight[thisfont]; |
@@ -911,7 +911,7 @@ void lcd_getfontsize(unsigned int font, int *width, int *height) | |||
911 | /* no LCD defined, no code to use */ | 911 | /* no LCD defined, no code to use */ |
912 | #endif | 912 | #endif |
913 | 913 | ||
914 | void lcd_puts_scroll(int x, int y, char* string ) | 914 | void lcd_puts_scroll(int x, int y, unsigned char* string ) |
915 | { | 915 | { |
916 | struct scrollinfo* s = &scroll; | 916 | struct scrollinfo* s = &scroll; |
917 | #ifdef HAVE_LCD_CHARCELLS | 917 | #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 @@ | |||
28 | extern void lcd_init(void); | 28 | extern void lcd_init(void); |
29 | extern void lcd_clear_display(void); | 29 | extern void lcd_clear_display(void); |
30 | extern void lcd_backlight(bool on); | 30 | extern void lcd_backlight(bool on); |
31 | extern void lcd_puts(int x, int y, char *string); | 31 | extern void lcd_puts(int x, int y, unsigned char *string); |
32 | extern void lcd_puts_scroll(int x, int y, char* string ); | 32 | extern void lcd_puts_scroll(int x, int y, unsigned char* string ); |
33 | extern void lcd_stop_scroll(void); | 33 | extern void lcd_stop_scroll(void); |
34 | extern void lcd_scroll_speed( int speed ); | 34 | extern void lcd_scroll_speed( int speed ); |
35 | 35 | ||
@@ -79,7 +79,7 @@ extern void lcd_double_height (bool on); | |||
79 | #define LCD_WIDTH 112 /* Display width in pixels */ | 79 | #define LCD_WIDTH 112 /* Display width in pixels */ |
80 | #define LCD_HEIGHT 64 /* Display height in pixels */ | 80 | #define LCD_HEIGHT 64 /* Display height in pixels */ |
81 | 81 | ||
82 | extern void lcd_putsxy(int x, int y, char *string, int font); | 82 | extern void lcd_putsxy(int x, int y, unsigned char *string, int font); |
83 | extern void lcd_setfont(int font); | 83 | extern void lcd_setfont(int font); |
84 | extern void lcd_getfontsize(unsigned int font, int *width, int *height); | 84 | extern void lcd_getfontsize(unsigned int font, int *width, int *height); |
85 | extern void lcd_setmargins(int xmargin, int ymargin); | 85 | extern void lcd_setmargins(int xmargin, int ymargin); |