Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(CMSIS): Adding mallinfo function and reworking Cordio memory management. #1179

Merged
merged 20 commits into from
Oct 15, 2024
Merged

feat(CMSIS): Adding mallinfo function and reworking Cordio memory management. #1179

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a5eca69
Adding mallinfo function.
kevin-gillespie Sep 18, 2024
7f1b724
Removing NULL checks.
kevin-gillespie Sep 18, 2024
4618758
Using dynamic memory allocation.
kevin-gillespie Sep 18, 2024
63ff25c
Fixing formatting errors.
kevin-gillespie Sep 18, 2024
1a2400e
Reworking HeapAlloc.
kevin-gillespie Sep 18, 2024
0fecbbe
Fixing formatting.
kevin-gillespie Sep 18, 2024
ff0fd7c
Reworking WsfHeap usage.
kevin-gillespie Sep 18, 2024
0232186
Updated ME18's BLE_datc example to locally run datsc_connected.py. Re…
crsz20 Sep 20, 2024
7dd2378
clang-format bot reformatting.
crsz20 Sep 20, 2024
096893b
Consolidated setting runtime config and memory usage count to LlInitS…
crsz20 Sep 23, 2024
35a1694
Merge branch 'feat/cordio-malloc' of github.com:analogdevicesinc/msdk…
crsz20 Sep 23, 2024
425c3c7
Renamed to LlInitSetRtCfg()
crsz20 Sep 23, 2024
e0e9ab1
Merge branch 'main' into feat/cordio-malloc
crsz20 Sep 25, 2024
f97bcd1
Updated ME17 examples with LlInitSetRtCfg()
crsz20 Sep 25, 2024
d34b408
Updated ME18 examples with WsfHeap updates
crsz20 Sep 26, 2024
6605515
Modified ME14 examples with WsfHeap updates
crsz20 Sep 27, 2024
e43da2f
Removed commented assertions from run time config functions
crsz20 Sep 27, 2024
827fe2c
clang-format bot reformatting.
crsz20 Sep 27, 2024
18dffa5
Updating GitHub bot permissions to write actions
crsz20 Oct 4, 2024
e2cc1e1
clang-format bot reformatting.
crsz20 Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 51 additions & 27 deletions Examples/MAX32655/Bluetooth/BLE4_ctr/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,10 @@ static void mainLoadConfiguration(void)
/*************************************************************************************************/
static void mainWsfInit(void)
{
uint32_t llmemUsed, memUsed;

mainLoadConfiguration();

/* +12 for message headroom, +4 for header. */
const uint16_t aclBufSize = 12 + mainLlRtCfg.maxAclLen + 4 + BB_DATA_PDU_TAILROOM;

Expand All @@ -105,24 +109,67 @@ static void mainWsfInit(void)

const uint8_t numPools = sizeof(poolDesc) / sizeof(poolDesc[0]);

/* Calculate how much memory we will need for the LL initialization */
WsfCsEnter();

LlInitRtCfg_t llCfg = {
.pBbRtCfg = &mainBbRtCfg,
.wlSizeCfg = 4,
.rlSizeCfg = 4,
.plSizeCfg = 4,
.pLlRtCfg = &mainLlRtCfg,
/* Not significant yet, only being used for memory size requirement calculation. */
.pFreeMem = WsfHeapGetFreeStartAddress(),
/* Not significant yet, only being used for memory size requirement calculation. */
.freeMemAvail = WsfHeapCountAvailable()
};

llmemUsed = LlInitSetBbRtCfg(llCfg.pBbRtCfg, llCfg.wlSizeCfg, llCfg.rlSizeCfg, llCfg.plSizeCfg,
llCfg.pFreeMem, llCfg.freeMemAvail);

llCfg.pFreeMem += llmemUsed;
llCfg.freeMemAvail -= llmemUsed;

llmemUsed += LlInitSetLlRtCfg(llCfg.pLlRtCfg, llCfg.pFreeMem, llCfg.freeMemAvail);

WsfCsExit();

/* Initial buffer configuration. */
uint16_t memUsed;
WsfCsEnter();
memUsed = WsfBufInit(numPools, poolDesc);
memUsed = WsfBufCalcSize(numPools, poolDesc);
WsfHeapAlloc(memUsed);
WsfBufInit(numPools, poolDesc);
WsfCsExit();

WsfOsInit();
WsfTimerInit();

#if (WSF_TRACE_ENABLED == TRUE)
WsfCsEnter();
memUsed = WsfBufIoUartInit(WsfHeapGetFreeStartAddress(), PLATFORM_UART_TERMINAL_BUFFER_SIZE);
WsfHeapAlloc(memUsed);
WsfHeapAlloc(PLATFORM_UART_TERMINAL_BUFFER_SIZE);
WsfBufIoUartInit(WsfHeapGetFreeStartAddress(), PLATFORM_UART_TERMINAL_BUFFER_SIZE);
WsfCsExit();

WsfTraceRegisterHandler(WsfBufIoWrite);
WsfTraceEnable(TRUE);
#endif

/* Complete the LL initialization */
WsfCsEnter();

/* Allocate the memory */
WsfHeapAlloc(llmemUsed);

/* Set the free memory pointers */
llCfg.pFreeMem = WsfHeapGetFreeStartAddress();
llCfg.freeMemAvail = WsfHeapCountAvailable();

/* Run the initialization with properly set the free memory pointers */
if (llmemUsed != LlInitControllerInit(&llCfg)) {
WSF_ASSERT(0);
}

WsfCsExit();
}

