summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2004-08-01 21:50:57 +0000
committerJens Arnold <amiconn@rockbox.org>2004-08-01 21:50:57 +0000
commitabe77a1a2a1db4e6b9bcd4a8d14dc7abef0b2104 (patch)
treed6ea7f30e04c644693dc50f9b112a5d2cbc0cd41 /firmware
parent27a4b60f1a0cd2bfef48f59acf236081fd3b787e (diff)
downloadrockbox-abe77a1a2a1db4e6b9bcd4a8d14dc7abef0b2104.zip
rockbox-abe77a1a2a1db4e6b9bcd4a8d14dc7abef0b2104.tar.gz
rockbox-abe77a1a2a1db4e6b9bcd4a8d14dc7abef0b2104.tar.bz2
rockbox-abe77a1a2a1db4e6b9bcd4a8d14dc7abef0b2104.tar.xz
More const policeing step 1
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4978 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/lcd-recorder.c6
-rw-r--r--firmware/export/lcd.h7
2 files changed, 6 insertions, 7 deletions
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c
index 3d3763c..d2949c8 100644
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-recorder.c
@@ -305,7 +305,7 @@ void lcd_setfont(int newfont)
curfont = newfont;
}
-int lcd_getstringsize(unsigned char *str, int *w, int *h)
+int lcd_getstringsize(const unsigned char *str, int *w, int *h)
{
struct font* pf = font_get(curfont);
int ch;
@@ -328,12 +328,12 @@ int lcd_getstringsize(unsigned char *str, int *w, int *h)
}
/* put a string at a given char position */
-void lcd_puts(int x, int y, unsigned char *str)
+void lcd_puts(int x, int y, const unsigned char *str)
{
lcd_puts_style(x, y, str, STYLE_DEFAULT);
}
-void lcd_puts_style(int x, int y, unsigned char *str, int style)
+void lcd_puts_style(int x, int y, const unsigned char *str, int style)
{
int xpos,ypos,w,h;
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 1a408d4..6a7f8cf 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -31,8 +31,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, unsigned char *string);
-extern void lcd_puts_style(int x, int y, unsigned char *string, int style);
+extern void lcd_puts(int x, int y, const unsigned char *string);
+extern void lcd_puts_style(int x, int y, const unsigned char *string, int style);
extern void lcd_putc(int x, int y, unsigned short ch);
extern void lcd_puts_scroll(int x, int y, unsigned char* string );
@@ -142,8 +142,7 @@ extern void lcd_bidir_scroll(int threshold);
extern void lcd_scroll_step(int pixels);
extern void lcd_setfont(int font);
extern void lcd_putsxy(int x, int y, const unsigned char *string);
-extern int lcd_getstringsize(unsigned char *str, int *w, int *h);
-extern int lcd_getstringsize(unsigned char *str, int *w, int *h);
+extern int lcd_getstringsize(const unsigned char *str, int *w, int *h);
#endif /* CHARCELLS / BITMAP */