FM tuner region code cleanup - FS #11492 by me.

This removes the tuner-specific region structs and makes each driver use the common one (which is now extended with a deemphasis field)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27579 a1c6a512-1295-4272-9138-f99709370657

7 files changed, 1 insertions, 48 deletions

diff --git a/firmware/export/ipod_remote_tuner.h b/firmware/export/ipod_remote_tuner.h
index 28fcfe1e93..2c866ad3d2 100644
--- a/firmware/export/ipod_remote_tuner.h
+++ b/firmware/export/ipod_remote_tuner.h
@@ -48,19 +48,6 @@ extern void rmt_tuner_signal_power(unsigned char value);
 
 extern void rmt_tuner_rds_data(void);
 
-struct rmt_tuner_region_data
-{
-    /* 0: 50us, 1: 75us */
-    unsigned char deemphasis;
-    /* 0: europe, 1: japan (BL in TEA spec)*/
-    unsigned char band;
-    /* 0: us/australia (200kHz), 1: europe/japan (100kHz), 2: (50kHz) */
-    unsigned char spacing;
-} __attribute__((packed));
-
-extern const struct rmt_tuner_region_data
-                                rmt_tuner_region_data[TUNER_NUM_REGIONS];
-
 int ipod_rmt_tuner_set(int setting, int value);
 int ipod_rmt_tuner_get(int setting);
 char* ipod_get_rds_info(int setting);
diff --git a/firmware/export/lv24020lp.h b/firmware/export/lv24020lp.h
index 16a8856a3f..753949f361 100644
--- a/firmware/export/lv24020lp.h
+++ b/firmware/export/lv24020lp.h
@@ -37,8 +37,6 @@
 #define LV24020LP_DEBUG_FIRST LV24020LP_CTRL_STAT
 #define LV24020LP_DEBUG_LAST  LV24020LP_SD_SET
 
-const unsigned char lv24020lp_region_data[TUNER_NUM_REGIONS];
-
 int lv24020lp_set(int setting, int value);
 int lv24020lp_get(int setting);
 void lv24020lp_power(bool status);
diff --git a/firmware/export/rda5802.h b/firmware/export/rda5802.h
index e61ecb40ae..87707966fd 100644
--- a/firmware/export/rda5802.h
+++ b/firmware/export/rda5802.h
@@ -27,14 +27,6 @@
 
 #define HAVE_RADIO_REGION
 
-struct rda5802_region_data
-{
-    unsigned char deemphasis; /* 0: 75us, 1: 50us */
-    unsigned char band; /* 0: us/europe, 1: japan */
-} __attribute__((packed));
-
-extern const struct rda5802_region_data rda5802_region_data[TUNER_NUM_REGIONS];
-
 struct rda5802_dbg_info
 {
     uint16_t regs[16];  /* Read registers */
diff --git a/firmware/export/si4700.h b/firmware/export/si4700.h
index d6c4e73b6e..c4aff6ff30 100644
--- a/firmware/export/si4700.h
+++ b/firmware/export/si4700.h
@@ -27,15 +27,6 @@
 
 #define HAVE_RADIO_REGION
 
-struct si4700_region_data
-{
-    unsigned char deemphasis; /* 0: 75us, 1: 50us */
-    unsigned char band; /* 0: us/europe, 1: japan */
-    unsigned char spacing; /* 0: us/australia (200kHz), 1: europe/japan (100kHz), 2: (50kHz) */
-} __attribute__((packed));
-
-extern const struct si4700_region_data si4700_region_data[TUNER_NUM_REGIONS];
-
 struct si4700_dbg_info
 {
     uint16_t regs[16];  /* Read registers */
diff --git a/firmware/export/tea5760.h b/firmware/export/tea5760.h
index 8fa54dfa78..ea857dec3e 100644
--- a/firmware/export/tea5760.h
+++ b/firmware/export/tea5760.h
@@ -28,14 +28,6 @@
 
 #define HAVE_RADIO_REGION
 
-struct tea5760_region_data
-{
-    unsigned char deemphasis;   /* 1: 50us, 0: 75us */
-    unsigned char band;         /* 0: europe, 1: japan (BL in TEA spec)*/
-} __attribute__((packed));
-
-extern const struct tea5760_region_data tea5760_region_data[TUNER_NUM_REGIONS];
-
 struct tea5760_dbg_info
 {
     unsigned char read_regs[16];
diff --git a/firmware/export/tea5767.h b/firmware/export/tea5767.h
index dceb0f4168..eee469d1ea 100644
--- a/firmware/export/tea5767.h
+++ b/firmware/export/tea5767.h
@@ -26,14 +26,6 @@
 #define HAVE_RADIO_REGION
 #define HAVE_RADIO_MUTE_TIMEOUT
 
-struct tea5767_region_data
-{
-    unsigned char deemphasis; /* 0: 50us, 1: 75us */
-    unsigned char band; /* 0: europe, 1: japan (BL in TEA spec)*/
-} __attribute__((packed));
-
-extern const struct tea5767_region_data tea5767_region_data[TUNER_NUM_REGIONS];
-
 struct tea5767_dbg_info
 {
     unsigned char read_regs[5];
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h
index 461c9a3fcb..9263c08d90 100644
--- a/firmware/export/tuner.h
+++ b/firmware/export/tuner.h
@@ -84,6 +84,7 @@ struct fm_region_data
     int freq_min;
     int freq_max;
     int freq_step;
+    int deemphasis; /* in microseconds, usually 50 or 75 */
 };
 
 extern const struct fm_region_data fm_region_data[TUNER_NUM_REGIONS];