espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 19:54:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/move_ringbuf_funcs_into_flash' into 'master'

Browse Source 
esp_ringbuf: add kconfig opt to move ringbuffer functions into flash

Closes IDF-2247

See merge request espressif/esp-idf!10731
This commit is contained in:
Ivan Grokhotkov
2021-01-20 07:32:39 +08:00
parent 19d2e4cca1 8bde6b8fca
commit b69f94fb3a
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
components/esp_ringbuf/linker.lf
View File

@@ -2,3 +2,32 @@
archive: libesp_ringbuf.a archive: libesp_ringbuf.a
entries: entries:
* (noflash_text) * (noflash_text)
if FREERTOS_PLACE_FUNCTIONS_INTO_FLASH = y:
ringbuf: prvGetCurMaxSizeNoSplit (default)
ringbuf: prvGetCurMaxSizeAllowSplit (default)
ringbuf: prvGetCurMaxSizeByteBuf (default)
ringbuf: prvReturnItemByteBuf (default)
ringbuf: prvGetItemByteBuf (default)
ringbuf: prvCheckItemFitsByteBuffer (default)
ringbuf: prvReturnItemDefault (default)
ringbuf: prvGetItemDefault (default)
ringbuf: prvAcquireItemNoSplit (default)
ringbuf: prvSendItemDoneNoSplit (default)
ringbuf: prvCheckItemFitsDefault (default)
ringbuf: prvCopyItemByteBuf (default)
ringbuf: prvCopyItemAllowSplit (default)
ringbuf: prvCopyItemNoSplit (default)
ringbuf: prvInitializeNewRingbuffer (default)
ringbuf: prvReceiveGeneric (default)
ringbuf: xRingbufferCreate (default)
ringbuf: xRingbufferCreateStatic (default)
ringbuf: xRingbufferSend (default)
ringbuf: xRingbufferReceive (default)
ringbuf: xRingbufferReceiveSplit (default)
ringbuf: xRingbufferReceiveUpTo (default)
ringbuf: vRingbufferReturnItem (default)
ringbuf: vRingbufferDelete (default)
ringbuf: xRingbufferAddToQueueSetRead (default)
ringbuf: xRingbufferCanRead (default)
ringbuf: xRingbufferRemoveFromQueueSetRead (default)
ringbuf: vRingbufferGetInfo (default)

2
components/esp_ringbuf/test/test_ringbuf.c
View File

@@ -678,8 +678,8 @@ static IRAM_ATTR __attribute__((noinline)) bool iram_ringbuf_test(void)
result = result && (handle != NULL); result = result && (handle != NULL);
spi_flash_guard_get()->start(); // Disables flash cache spi_flash_guard_get()->start(); // Disables flash cache
xRingbufferGetMaxItemSize(handle); xRingbufferGetMaxItemSize(handle);
vRingbufferDelete(handle);
spi_flash_guard_get()->end(); // Re-enables flash cache spi_flash_guard_get()->end(); // Re-enables flash cache
vRingbufferDelete(handle);
return result; return result;
} }

2
components/freertos/linker.lf
View File

@@ -18,7 +18,6 @@ entries:
tasks: prvInitialiseTaskLists (default) tasks: prvInitialiseTaskLists (default)
tasks: prvDeleteTCB (default) tasks: prvDeleteTCB (default)
tasks: prvCheckTasksWaitingTermination (default) tasks: prvCheckTasksWaitingTermination (default)
tasks: prvAddCurrentTaskToDelayedList (default)
tasks: prvIdleTask (default) tasks: prvIdleTask (default)
tasks: prvAddNewTaskToReadyList (default) tasks: prvAddNewTaskToReadyList (default)
tasks: xTaskCreateStaticPinnedToCore (default) tasks: xTaskCreateStaticPinnedToCore (default)
@@ -84,7 +83,6 @@ entries:
event_groups: xEventGroupSetBits (default) event_groups: xEventGroupSetBits (default)
event_groups: xEventGroupSync (default) event_groups: xEventGroupSync (default)
event_groups: vEventGroupDelete (default) event_groups: vEventGroupDelete (default)
queue: prvIsQueueEmpty (default)
queue: prvIsQueueFull (default) queue: prvIsQueueFull (default)
queue: prvInitialiseNewQueue (default) queue: prvInitialiseNewQueue (default)
queue: prvInitialiseMutex (default) queue: prvInitialiseMutex (default)

2
tools/unit-test-app/configs/freertos_flash
View File

@@ -1,2 +1,2 @@
TEST_COMPONENTS=freertos driver spi_flash TEST_COMPONENTS=freertos driver spi_flash esp_ringbuf
CONFIG_FREERTOS_TASK_FUNCTIONS_INTO_FLASH=y CONFIG_FREERTOS_TASK_FUNCTIONS_INTO_FLASH=y