diff --git a/openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c b/openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c index 82dedd9bc999895101ce99aeb0b00879227e8867..4c957cddfe6fc86d061e513adf863f42509ef939 100644 --- a/openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c +++ b/openair1/PHY/LTE_UE_TRANSPORT/dci_tools_ue.c @@ -943,7 +943,7 @@ int check_dci_format1_1a_coherency(DCI_format_t dci_format, } } - if ((rnti==si_rnti) || (rnti==p_rnti) || (rnti==ra_rnti)) + if (dci_format == format1a && ((rnti==si_rnti) || (rnti==p_rnti) || (rnti==ra_rnti))) { NPRB = (TPC&1) + 2; switch (N_RB_DL) { @@ -960,8 +960,8 @@ int check_dci_format1_1a_coherency(DCI_format_t dci_format, RIV_max = RIV_max100; break; } - } - else + } + else if (dci_format == format1a) { switch (N_RB_DL) { case 6: @@ -996,13 +996,13 @@ int check_dci_format1_1a_coherency(DCI_format_t dci_format, } - if(dci_format == format1) + else if (dci_format == format1) { NPRB = conv_nprb(rah, rballoc, N_RB_DL); } - if(rballoc > RIV_max) + if(dci_format == format1a && rballoc > RIV_max) { // LOG_I(PHY,"bad dci rballoc rballoc %d RIV_max %lld \n",rballoc, RIV_max); // DCI false detection diff --git a/openair1/PHY/impl_defs_top.h b/openair1/PHY/impl_defs_top.h index 8b31b601621d59e7121ad6f9805b1efe402255c7..df1f6f46933818054bcd1252fb05d54961fde544 100644 --- a/openair1/PHY/impl_defs_top.h +++ b/openair1/PHY/impl_defs_top.h @@ -287,9 +287,9 @@ typedef struct { #ifndef malloc16 # ifdef __AVX2__ -# define malloc16(x) memalign(32,x) +# define malloc16(x) memalign(32,x+32) # else -# define malloc16(x) memalign(16,x) +# define malloc16(x) memalign(16,x+16) # endif #endif #define free16(y,x) free(y) @@ -306,9 +306,9 @@ typedef struct { static inline void* malloc16_clear( size_t size ) { #ifdef __AVX2__ - void* ptr = memalign(32, size); + void* ptr = memalign(32, size+32); #else - void* ptr = memalign(16, size); + void* ptr = memalign(16, size+16); #endif DevAssert(ptr); memset( ptr, 0, size ); diff --git a/openair1/SIMULATION/LTE_PHY/dlsim.c b/openair1/SIMULATION/LTE_PHY/dlsim.c index f51d6367a1239fab397fb2d91b067861142643dc..7b3a2318b277680ebd785f4b0d57c52d72def35c 100644 --- a/openair1/SIMULATION/LTE_PHY/dlsim.c +++ b/openair1/SIMULATION/LTE_PHY/dlsim.c @@ -521,6 +521,7 @@ int main(int argc, char **argv) int k,i,j,aa; int re; + int s,Kr,Kr_bytes; double SNR,snr0=-2.0,snr1,rate = 0; @@ -1306,7 +1307,9 @@ int main(int argc, char **argv) } */ + UE->pdcch_vars[UE->current_thread_id[subframe]][0]->crnti = n_rnti; + UE->n_connected_eNB = 1; printf("Allocating %dx%d eNB->UE channel descriptor\n",eNB->frame_parms.nb_antennas_tx,UE->frame_parms.nb_antennas_rx); eNB2UE[0] = new_channel_desc_scm(eNB->frame_parms.nb_antennas_tx, @@ -1318,8 +1321,10 @@ int main(int argc, char **argv) rx_sample_offset, 0); + reset_meas(&eNB2UE[0]->random_channel); + reset_meas(&eNB2UE[0]->interp_time); if(num_rounds>1) { - for(n=1; n<4; n++) + for(n=1; n<4; n++) { eNB2UE[n] = new_channel_desc_scm(eNB->frame_parms.nb_antennas_tx, UE->frame_parms.nb_antennas_rx, channel_model, @@ -1328,8 +1333,11 @@ int main(int argc, char **argv) forgetting_factor, rx_sample_offset, 0); + reset_meas(&eNB2UE[n]->random_channel); + reset_meas(&eNB2UE[n]->interp_time); + } } - + if (eNB2UE[0]==NULL) { printf("Problem generating channel model. Exiting.\n"); exit(-1); diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf index 25b0cb1456369ffb4ef6cec09657b5954e5e08e5..550de4e1a2c5a56b846a8d5bf296a08f2ddaabad 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.conf @@ -39,7 +39,7 @@ eNBs = downlink_frequency = 2685000000L; uplink_frequency_offset = -120000000; Nid_cell = 0; - N_RB_DL = 50; + N_RB_DL = 100; Nid_cell_mbsfn = 0; nb_antenna_ports = 1; nb_antennas_tx = 1; diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf index 2b5a0ca68469eae11ba2587f9aae402a8dba7fc5..625ac3a26d2983f18bf47a33b256383d7c34d38e 100644 --- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf +++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/rcc.band7.tm1.if4p5.50PRB.lo.conf @@ -39,7 +39,7 @@ eNBs = downlink_frequency = 2685000000L; uplink_frequency_offset = -120000000; Nid_cell = 0; - N_RB_DL = 50; + N_RB_DL = 100; Nid_cell_mbsfn = 0; nb_antenna_ports = 1; nb_antennas_tx = 1;