resubmit code-cleanup changes lost in gerrit merge

Change-Id: Iebc520d9b10ef220a83a16ff55efa46b4c5a0d27

6 files changed, 5 insertions, 160 deletions

diff --git a/include/bdroid_crespo.txt b/include/bdroid_crespo.txt
index 573216a..2c58193 100755
--- a/include/bdroid_crespo.txt
+++ b/include/bdroid_crespo.txt
@@ -1,28 +1,9 @@
 AVCT_INCLUDED =  TRUE
 AVRC_INCLUDED = TRUE
-AVRC_METADATA_INCLUDED = FALSE
-AVRC_ADV_CTRL_INCLUDED = FALSE
 AVDT_INCLUDED = TRUE
 UNV_INCLUDED = FALSE
 A2D_INCLUDED = TRUE
 A2D_SBC_INCLUDED = TRUE
-A2D_M12_INCLUDED = FALSE
-A2D_M24_INCLUDED = FALSE
-VDP_INCLUDED = FALSE
-VDP_H263_INCLUDED = FALSE
-VDP_MPEG_INCLUDED = FALSE
-VDP_VEND_INCLUDED = FALSE
-BIP_INCLUDED = FALSE
-BIP_INITR_INCLUDED = FALSE
-BIP_RSPDR_INCLUDED = FALSE
-BIP_PUSH_INCLUDED = FALSE
-BIP_PULL_INCLUDED = FALSE
-BIP_PRINTING_INCLUDED = FALSE
-BIP_ARCHIVE_INCLUDED = FALSE
-BIP_CAMERA_INCLUDED = FALSE
-BIP_DISPLAY_INCLUDED = FALSE
-BPP_INCLUDED = FALSE
-BPP_SND_INCLUDED = FALSE
 DUN_INCLUDED = FALSE
 GAP_INCLUDED = FALSE
 GOEP_INCLUDED = FALSE
@@ -33,14 +14,7 @@ L2CAP_INCLUDED = TRUE
 L2CAP_LINK_INACTIVITY_TOUT = 4
 L2CAP_FCR_INCLUDED = TRUE
 L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-OBX_INCLUDED = TRUE
-OBX_SERVER_INCLUDED = TRUE
-OBX_CLIENT_INCLUDED = TRUE
-OBX_MD5_INCLUDED = FALSE
-OBX_MD5_TEST_INCLUDED = FALSE
-OBX_14_INCLUDED = FALSE
 BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-BTA_OPC_SENDING_ABORT = TRUE
 RFCOMM_INCLUDED = TRUE
 MAX_RFC_PORTS = 30
 MAX_BD_CONNECTIONS = 7
@@ -68,7 +42,6 @@ SDP_MAX_ATTR_LEN = 400
 SDP_MAX_PAD_LEN = 600
 BNEP_INCLUDED = TRUE
 PAN_INCLUDED = TRUE
-SAP_SERVER_INCLUDED = FALSE
 HID_DEV_INCLUDED = FALSE
 HID_HOST_INCLUDED = TRUE
 BLE_INCLUDED = FALSE
@@ -190,7 +163,7 @@ BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA
 PBAP_ZERO_VCARD_IN_DB = FALSE
 BTA_DM_SDP_DB_SIZE = 8000
 MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = TRUE
+FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
 HID_HOST_MAX_CONN_RETRY = (3)
 BTM_DISC_DURING_RS = TRUE
 BTM_WBS_INCLUDED = FALSE
diff --git a/include/bdroid_crespo4g.txt b/include/bdroid_crespo4g.txt
index 573216a..2c58193 100755
--- a/include/bdroid_crespo4g.txt
+++ b/include/bdroid_crespo4g.txt
@@ -1,28 +1,9 @@
 AVCT_INCLUDED =  TRUE
 AVRC_INCLUDED = TRUE
-AVRC_METADATA_INCLUDED = FALSE
-AVRC_ADV_CTRL_INCLUDED = FALSE
 AVDT_INCLUDED = TRUE
 UNV_INCLUDED = FALSE
 A2D_INCLUDED = TRUE
 A2D_SBC_INCLUDED = TRUE
