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

remove dependency on socket_connection.h in l2cap

Browse Source
This commit is contained in:
matthias.ringwald 2010-07-19 17:50:59 +00:00
parent 3b1127e247
commit 36944dff77
3 changed files with 30 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/daemon.c
View File

@ -116,13 +116,6 @@ static int btstack_command_handler(connection_t *connection, uint8_t *packet, ui
case BTSTACK_SET_POWER_MODE: case BTSTACK_SET_POWER_MODE:
hci_power_control(packet[3]); hci_power_control(packet[3]);
break; break;
case BTSTACK_SET_ACL_CAPTURE_MODE:
if (packet[3]) {
l2cap_set_capture_connection(connection);
} else {
l2cap_set_capture_connection(NULL);
}
break;
case BTSTACK_GET_VERSION: case BTSTACK_GET_VERSION:
hci_emit_btstack_version(); hci_emit_btstack_version();
break; break;
@ -261,7 +254,7 @@ static void deamon_status_event_handler(uint8_t *packet, uint16_t size){
} }
} }
static void daemon_packet_handler(connection_t * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){ static void daemon_packet_handler(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
switch (packet_type) { switch (packet_type) {
case HCI_EVENT_PACKET: case HCI_EVENT_PACKET:
deamon_status_event_handler(packet, size); deamon_status_event_handler(packet, size);

70
src/l2cap.c
View File

@ -59,15 +59,14 @@
#define L2CAP_SIGNALING_COMMAND_LENGTH_OFFSET 2 #define L2CAP_SIGNALING_COMMAND_LENGTH_OFFSET 2
#define L2CAP_SIGNALING_COMMAND_DATA_OFFSET 4 #define L2CAP_SIGNALING_COMMAND_DATA_OFFSET 4
static void null_packet_handler(connection_t * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size); static void null_packet_handler(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size);
static void l2cap_packet_handler(uint8_t packet_type, uint8_t *packet, uint16_t size); static void l2cap_packet_handler(uint8_t packet_type, uint8_t *packet, uint16_t size);
static uint8_t * sig_buffer = NULL; static uint8_t * sig_buffer = NULL;
static linked_list_t l2cap_channels = NULL; static linked_list_t l2cap_channels = NULL;
static linked_list_t l2cap_services = NULL; static linked_list_t l2cap_services = NULL;
static uint8_t * acl_buffer = NULL; static uint8_t * acl_buffer = NULL;
static void (*packet_handler) (connection_t * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) = null_packet_handler; static void (*packet_handler) (void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size) = null_packet_handler;
static connection_t * capture_connection = NULL;
static uint8_t config_options[] = { 1, 2, 150, 0}; // mtu = 48 static uint8_t config_options[] = { 1, 2, 150, 0}; // mtu = 48
@ -84,9 +83,9 @@ void l2cap_init(){
/** Register L2CAP packet handlers */ /** Register L2CAP packet handlers */
static void null_packet_handler(connection_t * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){ static void null_packet_handler(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size){
} }
void l2cap_register_packet_handler(void (*handler)(connection_t * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size)){ void l2cap_register_packet_handler(void (*handler)(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size)){
packet_handler = handler; packet_handler = handler;
} }
@ -95,17 +94,7 @@ void l2cap_dispatch(l2cap_channel_t *channel, uint8_t type, uint8_t * data, uint
if (channel->packet_handler) { if (channel->packet_handler) {
(* (channel->packet_handler))(type, channel->local_cid, data, size); (* (channel->packet_handler))(type, channel->local_cid, data, size);
} else { } else {
switch (type){ (*packet_handler)(channel->connection, type, channel->local_cid, data, size);
case HCI_EVENT_PACKET:
(*packet_handler)(channel->connection, HCI_EVENT_PACKET, 0, data, size);
break;
case L2CAP_DATA_PACKET:
(*packet_handler)(channel->connection, L2CAP_DATA_PACKET, channel->local_cid, data, size);
break;
default:
// ??
break;
}
} }
} }
@ -194,7 +183,7 @@ void l2cap_send_internal(uint16_t local_cid, uint8_t *data, uint16_t len){
} }
// open outgoing L2CAP channel // open outgoing L2CAP channel
void l2cap_create_channel_internal(connection_t * connection, bd_addr_t address, uint16_t psm){ void l2cap_create_channel_internal(void * connection, bd_addr_t address, uint16_t psm){
// alloc structure // alloc structure
l2cap_channel_t * chan = malloc(sizeof(l2cap_channel_t)); l2cap_channel_t * chan = malloc(sizeof(l2cap_channel_t));
@ -268,7 +257,8 @@ void l2cap_event_handler( uint8_t *packet, uint16_t size ){
bd_addr_t address; bd_addr_t address;
hci_con_handle_t handle; hci_con_handle_t handle;
linked_item_t *it;
switch(packet[0]){ switch(packet[0]){
// handle connection complete events // handle connection complete events
@ -297,7 +287,6 @@ void l2cap_event_handler( uint8_t *packet, uint16_t size ){
case HCI_EVENT_DISCONNECTION_COMPLETE: case HCI_EVENT_DISCONNECTION_COMPLETE:
// send l2cap disconnect events for all channels on this handle // send l2cap disconnect events for all channels on this handle
handle = READ_BT_16(packet, 3); handle = READ_BT_16(packet, 3);
linked_item_t *it;
// only access next element to allows for removal // only access next element to allows for removal
for (it = (linked_item_t *) &l2cap_channels; it->next ; it = it->next){ for (it = (linked_item_t *) &l2cap_channels; it->next ; it = it->next){
l2cap_channel_t * channel = (l2cap_channel_t *) it->next; l2cap_channel_t * channel = (l2cap_channel_t *) it->next;
@ -311,21 +300,18 @@ void l2cap_event_handler( uint8_t *packet, uint16_t size ){
// HCI Connection Timeouts // HCI Connection Timeouts
case L2CAP_EVENT_TIMEOUT_CHECK: case L2CAP_EVENT_TIMEOUT_CHECK:
if (!capture_connection){ handle = READ_BT_16(packet, 2);
hci_con_handle_t handle = READ_BT_16(packet, 2); l2cap_channel_t * channel;
linked_item_t *it; int used = 0;
l2cap_channel_t * channel; for (it = (linked_item_t *) l2cap_channels; it ; it = it->next){
int used = 0; channel = (l2cap_channel_t *) it;
for (it = (linked_item_t *) l2cap_channels; it ; it = it->next){ if (channel->handle == handle) {
channel = (l2cap_channel_t *) it; used = 1;
if (channel->handle == handle) {
used = 1;
}
}
if (!used) {
hci_send_cmd(&hci_disconnect, handle, 0x13); // remote closed connection
} }
} }
if (!used) {
hci_send_cmd(&hci_disconnect, handle, 0x13); // remote closed connection
}
break; break;
default: default:
@ -636,13 +622,7 @@ void l2cap_signaling_handler_dispatch( hci_con_handle_t handle, uint8_t * comman
} }
void l2cap_acl_handler( uint8_t *packet, uint16_t size ){ void l2cap_acl_handler( uint8_t *packet, uint16_t size ){
// Capturing?
if (capture_connection) {
(*packet_handler)(capture_connection, HCI_ACL_DATA_PACKET, 0, packet, size);
return;
}
// Get Channel ID // Get Channel ID
uint16_t channel_id = READ_L2CAP_CHANNEL_ID(packet); uint16_t channel_id = READ_L2CAP_CHANNEL_ID(packet);
@ -707,7 +687,7 @@ l2cap_service_t * l2cap_get_service(uint16_t psm){
return NULL; return NULL;
} }
void l2cap_register_service_internal(connection_t *connection, btstack_packet_handler_t packet_handler, uint16_t psm, uint16_t mtu){ void l2cap_register_service_internal(void *connection, btstack_packet_handler_t packet_handler, uint16_t psm, uint16_t mtu){
// check for alread registered psm // TODO: emit error event // check for alread registered psm // TODO: emit error event
l2cap_service_t *service = l2cap_get_service(psm); l2cap_service_t *service = l2cap_get_service(psm);
if (service) return; if (service) return;
@ -726,7 +706,7 @@ void l2cap_register_service_internal(connection_t *connection, btstack_packet_ha
linked_list_add(&l2cap_services, (linked_item_t *) service); linked_list_add(&l2cap_services, (linked_item_t *) service);
} }
void l2cap_unregister_service_internal(connection_t *connection, uint16_t psm){ void l2cap_unregister_service_internal(void *connection, uint16_t psm){
l2cap_service_t *service = l2cap_get_service(psm); l2cap_service_t *service = l2cap_get_service(psm);
if (!service) return; if (!service) return;
linked_list_remove(&l2cap_services, (linked_item_t *) service); linked_list_remove(&l2cap_services, (linked_item_t *) service);
@ -734,7 +714,7 @@ void l2cap_unregister_service_internal(connection_t *connection, uint16_t psm){
} }
// //
void l2cap_close_connection(connection_t *connection){ void l2cap_close_connection(void *connection){
linked_item_t *it; linked_item_t *it;
// close open channels // close open channels
@ -760,10 +740,4 @@ void l2cap_close_connection(connection_t *connection){
} }
} }
} }
void l2cap_set_capture_connection(connection_t * connection){
capture_connection = connection;
}

17
src/l2cap.h
View File

@ -43,7 +43,6 @@
#include "l2cap_signaling.h" #include "l2cap_signaling.h"
#include <btstack/utils.h> #include <btstack/utils.h>
#include <btstack/btstack.h> #include <btstack/btstack.h>
#include "socket_connection.h"
#define L2CAP_SIG_ID_INVALID 0 #define L2CAP_SIG_ID_INVALID 0
@ -80,7 +79,7 @@ typedef struct {
// uint16_t flush_timeout_outgoing; // uint16_t flush_timeout_outgoing;
// client connection // client connection
connection_t * connection; void * connection;
// internal connection // internal connection
btstack_packet_handler_t packet_handler; btstack_packet_handler_t packet_handler;
@ -99,7 +98,7 @@ typedef struct {
uint16_t mtu; uint16_t mtu;
// client connection // client connection
connection_t *connection; void *connection;
// internal connection // internal connection
btstack_packet_handler_t packet_handler; btstack_packet_handler_t packet_handler;
@ -107,20 +106,18 @@ typedef struct {
} l2cap_service_t; } l2cap_service_t;
void l2cap_init(); void l2cap_init();
void l2cap_register_packet_handler(void (*handler)(connection_t * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size)); void l2cap_register_packet_handler(void (*handler)(void * connection, uint8_t packet_type, uint16_t channel, uint8_t *packet, uint16_t size));
void l2cap_create_channel_internal(connection_t * connection, bd_addr_t address, uint16_t psm); void l2cap_create_channel_internal(void * connection, bd_addr_t address, uint16_t psm);
void l2cap_disconnect_internal(uint16_t local_cid, uint8_t reason); void l2cap_disconnect_internal(uint16_t local_cid, uint8_t reason);
void l2cap_send_internal(uint16_t local_cid, uint8_t *data, uint16_t len); void l2cap_send_internal(uint16_t local_cid, uint8_t *data, uint16_t len);
uint16_t l2cap_get_remote_mtu_for_local_cid(uint16_t local_cid); uint16_t l2cap_get_remote_mtu_for_local_cid(uint16_t local_cid);
void l2cap_set_capture_connection(connection_t * connection);
void l2cap_finialize_channel_close(l2cap_channel_t *channel); void l2cap_finialize_channel_close(l2cap_channel_t *channel);
void l2cap_close_connection(connection_t *connection); void l2cap_close_connection(void *connection);
l2cap_service_t * l2cap_get_service(uint16_t psm); l2cap_service_t * l2cap_get_service(uint16_t psm);
void l2cap_register_service_internal(connection_t *connection, btstack_packet_handler_t packet_handler, uint16_t psm, uint16_t mtu); void l2cap_register_service_internal(void *connection, btstack_packet_handler_t packet_handler, uint16_t psm, uint16_t mtu);
void l2cap_unregister_service_internal(connection_t *connection, uint16_t psm); void l2cap_unregister_service_internal(void *connection, uint16_t psm);
void l2cap_accept_connection_internal(uint16_t local_cid); void l2cap_accept_connection_internal(uint16_t local_cid);
void l2cap_decline_connection_internal(uint16_t local_cid, uint8_t reason); void l2cap_decline_connection_internal(uint16_t local_cid, uint8_t reason);