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

CFI length is wrong for nof_prb == 10

Browse Source
master
Mikko Markus Torni 8 years ago
parent cbb7e3cea0
commit af4ac1e764
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File

6
srslte/lib/phch/regs.c
Unescape Escape View File

@ -89,7 +89,7 @@ int regs_pdcch_init(srslte_regs_t *h) {
bzero(&h->pdcch, sizeof(srslte_regs_ch_t)); bzero(&h->pdcch, sizeof(srslte_regs_ch_t));
for (cfi=0;cfi<3;cfi++) { for (cfi=0;cfi<3;cfi++) {
if (h->cell.nof_prb < 10) { if (h->cell.nof_prb <= 10) {
nof_ctrl_symbols = cfi+2; nof_ctrl_symbols = cfi+2;
} else { } else {
nof_ctrl_symbols = cfi+1; nof_ctrl_symbols = cfi+1;
@ -673,7 +673,7 @@ void srslte_regs_free(srslte_regs_t *h) {
int srslte_regs_set_cfi(srslte_regs_t *h, uint32_t cfi) { int srslte_regs_set_cfi(srslte_regs_t *h, uint32_t cfi) {
if (cfi > 0 && cfi <= 3) { if (cfi > 0 && cfi <= 3) {
if (h->phich_len == SRSLTE_PHICH_EXT && if (h->phich_len == SRSLTE_PHICH_EXT &&
((h->cell.nof_prb < 10 && cfi < 2) || (h->cell.nof_prb >= 10 && cfi < 3))) { ((h->cell.nof_prb <= 10 && cfi < 2) || (h->cell.nof_prb >= 10 && cfi < 3))) {
fprintf(stderr, "PHICH length is extended. The number of control symbols should be at least 3.\n"); fprintf(stderr, "PHICH length is extended. The number of control symbols should be at least 3.\n");
return SRSLTE_ERROR_INVALID_INPUTS; return SRSLTE_ERROR_INVALID_INPUTS;
} else { } else {
@ -705,7 +705,7 @@ int srslte_regs_init(srslte_regs_t *h, srslte_cell_t cell) {
bzero(h, sizeof(srslte_regs_t)); bzero(h, sizeof(srslte_regs_t));
ret = SRSLTE_ERROR; ret = SRSLTE_ERROR;
max_ctrl_symbols = cell.nof_prb<10?4:3; max_ctrl_symbols = cell.nof_prb<=10?4:3;
vo = cell.id % 3; vo = cell.id % 3;
h->cell = cell; h->cell = cell;
h->max_ctrl_symbols = max_ctrl_symbols; h->max_ctrl_symbols = max_ctrl_symbols;

Write Preview
Loading…
Cancel
Save