len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-09 21:22:39 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

RDS: Use a define that doesn't imply any particular hardware dependency.

Browse source 
Theoretically, anything with the capability could implement the decoding
action in an ISR on any radio chip supporting RDS.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31464 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2011-12-29 14:55:49 +00:00
parent ea55ad07b7
commit 2403f38c1f
4 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
firmware/drivers/rds.c
View file

@ -36,7 +36,7 @@ static char rt_copy[65];
static int rt_segment; static int rt_segment;
static int rt_abflag; static int rt_abflag;
#ifdef SI4700_RDS_ASYNC #ifdef RDS_ISR_PROCESSING
/* Functions are called in ISR context */ /* Functions are called in ISR context */
#define rds_disable_irq_save() disable_irq_save() #define rds_disable_irq_save() disable_irq_save()
#define rds_restore_irq(old) restore_irq(old) #define rds_restore_irq(old) restore_irq(old)
@ -57,12 +57,12 @@ static inline char * get_rt(void)
rds_restore_irq(oldlevel); rds_restore_irq(oldlevel);
return rt_out; return rt_out;
} }
#else /* ndef SI4700_RDS_ASYNC */ #else /* ndef RDS_ISR_PROCESSING */
#define rds_disable_irq_save() 0 #define rds_disable_irq_save() 0
#define rds_restore_irq(old) ((void)(old)) #define rds_restore_irq(old) ((void)(old))
static inline char * get_ps(void) { return ps_copy; } static inline char * get_ps(void) { return ps_copy; }
static inline char * get_rt(void) { return rt_copy; } static inline char * get_rt(void) { return rt_copy; }
#endif /* SI4700_RDS_ASYNC */ #endif /* RDS_ISR_PROCESSING */
/* resets the rds parser */ /* resets the rds parser */
void rds_reset(void) void rds_reset(void)

19
firmware/drivers/tuner/si4700.c
View file

@ -21,9 +21,8 @@
* *
****************************************************************************/ ****************************************************************************/
#include "config.h" #include "config.h"
#include <stdbool.h> #include "system.h"
#include <string.h> #include <string.h>
#include <stdlib.h>
#include "kernel.h" #include "kernel.h"
#include "power.h" #include "power.h"
#include "tuner.h" /* tuner abstraction interface */ #include "tuner.h" /* tuner abstraction interface */
@ -529,9 +528,17 @@ int si4700_get(int setting)
#ifdef HAVE_RDS_CAP #ifdef HAVE_RDS_CAP
case RADIO_EVENT: case RADIO_EVENT:
{
#ifdef RDS_ISR_PROCESSING
int oldlevel = disable_irq_save();
#endif
val = rds_event; val = rds_event;
rds_event = 0; rds_event = 0;
#ifdef RDS_ISR_PROCESSING
restore_irq(oldlevel);
#endif
break; break;
}
#endif #endif
} }
@ -557,8 +564,8 @@ void si4700_dbg_info(struct si4700_dbg_info *nfo)
#ifdef HAVE_RDS_CAP #ifdef HAVE_RDS_CAP
#ifdef SI4700_RDS_ASYNC #ifdef RDS_ISR_PROCESSING
/* Read raw RDS info for processing - asynchronously */ /* Read raw RDS info for processing - in ISR */
/* Assumes regbuf is 32 bytes */ /* Assumes regbuf is 32 bytes */
void si4700_rds_read_raw_async(void) void si4700_rds_read_raw_async(void)
@ -583,7 +590,7 @@ void si4700_rds_set_event(void)
rds_event = 1; rds_event = 1;
} }
#else #else /* ndef RDS_ISR_PROCESSING */
/* Read raw RDS info for processing */ /* Read raw RDS info for processing */
bool si4700_rds_read_raw(uint16_t data[4]) bool si4700_rds_read_raw(uint16_t data[4])
{ {
@ -610,7 +617,7 @@ void si4700_rds_set_event(void)
rds_event = 1; rds_event = 1;
mutex_unlock(&fmr_mutex); mutex_unlock(&fmr_mutex);
} }
#endif /* SI4700_RDS_ASYNC */ #endif /* RDS_ISR_PROCESSING */
char * si4700_get_rds_info(int setting) char * si4700_get_rds_info(int setting)
{ {

2
firmware/export/config/gigabeats.h
View file

@ -90,7 +90,7 @@
#define CONFIG_TUNER SI4700 #define CONFIG_TUNER SI4700
#define HAVE_RDS_CAP #define HAVE_RDS_CAP
#define SI4700_RDS_ASYNC #define RDS_ISR_PROCESSING
/* Define this if you have the WM8978 audio codec */ /* Define this if you have the WM8978 audio codec */
#define HAVE_WM8978 #define HAVE_WM8978

8
firmware/export/si4700.h
View file

@ -46,16 +46,16 @@ bool si4700_st(void);
void si4700_rds_init(void); void si4700_rds_init(void);
/* Radio is fully powered up or about to be powered down */ /* Radio is fully powered up or about to be powered down */
void si4700_rds_powerup(bool on); void si4700_rds_powerup(bool on);
#ifdef SI4700_RDS_ASYNC #ifdef RDS_ISR_PROCESSING
/* Read raw RDS info for processing - asynchronously */ /* Read raw RDS info for processing - asynchronously */
void si4700_read_raw_async(int count); void si4700_read_raw_async(int count); /* implemented by target */
void si4700_rds_read_raw_async(void); void si4700_rds_read_raw_async(void);
void si4700_rds_read_raw_async_complete(unsigned char *regbuf, void si4700_rds_read_raw_async_complete(unsigned char *regbuf,
uint16_t data[4]); uint16_t data[4]);
#else #else /* ndef RDS_ISR_PROCESSING */
/* Read raw RDS info for processing */ /* Read raw RDS info for processing */
bool si4700_rds_read_raw(uint16_t data[4]); bool si4700_rds_read_raw(uint16_t data[4]);
#endif #endif /* RDS_ISR_PROCESSING */
/* Obtain specified string */ /* Obtain specified string */
char* si4700_get_rds_info(int setting); char* si4700_get_rds_info(int setting);
/* Set the event flag */ /* Set the event flag */