Delete unused Broadcom-specific extensions API. (98813794) · Commits · e / os / android_packages_modules_Bluetooth

system/bta/dm/bta_dm_act.c

+1 −21

Original line number	Diff line number	Diff line
		@@ -35,7 +35,6 @@
		#include "btu.h"
		#include "sdp_api.h"
		#include "l2c_api.h"
		#include "wbt_api.h"
		#include "utl.h"
		#include "gap_api.h" /* For GAP_BleReadPeerPrefConnParams */
		#include <string.h>
		@@ -1471,7 +1470,6 @@ void bta_dm_sdp_result (tBTA_DM_MSG *p_data)

		tSDP_DISC_REC *p_sdp_rec = NULL;
		tBTA_DM_MSG *p_msg;
		BOOLEAN service_found = FALSE;
		BOOLEAN scn_found = FALSE;
		UINT16 service = 0xFFFF;
		tSDP_PROTOCOL_ELEM pe;
		@@ -1493,7 +1491,6 @@ void bta_dm_sdp_result (tBTA_DM_MSG *p_data)
		do
		{

		service_found = FALSE;
		p_sdp_rec = NULL;
		if( bta_dm_search_cb.service_index == (BTA_USER_SERVICE_ID+1) )
		{
		@@ -1556,23 +1553,7 @@ void bta_dm_sdp_result (tBTA_DM_MSG *p_data)
		bta_dm_search_cb.services != BTA_ALL_SERVICE_MASK) \|\|
		(p_sdp_rec != NULL))
		{
		/* If Plug and Play service record, check to see if Broadcom stack */
		if (service == UUID_SERVCLASS_PNP_INFORMATION)
		{
		if (p_sdp_rec)
		{
		if (SDP_FindAttributeInRec (p_sdp_rec, ATTR_ID_EXT_BRCM_VERSION))
		{
		service_found = TRUE;
		}
		}
		}
		else
		{
		service_found = TRUE;
		}

		if (service_found)
		if (service != UUID_SERVCLASS_PNP_INFORMATION)
		{
		UINT16 tmp_svc = 0xFFFF;
		bta_dm_search_cb.services_found \|=
		@@ -2026,7 +2007,6 @@ static void bta_dm_find_services ( BD_ADDR bd_addr)
		{

		tSDP_UUID uuid;
		UINT16 attr_list[] = {ATTR_ID_SERVICE_CLASS_ID_LIST, ATTR_ID_EXT_BRCM_VERSION};
		UINT16 num_attrs = 1;
		tBTA_DM_MSG *p_msg;

system/stack/include/wbt_api.h

deleted100644 → 0

+0 −71

Original line number	Diff line number	Diff line
		/******************************************************************************
		*
		* Copyright (C) 2003-2012 Broadcom Corporation
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at:
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*
		******************************************************************************/

		/******************************************************************************
		*
		* This file contains definitions and constants used by the Broadcom
		* Bluetooth Extensions API software.
		*
		******************************************************************************/
		#ifndef WBT_API_H
		#define WBT_API_H

		#include "bt_target.h"

		/*****************************************************************************
		** Constants and Types
		*****************************************************************************/

		/**************************
		* SDP Attribute IDs *
		***************************/
		#define ATTR_ID_EXT_BRCM_VERSION 0x8001 /* UINT16 (0xmmnn - major, minor [0x0001]) mandatory */
		#define ATTR_ID_EXT_PIN_CODE 0x8002 /* UINT32 4 - digit pin */

		/**************************
		* SDP Attribute ID Values *
		***************************/
		/* Version Attribute Value */
		#define BRCM_EXT_VERSION 0x0001 /* UINT16 (0xmmnn - major, minor [0x0001]) mandatory */

		/* Pin Code Attribute Value */
		#define BRCM_EXT_PIN_CODE 0x00000000 /* UINT32 ('0000') */

		/*****************************************************************************
		** External Function Declarations
		*****************************************************************************/
		#ifdef __cplusplus
		extern "C"
		{
		#endif

		extern BOOLEAN WBT_ExtCreateRecord(void);

		/* Features */
		extern BOOLEAN WBT_ExtAddPinCode(void);


		extern UINT32 wbt_sdp_show_ext(UINT8 scn, char *service_name,
		UINT8 pin_code_ext,
		UINT8 active_sync_ext);

		#ifdef __cplusplus
		}
		#endif

		#endif /* WBT_API_H */

system/stack/sdp/sdp_db.c

+0 −12

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@

		#include "sdp_api.h"
		#include "sdpint.h"
		#include "wbt_api.h"

		#if SDP_SERVER_ENABLED == TRUE
		/********************************************************************************/
		@@ -340,7 +339,6 @@ BOOLEAN SDP_DeleteRecord (UINT32 handle)

		/* require new DI record to be created in SDP_SetLocalDiRecord */
		sdp_cb.server_db.di_primary_handle = 0;
		sdp_cb.server_db.brcm_di_registered = 0;

		return (TRUE);
		}
		@@ -369,7 +367,6 @@ BOOLEAN SDP_DeleteRecord (UINT32 handle)
		if( sdp_cb.server_db.di_primary_handle == handle )
		{
		sdp_cb.server_db.di_primary_handle = 0;
		sdp_cb.server_db.brcm_di_registered = 0;
		}

		return (TRUE);
		@@ -505,12 +502,6 @@ BOOLEAN SDP_AddAttribute (UINT32 handle, UINT16 attr_id, UINT8 attr_type,
		return (FALSE);
		}
		p_rec->num_attributes++;

		/* Mark DI record as used by Broadcom */
		if (handle == sdp_cb.server_db.di_primary_handle &&
		attr_id == ATTR_ID_EXT_BRCM_VERSION)
		sdp_cb.server_db.brcm_di_registered = TRUE;

		return (TRUE);
		}
		}
		@@ -1023,6 +1014,3 @@ INT32 SDP_ReadRecord(UINT32 handle, UINT8 p_data, INT32 p_data_len)
		return (offset);
		}
		#endif

system/stack/sdp/sdpint.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,6 @@ typedef struct
		typedef struct
		{
		UINT32 di_primary_handle; /* Device ID Primary record or NULL if nonexistent */
		BOOLEAN brcm_di_registered;
		UINT16 num_records;
		tSDP_RECORD record[SDP_MAX_RECORDS];
		} tSDP_DB;