diff options
| author | Casper Bonde <c.bonde@samsung.com> | 2015-04-13 21:58:56 +0200 |
|---|---|---|
| committer | Andre Eisenbach <eisenbach@google.com> | 2015-04-13 14:23:29 -0700 |
| commit | d232721ae5e5b6949a5249f0d116408b8a3c5f1d (patch) | |
| tree | 20a26dd135f491116375b4a3a0446c5c226d9552 /include | |
| parent | 899b77140675a157dba034e98527ab546bc9ac35 (diff) | |
| download | android_system_bt-d232721ae5e5b6949a5249f0d116408b8a3c5f1d.tar.gz android_system_bt-d232721ae5e5b6949a5249f0d116408b8a3c5f1d.tar.bz2 android_system_bt-d232721ae5e5b6949a5249f0d116408b8a3c5f1d.zip | |
L2CAP socket - fix merge errors
This fixes a few changes that was reverted by mistake,
causing uninitialized data to be used as instance data
in GAP and no buffers allocated to the L2CAP sockets.
Change-Id: I060c5faf602c1dedcc34b4acd1417949820a4da4
Diffstat (limited to 'include')
| -rw-r--r-- | include/bt_target.h | 11 | ||||
| -rw-r--r-- | include/gki_target.h | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/include/bt_target.h b/include/bt_target.h index b2550739c..4fb2a0f4c 100644 --- a/include/bt_target.h +++ b/include/bt_target.h @@ -1101,6 +1101,17 @@ ** ******************************************************************************/ #define OBX_14_INCLUDED FALSE + +/* The maximum number of registered servers. */ +#ifndef OBX_NUM_SERVERS +#define OBX_NUM_SERVERS 12 +#endif + +/* The maximum number of active clients. */ +#ifndef OBX_NUM_CLIENTS +#define OBX_NUM_CLIENTS 8 +#endif + /* This option is application when OBX_14_INCLUDED=TRUE Pool ID where to reassemble the SDU. This Pool will allow buffers to be used that are larger than diff --git a/include/gki_target.h b/include/gki_target.h index 1d35c25d1..45f639798 100644 --- a/include/gki_target.h +++ b/include/gki_target.h @@ -94,7 +94,7 @@ #define GKI_MAX_BUF_SIZE_POOL_ID GKI_POOL_ID_3 #endif -/* Pool 4 is unused */ +/* Pool 4 is used for BluetoothSocket L2CAP connections */ /* The size of the buffers in pool 4. */ #ifndef GKI_BUF4_SIZE #define GKI_BUF4_SIZE (8080+26) @@ -102,7 +102,7 @@ /* The number of buffers in buffer pool 4. */ #ifndef GKI_BUF4_MAX -#define GKI_BUF4_MAX 0 +#define GKI_BUF4_MAX (OBX_NUM_SERVERS + OBX_NUM_CLIENTS) #endif /* The ID of buffer pool 4. */ @@ -142,7 +142,7 @@ of order */ #endif /* The size of the buffers in pool 5 -** Special pool used by l2cap retransmissions only. This size based on segment +** Special pool used by L2CAP retransmissions only. This size based on segment ** that will fit into both DH5 and 2-DH3 packet types after accounting for GKI ** header. 13 bytes of max headers allows us a 339 payload max. (in btui_app.txt) ** Note: 748 used for insight scriptwrapper with CAT-2 scripts. |