diff options
| -rw-r--r-- | chip/nrf51/bluetooth_le.c | 32 | ||||
| -rw-r--r-- | chip/nrf51/bluetooth_le.h | 2 |
2 files changed, 32 insertions, 2 deletions
diff --git a/chip/nrf51/bluetooth_le.c b/chip/nrf51/bluetooth_le.c index 1f681a3e30..39a10d48d0 100644 --- a/chip/nrf51/bluetooth_le.c +++ b/chip/nrf51/bluetooth_le.c @@ -115,19 +115,38 @@ void ble_tx(struct ble_pdu *pdu) } static struct nrf51_ble_packet_t rx_packet; - int ble_rx(struct ble_pdu *pdu, int timeout, int adv) { uint32_t done; uint32_t timeout_time; + /* Prevent illegal wait times */ + if (timeout <= 0) { + NRF51_RADIO_DISABLE = 1; + return EC_ERROR_TIMEOUT; + } + NRF51_RADIO_PACKETPTR = (uint32_t)&rx_packet; NRF51_RADIO_END = NRF51_RADIO_PAYLOAD = NRF51_RADIO_ADDRESS = 0; + /* + * These shortcuts cause packet transmission 150 microseconds after + * packet receive, as is the BTLE standard. See NRF51 manual: + * section 17.1.12 + */ NRF51_RADIO_SHORTS = NRF51_RADIO_SHORTS_READY_START | + NRF51_RADIO_SHORTS_DISABLED_TXEN | NRF51_RADIO_SHORTS_END_DISABLE; NRF51_RADIO_RXEN = 1; - timeout_time = get_time().val + timeout; + timeout_time = get_time().val + RADIO_SETUP_TIMEOUT; + while (!NRF51_RADIO_READY) { + if (get_time().val > timeout_time) { + CPRINTF("RADIO NOT SET UP IN TIME. TIMING OUT.\n"); + return EC_ERROR_TIMEOUT; + } + } + + timeout_time = get_time().val + timeout; do { if (get_time().val >= timeout_time) { NRF51_RADIO_DISABLE = 1; @@ -138,8 +157,17 @@ int ble_rx(struct ble_pdu *pdu, int timeout, int adv) rsp_end = get_time().le.lo; + if (NRF51_RADIO_CRCSTATUS == 0) { + CPRINTF("INVALID CRC\n"); + return EC_ERROR_CRC; + } + nrf2ble_packet(pdu, &rx_packet, adv); + /* + * Throw error if radio not yet disabled. Something has + * gone wrong. May be in an unexpected state. + */ if (NRF51_RADIO_DISABLED != 1) return EC_ERROR_UNKNOWN; diff --git a/chip/nrf51/bluetooth_le.h b/chip/nrf51/bluetooth_le.h index d438259aac..a2b3807a7e 100644 --- a/chip/nrf51/bluetooth_le.h +++ b/chip/nrf51/bluetooth_le.h @@ -17,6 +17,8 @@ #define EXTRA_RECEIVE_BYTES 0 #define BLE_ADV_WHITEN 1 +#define RADIO_SETUP_TIMEOUT 1000 + /* Data and Advertisements have the same PCNF values */ #define NRF51_RADIO_PCNF0_ADV_DATA \ NRF51_RADIO_PCNF0_VAL(NRF51_BLE_LENGTH_BITS, \ |