Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions components/esp_event/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,14 @@ menu "Event Loop Library"
help
Enable posting events from interrupt handlers.

config ESP_EVENT_POST_FROM_ISR_SIZE
int "Max size of data from events"
default 4
depends on ESP_EVENT_POST_FROM_ISR
help
Enable posting events from interrupt handlers.


config ESP_EVENT_POST_FROM_IRAM_ISR
bool "Support posting events from ISRs placed in IRAM"
default y
Expand Down
19 changes: 16 additions & 3 deletions components/esp_event/esp_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -924,6 +924,22 @@ esp_err_t esp_event_post_to(esp_event_loop_handle_t event_loop, esp_event_base_t
memset((void*)(&post), 0, sizeof(post));

if (event_data != NULL && event_data_size != 0) {
#if CONFIG_ESP_EVENT_POST_FROM_ISR

if (event_data_size > sizeof(post.data.val)) {
post.data.ptr = calloc(1, event_data_size);

if (post.data.ptr == NULL) {
return ESP_ERR_NO_MEM;
}
post.data_allocated = true;
memcpy(post.data.ptr, event_data, event_data_size);
} else {
memcpy((void*)(&(post.data.val)), event_data, event_data_size);
}

post.data_set = true;
#else
// Make persistent copy of event data on heap.
void* event_data_copy = calloc(1, event_data_size);

Expand All @@ -933,9 +949,6 @@ esp_err_t esp_event_post_to(esp_event_loop_handle_t event_loop, esp_event_base_t

memcpy(event_data_copy, event_data, event_data_size);
post.data.ptr = event_data_copy;
#if CONFIG_ESP_EVENT_POST_FROM_ISR
post.data_allocated = true;
post.data_set = true;
#endif
}
post.base = event_base;
Expand Down
2 changes: 1 addition & 1 deletion components/esp_event/private_include/esp_event_internal.h
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ typedef struct esp_event_remove_handler_context_t {
} esp_event_remove_handler_context_t;

typedef union esp_event_post_data {
uint32_t val;
uint8_t val[CONFIG_ESP_EVENT_POST_FROM_ISR_SIZE];
void *ptr;
} esp_event_post_data_t;

Expand Down