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

UL working on enb simulator

Browse Source
master
Ismael Gomez 8 years ago
parent 56bdb47258
commit 0acfbfecb1
5 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File

2
srslte/include/srslte/enb/enb_dl.h
Unescape Escape View File

@ -103,7 +103,6 @@ typedef struct {
typedef struct { typedef struct {
uint8_t ack; uint8_t ack;
uint32_t rnti_idx; uint32_t rnti_idx;
srslte_enb_ul_phich_info_t info;
} srslte_enb_dl_phich_t; } srslte_enb_dl_phich_t;
/* This function shall be called just after the initial synchronization */ /* This function shall be called just after the initial synchronization */
@ -137,6 +136,7 @@ SRSLTE_API void srslte_enb_dl_put_phich(srslte_enb_dl_t *q,
uint32_t sf_idx); uint32_t sf_idx);
SRSLTE_API void srslte_enb_dl_put_phich_multi(srslte_enb_dl_t *q, SRSLTE_API void srslte_enb_dl_put_phich_multi(srslte_enb_dl_t *q,
srslte_enb_ul_t *q_ul,
srslte_enb_dl_phich_t *acks, srslte_enb_dl_phich_t *acks,
uint32_t nof_acks, uint32_t nof_acks,
uint32_t sf_idx); uint32_t sf_idx);

11
srslte/include/srslte/enb/enb_ul.h
Unescape Escape View File

