diff options
| author | Kim Schulz <k.schulz@samsung.com> | 2015-03-25 10:39:40 +0100 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2015-04-10 16:49:17 -0700 |
| commit | 8372aa5fa535ee4f09c09981b6125b54ace31fe2 (patch) | |
| tree | 7dcba062c3e78e4475cd925706fc08201444118d /stack/gatt/gatt_main.c | |
| parent | fd422a772fb3d28d462a2b8020ff4a2bdc5e954a (diff) | |
| download | android_system_bt-8372aa5fa535ee4f09c09981b6125b54ace31fe2.tar.gz android_system_bt-8372aa5fa535ee4f09c09981b6125b54ace31fe2.tar.bz2 android_system_bt-8372aa5fa535ee4f09c09981b6125b54ace31fe2.zip | |
L2CAP and SDP Search API for BT profiles (2/2)
Added support for exposing L2CAP to Java such that OBEX over L2CAP
is made possible.
Added support to create SDP records as a seperate step.(as opposed to
creating a SDP record when a BluetoothSocket is created).
This allows both a RFCOMM channel and a L2CAP PSM to be included in a
SDP record. (Additionally the content of the SDP record is set by the
profile in Java, in stead of beeing hardcoded in the socket layer.)
This completes the L2CAP channel exposure to Java.
Change-Id: Iaf68a07d910145cdd33e940d73cd680f79164100
Diffstat (limited to 'stack/gatt/gatt_main.c')
| -rw-r--r-- | stack/gatt/gatt_main.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/stack/gatt/gatt_main.c b/stack/gatt/gatt_main.c index f0a0229ec..e1e9564f9 100644 --- a/stack/gatt/gatt_main.c +++ b/stack/gatt/gatt_main.c @@ -44,11 +44,13 @@ /********************************************************************************/ /* L O C A L F U N C T I O N P R O T O T Y P E S */ /********************************************************************************/ -static void gatt_le_connect_cback (BD_ADDR bd_addr, BOOLEAN connected, UINT16 reason, tBT_TRANSPORT transport); -static void gatt_le_data_ind (BD_ADDR bd_addr, BT_HDR *p_buf); +static void gatt_le_connect_cback (UINT16 chan, BD_ADDR bd_addr, BOOLEAN connected, + UINT16 reason, tBT_TRANSPORT transport); +static void gatt_le_data_ind (UINT16 chan, BD_ADDR bd_addr, BT_HDR *p_buf); static void gatt_le_cong_cback(BD_ADDR remote_bda, BOOLEAN congest); -static void gatt_l2cif_connect_ind_cback (BD_ADDR bd_addr, UINT16 l2cap_cid, UINT16 psm, UINT8 l2cap_id); +static void gatt_l2cif_connect_ind_cback (BD_ADDR bd_addr, UINT16 l2cap_cid, + UINT16 psm, UINT8 l2cap_id); static void gatt_l2cif_connect_cfm_cback (UINT16 l2cap_cid, UINT16 result); static void gatt_l2cif_config_ind_cback (UINT16 l2cap_cid, tL2CAP_CFG_INFO *p_cfg); static void gatt_l2cif_config_cfm_cback (UINT16 l2cap_cid, tL2CAP_CFG_INFO *p_cfg); @@ -399,7 +401,7 @@ BOOLEAN gatt_act_connect (tGATT_REG *p_reg, BD_ADDR bd_addr, tBT_TRANSPORT trans ** connected (conn = TRUE)/disconnected (conn = FALSE). ** *******************************************************************************/ -static void gatt_le_connect_cback (BD_ADDR bd_addr, BOOLEAN connected, +static void gatt_le_connect_cback (UINT16 chan, BD_ADDR bd_addr, BOOLEAN connected, UINT16 reason, tBT_TRANSPORT transport) { @@ -544,7 +546,7 @@ static void gatt_le_cong_cback(BD_ADDR remote_bda, BOOLEAN congested) ** Returns void ** *******************************************************************************/ -static void gatt_le_data_ind (BD_ADDR bd_addr, BT_HDR *p_buf) +static void gatt_le_data_ind (UINT16 chan, BD_ADDR bd_addr, BT_HDR *p_buf) { tGATT_TCB *p_tcb; |