Compile time ifdefs to allow ARM to compile with SDCARD disabled.

This commit is contained in:
rob@marotori.com
2012-08-30 10:27:18 +00:00
parent a5602535aa
commit 8be25ddbc7
2 changed files with 8 additions and 0 deletions
+4
View File
@@ -173,7 +173,9 @@ uint32_t pcmFreq = 8000;
#ifndef SIMU
void audioTask(void* pdata)
{
#if defined(SDCARD)
sdInit();
#endif
while (1) {
@@ -481,8 +483,10 @@ void AudioQueue::playFile(const char *filename, uint8_t flags, uint8_t id)
printf("playFile(\"%s\")\n", filename); fflush(stdout);
#endif
#if defined(SDCARD)
if (Card_initialized && !sd_card_mounted())
return;
#endif
CoEnterMutexSection(audioMutex);
+4
View File
@@ -1905,9 +1905,11 @@ void evalFunctions()
if (IS_PLAYING(i+1)) {
switch_mask = 0;
}
#if defined(SDCARD)
else {
PUSH_CUSTOM_PROMPT(sd->param, i+1);
}
#endif
}
else if (sd->func == FUNC_PLAY_VALUE) {
if (IS_PLAYING(i+1)) {
@@ -3128,9 +3130,11 @@ inline void open9xInit(OPEN9X_INIT_ARGS)
doSplash();
#if defined(PCBARM)
#if defined(SDCARD)
while (!Card_initialized) {
CoTickDelay(1); // 2ms
}
#endif
#endif
#if !defined(PCBARM)