Some refactoring

This commit is contained in:
bsongis
2012-10-04 17:24:27 +00:00
parent 6ecf3375c2
commit 2b78b499f4
4 changed files with 15 additions and 11 deletions
+7
View File
@@ -26,6 +26,10 @@ typedef enum {
/*---------------------------------------*/ /*---------------------------------------*/
/* Prototypes for disk control functions */ /* Prototypes for disk control functions */
#ifdef __cplusplus
extern "C" {
#endif
int assign_drives (int, int); int assign_drives (int, int);
DSTATUS disk_initialize (BYTE); DSTATUS disk_initialize (BYTE);
DSTATUS disk_status (BYTE); DSTATUS disk_status (BYTE);
@@ -35,6 +39,9 @@ DRESULT disk_write (BYTE, const BYTE*, DWORD, BYTE);
#endif #endif
DRESULT disk_ioctl (BYTE, BYTE, void*); DRESULT disk_ioctl (BYTE, BYTE, void*);
#ifdef __cplusplus
}
#endif
/* Disk Status Bits (DSTATUS) */ /* Disk Status Bits (DSTATUS) */
+4 -2
View File
@@ -441,8 +441,9 @@ ifeq ($(PCB), X9D)
CPPSRC += sky9x/sound_driver.cpp sky9x/haptic_driver.cpp sky9x/sdcard_driver.cpp CPPSRC += sky9x/sound_driver.cpp sky9x/haptic_driver.cpp sky9x/sdcard_driver.cpp
ifeq ($(SDCARD), YES) ifeq ($(SDCARD), YES)
SRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c sky9x/diskio.c EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c sky9x/diskio.cpp
CPPDEFS += -DVOICE CPPDEFS += -DVOICE
EXTRAINCDIRS += FatFs FatFs/option
endif endif
ifeq ($(BLUETOOTH), YES) ifeq ($(BLUETOOTH), YES)
@@ -476,7 +477,8 @@ ifeq ($(PCB), SKY9X)
CPPSRC += sky9x/sound_driver.cpp sky9x/haptic_driver.cpp sky9x/sdcard_driver.cpp sky9x/massstorage.cpp CPPSRC += sky9x/sound_driver.cpp sky9x/haptic_driver.cpp sky9x/sdcard_driver.cpp sky9x/massstorage.cpp
ifeq ($(SDCARD), YES) ifeq ($(SDCARD), YES)
SRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c sky9x/diskio.c EXTRAINCDIRS += FatFs FatFs/option
EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c sky9x/diskio.cpp
CPPDEFS += -DVOICE CPPDEFS += -DVOICE
endif endif
-6
View File
@@ -34,7 +34,6 @@
#include "../open9x.h" #include "../open9x.h"
#if defined(SDCARD) #if defined(SDCARD)
const char * audioFilenames[] = { const char * audioFilenames[] = {
"inactiv", "inactiv",
"lowbatt", "lowbatt",
@@ -67,8 +66,6 @@ const char * audioFilenames[] = {
uint32_t sdAvailableAudioFiles = 0; uint32_t sdAvailableAudioFiles = 0;
// TODO enable the assert when it's C++
extern "C" {
void retrieveAvailableAudioFiles() void retrieveAvailableAudioFiles()
{ {
FILINFO info; FILINFO info;
@@ -80,10 +77,8 @@ void retrieveAvailableAudioFiles()
char filename[32] = SYSTEM_SOUNDS_PATH "/"; char filename[32] = SYSTEM_SOUNDS_PATH "/";
#if !defined WIN32 && defined __GNUC__
assert(sizeof(audioFilenames)==AU_FRSKY_FIRST*sizeof(char *)); assert(sizeof(audioFilenames)==AU_FRSKY_FIRST*sizeof(char *));
assert(sizeof(sdAvailableAudioFiles)*8 > AU_FRSKY_FIRST); assert(sizeof(sdAvailableAudioFiles)*8 > AU_FRSKY_FIRST);
#endif
uint32_t availableAudioFiles = 0; uint32_t availableAudioFiles = 0;
@@ -96,7 +91,6 @@ void retrieveAvailableAudioFiles()
sdAvailableAudioFiles = availableAudioFiles; sdAvailableAudioFiles = availableAudioFiles;
} }
}
inline bool isAudioFileAvailable(uint8_t i, char * filename) inline bool isAudioFileAvailable(uint8_t i, char * filename)
{ {
+4 -3
View File
@@ -615,7 +615,6 @@ static const char * sdCmd52(uint8_t wrFlag,
*status = HSMCI->HSMCI_RSPR[0]; *status = HSMCI->HSMCI_RSPR[0];
return 0; return 0;
} }
#endif
const char * sdSwReset(uint32_t retry) const char * sdSwReset(uint32_t retry)
{ {
@@ -629,6 +628,7 @@ const char * sdSwReset(uint32_t retry)
} }
return result; return result;
} }
#endif
/** /**
* \brief Run the SD/MMC/SDIO Mode initialization sequence. * \brief Run the SD/MMC/SDIO Mode initialization sequence.
@@ -954,8 +954,9 @@ void sdInit()
#endif #endif
uint8_t sdErrorCount = 0; uint8_t sdErrorCount = 0;
static FATFS g_FATFS_Obj = { 0 }; FATFS g_FATFS_Obj = { 0 };
void retrieveAvailableAudioFiles();
extern void retrieveAvailableAudioFiles();
void sdPoll10mS() void sdPoll10mS()
{ {