From 5a762d9eeebff7ea191c9bd00bcd9446673f3506 Mon Sep 17 00:00:00 2001 From: Ivan Grokhotkov Date: Mon, 26 Sep 2016 01:35:31 +0800 Subject: [PATCH] components/esp32: clarify type of queue in wifi_init_config_t, add default init macro --- components/esp32/include/esp_wifi.h | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/components/esp32/include/esp_wifi.h b/components/esp32/include/esp_wifi.h index 38b7bdac1..32d5cd0f6 100644 --- a/components/esp32/include/esp_wifi.h +++ b/components/esp32/include/esp_wifi.h @@ -59,7 +59,8 @@ #include #include - +#include "freertos/FreeRTOS.h" +#include "freertos/queue.h" #include "esp_err.h" #include "rom/queue.h" @@ -138,13 +139,22 @@ typedef enum { typedef struct { - void *event_q; /**< WiFi event q handler, it's a freeRTOS queue */ + QueueHandle_t event_queue; /**< WiFi event queue handle */ uint8_t rx_ba_win; /**< TBC */ uint8_t tx_ba_win; /**< TBC */ uint8_t rx_buf_cnt; /**< TBC */ uint8_t tx_buf_cnt; /**< TBC */ } wifi_init_config_t; + +#define WIFI_INIT_CONFIG_DEFAULT(event_queue_) { \ + .event_queue = event_queue_, \ + .rx_ba_win = 0, \ + .tx_ba_win = 0, \ + .rx_buf_cnt = 0, \ + .tx_buf_cnt = 0 \ +}; + /** * @brief Init WiFi * Alloc resource for WiFi driver, such as WiFi control structure, RX/TX buffer,