espressif/esp-nimble
1
0
Fork 0
mirror of https://github.com/espressif/esp-nimble.git synced 2026-09-20 16:07:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

nimble/ll: Move ble_ll_conn_req_pdu_make to proper file

Browse Source 
Not sure why this was in hci file, should be in ll.
Also this makes possible for compiler to inline it.
This commit is contained in:
Andrzej Kaczmarek
2018-06-07 14:57:27 +02:00
parent c92036a424
commit 17297a3ffe
3 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nimble/controller/src/ble_ll_conn.c
+49
View File
@@ -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.
*
nimble/controller/src/ble_ll_conn_hci.c
-48
View File
@@ -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
*
nimble/controller/src/ble_ll_conn_priv.h
-1
View File
@@ -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