Merge branch 'contrib/github_pr_8388' into 'master'

esp_event: constify event_data pointer (GitHub PR)

Closes IDFGH-6760

See merge request espressif/esp-idf!17195
This commit is contained in:
Jakob Hasse 2022-02-17 14:44:32 +00:00
commit 41e1eea9a9
4 changed files with 18 additions and 36 deletions

View File

@ -1,16 +1,8 @@
// Copyright 2018 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include "esp_event.h" #include "esp_event.h"
#include "esp_event_internal.h" #include "esp_event_internal.h"
@ -74,7 +66,7 @@ esp_err_t esp_event_handler_instance_unregister(esp_event_base_t event_base,
} }
esp_err_t esp_event_post(esp_event_base_t event_base, int32_t event_id, esp_err_t esp_event_post(esp_event_base_t event_base, int32_t event_id,
void* event_data, size_t event_data_size, TickType_t ticks_to_wait) const void* event_data, size_t event_data_size, TickType_t ticks_to_wait)
{ {
if (s_default_loop == NULL) { if (s_default_loop == NULL) {
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
@ -87,7 +79,7 @@ esp_err_t esp_event_post(esp_event_base_t event_base, int32_t event_id,
#if CONFIG_ESP_EVENT_POST_FROM_ISR #if CONFIG_ESP_EVENT_POST_FROM_ISR
esp_err_t esp_event_isr_post(esp_event_base_t event_base, int32_t event_id, esp_err_t esp_event_isr_post(esp_event_base_t event_base, int32_t event_id,
void* event_data, size_t event_data_size, BaseType_t* task_unblocked) const void* event_data, size_t event_data_size, BaseType_t* task_unblocked)
{ {
if (s_default_loop == NULL) { if (s_default_loop == NULL) {
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;

View File

@ -1,16 +1,8 @@
// Copyright 2018 Espressif Systems (Shanghai) PTE LTD /*
// * SPDX-FileCopyrightText: 2018-2022 Espressif Systems (Shanghai) CO LTD
// Licensed under the Apache License, Version 2.0 (the "License"); *
// you may not use this file except in compliance with the License. * SPDX-License-Identifier: Apache-2.0
// You may obtain a copy of the License at */
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -823,7 +815,7 @@ esp_err_t esp_event_handler_instance_unregister_with(esp_event_loop_handle_t eve
} }
esp_err_t esp_event_post_to(esp_event_loop_handle_t event_loop, esp_event_base_t event_base, int32_t event_id, esp_err_t esp_event_post_to(esp_event_loop_handle_t event_loop, esp_event_base_t event_base, int32_t event_id,
void* event_data, size_t event_data_size, TickType_t ticks_to_wait) const void* event_data, size_t event_data_size, TickType_t ticks_to_wait)
{ {
assert(event_loop); assert(event_loop);
@ -900,7 +892,7 @@ esp_err_t esp_event_post_to(esp_event_loop_handle_t event_loop, esp_event_base_t
#if CONFIG_ESP_EVENT_POST_FROM_ISR #if CONFIG_ESP_EVENT_POST_FROM_ISR
esp_err_t esp_event_isr_post_to(esp_event_loop_handle_t event_loop, esp_event_base_t event_base, int32_t event_id, esp_err_t esp_event_isr_post_to(esp_event_loop_handle_t event_loop, esp_event_base_t event_base, int32_t event_id,
void* event_data, size_t event_data_size, BaseType_t* task_unblocked) const void* event_data, size_t event_data_size, BaseType_t* task_unblocked)
{ {
assert(event_loop); assert(event_loop);

View File

@ -373,7 +373,7 @@ esp_err_t esp_event_handler_instance_unregister(esp_event_base_t event_base,
*/ */
esp_err_t esp_event_post(esp_event_base_t event_base, esp_err_t esp_event_post(esp_event_base_t event_base,
int32_t event_id, int32_t event_id,
void *event_data, const void *event_data,
size_t event_data_size, size_t event_data_size,
TickType_t ticks_to_wait); TickType_t ticks_to_wait);
@ -402,7 +402,7 @@ esp_err_t esp_event_post(esp_event_base_t event_base,
esp_err_t esp_event_post_to(esp_event_loop_handle_t event_loop, esp_err_t esp_event_post_to(esp_event_loop_handle_t event_loop,
esp_event_base_t event_base, esp_event_base_t event_base,
int32_t event_id, int32_t event_id,
void *event_data, const void *event_data,
size_t event_data_size, size_t event_data_size,
TickType_t ticks_to_wait); TickType_t ticks_to_wait);
@ -431,7 +431,7 @@ esp_err_t esp_event_post_to(esp_event_loop_handle_t event_loop,
*/ */
esp_err_t esp_event_isr_post(esp_event_base_t event_base, esp_err_t esp_event_isr_post(esp_event_base_t event_base,
int32_t event_id, int32_t event_id,
void *event_data, const void *event_data,
size_t event_data_size, size_t event_data_size,
BaseType_t *task_unblocked); BaseType_t *task_unblocked);
@ -461,7 +461,7 @@ esp_err_t esp_event_isr_post(esp_event_base_t event_base,
esp_err_t esp_event_isr_post_to(esp_event_loop_handle_t event_loop, esp_err_t esp_event_isr_post_to(esp_event_loop_handle_t event_loop,
esp_event_base_t event_base, esp_event_base_t event_base,
int32_t event_id, int32_t event_id,
void *event_data, const void *event_data,
size_t event_data_size, size_t event_data_size,
BaseType_t *task_unblocked); BaseType_t *task_unblocked);
#endif #endif

View File

@ -450,8 +450,6 @@ components/esp_eth/src/w5500.h
components/esp_eth/test/test_emac.c components/esp_eth/test/test_emac.c
components/esp_eth/test_apps/component_ut_test.py components/esp_eth/test_apps/component_ut_test.py
components/esp_eth/test_apps/main/esp_eth_test.c components/esp_eth/test_apps/main/esp_eth_test.c
components/esp_event/default_event_loop.c
components/esp_event/esp_event.c
components/esp_event/esp_event_private.c components/esp_event/esp_event_private.c
components/esp_event/event_loop_legacy.c components/esp_event/event_loop_legacy.c
components/esp_event/event_send.c components/esp_event/event_send.c