Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ipod fm remote: some static/const fixes from FS #11266 by me

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27867 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Bertrik Sikken 2010-08-23 20:49:33 +00:00
parent e70bc182cf
commit aea21cd18b
2 changed files with 42 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
firmware/drivers/tuner/ipod_remote_tuner.c
View file

@ -35,22 +35,28 @@ static bool powered = false;
static unsigned char tuner_param = 0x00, old_tuner_param = 0xFF; static unsigned char tuner_param = 0x00, old_tuner_param = 0xFF;
/* temp var for tests to avoid looping execution in submenus settings*/ /* temp var for tests to avoid looping execution in submenus settings*/
int mono_mode = -1, old_region = -1; static int mono_mode = -1, old_region = -1;
int radio_present = 0; int radio_present = 0;
int tuner_frequency = 0;
int tuner_signal_power = 0;
int radio_tuned = 0;
int rds_event = 0;
char rds_radioname[9]; static int tuner_frequency = 0;
char rds_radioinfo[65]; static int tuner_signal_power = 0;
static bool radio_tuned = false;
static bool rds_event = false;
union FRQ { static char rds_radioname[9];
static char rds_radioinfo[65];
static union FRQ {
unsigned long int frequency_radio; unsigned long int frequency_radio;
char data_frequency[4]; char data_frequency[4];
}Frequency; }Frequency;
static void rmt_tuner_signal_power(unsigned char value)
{
tuner_signal_power = (int)(value);
}
void rmt_tuner_freq(void) void rmt_tuner_freq(void)
{ {
char tempdata[4]; char tempdata[4];
@ -61,15 +67,15 @@ void rmt_tuner_freq(void)
memcpy(Frequency.data_frequency,tempdata,4); memcpy(Frequency.data_frequency,tempdata,4);
tuner_frequency = (Frequency.frequency_radio*1000); tuner_frequency = (Frequency.frequency_radio*1000);
radio_tuned = 1; radio_tuned = true;
rmt_tuner_signal_power(serbuf[7]); rmt_tuner_signal_power(serbuf[7]);
} }
void rmt_tuner_set_freq(int curr_freq) static void rmt_tuner_set_freq(int curr_freq)
{ {
if (curr_freq != tuner_frequency) if (curr_freq != tuner_frequency)
{ {
radio_tuned = 0; radio_tuned = false;
tuner_signal_power = 0; tuner_signal_power = 0;
/* clear rds name and info */ /* clear rds name and info */
memset(rds_radioname,' ',sizeof(rds_radioname)); memset(rds_radioname,' ',sizeof(rds_radioname));
@ -94,12 +100,7 @@ void rmt_tuner_set_freq(int curr_freq)
} }
} }
void rmt_tuner_signal_power(unsigned char value) static void rmt_tuner_sleep(int state)
{
tuner_signal_power = (int)(value);
}
void rmt_tuner_sleep(int state)
{ {
if (state == 0) if (state == 0)
{ {
@ -108,41 +109,41 @@ void rmt_tuner_sleep(int state)
mono_mode = -1; mono_mode = -1;
old_region = -1; old_region = -1;
tuner_frequency = 0; tuner_frequency = 0;
radio_tuned = 0; radio_tuned = false;
/* tuner HW on */ /* tuner HW on */
unsigned char data[] = {0x07, 0x05, 0x01}; const unsigned char data[] = {0x07, 0x05, 0x01};
iap_send_pkt(data, sizeof(data)); iap_send_pkt(data, sizeof(data));
/* boost gain */ /* boost gain */
unsigned char data1[] = {0x07, 0x24, 0x06 }; const unsigned char data1[] = {0x07, 0x24, 0x06 };
iap_send_pkt(data1, sizeof(data1)); iap_send_pkt(data1, sizeof(data1));
/* set volume */ /* set volume */
unsigned char data2[] = {0x03, 0x09, 0x04, 0x00, 0x00 }; unsigned char data2[] = {0x03, 0x09, 0x04, 0x00, 0x00 };
data2[4] = (char)((global_settings.volume+58) * 4); data2[4] = (char)((global_settings.volume+58) * 4);
iap_send_pkt(data2, sizeof(data2)); iap_send_pkt(data2, sizeof(data2));
/* set rds on */ /* set rds on */
unsigned char data3[] = {0x07, 0x20, 0x40, 0x00, 0x00, 0x10 }; const unsigned char data3[] = {0x07, 0x20, 0x40, 0x00, 0x00, 0x10 };
iap_send_pkt(data3, sizeof(data3)); iap_send_pkt(data3, sizeof(data3));
} }
else else
{ {
/* unbooste gain */ /* unbooste gain */
unsigned char data[] = {0x07, 0x24, 0x00}; const unsigned char data[] = {0x07, 0x24, 0x00};
iap_send_pkt(data, sizeof(data)); iap_send_pkt(data, sizeof(data));
/* set rds off */ /* set rds off */
unsigned char data1[] = {0x07, 0x20, 0x00, 0x00, 0x00, 0x00 }; const unsigned char data1[] = {0x07, 0x20, 0x00, 0x00, 0x00, 0x00 };
iap_send_pkt(data1, sizeof(data1)); iap_send_pkt(data1, sizeof(data1));
/* stop tuner HW */ /* stop tuner HW */
unsigned char data2[] = {0x07, 0x05, 0x00}; const unsigned char data2[] = {0x07, 0x05, 0x00};
iap_send_pkt(data2, sizeof(data2)); iap_send_pkt(data2, sizeof(data2));
} }
} }
void rmt_tuner_scan(int param) static void rmt_tuner_scan(int param)
{ {
unsigned char data[] = {0x07, 0x11, 0x08}; /* RSSI level */ const unsigned char data[] = {0x07, 0x11, 0x08}; /* RSSI level */
unsigned char updown = 0x00; unsigned char updown = 0x00;
radio_tuned = 0; radio_tuned = false;
iap_send_pkt(data, sizeof(data)); iap_send_pkt(data, sizeof(data));
if (param == 1) if (param == 1)
@ -161,7 +162,8 @@ void rmt_tuner_scan(int param)
iap_send_pkt(data1, sizeof(data1)); iap_send_pkt(data1, sizeof(data1));
} }
void rmt_tuner_mute(int value) #if 0 /* function is not used */
static void rmt_tuner_mute(int value)
{ {
/* mute flag off (play) */ /* mute flag off (play) */
unsigned char data[] = {0x03, 0x09, 0x03, 0x01}; unsigned char data[] = {0x03, 0x09, 0x03, 0x01};
@ -172,8 +174,9 @@ void rmt_tuner_mute(int value)
} }
iap_send_pkt(data, sizeof(data)); iap_send_pkt(data, sizeof(data));
} }
#endif
void rmt_tuner_region(int region) static void rmt_tuner_region(int region)
{ {
if (region != old_region) if (region != old_region)
{ {
@ -194,7 +197,7 @@ void rmt_tuner_region(int region)
} }
/* set stereo/mono, deemphasis, delta freq... */ /* set stereo/mono, deemphasis, delta freq... */
void rmt_tuner_set_param(unsigned char tuner_param) static void rmt_tuner_set_param(unsigned char tuner_param)
{ {
if(tuner_param != old_tuner_param) if(tuner_param != old_tuner_param)
{ {
@ -279,9 +282,7 @@ static bool reply_timeout(void)
} }
while((ipod_rmt_tuner_get(RADIO_TUNED) == 0) && (timeout < TIMEOUT_VALUE)); while((ipod_rmt_tuner_get(RADIO_TUNED) == 0) && (timeout < TIMEOUT_VALUE));
if (timeout >= TIMEOUT_VALUE) return (timeout >= TIMEOUT_VALUE);
return true;
else return false;
} }
void rmt_tuner_rds_data(void) void rmt_tuner_rds_data(void)
@ -294,7 +295,7 @@ void rmt_tuner_rds_data(void)
{ {
strlcpy(rds_radioinfo,serbuf+5,(serbuf[0]-4)); strlcpy(rds_radioinfo,serbuf+5,(serbuf[0]-4));
} }
rds_event = 1; rds_event = true;
} }
/* tuner abstraction layer: set something to the tuner */ /* tuner abstraction layer: set something to the tuner */
@ -327,13 +328,13 @@ int ipod_rmt_tuner_set(int setting, int value)
&fm_region_data[global_settings.fm_region]; &fm_region_data[global_settings.fm_region];
/* case: scan for presets, back to beginning of the band */ /* case: scan for presets, back to beginning of the band */
if ((radio_tuned == 1) && (value == fmr->freq_min)) if (radio_tuned && (value == fmr->freq_min))
{ {
tuner_set(RADIO_FREQUENCY,value); tuner_set(RADIO_FREQUENCY,value);
} }
/* scan through frequencies */ /* scan through frequencies */
if (radio_tuned == 1) if (radio_tuned)
{ {
if ((tuner_frequency <= fmr->freq_min) if ((tuner_frequency <= fmr->freq_min)
&& (tuner_frequency >= fmr->freq_max)) && (tuner_frequency >= fmr->freq_max))
@ -355,17 +356,17 @@ int ipod_rmt_tuner_set(int setting, int value)
if (reply_timeout() == true) if (reply_timeout() == true)
return 0; return 0;
} }
radio_tuned = 0; radio_tuned = false;
} }
if (tuner_frequency == value) if (tuner_frequency == value)
{ {
radio_tuned = 1; radio_tuned = true;
return 1; return 1;
} }
else else
{ {
radio_tuned = 0; radio_tuned = false;
return 0; return 0;
} }
} }
@ -426,7 +427,7 @@ int ipod_rmt_tuner_get(int setting)
/* radio tuned: yes no */ /* radio tuned: yes no */
case RADIO_TUNED: case RADIO_TUNED:
val = 0; val = 0;
if (radio_tuned == 1) if (radio_tuned)
val = 1; val = 1;
break; break;
@ -441,7 +442,7 @@ int ipod_rmt_tuner_get(int setting)
if (rds_event) if (rds_event)
{ {
val = 1; val = 1;
rds_event = 0; rds_event = false;
} }
break; break;
} }

17
firmware/export/ipod_remote_tuner.h
View file

@ -27,25 +27,8 @@
#define TIMEOUT_VALUE 20 #define TIMEOUT_VALUE 20
extern int radio_present; extern int radio_present;
extern int tuner_frequency;
extern int tuner_signal_power;
extern int radio_tuned;
/* update tuner state: plugged or unplugged when in radio mode */
extern void rmt_tuner_region(int region);
extern void rmt_tuner_set_freq(int curr_freq);
extern void rmt_tuner_freq(void); extern void rmt_tuner_freq(void);
extern void rmt_tuner_scan(int direction);
/* tuner mode state: ON or OFF */
extern void rmt_tuner_sleep(int state);
/* parameters are stereo/mono, deemphasis, delta freq... */
extern void rmt_tuner_set_param(unsigned char tuner_param);
extern void rmt_tuner_mute(int value);
extern void rmt_tuner_signal_power(unsigned char value);
extern void rmt_tuner_rds_data(void); extern void rmt_tuner_rds_data(void);
int ipod_rmt_tuner_set(int setting, int value); int ipod_rmt_tuner_set(int setting, int value);