From 1c5d0b41eebdb4f8c627b1a0e5f7b699f0b08fb8 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Wed, 3 Apr 2013 16:33:23 +0200 Subject: scroll_engine: Rename scroll_stop* functions to be more consistent with the lcd api. Change-Id: I8ada10b96bfb628cca0331689e8b936ae47c7e1c --- firmware/export/lcd-remote.h | 3 --- firmware/export/lcd.h | 4 ---- firmware/export/scroll_engine.h | 24 +++++++++++++++++------- 3 files changed, 17 insertions(+), 14 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h index 6a3371fef2..74b668db3d 100644 --- a/firmware/export/lcd-remote.h +++ b/firmware/export/lcd-remote.h @@ -187,9 +187,6 @@ extern void lcd_remote_puts_style_offset(int x, int y, const unsigned char *str, extern void lcd_remote_puts_style_xyoffset(int x, int y, const unsigned char *str, int style, int x_offset, int y_offset); extern void lcd_remote_putc(int x, int y, unsigned short ch); -extern void lcd_remote_stop_scroll(void); -extern void lcd_remote_scroll_speed(int speed); -extern void lcd_remote_scroll_delay(int ms); extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str); extern void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *str, int style); diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h index 5ad2d83513..7ea053f241 100644 --- a/firmware/export/lcd.h +++ b/firmware/export/lcd.h @@ -207,10 +207,6 @@ extern void lcd_puts_offset(int x, int y, const unsigned char *str, int offset); extern void lcd_puts_scroll_offset(int x, int y, const unsigned char *string, int offset); extern void lcd_putc(int x, int y, unsigned long ucs); -extern void lcd_stop_scroll(void); -extern void lcd_bidir_scroll(int threshold); -extern void lcd_scroll_speed(int speed); -extern void lcd_scroll_delay(int ms); extern void lcd_puts_scroll(int x, int y, const unsigned char* string); extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string, int style); diff --git a/firmware/export/scroll_engine.h b/firmware/export/scroll_engine.h index 55f4120893..01a9a5e33d 100644 --- a/firmware/export/scroll_engine.h +++ b/firmware/export/scroll_engine.h @@ -29,14 +29,24 @@ #include #include "file.h" -void scroll_init(void) INIT_ATTR; -void lcd_scroll_stop(const struct viewport* vp); -void lcd_scroll_stop_line(const struct viewport* vp, int y); -void lcd_scroll_fn(void); +extern void scroll_init(void) INIT_ATTR; + +extern void lcd_bidir_scroll(int threshold); +extern void lcd_scroll_speed(int speed); +extern void lcd_scroll_delay(int ms); + +extern void lcd_scroll_stop(void); +extern void lcd_scroll_stop_viewport(const struct viewport *vp); +extern void lcd_scroll_stop_viewport_line(const struct viewport *vp, int line); +extern void lcd_scroll_fn(void); #ifdef HAVE_REMOTE_LCD -void lcd_remote_scroll_fn(void); -void lcd_remote_scroll_stop(const struct viewport* vp); -void lcd_remote_scroll_stop_line(const struct viewport* vp, int y); +extern void lcd_remote_scroll_speed(int speed); +extern void lcd_remote_scroll_delay(int ms); + +extern void lcd_remote_scroll_stop(void); +extern void lcd_remote_scroll_stop_viewport(const struct viewport *vp); +extern void lcd_remote_scroll_stop_viewport_line(const struct viewport *vp, int line); +extern void lcd_remote_scroll_fn(void); #endif /* internal usage, but in multiple drivers */ -- cgit v1.2.3