summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2010-07-31 13:41:06 +0000
committerBertrik Sikken <bertrik@sikken.nl>2010-07-31 13:41:06 +0000
commit76f4c02dc59f5c6139ffa7b2b887bf81011fcd5d (patch)
tree83ba5c6945ce54e4d54d4b6b8682579e59e98fe2
parent38e0918eb5822e3f7b36cc88606f61c99003d82f (diff)
downloadrockbox-76f4c02dc59f5c6139ffa7b2b887bf81011fcd5d.zip
rockbox-76f4c02dc59f5c6139ffa7b2b887bf81011fcd5d.tar.gz
rockbox-76f4c02dc59f5c6139ffa7b2b887bf81011fcd5d.tar.bz2
rockbox-76f4c02dc59f5c6139ffa7b2b887bf81011fcd5d.tar.xz
Various minor clean-ups for mrobe
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27639 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/gui/wps.c4
-rw-r--r--firmware/scroll_engine.c4
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c9
-rw-r--r--firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c2
4 files changed, 9 insertions, 10 deletions
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 7dca645..6840c16 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -224,7 +224,7 @@ static bool update_onvol_change(struct gui_wps * gwps)
#ifdef HAVE_TOUCHSCREEN
-int skintouch_to_wps(struct wps_data *data)
+static int skintouch_to_wps(struct wps_data *data)
{
int offset = 0;
int button = skin_get_touchaction(data, &offset);
@@ -274,7 +274,7 @@ int skintouch_to_wps(struct wps_data *data)
}
return button;
}
-#endif
+#endif /* HAVE_TOUCHSCREEN */
bool ffwd_rew(int button)
{
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c
index 4fee7ed..fb1628a 100644
--- a/firmware/scroll_engine.c
+++ b/firmware/scroll_engine.c
@@ -47,8 +47,8 @@ static const char scroll_name[] = "scroll";
static struct scrollinfo lcd_scroll[LCD_SCROLLABLE_LINES];
#ifdef HAVE_REMOTE_LCD
-struct scrollinfo lcd_remote_scroll[LCD_REMOTE_SCROLLABLE_LINES];
-struct event_queue scroll_queue;
+static struct scrollinfo lcd_remote_scroll[LCD_REMOTE_SCROLLABLE_LINES];
+static struct event_queue scroll_queue;
#endif
struct scroll_screen_info lcd_scroll_info =
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c
index 98d41c7..2e3a8be 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-remote-mr500.c
@@ -109,12 +109,11 @@ void lcd_remote_off(void)
/* This is the maximum transfer size to the remote (op 0x51= 7 bytes setup+79
* bytes screen data+xor+sum
*/
-unsigned char remote_payload[88];
-unsigned char remote_payload_size;
-bool remote_repeat_draw=false;
+static unsigned char remote_payload[88];
+static unsigned char remote_payload_size;
-unsigned char remote_draw_x, remote_draw_y,
- remote_draw_width, remote_draw_height;
+static unsigned char remote_draw_x, remote_draw_y,
+ remote_draw_width, remote_draw_height;
/* Monitor remote hotswap */
static void remote_tick(void)
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
index c4693d6..153b589 100644
--- a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
+++ b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c
@@ -127,7 +127,7 @@ size_t pcm_get_bytes_waiting(void)
}
/* Only used when debugging */
-char buffer[80];
+static char buffer[80];
void DSPHINT(void) __attribute__ ((section(".icode")));
void DSPHINT(void)