From 17297a3ffe2836f6faf50a116283efdeeee0cdd2 Mon Sep 17 00:00:00 2001
From: Andrzej Kaczmarek <andrzej.kaczmarek@codecoup.pl>
Date: Thu, 7 Jun 2018 14:56:15 +0200
Subject: [PATCH] nimble/ll: Move ble_ll_conn_req_pdu_make to proper file

Not sure why this was in hci file, should be in ll.
Also this makes possible for compiler to inline it.
---
 nimble/controller/src/ble_ll_conn.c      | 49 ++++++++++++++++++++++++
 nimble/controller/src/ble_ll_conn_hci.c  | 48 -----------------------
 nimble/controller/src/ble_ll_conn_priv.h |  1 -
 3 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/nimble/controller/src/ble_ll_conn.c b/nimble/controller/src/ble_ll_conn.c
index 699da4328..6064adc1f 100644
--- a/nimble/controller/src/ble_ll_conn.c
+++ b/nimble/controller/src/ble_ll_conn.c
@@ -3057,6 +3057,55 @@ ble_ll_init_rx_isr_start(uint8_t pdu_type, struct ble_mbuf_hdr *ble_hdr)
 
     return 0;
 }
+
+/**
+ * Make a connect request PDU
+ *
+ * @param connsm
+ */
+static void
+ble_ll_conn_req_pdu_make(struct ble_ll_conn_sm *connsm, uint8_t chan)
+{
+    uint8_t pdu_type;
+    uint8_t *dptr;
+    struct os_mbuf *m;
+
+    m = ble_ll_scan_get_pdu();
+    BLE_LL_ASSERT(m != NULL);
+
+    /* Construct first PDU header byte */
+    pdu_type = BLE_ADV_PDU_TYPE_CONNECT_REQ;
+
+#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
+    /* We need CSA2 bit only for legacy connect */
+    if (chan >= BLE_PHY_NUM_DATA_CHANS) {
+        pdu_type |= BLE_ADV_PDU_HDR_CHSEL;
+    }
+#endif
+
+    /* Set BLE transmit header */
+    ble_ll_mbuf_init(m, BLE_CONNECT_REQ_LEN, pdu_type);
+
+    /* Construct the connect request */
+    dptr = m->om_data;
+
+    /* Skip inita and adva advertiser's address as we dont know that yet */
+    dptr += (2 * BLE_DEV_ADDR_LEN);
+
+    /* Access address */
+    put_le32(dptr, connsm->access_addr);
+    dptr[4] = (uint8_t)connsm->crcinit;
+    dptr[5] = (uint8_t)(connsm->crcinit >> 8);
+    dptr[6] = (uint8_t)(connsm->crcinit >> 16);
+    dptr[7] = connsm->tx_win_size;
+    put_le16(dptr + 8, connsm->tx_win_off);
+    put_le16(dptr + 10, connsm->conn_itvl);
+    put_le16(dptr + 12, connsm->slave_latency);
+    put_le16(dptr + 14, connsm->supervision_tmo);
+    memcpy(dptr + 16, &connsm->chanmap, BLE_LL_CONN_CHMAP_LEN);
+    dptr[21] = connsm->hop_inc | (connsm->master_sca << 5);
+}
+
 /**
  * Called when a receive PDU has ended and we are in the initiating state.
  *
diff --git a/nimble/controller/src/ble_ll_conn_hci.c b/nimble/controller/src/ble_ll_conn_hci.c
index 5274d15c5..570cf1a62 100644
--- a/nimble/controller/src/ble_ll_conn_hci.c
+++ b/nimble/controller/src/ble_ll_conn_hci.c
@@ -123,54 +123,6 @@ ble_ll_conn_hci_chk_conn_params(uint16_t itvl_min, uint16_t itvl_max,
     return BLE_ERR_SUCCESS;
 }
 
-/**
- * Make a connect request PDU
- *
- * @param connsm
- */
-void
-ble_ll_conn_req_pdu_make(struct ble_ll_conn_sm *connsm, uint8_t chan)
-{
-    uint8_t pdu_type;
-    uint8_t *dptr;
-    struct os_mbuf *m;
-
-    m = ble_ll_scan_get_pdu();
-    BLE_LL_ASSERT(m != NULL);
-
-    /* Construct first PDU header byte */
-    pdu_type = BLE_ADV_PDU_TYPE_CONNECT_REQ;
-
-#if (MYNEWT_VAL(BLE_LL_CFG_FEAT_LE_CSA2) == 1)
-    /* We need CSA2 bit only for legacy connect */
-    if (chan >= BLE_PHY_NUM_DATA_CHANS) {
-        pdu_type |= BLE_ADV_PDU_HDR_CHSEL;
-    }
-#endif
-
-    /* Set BLE transmit header */
-    ble_ll_mbuf_init(m, BLE_CONNECT_REQ_LEN, pdu_type);
-
-    /* Construct the connect request */
-    dptr = m->om_data;
-
-    /* Skip inita and adva advertiser's address as we dont know that yet */
-    dptr += (2 * BLE_DEV_ADDR_LEN);
-
-    /* Access address */
-    put_le32(dptr, connsm->access_addr);
-    dptr[4] = (uint8_t)connsm->crcinit;
-    dptr[5] = (uint8_t)(connsm->crcinit >> 8);
-    dptr[6] = (uint8_t)(connsm->crcinit >> 16);
-    dptr[7] = connsm->tx_win_size;
-    put_le16(dptr + 8, connsm->tx_win_off);
-    put_le16(dptr + 10, connsm->conn_itvl);
-    put_le16(dptr + 12, connsm->slave_latency);
-    put_le16(dptr + 14, connsm->supervision_tmo);
-    memcpy(dptr + 16, &connsm->chanmap, BLE_LL_CONN_CHMAP_LEN);
-    dptr[21] = connsm->hop_inc | (connsm->master_sca << 5);
-}
-
 /**
  * Send a connection complete event
  *
diff --git a/nimble/controller/src/ble_ll_conn_priv.h b/nimble/controller/src/ble_ll_conn_priv.h
index 581de37e1..5cc509f0b 100644
--- a/nimble/controller/src/ble_ll_conn_priv.h
+++ b/nimble/controller/src/ble_ll_conn_priv.h
@@ -182,7 +182,6 @@ int ble_ll_hci_acl_rx(struct os_mbuf *om, void *arg);
 int ble_ll_conn_hci_le_rd_phy(uint8_t *cmdbuf, uint8_t *rsp, uint8_t *rsplen);
 int ble_ll_conn_hci_le_set_phy(uint8_t *cmdbuf);
 int ble_ll_conn_chk_phy_upd_start(struct ble_ll_conn_sm *connsm);
-void ble_ll_conn_req_pdu_make(struct ble_ll_conn_sm *connsm, uint8_t chan);
 #if MYNEWT_VAL(BLE_LL_CFG_FEAT_LL_EXT_ADV)
 int ble_ll_ext_conn_create(uint8_t *cmdbuf);
 #endif