Check in for - new rfc multi accept code

Change-Id: I66794a8821481c58e045bb8acd8b7b758900d3e9

9 files changed, 513 insertions, 204 deletions

diff --git a/stack/include/port_api.h b/stack/include/port_api.h
index 26e0299..b7a7417 100644
--- a/stack/include/port_api.h
+++ b/stack/include/port_api.h
@@ -17,11 +17,11 @@
 **  Constants and Types
 *****************************************************************************/
 
-/* 
-** Define port settings structure send from the application in the 
+/*
+** Define port settings structure send from the application in the
 ** set settings request, or to the application in the set settings indication.
 */
-typedef struct 
+typedef struct
 {
 
 #define PORT_BAUD_RATE_2400       0x00
@@ -79,11 +79,17 @@ typedef struct
 } tPORT_STATE;
 
 
-/* 
+/*
 ** Define the callback function prototypes.  Parameters are specific
-** to each event and are described bellow 
+** to each event and are described bellow
 */
 typedef int  (tPORT_DATA_CALLBACK) (UINT16 port_handle, void *p_data, UINT16 len);
+
+#define DATA_CO_CALLBACK_TYPE_INCOMING          1
+#define DATA_CO_CALLBACK_TYPE_OUTGOING_SIZE     2
+#define DATA_CO_CALLBACK_TYPE_OUTGOING          3
+typedef int  (tPORT_DATA_CO_CALLBACK) (UINT16 port_handle, UINT8* p_buf, UINT16 len, int type);
+
 typedef void (tPORT_CALLBACK) (UINT32 code, UINT16 port_handle);
 
 /*
@@ -112,7 +118,7 @@ typedef void (tPORT_CALLBACK) (UINT32 code, UINT16 port_handle);
 #define PORT_EV_FCS     0x00020000   /* data flow enable status true = enabled */
 
 /*
-** To register for events application should provide bitmask with 
+** To register for events application should provide bitmask with
 ** corresponding bit set
 */
 
@@ -125,7 +131,7 @@ typedef void (tPORT_CALLBACK) (UINT32 code, UINT16 port_handle);
 
 
 /*
-** Define port result codes 
+** Define port result codes
 */
 #define PORT_SUCCESS                0
 
@@ -169,18 +175,18 @@ extern "C"
 **
 ** Function         RFCOMM_CreateConnection
 **
-** Description      RFCOMM_CreateConnection function is used from the application 
-**                  to establish serial port connection to the peer device, 
-**                  or allow RFCOMM to accept a connection from the peer 
-**                  application.  
+** Description      RFCOMM_CreateConnection function is used from the application
+**                  to establish serial port connection to the peer device,
+**                  or allow RFCOMM to accept a connection from the peer
+**                  application.
 **
-** Parameters:      scn          - Service Channel Number as registered with 
-**                                 the SDP (server) or obtained using SDP from 
+** Parameters:      scn          - Service Channel Number as registered with
+**                                 the SDP (server) or obtained using SDP from
 **                                 the peer device (client).
 **                  is_server    - TRUE if requesting application is a server
 **                  mtu          - Maximum frame size the application can accept
 **                  bd_addr      - BD_ADDR of the peer (client)
-**                  mask         - specifies events to be enabled.  A value 
+**                  mask         - specifies events to be enabled.  A value
 **                                 of zero disables all events.
 **                  p_handle     - OUT pointer to the handle.
 **                  p_mgmt_cb    - pointer to callback function to receive
@@ -220,7 +226,7 @@ RFC_API extern int RFCOMM_RemoveConnection (UINT16 handle);
 **
 ** Description      This function is called to close the server port.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **
 *******************************************************************************/
 RFC_API extern int RFCOMM_RemoveServer (UINT16 handle);
@@ -233,8 +239,8 @@ RFC_API extern int RFCOMM_RemoveServer (UINT16 handle);
 ** Description      Set event callback the specified connection.
 **
 ** Parameters:      handle       - Handle of the port returned in the Open
-**                  p_callback   - address of the callback function which should 
-**                                 be called from the RFCOMM when an event 
+**                  p_callback   - address of the callback function which should
+**                                 be called from the RFCOMM when an event
 **                                 specified in the mask occurs.
 **
 *******************************************************************************/
