mirror of https://github.com/pvnis/srsRAN_4G.git
Changes in ACK procedure to support CA. Tested 1 cell in SISO/MIMO
Ismael Gomez
5 years ago
committed by
Xavier Arteaga
parent
7a672ca340
commit
1d83bb08e2
@ -0,0 +1,31 @@
|
||||
#
|
||||
# Copyright 2013-2019 Software Radio Systems Limited
|
||||
#
|
||||
# This file is part of srsLTE
|
||||
#
|
||||
# srsLTE is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU Affero General Public License as
|
||||
# published by the Free Software Foundation, either version 3 of
|
||||
# the License, or (at your option) any later version.
|
||||
#
|
||||
# srsLTE is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU Affero General Public License for more details.
|
||||
#
|
||||
# A copy of the GNU Affero General Public License can be found in
|
||||
# the LICENSE file in the top-level directory of this distribution
|
||||
# and at http://www.gnu.org/licenses/.
|
||||
#
|
||||
|
||||
########################################################################
|
||||
# PROGRAM TO DEBUG PSS FROM USRP
|
||||
########################################################################
|
||||
|
||||
add_executable(gen_ack_test gen_ack_test.c)
|
||||
target_link_libraries(gen_ack_test srslte_phy)
|
||||
add_test(gen_ack_test gen_ack_test)
|
||||
|
||||
add_executable(pucch_resource_test pucch_resource_test.c)
|
||||
target_link_libraries(pucch_resource_test srslte_phy)
|
||||
add_test(pucch_resource_test pucch_resource_test)
|
||||
@ -0,0 +1,129 @@
|
||||
/*
|
||||
* Copyright 2013-2019 Software Radio Systems Limited
|
||||
*
|
||||
* This file is part of srsLTE.
|
||||
*
|
||||
* srsLTE is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* srsLTE is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* A copy of the GNU Affero General Public License can be found in
|
||||
* the LICENSE file in the top-level directory of this distribution
|
||||
* and at http://www.gnu.org/licenses/.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <strings.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "srslte/srslte.h"
|
||||
|
||||
#define TESTASSERT(cond) \
|
||||
{ \
|
||||
if (!(cond)) { \
|
||||
printf("[%s][Line %d]. Fail at %s\n", __FUNCTION__, __LINE__, #cond); \
|
||||
return -1; \
|
||||
} \
|
||||
}
|
||||
|
||||
int fdd_tests(uint32_t max_cc)
|
||||
{
|
||||
srslte_ue_dl_t ue_dl;
|
||||
srslte_dl_sf_cfg_t sf_cfg_dl;
|
||||
srslte_pdsch_ack_t ack_info;
|
||||
srslte_uci_data_t uci_data;
|
||||
|
||||
uint32_t test_cnt = 0;
|
||||
|
||||
ZERO_OBJECT(ue_dl);
|
||||
ue_dl.cell.frame_type = SRSLTE_FDD;
|
||||
|
||||
// This is used for TDD only
|
||||
ZERO_OBJECT(sf_cfg_dl);
|
||||
|
||||
for (uint32_t nof_cc = 1; nof_cc <= max_cc; nof_cc++) {
|
||||
for (uint32_t nof_tb = 1; nof_tb <= SRSLTE_MAX_CODEWORDS; nof_tb++) {
|
||||
for (uint32_t nof_active_cc = 1; nof_active_cc <= nof_cc; nof_active_cc++) {
|
||||
for (uint32_t nof_active_tb = 1; nof_active_tb <= nof_tb; nof_active_tb++) {
|
||||
|
||||
ZERO_OBJECT(ack_info);
|
||||
ack_info.nof_cc = nof_cc;
|
||||
ack_info.transmission_mode = nof_tb == 1 ? SRSLTE_TM1 : SRSLTE_TM4;
|
||||
|
||||
// Check different modes?
|
||||
ack_info.ack_nack_feedback_mode = SRSLTE_PUCCH_ACK_NACK_FEEDBACK_MODE_CS;
|
||||
|
||||
for (uint32_t cc_idx = 0; cc_idx < nof_cc; cc_idx++) {
|
||||
ack_info.cc[cc_idx].M = 1; // always 1 in FDD
|
||||
ack_info.cc[cc_idx].m[0].present = cc_idx <= nof_active_cc;
|
||||
ack_info.cc[cc_idx].m[0].resource.n_cce = cc_idx + 1;
|
||||
if (ack_info.cc[cc_idx].m[0].present) {
|
||||
for (uint32_t j = 0; j < nof_tb; j++) {
|
||||
ack_info.cc[cc_idx].m[0].value[j] = j < nof_active_tb ? 1 : 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
for (uint32_t sr_enabled = 0; sr_enabled < 2; sr_enabled++) {
|
||||
// Generate ACK/NACK bits
|
||||
srslte_uci_data_reset(&uci_data);
|
||||
uci_data.value.scheduling_request = (sr_enabled > 0);
|
||||
|
||||
printf("FDD Test %d: TM=%d, CC=%d, nof_active_tb=%d, nof_active_cc=%d, sr_request=%s\n",
|
||||
test_cnt++,
|
||||
ack_info.transmission_mode + 1,
|
||||
nof_cc,
|
||||
nof_active_tb,
|
||||
nof_active_cc,
|
||||
sr_enabled ? "yes" : "no");
|
||||
|
||||
srslte_ue_dl_gen_ack(&ue_dl, &sf_cfg_dl, &ack_info, &uci_data);
|
||||
|
||||
// Check output
|
||||
if (nof_cc == 1) {
|
||||
TESTASSERT(uci_data.cfg.ack[0].nof_acks == nof_active_tb);
|
||||
} else {
|
||||
if (uci_data.value.scheduling_request) {
|
||||
TESTASSERT(uci_data.cfg.ack[0].nof_acks == 1);
|
||||
} else {
|
||||
for (int i = 0; i < nof_cc; i++) {
|
||||
TESTASSERT(uci_data.cfg.ack[i].nof_acks == nof_tb);
|
||||
}
|
||||
}
|
||||
}
|
||||
uint32_t k = 0;
|
||||
for (uint32_t i = 0; i < nof_cc; i++) {
|
||||
TESTASSERT(uci_data.cfg.ack[i].ncce[0] == i + 1);
|
||||
for (uint32_t j = 0; j < uci_data.cfg.ack[i].nof_acks; j++) {
|
||||
TESTASSERT(uci_data.value.ack.ack_value[k++]);
|
||||
}
|
||||
}
|
||||
TESTASSERT(k == srslte_uci_cfg_total_ack(&uci_data.cfg));
|
||||
TESTASSERT(uci_data.value.ack.ack_value[k] == 2);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
|
||||
// Test only until Format1B - CS
|
||||
TESTASSERT(fdd_tests(2) == 0);
|
||||
|
||||
printf("Ok\n");
|
||||
exit(0);
|
||||
}
|
||||
@ -0,0 +1,165 @@
|
||||
/*
|
||||
* Copyright 2013-2019 Software Radio Systems Limited
|
||||
*
|
||||
* This file is part of srsLTE.
|
||||
*
|
||||
* srsLTE is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of
|
||||
* the License, or (at your option) any later version.
|
||||
*
|
||||
* srsLTE is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* A copy of the GNU Affero General Public License can be found in
|
||||
* the LICENSE file in the top-level directory of this distribution
|
||||
* and at http://www.gnu.org/licenses/.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <math.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <strings.h>
|
||||
#include <time.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "srslte/srslte.h"
|
||||
|
||||
#define TESTASSERT(cond) \
|
||||
{ \
|
||||
if (!(cond)) { \
|
||||
printf("[%s][Line %d]. Fail at %s\n", __FUNCTION__, __LINE__, #cond); \
|
||||
return -1; \
|
||||
} \
|
||||
}
|
||||
|
||||
int fdd_tests()
|
||||
{
|
||||
srslte_cell_t cell;
|
||||
srslte_pucch_cfg_t pucch_cfg;
|
||||
srslte_uci_cfg_t uci_cfg;
|
||||
srslte_uci_value_t uci_value;
|
||||
|
||||
ZERO_OBJECT(cell);
|
||||
cell.cp = SRSLTE_CP_NORM;
|
||||
cell.frame_type = SRSLTE_FDD;
|
||||
cell.nof_prb = 50;
|
||||
|
||||
ZERO_OBJECT(pucch_cfg);
|
||||
pucch_cfg.n_pucch_sr = 3;
|
||||
pucch_cfg.N_pucch_1 = 7;
|
||||
for (int i = 0; i < 4; i++) {
|
||||
for (int j = 0; j < 2; j++) {
|
||||
pucch_cfg.n1_pucch_an_cs[i][j] = j * 11 + i * 13;
|
||||
}
|
||||
}
|
||||
ZERO_OBJECT(uci_value);
|
||||
|
||||
// Format 1
|
||||
ZERO_OBJECT(uci_cfg);
|
||||
uci_value.scheduling_request = true;
|
||||
srslte_ue_ul_pucch_resource_selection(&cell, &pucch_cfg, &uci_cfg, &uci_value);
|
||||
TESTASSERT(pucch_cfg.format == SRSLTE_PUCCH_FORMAT_1);
|
||||
TESTASSERT(pucch_cfg.n_pucch == pucch_cfg.n_pucch_sr);
|
||||
|
||||
// Format 1A with and without SR
|
||||
for (int i = 0; i < 2; i++) {
|
||||
uci_value.scheduling_request = i == 0;
|
||||
ZERO_OBJECT(uci_cfg);
|
||||
uci_cfg.ack[0].nof_acks = 1;
|
||||
uci_cfg.ack[0].ncce[0] = 13;
|
||||
srslte_ue_ul_pucch_resource_selection(&cell, &pucch_cfg, &uci_cfg, &uci_value);
|
||||
TESTASSERT(pucch_cfg.format == SRSLTE_PUCCH_FORMAT_1A);
|
||||
if (i == 0) {
|
||||
TESTASSERT(pucch_cfg.n_pucch == pucch_cfg.n_pucch_sr);
|
||||
} else {
|
||||
TESTASSERT(pucch_cfg.n_pucch == uci_cfg.ack[0].ncce[0] + pucch_cfg.N_pucch_1);
|
||||
}
|
||||
}
|
||||
|
||||
// Format 1B with and without SR, MIMO
|
||||
pucch_cfg.ack_nack_feedback_mode = SRSLTE_PUCCH_ACK_NACK_FEEDBACK_MODE_NORMAL;
|
||||
for (int i = 0; i < 2; i++) {
|
||||
uci_value.scheduling_request = i == 0;
|
||||
uci_value.ack.ack_value[0] = 1; // To force a different resource than n_pucch_0 in case of CS incorrectly selected
|
||||
uci_value.ack.ack_value[1] = 1;
|
||||
ZERO_OBJECT(uci_cfg);
|
||||
uci_cfg.ack[0].nof_acks = 2;
|
||||
uci_cfg.ack[0].ncce[0] = 13;
|
||||
srslte_ue_ul_pucch_resource_selection(&cell, &pucch_cfg, &uci_cfg, &uci_value);
|
||||
TESTASSERT(pucch_cfg.format == SRSLTE_PUCCH_FORMAT_1B);
|
||||
if (i == 0) {
|
||||
TESTASSERT(pucch_cfg.n_pucch == pucch_cfg.n_pucch_sr);
|
||||
} else {
|
||||
TESTASSERT(pucch_cfg.n_pucch == uci_cfg.ack[0].ncce[0] + pucch_cfg.N_pucch_1);
|
||||
}
|
||||
}
|
||||
|
||||
// Format 1B-CS, no SR, 2 CA SISO
|
||||
uci_value.scheduling_request = 0;
|
||||
ZERO_OBJECT(uci_cfg);
|
||||
pucch_cfg.ack_nack_feedback_mode = SRSLTE_PUCCH_ACK_NACK_FEEDBACK_MODE_CS;
|
||||
uci_cfg.ack[0].nof_acks = 1;
|
||||
uci_cfg.ack[1].nof_acks = 1;
|
||||
uci_cfg.ack[0].ncce[0] = 13;
|
||||
uci_cfg.ack[1].ncce[0] = 4;
|
||||
|
||||
// Both on Pcell
|
||||
|
||||
// ACK/ACK, n_pucch = n_pucch_1
|
||||
uci_value.ack.ack_value[0] = 1;
|
||||
uci_value.ack.ack_value[1] = 1;
|
||||
srslte_ue_ul_pucch_resource_selection(&cell, &pucch_cfg, &uci_cfg, &uci_value);
|
||||
TESTASSERT(pucch_cfg.format == SRSLTE_PUCCH_FORMAT_1B);
|
||||
TESTASSERT(pucch_cfg.n_pucch == uci_cfg.ack[1].ncce[0] + pucch_cfg.N_pucch_1);
|
||||
|
||||
// ACK/DTX, n_pucch = n_pucch_0
|
||||
uci_value.ack.ack_value[0] = 1;
|
||||
uci_value.ack.ack_value[1] = 2;
|
||||
srslte_ue_ul_pucch_resource_selection(&cell, &pucch_cfg, &uci_cfg, &uci_value);
|
||||
TESTASSERT(pucch_cfg.format == SRSLTE_PUCCH_FORMAT_1B);
|
||||
TESTASSERT(pucch_cfg.n_pucch == uci_cfg.ack[0].ncce[0] + pucch_cfg.N_pucch_1);
|
||||
|
||||
// Each on its serving cell, n_pucch_1 is explicit
|
||||
uci_cfg.ack[1].grant_cc_idx = 1;
|
||||
uci_cfg.ack[1].tpc_for_pucch = 3;
|
||||
uci_value.ack.ack_value[0] = 1;
|
||||
uci_value.ack.ack_value[1] = 1;
|
||||
srslte_ue_ul_pucch_resource_selection(&cell, &pucch_cfg, &uci_cfg, &uci_value);
|
||||
TESTASSERT(pucch_cfg.format == SRSLTE_PUCCH_FORMAT_1B);
|
||||
TESTASSERT(pucch_cfg.n_pucch == pucch_cfg.n1_pucch_an_cs[uci_cfg.ack[1].tpc_for_pucch][0]);
|
||||
|
||||
// PCell scheduled on Scell
|
||||
uci_cfg.ack[0].grant_cc_idx = 1;
|
||||
uci_cfg.ack[0].tpc_for_pucch = 2;
|
||||
uci_value.ack.ack_value[0] = 1;
|
||||
uci_value.ack.ack_value[1] = 2;
|
||||
srslte_ue_ul_pucch_resource_selection(&cell, &pucch_cfg, &uci_cfg, &uci_value);
|
||||
TESTASSERT(pucch_cfg.format == SRSLTE_PUCCH_FORMAT_1B);
|
||||
TESTASSERT(pucch_cfg.n_pucch == pucch_cfg.n1_pucch_an_cs[uci_cfg.ack[0].tpc_for_pucch][0]);
|
||||
|
||||
// MIMO has the same logic of resource selection, no need to test for now
|
||||
|
||||
// Format 1B-CS with SR
|
||||
ZERO_OBJECT(uci_cfg);
|
||||
uci_value.scheduling_request = true;
|
||||
uci_cfg.ack[0].nof_acks = 1;
|
||||
uci_cfg.ack[1].nof_acks = 1;
|
||||
srslte_ue_ul_pucch_resource_selection(&cell, &pucch_cfg, &uci_cfg, &uci_value);
|
||||
TESTASSERT(pucch_cfg.format == SRSLTE_PUCCH_FORMAT_1B);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int main(int argc, char** argv)
|
||||
{
|
||||
|
||||
// Test only until Format1B - CS
|
||||
TESTASSERT(fdd_tests() == 0);
|
||||
|
||||
printf("Ok\n");
|
||||
exit(0);
|
||||
}
|
||||
Loading…
Reference in New Issue