resolved conflicts for 16424e5e to master

Change-Id: I33b2b627bf986c6d120acf8cf507d7884611a4ec

diff --cc include/bt_target.h
index ca3ba81,e865088..5f2ec25
--- 1/include/bt_target.h
--- 2/include/bt_target.h
+++ b/include/bt_target.h
@@@ -170,17 -188,32 +170,16 @@@
  **
  ******************************************************************************/
  
 -/* Receives HCI events from the lower-layer. */
 -#ifndef HCI_CMD_POOL_ID
 -#define HCI_CMD_POOL_ID             GKI_POOL_ID_2
 -#endif
 -
 -#ifndef HCI_CMD_POOL_BUF_SIZE
 -#define HCI_CMD_POOL_BUF_SIZE       GKI_BUF2_SIZE
 -#endif
 -
 -/* Receives ACL data packets from the lower-layer. */
 -#ifndef HCI_ACL_POOL_ID
 -#define HCI_ACL_POOL_ID             GKI_POOL_ID_3
 +#ifndef BT_DEFAULT_BUFFER_SIZE
 +#define BT_DEFAULT_BUFFER_SIZE          (4096 + 16)
  #endif
  
 -/* Maximum number of buffers available for ACL receive data. */
 -#ifndef HCI_ACL_BUF_MAX
 -#define HCI_ACL_BUF_MAX             GKI_BUF3_MAX
 +#ifndef BT_SMALL_BUFFER_SIZE
 +#define BT_SMALL_BUFFER_SIZE            660
  #endif
  
- /* Receives HCI events from the lower-layer. */
 -#ifndef HCI_ACL_BUF_SIZE
 -#define HCI_ACL_BUF_SIZE            (4096+16)
 -#endif
 -
 -/* Receives SCO data packets from the lower-layer. */
 -#ifndef HCI_SCO_POOL_ID
 -#define HCI_SCO_POOL_ID             GKI_POOL_ID_6
 +#ifndef HCI_CMD_BUF_SIZE
 +#define HCI_CMD_BUF_SIZE                BT_SMALL_BUFFER_SIZE
  #endif
  
  /* Sends SDP data packets. */
@@@ -200,25 -249,37 +199,41 @@@
  
  /* Sends L2CAP packets to the peer and HCI messages to the controller. */
  #ifndef L2CAP_CMD_BUF_SIZE
 -#define L2CAP_CMD_BUF_SIZE          660
 +#define L2CAP_CMD_BUF_SIZE              BT_SMALL_BUFFER_SIZE
  #endif
  
 -#ifndef L2CAP_CMD_POOL_ID
 -#define L2CAP_CMD_POOL_ID           GKI_POOL_ID_2
 +#ifndef L2CAP_USER_TX_BUF_SIZE
 +#define L2CAP_USER_TX_BUF_SIZE          BT_DEFAULT_BUFFER_SIZE
 +#endif
 +
 +#ifndef L2CAP_USER_RX_BUF_SIZE
 +#define L2CAP_USER_RX_BUF_SIZE          BT_DEFAULT_BUFFER_SIZE
  #endif
  
+ #ifndef L2CAP_USER_TX_BUF_SIZE
+ #define L2CAP_USER_TX_BUF_SIZE       (4096+16)
+ #endif
+ 
+ #ifndef L2CAP_USER_RX_BUF_SIZE
+ #define L2CAP_USER_RX_BUF_SIZE       (4096+16)
+ #endif
+ 
  /* Sends L2CAP segmented packets in ERTM mode */
 -#ifndef L2CAP_FCR_TX_POOL_ID
 -#define L2CAP_FCR_TX_POOL_ID        HCI_ACL_POOL_ID
 +#ifndef L2CAP_FCR_TX_BUF_SIZE
 +#define L2CAP_FCR_TX_BUF_SIZE           BT_DEFAULT_BUFFER_SIZE
  #endif
  
