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

fixed format2/2b precoding sizes

Browse Source
master
Ismael Gomez 8 years ago
parent 7920b9aa41
commit b581ebde9f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File

15
srslte/lib/phch/dci.c
Unescape Escape View File

@ -1018,7 +1018,7 @@ int dci_format2AB_pack(srslte_ra_dl_dci_t *data, srslte_dci_msg_t *msg, uint32_t
if (nof_prb > 10) { if (nof_prb > 10) {
*y++ = data->alloc_type; *y++ = data->alloc_type;
} }
/* Resource allocation: type0 or type 1 */ /* Resource allocation: type0 or type 1 */
uint32_t P = srslte_ra_type0_P(nof_prb); uint32_t P = srslte_ra_type0_P(nof_prb);
uint32_t alloc_size = (uint32_t) ceilf((float) nof_prb / P); uint32_t alloc_size = (uint32_t) ceilf((float) nof_prb / P);
@ -1044,7 +1044,6 @@ int dci_format2AB_pack(srslte_ra_dl_dci_t *data, srslte_dci_msg_t *msg, uint32_t
/* harq process number */ /* harq process number */
srslte_bit_unpack(data->harq_process, &y, harq_pid_len); srslte_bit_unpack(data->harq_process, &y, harq_pid_len);
// Transpor block to codeword swap flag // Transpor block to codeword swap flag
if (msg->format == SRSLTE_DCI_FORMAT2B) { if (msg->format == SRSLTE_DCI_FORMAT2B) {
@ -1064,19 +1063,21 @@ int dci_format2AB_pack(srslte_ra_dl_dci_t *data, srslte_dci_msg_t *msg, uint32_t
srslte_bit_unpack(data->rv_idx_1, &y, 2); srslte_bit_unpack(data->rv_idx_1, &y, 2);
// Precoding information // Precoding information
if (msg->format == SRSLTE_DCI_FORMAT2A) { if (msg->format == SRSLTE_DCI_FORMAT2) {
srslte_bit_unpack(data->pinfo, &y, precoding_bits_f2(nof_ports)); srslte_bit_unpack(data->pinfo, &y, precoding_bits_f2(nof_ports));
} else if (msg->format == SRSLTE_DCI_FORMAT2A) { } else if (msg->format == SRSLTE_DCI_FORMAT2A) {
srslte_bit_unpack(data->pinfo, &y, precoding_bits_f2a(nof_ports)); srslte_bit_unpack(data->pinfo, &y, precoding_bits_f2a(nof_ports));
} }
// Padding with zeros // Padding with zeros
uint32_t n = srslte_dci_format_sizeof(msg->format, nof_prb, nof_ports); uint32_t n = srslte_dci_format_sizeof(msg->format, nof_prb, nof_ports);
while (y - msg->data < n) { while (y - msg->data < n) {
*y++ = 0; *y++ = 0;
} }
msg->nof_bits = (y - msg->data); msg->nof_bits = (y - msg->data);
return SRSLTE_SUCCESS; return SRSLTE_SUCCESS;
} }
@ -1143,7 +1144,7 @@ int dci_format2AB_unpack(srslte_dci_msg_t *msg, srslte_ra_dl_dci_t *data, uint32
} }
// Precoding information // Precoding information
if (msg->format == SRSLTE_DCI_FORMAT2A) { if (msg->format == SRSLTE_DCI_FORMAT2) {
data->pinfo = srslte_bit_pack(&y, precoding_bits_f2(nof_ports)); data->pinfo = srslte_bit_pack(&y, precoding_bits_f2(nof_ports));
} else if (msg->format == SRSLTE_DCI_FORMAT2A) { } else if (msg->format == SRSLTE_DCI_FORMAT2A) {
data->pinfo = srslte_bit_pack(&y, precoding_bits_f2a(nof_ports)); data->pinfo = srslte_bit_pack(&y, precoding_bits_f2a(nof_ports));
@ -1162,14 +1163,18 @@ int srslte_dci_msg_pack_pdsch(srslte_ra_dl_dci_t *data, srslte_dci_format_t form
msg->format = format; msg->format = format;
switch (format) { switch (format) {
case SRSLTE_DCI_FORMAT1: case SRSLTE_DCI_FORMAT1:
msg->format = format;
return dci_format1_pack(data, msg, nof_prb); return dci_format1_pack(data, msg, nof_prb);
case SRSLTE_DCI_FORMAT1A: case SRSLTE_DCI_FORMAT1A:
msg->format = format;
return dci_format1As_pack(data, msg, nof_prb, crc_is_crnti); return dci_format1As_pack(data, msg, nof_prb, crc_is_crnti);
case SRSLTE_DCI_FORMAT1C: case SRSLTE_DCI_FORMAT1C:
msg->format = format;
return dci_format1Cs_pack(data, msg, nof_prb); return dci_format1Cs_pack(data, msg, nof_prb);
case SRSLTE_DCI_FORMAT2: case SRSLTE_DCI_FORMAT2:
case SRSLTE_DCI_FORMAT2A: case SRSLTE_DCI_FORMAT2A:
case SRSLTE_DCI_FORMAT2B: case SRSLTE_DCI_FORMAT2B:
msg->format = format;
return dci_format2AB_pack(data, msg, nof_prb, nof_ports); return dci_format2AB_pack(data, msg, nof_prb, nof_ports);
default: default:
fprintf(stderr, "DCI pack pdsch: Invalid DCI format %s\n", fprintf(stderr, "DCI pack pdsch: Invalid DCI format %s\n",

Write Preview
Loading…
Cancel
Save