فهرست منبع

Merge branch 'bugfix/warning_fix_latest_freertos_v3.3' into 'release/v3.3'

Fixed warnings for components driver, esp32 and mbedtls (v3.3)

See merge request espressif/esp-idf!6760
Mahavir Jain 6 سال پیش
والد
کامیت
29f6537faf
3فایلهای تغییر یافته به همراه12 افزوده شده و 13 حذف شده
  1. 1 1
      components/driver/rtc_module.c
  2. 8 9
      components/esp32/esp_adapter.c
  3. 3 3
      components/esp32/hwcrypto/sha.c

+ 1 - 1
components/driver/rtc_module.c

@@ -995,7 +995,7 @@ esp_err_t touch_pad_filter_start(uint32_t filter_period_ms)
     }
     if (s_touch_pad_filter->timer == NULL) {
         s_touch_pad_filter->timer = xTimerCreate("filter_tmr", filter_period_ms / portTICK_PERIOD_MS, pdFALSE,
-        NULL, touch_pad_filter_cb);
+        NULL, (void(*)(TimerHandle_t))touch_pad_filter_cb);
         if (s_touch_pad_filter->timer == NULL) {
             ret = ESP_ERR_NO_MEM;
         }

+ 8 - 9
components/esp32/esp_adapter.c

@@ -367,7 +367,6 @@ static int32_t IRAM_ATTR task_ms_to_tick_wrapper(uint32_t ms)
     return (int32_t)(ms / portTICK_PERIOD_MS);
 }
 
-
 static int32_t task_get_max_priority_wrapper(void)
 {
     return (int32_t)(configMAX_PRIORITIES);
@@ -535,24 +534,24 @@ wifi_osi_funcs_t g_wifi_osi_funcs = {
     ._mutex_lock = mutex_lock_wrapper,
     ._mutex_unlock = mutex_unlock_wrapper,
     ._queue_create = queue_create_wrapper,
-    ._queue_delete = vQueueDelete,
+    ._queue_delete = (void(*)(void *))vQueueDelete,
     ._queue_send = queue_send_wrapper,
     ._queue_send_from_isr = queue_send_from_isr_wrapper,
     ._queue_send_to_back = queue_send_to_back_wrapper,
     ._queue_send_to_front = queue_send_to_front_wrapper,
     ._queue_recv = queue_recv_wrapper,
-    ._queue_msg_waiting = uxQueueMessagesWaiting,
-    ._event_group_create = xEventGroupCreate,
-    ._event_group_delete = vEventGroupDelete,
-    ._event_group_set_bits = xEventGroupSetBits,
-    ._event_group_clear_bits = xEventGroupClearBits,
+    ._queue_msg_waiting = (uint32_t(*)(void *))uxQueueMessagesWaiting,
+    ._event_group_create = (void *(*)(void))xEventGroupCreate,
+    ._event_group_delete = (void(*)(void *))vEventGroupDelete,
+    ._event_group_set_bits = (uint32_t(*)(void *,uint32_t))xEventGroupSetBits,
+    ._event_group_clear_bits = (uint32_t(*)(void *,uint32_t))xEventGroupClearBits,
     ._event_group_wait_bits = event_group_wait_bits_wrapper,
     ._task_create_pinned_to_core = task_create_pinned_to_core_wrapper,
     ._task_create = task_create_wrapper,
-    ._task_delete = vTaskDelete,
+    ._task_delete = (void(*)(void *))vTaskDelete,
     ._task_delay = vTaskDelay,
     ._task_ms_to_tick = task_ms_to_tick_wrapper,
-    ._task_get_current_task = xTaskGetCurrentTaskHandle,
+    ._task_get_current_task = (void *(*)(void))xTaskGetCurrentTaskHandle,
     ._task_get_max_priority = task_get_max_priority_wrapper,
     ._malloc = malloc,
     ._free = free,

+ 3 - 3
components/esp32/hwcrypto/sha.c

@@ -195,7 +195,7 @@ static bool esp_sha_lock_engine_common(esp_sha_type sha_type, TickType_t ticks_t
 
 void esp_sha_unlock_engine(esp_sha_type sha_type)
 {
-    SemaphoreHandle_t *engine_state = sha_get_engine_state(sha_type);
+    SemaphoreHandle_t engine_state = sha_get_engine_state(sha_type);
 
     portENTER_CRITICAL(&engines_in_use_lock);
 
@@ -231,7 +231,7 @@ void esp_sha_read_digest_state(esp_sha_type sha_type, void *digest_state)
     uint32_t word_len = sha_length(sha_type)/4;
 #ifndef NDEBUG
     {
-        SemaphoreHandle_t *engine_state = sha_get_engine_state(sha_type);
+        SemaphoreHandle_t engine_state = sha_get_engine_state(sha_type);
         assert(uxSemaphoreGetCount(engine_state) == 0 &&
                "SHA engine should be locked" );
     }
@@ -276,7 +276,7 @@ void esp_sha_block(esp_sha_type sha_type, const void *data_block, bool is_first_
 {
 #ifndef NDEBUG
     {
-        SemaphoreHandle_t *engine_state = sha_get_engine_state(sha_type);
+        SemaphoreHandle_t engine_state = sha_get_engine_state(sha_type);
         assert(uxSemaphoreGetCount(engine_state) == 0 &&
                "SHA engine should be locked" );
     }