summaryrefslogtreecommitdiffstats
path: root/stack
diff options
context:
space:
mode:
authorSharvil Nanavati <sharvil@google.com>2014-12-29 04:51:27 -0800
committerAndre Eisenbach <eisenbach@google.com>2015-03-16 16:51:42 -0700
commit85273185da7e3fec7cd70fde10b79b237bde16c1 (patch)
treef1960e42b055e2831c0c65fe068d4d0ce80aa505 /stack
parent181932fad8b91dc6831222e5b616574c39a21565 (diff)
downloadandroid_system_bt-85273185da7e3fec7cd70fde10b79b237bde16c1.tar.gz
android_system_bt-85273185da7e3fec7cd70fde10b79b237bde16c1.tar.bz2
android_system_bt-85273185da7e3fec7cd70fde10b79b237bde16c1.zip
Delete unused Broadcom-specific extensions API.
Diffstat (limited to 'stack')
-rw-r--r--stack/include/wbt_api.h71
-rw-r--r--stack/sdp/sdp_db.c12
-rw-r--r--stack/sdp/sdpint.h1
3 files changed, 0 insertions, 84 deletions
diff --git a/stack/include/wbt_api.h b/stack/include/wbt_api.h
deleted file mode 100644
index 461b57957..000000000
--- a/stack/include/wbt_api.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/******************************************************************************
- *
- * 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 */
diff --git a/stack/sdp/sdp_db.c b/stack/sdp/sdp_db.c
index 322e27dcf..ea8fa8756 100644
--- a/stack/sdp/sdp_db.c
+++ b/stack/sdp/sdp_db.c
@@ -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
-
-
-
diff --git a/stack/sdp/sdpint.h b/stack/sdp/sdpint.h
index 891983c4c..262ac89f0 100644
--- a/stack/sdp/sdpint.h
+++ b/stack/sdp/sdpint.h
@@ -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;