summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2010-04-18 15:46:56 +0000
committerBertrik Sikken <bertrik@sikken.nl>2010-04-18 15:46:56 +0000
commitfefa1c7bbf4252b796bb1f37a957b1ccb977b356 (patch)
tree87a395b9e375a245ad3ce18adb9b70cb4fa4a6af
parentc493a1e39d4ce5c725bad9cb3686ee3e8477f734 (diff)
downloadrockbox-fefa1c7bbf4252b796bb1f37a957b1ccb977b356.tar.gz
rockbox-fefa1c7bbf4252b796bb1f37a957b1ccb977b356.zip
Clean up IAP / ipod remote tuner a bit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25672 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/iap.c16
-rw-r--r--firmware/drivers/tuner/ipod_remote_tuner.c9
-rw-r--r--firmware/export/iap.h2
3 files changed, 13 insertions, 14 deletions
diff --git a/apps/iap.c b/apps/iap.c
index 33c84c759b..96713083c1 100644
--- a/apps/iap.c
+++ b/apps/iap.c
@@ -71,6 +71,13 @@ static void iap_task(void)
71 queue_post(&button_queue, SYS_IAP_PERIODIC, 0); 71 queue_post(&button_queue, SYS_IAP_PERIODIC, 0);
72} 72}
73 73
74/* called by playback when the next track starts */
75static void iap_track_changed(void *ignored)
76{
77 (void)ignored;
78 iap_changedctr = 1;
79}
80
74void iap_setup(int ratenum) 81void iap_setup(int ratenum)
75{ 82{
76 iap_bitrate_set(ratenum); 83 iap_bitrate_set(ratenum);
@@ -177,13 +184,6 @@ int iap_getc(unsigned char x)
177 return newpkt; 184 return newpkt;
178} 185}
179 186
180/* called by playback when the next track starts */
181void iap_track_changed(void *ignored)
182{
183 (void)ignored;
184 iap_changedctr = 1;
185}
186
187void iap_periodic(void) 187void iap_periodic(void)
188{ 188{
189 if(!iap_setupflag) return; 189 if(!iap_setupflag) return;
@@ -212,7 +212,7 @@ void iap_periodic(void)
212 iap_send_pkt(data, sizeof(data)); 212 iap_send_pkt(data, sizeof(data));
213} 213}
214 214
215void iap_set_remote_volume(void) 215static void iap_set_remote_volume(void)
216{ 216{
217 unsigned char data[] = {0x03, 0x0D, 0x04, 0x00, 0x00}; 217 unsigned char data[] = {0x03, 0x0D, 0x04, 0x00, 0x00};
218 data[4] = (char)((global_settings.volume+58) * 4); 218 data[4] = (char)((global_settings.volume+58) * 4);
diff --git a/firmware/drivers/tuner/ipod_remote_tuner.c b/firmware/drivers/tuner/ipod_remote_tuner.c
index e770b9dbe4..25ad2d9845 100644
--- a/firmware/drivers/tuner/ipod_remote_tuner.c
+++ b/firmware/drivers/tuner/ipod_remote_tuner.c
@@ -29,6 +29,7 @@
29#include "tuner.h" /* tuner abstraction interface */ 29#include "tuner.h" /* tuner abstraction interface */
30#include "adc.h" 30#include "adc.h"
31#include "settings.h" 31#include "settings.h"
32#include "power.h"
32 33
33static bool powered = false; 34static bool powered = false;
34 35
@@ -204,7 +205,7 @@ void rmt_tuner_set_param(unsigned char tuner_param)
204 } 205 }
205} 206}
206 207
207void set_deltafreq(int delta) 208static void set_deltafreq(int delta)
208{ 209{
209 tuner_param &= 0xFC; 210 tuner_param &= 0xFC;
210 switch (delta) 211 switch (delta)
@@ -231,7 +232,7 @@ void set_deltafreq(int delta)
231 } 232 }
232} 233}
233 234
234void set_deemphasis(int deemphasis) 235static void set_deemphasis(int deemphasis)
235{ 236{
236 tuner_param &= 0xBF; 237 tuner_param &= 0xBF;
237 switch (deemphasis) 238 switch (deemphasis)
@@ -249,7 +250,7 @@ void set_deemphasis(int deemphasis)
249 } 250 }
250} 251}
251 252
252void set_mono(int value) 253static void set_mono(int value)
253{ 254{
254 tuner_param &= 0xEF; 255 tuner_param &= 0xEF;
255 256
@@ -264,7 +265,7 @@ void set_mono(int value)
264 } 265 }
265} 266}
266 267
267bool reply_timeout(void) 268static bool reply_timeout(void)
268{ 269{
269 int timeout = 0; 270 int timeout = 0;
270 271
diff --git a/firmware/export/iap.h b/firmware/export/iap.h
index d00e5f398a..b6d6e64d68 100644
--- a/firmware/export/iap.h
+++ b/firmware/export/iap.h
@@ -24,12 +24,10 @@
24#define TX_BUFLEN 128 24#define TX_BUFLEN 128
25 25
26extern int iap_getc(unsigned char x); 26extern int iap_getc(unsigned char x);
27extern void iap_write_pkt(unsigned char data, int len);
28extern void iap_setup(int ratenum); 27extern void iap_setup(int ratenum);
29extern void iap_bitrate_set(int ratenum); 28extern void iap_bitrate_set(int ratenum);
30extern void iap_periodic(void); 29extern void iap_periodic(void);
31extern void iap_handlepkt(void); 30extern void iap_handlepkt(void);
32extern void iap_track_changed(void *ignored);
33extern void iap_send_pkt(const unsigned char * data, int len); 31extern void iap_send_pkt(const unsigned char * data, int len);
34extern unsigned char serbuf[RX_BUFLEN]; 32extern unsigned char serbuf[RX_BUFLEN];
35 33