espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-08 07:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/bt_fix_int_arguments' into 'master'

Browse Source 
bt: make int types consistent

See merge request espressif/esp-idf!18223
This commit is contained in:
Anton Maklakov
2022-05-29 16:56:00 +08:00
parent 368cb04194 cfa3e68d1b
commit 70c12407d3
2 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/controller/esp32/bt.c
View File

@@ -151,8 +151,8 @@ struct osi_funcs_t {
void (* _task_delete)(void *task_handle); void (* _task_delete)(void *task_handle);
bool (* _is_in_isr)(void); bool (* _is_in_isr)(void);
int (* _cause_sw_intr_to_core)(int core_id, int intr_no); int (* _cause_sw_intr_to_core)(int core_id, int intr_no);
void *(* _malloc)(uint32_t size); void *(* _malloc)(size_t size);
void *(* _malloc_internal)(uint32_t size); void *(* _malloc_internal)(size_t size);
void (* _free)(void *p); void (* _free)(void *p);
int32_t (* _read_efuse_mac)(uint8_t mac[6]); int32_t (* _read_efuse_mac)(uint8_t mac[6]);
void (* _srand)(unsigned int seed); void (* _srand)(unsigned int seed);

64
components/bt/controller/esp32s3/bt.c
View File

@@ -138,37 +138,37 @@ typedef void (* osi_intr_handler)(void);
struct osi_funcs_t { struct osi_funcs_t {
uint32_t _magic; uint32_t _magic;
uint32_t _version; uint32_t _version;
void (*_interrupt_set)(int32_t cpu_no, int32_t intr_source, int32_t interrupt_no, int32_t interrpt_prio); void (*_interrupt_set)(int cpu_no, int intr_source, int interrupt_no, int interrpt_prio);
void (*_interrupt_clear)(int32_t interrupt_source, int32_t interrupt_no); void (*_interrupt_clear)(int interrupt_source, int interrupt_no);
void (*_interrupt_handler_set)(int32_t interrupt_no, void *fn, void *arg); void (*_interrupt_handler_set)(int interrupt_no, void *fn, void *arg);
void (*_interrupt_disable)(void); void (*_interrupt_disable)(void);
void (*_interrupt_restore)(void); void (*_interrupt_restore)(void);
void (*_task_yield)(void); void (*_task_yield)(void);
void (*_task_yield_from_isr)(void); void (*_task_yield_from_isr)(void);
void *(*_semphr_create)(uint32_t max, uint32_t init); void *(*_semphr_create)(uint32_t max, uint32_t init);
void (*_semphr_delete)(void *semphr); void (*_semphr_delete)(void *semphr);
int32_t (*_semphr_take_from_isr)(void *semphr, void *hptw); int (*_semphr_take_from_isr)(void *semphr, void *hptw);
int32_t (*_semphr_give_from_isr)(void *semphr, void *hptw); int (*_semphr_give_from_isr)(void *semphr, void *hptw);
int32_t (*_semphr_take)(void *semphr, uint32_t block_time_ms); int (*_semphr_take)(void *semphr, uint32_t block_time_ms);
int32_t (*_semphr_give)(void *semphr); int (*_semphr_give)(void *semphr);
void *(*_mutex_create)(void); void *(*_mutex_create)(void);
void (*_mutex_delete)(void *mutex); void (*_mutex_delete)(void *mutex);
int32_t (*_mutex_lock)(void *mutex); int (*_mutex_lock)(void *mutex);
int32_t (*_mutex_unlock)(void *mutex); int (*_mutex_unlock)(void *mutex);
void *(* _queue_create)(uint32_t queue_len, uint32_t item_size); void *(* _queue_create)(uint32_t queue_len, uint32_t item_size);
void (* _queue_delete)(void *queue); void (* _queue_delete)(void *queue);
int32_t (* _queue_send)(void *queue, void *item, uint32_t block_time_ms); int (* _queue_send)(void *queue, void *item, uint32_t block_time_ms);
int32_t (* _queue_send_from_isr)(void *queue, void *item, void *hptw); int (* _queue_send_from_isr)(void *queue, void *item, void *hptw);
int32_t (* _queue_recv)(void *queue, void *item, uint32_t block_time_ms); int (* _queue_recv)(void *queue, void *item, uint32_t block_time_ms);
int32_t (* _queue_recv_from_isr)(void *queue, void *item, void *hptw); int (* _queue_recv_from_isr)(void *queue, void *item, void *hptw);
int32_t (* _task_create)(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio, void *task_handle, uint32_t core_id); int (* _task_create)(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio, void *task_handle, uint32_t core_id);
void (* _task_delete)(void *task_handle); void (* _task_delete)(void *task_handle);
bool (* _is_in_isr)(void); bool (* _is_in_isr)(void);
int (* _cause_sw_intr_to_core)(int core_id, int intr_no); int (* _cause_sw_intr_to_core)(int core_id, int intr_no);
void *(* _malloc)(size_t size); void *(* _malloc)(size_t size);
void *(* _malloc_internal)(size_t size); void *(* _malloc_internal)(size_t size);
void (* _free)(void *p); void (* _free)(void *p);
int32_t (* _read_efuse_mac)(uint8_t mac[6]); int (* _read_efuse_mac)(uint8_t mac[6]);
void (* _srand)(unsigned int seed); void (* _srand)(unsigned int seed);
int (* _rand)(void); int (* _rand)(void);
uint32_t (* _btdm_lpcycles_2_hus)(uint32_t cycles, uint32_t *error_corr); uint32_t (* _btdm_lpcycles_2_hus)(uint32_t cycles, uint32_t *error_corr);
@@ -269,33 +269,33 @@ extern char _bt_tmp_bss_end;
/* Local Function Declare /* Local Function Declare
********************************************************************* *********************************************************************
*/ */
static void interrupt_set_wrapper(int32_t cpu_no, int32_t intr_source, int32_t intr_num, int32_t intr_prio); static void interrupt_set_wrapper(int cpu_no, int intr_source, int intr_num, int intr_prio);
static void interrupt_clear_wrapper(int32_t intr_source, int32_t intr_num); static void interrupt_clear_wrapper(int intr_source, int intr_num);
static void interrupt_handler_set_wrapper(int n, void *fn, void *arg); static void interrupt_handler_set_wrapper(int n, void *fn, void *arg);
static void interrupt_disable(void); static void interrupt_disable(void);
static void interrupt_restore(void); static void interrupt_restore(void);
static void task_yield_from_isr(void); static void task_yield_from_isr(void);
static void *semphr_create_wrapper(uint32_t max, uint32_t init); static void *semphr_create_wrapper(uint32_t max, uint32_t init);
static void semphr_delete_wrapper(void *semphr); static void semphr_delete_wrapper(void *semphr);
static int32_t semphr_take_from_isr_wrapper(void *semphr, void *hptw); static int semphr_take_from_isr_wrapper(void *semphr, void *hptw);
static int32_t semphr_give_from_isr_wrapper(void *semphr, void *hptw); static int semphr_give_from_isr_wrapper(void *semphr, void *hptw);
static int32_t semphr_take_wrapper(void *semphr, uint32_t block_time_ms); static int semphr_take_wrapper(void *semphr, uint32_t block_time_ms);
static int32_t semphr_give_wrapper(void *semphr); static int semphr_give_wrapper(void *semphr);
static void *mutex_create_wrapper(void); static void *mutex_create_wrapper(void);
static void mutex_delete_wrapper(void *mutex); static void mutex_delete_wrapper(void *mutex);
static int32_t mutex_lock_wrapper(void *mutex); static int mutex_lock_wrapper(void *mutex);
static int32_t mutex_unlock_wrapper(void *mutex); static int mutex_unlock_wrapper(void *mutex);
static void *queue_create_wrapper(uint32_t queue_len, uint32_t item_size); static void *queue_create_wrapper(uint32_t queue_len, uint32_t item_size);
static void queue_delete_wrapper(void *queue); static void queue_delete_wrapper(void *queue);
static int32_t queue_send_wrapper(void *queue, void *item, uint32_t block_time_ms); static int queue_send_wrapper(void *queue, void *item, uint32_t block_time_ms);
static int32_t queue_send_from_isr_wrapper(void *queue, void *item, void *hptw); static int queue_send_from_isr_wrapper(void *queue, void *item, void *hptw);
static int32_t queue_recv_wrapper(void *queue, void *item, uint32_t block_time_ms); static int queue_recv_wrapper(void *queue, void *item, uint32_t block_time_ms);
static int32_t queue_recv_from_isr_wrapper(void *queue, void *item, void *hptw); static int queue_recv_from_isr_wrapper(void *queue, void *item, void *hptw);
static int32_t task_create_wrapper(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio, void *task_handle, uint32_t core_id); static int task_create_wrapper(void *task_func, const char *name, uint32_t stack_depth, void *param, uint32_t prio, void *task_handle, uint32_t core_id);
static void task_delete_wrapper(void *task_handle); static void task_delete_wrapper(void *task_handle);
static bool is_in_isr_wrapper(void); static bool is_in_isr_wrapper(void);
static void *malloc_internal_wrapper(size_t size); static void *malloc_internal_wrapper(size_t size);
static int32_t read_mac_wrapper(uint8_t mac[6]); static int read_mac_wrapper(uint8_t mac[6]);
static void srand_wrapper(unsigned int seed); static void srand_wrapper(unsigned int seed);
static int rand_wrapper(void); static int rand_wrapper(void);
static uint32_t btdm_lpcycles_2_hus(uint32_t cycles, uint32_t *error_corr); static uint32_t btdm_lpcycles_2_hus(uint32_t cycles, uint32_t *error_corr);
@@ -432,16 +432,16 @@ static inline void esp_bt_power_domain_off(void)
esp_wifi_bt_power_domain_off(); esp_wifi_bt_power_domain_off();
} }
static void interrupt_set_wrapper(int32_t cpu_no, int32_t intr_source, int32_t intr_num, int32_t intr_prio) static void interrupt_set_wrapper(int cpu_no, int intr_source, int intr_num, int intr_prio)
{ {
esp_rom_route_intr_matrix(cpu_no, intr_source, intr_num); esp_rom_route_intr_matrix(cpu_no, intr_source, intr_num);
} }
static void interrupt_clear_wrapper(int32_t intr_source, int32_t intr_num) static void interrupt_clear_wrapper(int intr_source, int intr_num)
{ {
} }
static void interrupt_handler_set_wrapper(int32_t n, void *fn, void *arg) static void interrupt_handler_set_wrapper(int n, void *fn, void *arg)
{ {
xt_set_interrupt_handler(n, (xt_handler)fn, arg); xt_set_interrupt_handler(n, (xt_handler)fn, arg);
} }