-A2D_M12_INCLUDED = FALSE
-A2D_M24_INCLUDED = FALSE
-VDP_INCLUDED = FALSE
-VDP_H263_INCLUDED = FALSE
-VDP_MPEG_INCLUDED = FALSE
-VDP_VEND_INCLUDED = FALSE
-BIP_INCLUDED = FALSE
-BIP_INITR_INCLUDED = FALSE
-BIP_RSPDR_INCLUDED = FALSE
-BIP_PUSH_INCLUDED = FALSE
-BIP_PULL_INCLUDED = FALSE
-BIP_PRINTING_INCLUDED = FALSE
-BIP_ARCHIVE_INCLUDED = FALSE
-BIP_CAMERA_INCLUDED = FALSE
-BIP_DISPLAY_INCLUDED = FALSE
-BPP_INCLUDED = FALSE
-BPP_SND_INCLUDED = FALSE
 DUN_INCLUDED = FALSE
 GAP_INCLUDED = FALSE
 GOEP_INCLUDED = FALSE
@@ -33,14 +14,7 @@ L2CAP_INCLUDED = TRUE
 L2CAP_LINK_INACTIVITY_TOUT = 4
 L2CAP_FCR_INCLUDED = TRUE
 L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-OBX_INCLUDED = TRUE
-OBX_SERVER_INCLUDED = TRUE
-OBX_CLIENT_INCLUDED = TRUE
-OBX_MD5_INCLUDED = FALSE
-OBX_MD5_TEST_INCLUDED = FALSE
-OBX_14_INCLUDED = FALSE
 BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-BTA_OPC_SENDING_ABORT = TRUE
 RFCOMM_INCLUDED = TRUE
 MAX_RFC_PORTS = 30
 MAX_BD_CONNECTIONS = 7
@@ -68,7 +42,6 @@ SDP_MAX_ATTR_LEN = 400
 SDP_MAX_PAD_LEN = 600
 BNEP_INCLUDED = TRUE
 PAN_INCLUDED = TRUE
-SAP_SERVER_INCLUDED = FALSE
 HID_DEV_INCLUDED = FALSE
 HID_HOST_INCLUDED = TRUE
 BLE_INCLUDED = FALSE
@@ -190,7 +163,7 @@ BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA
 PBAP_ZERO_VCARD_IN_DB = FALSE
 BTA_DM_SDP_DB_SIZE = 8000
 MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = TRUE
+FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
 HID_HOST_MAX_CONN_RETRY = (3)
 BTM_DISC_DURING_RS = TRUE
 BTM_WBS_INCLUDED = FALSE
diff --git a/include/bdroid_maguro.txt b/include/bdroid_maguro.txt
index 917d8ef..9fe40d7 100755
--- a/include/bdroid_maguro.txt
+++ b/include/bdroid_maguro.txt
@@ -1,28 +1,9 @@
 AVCT_INCLUDED =  TRUE
 AVRC_INCLUDED = TRUE
-AVRC_METADATA_INCLUDED = FALSE
-AVRC_ADV_CTRL_INCLUDED = FALSE
 AVDT_INCLUDED = TRUE
 UNV_INCLUDED = FALSE
 A2D_INCLUDED = TRUE
 A2D_SBC_INCLUDED = TRUE
-A2D_M12_INCLUDED = FALSE
-A2D_M24_INCLUDED = FALSE
-VDP_INCLUDED = FALSE
-VDP_H263_INCLUDED = FALSE
-VDP_MPEG_INCLUDED = FALSE
-VDP_VEND_INCLUDED = FALSE
-BIP_INCLUDED = FALSE
-BIP_INITR_INCLUDED = FALSE
-BIP_RSPDR_INCLUDED = FALSE
-BIP_PUSH_INCLUDED = FALSE
-BIP_PULL_INCLUDED = FALSE
-BIP_PRINTING_INCLUDED = FALSE
-BIP_ARCHIVE_INCLUDED = FALSE
-BIP_CAMERA_INCLUDED = FALSE
-BIP_DISPLAY_INCLUDED = FALSE
-BPP_INCLUDED = FALSE
-BPP_SND_INCLUDED = FALSE
 DUN_INCLUDED = FALSE
 GAP_INCLUDED = FALSE
 GOEP_INCLUDED = FALSE
@@ -33,14 +14,7 @@ L2CAP_INCLUDED = TRUE
 L2CAP_LINK_INACTIVITY_TOUT = 4
 L2CAP_FCR_INCLUDED = TRUE
 L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-OBX_INCLUDED = TRUE
-OBX_SERVER_INCLUDED = TRUE
-OBX_CLIENT_INCLUDED = TRUE
-OBX_MD5_INCLUDED = FALSE
-OBX_MD5_TEST_INCLUDED = FALSE
-OBX_14_INCLUDED = FALSE
 BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-BTA_OPC_SENDING_ABORT = TRUE
 RFCOMM_INCLUDED = TRUE
 MAX_RFC_PORTS = 30
 MAX_BD_CONNECTIONS = 7
