1 files changed, 13 insertions, 15 deletions

diff --git a/firmware/export/si4700.h b/firmware/export/si4700.h
index 6b7992c025..bd75bf0817 100644
--- a/firmware/export/si4700.h
+++ b/firmware/export/si4700.h
@@ -35,36 +35,34 @@ struct si4700_dbg_info
 };
 
 bool si4700_detect(void);
-void si4700_init(void);
+void si4700_init(void) INIT_ATTR;
 int si4700_set(int setting, int value);
 int si4700_get(int setting);
 void si4700_dbg_info(struct si4700_dbg_info *nfo);
 /* For interrupt-based mono/stereo indicator */
 bool si4700_st(void);
 
+#ifdef HAVE_RDS_CAP
 /** RDS support **/
-void si4700_rds_init(void);
+
+void si4700_rds_init(void) INIT_ATTR;
 /* Radio is fully powered up or about to be powered down */
 void si4700_rds_powerup(bool on);
-#ifdef RDS_ISR_PROCESSING
+
+#if (CONFIG_RDS & RDS_CFG_ISR) 
 /* Read raw RDS info for processing - asynchronously */
-void si4700_read_raw_async(int count); /* implemented by target */
-void si4700_rds_read_raw_async(void);
-void si4700_rds_read_raw_async_complete(unsigned char *regbuf,
-                                        uint16_t data[4]);
-#else /* ndef RDS_ISR_PROCESSING */
+void si4700_rds_read_raw_async(unsigned char *buf, int count); /* implemented by target */
+void si4700_rds_interrupt(void);
+#endif /* (CONFIG_RDS & RDS_CFG_ISR) */
+
 /* Read raw RDS info for processing */
-bool si4700_rds_read_raw(uint16_t data[4]);
-#endif /* RDS_ISR_PROCESSING */
-/* Obtain specified string */
-char* si4700_get_rds_info(int setting);
-/* Set the event flag */
-void si4700_rds_set_event(void);
+void si4700_rds_process(void);
+
+#endif /* HAVE_RDS_CAP */
 
 #ifndef CONFIG_TUNER_MULTI
 #define tuner_set si4700_set
 #define tuner_get si4700_get
-#define tuner_get_rds_info si4700_get_rds_info
 #endif
 
 #endif /* _SI4700_H_ */