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

replace l2cap_unregister_interal with l2cap_unregister

Browse Source
This commit is contained in:
Matthias Ringwald 2015-11-13 21:34:43 +01:00
parent be2053a636
commit 02f83142d4
5 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
platform/daemon/src/daemon.c
View File

@ -478,7 +478,7 @@ static void daemon_l2cap_close_connection(client_state_t * daemon_client){
linked_list_iterator_init(&it, l2cap_psms);
while (linked_list_iterator_has_next(&it)){
linked_list_uint32_t * item = (linked_list_uint32_t*) linked_list_iterator_next(&it);
l2cap_unregister_service_internal(NULL, item->value);
l2cap_unregister_service(item->value);
linked_list_remove(l2cap_psms, (linked_item_t *) item);
free(item);
}
@ -840,7 +840,7 @@ static int btstack_command_handler(connection_t *connection, uint8_t *packet, ui
case L2CAP_UNREGISTER_SERVICE:
psm = READ_BT_16(packet, 3);
daemon_remove_client_l2cap_service(connection, psm);
l2cap_unregister_service_internal(connection, psm);
l2cap_unregister_service(psm);
break;
case L2CAP_ACCEPT_CONNECTION:
cid = READ_BT_16(packet, 3);

2
src/classic/bnep.c
View File

@ -1643,6 +1643,6 @@ void bnep_unregister_service(uint16_t service_uuid)
btstack_memory_bnep_service_free(service);
service = NULL;
l2cap_unregister_service_internal(NULL, PSM_BNEP);
l2cap_unregister_service(PSM_BNEP);
}

2
src/classic/rfcomm.c
View File

@ -2293,7 +2293,7 @@ void rfcomm_unregister_service_internal(uint8_t service_channel){
// unregister if no services active
if (linked_list_empty(&rfcomm_services)){
// bt_send_cmd(&l2cap_unregister_service, PSM_RFCOMM);
l2cap_unregister_service_internal(NULL, PSM_RFCOMM);
l2cap_unregister_service(PSM_RFCOMM);
}
}

2
src/l2cap.c
View File

@ -1560,7 +1560,7 @@ uint8_t l2cap_register_service(btstack_packet_handler_t service_packet_handler,
return 0;
}
void l2cap_unregister_service_internal(void *connection, uint16_t psm){
void l2cap_unregister_service(uint16_t psm){
log_info("L2CAP_UNREGISTER_SERVICE psm 0x%x", psm);

7
src/l2cap.h
View File

@ -295,13 +295,6 @@ int l2cap_send_connectionless(uint16_t handle, uint16_t cid, uint8_t *data, uin
/* API_END */
// deprecated...
/**
* @brief Unregisters L2CAP service with given PSM. On embedded systems, use NULL for connection parameter.
*/
void l2cap_unregister_service_internal(void * connection, uint16_t psm);
#if 0
// to be implemented soon