Skip to content

Use cyw43_malloc/free macro instead of malloc/free to allow alternative implementations #1309

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 1 commit into from
Mar 20, 2023
Merged

Use cyw43_malloc/free macro instead of malloc/free to allow alternative implementations #1309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions src/rp2_common/pico_cyw43_driver/cybt_shared_bus/cybt_shared_bus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,14 @@ static cybt_result_t cybt_fw_download_prepare(uint8_t **p_write_buf, uint8_t **p
*p_write_buf = NULL;
*p_hex_buf = NULL;

*p_write_buf = malloc(BTFW_DOWNLOAD_BLK_SIZE + BTFW_SD_ALIGN);
*p_write_buf = cyw43_malloc(BTFW_DOWNLOAD_BLK_SIZE + BTFW_SD_ALIGN);
if (NULL == *p_write_buf) {
return CYBT_ERR_OUT_OF_MEMORY;
}

*p_hex_buf = malloc(BTFW_MAX_STR_LEN);
*p_hex_buf = cyw43_malloc(BTFW_MAX_STR_LEN);
if (NULL == *p_hex_buf) {
free(*p_write_buf);
cyw43_free(*p_write_buf);
return CYBT_ERR_OUT_OF_MEMORY;
}

Expand All @@ -78,11 +78,11 @@ static cybt_result_t cybt_fw_download_prepare(uint8_t **p_write_buf, uint8_t **p

static cybt_result_t cybt_fw_download_finish(uint8_t *p_write_buf, uint8_t *p_hex_buf) {
if (p_write_buf) {
free(p_write_buf);
cyw43_free(p_write_buf);
}

if (p_hex_buf) {
free(p_hex_buf);
cyw43_free(p_hex_buf);
}

return CYBT_SUCCESS;
Expand Down
8 changes: 8 additions & 0 deletions src/rp2_common/pico_cyw43_driver/include/cyw43_configport.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,14 @@ void cyw43_post_poll_hook(void);

#define CYW43_POST_POLL_HOOK cyw43_post_poll_hook();

// Allow malloc and free to be changed
#ifndef cyw43_malloc
#define cyw43_malloc malloc
#endif
#ifndef cyw43_free
#define cyw43_free free
#endif

#ifdef __cplusplus
}
#endif
Expand Down