summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ericson <kjell@haxx.se>2003-01-14 13:51:09 +0000
committerKjell Ericson <kjell@haxx.se>2003-01-14 13:51:09 +0000
commit75361e5e44d46adb115bc6f4445f18ea6f4d1019 (patch)
tree25b9041d3385661a4ad840440fbe82cff1d69a12
parent5d75f7e718a478e9abab5e94dec925ee22801275 (diff)
downloadrockbox-75361e5e44d46adb115bc6f4445f18ea6f4d1019.zip
rockbox-75361e5e44d46adb115bc6f4445f18ea6f4d1019.tar.gz
rockbox-75361e5e44d46adb115bc6f4445f18ea6f4d1019.tar.bz2
rockbox-75361e5e44d46adb115bc6f4445f18ea6f4d1019.tar.xz
Stop scrolling text when lcd_clear_display() has been called.
Added call to lcd_update() for Recorder simulator. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3084 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/lcd-player.c1
-rw-r--r--firmware/drivers/lcd-recorder.c5
2 files changed, 3 insertions, 3 deletions
diff --git a/firmware/drivers/lcd-player.c b/firmware/drivers/lcd-player.c
index ea75954..28bbfab 100644
--- a/firmware/drivers/lcd-player.c
+++ b/firmware/drivers/lcd-player.c
@@ -264,6 +264,7 @@ void lcd_clear_display(void)
int i;
bool update=false;
DEBUGF("lcd_clear_display()\n");
+ lcd_stop_scroll();
for (i=0;i<22;i++)
update|=lcdx_putc(i%11, i/11, ' ');
if (update)
diff --git a/firmware/drivers/lcd-recorder.c b/firmware/drivers/lcd-recorder.c
index 24c4811..80d8a9b 100644
--- a/firmware/drivers/lcd-recorder.c
+++ b/firmware/drivers/lcd-recorder.c
@@ -216,6 +216,7 @@ void lcd_roll(int lines)
void lcd_clear_display (void)
{
memset (lcd_framebuffer, 0, sizeof lcd_framebuffer);
+ lcd_stop_scroll();
}
void lcd_setmargins(int x, int y)
@@ -290,9 +291,7 @@ void lcd_puts(int x, int y, unsigned char *str)
lcd_putsxy(xpos, ypos, str);
lcd_clearrect(xpos + w, ypos, LCD_WIDTH - (xpos + w), h);
-#if defined(SIMULATOR) && defined(HAVE_LCD_CHARCELLS)
- /* this function is being used when simulating a charcell LCD and
- then we update immediately */
+#if defined(SIMULATOR)
lcd_update();
#endif
}