Bluetooth: controller: Reorder feature bits

Reorder Channel Selection Algorithm #2 and Minimum Number of
Used Channels Procedure bits.

Signed-off-by: Vinayak Kariappa Chettimada <[email protected]>

Author: cvinayak

subsys/bluetooth/controller/include/ll_feat.h

@@ -57,19 +57,6 @@
 #define LL_FEAT_BIT_EXT_SCAN 0
 #endif /* !CONFIG_BT_CTLR_EXT_SCAN_FP */
 
-#if defined(CONFIG_BT_CTLR_CHAN_SEL_2)
-#define LL_FEAT_BIT_CHAN_SEL_2 BIT64(BT_LE_FEAT_BIT_CHAN_SEL_ALGO_2)
-#else /* !CONFIG_BT_CTLR_CHAN_SEL_2 */
-#define LL_FEAT_BIT_CHAN_SEL_2 0
-#endif /* !CONFIG_BT_CTLR_CHAN_SEL_2 */
-
-#if defined(CONFIG_BT_CTLR_MIN_USED_CHAN)
-#define LL_FEAT_BIT_MIN_USED_CHAN \
-		BIT64(BT_LE_FEAT_BIT_MIN_USED_CHAN_PROC)
-#else /* !CONFIG_BT_CTLR_MIN_USED_CHAN */
-#define LL_FEAT_BIT_MIN_USED_CHAN 0
-#endif /* !CONFIG_BT_CTLR_MIN_USED_CHAN */
-
 #if defined(CONFIG_BT_CTLR_PHY_2M)
 #define LL_FEAT_BIT_PHY_2M BIT64(BT_LE_FEAT_BIT_PHY_2M)
 #else /* !CONFIG_BT_CTLR_PHY_2M */
@@ -112,6 +99,19 @@
 #define LL_FEAT_BIT_PER_ADV 0
 #endif /* !CONFIG_BT_CTLR_ADV_PERIODIC && !CONFIG_BT_CTLR_SYNC_PERIODIC */
 
+#if defined(CONFIG_BT_CTLR_CHAN_SEL_2)
+#define LL_FEAT_BIT_CHAN_SEL_2 BIT64(BT_LE_FEAT_BIT_CHAN_SEL_ALGO_2)
+#else /* !CONFIG_BT_CTLR_CHAN_SEL_2 */
+#define LL_FEAT_BIT_CHAN_SEL_2 0
+#endif /* !CONFIG_BT_CTLR_CHAN_SEL_2 */
+
+#if defined(CONFIG_BT_CTLR_MIN_USED_CHAN)
+#define LL_FEAT_BIT_MIN_USED_CHAN \
+		BIT64(BT_LE_FEAT_BIT_MIN_USED_CHAN_PROC)
+#else /* !CONFIG_BT_CTLR_MIN_USED_CHAN */
+#define LL_FEAT_BIT_MIN_USED_CHAN 0
+#endif /* !CONFIG_BT_CTLR_MIN_USED_CHAN */
+
 #if defined(CONFIG_BT_CTLR_DF) && defined(CONFIG_BT_CTLR_DF_ADV_CTE_TX)
 #define LL_FEAT_BIT_CONNECTIONLESS_CTE_TX \
 	BIT64(BT_LE_FEAT_BIT_CONNECTIONLESS_CTE_TX)