summaryrefslogtreecommitdiff
path: root/firmware/export
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2013-12-15 00:38:48 +0100
committerThomas Martitz <kugel@rockbox.org>2013-12-15 00:38:48 +0100
commitc72b454286864d728de676ebdf92288dd04ace45 (patch)
treebfe7ebfff65c3452b54661eafa844d28d0812a96 /firmware/export
parent1fc19042f72e9171b79c5a847cbce0c8939888c5 (diff)
downloadrockbox-c72b454286864d728de676ebdf92288dd04ace45.tar.gz
rockbox-c72b454286864d728de676ebdf92288dd04ace45.zip
Fix reds. Also apply the new scrolling to lcd charcell (this even uncovered an
error). Change-Id: I29243bb36b6cec1471bd6c0afc64e00547a68c50
Diffstat (limited to 'firmware/export')
-rw-r--r--firmware/export/lcd.h2
-rw-r--r--firmware/export/scroll_engine.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 37e6bf4d16..f6b32a37ee 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -195,6 +195,7 @@ extern int lcd_getstringsize(const unsigned char *str, int *w, int *h);
195extern void lcd_set_viewport(struct viewport* vp); 195extern void lcd_set_viewport(struct viewport* vp);
196extern void lcd_update(void); 196extern void lcd_update(void);
197extern void lcd_update_viewport(void); 197extern void lcd_update_viewport(void);
198extern void lcd_update_viewport_rect(int x, int y, int width, int height);
198extern void lcd_clear_viewport(void); 199extern void lcd_clear_viewport(void);
199extern void lcd_clear_display(void); 200extern void lcd_clear_display(void);
200extern void lcd_putsxy(int x, int y, const unsigned char *string); 201extern void lcd_putsxy(int x, int y, const unsigned char *string);
@@ -234,7 +235,6 @@ extern void lcd_blit_grey_phase(unsigned char *values, unsigned char *phases,
234 235
235/* update a fraction of the screen */ 236/* update a fraction of the screen */
236extern void lcd_update_rect(int x, int y, int width, int height); 237extern void lcd_update_rect(int x, int y, int width, int height);
237extern void lcd_update_viewport_rect(int x, int y, int width, int height);
238 238
239#ifdef HAVE_REMOTE_LCD 239#ifdef HAVE_REMOTE_LCD
240extern void lcd_remote_update(void); 240extern void lcd_remote_update(void);
diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h
index c7eb97aecc..5e4b744c59 100644
--- a/firmware/export/scroll_engine.h
+++ b/firmware/export/scroll_engine.h
@@ -62,9 +62,6 @@ struct scrollinfo
62 struct viewport* vp; 62 struct viewport* vp;
63 char linebuffer[9*MAX_PATH/10]; 63 char linebuffer[9*MAX_PATH/10];
64 const char *line; 64 const char *line;
65#ifdef HAVE_LCD_CHARCELLS
66 int len; /* length of line in chars */
67#endif
68 /* rectangle for the line */ 65 /* rectangle for the line */
69 int x, y; /* relative to the viewort */ 66 int x, y; /* relative to the viewort */
70 int width, height; 67 int width, height;