2 files changed, 0 insertions, 48 deletions

diff --git a/firmware/drivers/rds.c b/firmware/drivers/rds.c
index 0b9b227563..2d8466ae36 100644
--- a/firmware/drivers/rds.c
+++ b/firmware/drivers/rds.c
@@ -72,15 +72,6 @@ static int  rt_data_idx;        /* rt_data[0 or 1] */
 #define RT_DATA_INC(x) rt_data[rt_data_idx ^= (x)]
 #endif /* (CONFIG_RDS & RDS_CFG_PROCESS) */
 
-#if (CONFIG_RDS & RDS_CFG_ISR)
-/* Functions are called in ISR context */
-#define rds_disable_irq_save() disable_irq_save()
-#define rds_restore_irq(old) restore_irq(old)
-#else /* !(CONFIG_RDS & RDS_CFG_ISR) */
-#define rds_disable_irq_save() 0
-#define rds_restore_irq(old) ((void)(old))
-#endif /* (CONFIG_RDS & RDS_CFG_ISR) */
-
 /* RDS code table G0 to UTF-8 translation */
 static const uint16_t rds_tbl_g0[0x100-0x20] =
 {
@@ -195,8 +186,6 @@ static void register_activity(void)
 /* resets the rds parser */
 void rds_reset(void)
 {
-    int oldlevel = rds_disable_irq_save();
-
     /* reset general info */
     pi_code    = 0;
     ct_data    = 0;
@@ -210,8 +199,6 @@ void rds_reset(void)
     ps_segment = 0;
     rt_segment = 0;
 #endif /* (CONFIG_RDS & RDS_CFG_PROCESS) */
-
-    rds_restore_irq(oldlevel);
 }
 
 /* initialises the rds parser */
@@ -223,8 +210,6 @@ void rds_init(void)
 /* sync RDS state */
 void rds_sync(void)
 {
-    int oldlevel = rds_disable_irq_save();
-
     if (rds_active) {
         if (TIMED_OUT(rds_timeout)) {
             rds_reset();
@@ -238,8 +223,6 @@ void rds_sync(void)
             }
         }
     }
-
-    rds_restore_irq(oldlevel);
 }
 
 #if (CONFIG_RDS & RDS_CFG_PROCESS)
@@ -458,8 +441,6 @@ void rds_push_info(enum rds_info_id info_id, uintptr_t data, size_t size)
 /* read fully-processed RDS data */
 size_t rds_pull_info(enum rds_info_id info_id, uintptr_t data, size_t size)
 {
-    int oldlevel = rds_disable_irq_save();
-
     rds_sync();
 
     switch (info_id) {
@@ -490,7 +471,5 @@ size_t rds_pull_info(enum rds_info_id info_id, uintptr_t data, size_t size)
     default:
         size = 0;
     }
-
-    rds_restore_irq(oldlevel);
     return size;
 }
diff --git a/firmware/drivers/tuner/si4700.c b/firmware/drivers/tuner/si4700.c
index cce203fde9..7b54526f61 100644
--- a/firmware/drivers/tuner/si4700.c
+++ b/firmware/drivers/tuner/si4700.c
@@ -553,32 +553,6 @@ void si4700_dbg_info(struct si4700_dbg_info *nfo)
 }
 
 #ifdef HAVE_RDS_CAP
-
-#if (CONFIG_RDS & RDS_CFG_ISR)
-static unsigned char isr_regbuf[(RDSD - STATUSRSSI + 1) * 2];
-
-/* Called by RDS interrupt on target */
-void si4700_rds_interrupt(void)
-{
-    si4700_rds_read_raw_async(isr_regbuf, sizeof (isr_regbuf));
-}
-
-/* Handle RDS event from ISR */
-void si4700_rds_process(void)
-{
-    uint16_t rds_data[4];
-    int index = (RDSA - STATUSRSSI) * 2;
-
-    for (int i = 0; i < 4; i++) {
-        rds_data[i] = isr_regbuf[index] << 8 | isr_regbuf[index + 1];
-        index += 2;
-    }
-
-    rds_process(rds_data);
-}
-
-#else /* !(CONFIG_RDS & RDS_CFG_ISR) */
-
 /* Handle RDS event from thread */
 void si4700_rds_process(void)
 {
@@ -603,7 +577,6 @@ void si4700_rds_process(void)
 
     mutex_unlock(&fmr_mutex);
 }
-#endif /* (CONFIG_RDS & RDS_CFG_ISR) */
 
 #if (CONFIG_RDS & RDS_CFG_POLL)
 static struct event_queue rds_queue;