summaryrefslogtreecommitdiff
path: root/firmware/export/config.h
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/export/config.h')
-rw-r--r--firmware/export/config.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 6ce9bede41..e4397517db 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -53,9 +53,6 @@
53#define RDA5802 0x80 /* RDA Microelectronics */ 53#define RDA5802 0x80 /* RDA Microelectronics */
54#define STFM1000 0x100 /* Sigmatel */ 54#define STFM1000 0x100 /* Sigmatel */
55 55
56/* CONFIG_CODEC */
57#define SWCODEC 1 /* if codec is done by SW */
58
59/* CONFIG_CPU */ 56/* CONFIG_CPU */
60#define MCF5249 5249 57#define MCF5249 5249
61#define MCF5250 5250 58#define MCF5250 5250
@@ -903,7 +900,6 @@ Lyre prototype 1 */
903#define HAVE_PICTUREFLOW_INTEGRATION 900#define HAVE_PICTUREFLOW_INTEGRATION
904#endif 901#endif
905 902
906#if (CONFIG_CODEC == SWCODEC)
907#ifdef BOOTLOADER 903#ifdef BOOTLOADER
908 904
909#ifdef HAVE_BOOTLOADER_USB_MODE 905#ifdef HAVE_BOOTLOADER_USB_MODE
@@ -975,8 +971,6 @@ Lyre prototype 1 */
975#define HAVE_CROSSFADE 971#define HAVE_CROSSFADE
976#endif 972#endif
977 973
978#endif /* (CONFIG_CODEC == SWCODEC) */
979
980/* Determine if accesses should be strictly long aligned. */ 974/* Determine if accesses should be strictly long aligned. */
981#if defined(CPU_ARM) || defined(CPU_MIPS) 975#if defined(CPU_ARM) || defined(CPU_MIPS)
982#define ROCKBOX_STRICT_ALIGN 1 976#define ROCKBOX_STRICT_ALIGN 1
@@ -1248,19 +1242,16 @@ Lyre prototype 1 */
1248#define HAVE_PCM_FULL_DUPLEX 1242#define HAVE_PCM_FULL_DUPLEX
1249#endif 1243#endif
1250 1244
1251#if (CONFIG_CODEC == SWCODEC)
1252#define HAVE_PITCHCONTROL 1245#define HAVE_PITCHCONTROL
1253#endif
1254 1246
1255/* enable logging messages to disk*/ 1247/* enable logging messages to disk*/
1256#if !defined(BOOTLOADER) && !defined(__PCTOOL__) && (CONFIG_CODEC == SWCODEC) 1248#if !defined(BOOTLOADER) && !defined(__PCTOOL__)
1257#define ROCKBOX_HAS_LOGDISKF 1249#define ROCKBOX_HAS_LOGDISKF
1258#endif 1250#endif
1259 1251
1260#if defined(HAVE_SDL_AUDIO) \ 1252#if defined(HAVE_SDL_AUDIO) \
1261 && !(CONFIG_PLATFORM & PLATFORM_MAEMO5) \ 1253 && !(CONFIG_PLATFORM & PLATFORM_MAEMO5) \
1262 && !defined(HAVE_SW_VOLUME_CONTROL) \ 1254 && !defined(HAVE_SW_VOLUME_CONTROL)
1263 && CONFIG_CODEC == SWCODEC
1264/* SW volume is needed for accurate control and no double buffering should be 1255/* SW volume is needed for accurate control and no double buffering should be
1265 * required. If target uses SW volume, then its definitions are used instead 1256 * required. If target uses SW volume, then its definitions are used instead
1266 * so things are as on target. */ 1257 * so things are as on target. */