@@ -68,7 +42,6 @@ SDP_MAX_ATTR_LEN = 400
 SDP_MAX_PAD_LEN = 600
 BNEP_INCLUDED = TRUE
 PAN_INCLUDED = TRUE
-SAP_SERVER_INCLUDED = FALSE
 HID_DEV_INCLUDED = FALSE
 HID_HOST_INCLUDED = TRUE
 BLE_INCLUDED = FALSE
@@ -188,7 +161,7 @@ BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA
 PBAP_ZERO_VCARD_IN_DB = FALSE
 BTA_DM_SDP_DB_SIZE = 8000
 MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = TRUE
+FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
 HID_HOST_MAX_CONN_RETRY = (3)
 BTM_DISC_DURING_RS = TRUE
 BTM_WBS_INCLUDED = FALSE
diff --git a/include/bdroid_toro.txt b/include/bdroid_toro.txt
index a8742ce..3e5a4ea 100755
--- a/include/bdroid_toro.txt
+++ b/include/bdroid_toro.txt
@@ -1,28 +1,9 @@
 AVCT_INCLUDED =  TRUE
 AVRC_INCLUDED = TRUE
-AVRC_METADATA_INCLUDED = FALSE
-AVRC_ADV_CTRL_INCLUDED = FALSE
 AVDT_INCLUDED = TRUE
 UNV_INCLUDED = FALSE
 A2D_INCLUDED = TRUE
 A2D_SBC_INCLUDED = TRUE
-A2D_M12_INCLUDED = FALSE
-A2D_M24_INCLUDED = FALSE
-VDP_INCLUDED = FALSE
-VDP_H263_INCLUDED = FALSE
-VDP_MPEG_INCLUDED = FALSE
-VDP_VEND_INCLUDED = FALSE
-BIP_INCLUDED = FALSE
-BIP_INITR_INCLUDED = FALSE
-BIP_RSPDR_INCLUDED = FALSE
-BIP_PUSH_INCLUDED = FALSE
-BIP_PULL_INCLUDED = FALSE
-BIP_PRINTING_INCLUDED = FALSE
-BIP_ARCHIVE_INCLUDED = FALSE
-BIP_CAMERA_INCLUDED = FALSE
-BIP_DISPLAY_INCLUDED = FALSE
-BPP_INCLUDED = FALSE
-BPP_SND_INCLUDED = FALSE
 DUN_INCLUDED = FALSE
 GAP_INCLUDED = FALSE
 GOEP_INCLUDED = FALSE
@@ -33,14 +14,7 @@ L2CAP_INCLUDED = TRUE
 L2CAP_LINK_INACTIVITY_TOUT = 4
 L2CAP_FCR_INCLUDED = TRUE
 L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-OBX_INCLUDED = TRUE
-OBX_SERVER_INCLUDED = TRUE
-OBX_CLIENT_INCLUDED = TRUE
-OBX_MD5_INCLUDED = FALSE
-OBX_MD5_TEST_INCLUDED = FALSE
-OBX_14_INCLUDED = FALSE
 BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-BTA_OPC_SENDING_ABORT = TRUE
 RFCOMM_INCLUDED = TRUE
 MAX_RFC_PORTS = 30
 MAX_BD_CONNECTIONS = 7
@@ -68,7 +42,6 @@ SDP_MAX_ATTR_LEN = 400
 SDP_MAX_PAD_LEN = 600
 BNEP_INCLUDED = TRUE
 PAN_INCLUDED = TRUE
-SAP_SERVER_INCLUDED = FALSE
 HID_DEV_INCLUDED = FALSE
 HID_HOST_INCLUDED = TRUE
 BLE_INCLUDED = FALSE
@@ -188,7 +161,7 @@ BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA
 PBAP_ZERO_VCARD_IN_DB = FALSE
 BTA_DM_SDP_DB_SIZE = 8000
 MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = TRUE
+FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
 HID_HOST_MAX_CONN_RETRY = (3)
 BTM_DISC_DURING_RS = TRUE
 BTM_WBS_INCLUDED = FALSE
diff --git a/include/bdroid_wingray.txt b/include/bdroid_wingray.txt
index a63f095..3636ba7 100755
--- a/include/bdroid_wingray.txt
+++ b/include/bdroid_wingray.txt
@@ -1,28 +1,9 @@
 AVCT_INCLUDED =  TRUE
 AVRC_INCLUDED = TRUE
-AVRC_METADATA_INCLUDED = FALSE
-AVRC_ADV_CTRL_INCLUDED = FALSE
 AVDT_INCLUDED = TRUE
 UNV_INCLUDED = FALSE
 A2D_INCLUDED = TRUE
 A2D_SBC_INCLUDED = TRUE
