From 638dd6786a75e5d3e87a9e04f80138d80665f230 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 19 Jul 2004 21:46:37 +0000 Subject: Const'ed the logo, the bitmaps and the credits (optimization for running from ROM) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4896 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd-recorder.c | 11 ++++++----- firmware/export/lcd.h | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) (limited to 'firmware') diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c index cf3c7615e1..3d3763ca50 100644 --- a/firmware/drivers/lcd-recorder.c +++ b/firmware/drivers/lcd-recorder.c @@ -371,7 +371,7 @@ void lcd_puts_style(int x, int y, unsigned char *str, int style) } /* put a string at a given pixel position, skipping first ofs pixel columns */ -static void lcd_putsxyofs(int x, int y, int ofs, unsigned char *str) +static void lcd_putsxyofs(int x, int y, int ofs, const unsigned char *str) { int ch; struct font* pf = font_get(curfont); @@ -428,7 +428,7 @@ static void lcd_putsxyofs(int x, int y, int ofs, unsigned char *str) } /* put a string at a given pixel position */ -void lcd_putsxy(int x, int y, unsigned char *str) +void lcd_putsxy(int x, int y, const unsigned char *str) { lcd_putsxyofs(x, y, 0, str); } @@ -450,12 +450,13 @@ void lcd_putsxy(int x, int y, unsigned char *str) * Draw a bitmap at (x, y), size (nx, ny) * if 'clear' is true, clear destination area first */ -void lcd_bitmap (unsigned char *src, int x, int y, int nx, int ny, +void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny, bool clear) __attribute__ ((section (".icode"))); -void lcd_bitmap (unsigned char *src, int x, int y, int nx, int ny, +void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny, bool clear) { - unsigned char *src_col, *dst, *dst_col; + const unsigned char *src_col; + unsigned char *dst, *dst_col; unsigned int data, mask1, mask2, mask3, mask4; int stride, shift; diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 20023bf1c6..1a408d448c 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h @@ -123,7 +123,7 @@ extern unsigned char lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH]; extern void lcd_setmargins(int xmargin, int ymargin); extern int lcd_getxmargin(void); extern int lcd_getymargin(void); -extern void lcd_bitmap (unsigned char *src, int x, int y, int nx, int ny, +extern void lcd_bitmap (const unsigned char *src, int x, int y, int nx, int ny, bool clear); extern void lcd_clearrect (int x, int y, int nx, int ny); extern void lcd_fillrect (int x, int y, int nx, int ny); @@ -141,7 +141,7 @@ extern void lcd_set_flip(bool yesno); 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, unsigned char *string); +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); -- cgit v1.2.3