diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/SOURCES | 2 | ||||
-rw-r--r-- | firmware/export/config/sansaclipplus.h | 4 | ||||
-rw-r--r-- | firmware/export/config/sansaclipv2.h | 4 | ||||
-rw-r--r-- | firmware/target/arm/as3525/audio-as3525.c | 7 | ||||
-rw-r--r-- | firmware/target/arm/as3525/sd-as3525v2.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/as3525/system-as3525.c | 2 |
6 files changed, 15 insertions, 6 deletions
diff --git a/firmware/SOURCES b/firmware/SOURCES index eb3e88fd8b..04404f7960 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -423,7 +423,9 @@ drivers/generic_i2c.c | |||
423 | target/arm/adc-as3514.c | 423 | target/arm/adc-as3514.c |
424 | target/arm/as3525/audio-as3525.c | 424 | target/arm/as3525/audio-as3525.c |
425 | target/arm/as3525/debug-as3525.c | 425 | target/arm/as3525/debug-as3525.c |
426 | #if CONFIG_TUNER | ||
426 | target/arm/as3525/fmradio-i2c-as3525.c | 427 | target/arm/as3525/fmradio-i2c-as3525.c |
428 | #endif /* CONFIG_TUNER */ | ||
427 | target/arm/as3525/i2s-as3525.c | 429 | target/arm/as3525/i2s-as3525.c |
428 | target/arm/as3525/pcm-as3525.c | 430 | target/arm/as3525/pcm-as3525.c |
429 | #endif /* BOOTLOADER */ | 431 | #endif /* BOOTLOADER */ |
diff --git a/firmware/export/config/sansaclipplus.h b/firmware/export/config/sansaclipplus.h index ba70fdd203..216f44c4d6 100644 --- a/firmware/export/config/sansaclipplus.h +++ b/firmware/export/config/sansaclipplus.h | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | /* Define bitmask of input sources - recordable bitmask can be defined | 25 | /* Define bitmask of input sources - recordable bitmask can be defined |
26 | explicitly if different */ | 26 | explicitly if different */ |
27 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 27 | #define INPUT_SRC_CAPS (SRC_CAP_MIC /*| SRC_CAP_FMRADIO*/) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | /* define this if you have a bitmap LCD display */ |
30 | #define HAVE_LCD_BITMAP | 30 | #define HAVE_LCD_BITMAP |
@@ -119,7 +119,7 @@ | |||
119 | #define AB_REPEAT_ENABLE 1 | 119 | #define AB_REPEAT_ENABLE 1 |
120 | 120 | ||
121 | /* FM Tuner */ | 121 | /* FM Tuner */ |
122 | #define CONFIG_TUNER SI4700 /* in fact SI4702 */ | 122 | //#define CONFIG_TUNER SI4700 /* in fact SI4702 */ |
123 | //#define HAVE_TUNER_PWR_CTRL | 123 | //#define HAVE_TUNER_PWR_CTRL |
124 | 124 | ||
125 | /* Define this for LCD backlight available */ | 125 | /* Define this for LCD backlight available */ |
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h index 513b093f2f..26c54a4509 100644 --- a/firmware/export/config/sansaclipv2.h +++ b/firmware/export/config/sansaclipv2.h | |||
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | /* Define bitmask of input sources - recordable bitmask can be defined | 25 | /* Define bitmask of input sources - recordable bitmask can be defined |
26 | explicitly if different */ | 26 | explicitly if different */ |
27 | #define INPUT_SRC_CAPS (SRC_CAP_MIC | SRC_CAP_FMRADIO) | 27 | #define INPUT_SRC_CAPS (SRC_CAP_MIC /*| SRC_CAP_FMRADIO*/) |
28 | 28 | ||
29 | /* define this if you have a bitmap LCD display */ | 29 | /* define this if you have a bitmap LCD display */ |
30 | #define HAVE_LCD_BITMAP | 30 | #define HAVE_LCD_BITMAP |
@@ -122,7 +122,7 @@ | |||
122 | #define AB_REPEAT_ENABLE 1 | 122 | #define AB_REPEAT_ENABLE 1 |
123 | 123 | ||
124 | /* FM Tuner */ | 124 | /* FM Tuner */ |
125 | #define CONFIG_TUNER SI4700 /* in fact SI4702 */ | 125 | //#define CONFIG_TUNER SI4700 /* in fact SI4702 */ |
126 | //#define HAVE_TUNER_PWR_CTRL | 126 | //#define HAVE_TUNER_PWR_CTRL |
127 | 127 | ||
128 | /* Define this for LCD backlight available */ | 128 | /* Define this for LCD backlight available */ |
diff --git a/firmware/target/arm/as3525/audio-as3525.c b/firmware/target/arm/as3525/audio-as3525.c index b616153eae..27cbaac3d8 100644 --- a/firmware/target/arm/as3525/audio-as3525.c +++ b/firmware/target/arm/as3525/audio-as3525.c | |||
@@ -47,7 +47,9 @@ void audio_input_mux(int source, unsigned flags) | |||
47 | case AUDIO_SRC_PLAYBACK: | 47 | case AUDIO_SRC_PLAYBACK: |
48 | if (source != last_source) | 48 | if (source != last_source) |
49 | { | 49 | { |
50 | #if defined(HAVE_RECORDING) || defined(HAVE_FMRADIO_IN) | ||
50 | audiohw_set_monitor(false); | 51 | audiohw_set_monitor(false); |
52 | #endif | ||
51 | #ifdef HAVE_RECORDING | 53 | #ifdef HAVE_RECORDING |
52 | audiohw_disable_recording(); | 54 | audiohw_disable_recording(); |
53 | #endif | 55 | #endif |
@@ -64,6 +66,8 @@ void audio_input_mux(int source, unsigned flags) | |||
64 | break; | 66 | break; |
65 | #endif | 67 | #endif |
66 | 68 | ||
69 | #if (INPUT_SRC_CAPS & SRC_CAP_FMRADIO) | ||
70 | |||
67 | case AUDIO_SRC_FMRADIO: /* recording and playback */ | 71 | case AUDIO_SRC_FMRADIO: /* recording and playback */ |
68 | if (source == last_source | 72 | if (source == last_source |
69 | #ifdef HAVE_RECORDING | 73 | #ifdef HAVE_RECORDING |
@@ -86,9 +90,12 @@ void audio_input_mux(int source, unsigned flags) | |||
86 | #ifdef HAVE_RECORDING | 90 | #ifdef HAVE_RECORDING |
87 | audiohw_disable_recording(); | 91 | audiohw_disable_recording(); |
88 | #endif | 92 | #endif |
93 | #if defined(HAVE_RECORDING) || defined(HAVE_FMRADIO_IN) | ||
89 | audiohw_set_monitor(true); /* line 2 analog audio path */ | 94 | audiohw_set_monitor(true); /* line 2 analog audio path */ |
95 | #endif | ||
90 | } | 96 | } |
91 | break; | 97 | break; |
98 | #endif /* (INPUT_SRC_CAPS & SRC_CAP_FMRADIO) */ | ||
92 | } | 99 | } |
93 | 100 | ||
94 | last_source = source; | 101 | last_source = source; |
diff --git a/firmware/target/arm/as3525/sd-as3525v2.c b/firmware/target/arm/as3525/sd-as3525v2.c index 338a6d669f..eef368cfc6 100644 --- a/firmware/target/arm/as3525/sd-as3525v2.c +++ b/firmware/target/arm/as3525/sd-as3525v2.c | |||
@@ -191,7 +191,7 @@ static const char sd_thread_name[] = "ata/sd"; | |||
191 | static struct mutex sd_mtx SHAREDBSS_ATTR; | 191 | static struct mutex sd_mtx SHAREDBSS_ATTR; |
192 | static struct event_queue sd_queue; | 192 | static struct event_queue sd_queue; |
193 | #ifndef BOOTLOADER | 193 | #ifndef BOOTLOADER |
194 | static bool sd_enabled = false; | 194 | bool sd_enabled = false; |
195 | #endif | 195 | #endif |
196 | 196 | ||
197 | static struct wakeup transfer_completion_signal; | 197 | static struct wakeup transfer_completion_signal; |
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c index 4473e1ce59..bd6069ea39 100644 --- a/firmware/target/arm/as3525/system-as3525.c +++ b/firmware/target/arm/as3525/system-as3525.c | |||
@@ -336,7 +336,7 @@ void system_init(void) | |||
336 | #ifndef BOOTLOADER | 336 | #ifndef BOOTLOADER |
337 | /* Initialize power management settings */ | 337 | /* Initialize power management settings */ |
338 | ascodec_write(AS3514_CVDD_DCDC3, AS314_CP_DCDC3_SETTING); | 338 | ascodec_write(AS3514_CVDD_DCDC3, AS314_CP_DCDC3_SETTING); |
339 | #ifdef CONFIG_TUNER | 339 | #if CONFIG_TUNER |
340 | fmradio_i2c_init(); | 340 | fmradio_i2c_init(); |
341 | #endif | 341 | #endif |
342 | #endif /* !BOOTLOADER */ | 342 | #endif /* !BOOTLOADER */ |