diff options
| author | Bertrik Sikken <bertrik@sikken.nl> | 2010-04-18 15:46:56 +0000 |
|---|---|---|
| committer | Bertrik Sikken <bertrik@sikken.nl> | 2010-04-18 15:46:56 +0000 |
| commit | fefa1c7bbf4252b796bb1f37a957b1ccb977b356 (patch) | |
| tree | 87a395b9e375a245ad3ce18adb9b70cb4fa4a6af | |
| parent | c493a1e39d4ce5c725bad9cb3686ee3e8477f734 (diff) | |
| download | rockbox-fefa1c7bbf4252b796bb1f37a957b1ccb977b356.zip rockbox-fefa1c7bbf4252b796bb1f37a957b1ccb977b356.tar.gz rockbox-fefa1c7bbf4252b796bb1f37a957b1ccb977b356.tar.bz2 rockbox-fefa1c7bbf4252b796bb1f37a957b1ccb977b356.tar.xz | |
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.c | 16 | ||||
| -rw-r--r-- | firmware/drivers/tuner/ipod_remote_tuner.c | 9 | ||||
| -rw-r--r-- | firmware/export/iap.h | 2 |
3 files changed, 13 insertions, 14 deletions
@@ -71,6 +71,13 @@ static void iap_task(void) queue_post(&button_queue, SYS_IAP_PERIODIC, 0); } +/* called by playback when the next track starts */ +static void iap_track_changed(void *ignored) +{ + (void)ignored; + iap_changedctr = 1; +} + void iap_setup(int ratenum) { iap_bitrate_set(ratenum); @@ -177,13 +184,6 @@ int iap_getc(unsigned char x) return newpkt; } -/* called by playback when the next track starts */ -void iap_track_changed(void *ignored) -{ - (void)ignored; - iap_changedctr = 1; -} - void iap_periodic(void) { if(!iap_setupflag) return; @@ -212,7 +212,7 @@ void iap_periodic(void) iap_send_pkt(data, sizeof(data)); } -void iap_set_remote_volume(void) +static void iap_set_remote_volume(void) { unsigned char data[] = {0x03, 0x0D, 0x04, 0x00, 0x00}; 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 e770b9d..25ad2d9 100644 --- a/firmware/drivers/tuner/ipod_remote_tuner.c +++ b/firmware/drivers/tuner/ipod_remote_tuner.c @@ -29,6 +29,7 @@ #include "tuner.h" /* tuner abstraction interface */ #include "adc.h" #include "settings.h" +#include "power.h" static bool powered = false; @@ -204,7 +205,7 @@ void rmt_tuner_set_param(unsigned char tuner_param) } } -void set_deltafreq(int delta) +static void set_deltafreq(int delta) { tuner_param &= 0xFC; switch (delta) @@ -231,7 +232,7 @@ void set_deltafreq(int delta) } } -void set_deemphasis(int deemphasis) +static void set_deemphasis(int deemphasis) { tuner_param &= 0xBF; switch (deemphasis) @@ -249,7 +250,7 @@ void set_deemphasis(int deemphasis) } } -void set_mono(int value) +static void set_mono(int value) { tuner_param &= 0xEF; @@ -264,7 +265,7 @@ void set_mono(int value) } } -bool reply_timeout(void) +static bool reply_timeout(void) { int timeout = 0; diff --git a/firmware/export/iap.h b/firmware/export/iap.h index d00e5f3..b6d6e64 100644 --- a/firmware/export/iap.h +++ b/firmware/export/iap.h @@ -24,12 +24,10 @@ #define TX_BUFLEN 128 extern int iap_getc(unsigned char x); -extern void iap_write_pkt(unsigned char data, int len); extern void iap_setup(int ratenum); extern void iap_bitrate_set(int ratenum); extern void iap_periodic(void); extern void iap_handlepkt(void); -extern void iap_track_changed(void *ignored); extern void iap_send_pkt(const unsigned char * data, int len); extern unsigned char serbuf[RX_BUFLEN]; |