mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-24 22:43:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid returning structs

Browse Source
This commit is contained in:
Matthias Ringwald 2015-11-07 17:15:15 +01:00
parent e13fc2ba62
commit c133441bcb
4 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ble/l2cap_le.c
View File

@ -309,7 +309,8 @@ void l2cap_acl_handler( uint8_t *packet, uint16_t size ){
hci_connection_t * connection = hci_connection_for_handle(handle); hci_connection_t * connection = hci_connection_for_handle(handle);
if (connection){ if (connection){
int update_parameter = 1; int update_parameter = 1;
le_connection_parameter_range_t existing_range = gap_le_get_connection_parameter_range(); le_connection_parameter_range_t existing_range;
gap_le_get_connection_parameter_range(existing_range);
uint16_t le_conn_interval_min = READ_BT_16(packet,12); uint16_t le_conn_interval_min = READ_BT_16(packet,12);
uint16_t le_conn_interval_max = READ_BT_16(packet,14); uint16_t le_conn_interval_max = READ_BT_16(packet,14);
uint16_t le_conn_latency = READ_BT_16(packet,16); uint16_t le_conn_latency = READ_BT_16(packet,16);

11
src/hci.c
View File

@ -133,8 +133,8 @@ static hci_connection_t * create_connection_for_bd_addr_and_type(bd_addr_t addr,
* *
* @return le connection parameter range struct * @return le connection parameter range struct
*/ */
le_connection_parameter_range_t gap_le_get_connection_parameter_range(void){ void gap_le_get_connection_parameter_range(le_connection_parameter_range_t range){
return hci_stack->le_connection_parameter_range; range = hci_stack->le_connection_parameter_range;
} }
/** /**
@ -143,12 +143,7 @@ le_connection_parameter_range_t gap_le_get_connection_parameter_range(void){
*/ */
void gap_le_set_connection_parameter_range(le_connection_parameter_range_t range){ void gap_le_set_connection_parameter_range(le_connection_parameter_range_t range){
hci_stack->le_connection_parameter_range.le_conn_interval_min = range.le_conn_interval_min; hci_stack->le_connection_parameter_range = range;
hci_stack->le_connection_parameter_range.le_conn_interval_max = range.le_conn_interval_max;
hci_stack->le_connection_parameter_range.le_conn_interval_min = range.le_conn_latency_min;
hci_stack->le_connection_parameter_range.le_conn_interval_max = range.le_conn_latency_max;
hci_stack->le_connection_parameter_range.le_supervision_timeout_min = range.le_supervision_timeout_min;
hci_stack->le_connection_parameter_range.le_supervision_timeout_max = range.le_supervision_timeout_max;
} }
/** /**

2
src/hci.h
View File

@ -842,7 +842,7 @@ int hci_send_cmd_packet(uint8_t *packet, int size);
/* API_START */ /* API_START */
le_connection_parameter_range_t gap_le_get_connection_parameter_range(void); void gap_le_get_connection_parameter_range(le_connection_parameter_range_t range);
void gap_le_set_connection_parameter_range(le_connection_parameter_range_t range); void gap_le_set_connection_parameter_range(le_connection_parameter_range_t range);
/* LE Client Start */ /* LE Client Start */

3
src/l2cap.c
View File

@ -1434,7 +1434,8 @@ static void l2cap_acl_handler( uint8_t *packet, uint16_t size ){
break; break;
} }
int update_parameter = 1; int update_parameter = 1;
le_connection_parameter_range_t existing_range = gap_le_get_connection_parameter_range(); le_connection_parameter_range_t existing_range;
gap_le_get_connection_parameter_range(existing_range);
uint16_t le_conn_interval_min = READ_BT_16(packet,12); uint16_t le_conn_interval_min = READ_BT_16(packet,12);
uint16_t le_conn_interval_max = READ_BT_16(packet,14); uint16_t le_conn_interval_max = READ_BT_16(packet,14);
uint16_t le_conn_latency = READ_BT_16(packet,16); uint16_t le_conn_latency = READ_BT_16(packet,16);