Merge branch 'next' of https://github.com/srsLTE/srsLTE into next

This commit is contained in:
ismagom 2016-03-13 23:09:10 +01:00
commit dd396c0562
2 changed files with 4 additions and 3 deletions

View File

@ -235,7 +235,7 @@ int srslte_symbol_sz(uint32_t nof_prb) {
} else if (nof_prb<=75) { } else if (nof_prb<=75) {
return 1024; return 1024;
} else if (nof_prb<=100) { } else if (nof_prb<=100) {
return 1280; return 1536;
} else { } else {
return SRSLTE_ERROR; return SRSLTE_ERROR;
} }
@ -258,7 +258,7 @@ int srslte_nof_prb(uint32_t symbol_sz)
return 50; return 50;
case 1024: case 1024:
return 75; return 75;
case 1280: case 1536:
return 100; return 100;
} }
} else { } else {

View File

@ -172,7 +172,8 @@ void base_free() {
int main(int argc, char **argv) { int main(int argc, char **argv) {
uint8_t bch_payload[SRSLTE_BCH_PAYLOAD_LEN]; uint8_t bch_payload[SRSLTE_BCH_PAYLOAD_LEN];
int n; int n;
uint32_t nof_tx_ports, sfn_offset; uint32_t nof_tx_ports;
int sfn_offset;
cf_t *ce_slot1[SRSLTE_MAX_PORTS]; cf_t *ce_slot1[SRSLTE_MAX_PORTS];
if (argc < 3) { if (argc < 3) {