summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2017-01-30 09:52:05 -0500
committerMichael Sevakis <jethead71@rockbox.org>2017-02-11 22:19:32 -0500
commitfc9695eb47732e1c189e2f033dbd55e5c346e8c4 (patch)
tree550830e9af67f47e3eb87587770b25d22110f57a /firmware/target/arm
parent6436c6e749ab04fbd5d97804a6a1c3b3122b326d (diff)
downloadrockbox-fc9695eb47732e1c189e2f033dbd55e5c346e8c4.tar.gz
rockbox-fc9695eb47732e1c189e2f033dbd55e5c346e8c4.tar.bz2
rockbox-fc9695eb47732e1c189e2f033dbd55e5c346e8c4.zip
Improve radio RDS driver and framework
* Remove unused bits like the radio event and simplify basic radio interface. It can be more self-contained with rds.h only required by radio and tuner code. * Add post-processing to text a-la Silicon Labs AN243. The chip's error correction can only do so much; additional checks are highly recommended. Simply testing for two identical messages in a row is extremely effective and I've never seen corrupted text since doing that, even with mediocre reception. Groups segments must arrive in order, not randomly; logic change only accepts them in order, starting at 0. Time readout was made a bit better but really we'd need to use verbose mode and ensure that no errors were seen during receiving of time and more checks would be need to have a stable PI. The text is the important bit anyway. * Time out of stale text. * Text is no longer updated until a complete group has been received, as is specified in the standard. Perhaps go back to scrolling text lines in the radio screen? * Add proper character conversion to UTF-8. Only the default G0 table for the moment. The other two could be added in. * Add variants "RDS_CFG_PROCESS" and "RDS_CFG_PUSH" to allow the option for processed RDS data to be pushed to the driver and still do proper post-processing (only text conversion for now for the latter). Change-Id: I4d83f8b2e89a209a5096d15ec266477318c66925
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/as3525/fmradio-i2c-as3525.c8
-rw-r--r--firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c8
-rw-r--r--firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c57
3 files changed, 23 insertions, 50 deletions
diff --git a/firmware/target/arm/as3525/fmradio-i2c-as3525.c b/firmware/target/arm/as3525/fmradio-i2c-as3525.c
index ebe7ebeffd..5b629f5ad4 100644
--- a/firmware/target/arm/as3525/fmradio-i2c-as3525.c
+++ b/firmware/target/arm/as3525/fmradio-i2c-as3525.c
@@ -35,7 +35,6 @@
#include "generic_i2c.h"
#include "fmradio_i2c.h"
#include "thread.h"
-#include "rds.h"
#if defined(SANSA_CLIP) || defined(SANSA_C200V2)
#define I2C_SCL_GPIO(x) GPIOB_PIN(x)
@@ -203,13 +202,9 @@ void tuner_isr(void)
/* Captures RDS data and processes it */
static void NORETURN_ATTR rds_thread(void)
{
- uint16_t rds_data[4];
-
while (true) {
semaphore_wait(&rds_sema, TIMEOUT_BLOCK);
- if (si4700_rds_read_raw(rds_data) && rds_process(rds_data)) {
- si4700_rds_set_event();
- }
+ si4700_rds_process();
}
}
@@ -233,7 +228,6 @@ void si4700_rds_powerup(bool on)
void si4700_rds_init(void)
{
semaphore_init(&rds_sema, 1, 0);
- rds_init();
create_thread(rds_thread, rds_stack, sizeof(rds_stack), 0, "rds"
IF_PRIO(, PRIORITY_REALTIME) IF_COP(, CPU));
}
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c b/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c
index bc4a83665d..5d146c4846 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/fmradio-i2c-fuzeplus.c
@@ -23,7 +23,6 @@
#include "system.h"
#include "kernel.h"
#include "pinctrl-imx233.h"
-#include "rds.h"
#include "si4700.h"
/**
@@ -52,13 +51,11 @@ static void stc_rds_callback(int bank, int pin, intptr_t user)
/* Captures RDS data and processes it */
static void NORETURN_ATTR rds_thread(void)
{
- uint16_t rds_data[4];
-
while(true)
{
semaphore_wait(&rds_sema, TIMEOUT_BLOCK);
- if(si4700_rds_read_raw(rds_data) && rds_process(rds_data))
- si4700_rds_set_event();
+ si4700_rds_process();
+
/* renable callback */
imx233_pinctrl_setup_irq(2, 27, true, true, false, &stc_rds_callback, 0);
}
@@ -86,7 +83,6 @@ void si4700_rds_powerup(bool on)
void si4700_rds_init(void)
{
semaphore_init(&rds_sema, 1, 0);
- rds_init();
create_thread(rds_thread, rds_stack, sizeof(rds_stack), 0, "rds"
IF_PRIO(, PRIORITY_REALTIME) IF_COP(, CPU));
}
diff --git a/firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c b/firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c
index ee91b99c0f..5b0c71110d 100644
--- a/firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c
+++ b/firmware/target/arm/imx31/gigabeat-s/fmradio-i2c-gigabeat-s.c
@@ -29,7 +29,6 @@
#include "gpio-target.h"
#include "i2c-imx31.h"
#include "fmradio_i2c.h"
-#include "rds.h"
#include "tuner.h"
static struct i2c_node si4700_i2c_node =
@@ -128,60 +127,44 @@ bool si4700_st(void)
/* Low-level RDS Support */
-
-/* Transfer descriptor for RDS async operations */
-static struct si4700_i2c_transfer_desc
-{
- struct i2c_transfer_desc xfer;
- unsigned char regbuf[32];
-} si4700_xfer =
-{
- .xfer = { .node = &si4700_i2c_node }
-};
-
static bool int_restore;
-static void si4700_rds_read_raw_callback(struct i2c_transfer_desc *xfer)
+/* Called after I2C read cycle completes */
+static void si4700_rds_read_raw_async_callback(struct i2c_transfer_desc *xfer)
{
- struct si4700_i2c_transfer_desc *xf =
- (struct si4700_i2c_transfer_desc *)xfer;
-
if (xfer->rxcount == 0)
- {
- uint16_t rds_data[4];
- si4700_rds_read_raw_async_complete(xf->regbuf, rds_data);
-
- if (rds_process(rds_data))
- si4700_rds_set_event();
- }
+ si4700_rds_process();
/* else read didn't finish */
if (int_restore)
gpio_int_enable(SI4700_EVENT_ID);
}
-/* Callback from si4700_rds_read_raw to execute the read */
-void si4700_read_raw_async(int count)
+/* Called to read registers from ISR context */
+void si4700_rds_read_raw_async(unsigned char *buf, int count)
{
- si4700_xfer.xfer.txdata = NULL;
- si4700_xfer.xfer.txcount = 0;
- si4700_xfer.xfer.rxdata = si4700_xfer.regbuf;
- si4700_xfer.xfer.rxcount = count;
- si4700_xfer.xfer.callback = si4700_rds_read_raw_callback;
- si4700_xfer.xfer.next = NULL;
-
- i2c_transfer(&si4700_xfer.xfer);
+ /* transfer descriptor for RDS async operations */
+ static struct i2c_transfer_desc xfer = { .node = &si4700_i2c_node };
+
+ xfer.txdata = NULL;
+ xfer.txcount = 0;
+ xfer.rxdata = buf;
+ xfer.rxcount = count;
+ xfer.callback = si4700_rds_read_raw_async_callback;
+ xfer.next = NULL;
+
+ i2c_transfer(&xfer);
}
/* RDS GPIO interrupt handler - start RDS data read */
void INT_SI4700_RDS(void)
{
- /* mask and clear the interrupt */
+ /* mask and clear the interrupt until we're done */
gpio_int_disable(SI4700_EVENT_ID);
gpio_int_clear(SI4700_EVENT_ID);
- /* read the RDS data */
- si4700_rds_read_raw_async();
+ /* tell radio driver about it */
+ si4700_rds_interrupt();
}
/* Called with on=true after full radio power up, and with on=false before
@@ -197,5 +180,5 @@ void si4700_rds_powerup(bool on)
/* One-time RDS init at startup */
void si4700_rds_init(void)
{
- rds_init();
+ /* nothing to do */
}