alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

components/bt: Combine two hci task into one

Browse Source
This commit is contained in:
baohongde 2018-10-10 16:10:20 +08:00
parent 5fd4cbb9d2
commit 930c304a57
3 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/bt/bluedroid/hci/hci_hal_h4.c
View File

@ -27,12 +27,6 @@
#include "esp_bt.h" #include "esp_bt.h"
#include "stack/hcimsgs.h" #include "stack/hcimsgs.h"
#define HCI_H4_TASK_PINNED_TO_CORE (TASK_PINNED_TO_CORE)
#define HCI_H4_TASK_STACK_SIZE (2048 + BT_TASK_EXTRA_STACK_SIZE)
#define HCI_H4_TASK_PRIO (BT_TASK_MAX_PRIORITIES - 4)
#define HCI_H4_TASK_NAME "hciH4T"
#if (C2H_FLOW_CONTROL_INCLUDED == TRUE) #if (C2H_FLOW_CONTROL_INCLUDED == TRUE)
#include "l2c_int.h" #include "l2c_int.h"
#endif ///C2H_FLOW_CONTROL_INCLUDED == TRUE #endif ///C2H_FLOW_CONTROL_INCLUDED == TRUE
@ -105,9 +99,11 @@ static void hci_hal_env_deinit(void)
hci_hal_env.rx_q = NULL; hci_hal_env.rx_q = NULL;
} }
static bool hal_open(const hci_hal_callbacks_t *upper_callbacks) static bool hal_open(const hci_hal_callbacks_t *upper_callbacks, void *task_thread)
{ {
assert(upper_callbacks != NULL); assert(upper_callbacks != NULL);
assert(task_thread != NULL);
callbacks = upper_callbacks; callbacks = upper_callbacks;
#if (BLE_ADV_REPORT_FLOW_CONTROL == TRUE) #if (BLE_ADV_REPORT_FLOW_CONTROL == TRUE)
hci_hal_env_init(HCI_HAL_SERIAL_BUFFER_SIZE, BLE_ADV_REPORT_FLOW_CONTROL_NUM + L2CAP_HOST_FC_ACL_BUFS + QUEUE_SIZE_MAX); // adv flow control num + ACL flow control num + hci cmd numeber hci_hal_env_init(HCI_HAL_SERIAL_BUFFER_SIZE, BLE_ADV_REPORT_FLOW_CONTROL_NUM + L2CAP_HOST_FC_ACL_BUFS + QUEUE_SIZE_MAX); // adv flow control num + ACL flow control num + hci cmd numeber
@ -115,10 +111,7 @@ static bool hal_open(const hci_hal_callbacks_t *upper_callbacks)
hci_hal_env_init(HCI_HAL_SERIAL_BUFFER_SIZE, QUEUE_SIZE_MAX); hci_hal_env_init(HCI_HAL_SERIAL_BUFFER_SIZE, QUEUE_SIZE_MAX);
#endif #endif
hci_h4_thread = osi_thread_create(HCI_H4_TASK_NAME, HCI_H4_TASK_STACK_SIZE, HCI_H4_TASK_PRIO, HCI_H4_TASK_PINNED_TO_CORE, 1); hci_h4_thread = (osi_thread_t *)task_thread;
if (hci_h4_thread == NULL) {
return false;
}
//register vhci host cb //register vhci host cb
if (esp_vhci_host_register_callback(&vhci_host_cb) != ESP_OK) { if (esp_vhci_host_register_callback(&vhci_host_cb) != ESP_OK) {
@ -132,7 +125,6 @@ static void hal_close()
{ {
hci_hal_env_deinit(); hci_hal_env_deinit();
osi_thread_free(hci_h4_thread);
hci_h4_thread = NULL; hci_h4_thread = NULL;
} }
@ -180,7 +172,7 @@ static void hci_hal_h4_rx_handler(void *arg)
bool hci_hal_h4_task_post(osi_thread_blocking_t blocking) bool hci_hal_h4_task_post(osi_thread_blocking_t blocking)
{ {
return osi_thread_post(hci_h4_thread, hci_hal_h4_rx_handler, NULL, 0, blocking); return osi_thread_post(hci_h4_thread, hci_hal_h4_rx_handler, NULL, 1, blocking);
} }
#if (C2H_FLOW_CONTROL_INCLUDED == TRUE) #if (C2H_FLOW_CONTROL_INCLUDED == TRUE)

6
components/bt/bluedroid/hci/hci_layer.c
View File

@ -37,7 +37,7 @@
#define HCI_HOST_TASK_PINNED_TO_CORE (TASK_PINNED_TO_CORE) #define HCI_HOST_TASK_PINNED_TO_CORE (TASK_PINNED_TO_CORE)
#define HCI_HOST_TASK_STACK_SIZE (2048 + BT_TASK_EXTRA_STACK_SIZE) #define HCI_HOST_TASK_STACK_SIZE (2048 + BT_TASK_EXTRA_STACK_SIZE)
#define HCI_HOST_TASK_PRIO (BT_TASK_MAX_PRIORITIES - 3) #define HCI_HOST_TASK_PRIO (BT_TASK_MAX_PRIORITIES - 3)
#define HCI_HOST_TASK_NAME "hciHostT" #define HCI_HOST_TASK_NAME "hciT"
typedef struct { typedef struct {
uint16_t opcode; uint16_t opcode;
@ -105,13 +105,13 @@ int hci_start_up(void)
goto error; goto error;
} }
hci_host_thread = osi_thread_create(HCI_HOST_TASK_NAME, HCI_HOST_TASK_STACK_SIZE, HCI_HOST_TASK_PRIO, HCI_HOST_TASK_PINNED_TO_CORE, 1); hci_host_thread = osi_thread_create(HCI_HOST_TASK_NAME, HCI_HOST_TASK_STACK_SIZE, HCI_HOST_TASK_PRIO, HCI_HOST_TASK_PINNED_TO_CORE, 2);
if (hci_host_thread == NULL) { if (hci_host_thread == NULL) {
return -2; return -2;
} }
packet_fragmenter->init(&packet_fragmenter_callbacks); packet_fragmenter->init(&packet_fragmenter_callbacks);
hal->open(&hal_callbacks); hal->open(&hal_callbacks, hci_host_thread);
hci_host_startup_flag = true; hci_host_startup_flag = true;
return 0; return 0;

2
components/bt/bluedroid/hci/include/hci/hci_hal.h
View File

@ -51,7 +51,7 @@ typedef struct hci_hal_t {
//bool (*init)(const hci_hal_callbacks_t *upper_callbacks); //bool (*init)(const hci_hal_callbacks_t *upper_callbacks);
// Connect to the underlying hardware, and let data start flowing. // Connect to the underlying hardware, and let data start flowing.
bool (*open)(const hci_hal_callbacks_t *upper_callbacks); bool (*open)(const hci_hal_callbacks_t *upper_callbacks, void *task_thread);
// Disconnect from the underlying hardware, and close the HAL. // Disconnect from the underlying hardware, and close the HAL.
// "Daisy, Daisy..." // "Daisy, Daisy..."
void (*close)(void); void (*close)(void);