Bluetooth: controller: Move PKT_US to ULL internal header
Minor refactoring to move PKT_US into ULL internal header,
and rename ull_conn_allowed_check to ull_conn_llcp_req.
Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn.c b/subsys/bluetooth/controller/ll_sw/ull_conn.c
index ec21aca..6d6ba60 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn.c
@@ -42,17 +42,6 @@
#include <soc.h>
#include "hal/debug.h"
-/* Macro to return PDU time */
-#if defined(CONFIG_BT_CTLR_PHY_CODED)
-#define PKT_US(octets, phy) \
- (((phy) & BIT(2)) ? \
- (80 + 256 + 16 + 24 + ((((2 + (octets) + 4) * 8) + 24 + 3) * 8)) : \
- (((octets) + 14) * 8 / BIT(((phy) & 0x03) >> 1)))
-#else /* !CONFIG_BT_CTLR_PHY_CODED */
-#define PKT_US(octets, phy) \
- (((octets) + 14) * 8 / BIT(((phy) & 0x03) >> 1))
-#endif /* !CONFIG_BT_CTLR_PHY_CODED */
-
static int init_reset(void);
static void ticker_op_update_cb(u32_t status, void *param);
static inline void disable(u16_t handle);
@@ -184,22 +173,6 @@
return conn;
}
-u8_t ull_conn_allowed_check(void *conn)
-{
- struct ll_conn * const conn_hdr = conn;
- if (conn_hdr->llcp_req != conn_hdr->llcp_ack) {
- return BT_HCI_ERR_CMD_DISALLOWED;
- }
-
- conn_hdr->llcp_req++;
- if (((conn_hdr->llcp_req - conn_hdr->llcp_ack) & 0x03) != 1U) {
- conn_hdr->llcp_req--;
- return BT_HCI_ERR_CMD_DISALLOWED;
- }
-
- return 0;
-}
-
void *ll_tx_mem_acquire(void)
{
return mem_acquire(&mem_conn_tx.free);
@@ -264,7 +237,7 @@
if (!cmd) {
- ret = ull_conn_allowed_check(conn);
+ ret = ull_conn_llcp_req(conn);
if (ret) {
return ret;
}
@@ -367,7 +340,7 @@
return BT_HCI_ERR_CMD_DISALLOWED;
}
- ret = ull_conn_allowed_check(conn);
+ ret = ull_conn_llcp_req(conn);
if (ret) {
return ret;
}
@@ -388,7 +361,7 @@
return BT_HCI_ERR_CMD_DISALLOWED;
}
- ret = ull_conn_allowed_check(conn);
+ ret = ull_conn_llcp_req(conn);
if (ret) {
return ret;
}
@@ -1281,6 +1254,22 @@
ll_tx_ack_put(conn->lll.handle, tx);
}
+u8_t ull_conn_llcp_req(void *conn)
+{
+ struct ll_conn * const conn_hdr = conn;
+ if (conn_hdr->llcp_req != conn_hdr->llcp_ack) {
+ return BT_HCI_ERR_CMD_DISALLOWED;
+ }
+
+ conn_hdr->llcp_req++;
+ if (((conn_hdr->llcp_req - conn_hdr->llcp_ack) & 0x03) != 1) {
+ conn_hdr->llcp_req--;
+ return BT_HCI_ERR_CMD_DISALLOWED;
+ }
+
+ return 0;
+}
+
static int init_reset(void)
{
/* Initialize conn pool. */
diff --git a/subsys/bluetooth/controller/ll_sw/ull_conn_internal.h b/subsys/bluetooth/controller/ll_sw/ull_conn_internal.h
index 4626ecf..41be335 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_conn_internal.h
+++ b/subsys/bluetooth/controller/ll_sw/ull_conn_internal.h
@@ -7,7 +7,17 @@
/* Macro to convert time in us to connection interval units */
#define RADIO_CONN_EVENTS(x, y) ((u16_t)(((x) + (y) - 1) / (y)))
-u8_t ull_conn_allowed_check(void *conn);
+/* Macro to return PDU time */
+#if defined(CONFIG_BT_CTLR_PHY_CODED)
+#define PKT_US(octets, phy) \
+ (((phy) & BIT(2)) ? \
+ (80 + 256 + 16 + 24 + ((((2 + (octets) + 4) * 8) + 24 + 3) * 8)) : \
+ (((octets) + 14) * 8 / BIT(((phy) & 0x03) >> 1)))
+#else /* !CONFIG_BT_CTLR_PHY_CODED */
+#define PKT_US(octets, phy) \
+ (((octets) + 14) * 8 / BIT(((phy) & 0x03) >> 1))
+#endif /* !CONFIG_BT_CTLR_PHY_CODED */
+
struct ll_conn *ll_conn_acquire(void);
void ll_conn_release(struct ll_conn *conn);
u16_t ll_conn_handle_get(struct ll_conn *conn);
@@ -30,3 +40,4 @@
void ull_conn_link_tx_release(void *link);
void ull_conn_tx_ack(struct ll_conn *conn, memq_link_t *link,
struct node_tx *tx);
+u8_t ull_conn_llcp_req(void *conn);
diff --git a/subsys/bluetooth/controller/ll_sw/ull_master.c b/subsys/bluetooth/controller/ll_sw/ull_master.c
index b0cbeaa..f27b518 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_master.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_master.c
@@ -312,7 +312,7 @@
continue;
}
- ret = ull_conn_allowed_check(conn);
+ ret = ull_conn_llcp_req(conn);
if (ret) {
return ret;
}
@@ -341,7 +341,7 @@
return BT_HCI_ERR_UNKNOWN_CONN_ID;
}
- ret = ull_conn_allowed_check(conn);
+ ret = ull_conn_llcp_req(conn);
if (ret) {
return ret;
}
diff --git a/subsys/bluetooth/controller/ll_sw/ull_slave.c b/subsys/bluetooth/controller/ll_sw/ull_slave.c
index 6815ed4..8150353 100644
--- a/subsys/bluetooth/controller/ll_sw/ull_slave.c
+++ b/subsys/bluetooth/controller/ll_sw/ull_slave.c
@@ -439,7 +439,7 @@
if (error_code) {
if (conn->refresh == 0U) {
- ret = ull_conn_allowed_check(conn);
+ ret = ull_conn_llcp_req(conn);
if (ret) {
return ret;
}
@@ -463,7 +463,7 @@
memcpy(&conn->llcp.encryption.ltk[0], ltk,
sizeof(conn->llcp.encryption.ltk));
- ret = ull_conn_allowed_check(conn);
+ ret = ull_conn_llcp_req(conn);
if (ret) {
return ret;
}