@ -60,7 +60,8 @@ typedef struct {
typedef struct SRSLTE_API { typedef struct SRSLTE_API {
srslte_cell_t cell; srslte_cell_t cell;
uint32_t nof_rnti;
cf_t *sf_symbols; cf_t *sf_symbols;
cf_t *ce; cf_t *ce;
@ -89,12 +90,14 @@ typedef struct {
/* This function shall be called just after the initial synchronization */ /* This function shall be called just after the initial synchronization */
SRSLTE_API int srslte_enb_ul_init(srslte_enb_ul_t *q, SRSLTE_API int srslte_enb_ul_init(srslte_enb_ul_t *q,
srslte_cell_t cell, srslte_cell_t cell,
srslte_prach_cfg_t* prach_cfg, srslte_prach_cfg_t* prach_cfg,
srslte_refsignal_dmrs_pusch_cfg_t *pusch_cfg,
srslte_pucch_cfg_t *pucch_cfg,
uint32_t nof_rntis); uint32_t nof_rntis);
SRSLTE_API void srslte_enb_ul_free(srslte_enb_ul_t *q); SRSLTE_API void srslte_enb_ul_free(srslte_enb_ul_t *q);
SRSLTE_API int srslte_enb_ul_add_rnti(srslte_enb_ul_t *q, SRSLTE_API int srslte_enb_ul_cfg_rnti(srslte_enb_ul_t *q,
uint32_t idx, uint32_t idx,
uint16_t rnti); uint16_t rnti);
@ -115,11 +118,13 @@ SRSLTE_API int srslte_enb_ul_get_pusch(srslte_enb_ul_t *q,
uint32_t rv_idx, uint32_t rv_idx,
uint32_t current_tx_nb, uint32_t current_tx_nb,
uint8_t *data, uint8_t *data,
srslte_uci_data_t *uci_data,
uint32_t sf_idx); uint32_t sf_idx);
SRSLTE_API int srslte_enb_ul_get_pusch_multi(srslte_enb_ul_t *q, SRSLTE_API int srslte_enb_ul_get_pusch_multi(srslte_enb_ul_t *q,
srslte_enb_ul_pusch_t *grants, srslte_enb_ul_pusch_t *grants,
bool *pusch_crc_res, bool *pusch_crc_res,
srslte_uci_data_t *uci_data,
uint32_t nof_pusch, uint32_t nof_pusch,
uint32_t sf_idx); uint32_t sf_idx);

7
srslte/lib/enb/enb_dl.c
Unescape Escape View File

@ -194,10 +194,13 @@ void srslte_enb_dl_put_phich(srslte_enb_dl_t *q, uint8_t ack, uint32_t n_prb_low
srslte_phich_encode(&q->phich, ack, ngroup, nseq, sf_idx, q->sf_symbols); srslte_phich_encode(&q->phich, ack, ngroup, nseq, sf_idx, q->sf_symbols);
} }
void srslte_enb_dl_put_phich_multi(srslte_enb_dl_t *q, srslte_enb_dl_phich_t *acks, uint32_t nof_acks, uint32_t sf_idx) void srslte_enb_dl_put_phich_multi(srslte_enb_dl_t *q, srslte_enb_ul_t *q_ul,
srslte_enb_dl_phich_t *acks, uint32_t nof_acks, uint32_t sf_idx)
{ {
for (int i=0;i<nof_acks;i++) { for (int i=0;i<nof_acks;i++) {
srslte_phich_encode(&q->phich, acks[i].ack, acks[i].n_prb_lowest, acks[i].n_dmrs, sf_idx, q->sf_symbols); srslte_enb_ul_phich_info_t info;
srslte_enb_ul_get_phich_info(q_ul, acks[i].rnti_idx, &info);
srslte_enb_dl_put_phich(q, acks[i].ack, info.n_prb_lowest, info.n_dmrs, sf_idx);
} }
} }

45
srslte/lib/enb/enb_ul.c
Unescape Escape View File

@ -40,7 +40,10 @@
#define MAX_CANDIDATES 64 #define MAX_CANDIDATES 64
int srslte_enb_ul_init(srslte_enb_ul_t *q, srslte_cell_t cell, int srslte_enb_ul_init(srslte_enb_ul_t *q, srslte_cell_t cell,
srslte_prach_cfg_t *prach_cfg, uint32_t nof_rnti) srslte_prach_cfg_t *prach_cfg,
srslte_refsignal_dmrs_pusch_cfg_t *pusch_cfg,
srslte_pucch_cfg_t *pucch_cfg,
uint32_t nof_rnti)
{ {
int ret = SRSLTE_ERROR_INVALID_INPUTS; int ret = SRSLTE_ERROR_INVALID_INPUTS;
@ -52,6 +55,7 @@ int srslte_enb_ul_init(srslte_enb_ul_t *q, srslte_cell_t cell,
bzero(q, sizeof(srslte_enb_ul_t)); bzero(q, sizeof(srslte_enb_ul_t));
q->cell = cell; q->cell = cell;
q->nof_rnti = nof_rnti;
if (srslte_ofdm_rx_init(&q->fft, q->cell.cp, q->cell.nof_prb)) { if (srslte_ofdm_rx_init(&q->fft, q->cell.cp, q->cell.nof_prb)) {
fprintf(stderr, "Error initiating FFT\n"); fprintf(stderr, "Error initiating FFT\n");
@ -85,6 +89,9 @@ int srslte_enb_ul_init(srslte_enb_ul_t *q, srslte_cell_t cell,
goto clean_exit; goto clean_exit;
} }
// SRS is a dedicated configuration
srslte_chest_ul_set_cfg(&q->chest, pusch_cfg, pucch_cfg, NULL);
q->sf_symbols = srslte_vec_malloc(CURRENT_SFLEN_RE * sizeof(cf_t)); q->sf_symbols = srslte_vec_malloc(CURRENT_SFLEN_RE * sizeof(cf_t));
if (!q->sf_symbols) { if (!q->sf_symbols) {
perror("malloc"); perror("malloc");
@ -97,6 +104,12 @@ int srslte_enb_ul_init(srslte_enb_ul_t *q, srslte_cell_t cell,
goto clean_exit; goto clean_exit;
} }
q->phich_info = malloc(nof_rnti*sizeof(srslte_enb_ul_phich_info_t));
if (!q->phich_info) {
perror("malloc");
goto clean_exit;
}
ret = SRSLTE_SUCCESS; ret = SRSLTE_SUCCESS;
} else { } else {
@ -125,11 +138,14 @@ void srslte_enb_ul_free(srslte_enb_ul_t *q)
if (q->ce) { if (q->ce) {
free(q->ce); free(q->ce);
} }
if (q->phich_info) {
free(q->phich_info);
}
bzero(q, sizeof(srslte_enb_ul_t)); bzero(q, sizeof(srslte_enb_ul_t));
} }
} }
int srslte_enb_ul_add_rnti(srslte_enb_ul_t *q, uint32_t idx, uint16_t rnti) int srslte_enb_ul_cfg_rnti(srslte_enb_ul_t *q, uint32_t idx, uint16_t rnti)
{ {
return srslte_pusch_set_rnti_multi(&q->pusch, idx, rnti); return srslte_pusch_set_rnti_multi(&q->pusch, idx, rnti);
} }
@ -144,10 +160,9 @@ void srslte_enb_ul_fft(srslte_enb_ul_t *q, cf_t *signal_buffer)
srslte_ofdm_rx_sf(&q->fft, signal_buffer, q->sf_symbols); srslte_ofdm_rx_sf(&q->fft, signal_buffer, q->sf_symbols);
} }
int srslte_enb_ul_get_pusch(srslte_enb_ul_t *q, srslte_ra_ul_grant_t *grant, srslte_softbuffer_rx_t *softbuffer, int srslte_enb_ul_get_pusch(srslte_enb_ul_t *q, srslte_ra_ul_grant_t *grant, srslte_softbuffer_rx_t *softbuffer,
uint32_t rnti_idx, uint32_t rv_idx, uint32_t current_tx_nb, uint32_t rnti_idx, uint32_t rv_idx, uint32_t current_tx_nb,
uint8_t *data, uint32_t sf_idx) uint8_t *data, srslte_uci_data_t *uci_data, uint32_t sf_idx)
{ {
if (srslte_pusch_cfg(&q->pusch, &q->pusch_cfg, grant, NULL, NULL, NULL, sf_idx, rv_idx, current_tx_nb)) { if (srslte_pusch_cfg(&q->pusch, &q->pusch_cfg, grant, NULL, NULL, NULL, sf_idx, rv_idx, current_tx_nb)) {
@ -161,17 +176,15 @@ int srslte_enb_ul_get_pusch(srslte_enb_ul_t *q, srslte_ra_ul_grant_t *grant, srs
float noise_power = srslte_chest_ul_get_noise_estimate(&q->chest); float noise_power = srslte_chest_ul_get_noise_estimate(&q->chest);
srslte_uci_data_t uci_data;
bzero(&uci_data, sizeof(srslte_uci_data_t));
return srslte_pusch_uci_decode_rnti_idx(&q->pusch, &q->pusch_cfg, return srslte_pusch_uci_decode_rnti_idx(&q->pusch, &q->pusch_cfg,
softbuffer, q->sf_symbols, softbuffer, q->sf_symbols,
q->ce, noise_power, q->ce, noise_power,
rnti_idx, data, rnti_idx, data,
&uci_data); uci_data);
} }
int srslte_enb_ul_get_pusch_multi(srslte_enb_ul_t *q, srslte_enb_ul_pusch_t *grants, int srslte_enb_ul_get_pusch_multi(srslte_enb_ul_t *q, srslte_enb_ul_pusch_t *grants,
bool *pusch_crc_res, bool *pusch_crc_res, srslte_uci_data_t *uci_data,
uint32_t nof_pusch, uint32_t tti) uint32_t nof_pusch, uint32_t tti)
{ {
uint32_t n_rb_ho = 0; uint32_t n_rb_ho = 0;
@ -181,7 +194,9 @@ int srslte_enb_ul_get_pusch_multi(srslte_enb_ul_t *q, srslte_enb_ul_pusch_t *gra
pusch_crc_res[i] = srslte_enb_ul_get_pusch(q, &phy_grant, grants[i].softbuffer, pusch_crc_res[i] = srslte_enb_ul_get_pusch(q, &phy_grant, grants[i].softbuffer,
grants[i].rnti_idx, grants[i].rv_idx, grants[i].rnti_idx, grants[i].rv_idx,
grants[i].current_tx_nb, grants[i].current_tx_nb,
grants[i].data, tti%10) == 0; grants[i].data,
&uci_data[i],
tti%10) == 0;
q->phich_info[grants[i].rnti_idx].n_prb_lowest = q->pusch_cfg.grant.n_prb_tilde[0]; q->phich_info[grants[i].rnti_idx].n_prb_lowest = q->pusch_cfg.grant.n_prb_tilde[0];
q->phich_info[grants[i].rnti_idx].n_dmrs = phy_grant.ncs_dmrs; q->phich_info[grants[i].rnti_idx].n_dmrs = phy_grant.ncs_dmrs;
@ -190,8 +205,14 @@ int srslte_enb_ul_get_pusch_multi(srslte_enb_ul_t *q, srslte_enb_ul_pusch_t *gra
} }
void srslte_enb_ul_get_phich_info(srslte_enb_ul_t *q, void srslte_enb_ul_get_phich_info(srslte_enb_ul_t *q,
uint32_t rnti_idx, uint32_t rnti_idx,
srslte_enb_ul_phich_info_t *phich_info) srslte_enb_ul_phich_info_t *phich_info)
{
if (rnti_idx < q->nof_rnti) {
phich_info->n_dmrs = q->phich_info[rnti_idx].n_dmrs;
phich_info->n_prb_lowest = q->phich_info[rnti_idx].n_prb_lowest;
}
}
int srslte_enb_ul_detect_prach(srslte_enb_ul_t *q, uint32_t tti, int srslte_enb_ul_detect_prach(srslte_enb_ul_t *q, uint32_t tti,
uint32_t freq_offset, cf_t *signal, uint32_t freq_offset, cf_t *signal,

2
srslte/lib/phch/pusch.c
Unescape Escape View File

@ -614,7 +614,7 @@ int srslte_pusch_uci_decode_seq(srslte_pusch_t *q,
srslte_demod_soft_demodulate_s(cfg->grant.mcs.mod, q->d, q->q, cfg->nbits.nof_re); srslte_demod_soft_demodulate_s(cfg->grant.mcs.mod, q->d, q->q, cfg->nbits.nof_re);
// Decode RI/HARQ bits before descrambling // Decode RI/HARQ bits before descrambling
if (srslte_ulsch_uci_decode_ri_ack(&q->ul_sch, cfg, softbuffer, q->q, q->seq[cfg->sf_idx].c, uci_data)) { if (srslte_ulsch_uci_decode_ri_ack(&q->ul_sch, cfg, softbuffer, q->q, seq[cfg->sf_idx].c, uci_data)) {
fprintf(stderr, "Error decoding RI/HARQ bits\n"); fprintf(stderr, "Error decoding RI/HARQ bits\n");
return SRSLTE_ERROR; return SRSLTE_ERROR;
} }

Write Preview
Loading…
Cancel
Save