Skip to content

Fixed memmanager and add assertion #277

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

Merged
merged 4 commits into from
Jun 9, 2022
Merged

Fixed memmanager and add assertion #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5bc7ed
Fixed memmanager and add assertion
Hadatko May 17, 2022
63870bb
Added NULL for free function
Hadatko May 18, 2022
6682929
Keep backward compatibility with older version of driver.
Hadatko May 19, 2022
53c4379
Changes based on PR.
Hadatko Jun 8, 2022
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
2 changes: 1 addition & 1 deletion erpc_c/port/erpc_config_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
#endif

#if !defined(erpc_assert)
#if ERPC_HAS_FREERTOSCONFIG_H
#if ERPC_HAS_FREERTOSCONFIG_H
#ifdef __cplusplus
extern "C" {
#endif
Expand Down
9 changes: 6 additions & 3 deletions erpc_c/port/erpc_port_memmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

extern "C" {
#include "FreeRTOS.h"
#include "MemManager.h"
#include "fsl_component_mem_manager.h"
}

#if !(__embedded_cplusplus)
Expand Down Expand Up @@ -58,13 +58,16 @@ void operator delete[](void *ptr) THROW

void *erpc_malloc(size_t size)
{
void *p = MEM_BufferAllocForever(size, 0);
void *p = MEM_BufferAlloc(size);
return p;
}

void erpc_free(void *ptr)
{
MEM_BufferFree(ptr);
if (ptr != NULL)
{
erpc_assert(MEM_BufferFree(ptr) == kStatus_MemSuccess);
}
}

/* Provide function for pure virtual call to avoid huge demangling code being linked in ARM GCC */
Expand Down
5 changes: 4 additions & 1 deletion erpc_c/port/erpc_port_mqx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ void *erpc_malloc(size_t size)

void erpc_free(void *ptr)
{
_mem_free(ptr);
if (ptr != NULL)
{
erpc_assert(_mem_free(ptr) == MQX_OK);
}
}

/* Provide function for pure virtual call to avoid huge demangling code being linked in ARM GCC */
Expand Down