@@ -249,15 +255,15 @@ RFC_API extern int PORT_SetEventCallback (UINT16 port_handle,
 ** Description      Set event data callback the specified connection.
 **
 ** Parameters:      handle       - Handle of the port returned in the Open
-**                  p_callback   - address of the callback function which should 
-**                                 be called from the RFCOMM when a data 
+**                  p_callback   - address of the callback function which should
+**                                 be called from the RFCOMM when a data
 **                                 packet is received.
 **
 *******************************************************************************/
 RFC_API extern int PORT_SetDataCallback (UINT16 port_handle,
                                          tPORT_DATA_CALLBACK *p_cb);
 
-
+RFC_API extern int PORT_SetDataCOCallback (UINT16 port_handle, tPORT_DATA_CO_CALLBACK *p_port_cb);
 /*******************************************************************************
 **
 ** Function         PORT_SetEventMask
@@ -265,7 +271,7 @@ RFC_API extern int PORT_SetDataCallback (UINT16 port_handle,
 ** Description      This function is called to close the specified connection.
 **
 ** Parameters:      handle - Handle of the port returned in the Open
-**                  mask   - specifies events to be enabled.  A value 
+**                  mask   - specifies events to be enabled.  A value
 **                           of zero disables all events.
 **
 *******************************************************************************/
@@ -304,11 +310,11 @@ RFC_API extern BOOLEAN PORT_IsOpening (BD_ADDR bd_addr);
 **
 ** Function         PORT_SetState
 **
-** Description      This function configures connection according to the 
+** Description      This function configures connection according to the
 **                  specifications in the tPORT_STATE structure.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
-**                  p_settings - Pointer to a tPORT_STATE structure containing 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  p_settings - Pointer to a tPORT_STATE structure containing
 **                               configuration information for the connection.
 **
 *******************************************************************************/
@@ -320,7 +326,7 @@ RFC_API extern int PORT_SetState (UINT16 handle, tPORT_STATE *p_settings);
 **
 ** Description      This function return number of buffers on the rx queue.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  p_rx_queue_count - Pointer to return queue count in.
 **
 *******************************************************************************/
@@ -333,7 +339,7 @@ RFC_API extern int PORT_GetRxQueueCnt (UINT16 handle, UINT16 *p_rx_queue_count);
 ** Description      This function is called to fill tPORT_STATE structure
 **                  with the current control settings for the port
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  p_settings - Pointer to a tPORT_STATE structure in which
 **                               configuration information is returned.
 **
@@ -345,10 +351,10 @@ RFC_API extern int PORT_GetState (UINT16 handle, tPORT_STATE *p_settings);
 **
 ** Function         PORT_Control
 **
-** Description      This function directs a specified connection to pass control 
+** Description      This function directs a specified connection to pass control
 **                  control information to the peer device.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  signal     - specify the function to be passed
 **
 *******************************************************************************/
@@ -369,11 +375,11 @@ RFC_API extern int PORT_Control (UINT16 handle, UINT8 signal);
 **
 ** Function         PORT_FlowControl
 **
-** Description      This function directs a specified connection to pass 
-**                  flow control message to the peer device.  Enable flag passed 
+** Description      This function directs a specified connection to pass
+**                  flow control message to the peer device.  Enable flag passed
 **                  shows if port can accept more data.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  enable     - enables data flow
 **
 *******************************************************************************/
@@ -384,12 +390,12 @@ RFC_API extern int PORT_FlowControl (UINT16 handle, BOOLEAN enable);
 **
 ** Function         PORT_GetModemStatus
 **
-** Description      This function retrieves modem control signals.  Normally 
-**                  application will call this function after a callback 
-**                  function is called with notification that one of signals 
+** Description      This function retrieves modem control signals.  Normally
+**                  application will call this function after a callback
+**                  function is called with notification that one of signals
 **                  has been changed.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                               callback.
 **                  p_signal   - specify the pointer to control signals info
 **
@@ -415,14 +421,14 @@ RFC_API extern int PORT_GetModemStatus (UINT16 handle, UINT8 *p_control_signal);
 ** Function         PORT_ClearError
 **
 ** Description      This function retreives information about a communications
-**                  error and reports current status of a connection.  The 
+**                  error and reports current status of a connection.  The
 **                  function should be called when an error occures to clear
 **                  the connection error flag and to enable additional read
 **                  and write operations.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  p_errors   - pointer of the variable to receive error codes
-**                  p_status   - pointer to the tPORT_STATUS structur to receive 
+**                  p_status   - pointer to the tPORT_STATUS structur to receive
 **                               connection status
 **
 *******************************************************************************/
@@ -456,7 +462,7 @@ RFC_API extern int PORT_ClearError (UINT16 handle, UINT16 *p_errors,
 **
 ** Description      This function send a communications error to the peer device
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  errors     - receive error codes
 **
 *******************************************************************************/
@@ -467,10 +473,10 @@ RFC_API extern int PORT_SendError (UINT16 handle, UINT8 errors);
 **
 ** Function         PORT_GetQueueStatus
 **
-** Description      This function reports current status of a connection.  
+** Description      This function reports current status of a connection.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
-**                  p_status   - pointer to the tPORT_STATUS structur to receive 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  p_status   - pointer to the tPORT_STATUS structur to receive
 **                               connection status
 **
 *******************************************************************************/
@@ -481,11 +487,11 @@ RFC_API extern int PORT_GetQueueStatus (UINT16 handle, tPORT_STATUS *p_status);
 **
 ** Function         PORT_Purge
 **
-** Description      This function discards all the data from the output or 
+** Description      This function discards all the data from the output or
 **                  input queues of the specified connection.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
-**                  purge_flags - specify the action to take.  
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  purge_flags - specify the action to take.
 **
 *******************************************************************************/
 #define PORT_PURGE_TXCLEAR  0x01
@@ -498,15 +504,15 @@ RFC_API extern int PORT_Purge (UINT16 handle, UINT8 purge_flags);
 **
 ** Function         PORT_Read
 **
-** Description      This function returns the pointer to the buffer received 
-**                  from the peer device.  Normally application will call this 
-**                  function after receiving PORT_EVT_RXCHAR event. 
+** Description      This function returns the pointer to the buffer received
+**                  from the peer device.  Normally application will call this
+**                  function after receiving PORT_EVT_RXCHAR event.
 **                  Application calling this function is responsible to free
 **                  buffer returned.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                                callback.
-**                  pp_buf      - pointer to address of buffer with data, 
+**                  pp_buf      - pointer to address of buffer with data,
 **
 *******************************************************************************/
 RFC_API extern int PORT_Read (UINT16 handle, BT_HDR **pp_buf);
@@ -519,7 +525,7 @@ RFC_API extern int PORT_Read (UINT16 handle, BT_HDR **pp_buf);
 ** Description      Normally application will call this function after receiving
 **                  PORT_EVT_RXCHAR event.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                                callback.
 **                  p_data      - Data area
 **                  max_len     - Byte count requested
@@ -537,8 +543,8 @@ RFC_API extern int PORT_ReadData (UINT16 handle, char *p_data, UINT16 max_len,
 ** Description      This function to send BT buffer to the peer device.
 **                  Application should not free the buffer.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
-**                  p_buf       - pointer to the buffer with data, 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  p_buf       - pointer to the buffer with data,
 **
 *******************************************************************************/
 RFC_API extern int PORT_Write (UINT16 handle, BT_HDR *p_buf);
@@ -548,10 +554,10 @@ RFC_API extern int PORT_Write (UINT16 handle, BT_HDR *p_buf);
 **
 ** Function         PORT_WriteData
 **
-** Description      This function is called from the legacy application to 
-**                  send data.  
+** Description      This function is called from the legacy application to
+**                  send data.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  p_data      - Data area
 **                  max_len     - Byte count to write
 **                  p_len       - Bytes written
@@ -560,6 +566,17 @@ RFC_API extern int PORT_Write (UINT16 handle, BT_HDR *p_buf);
 RFC_API extern int PORT_WriteData (UINT16 handle, char *p_data, UINT16 max_len,
                                    UINT16 *p_len);
 
+/*******************************************************************************
+**
+** Function         PORT_WriteDataCO
+**
+** Description      Normally not GKI aware application will call this function
+**                  to send data to the port by callout functions.
+**
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**
+*******************************************************************************/
+RFC_API extern int PORT_WriteDataCO (UINT16 handle, int* p_len);
 
 /*******************************************************************************
 **
diff --git a/stack/include/sdp_api.h b/stack/include/sdp_api.h
index 00de801..e4774c3 100644
--- a/stack/include/sdp_api.h
+++ b/stack/include/sdp_api.h
@@ -68,6 +68,7 @@
 
 /* Define a callback function for when discovery is complete. */
 typedef void (tSDP_DISC_CMPL_CB) (UINT16 result);
+typedef void (tSDP_DISC_CMPL_CB2) (UINT16 result, void* user_data);
 
 typedef struct
 {
@@ -138,14 +139,14 @@ typedef struct
 }tSDP_DISCOVERY_DB;
 
 /* This structure is used to add protocol lists and find protocol elements */
-typedef struct 
+typedef struct
 {
     UINT16      protocol_uuid;
     UINT16      num_params;
     UINT16      params[SDP_MAX_PROTOCOL_PARAMS];
 } tSDP_PROTOCOL_ELEM;
 
-typedef struct 
+typedef struct
 {
     UINT16              num_elems;
     tSDP_PROTOCOL_ELEM  list_elem[SDP_MAX_LIST_ELEMS];
@@ -160,7 +161,7 @@ typedef struct t_sdp_di_record
     UINT16       vendor_id_source;
     UINT16       product;
     UINT16       version;
-    BOOLEAN      primary_record;  
+    BOOLEAN      primary_record;
     char         client_executable_url[SDP_MAX_ATTR_LEN];   /* optional */
     char         service_description[SDP_MAX_ATTR_LEN];     /* optional */
     char         documentation_url[SDP_MAX_ATTR_LEN];       /* optional */
@@ -203,9 +204,9 @@ SDP_API extern BOOLEAN SDP_InitDiscoveryDb (tSDP_DISCOVERY_DB *p_db, UINT32 len,
 **
 ** Function         SDP_CancelServiceSearch
 **
-** Description      This function cancels an active query to an SDP server. 
+** Description      This function cancels an active query to an SDP server.
 **
-** Returns          TRUE if discovery cancelled, FALSE if a matching activity is not found. 
+** Returns          TRUE if discovery cancelled, FALSE if a matching activity is not found.
 **
 *******************************************************************************/
 SDP_API extern BOOLEAN SDP_CancelServiceSearch (tSDP_DISCOVERY_DB *p_db);
@@ -214,9 +215,9 @@ SDP_API extern BOOLEAN SDP_CancelServiceSearch (tSDP_DISCOVERY_DB *p_db);
 **
 ** Function         SDP_ServiceSearchRequest
 **
-** Description      This function queries an SDP server for information. 
+** Description      This function queries an SDP server for information.
 **
-** Returns          TRUE if discovery started, FALSE if failed. 
+** Returns          TRUE if discovery started, FALSE if failed.
 **
 *******************************************************************************/
 SDP_API extern BOOLEAN SDP_ServiceSearchRequest (UINT8 *p_bd_addr,
@@ -228,19 +229,36 @@ SDP_API extern BOOLEAN SDP_ServiceSearchRequest (UINT8 *p_bd_addr,
 **
 ** Function         SDP_ServiceSearchAttributeRequest
 **
-** Description      This function queries an SDP server for information. 
+** Description      This function queries an SDP server for information.
 **
 **                  The difference between this API function and the function
-**                  SDP_ServiceSearchRequest is that this one does a 
+**                  SDP_ServiceSearchRequest is that this one does a
 **                  combined ServiceSearchAttributeRequest SDP function.
 **
-** Returns          TRUE if discovery started, FALSE if failed. 
+** Returns          TRUE if discovery started, FALSE if failed.
 **
 *******************************************************************************/
 SDP_API extern BOOLEAN SDP_ServiceSearchAttributeRequest (UINT8 *p_bd_addr,
                                                           tSDP_DISCOVERY_DB *p_db,
                                                           tSDP_DISC_CMPL_CB *p_cb);
 
+/*******************************************************************************
+**
+** Function         SDP_ServiceSearchAttributeRequest2
+**
+** Description      This function queries an SDP server for information.
+**
+**                  The difference between this API function and the function
+**                  SDP_ServiceSearchRequest is that this one does a
+**                  combined ServiceSearchAttributeRequest SDP function with the
+**                  user data piggyback
+**
+** Returns          TRUE if discovery started, FALSE if failed.
+**
+*******************************************************************************/
+SDP_API extern BOOLEAN SDP_ServiceSearchAttributeRequest2 (UINT8 *p_bd_addr,
+                                                          tSDP_DISCOVERY_DB *p_db,
+                                                          tSDP_DISC_CMPL_CB2 *p_cb, void * user_data);
 
 /* API of utilities to find data in the local discovery database */
 
@@ -351,7 +369,7 @@ SDP_API extern BOOLEAN SDP_FindAddProtoListsElemInRec (tSDP_DISC_REC *p_rec,
 **
 ** Description      This function looks at a specific discovery record for the
 **                  Profile list descriptor, and pulls out the version number.
-**                  The version number consists of an 8-bit major version and 
+**                  The version number consists of an 8-bit major version and
 **                  an 8-bit minor version.
 **
 ** Returns          TRUE if found, FALSE if not
@@ -568,7 +586,7 @@ SDP_API extern BOOLEAN SDP_DeleteAttribute (UINT32 handle, UINT16 attr_id);
 **
 ** Function         SDP_SetLocalDiRecord
 **
-** Description      This function adds a DI record to the local SDP database.   
+** Description      This function adds a DI record to the local SDP database.
 **
 ** Returns          Returns SDP_SUCCESS if record added successfully, else error
 **
@@ -622,7 +640,7 @@ SDP_API extern UINT8  SDP_GetNumDiRecords (tSDP_DISCOVERY_DB *p_db);
 ** Function         SDP_GetDiRecord
 **
 ** Description      This function retrieves a remote device's DI record from
-**                  the specified database.  
+**                  the specified database.
 **
 ** Returns          SDP_SUCCESS if record retrieved, else error
 **
@@ -649,7 +667,7 @@ SDP_API extern UINT8 SDP_SetTraceLevel (UINT8 new_level);
 ** Function         SDP_ConnOpen
 **
 ** Description      This function creates a connection to the SDP server on the
-**                  given device. 
+**                  given device.
 **
 ** Returns          0, if failed to initiate connection. Otherwise, the handle.
 **
@@ -663,7 +681,7 @@ SDP_API UINT32 SDP_ConnOpen (UINT8 *p_bd_addr, tSDP_DISC_RES_CB *p_rcb,
 **
 ** Description      This function sends data to the connected SDP server.
 **
-** Returns          TRUE if data is sent, FALSE if failed. 
+** Returns          TRUE if data is sent, FALSE if failed.
 **
 *******************************************************************************/
 SDP_API BOOLEAN SDP_WriteData (UINT32 handle, BT_HDR  *p_msg);
@@ -676,7 +694,7 @@ SDP_API BOOLEAN SDP_WriteData (UINT32 handle, BT_HDR  *p_msg);
 **
 ** Parameters:      handle      - Handle of the connection returned by SDP_ConnOpen
 **
-** Returns          TRUE if connection is closed, FALSE if failed to find the handle. 
+** Returns          TRUE if connection is closed, FALSE if failed to find the handle.
 **
 *******************************************************************************/
 SDP_API BOOLEAN SDP_ConnClose (UINT32 handle);
@@ -690,7 +708,7 @@ SDP_API BOOLEAN SDP_ConnClose (UINT32 handle);
 **
 ** Parameters:      p_rec      - pointer to a SDP record.
 **
-** Returns          TRUE if found, otherwise FALSE. 
+** Returns          TRUE if found, otherwise FALSE.
 **
 *******************************************************************************/
 SDP_API BOOLEAN SDP_FindServiceUUIDInRec(tSDP_DISC_REC *p_rec, tBT_UUID *p_uuid);
diff --git a/stack/rfcomm/port_api.c b/stack/rfcomm/port_api.c
index fe023a4..50da558 100644
--- a/stack/rfcomm/port_api.c
+++ b/stack/rfcomm/port_api.c
@@ -24,22 +24,28 @@
 /* duration of break in 200ms units */
 #define PORT_BREAK_DURATION     1
 
+#include <cutils/log.h>
+#define info(fmt, ...)  LOGI ("%s: " fmt,__FUNCTION__,  ## __VA_ARGS__)
+#define debug(fmt, ...) LOGD ("%s: " fmt,__FUNCTION__,  ## __VA_ARGS__)
+#define error(fmt, ...) LOGE ("## ERROR : %s: " fmt "##",__FUNCTION__,  ## __VA_ARGS__)
+#define asrt(s) if(!(s)) LOGE ("## %s assert %s failed at line:%d ##",__FUNCTION__, #s, __LINE__)
+
 /*******************************************************************************
 **
 ** Function         RFCOMM_CreateConnection
 **
-** Description      RFCOMM_CreateConnection function is used from the application 
-**                  to establish serial port connection to the peer device, 
-**                  or allow RFCOMM to accept a connection from the peer 
-**                  application.  
+** Description      RFCOMM_CreateConnection function is used from the application
+**                  to establish serial port connection to the peer device,
+**                  or allow RFCOMM to accept a connection from the peer
+**                  application.
 **
-** Parameters:      scn          - Service Channel Number as registered with 
-**                                 the SDP (server) or obtained using SDP from 
+** Parameters:      scn          - Service Channel Number as registered with
+**                                 the SDP (server) or obtained using SDP from
 **                                 the peer device (client).
 **                  is_server    - TRUE if requesting application is a server
 **                  mtu          - Maximum frame size the application can accept
 **                  bd_addr      - BD_ADDR of the peer (client)
-**                  mask         - specifies events to be enabled.  A value 
+**                  mask         - specifies events to be enabled.  A value
 **                                 of zero disables all events.
 **                  p_handle     - OUT pointer to the handle.
 **                  p_mgmt_cb    - pointer to callback function to receive
@@ -55,8 +61,8 @@
 ** (scn * 2 + 1) dlci.
 **
 *******************************************************************************/
-int RFCOMM_CreateConnection (UINT16 uuid, UINT8 scn, BOOLEAN is_server, 
-                             UINT16 mtu, BD_ADDR bd_addr, UINT16 *p_handle, 
+int RFCOMM_CreateConnection (UINT16 uuid, UINT8 scn, BOOLEAN is_server,
+                             UINT16 mtu, BD_ADDR bd_addr, UINT16 *p_handle,
                              tPORT_CALLBACK *p_mgmt_cb)
 {
     tPORT      *p_port;
@@ -65,7 +71,7 @@ int RFCOMM_CreateConnection (UINT16 uuid, UINT8 scn, BOOLEAN is_server,
     tRFC_MCB   *p_mcb = port_find_mcb (bd_addr);
     UINT16     rfcomm_mtu;
 
-    RFCOMM_TRACE_API3 ("RFCOMM_CreateConnection() called SCN: %d is_server:%d mtu:%d", 
+    RFCOMM_TRACE_API3 ("RFCOMM_CreateConnection() called SCN: %d is_server:%d mtu:%d",
                        scn, is_server, mtu);
     RFCOMM_TRACE_API6 ("RFCOMM_CreateConnection()  BDA: %02x-%02x-%02x-%02x-%02x-%02x",
                        bd_addr[0], bd_addr[1], bd_addr[2], bd_addr[3], bd_addr[4], bd_addr[5]);
@@ -93,7 +99,7 @@ int RFCOMM_CreateConnection (UINT16 uuid, UINT8 scn, BOOLEAN is_server,
         /* if existing port is also a client port */
         if (p_port->is_server == FALSE)
         {
-            RFCOMM_TRACE_ERROR3 ("RFCOMM_CreateConnection - already opened state:%d, RFC state:%d, MCB state:%d", 
+            RFCOMM_TRACE_ERROR3 ("RFCOMM_CreateConnection - already opened state:%d, RFC state:%d, MCB state:%d",
                 p_port->state, p_port->rfc.state, p_port->rfc.p_mcb ? p_port->rfc.p_mcb->state : 0);
             return (PORT_ALREADY_OPENED);
         }
@@ -153,7 +159,7 @@ int RFCOMM_CreateConnection (UINT16 uuid, UINT8 scn, BOOLEAN is_server,
         p_port->keep_port_handle = TRUE;
 
         /* keep mtu that user asked, p_port->mtu could be updated during param negotiation */
-        p_port->keep_mtu         = p_port->mtu; 
+        p_port->keep_mtu         = p_port->mtu;
     }
 
     p_port->local_ctrl.modem_signal = p_port->default_signal_state;
@@ -181,7 +187,7 @@ int RFCOMM_CreateConnection (UINT16 uuid, UINT8 scn, BOOLEAN is_server,
 **
 ** Description      This function is called to close the specified connection.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **
 *******************************************************************************/
 int RFCOMM_RemoveConnection (UINT16 handle)
@@ -217,7 +223,7 @@ int RFCOMM_RemoveConnection (UINT16 handle)
 **
 ** Description      This function is called to close the server port.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **
 *******************************************************************************/
 int RFCOMM_RemoveServer (UINT16 handle)
@@ -236,7 +242,7 @@ int RFCOMM_RemoveServer (UINT16 handle)
 
     /* Do not report any events to the client any more. */
     p_port->p_mgmt_callback = NULL;
-    
+
     if (!p_port->in_use || (p_port->state == PORT_STATE_CLOSED))
     {
         RFCOMM_TRACE_EVENT1 ("RFCOMM_RemoveServer() Not opened:%d", handle);
@@ -256,13 +262,13 @@ int RFCOMM_RemoveServer (UINT16 handle)
 **
 ** Function         PORT_SetEventCallback
 **
-** Description      This function is called to provide an address of the 
+** Description      This function is called to provide an address of the
 **                  function which will be called when one of the events
 **                  specified in the mask occures.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
-**                  p_callback - address of the callback function which should 
-**                               be called from the RFCOMM when an event 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  p_callback - address of the callback function which should
+**                               be called from the RFCOMM when an event
 **                               specified in the mask occures.
 **
 **
@@ -298,9 +304,9 @@ int PORT_SetEventCallback (UINT16 port_handle, tPORT_CALLBACK *p_port_cb)
 **
 ** Description      This function is when a data packet is received
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
-**                  p_callback - address of the callback function which should 
-**                               be called from the RFCOMM when data packet 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  p_callback - address of the callback function which should
+**                               be called from the RFCOMM when data packet
 **                               is received.
 **
 **
@@ -328,6 +334,43 @@ int PORT_SetDataCallback (UINT16 port_handle, tPORT_DATA_CALLBACK *p_port_cb)
 
     return (PORT_SUCCESS);
 }
+/*******************************************************************************
+**
+** Function         PORT_SetCODataCallback
+**
+** Description      This function is when a data packet is received
+**
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  p_callback - address of the callback function which should
+**                               be called from the RFCOMM when data packet
+**                               is received.
+**
+**
+*******************************************************************************/
+int PORT_SetDataCOCallback (UINT16 port_handle, tPORT_DATA_CO_CALLBACK *p_port_cb)
+{
+    tPORT  *p_port;
+
+    RFCOMM_TRACE_API2 ("PORT_SetDataCOCallback() handle:%d cb 0x%x", port_handle, p_port_cb);
+
+    /* Check if handle is valid to avoid crashing */
+    if ((port_handle == 0) || (port_handle > MAX_RFC_PORTS))
+    {
+        return (PORT_BAD_HANDLE);
+    }
+
+    p_port = &rfc_cb.port.port[port_handle - 1];
+
+    if (!p_port->in_use || (p_port->state == PORT_STATE_CLOSED))
+    {
+        return (PORT_NOT_OPENED);
+    }
+
+    p_port->p_data_co_callback = p_port_cb;
+
+    return (PORT_SUCCESS);
+}
+
 
 
 /*******************************************************************************
@@ -336,7 +379,7 @@ int PORT_SetDataCallback (UINT16 port_handle, tPORT_DATA_CALLBACK *p_port_cb)
 **
 ** Description      This function is called to close the specified connection.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  mask   - Bitmask of the events the host is interested in
 **
 *******************************************************************************/
@@ -372,7 +415,7 @@ int PORT_SetEventMask (UINT16 port_handle, UINT32 mask)
 ** Description      This function returns PORT_SUCCESS if connection referenced
 **                  by handle is up and running
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  bd_addr    - OUT bd_addr of the peer
 **                  p_lcid     - OUT L2CAP's LCID
 **
@@ -396,8 +439,8 @@ int PORT_CheckConnection (UINT16 handle, BD_ADDR bd_addr, UINT16 *p_lcid)
         return (PORT_NOT_OPENED);
     }
 
-    if (!p_port->rfc.p_mcb 
-     || !p_port->rfc.p_mcb->peer_ready 
+    if (!p_port->rfc.p_mcb
+     || !p_port->rfc.p_mcb->peer_ready
      || (p_port->rfc.state != RFC_STATE_OPENED))
     {
         return (PORT_LINE_ERR);
@@ -453,7 +496,7 @@ BOOLEAN PORT_IsOpening (BD_ADDR bd_addr)
                 }
             }
 
-            if ((!found_port) || 
+            if ((!found_port) ||
                 (found_port && (p_port->rfc.state < RFC_STATE_OPENED)))
             {
                 /* Port is not established yet. */
@@ -470,11 +513,11 @@ BOOLEAN PORT_IsOpening (BD_ADDR bd_addr)
 **
 ** Function         PORT_SetState
 **
-** Description      This function configures connection according to the 
+** Description      This function configures connection according to the
 **                  specifications in the tPORT_STATE structure.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
-**                  p_settings - Pointer to a tPORT_STATE structure containing 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  p_settings - Pointer to a tPORT_STATE structure containing
 **                               configuration information for the connection.
 **
 **
@@ -524,7 +567,7 @@ int PORT_SetState (UINT16 handle, tPORT_STATE *p_settings)
 **
 ** Description      This function return number of buffers on the rx queue.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  p_rx_queue_count - Pointer to return queue count in.
 **
 *******************************************************************************/
@@ -567,7 +610,7 @@ int PORT_GetRxQueueCnt (UINT16 handle, UINT16 *p_rx_queue_count)
 ** Description      This function is called to fill tPORT_STATE structure
 **                  with the curremt control settings for the port
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  p_settings - Pointer to a tPORT_STATE structure in which
 **                               configuration information is returned.
 **
@@ -605,10 +648,10 @@ int PORT_GetState (UINT16 handle, tPORT_STATE *p_settings)
 **
 ** Function         PORT_Control
 **
-** Description      This function directs a specified connection to pass control 
+** Description      This function directs a specified connection to pass control
 **                  control information to the peer device.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  signal     = specify the function to be passed
 **
 *******************************************************************************/
@@ -691,11 +734,11 @@ int PORT_Control (UINT16 handle, UINT8 signal)
 **
 ** Function         PORT_FlowControl
 **
-** Description      This function directs a specified connection to pass 
-**                  flow control message to the peer device.  Enable flag passed 
+** Description      This function directs a specified connection to pass
+**                  flow control message to the peer device.  Enable flag passed
 **                  shows if port can accept more data.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  enable     - enables data flow
 **
 *******************************************************************************/
@@ -770,12 +813,12 @@ int PORT_FlowControl (UINT16 handle, BOOLEAN enable)
 **
 ** Function         PORT_GetModemStatus
 **
-** Description      This function retrieves modem control signals.  Normally 
-**                  application will call this function after a callback 
-**                  function is called with notification that one of signals 
+** Description      This function retrieves modem control signals.  Normally
+**                  application will call this function after a callback
+**                  function is called with notification that one of signals
 **                  has been changed.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  p_signal   - specify the pointer to control signals info
 **
 *******************************************************************************/
@@ -798,7 +841,7 @@ int PORT_GetModemStatus (UINT16 handle, UINT8 *p_signal)
     *p_signal = p_port->peer_ctrl.modem_signal;
 
     RFCOMM_TRACE_API2 ("PORT_GetModemStatus() handle:%d signal:%x", handle, *p_signal);
-    
+
     return (PORT_SUCCESS);
 }
 
@@ -808,14 +851,14 @@ int PORT_GetModemStatus (UINT16 handle, UINT8 *p_signal)
 ** Function         PORT_ClearError
 **
 ** Description      This function retreives information about a communications
-**                  error and reports current status of a connection.  The 
+**                  error and reports current status of a connection.  The
 **                  function should be called when an error occures to clear
 **                  the connection error flag and to enable additional read
 **                  and write operations.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  p_errors   - pointer of the variable to receive error codes
-**                  p_status   - pointer to the tPORT_STATUS structur to receive 
+**                  p_status   - pointer to the tPORT_STATUS structur to receive
 **                               connection status
 **
 *******************************************************************************/
@@ -854,7 +897,7 @@ int PORT_ClearError (UINT16 handle, UINT16 *p_errors, tPORT_STATUS *p_status)
 **
 ** Description      This function send a communications error to the peer device
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  errors     - receive error codes
 **
 *******************************************************************************/
@@ -890,10 +933,10 @@ int PORT_SendError (UINT16 handle, UINT8 errors)
 **
 ** Function         PORT_GetQueueStatus
 **
-** Description      This function reports current status of a connection.  
+** Description      This function reports current status of a connection.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
-**                  p_status   - pointer to the tPORT_STATUS structur to receive 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  p_status   - pointer to the tPORT_STATUS structur to receive
 **                               connection status
 **
 *******************************************************************************/
@@ -939,11 +982,11 @@ int PORT_GetQueueStatus (UINT16 handle, tPORT_STATUS *p_status)
 **
 ** Function         PORT_Purge
 **
-** Description      This function discards all the data from the output or 
+** Description      This function discards all the data from the output or
 **                  input queues of the specified connection.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
-**                  purge_flags - specify the action to take.  
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  purge_flags - specify the action to take.
 **
 *******************************************************************************/
 int PORT_Purge (UINT16 handle, UINT8 purge_flags)
@@ -951,7 +994,7 @@ int PORT_Purge (UINT16 handle, UINT8 purge_flags)
     tPORT      *p_port;
     BT_HDR     *p_buf;
     UINT16      count;
-    UINT32     events; 
+    UINT32     events;
 
     RFCOMM_TRACE_API2 ("PORT_Purge() handle:%d flags:0x%x", handle, purge_flags);
 
@@ -994,7 +1037,7 @@ int PORT_Purge (UINT16 handle, UINT8 purge_flags)
             GKI_freebuf (p_buf);
 
         p_port->tx.queue_size = 0;
-        
+
         PORT_SCHEDULE_UNLOCK;
 
         events = PORT_EV_TXEMPTY;
@@ -1015,10 +1058,10 @@ int PORT_Purge (UINT16 handle, UINT8 purge_flags)
 **
 ** Function         PORT_ReadData
 **
-** Description      Normally not GKI aware application will call this function 
+** Description      Normally not GKI aware application will call this function
 **                  after receiving PORT_EV_RXCHAR event.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  p_data      - Data area
 **                  max_len     - Byte count requested
 **                  p_len       - Byte count received
@@ -1114,7 +1157,7 @@ int PORT_ReadData (UINT16 handle, char *p_data, UINT16 max_len, UINT16 *p_len)
     /* If rfcomm suspended traffic from the peer based on the rx_queue_size */
     /* check if it can be resumed now */
     port_flow_control_peer (p_port, TRUE, count);
-    
+
     return (PORT_SUCCESS);
 }
 
@@ -1126,8 +1169,8 @@ int PORT_ReadData (UINT16 handle, char *p_data, UINT16 max_len, UINT16 *p_len)
 ** Description      Normally application will call this function after receiving
 **                  PORT_EV_RXCHAR event.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
-**                  pp_buf      - pointer to address of buffer with data, 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  pp_buf      - pointer to address of buffer with data,
 **
 *******************************************************************************/
 int PORT_Read (UINT16 handle, BT_HDR **pp_buf)
@@ -1181,17 +1224,17 @@ int PORT_Read (UINT16 handle, BT_HDR **pp_buf)
 **
 ** Function         port_write
 **
-** Description      This function when a data packet is received from the apper 
-**                  layer task.  
+** Description      This function when a data packet is received from the apper
+**                  layer task.
 **
-** Parameters:      p_port     - pointer to address of port control block 
-**                  p_buf      - pointer to address of buffer with data, 
+** Parameters:      p_port     - pointer to address of port control block
+**                  p_buf      - pointer to address of buffer with data,
 **
 *******************************************************************************/
 static int port_write (tPORT *p_port, BT_HDR *p_buf)
 {
     /* We should not allow to write data in to server port when connection is not opened */
-    if (p_port->is_server && (p_port->rfc.state != RFC_STATE_OPENED)) 
+    if (p_port->is_server && (p_port->rfc.state != RFC_STATE_OPENED))
     {
         GKI_freebuf (p_buf);
         return (PORT_CLOSED);
@@ -1201,16 +1244,16 @@ static int port_write (tPORT *p_port, BT_HDR *p_buf)
     /* Peer is not ready or Port is not yet opened or initial port control */
     /* command has not been sent */
     if (p_port->tx.peer_fc
-     || !p_port->rfc.p_mcb 
-     || !p_port->rfc.p_mcb->peer_ready 
-     || (p_port->rfc.state != RFC_STATE_OPENED) 
-     || ((p_port->port_ctrl & (PORT_CTRL_REQ_SENT | PORT_CTRL_IND_RECEIVED)) != 
+     || !p_port->rfc.p_mcb
+     || !p_port->rfc.p_mcb->peer_ready
+     || (p_port->rfc.state != RFC_STATE_OPENED)
+     || ((p_port->port_ctrl & (PORT_CTRL_REQ_SENT | PORT_CTRL_IND_RECEIVED)) !=
                               (PORT_CTRL_REQ_SENT | PORT_CTRL_IND_RECEIVED)))
     {
         if ((p_port->tx.queue_size  > PORT_TX_CRITICAL_WM)
          || (p_port->tx.queue.count > PORT_TX_BUF_CRITICAL_WM))
         {
-            RFCOMM_TRACE_WARNING1 ("PORT_Write: Queue size: %d", 
+            RFCOMM_TRACE_WARNING1 ("PORT_Write: Queue size: %d",
                                    p_port->tx.queue_size);
 
             GKI_freebuf (p_buf);
@@ -1221,8 +1264,8 @@ static int port_write (tPORT *p_port, BT_HDR *p_buf)
             return (PORT_TX_FULL);
         }
 
-        RFCOMM_TRACE_EVENT4 ("PORT_Write : Data is enqued. flow disabled %d peer_ready %d state %d ctrl_state %x", 
-                             p_port->tx.peer_fc, 
+        RFCOMM_TRACE_EVENT4 ("PORT_Write : Data is enqued. flow disabled %d peer_ready %d state %d ctrl_state %x",
+                             p_port->tx.peer_fc,
                              (p_port->rfc.p_mcb && p_port->rfc.p_mcb->peer_ready),
                              p_port->rfc.state,
                              p_port->port_ctrl);
@@ -1245,11 +1288,11 @@ static int port_write (tPORT *p_port, BT_HDR *p_buf)
 **
 ** Function         PORT_Write
 **
-** Description      This function when a data packet is received from the apper 
-**                  layer task.  
+** Description      This function when a data packet is received from the apper
+**                  layer task.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
-**                  pp_buf      - pointer to address of buffer with data, 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  pp_buf      - pointer to address of buffer with data,
 **
 *******************************************************************************/
 int PORT_Write (UINT16 handle, BT_HDR *p_buf)
@@ -1277,7 +1320,7 @@ int PORT_Write (UINT16 handle, BT_HDR *p_buf)
 
     if (p_port->line_status)
     {
-        RFCOMM_TRACE_WARNING1 ("PORT_Write: Data dropped line_status:0x%x", 
+        RFCOMM_TRACE_WARNING1 ("PORT_Write: Data dropped line_status:0x%x",
                                p_port->line_status);
         GKI_freebuf (p_buf);
         return (PORT_LINE_ERR);
@@ -1285,7 +1328,7 @@ int PORT_Write (UINT16 handle, BT_HDR *p_buf)
 
     rc = port_write (p_port, p_buf);
     event |= port_flow_control_user (p_port);
-    
+
     switch (rc)
     {
     case PORT_TX_FULL:
@@ -1305,16 +1348,165 @@ int PORT_Write (UINT16 handle, BT_HDR *p_buf)
 
     return (PORT_SUCCESS);
 }
+/*******************************************************************************
+**
+** Function         PORT_WriteDataCO
+**
+** Description      Normally not GKI aware application will call this function
+**                  to send data to the port by callout functions
+**
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
+**                  fd         - socket fd
+**                  p_len      - Byte count returned
+**
+*******************************************************************************/
+int PORT_WriteDataCO (UINT16 handle, int* p_len)
+{
+
+    tPORT      *p_port;
+    BT_HDR     *p_buf;
+    UINT32     event = 0;
+    int        rc = 0;
+    UINT16     length;
+
+    RFCOMM_TRACE_API1 ("PORT_WriteDataCO() handle:%d", handle);
+    int written;
+    *p_len = 0;
+
+    /* Check if handle is valid to avoid crashing */
+    if ((handle == 0) || (handle > MAX_RFC_PORTS))
+    {
+        return (PORT_BAD_HANDLE);
+    }
+    p_port = &rfc_cb.port.port[handle - 1];
+
+    if (!p_port->in_use || (p_port->state == PORT_STATE_CLOSED))
+    {
+        RFCOMM_TRACE_WARNING1 ("PORT_WriteDataByFd() no port state:%d", p_port->state);
+        return (PORT_NOT_OPENED);
+    }
+
+    if (!p_port->peer_mtu)
+    {
+        RFCOMM_TRACE_ERROR1 ("PORT_WriteDataByFd() peer_mtu:%d", p_port->peer_mtu);
+        return (PORT_UNKNOWN_ERROR);
+    }
+    int available = 0;
+    //if(ioctl(fd, FIONREAD, &available) < 0)
+    if(p_port->p_data_co_callback(handle, (UINT8*)&available, sizeof(available),
+                                DATA_CO_CALLBACK_TYPE_OUTGOING_SIZE) == FALSE)
+    {
+        RFCOMM_TRACE_ERROR1("p_data_co_callback DATA_CO_CALLBACK_TYPE_INCOMING_SIZE failed, available:%d", available);
+        return (PORT_UNKNOWN_ERROR);
+    }
+    /* Length for each buffer is the smaller of GKI buffer, peer MTU, or max_len */
+    length = RFCOMM_DATA_POOL_BUF_SIZE -
+            (UINT16)(sizeof(BT_HDR) + L2CAP_MIN_OFFSET + RFCOMM_DATA_OVERHEAD);
+
+    /* If there are buffers scheduled for transmission check if requested */
+    /* data fits into the end of the queue */
+    PORT_SCHEDULE_LOCK;
+
+    if (((p_buf = (BT_HDR *)p_port->tx.queue.p_last) != NULL)
+     && (((int)p_buf->len + available) <= (int)p_port->peer_mtu)
+     && (((int)p_buf->len + available) <= (int)length))
+    {
+        //if(recv(fd, (UINT8 *)(p_buf + 1) + p_buf->offset + p_buf->len, available, 0) != available)
+        if(p_port->p_data_co_callback(handle, (UINT8 *)(p_buf + 1) + p_buf->offset + p_buf->len,
+                                    available, DATA_CO_CALLBACK_TYPE_OUTGOING) == FALSE)
+
+        {
+            error("p_data_co_callback DATA_CO_CALLBACK_TYPE_OUTGOING failed, available:%d", available);
+            return (PORT_UNKNOWN_ERROR);
+        }
+        //memcpy ((UINT8 *)(p_buf + 1) + p_buf->offset + p_buf->len, p_data, max_len);
+        p_port->tx.queue_size += (UINT16)available;
+
+        *p_len = available;
+        p_buf->len += (UINT16)available;
+
+        PORT_SCHEDULE_UNLOCK;
+
+        return (PORT_SUCCESS);
+    }
+
+    PORT_SCHEDULE_UNLOCK;
+
+    //int max_read = length < p_port->peer_mtu ? length : p_port->peer_mtu;
+
+    //max_read = available < max_read ? available : max_read;
+
+    while (available)
+    {
+        /* if we're over buffer high water mark, we're done */
+        if ((p_port->tx.queue_size  > PORT_TX_HIGH_WM)
+         || (p_port->tx.queue.count > PORT_TX_BUF_HIGH_WM))
+            break;
+
+        /* continue with rfcomm data write */
+        p_buf = (BT_HDR *)GKI_getpoolbuf (RFCOMM_DATA_POOL_ID);
+        if (!p_buf)
+            break;
+
+        p_buf->offset         = L2CAP_MIN_OFFSET + RFCOMM_MIN_OFFSET;
+        p_buf->layer_specific = handle;
+
+        if (p_port->peer_mtu < length)
+            length = p_port->peer_mtu;
+        if (available < (int)length)
+            length = (UINT16)available;
+        p_buf->len = length;
+        p_buf->event          = BT_EVT_TO_BTU_SP_DATA;
+
+        //memcpy ((UINT8 *)(p_buf + 1) + p_buf->offset, p_data, length);
+        //if(recv(fd, (UINT8 *)(p_buf + 1) + p_buf->offset, (int)length, 0) != (int)length)
+        if(p_port->p_data_co_callback(handle, (UINT8 *)(p_buf + 1) + p_buf->offset, length,
+                                      DATA_CO_CALLBACK_TYPE_OUTGOING) == FALSE)
+        {
+            error("p_data_co_callback DATA_CO_CALLBACK_TYPE_OUTGOING failed, length:%d", length);
+            return (PORT_UNKNOWN_ERROR);
+        }
+
+
+        RFCOMM_TRACE_EVENT1 ("PORT_WriteData %d bytes", length);
+
+        rc = port_write (p_port, p_buf);
+
+        /* If queue went below the threashold need to send flow control */
+        event |= port_flow_control_user (p_port);
+
+        if (rc == PORT_SUCCESS)
+            event |= PORT_EV_TXCHAR;
+
+        if ((rc != PORT_SUCCESS) && (rc != PORT_CMD_PENDING))
+            break;
+
+        *p_len  += length;
+        available -= (int)length;
+    }
+    if (!available && (rc != PORT_CMD_PENDING) && (rc != PORT_TX_QUEUE_DISABLED))
+        event |= PORT_EV_TXEMPTY;
+
+    /* Mask out all events that are not of interest to user */
+    event &= p_port->ev_mask;
+
+    /* Send event to the application */
+    if (p_port->p_callback && event)
+        (p_port->p_callback)(event, p_port->inx);
+
+    return (PORT_SUCCESS);
+}
+
 
 
 /*******************************************************************************
 **
 ** Function         PORT_WriteData
 **
-** Description      Normally not GKI aware application will call this function 
+** Description      Normally not GKI aware application will call this function
 **                  to send data to the port.
 **
-** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection 
+** Parameters:      handle     - Handle returned in the RFCOMM_CreateConnection
 **                  p_data      - Data area
 **                  max_len     - Byte count requested
 **                  p_len       - Byte count received
@@ -1352,7 +1544,7 @@ int PORT_WriteData (UINT16 handle, char *p_data, UINT16 max_len, UINT16 *p_len)
     }
 
     /* Length for each buffer is the smaller of GKI buffer, peer MTU, or max_len */
-    length = RFCOMM_DATA_POOL_BUF_SIZE - 
+    length = RFCOMM_DATA_POOL_BUF_SIZE -
             (UINT16)(sizeof(BT_HDR) + L2CAP_MIN_OFFSET + RFCOMM_DATA_OVERHEAD);
 
     /* If there are buffers scheduled for transmission check if requested */
@@ -1403,7 +1595,7 @@ int PORT_WriteData (UINT16 handle, char *p_data, UINT16 max_len, UINT16 *p_len)
         RFCOMM_TRACE_EVENT1 ("PORT_WriteData %d bytes", length);
 
         rc = port_write (p_port, p_buf);
-        
+
         /* If queue went below the threashold need to send flow control */
         event |= port_flow_control_user (p_port);
 
@@ -1468,7 +1660,7 @@ int PORT_Test (UINT16 handle, UINT8 *p_data, UINT16 len)
 
     if ((p_buf = (BT_HDR *)GKI_getpoolbuf (RFCOMM_CMD_POOL_ID)) != NULL)
     {
-    
+
         p_buf->offset  = L2CAP_MIN_OFFSET + RFCOMM_MIN_OFFSET + 2;
         p_buf->len = len;
 
diff --git a/stack/rfcomm/port_int.h b/stack/rfcomm/port_int.h
index acd56b7..c3fbcee 100644
--- a/stack/rfcomm/port_int.h
+++ b/stack/rfcomm/port_int.h
@@ -35,7 +35,7 @@
 #define PORT_FC_CREDIT          2   /* use RFCOMM credit based flow control */
 
 /*
-** Define Port Data Transfere control block 
+** Define Port Data Transfere control block
 */
 typedef struct
 {
@@ -66,7 +66,7 @@ typedef struct
 #define RFCOMM_CTRL_BREAK_IN_SEQ    1
 
     UINT8   break_signal_seq;   /* as soon as possible | in sequence (default) */
-    
+
     BOOLEAN fc;                 /* TRUE when the device is unable to accept frames */
 } tPORT_CTRL;
 
@@ -74,7 +74,7 @@ typedef struct
 /*
 ** RFCOMM multiplexer Control Block
 */
-typedef struct 
+typedef struct
 {
     TIMER_LIST_ENT tle;       /* Timer list entry */
     BUFFER_Q  cmd_q;          /* Queue for command messages on this mux */
@@ -162,7 +162,7 @@ struct t_port_info
     tPORT_STATE user_port_pars;  /* Port parameters for user connection */
     tPORT_STATE peer_port_pars;  /* Port parameters for user connection */
 
-    tPORT_CTRL  local_ctrl; 
+    tPORT_CTRL  local_ctrl;
     tPORT_CTRL  peer_ctrl;
 
 #define PORT_CTRL_REQ_SENT          0x01
@@ -180,6 +180,7 @@ struct t_port_info
     tPORT_CALLBACK      *p_callback;        /* Pointer to users callback function */
     tPORT_CALLBACK      *p_mgmt_callback;   /* Callback function to receive connection up/down */
     tPORT_DATA_CALLBACK *p_data_callback;   /* Callback function to receive data indications */
+    tPORT_DATA_CO_CALLBACK *p_data_co_callback;   /* Callback function with callouts and flowctrl */
     UINT16      credit_tx;                  /* Flow control credits for tx path */
     UINT16      credit_rx;                  /* Flow control credits for rx path, this is */
                                             /* number of buffers peer is allowed to sent */
diff --git a/stack/rfcomm/port_rfc.c b/stack/rfcomm/port_rfc.c
index c4ac929..ef84fef 100644
--- a/stack/rfcomm/port_rfc.c
+++ b/stack/rfcomm/port_rfc.c
@@ -819,6 +819,17 @@ void PORT_DataInd (tRFC_MCB *p_mcb, UINT8 dlci, BT_HDR *p_buf)
         GKI_freebuf (p_buf);
         return;
     }
+    /* If client registered callout callback with flow control we can just deliver receive data */
+    if (p_port->p_data_co_callback)
+    {
+        /* Another packet is delivered to user.  Send credits to peer if required */
+
+        if(p_port->p_data_co_callback(p_port->inx, (UINT8*)p_buf, -1, DATA_CO_CALLBACK_TYPE_INCOMING))
+            port_flow_control_peer(p_port, TRUE, 1);
+        else port_flow_control_peer(p_port, FALSE, 0);
+        //GKI_freebuf (p_buf);
+        return;
+    }
 
     /* If client registered callback we can just deliver receive data */
     if (p_port->p_data_callback)
diff --git a/stack/rfcomm/port_utils.c b/stack/rfcomm/port_utils.c
index 5a52774..6800b46 100644
--- a/stack/rfcomm/port_utils.c
+++ b/stack/rfcomm/port_utils.c
@@ -20,6 +20,12 @@
 #include "btm_int.h"
 #include "btu.h"
 
+#include <cutils/log.h>
+#define info(fmt, ...)  LOGI ("%s: " fmt,__FUNCTION__,  ## __VA_ARGS__)
+#define debug(fmt, ...) LOGD ("%s: " fmt,__FUNCTION__,  ## __VA_ARGS__)
+#define error(fmt, ...) LOGE ("## ERROR : %s: " fmt "##",__FUNCTION__,  ## __VA_ARGS__)
+#define asrt(s) if(!(s)) LOGE ("## %s assert %s failed at line:%d ##",__FUNCTION__, #s, __LINE__)
+
 
 static const tPORT_STATE default_port_pars = 
 {
@@ -73,6 +79,7 @@ tPORT *port_allocate_port (UINT8 dlci, BD_ADDR bd_addr)
             port_set_defaults (p_port);
 
             rfc_cb.rfc.last_port = yy;
+            debug("rfc_cb.port.port[%d] allocated, last_port:%d", yy, rfc_cb.rfc.last_port);
             return (p_port);
         }
     }
@@ -197,7 +204,7 @@ void port_release_port (tPORT *p_port)
     tPORT_STATE user_port_pars;
 
     PORT_SCHEDULE_LOCK;
-
+    debug("port_release_port, p_port:%p", p_port);
     while ((p_buf = (BT_HDR *)GKI_dequeue (&p_port->rx.queue)) != NULL)
         GKI_freebuf (p_buf);
 
@@ -506,7 +513,7 @@ void port_flow_control_peer(tPORT *p_port, BOOLEAN enable, UINT16 count)
         else
         {
             /* if client registered data callback, just do what they want */
-            if (p_port->p_data_callback)
+            if (p_port->p_data_callback || p_port->p_data_co_callback)
             {
                 p_port->rx.peer_fc = TRUE;
             }
@@ -540,7 +547,7 @@ void port_flow_control_peer(tPORT *p_port, BOOLEAN enable, UINT16 count)
         else
         {
             /* if client registered data callback, just do what they want */
-            if (p_port->p_data_callback)
+            if (p_port->p_data_callback || p_port->p_data_co_callback)
             {
                 p_port->rx.peer_fc = TRUE;
                 RFCOMM_FlowReq (p_port->rfc.p_mcb, p_port->dlci, FALSE);
diff --git a/stack/sdp/sdp_api.c b/stack/sdp/sdp_api.c
index 2545181..ef13f15 100644
--- a/stack/sdp/sdp_api.c
+++ b/stack/sdp/sdp_api.c
@@ -23,6 +23,12 @@
 #include "sdpint.h"
 #include "btu.h"
 
+#include <cutils/log.h>
+#define info(fmt, ...)  LOGI ("%s: " fmt,__FUNCTION__,  ## __VA_ARGS__)
+#define debug(fmt, ...) LOGD ("%s: " fmt,__FUNCTION__,  ## __VA_ARGS__)
+#define error(fmt, ...) LOGE ("## ERROR : %s: " fmt "##",__FUNCTION__,  ## __VA_ARGS__)
+#define asrt(s) if(!(s)) LOGE ("## %s assert %s failed at line:%d ##",__FUNCTION__, #s, __LINE__)
+
 
 /**********************************************************************
 **   C L I E N T    F U N C T I O N    P R O T O T Y P E S            *
@@ -94,9 +100,9 @@ BOOLEAN SDP_InitDiscoveryDb (tSDP_DISCOVERY_DB *p_db, UINT32 len, UINT16 num_uui
 **
 ** Function         SDP_CancelServiceSearch
 **
-** Description      This function cancels an active query to an SDP server. 
+** Description      This function cancels an active query to an SDP server.
 **
-** Returns          TRUE if discovery cancelled, FALSE if a matching activity is not found. 
+** Returns          TRUE if discovery cancelled, FALSE if a matching activity is not found.
 **
 *******************************************************************************/
 BOOLEAN SDP_CancelServiceSearch (tSDP_DISCOVERY_DB *p_db)
@@ -118,9 +124,9 @@ BOOLEAN SDP_CancelServiceSearch (tSDP_DISCOVERY_DB *p_db)
 **
 ** Function         SDP_ServiceSearchRequest
 **
-** Description      This function queries an SDP server for information. 
+** Description      This function queries an SDP server for information.
 **
-** Returns          TRUE if discovery started, FALSE if failed. 
+** Returns          TRUE if discovery started, FALSE if failed.
 **
 *******************************************************************************/
 BOOLEAN SDP_ServiceSearchRequest (UINT8 *p_bd_addr, tSDP_DISCOVERY_DB *p_db,
@@ -150,14 +156,14 @@ BOOLEAN SDP_ServiceSearchRequest (UINT8 *p_bd_addr, tSDP_DISCOVERY_DB *p_db,
 **
 ** Function         SDP_ServiceSearchAttributeRequest
 **
-** Description      This function queries an SDP server for information. 
+** Description      This function queries an SDP server for information.
 **
 **                  The difference between this API function and the function
-**                  SDP_ServiceSearchRequest is that this one does a 
+**                  SDP_ServiceSearchRequest is that this one does a
 **                  combined ServiceSearchAttributeRequest SDP function.
 **                  (This is for Unplug Testing)
 **
-** Returns          TRUE if discovery started, FALSE if failed. 
+** Returns          TRUE if discovery started, FALSE if failed.
 **
 *******************************************************************************/
 BOOLEAN SDP_ServiceSearchAttributeRequest (UINT8 *p_bd_addr, tSDP_DISCOVERY_DB *p_db,
@@ -183,6 +189,44 @@ BOOLEAN SDP_ServiceSearchAttributeRequest (UINT8 *p_bd_addr, tSDP_DISCOVERY_DB *
     return (FALSE);
 #endif
 }
+/*******************************************************************************
+**
+** Function         SDP_ServiceSearchAttributeRequest2
+**
+** Description      This function queries an SDP server for information.
+**
+**                  The difference between this API function and the function
+**                  SDP_ServiceSearchRequest is that this one does a
+**                  combined ServiceSearchAttributeRequest SDP function.
+**                  (This is for Unplug Testing)
+**
+** Returns          TRUE if discovery started, FALSE if failed.
+**
+*******************************************************************************/
+BOOLEAN SDP_ServiceSearchAttributeRequest2 (UINT8 *p_bd_addr, tSDP_DISCOVERY_DB *p_db,
+                                           tSDP_DISC_CMPL_CB2 *p_cb2, void * user_data)
+{
+#if SDP_CLIENT_ENABLED == TRUE
+    tCONN_CB     *p_ccb;
+
+    /* Specific BD address */
+    p_ccb = sdp_conn_originate (p_bd_addr);
+
+    if (!p_ccb)
+        return (FALSE);
+
+    p_ccb->disc_state = SDP_DISC_WAIT_CONN;
+    p_ccb->p_db       = p_db;
+    p_ccb->p_cb2       = p_cb2;
+
+    p_ccb->is_attr_search = TRUE;
+    p_ccb->user_data = user_data;
+
+    return (TRUE);
+#else
+    return (FALSE);
+#endif
+}
 
 #if SDP_CLIENT_ENABLED == TRUE
 void SDP_SetIdleTimeout (BD_ADDR addr, UINT16 timeout)
@@ -272,10 +316,10 @@ tSDP_DISC_ATTR *SDP_FindAttributeInRec (tSDP_DISC_REC *p_rec, UINT16 attr_id)
 ** Description      This function is called to read the service UUID within a record
 **                  if there is any.
 **
-** Parameters:      p_rec      - pointer to a SDP record. 
+** Parameters:      p_rec      - pointer to a SDP record.
 **                  p_uuid     - output parameter to save the UUID found.
 **
-** Returns          TRUE if found, otherwise FALSE. 
+** Returns          TRUE if found, otherwise FALSE.
 **
 *******************************************************************************/
 BOOLEAN SDP_FindServiceUUIDInRec(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid)
@@ -612,7 +656,7 @@ BOOLEAN SDP_FindAddProtoListsElemInRec (tSDP_DISC_REC *p_rec, UINT16 layer_uuid,
 #if SDP_CLIENT_ENABLED == TRUE
     tSDP_DISC_ATTR  *p_attr, *p_sattr;
     BOOLEAN         ret = FALSE;
-    
+
     p_attr = p_rec->p_first_attr;
     while (p_attr)
     {
@@ -645,7 +689,7 @@ BOOLEAN SDP_FindAddProtoListsElemInRec (tSDP_DISC_REC *p_rec, UINT16 layer_uuid,
 **
 ** Description      This function looks at a specific discovery record for the
 **                  Profile list descriptor, and pulls out the version number.
-**                  The version number consists of an 8-bit major version and 
+**                  The version number consists of an 8-bit major version and
 **                  an 8-bit minor version.
 **
 ** Returns          TRUE if found, FALSE if not
@@ -732,11 +776,11 @@ UINT16 SDP_DiDiscover( BD_ADDR remote_device, tSDP_DISCOVERY_DB *p_db,
     tSDP_UUID init_uuid;
     init_uuid.len = 2;
     init_uuid.uu.uuid16 = di_uuid;
-  
+
     if( SDP_InitDiscoveryDb(p_db, len, num_uuids, &init_uuid, 0, NULL) )
         if( SDP_ServiceSearchRequest(remote_device, p_db, p_cb) )
             result = SDP_SUCCESS;
-  
+
     return result;
 #else
     return SDP_DI_DISC_FAILED;
@@ -777,7 +821,7 @@ UINT8 SDP_GetNumDiRecords( tSDP_DISCOVERY_DB *p_db )
 ** Function         SDP_GetDiRecord
 **
 ** Description      This function retrieves a remote device's DI record from
-**                  the specified database.  
+**                  the specified database.
 **
 ** Returns          SDP_SUCCESS if record retrieved, else error
 **
@@ -788,7 +832,7 @@ UINT16 SDP_GetDiRecord( UINT8 get_record_index, tSDP_DI_GET_RECORD *p_device_inf
 #if SDP_CLIENT_ENABLED == TRUE
     UINT16  result = SDP_NO_DI_RECORD_FOUND;
     UINT8  curr_record_index = 1;
-  
+
     tSDP_DISC_REC *p_curr_record = NULL;
 
     /* find the requested SDP record in the discovery database */
@@ -801,7 +845,7 @@ UINT16 SDP_GetDiRecord( UINT8 get_record_index, tSDP_DI_GET_RECORD *p_device_inf
             if( curr_record_index++ == get_record_index )
             {
                 result = SDP_SUCCESS;
-                break;          
+                break;
             }
         }
     }while( p_curr_record );
@@ -840,31 +884,31 @@ UINT16 SDP_GetDiRecord( UINT8 get_record_index, tSDP_DI_GET_RECORD *p_device_inf
             p_device_info->spec_id = p_curr_attr->attr_value.v.u16;
         else
             result = SDP_ERR_ATTR_NOT_PRESENT;
-    
+
         p_curr_attr = SDP_FindAttributeInRec( p_curr_record, ATTR_ID_VENDOR_ID );
         if( p_curr_attr )
             p_device_info->rec.vendor = p_curr_attr->attr_value.v.u16;
         else
             result = SDP_ERR_ATTR_NOT_PRESENT;
-       
+
         p_curr_attr = SDP_FindAttributeInRec( p_curr_record, ATTR_ID_VENDOR_ID_SOURCE );
         if( p_curr_attr )
             p_device_info->rec.vendor_id_source = p_curr_attr->attr_value.v.u16;
         else
             result = SDP_ERR_ATTR_NOT_PRESENT;
-       
+
         p_curr_attr = SDP_FindAttributeInRec( p_curr_record, ATTR_ID_PRODUCT_ID );
         if( p_curr_attr )
             p_device_info->rec.product = p_curr_attr->attr_value.v.u16;
         else
             result = SDP_ERR_ATTR_NOT_PRESENT;
-       
+
         p_curr_attr = SDP_FindAttributeInRec( p_curr_record, ATTR_ID_PRODUCT_VERSION );
         if( p_curr_attr )
             p_device_info->rec.version = p_curr_attr->attr_value.v.u16;
         else
             result = SDP_ERR_ATTR_NOT_PRESENT;
-       
+
         p_curr_attr = SDP_FindAttributeInRec( p_curr_record, ATTR_ID_PRIMARY_RECORD );
         if( p_curr_attr )
             p_device_info->rec.primary_record = (BOOLEAN)p_curr_attr->attr_value.v.u8;
@@ -888,7 +932,7 @@ UINT16 SDP_GetDiRecord( UINT8 get_record_index, tSDP_DI_GET_RECORD *p_device_inf
 **
 ** Description      This function adds a DI record to the local SDP database.
 **
-**                  
+**
 **
 ** Returns          Returns SDP_SUCCESS if record added successfully, else error
 **
@@ -912,7 +956,7 @@ UINT16 SDP_SetLocalDiRecord( tSDP_DI_RECORD *p_device_info, UINT32 *p_handle )
     if( p_device_info->primary_record == TRUE && sdp_cb.server_db.di_primary_handle )
         handle = sdp_cb.server_db.di_primary_handle;
     else
-    {  
+    {
         if( (handle = SDP_CreateRecord()) == 0 )
             return SDP_NO_RESOURCES;
     }
@@ -1013,7 +1057,7 @@ UINT16 SDP_SetLocalDiRecord( tSDP_DI_RECORD *p_device_info, UINT32 *p_handle )
                                BOOLEAN_DESC_TYPE, 1, &u8)) )
             result = SDP_DI_REG_FAILED;
     }
- 
+
     /* mandatory */
     if ( result == SDP_SUCCESS)
     {
@@ -1028,7 +1072,7 @@ UINT16 SDP_SetLocalDiRecord( tSDP_DI_RECORD *p_device_info, UINT32 *p_handle )
         SDP_DeleteRecord( handle );
     else if (p_device_info->primary_record == TRUE)
         sdp_cb.server_db.di_primary_handle = handle;
-  
+
     return result;
 #else   /* SDP_SERVER_ENABLED is FALSE */
     return SDP_DI_REG_FAILED;
@@ -1056,7 +1100,7 @@ UINT16 SDP_GetLocalDiRecord(tSDP_DI_GET_RECORD *p_device_info, UINT32 *p_handle
     tSDP_ATTRIBUTE  *p_attr;
     UINT8           *p_temp;
     INT32            templen;
-    
+
     if (*p_handle == 0)
         *p_handle = sdp_cb.server_db.di_primary_handle;
 
@@ -1172,7 +1216,7 @@ UINT8 SDP_SetTraceLevel (UINT8 new_level)
 ** Function         SDP_ConnOpen
 **
 ** Description      This function creates a connection to the SDP server on the
-**                  given device. 
+**                  given device.
 **
 ** Returns          0, if failed to initiate connection. Otherwise, the handle.
 **
@@ -1212,7 +1256,7 @@ UINT32 SDP_ConnOpen (UINT8 *p_bd_addr, tSDP_DISC_RES_CB *p_rcb,
 **
 ** Description      This function sends data to the connected SDP server.
 **
-** Returns          TRUE if data is sent, FALSE if failed. 
+** Returns          TRUE if data is sent, FALSE if failed.
 **
 *******************************************************************************/
 BOOLEAN SDP_WriteData (UINT32 handle, BT_HDR  *p_msg)
@@ -1244,7 +1288,7 @@ BOOLEAN SDP_WriteData (UINT32 handle, BT_HDR  *p_msg)
 **
 ** Parameters:      handle      - Handle of the connection returned by SDP_ConnOpen
 **
-** Returns          TRUE if connection is closed, FALSE if failed to find the handle. 
+** Returns          TRUE if connection is closed, FALSE if failed to find the handle.
 **
 *******************************************************************************/
 BOOLEAN SDP_ConnClose (UINT32 handle)
diff --git a/stack/sdp/sdp_main.c b/stack/sdp/sdp_main.c
index 8a9f6c5..8e84b8c 100644
--- a/stack/sdp/sdp_main.c
+++ b/stack/sdp/sdp_main.c
@@ -79,7 +79,7 @@ void sdp_init (void)
 
 #if SDP_SERVER_ENABLED == TRUE
     /* Register with Security Manager for the specific security level */
-    if (!BTM_SetSecurityLevel (FALSE, SDP_SERVICE_NAME, BTM_SEC_SERVICE_SDP_SERVER, 
+    if (!BTM_SetSecurityLevel (FALSE, SDP_SERVICE_NAME, BTM_SEC_SERVICE_SDP_SERVER,
                                SDP_SECURITY_LEVEL, SDP_PSM, 0, 0))
     {
         SDP_TRACE_ERROR0 ("Security Registration Server failed");
@@ -89,7 +89,7 @@ void sdp_init (void)
 
 #if SDP_CLIENT_ENABLED == TRUE
     /* Register with Security Manager for the specific security level */
-    if (!BTM_SetSecurityLevel (TRUE, SDP_SERVICE_NAME, BTM_SEC_SERVICE_SDP_SERVER, 
+    if (!BTM_SetSecurityLevel (TRUE, SDP_SERVICE_NAME, BTM_SEC_SERVICE_SDP_SERVER,
                                SDP_SECURITY_LEVEL, SDP_PSM, 0, 0))
     {
         SDP_TRACE_ERROR0 ("Security Registration for Client failed");
@@ -149,7 +149,7 @@ UINT16 sdp_set_max_attr_list_size (UINT16 max_size)
 **
 ** Description      This function handles an inbound connection indication
 **                  from L2CAP. This is the case where we are acting as a
-**                  server. 
+**                  server.
 **
 ** Returns          void
 **
@@ -171,7 +171,7 @@ static void sdp_connect_ind (BD_ADDR  bd_addr, UINT16 l2cap_cid, UINT16 psm, UIN
     p_ccb->connection_id = l2cap_cid;
 
     /* Send response to the L2CAP layer. */
-    L2CA_ConnectRsp (bd_addr, l2cap_id, l2cap_cid, L2CAP_CONN_OK, L2CAP_CONN_OK); 
+    L2CA_ConnectRsp (bd_addr, l2cap_id, l2cap_cid, L2CAP_CONN_OK, L2CAP_CONN_OK);
     {
         tL2CAP_CFG_INFO cfg = sdp_cb.l2cap_my_cfg;
 
@@ -195,7 +195,7 @@ static void sdp_connect_ind (BD_ADDR  bd_addr, UINT16 l2cap_cid, UINT16 psm, UIN
     SDP_TRACE_EVENT1 ("SDP - Rcvd L2CAP conn ind, sent config req, CID 0x%x", p_ccb->connection_id);
 #else   /* No server */
     /* Reject the connection */
-    L2CA_ConnectRsp (bd_addr, l2cap_id, l2cap_cid, L2CAP_CONN_NO_PSM, 0); 
+    L2CA_ConnectRsp (bd_addr, l2cap_id, l2cap_cid, L2CAP_CONN_NO_PSM, 0);
 #endif
 }
 
@@ -215,7 +215,7 @@ static void sdp_connect_cfm (UINT16 l2cap_cid, UINT16 result)
 {
     tCONN_CB    *p_ccb;
     tL2CAP_CFG_INFO cfg;
-    
+
     /* Find CCB based on CID */
     if ((p_ccb = sdpu_find_ccb_by_cid (l2cap_cid)) == NULL)
     {
@@ -254,20 +254,25 @@ static void sdp_connect_cfm (UINT16 l2cap_cid, UINT16 result)
         SDP_TRACE_WARNING2 ("SDP - Rcvd conn cnf with error: 0x%x  CID 0x%x", result, p_ccb->connection_id);
 
         /* Tell the user if he has a callback */
-        if (p_ccb->p_cb)
+        if (p_ccb->p_cb || p_ccb->p_cb2)
         {
+            UINT16 err = -1;
             if ((result == HCI_ERR_HOST_REJECT_SECURITY)
              || (result == HCI_ERR_AUTH_FAILURE)
              || (result == HCI_ERR_PAIRING_NOT_ALLOWED)
              || (result == HCI_ERR_PAIRING_WITH_UNIT_KEY_NOT_SUPPORTED)
              || (result == HCI_ERR_KEY_MISSING))
-                (*p_ccb->p_cb) (SDP_SECURITY_ERR);
+                err = SDP_SECURITY_ERR;
             else if (result == HCI_ERR_HOST_REJECT_DEVICE)
-                (*p_ccb->p_cb) (SDP_CONN_REJECTED);
+                err = SDP_CONN_REJECTED;
             else
-                (*p_ccb->p_cb) (SDP_CONN_FAILED);
-        }
+                err = SDP_CONN_FAILED;
+            if(p_ccb->p_cb)
+                (*p_ccb->p_cb)(err);
+            else if(p_ccb->p_cb2)
+                (*p_ccb->p_cb2)(err, p_ccb->user_data);
 
+        }
         sdpu_release_ccb (p_ccb);
     }
 }
@@ -456,6 +461,10 @@ static void sdp_disconnect_ind (UINT16 l2cap_cid, BOOLEAN ack_needed)
     if (p_ccb->p_cb)
         (*p_ccb->p_cb) ((UINT16) ((p_ccb->con_state == SDP_STATE_CONNECTED) ?
                         SDP_SUCCESS : SDP_CONN_FAILED));
+    else if (p_ccb->p_cb2)
+        (*p_ccb->p_cb2) ((UINT16) ((p_ccb->con_state == SDP_STATE_CONNECTED) ?
+                        SDP_SUCCESS : SDP_CONN_FAILED), p_ccb->user_data);
+
 #endif
     sdpu_release_ccb (p_ccb);
 }
@@ -478,7 +487,7 @@ static void sdp_disconnect_ind (UINT16 l2cap_cid, BOOLEAN ack_needed)
 static void sdp_data_ind (UINT16 l2cap_cid, BT_HDR *p_msg)
 {
     tCONN_CB    *p_ccb;
-    
+
     /* Find CCB based on CID */
     if ((p_ccb = sdpu_find_ccb_by_cid (l2cap_cid)) != NULL)
     {
@@ -499,7 +508,7 @@ static void sdp_data_ind (UINT16 l2cap_cid, BT_HDR *p_msg)
     {
         SDP_TRACE_WARNING1 ("SDP - Rcvd L2CAP data, unknown CID: 0x%x", l2cap_cid);
     }
-    
+
     GKI_freebuf (p_msg);
 }
 
@@ -628,6 +637,8 @@ void sdp_disconnect (tCONN_CB*p_ccb, UINT16 reason)
         /* Tell the user if he has a callback */
         if (p_ccb->p_cb)
             (*p_ccb->p_cb) (reason);
+        else if (p_ccb->p_cb2)
+            (*p_ccb->p_cb2) (reason, p_ccb->user_data);
 
         sdpu_release_ccb (p_ccb);
     }
@@ -659,6 +670,9 @@ static void sdp_disconnect_cfm (UINT16 l2cap_cid, UINT16 result)
     /* Tell the user if he has a callback */
     if (p_ccb->p_cb)
         (*p_ccb->p_cb) (p_ccb->disconnect_reason);
+    else if (p_ccb->p_cb2)
+        (*p_ccb->p_cb2) (p_ccb->disconnect_reason, p_ccb->user_data);
+
 
     sdpu_release_ccb (p_ccb);
 }
@@ -685,6 +699,8 @@ void sdp_conn_timeout (tCONN_CB*p_ccb)
     /* Tell the user if he has a callback */
     if (p_ccb->p_cb)
         (*p_ccb->p_cb) (SDP_CONN_FAILED);
+    else if (p_ccb->p_cb2)
+        (*p_ccb->p_cb2) (SDP_CONN_FAILED, p_ccb->user_data);
 #endif
     sdpu_release_ccb (p_ccb);
 }
diff --git a/stack/sdp/sdpint.h b/stack/sdp/sdpint.h
index 0f16b8c..f4416d0 100644
--- a/stack/sdp/sdpint.h
+++ b/stack/sdp/sdpint.h
@@ -176,6 +176,8 @@ typedef struct
 #if SDP_CLIENT_ENABLED == TRUE
     tSDP_DISCOVERY_DB *p_db;                    /* Database to save info into   */
     tSDP_DISC_CMPL_CB *p_cb;                    /* Callback for discovery done  */
+    tSDP_DISC_CMPL_CB2 *p_cb2;                   /* Callback for discovery done piggy back with the user data */
+    void               *user_data;              /* piggy back user data */
     UINT32            handles[SDP_MAX_DISC_SERVER_RECS]; /* Discovered server record handles */
     UINT16            num_handles;              /* Number of server handles     */
     UINT16            cur_handle;               /* Current handle being processed */
@@ -200,6 +202,7 @@ typedef struct
     UINT16            cont_offset;              /* Continuation state data in the server response */
     tSDP_CONT_INFO    cont_info;                /* structure to hold continuation information for the server response */
 #endif  /* SDP_SERVER_ENABLED == TRUE */
+
 } tCONN_CB;