Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-05 07:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

HAL_ChibiOS: added preallocation of DMA bouncebuffers

Browse Source 
we need 512 bytes for microSD
This commit is contained in:
Andrew Tridgell 2018-07-12 13:12:21 +10:00
parent e193a161f2
commit f083b80700
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_HAL_ChibiOS/Device.cpp
View File

@ -31,8 +31,8 @@ static const AP_HAL::HAL &hal = AP_HAL::get_HAL();
DeviceBus::DeviceBus(uint8_t _thread_priority) : DeviceBus::DeviceBus(uint8_t _thread_priority) :
thread_priority(_thread_priority) thread_priority(_thread_priority)
{ {
bouncebuffer_init(&bounce_buffer_tx); bouncebuffer_init(&bounce_buffer_tx, 10);
bouncebuffer_init(&bounce_buffer_rx); bouncebuffer_init(&bounce_buffer_rx, 10);
} }
/* /*

7
libraries/AP_HAL_ChibiOS/hwdef/common/bouncebuffer.c
View File

@ -32,10 +32,15 @@
/* /*
initialise a bouncebuffer initialise a bouncebuffer
*/ */
void bouncebuffer_init(struct bouncebuffer_t **bouncebuffer) void bouncebuffer_init(struct bouncebuffer_t **bouncebuffer, uint32_t prealloc_bytes)
{ {
(*bouncebuffer) = calloc(1, sizeof(struct bouncebuffer_t)); (*bouncebuffer) = calloc(1, sizeof(struct bouncebuffer_t));
osalDbgAssert(((*bouncebuffer) != NULL), "bouncebuffer init"); osalDbgAssert(((*bouncebuffer) != NULL), "bouncebuffer init");
if (prealloc_bytes) {
(*bouncebuffer)->dma_buf = malloc_dma(prealloc_bytes);
osalDbgAssert(((*bouncebuffer)->dma_buf != NULL), "bouncebuffer preallocate");
(*bouncebuffer)->size = prealloc_bytes;
}
} }
/* /*

2
libraries/AP_HAL_ChibiOS/hwdef/common/bouncebuffer.h
View File

@ -21,7 +21,7 @@ struct bouncebuffer_t {
/* /*
initialise a bouncebuffer initialise a bouncebuffer
*/ */
void bouncebuffer_init(struct bouncebuffer_t **bouncebuffer); void bouncebuffer_init(struct bouncebuffer_t **bouncebuffer, uint32_t prealloc_bytes);
/* /*
setup for reading from a device into memory, allocating a bouncebuffer if needed setup for reading from a device into memory, allocating a bouncebuffer if needed

2
libraries/AP_HAL_ChibiOS/sdcard.cpp
View File

@ -46,7 +46,7 @@ void sdcard_init()
sdcard_init_done = true; sdcard_init_done = true;
#if HAL_USE_SDC #if HAL_USE_SDC
bouncebuffer_init(&SDCD1.bouncebuffer); bouncebuffer_init(&SDCD1.bouncebuffer, 512);
sdcStart(&SDCD1, NULL); sdcStart(&SDCD1, NULL);