Fixed bug 3560980.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4617 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
parent
f200dd71c5
commit
ef202f6b0e
|
@ -155,6 +155,10 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
int i;
|
int i;
|
||||||
char *fn;
|
char *fn;
|
||||||
|
|
||||||
|
#if _USE_LFN
|
||||||
|
fno.lfname = 0;
|
||||||
|
fno.lfsize = 0;
|
||||||
|
#endif
|
||||||
res = f_opendir(&dir, path);
|
res = f_opendir(&dir, path);
|
||||||
if (res == FR_OK) {
|
if (res == FR_OK) {
|
||||||
i = strlen(path);
|
i = strlen(path);
|
||||||
|
@ -171,7 +175,7 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
res = scan_files(chp, path);
|
res = scan_files(chp, path);
|
||||||
if (res != FR_OK)
|
if (res != FR_OK)
|
||||||
break;
|
break;
|
||||||
path[i] = 0;
|
path[--i] = 0;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
chprintf(chp, "%s/%s\r\n", path, fn);
|
chprintf(chp, "%s/%s\r\n", path, fn);
|
||||||
|
|
|
@ -154,6 +154,10 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
int i;
|
int i;
|
||||||
char *fn;
|
char *fn;
|
||||||
|
|
||||||
|
#if _USE_LFN
|
||||||
|
fno.lfname = 0;
|
||||||
|
fno.lfsize = 0;
|
||||||
|
#endif
|
||||||
res = f_opendir(&dir, path);
|
res = f_opendir(&dir, path);
|
||||||
if (res == FR_OK) {
|
if (res == FR_OK) {
|
||||||
i = strlen(path);
|
i = strlen(path);
|
||||||
|
@ -170,7 +174,7 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
res = scan_files(chp, path);
|
res = scan_files(chp, path);
|
||||||
if (res != FR_OK)
|
if (res != FR_OK)
|
||||||
break;
|
break;
|
||||||
path[i] = 0;
|
path[--i] = 0;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
chprintf(chp, "%s/%s\r\n", path, fn);
|
chprintf(chp, "%s/%s\r\n", path, fn);
|
||||||
|
|
|
@ -143,6 +143,10 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
int i;
|
int i;
|
||||||
char *fn;
|
char *fn;
|
||||||
|
|
||||||
|
#if _USE_LFN
|
||||||
|
fno.lfname = 0;
|
||||||
|
fno.lfsize = 0;
|
||||||
|
#endif
|
||||||
res = f_opendir(&dir, path);
|
res = f_opendir(&dir, path);
|
||||||
if (res == FR_OK) {
|
if (res == FR_OK) {
|
||||||
i = strlen(path);
|
i = strlen(path);
|
||||||
|
@ -159,7 +163,7 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
res = scan_files(chp, path);
|
res = scan_files(chp, path);
|
||||||
if (res != FR_OK)
|
if (res != FR_OK)
|
||||||
break;
|
break;
|
||||||
path[i] = 0;
|
path[--i] = 0;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
chprintf(chp, "%s/%s\r\n", path, fn);
|
chprintf(chp, "%s/%s\r\n", path, fn);
|
||||||
|
|
|
@ -121,6 +121,10 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
int i;
|
int i;
|
||||||
char *fn;
|
char *fn;
|
||||||
|
|
||||||
|
#if _USE_LFN
|
||||||
|
fno.lfname = 0;
|
||||||
|
fno.lfsize = 0;
|
||||||
|
#endif
|
||||||
res = f_opendir(&dir, path);
|
res = f_opendir(&dir, path);
|
||||||
if (res == FR_OK) {
|
if (res == FR_OK) {
|
||||||
i = strlen(path);
|
i = strlen(path);
|
||||||
|
@ -137,7 +141,7 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
res = scan_files(chp, path);
|
res = scan_files(chp, path);
|
||||||
if (res != FR_OK)
|
if (res != FR_OK)
|
||||||
break;
|
break;
|
||||||
path[i] = 0;
|
path[--i] = 0;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
chprintf(chp, "%s/%s\r\n", path, fn);
|
chprintf(chp, "%s/%s\r\n", path, fn);
|
||||||
|
|
|
@ -135,6 +135,10 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
int i;
|
int i;
|
||||||
char *fn;
|
char *fn;
|
||||||
|
|
||||||
|
#if _USE_LFN
|
||||||
|
fno.lfname = 0;
|
||||||
|
fno.lfsize = 0;
|
||||||
|
#endif
|
||||||
res = f_opendir(&dir, path);
|
res = f_opendir(&dir, path);
|
||||||
if (res == FR_OK) {
|
if (res == FR_OK) {
|
||||||
i = strlen(path);
|
i = strlen(path);
|
||||||
|
@ -151,7 +155,7 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
res = scan_files(chp, path);
|
res = scan_files(chp, path);
|
||||||
if (res != FR_OK)
|
if (res != FR_OK)
|
||||||
break;
|
break;
|
||||||
path[i] = 0;
|
path[--i] = 0;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
chprintf(chp, "%s/%s\r\n", path, fn);
|
chprintf(chp, "%s/%s\r\n", path, fn);
|
||||||
|
|
|
@ -125,6 +125,10 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
int i;
|
int i;
|
||||||
char *fn;
|
char *fn;
|
||||||
|
|
||||||
|
#if _USE_LFN
|
||||||
|
fno.lfname = 0;
|
||||||
|
fno.lfsize = 0;
|
||||||
|
#endif
|
||||||
res = f_opendir(&dir, path);
|
res = f_opendir(&dir, path);
|
||||||
if (res == FR_OK) {
|
if (res == FR_OK) {
|
||||||
i = strlen(path);
|
i = strlen(path);
|
||||||
|
@ -141,7 +145,7 @@ static FRESULT scan_files(BaseSequentialStream *chp, char *path) {
|
||||||
res = scan_files(chp, path);
|
res = scan_files(chp, path);
|
||||||
if (res != FR_OK)
|
if (res != FR_OK)
|
||||||
break;
|
break;
|
||||||
path[i] = 0;
|
path[--i] = 0;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
chprintf(chp, "%s/%s\r\n", path, fn);
|
chprintf(chp, "%s/%s\r\n", path, fn);
|
||||||
|
|
|
@ -82,6 +82,8 @@
|
||||||
*****************************************************************************
|
*****************************************************************************
|
||||||
|
|
||||||
*** 2.5.0 ***
|
*** 2.5.0 ***
|
||||||
|
- FIX: Fixed Problem in FatFs demos related to LFN (bug 3560980)(backported
|
||||||
|
to 2.4.3 and 2.2.10).
|
||||||
- FIX: Fixed problem in STM32 DMA1 stream1 IRQ handler (bug 3538468)
|
- FIX: Fixed problem in STM32 DMA1 stream1 IRQ handler (bug 3538468)
|
||||||
(backported to 2.4.2).
|
(backported to 2.4.2).
|
||||||
- FIX: Fixed TIM8 not working in STM32 GPT driver (bug 3536523)(
|
- FIX: Fixed TIM8 not working in STM32 GPT driver (bug 3536523)(
|
||||||
|
|
Loading…
Reference in New Issue