mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-31 10:20:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

goep_client: move l2cap-related code into ENABLE_GOEP_L2CAP

Browse Source
This commit is contained in:
Matthias Ringwald 2018-09-04 16:14:50 +02:00
parent 8916d6f773
commit 645e6347ac
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/classic/goep_client.c
View File

@ -94,6 +94,7 @@ static const unsigned int attribute_value_buffer_size = sizeof(attribute_value);
static uint8_t goep_packet_buffer[100]; static uint8_t goep_packet_buffer[100];
#ifdef ENABLE_GOEP_L2CAP
static uint8_t ertm_buffer[1000]; static uint8_t ertm_buffer[1000];
static l2cap_ertm_config_t ertm_config = { static l2cap_ertm_config_t ertm_config = {
1, // ertm mandatory 1, // ertm mandatory
@ -104,6 +105,7 @@ static l2cap_ertm_config_t ertm_config = {
4, 4,
4, 4,
}; };
#endif
static inline void goep_client_emit_connected_event(goep_client_t * context, uint8_t status){ static inline void goep_client_emit_connected_event(goep_client_t * context, uint8_t status){
uint8_t event[15]; uint8_t event[15];
@ -174,6 +176,7 @@ static void goep_client_packet_handler(uint8_t packet_type, uint16_t channel, ui
switch (packet_type){ switch (packet_type){
case HCI_EVENT_PACKET: case HCI_EVENT_PACKET:
switch (hci_event_packet_get_type(packet)) { switch (hci_event_packet_get_type(packet)) {
#ifdef ENABLE_GOEP_L2CAP
case L2CAP_EVENT_CHANNEL_OPENED: case L2CAP_EVENT_CHANNEL_OPENED:
goep_client_handle_connection_opened(context, l2cap_event_channel_opened_get_status(packet), goep_client_handle_connection_opened(context, l2cap_event_channel_opened_get_status(packet),
btstack_min(l2cap_event_channel_opened_get_remote_mtu(packet), l2cap_event_channel_opened_get_local_mtu(packet))); btstack_min(l2cap_event_channel_opened_get_remote_mtu(packet), l2cap_event_channel_opened_get_local_mtu(packet)));
@ -184,6 +187,7 @@ static void goep_client_packet_handler(uint8_t packet_type, uint16_t channel, ui
case L2CAP_EVENT_CHANNEL_CLOSED: case L2CAP_EVENT_CHANNEL_CLOSED:
goep_client_handle_connection_close(context); goep_client_handle_connection_close(context);
break; break;
#endif
case RFCOMM_EVENT_CHANNEL_OPENED: case RFCOMM_EVENT_CHANNEL_OPENED:
goep_client_handle_connection_opened(context, rfcomm_event_channel_opened_get_status(packet), rfcomm_event_channel_opened_get_max_frame_size(packet)); goep_client_handle_connection_opened(context, rfcomm_event_channel_opened_get_status(packet), rfcomm_event_channel_opened_get_max_frame_size(packet));
return; return;
@ -225,7 +229,9 @@ static void goep_client_handle_sdp_query_event(uint8_t packet_type, uint16_t cha
switch(sdp_event_query_attribute_byte_get_attribute_id(packet)){ switch(sdp_event_query_attribute_byte_get_attribute_id(packet)){
case BLUETOOTH_ATTRIBUTE_PROTOCOL_DESCRIPTOR_LIST: case BLUETOOTH_ATTRIBUTE_PROTOCOL_DESCRIPTOR_LIST:
case BLUETOOTH_ATTRIBUTE_PBAP_SUPPORTED_FEATURES: case BLUETOOTH_ATTRIBUTE_PBAP_SUPPORTED_FEATURES:
#ifdef ENABLE_GOEP_L2CAP
case BLUETOOTH_ATTRIBUTE_GOEP_L2CAP_PSM: case BLUETOOTH_ATTRIBUTE_GOEP_L2CAP_PSM:
#endif
break; break;
default: default:
return; return;
@ -272,9 +278,11 @@ static void goep_client_handle_sdp_query_event(uint8_t packet_type, uint16_t cha
} }
} }
break; break;
#ifdef ENABLE_GOEP_L2CAP
case BLUETOOTH_ATTRIBUTE_GOEP_L2CAP_PSM: case BLUETOOTH_ATTRIBUTE_GOEP_L2CAP_PSM:
de_element_get_uint16(attribute_value, &context->l2cap_psm); de_element_get_uint16(attribute_value, &context->l2cap_psm);
break; break;
#endif
case BLUETOOTH_ATTRIBUTE_PBAP_SUPPORTED_FEATURES: case BLUETOOTH_ATTRIBUTE_PBAP_SUPPORTED_FEATURES:
if (de_get_element_type(attribute_value) != DE_UINT) break; if (de_get_element_type(attribute_value) != DE_UINT) break;
if (de_get_size_type(attribute_value) != DE_SIZE_32) break; if (de_get_size_type(attribute_value) != DE_SIZE_32) break;
@ -300,21 +308,21 @@ static void goep_client_handle_sdp_query_event(uint8_t packet_type, uint16_t cha
goep_client_emit_connected_event(goep_client, ERROR_CODE_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE); goep_client_emit_connected_event(goep_client, ERROR_CODE_UNSUPPORTED_FEATURE_OR_PARAMETER_VALUE);
break; break;
} }
#ifdef ENABLE_GOEP_L2CAP
if (context->l2cap_psm){ if (context->l2cap_psm){
log_info("Remote GOEP L2CAP PSM: %u", context->l2cap_psm); log_info("Remote GOEP L2CAP PSM: %u", context->l2cap_psm);
l2cap_create_ertm_channel(&goep_client_packet_handler, context->bd_addr, context->l2cap_psm, l2cap_create_ertm_channel(&goep_client_packet_handler, context->bd_addr, context->l2cap_psm,
&ertm_config, ertm_buffer, sizeof(ertm_buffer), &context->bearer_cid); &ertm_config, ertm_buffer, sizeof(ertm_buffer), &context->bearer_cid);
} else { return;
log_info("Remote GOEP RFCOMM Server Channel: %u", context->rfcomm_port);
rfcomm_create_channel(&goep_client_packet_handler, context->bd_addr, context->rfcomm_port, &context->bearer_cid);
} }
break; #endif
log_info("Remote GOEP RFCOMM Server Channel: %u", context->rfcomm_port);
rfcomm_create_channel(&goep_client_packet_handler, context->bd_addr, context->rfcomm_port, &context->bearer_cid);
} }
} }
static uint8_t * goep_client_get_outgoing_buffer(goep_client_t * context){ static uint8_t * goep_client_get_outgoing_buffer(goep_client_t * context){
if (context->l2cap_psm){ if (context->l2cap_psm){
// return l2cap_get_outgoing_buffer();
return goep_packet_buffer; return goep_packet_buffer;
} else { } else {
return rfcomm_get_outgoing_buffer(); return rfcomm_get_outgoing_buffer();
@ -334,7 +342,6 @@ static void goep_client_packet_init(uint16_t goep_cid, uint8_t opcode){
UNUSED(goep_cid); UNUSED(goep_cid);
goep_client_t * context = goep_client; goep_client_t * context = goep_client;
if (context->l2cap_psm){ if (context->l2cap_psm){
// l2cap_reserve_packet_buffer();
} else { } else {
rfcomm_reserve_packet_buffer(); rfcomm_reserve_packet_buffer();
} }