diff options
author | Bertrik Sikken <bertrik@sikken.nl> | 2010-06-16 20:29:08 +0000 |
---|---|---|
committer | Bertrik Sikken <bertrik@sikken.nl> | 2010-06-16 20:29:08 +0000 |
commit | ff8e76e9e534dde1e6a57a84d49b89dad847cafd (patch) | |
tree | 3fdbb6307e1c1350d13bb205a96e0a5d7df3ad01 /firmware/export | |
parent | 60d5f5050b00e05385cbe55a9d639a56e013ff3f (diff) | |
download | rockbox-ff8e76e9e534dde1e6a57a84d49b89dad847cafd.tar.gz rockbox-ff8e76e9e534dde1e6a57a84d49b89dad847cafd.zip |
The mystery FM chip in some Sansa Clip+ players has been identified as a RDA5802, so rename files and functions. Also fix several bugs.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26871 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/config.h | 2 | ||||
-rw-r--r-- | firmware/export/config/sansaclipplus.h | 2 | ||||
-rw-r--r-- | firmware/export/rda5802.h (renamed from firmware/export/fmclipplus.h) | 30 | ||||
-rw-r--r-- | firmware/export/tuner.h | 6 |
4 files changed, 20 insertions, 20 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index 7f77514116..5be2c99dcb 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -41,7 +41,7 @@ | |||
41 | #define TEA5760 0x10 /* Philips */ | 41 | #define TEA5760 0x10 /* Philips */ |
42 | #define LV240000 0x20 /* Sanyo */ | 42 | #define LV240000 0x20 /* Sanyo */ |
43 | #define IPOD_REMOTE_TUNER 0x40 /* Apple */ | 43 | #define IPOD_REMOTE_TUNER 0x40 /* Apple */ |
44 | #define FMCLIPPLUS 0x80 /* Mystery SiLabs FM tuner in some clip+ */ | 44 | #define RDA5802 0x80 /* RDA Microelectronics */ |
45 | 45 | ||
46 | /* CONFIG_CODEC */ | 46 | /* CONFIG_CODEC */ |
47 | #define MAS3587F 3587 | 47 | #define MAS3587F 3587 |
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index 90636b152d..df9fad74c9 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h | |||
@@ -123,7 +123,7 @@ | |||
123 | #define AB_REPEAT_ENABLE 1 | 123 | #define AB_REPEAT_ENABLE 1 |
124 | 124 | ||
125 | /* FM Tuner */ | 125 | /* FM Tuner */ |
126 | #define CONFIG_TUNER (SI4700|FMCLIPPLUS) /* in fact SI4702 */ | 126 | #define CONFIG_TUNER (SI4700|RDA5802) /* in fact SI4702 */ |
127 | //#define HAVE_TUNER_PWR_CTRL | 127 | //#define HAVE_TUNER_PWR_CTRL |
128 | 128 | ||
129 | /* Define this for LCD backlight available */ | 129 | /* Define this for LCD backlight available */ |
diff --git a/firmware/export/fmclipplus.h b/firmware/export/rda5802.h index 20961f47be..e61ecb40ae 100644 --- a/firmware/export/fmclipplus.h +++ b/firmware/export/rda5802.h | |||
@@ -8,7 +8,7 @@ | |||
8 | * | 8 | * |
9 | * $Id$ | 9 | * $Id$ |
10 | * | 10 | * |
11 | * Tuner header for the Silicon Labs Mystery radio chip in some Sansa Clip+ | 11 | * Tuner header for the RDA Microelectronics RDA5802 FM tuner chip |
12 | * | 12 | * |
13 | * Copyright (C) 2010 Bertrik Sikken | 13 | * Copyright (C) 2010 Bertrik Sikken |
14 | * | 14 | * |
@@ -22,33 +22,33 @@ | |||
22 | * | 22 | * |
23 | ****************************************************************************/ | 23 | ****************************************************************************/ |
24 | 24 | ||
25 | #ifndef _FMCLIPPLUS_H_ | 25 | #ifndef _RDA5802_H_ |
26 | #define _FMCLIPPLUS_H_ | 26 | #define _RDA5802_H_ |
27 | 27 | ||
28 | #define HAVE_RADIO_REGION | 28 | #define HAVE_RADIO_REGION |
29 | 29 | ||
30 | struct fmclipplus_region_data | 30 | struct rda5802_region_data |
31 | { | 31 | { |
32 | unsigned char deemphasis; /* 0: 75us, 1: 50us */ | 32 | unsigned char deemphasis; /* 0: 75us, 1: 50us */ |
33 | unsigned char band; /* 0: us/europe, 1: japan */ | 33 | unsigned char band; /* 0: us/europe, 1: japan */ |
34 | } __attribute__((packed)); | 34 | } __attribute__((packed)); |
35 | 35 | ||
36 | extern const struct fmclipplus_region_data fmclipplus_region_data[TUNER_NUM_REGIONS]; | 36 | extern const struct rda5802_region_data rda5802_region_data[TUNER_NUM_REGIONS]; |
37 | 37 | ||
38 | struct fmclipplus_dbg_info | 38 | struct rda5802_dbg_info |
39 | { | 39 | { |
40 | uint16_t regs[32]; /* Read registers */ | 40 | uint16_t regs[16]; /* Read registers */ |
41 | }; | 41 | }; |
42 | 42 | ||
43 | bool fmclipplus_detect(void); | 43 | bool rda5802_detect(void); |
44 | void fmclipplus_init(void); | 44 | void rda5802_init(void); |
45 | int fmclipplus_set(int setting, int value); | 45 | int rda5802_set(int setting, int value); |
46 | int fmclipplus_get(int setting); | 46 | int rda5802_get(int setting); |
47 | void fmclipplus_dbg_info(struct fmclipplus_dbg_info *nfo); | 47 | void rda5802_dbg_info(struct rda5802_dbg_info *nfo); |
48 | 48 | ||
49 | #ifndef CONFIG_TUNER_MULTI | 49 | #ifndef CONFIG_TUNER_MULTI |
50 | #define tuner_set fmclipplus_set | 50 | #define tuner_set rda5802_set |
51 | #define tuner_get fmclipplus_get | 51 | #define tuner_get rda5802_get |
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | #endif /* _FMCLIPPLUS_H_ */ | 54 | #endif /* _RDA5802_H_ */ |
diff --git a/firmware/export/tuner.h b/firmware/export/tuner.h index 9101bb9241..fa894a4b6c 100644 --- a/firmware/export/tuner.h +++ b/firmware/export/tuner.h | |||
@@ -132,9 +132,9 @@ extern int (*tuner_get)(int setting); | |||
132 | #include "si4700.h" | 132 | #include "si4700.h" |
133 | #endif | 133 | #endif |
134 | 134 | ||
135 | /* Silicon Labs mystery radio chip in some Sansa Clip+ */ | 135 | /* RDA micro RDA5802 */ |
136 | #if (CONFIG_TUNER & FMCLIPPLUS) | 136 | #if (CONFIG_TUNER & RDA5802) |
137 | #include "fmclipplus.h" | 137 | #include "rda5802.h" |
138 | #endif | 138 | #endif |
139 | 139 | ||
140 | /* Apple remote tuner */ | 140 | /* Apple remote tuner */ |