From 5c35aa44a2d92185d9eee51781f2522773607986 Mon Sep 17 00:00:00 2001 From: Sharvil Nanavati Date: Wed, 10 Jun 2015 23:20:24 -0700 Subject: [PATCH] Delete unused function declarations from sdp_api.h. Change-Id: I8db02d557fdfc138f2ec8de2b2d45049175fd999 --- stack/include/sdp_api.h | 119 +++++++++++++----------------------------------- 1 file changed, 31 insertions(+), 88 deletions(-) diff --git a/stack/include/sdp_api.h b/stack/include/sdp_api.h index ff44bf5f6..16f2dbc8d 100644 --- a/stack/include/sdp_api.h +++ b/stack/include/sdp_api.h @@ -176,15 +176,6 @@ typedef struct t_sdp_di_get_record tSDP_DI_RECORD rec; }tSDP_DI_GET_RECORD; - -/***************************************************************************** -** External Function Declarations -*****************************************************************************/ -#ifdef __cplusplus -extern "C" -{ -#endif - /* API into the SDP layer for service discovery. */ /******************************************************************************* @@ -196,7 +187,7 @@ extern "C" ** Returns TRUE if successful, FALSE if one or more parameters are bad ** *******************************************************************************/ -extern BOOLEAN SDP_InitDiscoveryDb (tSDP_DISCOVERY_DB *p_db, UINT32 len, +BOOLEAN SDP_InitDiscoveryDb (tSDP_DISCOVERY_DB *p_db, UINT32 len, UINT16 num_uuid, tSDP_UUID *p_uuid_list, UINT16 num_attr, @@ -211,7 +202,7 @@ extern BOOLEAN SDP_InitDiscoveryDb (tSDP_DISCOVERY_DB *p_db, UINT32 len, ** Returns TRUE if discovery cancelled, FALSE if a matching activity is not found. ** *******************************************************************************/ -extern BOOLEAN SDP_CancelServiceSearch (tSDP_DISCOVERY_DB *p_db); +BOOLEAN SDP_CancelServiceSearch (tSDP_DISCOVERY_DB *p_db); /******************************************************************************* ** @@ -222,7 +213,7 @@ extern BOOLEAN SDP_CancelServiceSearch (tSDP_DISCOVERY_DB *p_db); ** Returns TRUE if discovery started, FALSE if failed. ** *******************************************************************************/ -extern BOOLEAN SDP_ServiceSearchRequest (UINT8 *p_bd_addr, +BOOLEAN SDP_ServiceSearchRequest (UINT8 *p_bd_addr, tSDP_DISCOVERY_DB *p_db, tSDP_DISC_CMPL_CB *p_cb); @@ -240,7 +231,7 @@ extern BOOLEAN SDP_ServiceSearchRequest (UINT8 *p_bd_addr, ** Returns TRUE if discovery started, FALSE if failed. ** *******************************************************************************/ -extern BOOLEAN SDP_ServiceSearchAttributeRequest (UINT8 *p_bd_addr, +BOOLEAN SDP_ServiceSearchAttributeRequest (UINT8 *p_bd_addr, tSDP_DISCOVERY_DB *p_db, tSDP_DISC_CMPL_CB *p_cb); @@ -258,7 +249,7 @@ extern BOOLEAN SDP_ServiceSearchAttributeRequest (UINT8 *p_bd_addr, ** Returns TRUE if discovery started, FALSE if failed. ** *******************************************************************************/ -extern BOOLEAN SDP_ServiceSearchAttributeRequest2 (UINT8 *p_bd_addr, +BOOLEAN SDP_ServiceSearchAttributeRequest2 (UINT8 *p_bd_addr, tSDP_DISCOVERY_DB *p_db, tSDP_DISC_CMPL_CB2 *p_cb, void * user_data); @@ -276,7 +267,7 @@ extern BOOLEAN SDP_ServiceSearchAttributeRequest2 (UINT8 *p_bd_addr, ** Returns Pointer to matching record, or NULL ** *******************************************************************************/ -extern tSDP_DISC_REC *SDP_FindAttributeInDb (tSDP_DISCOVERY_DB *p_db, +tSDP_DISC_REC *SDP_FindAttributeInDb (tSDP_DISCOVERY_DB *p_db, UINT16 attr_id, tSDP_DISC_REC *p_start_rec); @@ -291,7 +282,7 @@ extern tSDP_DISC_REC *SDP_FindAttributeInDb (tSDP_DISCOVERY_DB *p_db, ** Returns Pointer to matching attribute entry, or NULL ** *******************************************************************************/ -extern tSDP_DISC_ATTR *SDP_FindAttributeInRec (tSDP_DISC_REC *p_rec, +tSDP_DISC_ATTR *SDP_FindAttributeInRec (tSDP_DISC_REC *p_rec, UINT16 attr_id); @@ -307,7 +298,7 @@ extern tSDP_DISC_ATTR *SDP_FindAttributeInRec (tSDP_DISC_REC *p_rec, ** Returns Pointer to record containing service class, or NULL ** *******************************************************************************/ -extern tSDP_DISC_REC *SDP_FindServiceInDb (tSDP_DISCOVERY_DB *p_db, +tSDP_DISC_REC *SDP_FindServiceInDb (tSDP_DISCOVERY_DB *p_db, UINT16 service_uuid, tSDP_DISC_REC *p_start_rec); @@ -328,7 +319,7 @@ extern tSDP_DISC_REC *SDP_FindServiceInDb (tSDP_DISCOVERY_DB *p_db, ** Returns Pointer to record containing service class, or NULL ** *******************************************************************************/ -extern tSDP_DISC_REC *SDP_FindServiceUUIDInDb (tSDP_DISCOVERY_DB *p_db, +tSDP_DISC_REC *SDP_FindServiceUUIDInDb (tSDP_DISCOVERY_DB *p_db, tBT_UUID *p_uuid, tSDP_DISC_REC *p_start_rec); @@ -345,7 +336,7 @@ extern tSDP_DISC_REC *SDP_FindServiceUUIDInDb (tSDP_DISCOVERY_DB *p_db, ** Returns TRUE if found, otherwise FALSE. ** *******************************************************************************/ -extern BOOLEAN SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid); +BOOLEAN SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC *p_rec, tBT_UUID * p_uuid); /******************************************************************************* ** @@ -359,7 +350,7 @@ extern BOOLEAN SDP_FindServiceUUIDInRec_128bit(tSDP_DISC_REC *p_rec, tBT_UUID * ** Returns Pointer to record containing service class, or NULL ** *******************************************************************************/ -extern tSDP_DISC_REC *SDP_FindServiceInDb_128bit(tSDP_DISCOVERY_DB *p_db, +tSDP_DISC_REC *SDP_FindServiceInDb_128bit(tSDP_DISCOVERY_DB *p_db, tSDP_DISC_REC *p_start_rec); /******************************************************************************* @@ -373,7 +364,7 @@ extern tSDP_DISC_REC *SDP_FindServiceInDb_128bit(tSDP_DISCOVERY_DB *p_db, ** If found, the passed protocol list element is filled in. ** *******************************************************************************/ -extern BOOLEAN SDP_FindProtocolListElemInRec (tSDP_DISC_REC *p_rec, +BOOLEAN SDP_FindProtocolListElemInRec (tSDP_DISC_REC *p_rec, UINT16 layer_uuid, tSDP_PROTOCOL_ELEM *p_elem); @@ -389,7 +380,7 @@ extern BOOLEAN SDP_FindProtocolListElemInRec (tSDP_DISC_REC *p_rec, ** If found, the passed protocol list element is filled in. ** *******************************************************************************/ -extern BOOLEAN SDP_FindAddProtoListsElemInRec (tSDP_DISC_REC *p_rec, +BOOLEAN SDP_FindAddProtoListsElemInRec (tSDP_DISC_REC *p_rec, UINT16 layer_uuid, tSDP_PROTOCOL_ELEM *p_elem); @@ -408,7 +399,7 @@ extern BOOLEAN SDP_FindAddProtoListsElemInRec (tSDP_DISC_REC *p_rec, ** in are filled in. ** *******************************************************************************/ -extern BOOLEAN SDP_FindProfileVersionInRec (tSDP_DISC_REC *p_rec, +BOOLEAN SDP_FindProfileVersionInRec (tSDP_DISC_REC *p_rec, UINT16 profile_uuid, UINT16 *p_version); @@ -427,7 +418,7 @@ extern BOOLEAN SDP_FindProfileVersionInRec (tSDP_DISC_REC *p_rec, ** Returns Record handle if OK, else 0. ** *******************************************************************************/ -extern UINT32 SDP_CreateRecord (void); +UINT32 SDP_CreateRecord (void); /******************************************************************************* @@ -443,7 +434,7 @@ extern UINT32 SDP_CreateRecord (void); ** Returns TRUE if succeeded, else FALSE ** *******************************************************************************/ -extern BOOLEAN SDP_DeleteRecord (UINT32 handle); +BOOLEAN SDP_DeleteRecord (UINT32 handle); /******************************************************************************* @@ -459,7 +450,7 @@ extern BOOLEAN SDP_DeleteRecord (UINT32 handle); ** The size of data copied into p_data is in *p_data_len. ** *******************************************************************************/ -extern INT32 SDP_ReadRecord(UINT32 handle, UINT8 *p_data, INT32 *p_data_len); +INT32 SDP_ReadRecord(UINT32 handle, UINT8 *p_data, INT32 *p_data_len); /******************************************************************************* ** @@ -475,7 +466,7 @@ extern INT32 SDP_ReadRecord(UINT32 handle, UINT8 *p_data, INT32 *p_data_len); ** Returns TRUE if added OK, else FALSE ** *******************************************************************************/ -extern BOOLEAN SDP_AddAttribute (UINT32 handle, UINT16 attr_id, +BOOLEAN SDP_AddAttribute (UINT32 handle, UINT16 attr_id, UINT8 attr_type, UINT32 attr_len, UINT8 *p_val); @@ -494,7 +485,7 @@ extern BOOLEAN SDP_AddAttribute (UINT32 handle, UINT16 attr_id, ** Returns TRUE if added OK, else FALSE ** *******************************************************************************/ -extern BOOLEAN SDP_AddSequence (UINT32 handle, UINT16 attr_id, +BOOLEAN SDP_AddSequence (UINT32 handle, UINT16 attr_id, UINT16 num_elem, UINT8 type[], UINT8 len[], UINT8 *p_val[]); @@ -511,7 +502,7 @@ extern BOOLEAN SDP_AddSequence (UINT32 handle, UINT16 attr_id, ** Returns TRUE if added OK, else FALSE ** *******************************************************************************/ -extern BOOLEAN SDP_AddUuidSequence (UINT32 handle, UINT16 attr_id, +BOOLEAN SDP_AddUuidSequence (UINT32 handle, UINT16 attr_id, UINT16 num_uuids, UINT16 *p_uuids); @@ -527,7 +518,7 @@ extern BOOLEAN SDP_AddUuidSequence (UINT32 handle, UINT16 attr_id, ** Returns TRUE if added OK, else FALSE ** *******************************************************************************/ -extern BOOLEAN SDP_AddProtocolList (UINT32 handle, UINT16 num_elem, +BOOLEAN SDP_AddProtocolList (UINT32 handle, UINT16 num_elem, tSDP_PROTOCOL_ELEM *p_elem_list); @@ -543,7 +534,7 @@ extern BOOLEAN SDP_AddProtocolList (UINT32 handle, UINT16 num_elem, ** Returns TRUE if added OK, else FALSE ** *******************************************************************************/ -extern BOOLEAN SDP_AddAdditionProtoLists (UINT32 handle, UINT16 num_elem, +BOOLEAN SDP_AddAdditionProtoLists (UINT32 handle, UINT16 num_elem, tSDP_PROTO_LIST_ELEM *p_proto_list); @@ -559,11 +550,10 @@ extern BOOLEAN SDP_AddAdditionProtoLists (UINT32 handle, UINT16 num_elem, ** Returns TRUE if added OK, else FALSE ** *******************************************************************************/ -extern BOOLEAN SDP_AddProfileDescriptorList (UINT32 handle, +BOOLEAN SDP_AddProfileDescriptorList (UINT32 handle, UINT16 profile_uuid, UINT16 version); - /******************************************************************************* ** ** Function SDP_AddLanguageBaseAttrIDList @@ -576,11 +566,10 @@ extern BOOLEAN SDP_AddProfileDescriptorList (UINT32 handle, ** Returns TRUE if added OK, else FALSE ** *******************************************************************************/ -extern BOOLEAN SDP_AddLanguageBaseAttrIDList (UINT32 handle, +BOOLEAN SDP_AddLanguageBaseAttrIDList (UINT32 handle, UINT16 lang, UINT16 char_enc, UINT16 base_id); - /******************************************************************************* ** ** Function SDP_AddServiceClassIdList @@ -593,11 +582,10 @@ extern BOOLEAN SDP_AddLanguageBaseAttrIDList (UINT32 handle, ** Returns TRUE if added OK, else FALSE ** *******************************************************************************/ -extern BOOLEAN SDP_AddServiceClassIdList (UINT32 handle, +BOOLEAN SDP_AddServiceClassIdList (UINT32 handle, UINT16 num_services, UINT16 *p_service_uuids); - /******************************************************************************* ** ** Function SDP_DeleteAttribute @@ -608,8 +596,7 @@ extern BOOLEAN SDP_AddServiceClassIdList (UINT32 handle, ** Returns TRUE if deleted OK, else FALSE if not found ** *******************************************************************************/ -extern BOOLEAN SDP_DeleteAttribute (UINT32 handle, UINT16 attr_id); - +BOOLEAN SDP_DeleteAttribute (UINT32 handle, UINT16 attr_id); /* Device Identification APIs */ @@ -622,7 +609,7 @@ extern BOOLEAN SDP_DeleteAttribute (UINT32 handle, UINT16 attr_id); ** Returns Returns SDP_SUCCESS if record added successfully, else error ** *******************************************************************************/ -extern UINT16 SDP_SetLocalDiRecord (tSDP_DI_RECORD *device_info, +UINT16 SDP_SetLocalDiRecord (tSDP_DI_RECORD *device_info, UINT32 *p_handle); /******************************************************************************* @@ -634,11 +621,10 @@ extern UINT16 SDP_SetLocalDiRecord (tSDP_DI_RECORD *device_info, ** Returns SDP_SUCCESS if query started successfully, else error ** *******************************************************************************/ -extern UINT16 SDP_DiDiscover (BD_ADDR remote_device, +UINT16 SDP_DiDiscover (BD_ADDR remote_device, tSDP_DISCOVERY_DB *p_db, UINT32 len, tSDP_DISC_CMPL_CB *p_cb); - /******************************************************************************* ** ** Function SDP_GetNumDiRecords @@ -648,8 +634,7 @@ extern UINT16 SDP_DiDiscover (BD_ADDR remote_device, ** Returns number of DI records found ** *******************************************************************************/ -extern UINT8 SDP_GetNumDiRecords (tSDP_DISCOVERY_DB *p_db); - +UINT8 SDP_GetNumDiRecords (tSDP_DISCOVERY_DB *p_db); /******************************************************************************* ** @@ -661,11 +646,10 @@ extern UINT8 SDP_GetNumDiRecords (tSDP_DISCOVERY_DB *p_db); ** Returns SDP_SUCCESS if record retrieved, else error ** *******************************************************************************/ -extern UINT16 SDP_GetDiRecord (UINT8 getRecordIndex, +UINT16 SDP_GetDiRecord (UINT8 getRecordIndex, tSDP_DI_GET_RECORD *device_info, tSDP_DISCOVERY_DB *p_db); - /******************************************************************************* ** ** Function SDP_SetTraceLevel @@ -676,44 +660,7 @@ extern UINT16 SDP_GetDiRecord (UINT8 getRecordIndex, ** Returns the new (current) trace level ** *******************************************************************************/ -extern UINT8 SDP_SetTraceLevel (UINT8 new_level); - -/******************************************************************************* -** -** Function SDP_ConnOpen -** -** Description This function creates a connection to the SDP server on the -** given device. -** -** Returns 0, if failed to initiate connection. Otherwise, the handle. -** -*******************************************************************************/ -UINT32 SDP_ConnOpen (UINT8 *p_bd_addr, tSDP_DISC_RES_CB *p_rcb, - tSDP_DISC_CMPL_CB *p_cb); - -/******************************************************************************* -** -** Function SDP_WriteData -** -** Description This function sends data to the connected SDP server. -** -** Returns TRUE if data is sent, FALSE if failed. -** -*******************************************************************************/ -BOOLEAN SDP_WriteData (UINT32 handle, BT_HDR *p_msg); - -/******************************************************************************* -** -** Function SDP_ConnClose -** -** Description This function is called to close a SDP connection. -** -** Parameters: handle - Handle of the connection returned by SDP_ConnOpen -** -** Returns TRUE if connection is closed, FALSE if failed to find the handle. -** -*******************************************************************************/ -BOOLEAN SDP_ConnClose (UINT32 handle); +UINT8 SDP_SetTraceLevel (UINT8 new_level); /******************************************************************************* ** @@ -729,8 +676,4 @@ BOOLEAN SDP_ConnClose (UINT32 handle); *******************************************************************************/ BOOLEAN SDP_FindServiceUUIDInRec(tSDP_DISC_REC *p_rec, tBT_UUID *p_uuid); -#ifdef __cplusplus -} -#endif - #endif /* SDP_API_H */ -- 2.11.0