Fix for CR BLTH01539543

Define max L2CAP channels to be 16 and combine MAX_L2CAP_LINKS and MAX_BD_CONNECTION into one definition

Change-Id: Ib5cb95f5829400b2182beb3c8409142a20b8fb95

14 files changed, 32 insertions, 28 deletions

diff --git a/include/bdroid_crespo.txt b/include/bdroid_crespo.txt
index e47625d..7301701 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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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 e47625d..7301701 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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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_generic.txt b/include/bdroid_generic.txt
index 9fe40d7..204b09f 100755
--- a/include/bdroid_generic.txt
+++ b/include/bdroid_generic.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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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_generic_x86.txt b/include/bdroid_generic_x86.txt
index 9fe40d7..204b09f 100755
--- a/include/bdroid_generic_x86.txt
+++ b/include/bdroid_generic_x86.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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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_grouper.txt b/include/bdroid_grouper.txt
index 45de212..cb8afbf 100755
--- a/include/bdroid_grouper.txt
+++ b/include/bdroid_grouper.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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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 d1c461a..ccb2d25 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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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_manta.txt b/include/bdroid_manta.txt
index 45de212..cb8afbf 100755
--- a/include/bdroid_manta.txt
+++ b/include/bdroid_manta.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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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_panda.txt b/include/bdroid_panda.txt
index 9fe40d7..204b09f 100755
--- a/include/bdroid_panda.txt
+++ b/include/bdroid_panda.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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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_phantasm.txt b/include/bdroid_phantasm.txt
index 73539dc..55c348d 100755
--- a/include/bdroid_phantasm.txt
+++ b/include/bdroid_phantasm.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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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_stingray.txt b/include/bdroid_stingray.txt
index 3636ba7..a11f48d 100755
--- a/include/bdroid_stingray.txt
+++ b/include/bdroid_stingray.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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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 4e563d0..2a39aa6 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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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_tuna.txt b/include/bdroid_tuna.txt
index 9fe40d7..204b09f 100755
--- a/include/bdroid_tuna.txt
+++ b/include/bdroid_tuna.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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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 997e609..3e63f69 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_BD_CONNECTIONS = 7
-MAX_L2CAP_LINKS = 7
+MAX_ACL_CONNECTIONS = 7
+MAX_L2CAP_CHANNELS = 16
 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 7e29052..5220134 100755
--- a/include/bt_target.h
+++ b/include/bt_target.h
@@ -844,8 +844,10 @@ and USER_HW_DISABLE_API macros */
 #endif
 
 /* The maximum number of simultaneous links that L2CAP can support. */
-#ifndef MAX_L2CAP_LINKS
+#ifndef MAX_ACL_CONNECTIONS
 #define MAX_L2CAP_LINKS             4
+#else
+#define MAX_L2CAP_LINKS             MAX_ACL_CONNECTIONS
 #endif
 
 /* The maximum number of simultaneous channels that L2CAP can support. */
@@ -1222,8 +1224,10 @@ and USER_HW_DISABLE_API macros */
 #endif
 
 /* The maximum simultaneous links to different devices. */
-#ifndef MAX_BD_CONNECTIONS
+#ifndef MAX_ACL_CONNECTIONS
 #define MAX_BD_CONNECTIONS          1
+#else
+#define MAX_BD_CONNECTIONS          MAX_ACL_CONNECTIONS
 #endif
 
 /* The port receive queue low watermark level, in bytes. */