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.tar.gz
rockbox-76f4c02dc59f5c6139ffa7b2b887bf81011fcd5d.zip
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 7dca6454e0..6840c16f28 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -224,7 +224,7 @@ static bool update_onvol_change(struct gui_wps * gwps)
224 224
225 225
226#ifdef HAVE_TOUCHSCREEN 226#ifdef HAVE_TOUCHSCREEN
227int skintouch_to_wps(struct wps_data *data) 227static int skintouch_to_wps(struct wps_data *data)
228{ 228{
229 int offset = 0; 229 int offset = 0;
230 int button = skin_get_touchaction(data, &offset); 230 int button = skin_get_touchaction(data, &offset);
@@ -274,7 +274,7 @@ int skintouch_to_wps(struct wps_data *data)
274 } 274 }
275 return button; 275 return button;
276} 276}
277#endif 277#endif /* HAVE_TOUCHSCREEN */
278 278
279bool ffwd_rew(int button) 279bool ffwd_rew(int button)
280{ 280{
diff --git a/firmware/scroll_engine.c b/firmware/scroll_engine.c
index 4fee7ed1d6..fb1628a9c4 100644
--- a/firmware/scroll_engine.c
+++ b/firmware/scroll_engine.c
@@ -47,8 +47,8 @@ static const char scroll_name[] = "scroll";
47static struct scrollinfo lcd_scroll[LCD_SCROLLABLE_LINES]; 47static struct scrollinfo lcd_scroll[LCD_SCROLLABLE_LINES];
48 48
49#ifdef HAVE_REMOTE_LCD 49#ifdef HAVE_REMOTE_LCD
50struct scrollinfo lcd_remote_scroll[LCD_REMOTE_SCROLLABLE_LINES]; 50static struct scrollinfo lcd_remote_scroll[LCD_REMOTE_SCROLLABLE_LINES];
51struct event_queue scroll_queue; 51static struct event_queue scroll_queue;
52#endif 52#endif
53 53
54struct scroll_screen_info lcd_scroll_info = 54struct 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 98d41c7618..2e3a8bed3d 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)
109/* This is the maximum transfer size to the remote (op 0x51= 7 bytes setup+79 109/* This is the maximum transfer size to the remote (op 0x51= 7 bytes setup+79
110 * bytes screen data+xor+sum 110 * bytes screen data+xor+sum
111 */ 111 */
112unsigned char remote_payload[88]; 112static unsigned char remote_payload[88];
113unsigned char remote_payload_size; 113static unsigned char remote_payload_size;
114bool remote_repeat_draw=false;
115 114
116unsigned char remote_draw_x, remote_draw_y, 115static unsigned char remote_draw_x, remote_draw_y,
117 remote_draw_width, remote_draw_height; 116 remote_draw_width, remote_draw_height;
118 117
119/* Monitor remote hotswap */ 118/* Monitor remote hotswap */
120static void remote_tick(void) 119static 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 c4693d632a..153b589b61 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)
127} 127}
128 128
129/* Only used when debugging */ 129/* Only used when debugging */
130char buffer[80]; 130static char buffer[80];
131 131
132void DSPHINT(void) __attribute__ ((section(".icode"))); 132void DSPHINT(void) __attribute__ ((section(".icode")));
133void DSPHINT(void) 133void DSPHINT(void)