+ #ifndef L2CAP_FCR_TX_BUF_SIZE
+ #define L2CAP_FCR_TX_BUF_SIZE       (4096+16)
+ #endif
+ 
+ #ifndef L2CAP_FCR_RX_BUF_SIZE
+ #define L2CAP_FCR_RX_BUF_SIZE       (4096+16)
+ #endif
+ 
  /* Receives L2CAP segmented packets in ERTM mode */
 -#ifndef L2CAP_FCR_RX_POOL_ID
 -#define L2CAP_FCR_RX_POOL_ID        HCI_ACL_POOL_ID
 +#ifndef L2CAP_FCR_RX_BUF_SIZE
 +#define L2CAP_FCR_RX_BUF_SIZE           BT_DEFAULT_BUFFER_SIZE
  #endif
  
  #ifndef L2CAP_FCR_ERTM_BUF_SIZE
@@@ -1510,31 -1672,49 +1525,47 @@@
  #define MCA_NUM_MDLS    4
  #endif
  
 -/* Pool ID where to reassemble the SDU. */
 -#ifndef MCA_USER_RX_POOL_ID
 -#define MCA_USER_RX_POOL_ID     HCI_ACL_POOL_ID
 +/* Buffer size to reassemble the SDU. */
 +#ifndef MCA_USER_RX_BUF_SIZE
 +#define MCA_USER_RX_BUF_SIZE    BT_DEFAULT_BUFFER_SIZE
  #endif
  
 -/* Pool ID where to hold the SDU. */
 -#ifndef MCA_USER_TX_POOL_ID
 -#define MCA_USER_TX_POOL_ID     HCI_ACL_POOL_ID
 +/* Buffer size to hold the SDU. */
 +#ifndef MCA_USER_TX_BUF_SIZE
 +#define MCA_USER_TX_BUF_SIZE    BT_DEFAULT_BUFFER_SIZE
  #endif
  
+ #ifndef MCA_USER_RX_BUF_SIZE
+ #define MCA_USER_RX_BUF_SIZE    (4096+16)
+ #endif
+ 
+ #ifndef MCA_USER_TX_BUF_SIZE
+ #define MCA_USER_TX_BUF_SIZE    (4096+16)
+ #endif
+ 
  /*
 -GKI Buffer Pool ID used to hold MPS segments during SDU reassembly
 -*/
 -#ifndef MCA_FCR_RX_POOL_ID
 -#define MCA_FCR_RX_POOL_ID      HCI_ACL_POOL_ID
 + * Buffer size used to hold MPS segments during SDU reassembly
 + */
 +#ifndef MCA_FCR_RX_BUF_SIZE
 +#define MCA_FCR_RX_BUF_SIZE     BT_DEFAULT_BUFFER_SIZE
  #endif
  
+ #ifndef MCA_FCR_RX_BUF_SIZE
+ #define MCA_FCR_RX_BUF_SIZE     (4096+16)
+ #endif
+ 
+ #ifndef MCA_FCR_TX_BUF_SIZE
+ #define MCA_FCR_TX_BUF_SIZE     (4096+16)
+ #endif
+ 
  /*
 -GKI Buffer Pool ID used to hold MPS segments used in (re)transmissions.
 -L2CAP_DEFAULT_ERM_POOL_ID is specified to use the HCI ACL data pool.
 -Note:  This pool needs to have enough buffers to hold two times the window size negotiated
 - in the tL2CAP_FCR_OPTIONS (2 * tx_win_size)  to allow for retransmissions.
 - The size of each buffer must be able to hold the maximum MPS segment size passed in
 - tL2CAP_FCR_OPTIONS plus BT_HDR (8) + HCI preamble (4) + L2CAP_MIN_OFFSET (11 - as of BT 2.1 + EDR Spec).
 -*/
 -#ifndef MCA_FCR_TX_POOL_ID
 -#define MCA_FCR_TX_POOL_ID      HCI_ACL_POOL_ID
 + * Default buffer size used to hold MPS segments used in (re)transmissions.
 + * The size of each buffer must be able to hold the maximum MPS segment size
 + * passed in tL2CAP_FCR_OPTIONS plus BT_HDR (8) + HCI preamble (4) +
 + * L2CAP_MIN_OFFSET (11 - as of BT 2.1 + EDR Spec).
 + */
 +#ifndef MCA_FCR_TX_BUF_SIZE
 +#define MCA_FCR_TX_BUF_SIZE     BT_DEFAULT_BUFFER_SIZE
  #endif
  
  /* MCAP control channel FCR Option: