zephyr
/
nrf_hw_models
mirror of https://github.com/zephyrproject-rtos/nrf_hw_models.git
1
0
Fork 0
Code Issues Releases Wiki Activity

RADIO: Handle 15.4 packet format at Rx 

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
This commit is contained in:
Alberto Escolar Piedras 2023-03-01 18:06:06 +01:00
parent 9f94dcf90a
commit 190d36a768
4 changed files with 65 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.txt
View File

@ -7,7 +7,7 @@ Current limitations and pending things to do:
* Proper testing: All currently implemented models have only been tested lightly
* RADIO:
* (L) Only BLE packet format supported (no LR)
* (L) Only BLE 1/2Mbps (no LR) and 802.15.4 packet format supported
* (L) Only default freq. map supported
* (VL) Only 1st logical address is supported
* (VL) More limitation listed in NRF_RADIO.c

65
src/HW_models/NRF_RADIO.c
View File

@ -644,7 +644,7 @@ static void handle_Rx_response(int ret){
rx_status.ADDRESS_End_Time = address_time + nrfra_timings_get_Rx_chain_delay();
uint length = rx_buf[1];
uint length = nrfra_get_payload_length(rx_buf);
uint max_length = (NRF_RADIO_regs.PCNF1 & NFCT_MAXLEN_MAXLEN_Msk) >> NFCT_MAXLEN_MAXLEN_Pos;
if (length > max_length){
@ -657,25 +657,40 @@ static void handle_Rx_response(int ret){
rx_status.packet_rejected = false;
bs_time_t payload_end;
if ((NRF_RADIO_regs.MODE == RADIO_MODE_MODE_Ble_1Mbit)
|| (NRF_RADIO_regs.MODE == RADIO_MODE_MODE_Ble_2Mbit)) {
payload_end = rx_status.rx_resp.rx_time_stamp + (bs_time_t)((2+length)*8/bits_per_us);
} else if (NRF_RADIO_regs.MODE == RADIO_MODE_MODE_Ieee802154_250Kbit) {
payload_end = rx_status.rx_resp.rx_time_stamp + (bs_time_t)((1+length)*8/bits_per_us);
} //Eventually this should be generalized with the packet configuration
rx_status.PAYLOAD_End_Time = nrfra_timings_get_Rx_chain_delay() +
hwll_dev_time_from_phy(rx_status.rx_resp.rx_time_stamp
+ (bs_time_t)((2+length)*8/bits_per_us));
hwll_dev_time_from_phy(payload_end);
rx_status.CRC_End_Time = nrfra_timings_get_Rx_chain_delay() +
hwll_dev_time_from_phy(rx_status.rx_resp.rx_time_stamp
+ (bs_time_t)((2+length)*8/bits_per_us)
+ rx_status.CRC_duration); //Provisional value
rx_status.CRC_End_Time = rx_status.PAYLOAD_End_Time + rx_status.CRC_duration; //Provisional value
if (rx_status.rx_resp.packet_size >= 5) { /*At least the header and CRC, otherwise better to not try to copy it*/
((uint8_t*)NRF_RADIO_regs.PACKETPTR)[0] = rx_buf[0];
((uint8_t*)NRF_RADIO_regs.PACKETPTR)[1] = rx_buf[1];
/* We cheat a bit and copy the whole packet already (The AAR block will look in Adv packets after 64 bits)*/
memcpy(&((uint8_t*)NRF_RADIO_regs.PACKETPTR)[2 + rx_status.S1Offset],
&rx_buf[2] , length);
}
if ((NRF_RADIO_regs.MODE == RADIO_MODE_MODE_Ble_1Mbit)
|| (NRF_RADIO_regs.MODE == RADIO_MODE_MODE_Ble_2Mbit)) {
if (rx_status.rx_resp.packet_size >= 5) { /*At least the header and CRC, otherwise better to not try to copy it*/
((uint8_t*)NRF_RADIO_regs.PACKETPTR)[0] = rx_buf[0];
((uint8_t*)NRF_RADIO_regs.PACKETPTR)[1] = rx_buf[1];
/* We cheat a bit and copy the whole packet already (The AAR block will look in Adv packets after 64 bits)*/
memcpy(&((uint8_t*)NRF_RADIO_regs.PACKETPTR)[2 + rx_status.S1Offset],
&rx_buf[2] , length);
}
} else if (NRF_RADIO_regs.MODE == RADIO_MODE_MODE_Ieee802154_250Kbit) {
if (rx_status.rx_resp.packet_size >= 3) { /*At least the header and CRC, otherwise better to not try to copy it*/
((uint8_t*)NRF_RADIO_regs.PACKETPTR)[0] = rx_buf[0];
memcpy(&((uint8_t*)NRF_RADIO_regs.PACKETPTR)[1 + rx_status.S1Offset],
&rx_buf[1] , length);
}
} //Eventually this should be generalized with the packet configuration
radio_sub_state = RX_WAIT_FOR_ADDRESS_END;
nrfra_set_Timer_RADIO(rx_status.ADDRESS_End_Time);
} else if ( ( ret == P2G4_MSG_RXV2_END ) && ( radio_state == RAD_RX /*if we havent aborted*/ ) ) {
bs_time_t end_time = hwll_dev_time_from_phy(rx_status.rx_resp.end_time);
@ -688,12 +703,24 @@ static void handle_Rx_response(int ret){
//packet lenght was received correctly, and just report a CRC error at the
//end of the CRC
if ( ( rx_status.rx_resp.status == P2G4_RXSTATUS_OK ) &&
( rx_status.rx_resp.packet_size > 5 ) ) {
memcpy((void*)&NRF_RADIO_regs.RXCRC, &rx_buf[2 + rx_buf[1]], 3);
}
if ( rx_status.rx_resp.status == P2G4_RXSTATUS_OK ){
//Let's copy the CRC
uint payload_len = nrfra_get_payload_length(rx_buf);
uint32_t crc = 0;
//Eventually this should be generalized with the packet configuration
if (((NRF_RADIO_regs.MODE == RADIO_MODE_MODE_Ble_1Mbit)
|| (NRF_RADIO_regs.MODE == RADIO_MODE_MODE_Ble_2Mbit))
&& ( rx_status.rx_resp.packet_size >= 5 ) ){
memcpy((void*)&crc, &rx_buf[2 + payload_len], 3);
} else if ((NRF_RADIO_regs.MODE == RADIO_MODE_MODE_Ieee802154_250Kbit)
&& ( rx_status.rx_resp.packet_size >= 3 ) ){
memcpy((void*)&crc, &rx_buf[1 + payload_len], 2);
//TODO: LQI
}
NRF_RADIO_regs.RXCRC = crc;
rx_status.CRC_OK = 1;
NRF_RADIO_regs.CRCSTATUS = 1;
}

18
src/HW_models/NRF_RADIO_utils.c
View File

@ -299,6 +299,21 @@ void nrfra_prep_tx_request(p2G4_txv2_t *tx_req, uint packet_size, bs_time_t pack
tx_req->coding_rate = 0;
}
uint nrfra_get_payload_length(uint8_t *buf){
int S0Len;
int LFLenb, LFLenB;
uint payload_len = 0;
S0Len = (NRF_RADIO_regs.PCNF0 & RADIO_PCNF0_S0LEN_Msk) >> RADIO_PCNF0_S0LEN_Pos;
LFLenb = (NRF_RADIO_regs.PCNF0 & RADIO_PCNF0_LFLEN_Msk) >> RADIO_PCNF0_LFLEN_Pos;
LFLenB = (LFLenb + 7)/8;
for (int i = 0; i < LFLenB; i++){
payload_len += buf[S0Len+i] << i*8;
}
return payload_len;
}
/**
* Assemble a packet to be transmitted out thru the air into tx_buf[]
* Omitting the preamble and address/sync flag
@ -316,7 +331,7 @@ uint nrfra_tx_copy_payload(uint8_t *tx_buf){
uint payload_len;
S0Len = (NRF_RADIO_regs.PCNF0 & RADIO_PCNF0_S0LEN_Msk) >> RADIO_PCNF0_S0LEN_Pos;
payload_len = ((uint8_t*)NRF_RADIO_regs.PACKETPTR)[S0Len];
S1LenAirb = (NRF_RADIO_regs.PCNF0 & RADIO_PCNF0_S1LEN_Msk) >> RADIO_PCNF0_S1LEN_Pos;
S1LenB = (S1LenAirb + 7)/8; //This is just : S1Offset = ceil(PCNF0.S1LEN / 8)
@ -346,6 +361,7 @@ uint nrfra_tx_copy_payload(uint8_t *tx_buf){
*/
}
payload_len = nrfra_get_payload_length(tx_buf);
int copy_len = payload_len + S1LenB;
memcpy(&tx_buf[i], &((uint8_t*)NRF_RADIO_regs.PACKETPTR)[i + S1Off], copy_len);
return payload_len;

1
src/HW_models/NRF_RADIO_utils.h
View File

@ -22,6 +22,7 @@ void nrfra_prep_rx_request(p2G4_rxv2_t *ongoing_rx, p2G4_address_t *rx_addresses
void nrfra_prep_tx_request(p2G4_txv2_t *ongoing_tx, uint packet_size, bs_time_t packet_duration);
uint nrfra_tx_copy_payload(uint8_t *tx_buf);
uint nrfra_get_payload_length(uint8_t *buf);
#ifdef __cplusplus
}