Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Filesystem: allow for large file IOs 

this allows for larger IOs on FATFS if the memoory is OK for DMA
This commit is contained in:
Andrew Tridgell 2024-01-05 13:36:32 +11:00 committed by Tom Pittenger
parent f2a1c80652
commit c5f295e852
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/AP_Filesystem/AP_Filesystem_FATFS.cpp
View File

@ -14,6 +14,7 @@
#include <ff.h> #include <ff.h>
#include <AP_HAL_ChibiOS/sdcard.h> #include <AP_HAL_ChibiOS/sdcard.h>
#include <GCS_MAVLink/GCS.h> #include <GCS_MAVLink/GCS.h>
#include <AP_HAL_ChibiOS/hwdef/common/stm32_util.h>
#if 0 #if 0
#define debug(fmt, args ...) do {printf("%s:%d: " fmt "\n", __FUNCTION__, __LINE__, ## args); } while(0) #define debug(fmt, args ...) do {printf("%s:%d: " fmt "\n", __FUNCTION__, __LINE__, ## args); } while(0)
@ -416,7 +417,10 @@ int32_t AP_Filesystem_FATFS::read(int fd, void *buf, uint32_t count)
UINT total = 0; UINT total = 0;
do { do {
UINT size = 0; UINT size = 0;
UINT n = MIN(bytes, MAX_IO_SIZE); UINT n = bytes;
if (!mem_is_dma_safe(buf, count, true)) {
n = MIN(bytes, MAX_IO_SIZE);
}
res = f_read(fh, (void *)buf, n, &size); res = f_read(fh, (void *)buf, n, &size);
if (res != FR_OK) { if (res != FR_OK) {
errno = fatfs_to_errno((FRESULT)res); errno = fatfs_to_errno((FRESULT)res);
@ -460,7 +464,10 @@ int32_t AP_Filesystem_FATFS::write(int fd, const void *buf, uint32_t count)
UINT total = 0; UINT total = 0;
do { do {
UINT n = MIN(bytes, MAX_IO_SIZE); UINT n = bytes;
if (!mem_is_dma_safe(buf, count, true)) {
n = MIN(bytes, MAX_IO_SIZE);
}
UINT size = 0; UINT size = 0;
res = f_write(fh, buf, n, &size); res = f_write(fh, buf, n, &size);
if (res == FR_DISK_ERR && RETRY_ALLOWED()) { if (res == FR_DISK_ERR && RETRY_ALLOWED()) {