/*************************************************************************************************/
Expand Down Expand Up @@ -164,31 +211,8 @@ static bool mainCheckServiceTokens(void)
/*************************************************************************************************/
int main(void)
{
uint32_t memUsed;

mainLoadConfiguration();
mainWsfInit();

#if (WSF_TRACE_ENABLED == TRUE)
WsfCsEnter();
memUsed = WsfBufIoUartInit(WsfHeapGetFreeStartAddress(), PLATFORM_UART_TERMINAL_BUFFER_SIZE);
WsfHeapAlloc(memUsed);
WsfCsExit();
#endif

WsfCsEnter();
LlInitRtCfg_t llCfg = { .pBbRtCfg = &mainBbRtCfg,
.wlSizeCfg = 4,
.rlSizeCfg = 4,
.plSizeCfg = 4,
.pLlRtCfg = &mainLlRtCfg,
.pFreeMem = WsfHeapGetFreeStartAddress(),
.freeMemAvail = WsfHeapCountAvailable() };

memUsed = LlInitControllerInit(&llCfg);
WsfHeapAlloc(memUsed);
WsfCsExit();

bdAddr_t bdAddr;
PalCfgLoadData(PAL_CFG_ID_BD_ADDR, bdAddr, sizeof(bdAddr_t));
/* Coverity[uninit_use_in_call] */
Expand Down
78 changes: 51 additions & 27 deletions Examples/MAX32655/Bluetooth/BLE5_ctr/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,10 @@ static void mainLoadConfiguration(void)
/*************************************************************************************************/
static void mainWsfInit(void)
{
uint32_t llmemUsed, memUsed;

mainLoadConfiguration();

/* +12 for message headroom, + 2 event header, +255 maximum parameter length. */
const uint16_t maxRptBufSize = 12 + 2 + 255;

Expand All @@ -137,24 +141,67 @@ static void mainWsfInit(void)

const uint8_t numPools = sizeof(poolDesc) / sizeof(poolDesc[0]);

/* Calculate how much memory we will need for the LL initialization */
WsfCsEnter();

LlInitRtCfg_t llCfg = {
.pBbRtCfg = &mainBbRtCfg,
.wlSizeCfg = 4,
.rlSizeCfg = 4,
.plSizeCfg = 4,
.pLlRtCfg = &mainLlRtCfg,
/* Not significant yet, only being used for memory size requirement calculation. */
.pFreeMem = WsfHeapGetFreeStartAddress(),
/* Not significant yet, only being used for memory size requirement calculation. */
.freeMemAvail = WsfHeapCountAvailable()
};

llmemUsed = LlInitSetBbRtCfg(llCfg.pBbRtCfg, llCfg.wlSizeCfg, llCfg.rlSizeCfg, llCfg.plSizeCfg,
llCfg.pFreeMem, llCfg.freeMemAvail);

llCfg.pFreeMem += llmemUsed;
llCfg.freeMemAvail -= llmemUsed;

llmemUsed += LlInitSetLlRtCfg(llCfg.pLlRtCfg, llCfg.pFreeMem, llCfg.freeMemAvail);

WsfCsExit();

/* Initial buffer configuration. */
uint16_t memUsed;
WsfCsEnter();
memUsed = WsfBufInit(numPools, poolDesc);
memUsed = WsfBufCalcSize(numPools, poolDesc);
WsfHeapAlloc(memUsed);
WsfBufInit(numPools, poolDesc);
WsfCsExit();

WsfOsInit();
WsfTimerInit();

#if (WSF_TRACE_ENABLED == TRUE)
WsfCsEnter();
memUsed = WsfBufIoUartInit(WsfHeapGetFreeStartAddress(), PLATFORM_UART_TERMINAL_BUFFER_SIZE);
WsfHeapAlloc(memUsed);
WsfHeapAlloc(PLATFORM_UART_TERMINAL_BUFFER_SIZE);
WsfBufIoUartInit(WsfHeapGetFreeStartAddress(), PLATFORM_UART_TERMINAL_BUFFER_SIZE);
WsfCsExit();

WsfTraceRegisterHandler(WsfBufIoWrite);
WsfTraceEnable(TRUE);
#endif

/* Complete the LL initialization */
WsfCsEnter();

/* Allocate the memory */
WsfHeapAlloc(llmemUsed);

/* Set the free memory pointers */
llCfg.pFreeMem = WsfHeapGetFreeStartAddress();
llCfg.freeMemAvail = WsfHeapCountAvailable();

/* Run the initialization with properly set the free memory pointers */
if (llmemUsed != LlInitControllerInit(&llCfg)) {
WSF_ASSERT(0);
}

WsfCsExit();
}

/*************************************************************************************************/
Expand Down Expand Up @@ -249,31 +296,8 @@ void setInterruptPriority(void)
/*************************************************************************************************/
int main(void)
{
uint32_t memUsed;

mainLoadConfiguration();
mainWsfInit();

#if (WSF_TRACE_ENABLED == TRUE)
WsfCsEnter();
memUsed = WsfBufIoUartInit(WsfHeapGetFreeStartAddress(), PLATFORM_UART_TERMINAL_BUFFER_SIZE);
WsfHeapAlloc(memUsed);
WsfCsExit();
#endif

WsfCsEnter();
LlInitRtCfg_t llCfg = { .pBbRtCfg = &mainBbRtCfg,
.wlSizeCfg = 4,
.rlSizeCfg = 4,
.plSizeCfg = 4,
.pLlRtCfg = &mainLlRtCfg,
.pFreeMem = WsfHeapGetFreeStartAddress(),
.freeMemAvail = WsfHeapCountAvailable() };

memUsed = LlInitControllerInit(&llCfg);
WsfHeapAlloc(memUsed);
WsfCsExit();

bdAddr_t bdAddr;
PalCfgLoadData(PAL_CFG_ID_BD_ADDR, bdAddr, sizeof(bdAddr_t));
/* Coverity[uninit_use_in_call] */
Expand Down
61 changes: 47 additions & 14 deletions Examples/MAX32655/Bluetooth/BLE_FreeRTOS/stack_dats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,11 @@ static void mainWsfInit(void)
const uint8_t numPools = sizeof(mainPoolDesc) / sizeof(mainPoolDesc[0]);

uint16_t memUsed;
/* Initial buffer configuration. */
WsfCsEnter();
memUsed = WsfBufInit(numPools, mainPoolDesc);
memUsed = WsfBufCalcSize(numPools, mainPoolDesc);
WsfHeapAlloc(memUsed);
WsfBufInit(numPools, mainPoolDesc);
WsfCsExit();

WsfOsInit();
Expand Down Expand Up @@ -327,27 +329,58 @@ void bleStartup(void)
mainLlRtCfg.defTxPwrLvl = DEFAULT_TX_POWER;
#endif

uint32_t memUsed;
WsfCsEnter();
memUsed = WsfBufIoUartInit(WsfHeapGetFreeStartAddress(), PLATFORM_UART_TERMINAL_BUFFER_SIZE);
WsfHeapAlloc(memUsed);
WsfHeapAlloc(PLATFORM_UART_TERMINAL_BUFFER_SIZE);
WsfBufIoUartInit(WsfHeapGetFreeStartAddress(), PLATFORM_UART_TERMINAL_BUFFER_SIZE);
WsfCsExit();

mainWsfInit();
AppTerminalInit();

#if defined(HCI_TR_EXACTLE) && (HCI_TR_EXACTLE == 1)
uint32_t llmemUsed;

/* Calculate how much memory we will need for the LL initialization */
WsfCsEnter();
LlInitRtCfg_t llCfg = { .pBbRtCfg = &mainBbRtCfg,
.wlSizeCfg = 4,
.rlSizeCfg = 4,
.plSizeCfg = 4,
.pLlRtCfg = &mainLlRtCfg,
.pFreeMem = WsfHeapGetFreeStartAddress(),
.freeMemAvail = WsfHeapCountAvailable() };

memUsed = LlInit(&llCfg);
WsfHeapAlloc(memUsed);

WsfTraceEnable(FALSE);

LlInitRtCfg_t llCfg = {
.pBbRtCfg = &mainBbRtCfg,
.wlSizeCfg = 4,
.rlSizeCfg = 4,
.plSizeCfg = 4,
.pLlRtCfg = &mainLlRtCfg,
/* Not significant yet, only being used for memory size requirement calculation. */
.pFreeMem = WsfHeapGetFreeStartAddress(),
/* Not significant yet, only being used for memory size requirement calculation. */
.freeMemAvail = WsfHeapCountAvailable()
};

llmemUsed = LlInitSetBbRtCfg(llCfg.pBbRtCfg, llCfg.wlSizeCfg, llCfg.rlSizeCfg, llCfg.plSizeCfg,
llCfg.pFreeMem, llCfg.freeMemAvail);

llCfg.pFreeMem += llmemUsed;
llCfg.freeMemAvail -= llmemUsed;

llmemUsed += LlInitSetLlRtCfg(llCfg.pLlRtCfg, llCfg.pFreeMem, llCfg.freeMemAvail);

/* Allocate the memory */
WsfHeapAlloc(llmemUsed);

/* Set the free memory pointers */
llCfg.pFreeMem = WsfHeapGetFreeStartAddress();
llCfg.freeMemAvail = WsfHeapCountAvailable();

#if (WSF_TOKEN_ENABLED == TRUE) || (WSF_TRACE_ENABLED == TRUE)
WsfTraceEnable(TRUE);
#endif

/* Run the initialization with properly set the free memory pointers */
if (llmemUsed != LlInitControllerInit(&llCfg)) {
WSF_ASSERT(0);
}

WsfCsExit();

bdAddr_t bdAddr;
Expand Down
Loading
Loading