Bluetooth: controller: Facilitate reuse of BT_CTLR_MAX_CONNECTABLE (f9dd4c24) · Commits · Wenxi XU / zephyr

subsys/bluetooth/controller/ll_sw/ull.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -63,6 +63,22 @@
		#include "common/log.h"
		#include "hal/debug.h"

		/* When both central and peripheral are supported, one each Rx node will be
		* needed by connectable advertising and the initiator to generate connection
		* complete event, hence conditionally set the count.
		*/
		#if defined(CONFIG_BT_MAX_CONN)
		#if defined(CONFIG_BT_CENTRAL) && defined(CONFIG_BT_PERIPHERAL)
		#define BT_CTLR_MAX_CONNECTABLE 2
		#else
		#define BT_CTLR_MAX_CONNECTABLE 1
		#endif
		#define BT_CTLR_MAX_CONN CONFIG_BT_MAX_CONN
		#else
		#define BT_CTLR_MAX_CONNECTABLE 0
		#define BT_CTLR_MAX_CONN 0
		#endif

		#if !defined(TICKER_USER_LLL_VENDOR_OPS)
		#define TICKER_USER_LLL_VENDOR_OPS 0
		#endif /* TICKER_USER_LLL_VENDOR_OPS */
		@@ -246,22 +262,6 @@ static MFIFO_DEFINE(pdu_rx_free, sizeof(void *), PDU_RX_CNT);
		PDU_RX_USER_PDU_OCTETS_MAX) \
		)

		/* When both central and peripheral are supported, one each Rx node will be
		* needed by connectable advertising and the initiator to generate connection
		* complete event, hence conditionally set the count.
		*/
		#if defined(CONFIG_BT_MAX_CONN)
		#if defined(CONFIG_BT_CENTRAL) && defined(CONFIG_BT_PERIPHERAL)
		#define BT_CTLR_MAX_CONNECTABLE 2
		#else
		#define BT_CTLR_MAX_CONNECTABLE 1
		#endif
		#define BT_CTLR_MAX_CONN CONFIG_BT_MAX_CONN
		#else
		#define BT_CTLR_MAX_CONNECTABLE 0
		#define BT_CTLR_MAX_CONN 0
		#endif

		#if defined(CONFIG_BT_CTLR_SCAN_SYNC_SET)
		#define BT_CTLR_SCAN_SYNC_SET CONFIG_BT_CTLR_SCAN_SYNC_SET
		#else