Merge remote-tracking branch 'origin/develop' into bler_txoptim
# Conflicts: # cmake_targets/CMakeLists.txt # openair1/PHY/CODING/crc_byte.c # openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim.c # openair1/PHY/CODING/nrLDPC_encoder/ldpc_encoder_optim8segmulti.c # openair1/PHY/NR_TRANSPORT/nr_dlsch.c # openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c # openair1/SIMULATION/NR_PHY/dlschsim.c
This commit is contained in:
+1
-1
@@ -784,7 +784,7 @@ void init_NR_UE_threads(int nb_inst) {
|
||||
/* HACK: this function is needed to compile the UE
|
||||
* fix it somehow
|
||||
*/
|
||||
int8_t find_dlsch(uint16_t rnti,
|
||||
int find_dlsch(uint16_t rnti,
|
||||
PHY_VARS_eNB *eNB,
|
||||
find_type_t type)
|
||||
{
|
||||
|
||||
@@ -233,20 +233,15 @@ nrUE_params_t *get_nrUE_params(void) {
|
||||
/* initialie thread pools used for NRUE processing paralleliation */
|
||||
void init_tpools(uint8_t nun_dlsch_threads) {
|
||||
char *params = NULL;
|
||||
if (IS_SOFTMODEM_RFSIM) {
|
||||
params = calloc(1,2);
|
||||
memcpy(params,"N",1);
|
||||
}
|
||||
else {
|
||||
params = calloc(1,(NR_RX_NB_TH*NR_NB_TH_SLOT*3)+1);
|
||||
for (int i=0; i<NR_RX_NB_TH*NR_NB_TH_SLOT; i++) {
|
||||
memcpy(params+(i*3),"-1,",3);
|
||||
}
|
||||
params = calloc(1,(NR_RX_NB_TH*NR_NB_TH_SLOT*3)+1);
|
||||
for (int i=0; i<NR_RX_NB_TH*NR_NB_TH_SLOT; i++) {
|
||||
memcpy(params+(i*3),"-1,",3);
|
||||
}
|
||||
initTpool(params, &(nrUE_params.Tpool), false);
|
||||
free(params);
|
||||
init_dlsch_tpool( nun_dlsch_threads);
|
||||
}
|
||||
|
||||
static void get_options(void) {
|
||||
|
||||
nrUE_params.ofdm_offset_divisor = 8;
|
||||
|
||||
Reference in New Issue
Block a user