[nrf fromtree] Bluetooth: Mesh: Remove duplicate brg declaration

Removes duplicate declaration of the bridging direction, keeping the
one in the public header file.

Signed-off-by: Håvard Reierstad <[email protected]>
(cherry picked from commit 0fe6d34)
Signed-off-by: Håvard Reierstad <[email protected]>

Author: HaavardRei

include/zephyr/bluetooth/mesh/brg_cfg.h

@@ -28,9 +28,9 @@ enum bt_mesh_brg_cfg_state {
 	BT_MESH_BRG_CFG_ENABLED,
 };
 
-/* Briding from Addr1 to Addr2. */
+/* Bridging from Addr1 to Addr2. */
 #define BT_MESH_BRG_CFG_DIR_ONEWAY 1
-/* Bidirectional briging between Addr1 and Addr2. */
+/* Bidirectional bridging between Addr1 and Addr2. */
 #define BT_MESH_BRG_CFG_DIR_TWOWAY 2
 
 /** Bridging Table state entry corresponding to a entry in the Bridging Table. */

subsys/bluetooth/mesh/brg_cfg.c

@@ -224,8 +224,8 @@ static bool netkey_check(uint16_t net_idx1, uint16_t net_idx2)
 	return bt_mesh_subnet_get(net_idx1) && bt_mesh_subnet_get(net_idx2);
 }
 
-int bt_mesh_brg_cfg_tbl_add(enum bt_mesh_brg_cfg_dir direction, uint16_t net_idx1,
-			    uint16_t net_idx2, uint16_t addr1, uint16_t addr2, uint8_t *status)
+int bt_mesh_brg_cfg_tbl_add(uint8_t direction, uint16_t net_idx1, uint16_t net_idx2, uint16_t addr1,
+			    uint16_t addr2, uint8_t *status)
 {
 	/* Sanity checks */
 	if (!BT_MESH_ADDR_IS_UNICAST(addr1) || net_idx1 == net_idx2 || addr1 == addr2 ||

subsys/bluetooth/mesh/brg_cfg.h

@@ -13,17 +13,6 @@
 
 #define BT_MESH_BRG_CFG_NKEY_PRHB_FLT_MASK 0x000C
 
-enum bt_mesh_brg_cfg_dir {
-	/* Value is prohibited. */
-	BT_MESH_BRG_CFG_DIR_PROHIBITED = 0,
-	/* Briging from Addr1 to Addr2. */
-	BT_MESH_BRG_CFG_DIR_ONEWAY = 1,
-	/* Briging to/from Addr1 from/to Addr2. */
-	BT_MESH_BRG_CFG_DIR_TWOWAY = 2,
-	/* Values above these are prohibited. */
-	BT_MESH_BRG_CFG_DIR_MAX = 3,
-};
-
 #define BT_MESH_BRG_CFG_NETIDX_NOMATCH 0xFFFF
 
 /* One row of the bridging table */
@@ -50,8 +39,8 @@ int bt_mesh_brg_cfg_tbl_reset(void);
 
 int bt_mesh_brg_cfg_tbl_get(const struct bt_mesh_brg_cfg_row **rows);
 
-int bt_mesh_brg_cfg_tbl_add(enum bt_mesh_brg_cfg_dir direction, uint16_t net_idx1,
-			    uint16_t net_idx2, uint16_t addr1, uint16_t addr2, uint8_t *status);
+int bt_mesh_brg_cfg_tbl_add(uint8_t direction, uint16_t net_idx1, uint16_t net_idx2, uint16_t addr1,
+			    uint16_t addr2, uint8_t *status);
 
 int bt_mesh_brg_cfg_tbl_remove(uint16_t net_idx1, uint16_t net_idx2, uint16_t addr1, uint16_t addr2,
 			       uint8_t *status);

tests/bluetooth/mesh/brg/src/main.c

@@ -293,6 +293,11 @@ ZTEST(bt_mesh_brg_cfg, test_brg_tbl_pending_store)
 	bt_mesh_brg_cfg_pending_store();
 }
 
+/* Value is prohibited. */
+#define BT_MESH_BRG_CFG_DIR_PROHIBITED 0
+/* Values above and including this is prohibited. */
+#define BT_MESH_BRG_CFG_DIR_MAX 3
+
 /* Test if invalid entries are not added to the table. */
 ZTEST(bt_mesh_brg_cfg, test_tbl_add_invalid_ip)
 {