Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2337fea authored by Kim Schulz's avatar Kim Schulz Committed by Andre Eisenbach
Browse files

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
parent 3bf2745d

system/bta/Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -70,17 +70,17 @@ LOCAL_SRC_FILES:= \ 
    ./hl/bta_hl_utils.c \

    ./hl/bta_hl_sdp.c \

    ./hl/bta_hl_ci.c \

    ./mce/bta_mce_api.c \

    ./mce/bta_mce_main.c \

    ./mce/bta_mce_act.c \

    ./mce/bta_mce_cfg.c \

    ./sdp/bta_sdp_api.c \

    ./sdp/bta_sdp_act.c \

    ./sdp/bta_sdp.c \

    ./sdp/bta_sdp_cfg.c \

    ./sys/bta_sys_main.c \

    ./sys/bta_sys_conn.c \

    ./sys/utl.c \

    ./jv/bta_jv_act.c \

    ./jv/bta_jv_cfg.c \

    ./jv/bta_jv_main.c \

    ./jv/bta_jv_api.c \

    ./jv/bta_jv_api.c



LOCAL_MODULE := libbt-brcm_bta

LOCAL_MODULE_CLASS := STATIC_LIBRARIES

system/bta/dm/bta_dm_pm.c

+3 −2
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ void bta_dm_disable_pm(void) 
static void bta_dm_pm_stop_timer(BD_ADDR peer_addr)

{

    UINT8 i;

    APPL_TRACE_DEBUG("%s: ", __func__);



    for(i=0; i<BTA_DM_NUM_PM_TIMER; i++)

    {

system/bta/include/bta_api.h

+12 −12
Original line number Diff line number Diff line
@@ -85,19 +85,19 @@ typedef UINT8 tBTA_STATUS; 
#define BTA_MN_SERVICE_ID       26          /* Message Notification Service */

#define BTA_HDP_SERVICE_ID      27          /* Health Device Profile */

#define BTA_PCE_SERVICE_ID      28          /* PhoneBook Access Client*/



#define BTA_SDP_SERVICE_ID      29          /* SDP Search*/

#if BLE_INCLUDED == TRUE && BTA_GATT_INCLUDED == TRUE

/* BLE profile service ID */

#define BTA_BLE_SERVICE_ID      29          /* GATT profile */

#define BTA_BLE_SERVICE_ID      30          /* GATT profile */



// btla-specific ++

#define BTA_USER_SERVICE_ID     30          /* User requested UUID */

#define BTA_USER_SERVICE_ID     31          /* User requested UUID */



#define BTA_MAX_SERVICE_ID      31

#define BTA_MAX_SERVICE_ID      32

// btla-specific --

#else

#define BTA_USER_SERVICE_ID     29          /* User requested UUID */

#define BTA_MAX_SERVICE_ID      30

#define BTA_USER_SERVICE_ID     30          /* User requested UUID */

#define BTA_MAX_SERVICE_ID      31

#endif

/* service IDs (BTM_SEC_SERVICE_FIRST_EMPTY + 1) to (BTM_SEC_MAX_SERVICES - 1)

 * are used by BTA JV */

system/bta/include/bta_jv_api.h

+398 −12

File changed.

Preview size limit exceeded, changes collapsed.

system/bta/include/bta_jv_co.h

+4 −0
Original line number Diff line number Diff line
@@ -46,4 +46,8 @@ extern int bta_co_rfc_data_incoming(void *user_data, BT_HDR *p_buf); 
extern int bta_co_rfc_data_outgoing_size(void *user_data, int *size);

extern int bta_co_rfc_data_outgoing(void *user_data, UINT8* buf, UINT16 size);



extern int bta_co_l2cap_data_incoming(void *user_data, BT_HDR *p_buf);

extern int bta_co_l2cap_data_outgoing_size(void *user_data, int *size);

extern int bta_co_l2cap_data_outgoing(void *user_data, UINT8* buf, UINT16 size);



#endif /* BTA_DG_CO_H */