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

Walk around GCC 4.8 compilation

Browse Source
master
Xavier Arteaga 4 years ago committed by Xavier Arteaga
parent a7c728c189
commit c11a5cc2c8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

4
CMakeLists.txt
Unescape Escape View File

@ -509,8 +509,8 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# Add colored output when using the Ninja generator # Add colored output when using the Ninja generator
if("Ninja" STREQUAL ${CMAKE_GENERATOR}) if("Ninja" STREQUAL ${CMAKE_GENERATOR})
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-color=always") ADD_C_COMPILER_FLAG_IF_AVAILABLE("-fdiagnostics-color=always" HAVE_DIAGNOSTIC_COLOR_C)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-color=always") ADD_CXX_COMPILER_FLAG_IF_AVAILABLE("-fdiagnostics-color=always" HAVE_DIAGNOSTIC_COLOR_CXX)
endif() endif()
# Add -Werror to C/C++ flags for newer compilers # Add -Werror to C/C++ flags for newer compilers

8
test/phy/dummy_gnb_stack.h
Unescape Escape View File

@ -77,7 +77,7 @@ private:
return ack.cc[0].M % 4; return ack.cc[0].M % 4;
} }
}; };
srsran::circular_array<pending_ack_t, TTIMOD_SZ> pending_ack = {}; std::array<pending_ack_t, TTIMOD_SZ> pending_ack = {};
struct dummy_harq_proc { struct dummy_harq_proc {
static const uint32_t MAX_TB_SZ = SRSRAN_LDPC_MAX_LEN_CB * SRSRAN_SCH_NR_MAX_NOF_CB_LDPC; static const uint32_t MAX_TB_SZ = SRSRAN_LDPC_MAX_LEN_CB * SRSRAN_SCH_NR_MAX_NOF_CB_LDPC;
@ -218,7 +218,7 @@ public:
dci.rv = 0; dci.rv = 0;
dci.ndi = (slot_cfg.idx / SRSRAN_NOF_SF_X_FRAME) % 2; dci.ndi = (slot_cfg.idx / SRSRAN_NOF_SF_X_FRAME) % 2;
dci.pid = slot_cfg.idx % SRSRAN_NOF_SF_X_FRAME; dci.pid = slot_cfg.idx % SRSRAN_NOF_SF_X_FRAME;
dci.dai = pending_ack[harq_ack_slot_idx].get_dai(); dci.dai = pending_ack[harq_ack_slot_idx % pending_ack.size()].get_dai();
dci.tpc = 1; dci.tpc = 1;
dci.pucch_resource = 0; dci.pucch_resource = 0;
if (dci.ctx.format == srsran_dci_format_nr_1_0) { if (dci.ctx.format == srsran_dci_format_nr_1_0) {
@ -254,7 +254,7 @@ public:
} }
// Calculate PUCCH slot and push resource // Calculate PUCCH slot and push resource
pending_ack[harq_ack_slot_idx].push_ack(ack_resource); pending_ack[harq_ack_slot_idx % pending_ack.size()].push_ack(ack_resource);
return SRSRAN_SUCCESS; return SRSRAN_SUCCESS;
} }
@ -263,7 +263,7 @@ public:
{ {
logger.set_context(slot_cfg.idx); logger.set_context(slot_cfg.idx);
srsran_pdsch_ack_nr_t ack = pending_ack[slot_cfg.idx].get_ack(); srsran_pdsch_ack_nr_t ack = pending_ack[slot_cfg.idx % pending_ack.size()].get_ack();
if (ack.nof_cc > 0) { if (ack.nof_cc > 0) {
mac_interface_phy_nr::pucch_t pucch = {}; mac_interface_phy_nr::pucch_t pucch = {};

Write Preview
Loading…
Cancel
Save