Skip to content

Commit ac009d5

Browse files
networkfusionnetworkfusion
authored
Update FatFS to R0.15a (#3146)
***NO_CI***
1 parent 8078a7f commit ac009d5

File tree

22 files changed

+58
-58
lines changed

22 files changed

+58
-58
lines changed

‎.devcontainer/All/Dockerfile.All

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-all:v2.56
1+
FROM ghcr.io/nanoframework/dev-container-all:v2.57

‎.devcontainer/All/Dockerfile.All.SRC

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ RUN git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx
7878
&& git clone --branch v6.3.0_rel --recursive https://github.com/eclipse-threadx/netxduo.git --depth 1 ./sources/NetxDuo
7979

8080
# Clone dependent repos (mbedtls, fatfs and littlefs)
81-
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
81+
RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
8282
&& git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs \
8383
&& git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
8484
&& cd ./sources/mbedtls \

‎.devcontainer/All/scripts/git-pull-repos.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ cd /sources/mbedtls
1818
git pull origin mbedtls-3.6.0
1919
git submodule update --init
2020
cd /sources/fatfs
21-
git pull origin R0.15
21+
git pull origin R0.15a
2222
cd /sources/FreeRTOS
2323
git pull origin V10.4.1-kernel-only
2424
cd /sources/CMSIS_5

‎.devcontainer/AzureRTOS/Dockerfile.AzureRTOS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.33
1+
FROM ghcr.io/nanoframework/dev-container-azure-rtos:v1.34

‎.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ RUN git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx
6767
&& git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx/netxduo.git --depth 1 ./sources/NetxDuo
6868

6969
# Clone dependent repos (mbedtls, fatfs and littlefs)
70-
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
70+
RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
7171
&& git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs \
7272
&& git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
7373
&& cd ./sources/mbedtls \

‎.devcontainer/ChibiOS/Dockerfile.ChibiOS

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-chibios:v1.34
1+
FROM ghcr.io/nanoframework/dev-container-chibios:v1.35

‎.devcontainer/ChibiOS/Dockerfile.ChibiOS.SRC

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
6565
&& git clone --branch chibios-21.11.x https://github.com/ChibiOS/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
6666

6767
# Clone dependent repos (mbedtls, fatfs and littlefs etc.)
68-
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
68+
RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
6969
&& git clone --branch v2.9.3 https://github.com/littlefs-project/littlefs --depth 1 ./sources/littlefs \
7070
&& git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip \
7171
&& git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \

‎.devcontainer/ESP32/Dockerfile.ESP32

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-esp32:v2.36
1+
FROM ghcr.io/nanoframework/dev-container-esp32:v2.37

‎.devcontainer/ESP32/Dockerfile.ESP32.SRC

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN apt-get update \
4545
RUN mkdir -p /usr/local/bin/gcc
4646

4747
# Clone fatfs
48-
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
48+
RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs
4949

5050
# Clone ESP-IDF
5151
RUN git clone --branch v5.2.3 https://github.com/espressif/esp-idf --depth 1 --recursive ./sources/esp-idf

‎.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.06
1+
FROM ghcr.io/nanoframework/dev-container-freertos-nxp:v1.07

‎.devcontainer/FreeRTOS-NXP/Dockerfile.FreeRTOS-NXP.SRC

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ RUN apt-get update \
5555
RUN mkdir -p /usr/local/bin/gcc
5656

5757
# Clone libs mbedtls and fatfs etc.
58-
RUN git clone --branch R0.15 https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
58+
RUN git clone --branch R0.15a https://github.com/abbrev/fatfs.git --depth 1 ./sources/fatfs \
5959
&& git clone --branch STABLE-2_1_3_RELEASE https://github.com/lwip-tcpip/lwip.git --depth 1 ./sources/lwip \
6060
&& git clone --branch mbedtls-3.6.0 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
6161
&& cd ./sources/mbedtls \

‎targets/AzureRTOS/ST/ORGPAL_PALTHREE/ffconf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/ Configurations of FatFs Module
99
/---------------------------------------------------------------------------*/
1010

11-
#define FFCONF_DEF 80286 /* Revision ID */
11+
#define FFCONF_DEF 5380 /* Revision ID */
1212

1313
/*---------------------------------------------------------------------------/
1414
/ Function Configurations

‎targets/ChibiOS/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ if(NF_FEATURE_HAS_SDCARD OR NF_FEATURE_HAS_USB_MSD)
168168
if(FATFS_VERSION_EMPTY)
169169
# no FatFS version actualy specified, must be empty which is fine, we'll default to a known good version
170170
# WHEN CHANGING THIS MAKE SURE TO UPDATE THE DEV CONTAINERS
171-
set(FATFS_VERSION_TAG "R0.15")
171+
set(FATFS_VERSION_TAG "R0.15a")
172172
else()
173173
# set version
174174
set(FATFS_VERSION_TAG ${FATFS_VERSION})

‎targets/ChibiOS/ORGPAL_PALTHREE/ffconf.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/ Configurations of FatFs Module
1010
/---------------------------------------------------------------------------*/
1111

12-
#define FFCONF_DEF 80286 /* Revision ID */
12+
#define FFCONF_DEF 5380 /* Revision ID */
1313

1414
/*---------------------------------------------------------------------------/
1515
/ Function Configurations
@@ -182,13 +182,13 @@
182182
/ const char* VolumeStr[FF_VOLUMES] = {"ram","flash","sd","usb",...
183183
*/
184184
#if (HAL_USE_SDC == TRUE) && (HAL_USBH_USE_MSD == TRUE)
185-
#define FF_VOLUME_STRS "D", "E"
185+
#define FF_VOLUME_STRS "D", "E"
186186
#elif (HAL_USE_SDC == FALSE) && (HAL_USBH_USE_MSD == TRUE)
187-
#define FF_VOLUME_STRS "E"
187+
#define FF_VOLUME_STRS "E"
188188
#elif (HAL_USE_SDC == TRUE) && (HAL_USBH_USE_MSD == FALSE)
189-
#define FF_VOLUME_STRS "D"
189+
#define FF_VOLUME_STRS "D"
190190
#else
191-
#define FF_VOLUME_STRS ""
191+
#define FF_VOLUME_STRS ""
192192
#endif
193193

194194
#define FF_MULTI_PARTITION 0

‎targets/ChibiOS/ORGPAL_PALX/ffconf.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/ Configurations of FatFs Module
1010
/---------------------------------------------------------------------------*/
1111

12-
#define FFCONF_DEF 80286 /* Revision ID */
12+
#define FFCONF_DEF 5380 /* Revision ID */
1313

1414
/*---------------------------------------------------------------------------/
1515
/ Function Configurations
@@ -182,13 +182,13 @@
182182
/ const char* VolumeStr[FF_VOLUMES] = {"ram","flash","sd","usb",...
183183
*/
184184
#if (HAL_USE_SDC == TRUE) && (HAL_USBH_USE_MSD == TRUE)
185-
#define FF_VOLUME_STRS "D", "E"
185+
#define FF_VOLUME_STRS "D", "E"
186186
#elif (HAL_USE_SDC == FALSE) && (HAL_USBH_USE_MSD == TRUE)
187-
#define FF_VOLUME_STRS "E"
187+
#define FF_VOLUME_STRS "E"
188188
#elif (HAL_USE_SDC == TRUE) && (HAL_USBH_USE_MSD == FALSE)
189-
#define FF_VOLUME_STRS "D"
189+
#define FF_VOLUME_STRS "D"
190190
#else
191-
#define FF_VOLUME_STRS ""
191+
#define FF_VOLUME_STRS ""
192192
#endif
193193

194194
#define FF_MULTI_PARTITION 0

‎targets/ChibiOS/ST_STM32F769I_DISCOVERY/ffconf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/ Configurations of FatFs Module
1010
/---------------------------------------------------------------------------*/
1111

12-
#define FFCONF_DEF 80286 /* Revision ID */
12+
#define FFCONF_DEF 5380 /* Revision ID */
1313

1414
/*---------------------------------------------------------------------------/
1515
/ Function Configurations

‎targets/ChibiOS/_FatFs/fatfs_FS_Driver.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -178,21 +178,21 @@ HRESULT FATFS_FS_Driver::GetSizeInfo(const VOLUME_ID *volume, int64_t *totalSize
178178

179179
f_chdrive(currentVolume->m_rootName);
180180

181-
// // this call is prone to take a long time, thus hitting the watchdog, therefore we are skipping this for now
182-
// // // get free clusters
183-
// // f_getfree(buffer, &freeClusters, &fsPtr);
184-
185-
// // // Get total sectors and free sectors
186-
// // totalSectors = (fs.n_fatent - 2) * fs.csize;
187-
// // freeSectors = freeClusters * fs.csize;
188-
189-
// // #if FF_MAX_SS != FF_MIN_SS
190-
// // *totalSize = (int64_t)totalSectors * fs.ssize;
191-
// // *totalFreeSpace = (int64_t)freeSectors * fs.ssize;
192-
// // #else
193-
// // *totalSize = (int64_t)totalSectors * FF_MAX_SS;
194-
// // *totalFreeSpace = (int64_t)freeSectors * FF_MAX_SS;
195-
// // #endif
181+
// this call is prone to take a long time, thus hitting the watchdog, therefore we are skipping this for now
182+
// // get free clusters
183+
// f_getfree(buffer, &freeClusters, &fsPtr);
184+
185+
// // Get total sectors and free sectors
186+
// totalSectors = (fs.n_fatent - 2) * fs.csize;
187+
// freeSectors = freeClusters * fs.csize;
188+
189+
// #if FF_MAX_SS != FF_MIN_SS
190+
// *totalSize = (int64_t)totalSectors * fs.ssize;
191+
// *totalFreeSpace = (int64_t)freeSectors * fs.ssize;
192+
// #else
193+
// *totalSize = (int64_t)totalSectors * FF_MAX_SS;
194+
// *totalFreeSpace = (int64_t)freeSectors * FF_MAX_SS;
195+
// #endif
196196

197197
*totalSize = -1;
198198
*totalFreeSpace = -1;

‎targets/ChibiOS/_FatFs/fatfs_syscall.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// ChibiOs version can be found at:
44
// https://github.com/ArduPilot/ChibiOS.svn/blob/master/os/various/fatfs_bindings/fatfs_syscall.c
55
// but currently locked to R0.14b.
6-
// This file aligns with compatibility with R0.15+
6+
// This file aligns with compatibility with R0.15a+
77
// And also allows use of nF specific capabilities.
88

99
/*------------------------------------------------------------------------*/

‎targets/ESP32/_FatFs/fatfs_FS_Driver.cpp

+15-15
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,21 @@ HRESULT FATFS_FS_Driver::GetSizeInfo(const VOLUME_ID *volume, int64_t *totalSize
9393

9494
f_chdrive(currentVolume->m_rootName);
9595

96-
// // this call is prone to take a long time, thus hitting the watchdog, therefore we are skipping this for now
97-
// // // get free clusters
98-
// // f_getfree(buffer, &freeClusters, &fsPtr);
99-
100-
// // // Get total sectors and free sectors
101-
// // totalSectors = (fs.n_fatent - 2) * fs.csize;
102-
// // freeSectors = freeClusters * fs.csize;
103-
104-
// // #if FF_MAX_SS != FF_MIN_SS
105-
// // *totalSize = (int64_t)totalSectors * fs.ssize;
106-
// // *totalFreeSpace = (int64_t)freeSectors * fs.ssize;
107-
// // #else
108-
// // *totalSize = (int64_t)totalSectors * FF_MAX_SS;
109-
// // *totalFreeSpace = (int64_t)freeSectors * FF_MAX_SS;
110-
// // #endif
96+
// this call is prone to take a long time, thus hitting the watchdog, therefore we are skipping this for now
97+
// // get free clusters
98+
// f_getfree(buffer, &freeClusters, &fsPtr);
99+
100+
// // Get total sectors and free sectors
101+
// totalSectors = (fs.n_fatent - 2) * fs.csize;
102+
// freeSectors = freeClusters * fs.csize;
103+
104+
// #if FF_MAX_SS != FF_MIN_SS
105+
// *totalSize = (int64_t)totalSectors * fs.ssize;
106+
// *totalFreeSpace = (int64_t)freeSectors * fs.ssize;
107+
// #else
108+
// *totalSize = (int64_t)totalSectors * FF_MAX_SS;
109+
// *totalFreeSpace = (int64_t)freeSectors * FF_MAX_SS;
110+
// #endif
111111

112112
*totalSize = -1;
113113
*totalFreeSpace = -1;

‎targets/FreeRTOS/NXP/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ endif()
2828
# check if build was requested with a specifc FatFS version
2929
if(FATFS_VERSION_EMPTY)
3030
# no FatFS version actualy specified, must be empty which is fine, we'll default to a known good version
31-
set(FATFS_VERSION_TAG "R0.15")
31+
set(FATFS_VERSION_TAG "R0.15a")
3232
else()
3333
# set version
3434
set(FATFS_VERSION_TAG "${FATFS_VERSION}")

‎targets/FreeRTOS/NXP/_FatFs/ffconf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/ Configurations of FatFs Module
66
/---------------------------------------------------------------------------*/
77

8-
#define FFCONF_DEF 80286 /* Revision ID */
8+
#define FFCONF_DEF 5380 /* Revision ID */
99

1010
#define SD_DISK_ENABLE
1111

‎targets/FreeRTOS/NXP/_FatFs/ffsystem.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// clang-format off
22

3-
// This file aligns with compatibility with R0.15+
3+
// This file aligns with compatibility with R0.15a+
44
// It currently includes commented out code which would allow a fully
55
// platform independent solution.
66

0 commit comments

Comments
 (0)