From 81facba4622dd827852bf0ecb9d34e8e571ab4e4 Mon Sep 17 00:00:00 2001 From: Ed Heyl Date: Wed, 25 Jul 2012 06:19:10 -0700 Subject: Fix build breakage: Revert "Fix for CR BLTH01539543" This reverts commit 3ec3b30a9d39c24437f30b98539b542a24e6737d. --- include/bdroid_crespo.txt | 4 ++-- include/bdroid_crespo4g.txt | 4 ++-- include/bdroid_maguro.txt | 4 ++-- include/bdroid_toro.txt | 4 ++-- include/bdroid_wingray.txt | 4 ++-- include/bt_target.h | 8 ++------ 6 files changed, 12 insertions(+), 16 deletions(-) (limited to 'include') diff --git a/include/bdroid_crespo.txt b/include/bdroid_crespo.txt index 7301701..e47625d 100755 --- a/include/bdroid_crespo.txt +++ b/include/bdroid_crespo.txt @@ -17,8 +17,8 @@ L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MO BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK) RFCOMM_INCLUDED = TRUE MAX_RFC_PORTS = 30 -MAX_ACL_CONNECTIONS = 7 -MAX_L2CAP_CHANNELS = 16 +MAX_BD_CONNECTIONS = 7 +MAX_L2CAP_LINKS = 7 BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD) PORT_TX_BUF_HIGH_WM = 10 PORT_RX_BUF_HIGH_WM = 10 diff --git a/include/bdroid_crespo4g.txt b/include/bdroid_crespo4g.txt index 7301701..e47625d 100755 --- a/include/bdroid_crespo4g.txt +++ b/include/bdroid_crespo4g.txt @@ -17,8 +17,8 @@ L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MO BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK) RFCOMM_INCLUDED = TRUE MAX_RFC_PORTS = 30 -MAX_ACL_CONNECTIONS = 7 -MAX_L2CAP_CHANNELS = 16 +MAX_BD_CONNECTIONS = 7 +MAX_L2CAP_LINKS = 7 BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD) PORT_TX_BUF_HIGH_WM = 10 PORT_RX_BUF_HIGH_WM = 10 diff --git a/include/bdroid_maguro.txt b/include/bdroid_maguro.txt index ccb2d25..d1c461a 100755 --- a/include/bdroid_maguro.txt +++ b/include/bdroid_maguro.txt @@ -17,8 +17,8 @@ L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MO BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK) RFCOMM_INCLUDED = TRUE MAX_RFC_PORTS = 30 -MAX_ACL_CONNECTIONS = 7 -MAX_L2CAP_CHANNELS = 16 +MAX_BD_CONNECTIONS = 7 +MAX_L2CAP_LINKS = 7 BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD) PORT_TX_BUF_HIGH_WM = 10 PORT_RX_BUF_HIGH_WM = 10 diff --git a/include/bdroid_toro.txt b/include/bdroid_toro.txt index 2a39aa6..4e563d0 100755 --- a/include/bdroid_toro.txt +++ b/include/bdroid_toro.txt @@ -17,8 +17,8 @@ L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MO BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK) RFCOMM_INCLUDED = TRUE MAX_RFC_PORTS = 30 -MAX_ACL_CONNECTIONS = 7 -MAX_L2CAP_CHANNELS = 16 +MAX_BD_CONNECTIONS = 7 +MAX_L2CAP_LINKS = 7 BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD) PORT_TX_BUF_HIGH_WM = 10 PORT_RX_BUF_HIGH_WM = 10 diff --git a/include/bdroid_wingray.txt b/include/bdroid_wingray.txt index 3e63f69..997e609 100755 --- a/include/bdroid_wingray.txt +++ b/include/bdroid_wingray.txt @@ -17,8 +17,8 @@ L2CAP_EXTFEA_SUPPORTED_MASK = (L2CAP_EXTFEA_ENH_RETRANS | L2CAP_EXTFEA_STREAM_MO BTUI_OPS_FORMATS = (BTA_OP_VCARD21_MASK | BTA_OP_VCAL_MASK | BTA_OP_VNOTE_MASK | BTA_OP_ANY_MASK) RFCOMM_INCLUDED = TRUE MAX_RFC_PORTS = 30 -MAX_ACL_CONNECTIONS = 7 -MAX_L2CAP_CHANNELS = 16 +MAX_BD_CONNECTIONS = 7 +MAX_L2CAP_LINKS = 7 BTA_RFC_MTU_SIZE = (L2CAP_MTU_SIZE-L2CAP_MIN_OFFSET-RFCOMM_DATA_OVERHEAD) PORT_TX_BUF_HIGH_WM = 10 PORT_RX_BUF_HIGH_WM = 10 diff --git a/include/bt_target.h b/include/bt_target.h index 5220134..7e29052 100755 --- a/include/bt_target.h +++ b/include/bt_target.h @@ -844,10 +844,8 @@ and USER_HW_DISABLE_API macros */ #endif /* The maximum number of simultaneous links that L2CAP can support. */ -#ifndef MAX_ACL_CONNECTIONS +#ifndef MAX_L2CAP_LINKS #define MAX_L2CAP_LINKS 4 -#else -#define MAX_L2CAP_LINKS MAX_ACL_CONNECTIONS #endif /* The maximum number of simultaneous channels that L2CAP can support. */ @@ -1224,10 +1222,8 @@ and USER_HW_DISABLE_API macros */ #endif /* The maximum simultaneous links to different devices. */ -#ifndef MAX_ACL_CONNECTIONS +#ifndef MAX_BD_CONNECTIONS #define MAX_BD_CONNECTIONS 1 -#else -#define MAX_BD_CONNECTIONS MAX_ACL_CONNECTIONS #endif /* The port receive queue low watermark level, in bytes. */ -- cgit v1.1