piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

For companion9x. The SD directory will be customizable.

Browse Source
This commit is contained in:
bsongis@gmail.com
2013-07-04 23:05:50 +00:00
parent a7c26a4514
commit e97af2fb23
2 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/simpgmspace.cpp
+24 -10
View File
@@ -434,8 +434,13 @@ namespace simu {
FATFS g_FATFS_Obj; FATFS g_FATFS_Obj;
#endif #endif
FRESULT f_stat (const TCHAR * path, FILINFO *) char simuSdDirectory[1024] = ".";
FRESULT f_stat (const TCHAR * name, FILINFO *)
{ {
char path[1024];
sprintf(path, "%s%s", simuSdDirectory, name);
struct stat tmp; struct stat tmp;
// printf("f_stat(%s)\n", path); fflush(stdout); // printf("f_stat(%s)\n", path); fflush(stdout);
return stat(path, &tmp) ? FR_INVALID_NAME : FR_OK; return stat(path, &tmp) ? FR_INVALID_NAME : FR_OK;
@@ -448,39 +453,42 @@ FRESULT f_mount (BYTE, FATFS*)
FRESULT f_open (FIL * fil, const TCHAR *name, BYTE flag) FRESULT f_open (FIL * fil, const TCHAR *name, BYTE flag)
{ {
char path[1024];
sprintf(path, "%s%s", simuSdDirectory, name);
if (!(flag & FA_WRITE)) { if (!(flag & FA_WRITE)) {
struct stat tmp; struct stat tmp;
if (stat(name, &tmp)) if (stat(path, &tmp))
return FR_INVALID_NAME; return FR_INVALID_NAME;
fil->fsize = tmp.st_size; fil->fsize = tmp.st_size;
} }
fil->fs = (FATFS*)fopen(name, (flag & FA_WRITE) ? "w+" : "r+"); fil->fs = (FATFS*)fopen(path, (flag & FA_WRITE) ? "w+" : "r+");
return FR_OK; return FR_OK;
} }
FRESULT f_read (FIL* fil, void* data, UINT size, UINT* read) FRESULT f_read (FIL* fil, void* data, UINT size, UINT* read)
{ {
fread(data, size, 1, (FILE*)fil->fs); if (fil && fil->fs) fread(data, size, 1, (FILE*)fil->fs);
*read = size; *read = size;
return FR_OK; return FR_OK;
} }
FRESULT f_write (FIL* fil, const void* data, UINT size, UINT* written) FRESULT f_write (FIL* fil, const void* data, UINT size, UINT* written)
{ {
if (fil->fs) fwrite(data, size, 1, (FILE*)fil->fs); if (fil && fil->fs) fwrite(data, size, 1, (FILE*)fil->fs);
*written = size; *written = size;
return FR_OK; return FR_OK;
} }
FRESULT f_lseek (FIL* fil, DWORD offset) FRESULT f_lseek (FIL* fil, DWORD offset)
{ {
if (fil->fs) fseek((FILE*)fil->fs, offset, SEEK_SET); if (fil && fil->fs) fseek((FILE*)fil->fs, offset, SEEK_SET);
return FR_OK; return FR_OK;
} }
FRESULT f_close (FIL * fil) FRESULT f_close (FIL * fil)
{ {
if (fil->fs) { if (fil && fil->fs) {
fclose((FILE*)fil->fs); fclose((FILE*)fil->fs);
fil->fs = NULL; fil->fs = NULL;
} }
@@ -489,17 +497,23 @@ FRESULT f_close (FIL * fil)
FRESULT f_chdir (const TCHAR *name) FRESULT f_chdir (const TCHAR *name)
{ {
char path[1024];
sprintf(path, "%s%s", simuSdDirectory, name);
#if defined WIN32 || !defined __GNUC__ #if defined WIN32 || !defined __GNUC__
_chdir(name); _chdir(path);
#else #else
chdir(name); chdir(path);
#endif #endif
return FR_OK; return FR_OK;
} }
FRESULT f_opendir (DIR * rep, const TCHAR * name) FRESULT f_opendir (DIR * rep, const TCHAR * name)
{ {
rep->fs = (FATFS *)simu::opendir(name); char path[1024];
sprintf(path, "%s%s", simuSdDirectory, name);
rep->fs = (FATFS *)simu::opendir(path);
return FR_OK; return FR_OK;
} }
src/simpgmspace.h
+1
View File
@@ -388,6 +388,7 @@ inline void GPIO_Init(GPIO_TypeDef* GPIOx, GPIO_InitTypeDef* GPIO_InitStruct) {
#define configure_pins(...) #define configure_pins(...)
extern char simuSdDirectory[1024];
#define sdMountPoll() #define sdMountPoll()
#define sdPoll10ms() #define sdPoll10ms()
#define sd_card_ready() (true) #define sd_card_ready() (true)