mirror of
https://github.com/espressif/ESP8266_RTOS_SDK.git
synced 2025-09-18 15:23:43 +08:00
feat(esp8266): Using global functions instead of function table
The Wi-Fi adapter APIs are only used by internal libraires.
This commit is contained in:
dongheng
@ -65,7 +65,6 @@
|
||||
#include "esp_err.h"
|
||||
#include "esp_wifi_types.h"
|
||||
#include "esp_event.h"
|
||||
#include "esp_wifi_os_adapter.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
@ -96,7 +95,7 @@ extern "C" {
|
||||
*/
|
||||
typedef struct {
|
||||
system_event_handler_t event_handler; /**< WiFi event handler */
|
||||
wifi_osi_funcs_t* osi_funcs; /**< WiFi OS functions */
|
||||
void* osi_funcs; /**< WiFi OS functions */
|
||||
int static_rx_buf_num; /**< WiFi static RX buffer number */
|
||||
int dynamic_rx_buf_num; /**< WiFi dynamic RX buffer number */
|
||||
int tx_buf_type; /**< WiFi TX buffer type */
|
||||
@ -114,10 +113,9 @@ typedef struct {
|
||||
|
||||
#define WIFI_INIT_CONFIG_MAGIC 0x1F2F3F4F
|
||||
|
||||
extern wifi_osi_funcs_t s_wifi_osi_funcs;
|
||||
#define WIFI_INIT_CONFIG_DEFAULT() { \
|
||||
.event_handler = &esp_event_send, \
|
||||
.osi_funcs = &s_wifi_osi_funcs, \
|
||||
.osi_funcs = NULL, \
|
||||
.static_rx_buf_num = 5,\
|
||||
.dynamic_rx_buf_num = 0,\
|
||||
.tx_buf_type = 0,\
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
// Copyright 2018 Espressif Systems (Shanghai) PTE LTD
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// 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.
|
||||
|
||||
#ifndef ESP_WIFI_OS_ADAPTER_H_
|
||||
#define ESP_WIFI_OS_ADAPTER_H_
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#define ESP_WIFI_OS_ADAPTER_VERSION 0x00000001
|
||||
#define ESP_WIFI_OS_ADAPTER_MAGIC 0xDEADBEAF
|
||||
|
||||
#define OSI_FUNCS_TIME_BLOCKING 0xffffffff
|
||||
|
||||
#define OSI_QUEUE_SEND_FRONT 0
|
||||
#define OSI_QUEUE_SEND_BACK 1
|
||||
#define OSI_QUEUE_SEND_OVERWRITE 2
|
||||
|
||||
#define OSI_MALLOC_CAP_32BIT (1 << 1)
|
||||
#define OSI_MALLOC_CAP_8BIT (1 << 2)
|
||||
#define OSI_MALLOC_CAP_DMA (1 << 3)
|
||||
|
||||
typedef struct {
|
||||
int32_t version;
|
||||
|
||||
void *(*task_create)(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio);
|
||||
void (*task_delete)(void *task_handle);
|
||||
void (*task_yield)(void);
|
||||
void (*task_yield_from_isr)(void);
|
||||
void (*task_delay)(uint32_t tick);
|
||||
void *(*task_get_current_task)(void);
|
||||
uint32_t (*task_get_max_priority)(void);
|
||||
|
||||
uint32_t (*task_ms_to_tick)(uint32_t ms);
|
||||
|
||||
void (*task_suspend_all)(void);
|
||||
void (*task_resume_all)(void);
|
||||
|
||||
void (*os_init)(void);
|
||||
void (*os_start)(void);
|
||||
|
||||
void *(*semphr_create)(uint32_t max, uint32_t init);
|
||||
void (*semphr_delete)(void *semphr);
|
||||
bool (*semphr_take_from_isr)(void *semphr, int *hptw);
|
||||
bool (*semphr_give_from_isr)(void *semphr, int *hptw);
|
||||
bool (*semphr_take)(void *semphr, uint32_t block_time_tick);
|
||||
bool (*semphr_give)(void *semphr);
|
||||
|
||||
void *(*mutex_create)(void);
|
||||
void (*mutex_delete)(void *mutex);
|
||||
bool (*mutex_lock)(void *mutex);
|
||||
bool (*mutex_unlock)(void *mutex);
|
||||
|
||||
void *(*queue_create)(uint32_t queue_len, uint32_t item_size);
|
||||
void (*queue_delete)(void *queue);
|
||||
bool (*queue_send)(void *queue, void *item, uint32_t block_time_tick, uint32_t pos);
|
||||
bool (*queue_send_from_isr)(void *queue, void *item, int *hptw);
|
||||
bool (*queue_recv)(void *queue, void *item, uint32_t block_time_tick);
|
||||
bool (*queue_recv_from_isr)(void *queue, void *item, int *hptw);
|
||||
uint32_t (*queue_msg_waiting)(void *queue);
|
||||
|
||||
void *(*timer_create)(const char *name, uint32_t period_ticks, bool auto_load, void *arg, void (*cb)(void *timer));
|
||||
void *(*timer_get_arg)(void *timer);
|
||||
bool (*timer_reset)(void *timer, uint32_t ticks);
|
||||
bool (*timer_stop)(void *timer, uint32_t ticks);
|
||||
bool (*timer_delete)(void *timer, uint32_t ticks);
|
||||
|
||||
void *(*malloc)(uint32_t size, uint32_t cap, const char *file, size_t line);
|
||||
void *(*zalloc)(uint32_t size, uint32_t cap, const char *file, size_t line);
|
||||
void *(*realloc)(void *ptr, uint32_t size, uint32_t cap, const char *file, size_t line);
|
||||
void *(*calloc)(uint32_t cnt, uint32_t size, uint32_t cap, const char *file, size_t line);
|
||||
void (*free)(void *p, const char *file, size_t line);
|
||||
uint32_t (*get_free_heap_size)(void);
|
||||
|
||||
void (*srand)(uint32_t seed);
|
||||
int32_t (*rand)(void);
|
||||
|
||||
int32_t (* nvs_set_i8)(uint32_t handle, const char* key, int8_t value);
|
||||
int32_t (* nvs_get_i8)(uint32_t handle, const char* key, int8_t* out_value);
|
||||
int32_t (* nvs_set_u8)(uint32_t handle, const char* key, uint8_t value);
|
||||
int32_t (* nvs_get_u8)(uint32_t handle, const char* key, uint8_t* out_value);
|
||||
int32_t (* nvs_set_u16)(uint32_t handle, const char* key, uint16_t value);
|
||||
int32_t (* nvs_get_u16)(uint32_t handle, const char* key, uint16_t* out_value);
|
||||
int32_t (* nvs_open)(const char* name, uint32_t open_mode, uint32_t *out_handle);
|
||||
void (* nvs_close)(uint32_t handle);
|
||||
int32_t (* nvs_commit)(uint32_t handle);
|
||||
int32_t (* nvs_set_blob)(uint32_t handle, const char* key, const void* value, size_t length);
|
||||
int32_t (* nvs_get_blob)(uint32_t handle, const char* key, void* out_value, size_t* length);
|
||||
int32_t (* nvs_erase_key)(uint32_t handle, const char* key);
|
||||
|
||||
int32_t magic;
|
||||
} wifi_osi_funcs_t;
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* ESP_WIFI_OS_ADAPTER_H_ */
|
||||
@ -15,141 +15,18 @@
|
||||
#ifndef ESP_WIFI_OSI_H_
|
||||
#define ESP_WIFI_OSI_H_
|
||||
|
||||
#include "esp_wifi_os_adapter.h"
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
extern wifi_osi_funcs_t s_wifi_osi_funcs;
|
||||
#define ESP_WIFI_OS_ADAPTER_VERSION 0x00000001
|
||||
#define ESP_WIFI_OS_ADAPTER_MAGIC 0xDEADBEAF
|
||||
|
||||
#define wifi_task_create(func, name, depth, param, pri) \
|
||||
s_wifi_osi_funcs.task_create(func, name, depth, param, pri)
|
||||
#define OSI_FUNCS_TIME_BLOCKING 0xffffffff
|
||||
|
||||
#define wifi_task_delete(h) \
|
||||
s_wifi_osi_funcs.task_delete(h)
|
||||
|
||||
#define wifi_task_yield() \
|
||||
s_wifi_osi_funcs.task_yield()
|
||||
|
||||
#define wifi_task_yield_from_isr() \
|
||||
s_wifi_osi_funcs.task_yield_from_isr()
|
||||
|
||||
#define wifi_task_delay(t) \
|
||||
s_wifi_osi_funcs.task_delay(t)
|
||||
|
||||
#define wifi_task_get_current_task() \
|
||||
s_wifi_osi_funcs.task_get_current_task()
|
||||
|
||||
#define wifi_task_get_max_priority() \
|
||||
s_wifi_osi_funcs.task_get_max_priority()
|
||||
|
||||
#define wifi_task_ms_to_ticks(t) \
|
||||
s_wifi_osi_funcs.task_ms_to_tick(t)
|
||||
|
||||
#define wifi_task_suspend_all() \
|
||||
s_wifi_osi_funcs.task_suspend_all()
|
||||
|
||||
#define wifi_task_resume_all() \
|
||||
s_wifi_osi_funcs.task_resume_all()
|
||||
|
||||
#define wifi_os_init() \
|
||||
s_wifi_osi_funcs.os_init()
|
||||
|
||||
#define wifi_os_start() \
|
||||
s_wifi_osi_funcs.os_start()
|
||||
|
||||
#define wifi_semphr_create(m, i) \
|
||||
s_wifi_osi_funcs.semphr_create(m, i)
|
||||
|
||||
#define wifi_semphr_delete(s) \
|
||||
s_wifi_osi_funcs.semphr_delete(s)
|
||||
|
||||
#define wifi_semphr_take_from_isr(s, r) \
|
||||
s_wifi_osi_funcs.semphr_take_from_isr(s, r)
|
||||
|
||||
#define wifi_semphr_give_from_isr(s, r) \
|
||||
s_wifi_osi_funcs.semphr_give_from_isr(s, r)
|
||||
|
||||
#define wifi_semphr_take(s, t) \
|
||||
s_wifi_osi_funcs.semphr_take(s, t)
|
||||
|
||||
#define wifi_semphr_give(s) \
|
||||
s_wifi_osi_funcs.semphr_give(s)
|
||||
|
||||
#define wifi_mutex_create() \
|
||||
s_wifi_osi_funcs.mutex_create()
|
||||
|
||||
#define wifi_mutex_delete(m) \
|
||||
s_wifi_osi_funcs.mutex_delete(m)
|
||||
|
||||
#define wifi_mutex_lock(m) \
|
||||
s_wifi_osi_funcs.mutex_lock(m)
|
||||
|
||||
#define wifi_mutex_unlock(m) \
|
||||
s_wifi_osi_funcs.mutex_unlock(m)
|
||||
|
||||
#define wifi_queue_create(ql, is) \
|
||||
s_wifi_osi_funcs.queue_create(ql, is)
|
||||
|
||||
#define wifi_queue_delete(q) \
|
||||
s_wifi_osi_funcs.queue_delete(q)
|
||||
|
||||
#define wifi_queue_send(q, i, t, p) \
|
||||
s_wifi_osi_funcs.queue_send(q, i, t, p)
|
||||
|
||||
#define wifi_queue_send_from_isr(q, i, r) \
|
||||
s_wifi_osi_funcs.queue_send_from_isr(q, i, r)
|
||||
|
||||
#define wifi_queue_recv(q, i, t) \
|
||||
s_wifi_osi_funcs.queue_recv(q, i, t)
|
||||
|
||||
#define wifi_queue_recv_from_isr(q, i, r) \
|
||||
s_wifi_osi_funcs.queue_recv_from_isr(q, i, r)
|
||||
|
||||
#define wifi_queue_msg_waiting(q) \
|
||||
s_wifi_osi_funcs.queue_msg_waiting(q)
|
||||
|
||||
#define wifi_timer_create(n, p, al, ag, cb) \
|
||||
s_wifi_osi_funcs.timer_create(n, p, al, ag, cb)
|
||||
|
||||
#define wifi_timer_get_arg(t) \
|
||||
s_wifi_osi_funcs.timer_get_arg(t)
|
||||
|
||||
#define wifi_timer_reset(t, tk) \
|
||||
s_wifi_osi_funcs.timer_reset(t, tk)
|
||||
|
||||
#define wifi_timer_stop(t, tk) \
|
||||
s_wifi_osi_funcs.timer_stop(t, tk)
|
||||
|
||||
#define wifi_timer_delete(t, tk) \
|
||||
s_wifi_osi_funcs.timer_delete(t, tk)
|
||||
|
||||
#define wifi_malloc(s, c) \
|
||||
s_wifi_osi_funcs.malloc(s, c, __ESP_FILE__, __LINE__)
|
||||
|
||||
#define wifi_zalloc(s, c) \
|
||||
s_wifi_osi_funcs.zalloc(s, c, __ESP_FILE__, __LINE__)
|
||||
|
||||
#define wifi_calloc(cnt, s, c) \
|
||||
s_wifi_osi_funcs.calloc(cnt, s, c, __ESP_FILE__, __LINE__)
|
||||
|
||||
#define wifi_realloc(ptr, s, c) \
|
||||
s_wifi_osi_funcs.realloc(ptr, s, c, __ESP_FILE__, __LINE__)
|
||||
|
||||
#define wifi_free(p) \
|
||||
s_wifi_osi_funcs.free(p, __ESP_FILE__, __LINE__)
|
||||
|
||||
#define wifi_get_free_heap_size() \
|
||||
s_wifi_osi_funcs.get_free_heap_size()
|
||||
|
||||
#define wifi_srand(s) \
|
||||
s_wifi_osi_funcs.srand(s)
|
||||
|
||||
#define wifi_rand() \
|
||||
s_wifi_osi_funcs.rand()
|
||||
|
||||
void *osi_task_top_sp(void);
|
||||
#define OSI_QUEUE_SEND_FRONT 0
|
||||
#define OSI_QUEUE_SEND_BACK 1
|
||||
#define OSI_QUEUE_SEND_OVERWRITE 2
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user