mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-02-16 06:39:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

hci: fix compile without ENABLE_CENTRAL

Browse Source
This commit is contained in:
Matthias Ringwald 2023-05-18 17:13:30 +02:00
parent b962f81088
commit 0c2c5f7996
3 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gap.h
View File

@ -892,7 +892,7 @@ uint8_t gap_cis_accept(hci_con_handle_t cis_con_handle);
uint8_t gap_cis_reject(hci_con_handle_t cis_con_handle); uint8_t gap_cis_reject(hci_con_handle_t cis_con_handle);
/** /**
* @brief Set connection parameters for outgoing connections * @brief Set connection parameters for outgoing connections and connection parameter updates
* @param conn_scan_interval (unit: 0.625 msec), default: 60 ms * @param conn_scan_interval (unit: 0.625 msec), default: 60 ms
* @param conn_scan_window (unit: 0.625 msec), default: 30 ms * @param conn_scan_window (unit: 0.625 msec), default: 30 ms
* @param conn_interval_min (unit: 1.25ms), default: 10 ms * @param conn_interval_min (unit: 1.25ms), default: 10 ms

26
src/hci.c
View File

@ -4654,8 +4654,7 @@ void hci_init(const hci_transport_t *transport, const void *config){
// voice setting - signed 16 bit pcm data with CVSD over the air // voice setting - signed 16 bit pcm data with CVSD over the air
hci_stack->sco_voice_setting = 0x60; hci_stack->sco_voice_setting = 0x60;
#ifdef ENABLE_LE_CENTRAL #ifdef ENABLE_BLE
// connection parameter to use for outgoing connections
hci_stack->le_connection_scan_interval = 0x0060; // 60 ms hci_stack->le_connection_scan_interval = 0x0060; // 60 ms
hci_stack->le_connection_scan_window = 0x0030; // 30 ms hci_stack->le_connection_scan_window = 0x0030; // 30 ms
hci_stack->le_connection_interval_min = 0x0008; // 10 ms hci_stack->le_connection_interval_min = 0x0008; // 10 ms
@ -4664,6 +4663,9 @@ void hci_init(const hci_transport_t *transport, const void *config){
hci_stack->le_supervision_timeout = 0x0048; // 720 ms hci_stack->le_supervision_timeout = 0x0048; // 720 ms
hci_stack->le_minimum_ce_length = 0; // 0 ms hci_stack->le_minimum_ce_length = 0; // 0 ms
hci_stack->le_maximum_ce_length = 0; // 0 ms hci_stack->le_maximum_ce_length = 0; // 0 ms
#endif
#ifdef ENABLE_LE_CENTRAL
hci_stack->le_connection_phys = 0x01; // LE 1M PHY hci_stack->le_connection_phys = 0x01; // LE 1M PHY
// default LE Scanning // default LE Scanning
@ -8152,9 +8154,16 @@ uint8_t gap_connect_cancel(void){
* @param max_ce_length (unit: 0.625ms), default: 30 ms * @param max_ce_length (unit: 0.625ms), default: 30 ms
*/ */
void gap_set_connection_parameters(uint16_t conn_scan_interval, uint16_t conn_scan_window, void gap_set_connection_phys(uint8_t phys){
uint16_t conn_interval_min, uint16_t conn_interval_max, uint16_t conn_latency, // LE Coded, LE 1M, LE 2M PHY
uint16_t supervision_timeout, uint16_t min_ce_length, uint16_t max_ce_length){ hci_stack->le_connection_phys = phys & 7;
}
#endif
void gap_set_connection_parameters(uint16_t conn_scan_interval, uint16_t conn_scan_window,
uint16_t conn_interval_min, uint16_t conn_interval_max, uint16_t conn_latency,
uint16_t supervision_timeout, uint16_t min_ce_length, uint16_t max_ce_length){
hci_stack->le_connection_scan_interval = conn_scan_interval; hci_stack->le_connection_scan_interval = conn_scan_interval;
hci_stack->le_connection_scan_window = conn_scan_window; hci_stack->le_connection_scan_window = conn_scan_window;
hci_stack->le_connection_interval_min = conn_interval_min; hci_stack->le_connection_interval_min = conn_interval_min;
@ -8165,13 +8174,6 @@ void gap_set_connection_parameters(uint16_t conn_scan_interval, uint16_t conn_sc
hci_stack->le_maximum_ce_length = max_ce_length; hci_stack->le_maximum_ce_length = max_ce_length;
} }
void gap_set_connection_phys(uint8_t phys){
// LE Coded, LE 1M, LE 2M PHY
hci_stack->le_connection_phys = phys & 7;
}
#endif
/** /**
* @brief Updates the connection parameters for a given LE connection * @brief Updates the connection parameters for a given LE connection
* @param handle * @param handle

19
src/hci.h
View File

@ -1158,6 +1158,16 @@ typedef struct {
// LE Whitelist Management // LE Whitelist Management
uint8_t le_whitelist_capacity; uint8_t le_whitelist_capacity;
btstack_linked_list_t le_whitelist; btstack_linked_list_t le_whitelist;
// Connection parameters
uint16_t le_connection_scan_interval;
uint16_t le_connection_scan_window;
uint16_t le_connection_interval_min;
uint16_t le_connection_interval_max;
uint16_t le_connection_latency;
uint16_t le_supervision_timeout;
uint16_t le_minimum_ce_length;
uint16_t le_maximum_ce_length;
#endif #endif
#ifdef ENABLE_LE_CENTRAL #ifdef ENABLE_LE_CENTRAL
@ -1175,15 +1185,6 @@ typedef struct {
uint16_t le_scan_interval; uint16_t le_scan_interval;
uint16_t le_scan_window; uint16_t le_scan_window;
// Connection parameters
uint16_t le_connection_interval_min;
uint16_t le_connection_interval_max;
uint16_t le_connection_latency;
uint16_t le_supervision_timeout;
uint16_t le_minimum_ce_length;
uint16_t le_maximum_ce_length;
uint16_t le_connection_scan_interval;
uint16_t le_connection_scan_window;
uint8_t le_connection_own_addr_type; uint8_t le_connection_own_addr_type;
uint8_t le_connection_phys; uint8_t le_connection_phys;
bd_addr_t le_connection_own_address; bd_addr_t le_connection_own_address;