-A2D_M12_INCLUDED = FALSE
-A2D_M24_INCLUDED = FALSE
-VDP_INCLUDED = FALSE
-VDP_H263_INCLUDED = FALSE
-VDP_MPEG_INCLUDED = FALSE
-VDP_VEND_INCLUDED = FALSE
-BIP_INCLUDED = FALSE
-BIP_INITR_INCLUDED = FALSE
-BIP_RSPDR_INCLUDED = FALSE
-BIP_PUSH_INCLUDED = FALSE
-BIP_PULL_INCLUDED = FALSE
-BIP_PRINTING_INCLUDED = FALSE
-BIP_ARCHIVE_INCLUDED = FALSE
-BIP_CAMERA_INCLUDED = FALSE
-BIP_DISPLAY_INCLUDED = FALSE
-BPP_INCLUDED = FALSE
-BPP_SND_INCLUDED = FALSE
 DUN_INCLUDED = FALSE
 GAP_INCLUDED = FALSE
 GOEP_INCLUDED = FALSE
@@ -33,14 +14,7 @@ L2CAP_INCLUDED = TRUE
 L2CAP_LINK_INACTIVITY_TOUT = 4
 L2CAP_FCR_INCLUDED = TRUE
 L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MODE | L2CAP_EXTFEA_NO_CRC | L2CAP_EXTFEA_FIXED_CHNLS)
-OBX_INCLUDED = TRUE
-OBX_SERVER_INCLUDED = TRUE
-OBX_CLIENT_INCLUDED = TRUE
-OBX_MD5_INCLUDED = FALSE
-OBX_MD5_TEST_INCLUDED = FALSE
-OBX_14_INCLUDED = FALSE
 BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK)
-BTA_OPC_SENDING_ABORT = TRUE
 RFCOMM_INCLUDED = TRUE
 MAX_RFC_PORTS = 30
 MAX_BD_CONNECTIONS = 7
@@ -68,7 +42,6 @@ SDP_MAX_ATTR_LEN = 400
 SDP_MAX_PAD_LEN = 600
 BNEP_INCLUDED = TRUE
 PAN_INCLUDED = TRUE
-SAP_SERVER_INCLUDED = FALSE
 HID_DEV_INCLUDED = FALSE
 HID_HOST_INCLUDED = FALSE
 BLE_INCLUDED = FALSE
@@ -189,7 +162,7 @@ BTAPP_DM_SUPPORTED_SERVICES = (BTA_HSP_SERVICE_MASK | BTA_HFP_SERVICE_MASK | BTA
 PBAP_ZERO_VCARD_IN_DB = FALSE
 BTA_DM_SDP_DB_SIZE = 8000
 MAX_L2CAP_CLIENTS = 15
-FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = TRUE
+FTS_REJECT_INVALID_OBEX_SET_PATH_REQ = FALSE
 HID_HOST_MAX_CONN_RETRY = (3)
 BTM_DISC_DURING_RS = TRUE
 BTM_WBS_INCLUDED = FALSE
diff --git a/include/bt_target.h b/include/bt_target.h
index b5ac06c..7e29052 100755
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -3022,16 +3022,6 @@ Range: Minimum 12000 (12 secs) on BR/EDR when supporting PBF.
 #define AVCT_NUM_CONN               3
 #endif
 
-/* TRUE to support the browsing channel. */
-#ifndef AVCT_BROWSE_INCLUDED
-#define AVCT_BROWSE_INCLUDED        TRUE
-#endif
-
-#if ((L2CAP_FCR_INCLUDED == FALSE) && (AVCT_BROWSE_INCLUDED == TRUE))
-#undef AVCT_BROWSE_INCLUDED
-#define AVCT_BROWSE_INCLUDED        FALSE
-#endif
-
 /* Pool ID where to reassemble the SDU.
    This Pool allows buffers to be used that are larger than
    the L2CAP_MAX_MTU. */
@@ -3113,16 +3103,6 @@ Range: Minimum 12000 (12 secs) when supporting PBF.
 #define AVRC_INCLUDED               FALSE
 #endif
 
-/* TRUE to support AVRCP 1.3 - Metadata. */
-#ifndef AVRC_METADATA_INCLUDED
-#define AVRC_METADATA_INCLUDED      TRUE
-#endif
-
-/* TRUE to support AVRCP 1.4 - Advanced Control. */
-#ifndef AVRC_ADV_CTRL_INCLUDED
-#define AVRC_ADV_CTRL_INCLUDED      TRUE
-#endif
-
 /******************************************************************************
 **
 ** MCAP