5g-team
/
srsRAN_4G
mirror of https://github.com/pvnis/srsRAN_4G.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ue_dl_nbiot: convert macro to access SF contents into member var

Browse Source 
also use srslte_vec_cf_cp() helper functions
master
Andre Puschmann 5 years ago
parent 9648e47eb6
commit 28c98280d7
2 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File

1
lib/include/srslte/phy/ue/ue_dl_nbiot.h
Unescape Escape View File

@ -64,6 +64,7 @@ typedef struct SRSLTE_API {
srslte_mib_nb_t mib; srslte_mib_nb_t mib;
bool mib_set; bool mib_set;
int nof_re; // Number of RE per subframe
cf_t* sf_symbols; // this buffer holds the symbols of the current subframe cf_t* sf_symbols; // this buffer holds the symbols of the current subframe
cf_t* sf_buffer; // this buffer holds multiple subframes cf_t* sf_buffer; // this buffer holds multiple subframes
cf_t* ce[SRSLTE_MAX_PORTS]; cf_t* ce[SRSLTE_MAX_PORTS];

54
lib/src/phy/ue/ue_dl_nbiot.c
Unescape Escape View File

@ -27,7 +27,6 @@
#include <string.h> #include <string.h>
#define DUMP_SIGNALS 0 #define DUMP_SIGNALS 0
#define CURRENT_SFLEN_RE SRSLTE_SF_LEN_RE(SRSLTE_NBIOT_MAX_PRB, SRSLTE_CP_NORM)
static srslte_dci_format_t nb_ue_formats[] = {SRSLTE_DCI_FORMATN0, SRSLTE_DCI_FORMATN1}; static srslte_dci_format_t nb_ue_formats[] = {SRSLTE_DCI_FORMATN0, SRSLTE_DCI_FORMATN1};
const uint32_t nof_nb_ue_formats = 2; const uint32_t nof_nb_ue_formats = 2;
@ -53,52 +52,53 @@ int srslte_nbiot_ue_dl_init(srslte_nbiot_ue_dl_t* q,
q->bits_total = 0; q->bits_total = 0;
q->sample_offset = 0; q->sample_offset = 0;
q->mib_set = false; q->mib_set = false;
q->nof_re = SRSLTE_SF_LEN_RE(SRSLTE_NBIOT_MAX_PRB, SRSLTE_CP_NORM);
// for transmissions using only single subframe // for transmissions using only single subframe
q->sf_symbols = srslte_vec_cf_malloc(CURRENT_SFLEN_RE); q->sf_symbols = srslte_vec_cf_malloc(q->nof_re);
if (!q->sf_symbols) { if (!q->sf_symbols) {
perror("malloc"); perror("malloc");
goto clean_exit; goto clean_exit;
} }
srslte_vec_cf_zero(q->sf_symbols, CURRENT_SFLEN_RE); srslte_vec_cf_zero(q->sf_symbols, q->nof_re);
for (uint32_t i = 0; i < SRSLTE_MAX_PORTS; i++) { for (uint32_t i = 0; i < SRSLTE_MAX_PORTS; i++) {
q->ce[i] = srslte_vec_cf_malloc(CURRENT_SFLEN_RE); q->ce[i] = srslte_vec_cf_malloc(q->nof_re);
if (!q->ce[i]) { if (!q->ce[i]) {
perror("malloc"); perror("malloc");
goto clean_exit; goto clean_exit;
} }
for (int k = 0; k < CURRENT_SFLEN_RE; k++) { for (int k = 0; k < q->nof_re; k++) {
q->ce[i][k] = 1; q->ce[i][k] = 1;
} }
} }
// allocate memory for symbols and estimates for tx spanning multiple subframes // allocate memory for symbols and estimates for tx spanning multiple subframes
// TODO: only buffer softbits rather than raw samples // TODO: only buffer softbits rather than raw samples
q->sf_buffer = srslte_vec_cf_malloc(CURRENT_SFLEN_RE * SRSLTE_NPDSCH_MAX_NOF_SF); q->sf_buffer = srslte_vec_cf_malloc(q->nof_re * SRSLTE_NPDSCH_MAX_NOF_SF);
if (!q->sf_buffer) { if (!q->sf_buffer) {
perror("malloc"); perror("malloc");
goto clean_exit; goto clean_exit;
} }
srslte_vec_cf_zero(q->sf_buffer, CURRENT_SFLEN_RE * SRSLTE_NPDSCH_MAX_NOF_SF); srslte_vec_cf_zero(q->sf_buffer, q->nof_re * SRSLTE_NPDSCH_MAX_NOF_SF);
for (uint32_t i = 0; i < SRSLTE_MAX_PORTS; i++) { for (uint32_t i = 0; i < SRSLTE_MAX_PORTS; i++) {
q->ce_buffer[i] = srslte_vec_cf_malloc(CURRENT_SFLEN_RE * SRSLTE_NPDSCH_MAX_NOF_SF); q->ce_buffer[i] = srslte_vec_cf_malloc(q->nof_re * SRSLTE_NPDSCH_MAX_NOF_SF);
if (!q->ce_buffer[i]) { if (!q->ce_buffer[i]) {
perror("malloc"); perror("malloc");
goto clean_exit; goto clean_exit;
} }
for (int k = 0; k < (CURRENT_SFLEN_RE * SRSLTE_NPDSCH_MAX_NOF_SF); k++) { for (int k = 0; k < (q->nof_re * SRSLTE_NPDSCH_MAX_NOF_SF); k++) {
q->ce_buffer[i][k] = 1; q->ce_buffer[i][k] = 1;
} }
} }
// allocate memory for soft-bits // allocate memory for soft-bits
q->llr = srslte_vec_f_malloc(CURRENT_SFLEN_RE * SRSLTE_NPDSCH_MAX_NOF_SF * 2); q->llr = srslte_vec_f_malloc(q->nof_re * SRSLTE_NPDSCH_MAX_NOF_SF * 2);
if (!q->llr) { if (!q->llr) {
goto clean_exit; goto clean_exit;
} }
srslte_vec_f_zero(q->llr, CURRENT_SFLEN_RE * SRSLTE_NPDSCH_MAX_NOF_SF * 2); srslte_vec_f_zero(q->llr, q->nof_re * SRSLTE_NPDSCH_MAX_NOF_SF * 2);
// initialize memory // initialize memory
if (srslte_ofdm_rx_init(&q->fft, SRSLTE_CP_NORM, in_buffer[0], q->sf_symbols, max_prb)) { if (srslte_ofdm_rx_init(&q->fft, SRSLTE_CP_NORM, in_buffer[0], q->sf_symbols, max_prb)) {
@ -764,21 +764,21 @@ int srslte_nbiot_ue_dl_decode_npdsch_no_bcch(srslte_nbiot_ue_dl_t* q, uint8_t* d
if (q->npdsch_cfg.num_sf % q->npdsch_cfg.grant.nof_rep == 0) { if (q->npdsch_cfg.num_sf % q->npdsch_cfg.grant.nof_rep == 0) {
// copy data and ce symbols for first repetition of each subframe // copy data and ce symbols for first repetition of each subframe
srslte_vec_cf_copy(&q->sf_buffer[q->npdsch_cfg.sf_idx * CURRENT_SFLEN_RE], q->sf_symbols, CURRENT_SFLEN_RE); srslte_vec_cf_copy(&q->sf_buffer[q->npdsch_cfg.sf_idx * q->nof_re], q->sf_symbols, q->nof_re);
for (int i = 0; i < q->cell.nof_ports; i++) { for (int i = 0; i < q->cell.nof_ports; i++) {
srslte_vec_cf_copy(&q->ce_buffer[i][q->npdsch_cfg.sf_idx * CURRENT_SFLEN_RE], q->ce[i], CURRENT_SFLEN_RE); srslte_vec_cf_copy(&q->ce_buffer[i][q->npdsch_cfg.sf_idx * q->nof_re], q->ce[i], q->nof_re);
} }
} else { } else {
// accumulate subframe samples and channel estimates // accumulate subframe samples and channel estimates
srslte_vec_sum_ccc(&q->sf_buffer[q->npdsch_cfg.sf_idx * CURRENT_SFLEN_RE], srslte_vec_sum_ccc(&q->sf_buffer[q->npdsch_cfg.sf_idx * q->nof_re],
q->sf_symbols, q->sf_symbols,
&q->sf_buffer[q->npdsch_cfg.sf_idx * CURRENT_SFLEN_RE], &q->sf_buffer[q->npdsch_cfg.sf_idx * q->nof_re],
CURRENT_SFLEN_RE); q->nof_re);
for (int i = 0; i < q->cell.nof_ports; i++) { for (int i = 0; i < q->cell.nof_ports; i++) {
srslte_vec_sum_ccc(&q->ce_buffer[i][q->npdsch_cfg.sf_idx * CURRENT_SFLEN_RE], srslte_vec_sum_ccc(&q->ce_buffer[i][q->npdsch_cfg.sf_idx * q->nof_re],
q->ce[i], q->ce[i],
&q->ce_buffer[i][q->npdsch_cfg.sf_idx * CURRENT_SFLEN_RE], &q->ce_buffer[i][q->npdsch_cfg.sf_idx * q->nof_re],
CURRENT_SFLEN_RE); q->nof_re);
} }
} }
q->npdsch_cfg.num_sf++; q->npdsch_cfg.num_sf++;
@ -788,15 +788,15 @@ int srslte_nbiot_ue_dl_decode_npdsch_no_bcch(srslte_nbiot_ue_dl_t* q, uint8_t* d
int m = SRSLTE_MIN(q->npdsch_cfg.grant.nof_rep, 4); int m = SRSLTE_MIN(q->npdsch_cfg.grant.nof_rep, 4);
if (q->npdsch_cfg.rep_idx % m == 0) { if (q->npdsch_cfg.rep_idx % m == 0) {
// average accumulated samples // average accumulated samples
srslte_vec_sc_prod_ccc(&q->sf_buffer[q->npdsch_cfg.sf_idx * CURRENT_SFLEN_RE], srslte_vec_sc_prod_ccc(&q->sf_buffer[q->npdsch_cfg.sf_idx * q->nof_re],
1.0 / m, 1.0 / m,
&q->sf_buffer[q->npdsch_cfg.sf_idx * CURRENT_SFLEN_RE], &q->sf_buffer[q->npdsch_cfg.sf_idx * q->nof_re],
CURRENT_SFLEN_RE); q->nof_re);
for (int i = 0; i < q->cell.nof_ports; i++) { for (int i = 0; i < q->cell.nof_ports; i++) {
srslte_vec_sc_prod_ccc(&q->ce_buffer[i][q->npdsch_cfg.sf_idx * CURRENT_SFLEN_RE], srslte_vec_sc_prod_ccc(&q->ce_buffer[i][q->npdsch_cfg.sf_idx * q->nof_re],
1.0 / m, 1.0 / m,
&q->ce_buffer[i][q->npdsch_cfg.sf_idx * CURRENT_SFLEN_RE], &q->ce_buffer[i][q->npdsch_cfg.sf_idx * q->nof_re],
CURRENT_SFLEN_RE); q->nof_re);
} }
q->npdsch_cfg.sf_idx++; q->npdsch_cfg.sf_idx++;
@ -862,9 +862,9 @@ int srslte_nbiot_ue_dl_decode_npdsch_bcch(srslte_nbiot_ue_dl_t* q, uint8_t* data
q->npdsch_cfg.grant.nof_sf * q->npdsch_cfg.grant.nof_rep); q->npdsch_cfg.grant.nof_sf * q->npdsch_cfg.grant.nof_rep);
// copy data and ce symbols // copy data and ce symbols
memcpy(&q->sf_buffer[q->npdsch_cfg.sf_idx * CURRENT_SFLEN_RE], q->sf_symbols, CURRENT_SFLEN_RE * sizeof(cf_t)); srslte_vec_cf_copy(&q->sf_buffer[q->npdsch_cfg.sf_idx * q->nof_re], q->sf_symbols, q->nof_re);
for (int i = 0; i < q->cell.nof_ports; i++) { for (int i = 0; i < q->cell.nof_ports; i++) {
memcpy(&q->ce_buffer[i][q->npdsch_cfg.sf_idx * CURRENT_SFLEN_RE], q->ce[i], CURRENT_SFLEN_RE * sizeof(cf_t)); srslte_vec_cf_copy(&q->ce_buffer[i][q->npdsch_cfg.sf_idx * q->nof_re], q->ce[i], q->nof_re);
} }
q->npdsch_cfg.num_sf++; q->npdsch_cfg.num_sf++;
q->npdsch_cfg.sf_idx++; q->npdsch_cfg.sf_idx++;

Write Preview
Loading…
Cancel
Save