diff --git a/cmake_targets/autotests/test_case_list.xml b/cmake_targets/autotests/test_case_list.xml
index 14daa644dfca7ff260037666a74eb974c954cfea..a2c68e9ef6a31d6f560006d43f17847b82c654e1 100755
--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -1104,7 +1104,8 @@
(Test19: Mapping type A, 3 DMRS Symbols),
(Test20: Mapping type B, 4 DMRS Symbols),
(Test21: 4x4 MIMO, 1 Layer),
- (Test22: 4x4 MIMO, 2 Layers)</desc>
+ (Test22: 4x4 MIMO, 2 Layers),
+ (Test23: 25 PRBs, 15 kHz SCS)</desc>
<pre_compile_prog></pre_compile_prog>
<compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
<compile_prog_args> --phy_simulators -c </compile_prog_args>
@@ -1132,8 +1133,9 @@
-n100 -s2 -U 2 0 2
-n100 -s2 -U 2 1 3
-n10 -s20 -U 3 0 0 2 -gR -x1 -y4 -z4
- -n10 -s20 -U 3 0 0 2 -gR -x2 -y4 -z4</main_exec_args>
- <tags>nr_dlsim.test1 nr_dlsim.test2 nr_dlsim.test3 nr_dlsim.test4 nr_dlsim.test5 nr_dlsim.test6 nr_dlsim.test7 nr_dlsim.test8 nr_dlsim.test9 nr_dlsim.test10 nr_dlsim.test11 nr_dlsim.test12 nr_dlsim.test13 nr_dlsim.test14 nr_dlsim.test15 nr_dlsim.test16 nr_dlsim.test17 nr_dlsim.test18 nr_dlsim.test19 nr_dlsim.test20 nr_dlsim.test21 nr_dlsim.test22</tags>
+ -n10 -s20 -U 3 0 0 2 -gR -x2 -y4 -z4
+ -n100 -m0 -e0 -R25 -b25 -i</main_exec_args>
+ <tags>nr_dlsim.test1 nr_dlsim.test2 nr_dlsim.test3 nr_dlsim.test4 nr_dlsim.test5 nr_dlsim.test6 nr_dlsim.test7 nr_dlsim.test8 nr_dlsim.test9 nr_dlsim.test10 nr_dlsim.test11 nr_dlsim.test12 nr_dlsim.test13 nr_dlsim.test14 nr_dlsim.test15 nr_dlsim.test16 nr_dlsim.test17 nr_dlsim.test18 nr_dlsim.test19 nr_dlsim.test20 nr_dlsim.test21 nr_dlsim.test22 nr_dlsim.test23</tags>
<search_expr_true>PDSCH test OK</search_expr_true>
<search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
<nruns>3</nruns>
@@ -1306,9 +1308,10 @@
(Test12: SC-FDMA, 216 PRBs),
(Test13: SC-FDMA, 273 PRBs),
(Test14: SC-FDMA, 3 DMRS),
- (Test15: MCS 19 50 PRBs 2 RX_Antenna)
- (Test16: MCS 9 106 PRBs MIMO 2 layers)
- (Test17: MCS 9 106 PRBs MIMO 4 layers)</desc>
+ (Test15: MCS 19 50 PRBs 2 RX_Antenna),
+ (Test16: MCS 9 106 PRBs MIMO 2 layers),
+ (Test17: MCS 9 106 PRBs MIMO 4 layers),
+ (Test18: 25 PRBs, 15 kHz SCS)</desc>
<pre_compile_prog></pre_compile_prog>
<compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
<compile_prog_args> --phy_simulators -c </compile_prog_args>
@@ -1331,9 +1334,9 @@
-n100 -s5 -Z -U 2 0 2
-n100 -m19 -s10 -S15 -z2
-n100 -m9 -r106 -s10 -W2 -y2 -z2
- -n100 -m9 -r106 -s20 -W4 -y4 -z4</main_exec_args>
-
- <tags>nr_ulsim.test1 nr_ulsim.test2 nr_ulsim.test3 nr_ulsim.test4 nr_ulsim.test5 nr_ulsim.test6 nr_ulsim.test7 nr_ulsim.test8 nr_ulsim.test9 nr_ulsim.test10 nr_ulsim.test11 nr_ulsim.test12 nr_ulsim.test13 nr_ulsim.test14 nr_ulsim.test15 nr_ulsim.test16 nr_ulsim.test17</tags>
+ -n100 -m9 -r106 -s20 -W4 -y4 -z4
+ -n100 -u0 -m0 -R25 -r25 -i</main_exec_args>
+ <tags>nr_ulsim.test1 nr_ulsim.test2 nr_ulsim.test3 nr_ulsim.test4 nr_ulsim.test5 nr_ulsim.test6 nr_ulsim.test7 nr_ulsim.test8 nr_ulsim.test9 nr_ulsim.test10 nr_ulsim.test11 nr_ulsim.test12 nr_ulsim.test13 nr_ulsim.test14 nr_ulsim.test15 nr_ulsim.test16 nr_ulsim.test17 nr_ulsim.test18</tags>
<search_expr_true>PUSCH test OK</search_expr_true>
<search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
<nruns>3</nruns>
@@ -1344,10 +1347,11 @@
<desc>nr_prachsim Test cases. (Test1: 30kHz SCS, 106 PRBs, Prach format A2),
(Test2: 30kHz SCS, 217 PRBs, Prach format A2),
(Test3: 30kHz SCS, 273 PRBs, Prach format A2),
- (Test4: 30kHz SCS, 106 PRBs, Prach format 0),
+ (Test4: 30kHz SCS, 106 PRBs, Prach format 0),
(Test5: 120kHz SCS, 32 PRBs, Prach format A2),
(Test6: 120kHz SCS, 66 PRBs, Prach format A2),
- (Test7: 120kHz SCS, 66 PRBs, High Speed Enabled)</desc>
+ (Test7: 120kHz SCS, 66 PRBs, High Speed Enabled),
+ (Test8: 15kHz SCS, 25 PRBs)</desc>
<pre_compile_prog></pre_compile_prog>
<compile_prog>$OPENAIR_DIR/cmake_targets/build_oai</compile_prog>
<compile_prog_args> --phy_simulators -c </compile_prog_args>
@@ -1357,11 +1361,12 @@
<main_exec_args>-a -s -30 -n 100 -p 63 -R 106
-a -s -30 -n 100 -p 63 -R 217
-a -s -30 -n 100 -p 63 -R 273
- -a -s -30 -n 100 -p 63 -R 106 -c 4
- -a -s -30 -n 100 -p 32 -R 32 -m 3 -c52
- -a -s -30 -n 100 -p 32 -R 66 -m 3 -c52
- -a -s -30 -n 100 -R 66 -m 3 -c52 -H</main_exec_args>
- <tags>nr_prachsim.test1 nr_prachsim.test2 nr_prachsim.test3 nr_prachsim.test4 nr_prachsim.test5 nr_prachsim.test6 nr_prachsim.test7</tags>
+ -a -s -30 -n 100 -p 63 -R 106 -c 4
+ -a -s -30 -n 100 -p 32 -R 32 -m 3 -c52
+ -a -s -30 -n 100 -p 32 -R 66 -m 3 -c52
+ -a -s -30 -n 100 -R 66 -m 3 -c52 -H
+ -a -s -30 -n 100 -p 99 -R 25 -m 0</main_exec_args>
+ <tags>nr_prachsim.test1 nr_prachsim.test2 nr_prachsim.test3 nr_prachsim.test4 nr_prachsim.test5 nr_prachsim.test6 nr_prachsim.test7 nr_prachsim.test8</tags>
<search_expr_true>PRACH test OK</search_expr_true>
<search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
<nruns>3</nruns>
diff --git a/common/utils/threadPool/thread-pool.h b/common/utils/threadPool/thread-pool.h
index d06f2195ee7921c40cfef5f5e5a1a5acf3885e3c..e448117385a932318358d578e83499c5632853cf 100644
--- a/common/utils/threadPool/thread-pool.h
+++ b/common/utils/threadPool/thread-pool.h
@@ -80,7 +80,7 @@ static inline notifiedFIFO_elt_t *newNotifiedFIFO_elt(int size,
notifiedFIFO_t *reponseFifo,
void (*processingFunc)(void *)) {
notifiedFIFO_elt_t *ret;
- AssertFatal( NULL != (ret=(notifiedFIFO_elt_t *) malloc(sizeof(notifiedFIFO_elt_t)+size+32)), "");
+ AssertFatal( NULL != (ret=(notifiedFIFO_elt_t *) calloc(1, sizeof(notifiedFIFO_elt_t)+size+32)), "");
ret->next=NULL;
ret->key=key;
ret->reponseFifo=reponseFifo;
diff --git a/executables/nr-ru.c b/executables/nr-ru.c
index fbe757ca300ec1489dd6a67f05cba4b965c1fa29..ad018b17ab010d765793e7e63e52313776741b36 100644
--- a/executables/nr-ru.c
+++ b/executables/nr-ru.c
@@ -719,10 +719,17 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
AssertFatal(txsymb>0,"illegal txsymb %d\n",txsymb);
- if(slot%(fp->slots_per_subframe/2))
- siglen = txsymb * (fp->ofdm_symbol_size + fp->nb_prefix_samples);
- else
- siglen = (fp->ofdm_symbol_size + fp->nb_prefix_samples0) + (txsymb - 1) * (fp->ofdm_symbol_size + fp->nb_prefix_samples);
+ if (fp->slots_per_subframe == 1) {
+ if (txsymb <= 7)
+ siglen = (fp->ofdm_symbol_size + fp->nb_prefix_samples0) + (txsymb - 1) * (fp->ofdm_symbol_size + fp->nb_prefix_samples);
+ else
+ siglen = 2 * (fp->ofdm_symbol_size + fp->nb_prefix_samples0) + (txsymb - 2) * (fp->ofdm_symbol_size + fp->nb_prefix_samples);
+ } else {
+ if(slot%(fp->slots_per_subframe/2))
+ siglen = txsymb * (fp->ofdm_symbol_size + fp->nb_prefix_samples);
+ else
+ siglen = (fp->ofdm_symbol_size + fp->nb_prefix_samples0) + (txsymb - 1) * (fp->ofdm_symbol_size + fp->nb_prefix_samples);
+ }
//+ ru->end_of_burst_delay;
flags = 3; // end of burst
@@ -1049,11 +1056,12 @@ void fill_rf_config(RU_t *ru, char *rf_config_file) {
cfg->tx_gain[i] = ru->att_tx;
cfg->rx_gain[i] = ru->max_rxgain-ru->att_rx;
cfg->configFilename = rf_config_file;
- LOG_I(PHY, "Channel %d: setting tx_gain offset %f, rx_gain offset %f, tx_freq %lu Hz, rx_freq %lu Hz\n",
+ LOG_I(PHY, "Channel %d: setting tx_gain offset %.0f, rx_gain offset %.0f, tx_freq %.0f Hz, rx_freq %.0f Hz, tune_offset %.0f Hz\n",
i, cfg->tx_gain[i],
cfg->rx_gain[i],
- (unsigned long)cfg->tx_freq[i],
- (unsigned long)cfg->rx_freq[i]);
+ cfg->tx_freq[i],
+ cfg->rx_freq[i],
+ cfg->tune_offset);
}
}
@@ -2051,6 +2059,8 @@ static void NRRCconfig_RU(void) {
RC.ru[j]->openair0_cfg.time_source = internal;
}
+ RC.ru[j]->openair0_cfg.tune_offset = get_softmodem_params()->tune_offset;
+
if (strcmp(*(RUParamList.paramarray[j][RU_LOCAL_RF_IDX].strptr), "yes") == 0) {
if ( !(config_isparamset(RUParamList.paramarray[j],RU_LOCAL_IF_NAME_IDX)) ) {
RC.ru[j]->if_south = LOCAL_RF;
diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c
index b1960faf7d555057cba80704529d2f71ccd9eef0..234705540273ac85571d27a216ac910a0e9c2dde 100644
--- a/executables/nr-uesoftmodem.c
+++ b/executables/nr-uesoftmodem.c
@@ -354,6 +354,7 @@ void init_openair0(void) {
openair0_cfg[card].num_rb_dl = frame_parms->N_RB_DL;
openair0_cfg[card].clock_source = get_softmodem_params()->clock_source;
openair0_cfg[card].time_source = get_softmodem_params()->timing_source;
+ openair0_cfg[card].tune_offset = get_softmodem_params()->tune_offset;
openair0_cfg[card].tx_num_channels = min(4, frame_parms->nb_antennas_tx);
openair0_cfg[card].rx_num_channels = min(4, frame_parms->nb_antennas_rx);
diff --git a/executables/softmodem-common.h b/executables/softmodem-common.h
index eb0c1a54f74025e5c3cb31d159790883c4e59ea7..72a9491f27f5817337f81961dc01ee368db96488 100644
--- a/executables/softmodem-common.h
+++ b/executables/softmodem-common.h
@@ -60,6 +60,7 @@ extern "C"
#define CONFIG_HLP_DMRSSYNC "tells RU to insert DMRS in subframe 1 slot 0"
#define CONFIG_HLP_CLK "tells hardware to use a clock reference (0:internal, 1:external, 2:gpsdo)\n"
#define CONFIG_HLP_TME "tells hardware to use a time reference (0:internal, 1:external, 2:gpsdo)\n"
+#define CONFIG_HLP_TUNE_OFFSET "LO tuning offset to use in Hz\n"
#define CONFIG_HLP_USIM "use XOR autentication algo in case of test usim mode\n"
#define CONFIG_HLP_NOSNGLT "Disables single-thread mode in lte-softmodem\n"
#define CONFIG_HLP_DLF "Set the downlink frequency for all component carriers\n"
@@ -118,6 +119,7 @@ extern "C"
#define EMULATE_RF softmodem_params.emulate_rf
#define CLOCK_SOURCE softmodem_params.clock_source
#define TIMING_SOURCE softmodem_params.timing_source
+#define TUNE_OFFSET softmodem_params.tune_offset
#define SEND_DMRSSYNC softmodem_params.send_dmrs_sync
#define USIM_TEST softmodem_params.usim_test
#define PRB_INTERPOLATION softmodem_params.prb_interpolation
@@ -141,6 +143,7 @@ extern int usrp_tx_thread;
{"usim-test", CONFIG_HLP_USIM, PARAMFLAG_BOOL, u8ptr:&USIM_TEST, defintval:0, TYPE_UINT8, 0}, \
{"clock-source", CONFIG_HLP_CLK, 0, uptr:&CLOCK_SOURCE, defintval:0, TYPE_UINT, 0}, \
{"time-source", CONFIG_HLP_TME, 0, uptr:&TIMING_SOURCE, defintval:0, TYPE_UINT, 0}, \
+ {"tune-offset", CONFIG_HLP_TUNE_OFFSET, 0, dblptr:&TUNE_OFFSET, defintval:0, TYPE_DOUBLE, 0}, \
{"wait-for-sync", NULL, PARAMFLAG_BOOL, iptr:&WAIT_FOR_SYNC, defintval:0, TYPE_INT, 0}, \
{"single-thread-enable", CONFIG_HLP_NOSNGLT, PARAMFLAG_BOOL, iptr:&SINGLE_THREAD_FLAG, defintval:0, TYPE_INT, 0}, \
{"C" , CONFIG_HLP_DLF, 0, u64ptr:&(downlink_frequency[0][0]), defuintval:0, TYPE_UINT64, 0}, \
@@ -245,6 +248,7 @@ typedef struct {
int band;
uint32_t clock_source;
uint32_t timing_source;
+ double tune_offset;
int hw_timing_advance;
uint32_t send_dmrs_sync;
int prb_interpolation;
diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index 58fef8ef667a1239e4b794c69032de30db40c395..8a060b69f41404490f2e5697882c7c4815e2dfe0 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -677,14 +677,18 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
int N_RB_UL = cfg->carrier_config.ul_grid_size[cfg->ssb_config.scs_common.value].value;
int n_buf = Prx*max_ul_mimo_layers;
+ int nb_re_pusch = N_RB_UL * NR_NB_SC_PER_RB;
+#ifdef __AVX2__
+ int nb_re_pusch2 = nb_re_pusch + (nb_re_pusch&7);
+#else
+ int nb_re_pusch2 = nb_re_pusch;
+#endif
+
for (int ULSCH_id=0; ULSCH_id<gNB->number_of_nr_ulsch_max; ULSCH_id++) {
pusch_vars[ULSCH_id] = (NR_gNB_PUSCH *)malloc16_clear( sizeof(NR_gNB_PUSCH) );
pusch_vars[ULSCH_id]->rxdataF_ext = (int32_t **)malloc16(Prx*sizeof(int32_t *) );
- pusch_vars[ULSCH_id]->rxdataF_ext2 = (int32_t **)malloc16(Prx*sizeof(int32_t *) );
pusch_vars[ULSCH_id]->ul_ch_estimates = (int32_t **)malloc16(n_buf*sizeof(int32_t *) );
pusch_vars[ULSCH_id]->ul_ch_estimates_ext = (int32_t **)malloc16(n_buf*sizeof(int32_t *) );
- pusch_vars[ULSCH_id]->ul_ch_ptrs_estimates = (int32_t **)malloc16(n_buf*sizeof(int32_t *) );
- pusch_vars[ULSCH_id]->ul_ch_ptrs_estimates_ext = (int32_t **)malloc16(n_buf*sizeof(int32_t *) );
pusch_vars[ULSCH_id]->ptrs_phase_per_slot = (int32_t **)malloc16(n_buf*sizeof(int32_t *) );
pusch_vars[ULSCH_id]->ul_ch_estimates_time = (int32_t **)malloc16(n_buf*sizeof(int32_t *) );
pusch_vars[ULSCH_id]->rxdataF_comp = (int32_t **)malloc16(n_buf*sizeof(int32_t *) );
@@ -692,32 +696,29 @@ int phy_init_nr_gNB(PHY_VARS_gNB *gNB,
pusch_vars[ULSCH_id]->ul_ch_magb0 = (int32_t **)malloc16(n_buf*sizeof(int32_t *) );
pusch_vars[ULSCH_id]->ul_ch_mag = (int32_t **)malloc16(n_buf*sizeof(int32_t *) );
pusch_vars[ULSCH_id]->ul_ch_magb = (int32_t **)malloc16(n_buf*sizeof(int32_t *) );
- pusch_vars[ULSCH_id]->rho = (int32_t ***)malloc16_clear(Prx*sizeof(int32_t**) );
+ pusch_vars[ULSCH_id]->rho = (int32_t ***)malloc16(Prx*sizeof(int32_t **) );
pusch_vars[ULSCH_id]->llr_layers = (int16_t **)malloc16(max_ul_mimo_layers*sizeof(int32_t *) );
for (i=0; i<Prx; i++) {
- pusch_vars[ULSCH_id]->rxdataF_ext[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*N_RB_UL*12*fp->symbols_per_slot );
- pusch_vars[ULSCH_id]->rxdataF_ext2[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*N_RB_UL*12*fp->symbols_per_slot );
+ pusch_vars[ULSCH_id]->rxdataF_ext[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*nb_re_pusch2*fp->symbols_per_slot );
pusch_vars[ULSCH_id]->rho[i] = (int32_t **)malloc16_clear(NR_MAX_NB_LAYERS*NR_MAX_NB_LAYERS*sizeof(int32_t*));
for (int j=0; j< max_ul_mimo_layers; j++) {
for (int k=0; k<max_ul_mimo_layers; k++) {
- pusch_vars[ULSCH_id]->rho[i][j*max_ul_mimo_layers+k]=(int32_t *)malloc16_clear( sizeof(int32_t) * fp->N_RB_UL*12*7*2 );
+ pusch_vars[ULSCH_id]->rho[i][j*max_ul_mimo_layers+k]=(int32_t *)malloc16_clear( sizeof(int32_t)*nb_re_pusch2*fp->symbols_per_slot );
}
}
}
for (i=0; i<n_buf; i++) {
- pusch_vars[ULSCH_id]->ul_ch_estimates[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size*2*fp->symbols_per_slot );
- pusch_vars[ULSCH_id]->ul_ch_estimates_ext[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*N_RB_UL*12*fp->symbols_per_slot );
- pusch_vars[ULSCH_id]->ul_ch_estimates_time[i] = (int32_t *)malloc16_clear( 2*sizeof(int32_t)*fp->ofdm_symbol_size );
- pusch_vars[ULSCH_id]->ul_ch_ptrs_estimates[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size*2*fp->symbols_per_slot ); // max intensity in freq is 1 sc every 2 RBs
- pusch_vars[ULSCH_id]->ul_ch_ptrs_estimates_ext[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*N_RB_UL*12*fp->symbols_per_slot );
+ pusch_vars[ULSCH_id]->ul_ch_estimates[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size*fp->symbols_per_slot );
+ pusch_vars[ULSCH_id]->ul_ch_estimates_ext[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*nb_re_pusch2*fp->symbols_per_slot );
+ pusch_vars[ULSCH_id]->ul_ch_estimates_time[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->ofdm_symbol_size );
pusch_vars[ULSCH_id]->ptrs_phase_per_slot[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*fp->symbols_per_slot); // symbols per slot
- pusch_vars[ULSCH_id]->rxdataF_comp[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*N_RB_UL*12*fp->symbols_per_slot );
- pusch_vars[ULSCH_id]->ul_ch_mag0[i] = (int32_t *)malloc16_clear( fp->symbols_per_slot*sizeof(int32_t)*N_RB_UL*12 );
- pusch_vars[ULSCH_id]->ul_ch_magb0[i] = (int32_t *)malloc16_clear( fp->symbols_per_slot*sizeof(int32_t)*N_RB_UL*12 );
- pusch_vars[ULSCH_id]->ul_ch_mag[i] = (int32_t *)malloc16_clear( fp->symbols_per_slot*sizeof(int32_t)*N_RB_UL*12 );
- pusch_vars[ULSCH_id]->ul_ch_magb[i] = (int32_t *)malloc16_clear( fp->symbols_per_slot*sizeof(int32_t)*N_RB_UL*12 );
+ pusch_vars[ULSCH_id]->rxdataF_comp[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*nb_re_pusch2*fp->symbols_per_slot );
+ pusch_vars[ULSCH_id]->ul_ch_mag0[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*nb_re_pusch2*fp->symbols_per_slot );
+ pusch_vars[ULSCH_id]->ul_ch_magb0[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*nb_re_pusch2*fp->symbols_per_slot );
+ pusch_vars[ULSCH_id]->ul_ch_mag[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*nb_re_pusch2*fp->symbols_per_slot );
+ pusch_vars[ULSCH_id]->ul_ch_magb[i] = (int32_t *)malloc16_clear( sizeof(int32_t)*nb_re_pusch2*fp->symbols_per_slot );
}
for (i=0; i< max_ul_mimo_layers; i++) {
@@ -846,7 +847,6 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
free_and_zero(pusch_vars[ULSCH_id]->llr_layers[i]);
for (int i = 0; i < Prx; i++) {
free_and_zero(pusch_vars[ULSCH_id]->rxdataF_ext[i]);
- free_and_zero(pusch_vars[ULSCH_id]->rxdataF_ext2[i]);
for (int j=0; j< max_ul_mimo_layers; j++) {
for (int k=0; k<max_ul_mimo_layers; k++)
free_and_zero(pusch_vars[ULSCH_id]->rho[i][j*max_ul_mimo_layers+k]);
@@ -857,8 +857,6 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_estimates[i]);
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_estimates_ext[i]);
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_estimates_time[i]);
- free_and_zero(pusch_vars[ULSCH_id]->ul_ch_ptrs_estimates[i]);
- free_and_zero(pusch_vars[ULSCH_id]->ul_ch_ptrs_estimates_ext[i]);
free_and_zero(pusch_vars[ULSCH_id]->ptrs_phase_per_slot[i]);
free_and_zero(pusch_vars[ULSCH_id]->rxdataF_comp[i]);
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_mag0[i]);
@@ -868,11 +866,8 @@ void phy_free_nr_gNB(PHY_VARS_gNB *gNB)
}
free_and_zero(pusch_vars[ULSCH_id]->llr_layers);
free_and_zero(pusch_vars[ULSCH_id]->rxdataF_ext);
- free_and_zero(pusch_vars[ULSCH_id]->rxdataF_ext2);
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_estimates);
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_estimates_ext);
- free_and_zero(pusch_vars[ULSCH_id]->ul_ch_ptrs_estimates);
- free_and_zero(pusch_vars[ULSCH_id]->ul_ch_ptrs_estimates_ext);
free_and_zero(pusch_vars[ULSCH_id]->ptrs_phase_per_slot);
free_and_zero(pusch_vars[ULSCH_id]->ul_ch_estimates_time);
free_and_zero(pusch_vars[ULSCH_id]->ul_valid_re_per_slot);
@@ -936,7 +931,12 @@ void nr_phy_config_request_sim(PHY_VARS_gNB *gNB,
//gNB_config->subframe_config.dl_cyclic_prefix_type.value = (fp->Ncp == NORMAL) ? NFAPI_CP_NORMAL : NFAPI_CP_EXTENDED;
gNB->mac_enabled = 1;
- if (mu==1) {
+ if (mu==0) {
+ fp->dl_CarrierFreq = 2600000000;//from_nrarfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.nrarfcn.value);
+ fp->ul_CarrierFreq = 2600000000;//fp->dl_CarrierFreq - (get_uldl_offset(gNB_config->nfapi_config.rf_bands.rf_band[0])*100000);
+ fp->nr_band = 38;
+ // fp->threequarter_fs= 0;
+ } else if (mu==1) {
fp->dl_CarrierFreq = 3600000000;//from_nrarfcn(gNB_config->nfapi_config.rf_bands.rf_band[0],gNB_config->nfapi_config.nrarfcn.value);
fp->ul_CarrierFreq = 3600000000;//fp->dl_CarrierFreq - (get_uldl_offset(gNB_config->nfapi_config.rf_bands.rf_band[0])*100000);
fp->nr_band = 78;
diff --git a/openair1/PHY/INIT/nr_init_ue.c b/openair1/PHY/INIT/nr_init_ue.c
index 238016460ca8557de868f2f202e4e5f8de686dca..fcbbd49b445a206811c8df13ba89b0c4b3c4670c 100644
--- a/openair1/PHY/INIT/nr_init_ue.c
+++ b/openair1/PHY/INIT/nr_init_ue.c
@@ -76,7 +76,6 @@ void phy_init_nr_ue_PDSCH(NR_UE_PDSCH *const pdsch,
pdsch->dl_ch_magr0 = (int32_t **)malloc16_clear( NR_MAX_NB_LAYERS*fp->nb_antennas_rx*sizeof(int32_t *) );
pdsch->ptrs_phase_per_slot = (int32_t **)malloc16_clear( fp->nb_antennas_rx*sizeof(int32_t *) );
pdsch->ptrs_re_per_slot = (int32_t **)malloc16_clear( fp->nb_antennas_rx*sizeof(int32_t *) );
- pdsch->dl_ch_ptrs_estimates_ext = (int32_t **)malloc16_clear( fp->nb_antennas_rx*sizeof(int32_t *) );
// the allocated memory size is fixed:
AssertFatal( fp->nb_antennas_rx <= 4, "nb_antennas_rx > 4" );//Extend the max number of UE Rx antennas to 4
@@ -86,7 +85,6 @@ void phy_init_nr_ue_PDSCH(NR_UE_PDSCH *const pdsch,
pdsch->rxdataF_uespec_pilots[i] = (int32_t *)malloc16_clear( sizeof(int32_t) * fp->N_RB_DL*12);
pdsch->ptrs_phase_per_slot[i] = (int32_t *)malloc16_clear( sizeof(int32_t) * 14 );
pdsch->ptrs_re_per_slot[i] = (int32_t *)malloc16_clear( sizeof(int32_t) * 14);
- pdsch->dl_ch_ptrs_estimates_ext[i] = (int32_t *)malloc16_clear( sizeof(int32_t) * num);
pdsch->rho[i] = (int32_t **)malloc16_clear( NR_MAX_NB_LAYERS*NR_MAX_NB_LAYERS*sizeof(int32_t *) );
for (int j=0; j<NR_MAX_NB_LAYERS; j++) {
@@ -126,7 +124,6 @@ void phy_term_nr_ue__PDSCH(NR_UE_PDSCH* pdsch, const NR_DL_FRAME_PARMS *const fp
free_and_zero(pdsch->rxdataF_uespec_pilots[i]);
free_and_zero(pdsch->ptrs_phase_per_slot[i]);
free_and_zero(pdsch->ptrs_re_per_slot[i]);
- free_and_zero(pdsch->dl_ch_ptrs_estimates_ext[i]);
free_and_zero(pdsch->rho[i]);
}
free_and_zero(pdsch->pmi_ext);
@@ -149,7 +146,6 @@ void phy_term_nr_ue__PDSCH(NR_UE_PDSCH* pdsch, const NR_DL_FRAME_PARMS *const fp
free_and_zero(pdsch->dl_ch_magr0);
free_and_zero(pdsch->ptrs_phase_per_slot);
free_and_zero(pdsch->ptrs_re_per_slot);
- free_and_zero(pdsch->dl_ch_ptrs_estimates_ext);
}
int init_nr_ue_signal(PHY_VARS_NR_UE *ue, int nb_connected_gNB)
diff --git a/openair1/PHY/MODULATION/nr_modulation.c b/openair1/PHY/MODULATION/nr_modulation.c
index b1a108f24756294a2ce77390db3d667779ae435d..8352a7f5a64a00bb45a2abb8a0e0a7b21b0f6159 100644
--- a/openair1/PHY/MODULATION/nr_modulation.c
+++ b/openair1/PHY/MODULATION/nr_modulation.c
@@ -665,8 +665,9 @@ void init_symbol_rotation(NR_DL_FRAME_PARMS *fp) {
void init_timeshift_rotation(NR_DL_FRAME_PARMS *fp)
{
+ const int sample_offset = fp->nb_prefix_samples / fp->ofdm_offset_divisor;
for (int i = 0; i < fp->ofdm_symbol_size; i++) {
- double poff = -i * 2.0 * M_PI * 144.0 / 2048.0 / fp->ofdm_offset_divisor;
+ double poff = -i * 2.0 * M_PI * sample_offset / fp->ofdm_symbol_size;
double exp_re = cos(poff);
double exp_im = sin(-poff);
fp->timeshift_symbol_rotation[i*2] = (int16_t)round(exp_re * 32767);
diff --git a/openair1/PHY/MODULATION/slot_fep_nr.c b/openair1/PHY/MODULATION/slot_fep_nr.c
index eb26dfc02bfb6e3b6a222521ec70d3f64ec6e487..139b730ce1bb515046340fef8fc6394d5c22451a 100644
--- a/openair1/PHY/MODULATION/slot_fep_nr.c
+++ b/openair1/PHY/MODULATION/slot_fep_nr.c
@@ -34,47 +34,6 @@
#define LOG_I(A,B...) printf(A)
#endif*/
-dft_size_idx_t get_dft_size_idx(uint16_t ofdm_symbol_size)
-{
- switch (ofdm_symbol_size) {
- case 128:
- return DFT_128;
-
- case 256:
- return DFT_256;
-
- case 512:
- return DFT_512;
-
- case 1024:
- return DFT_1024;
-
- case 1536:
- return DFT_1536;
-
- case 2048:
- return DFT_2048;
-
- case 3072:
- return DFT_3072;
-
- case 4096:
- return DFT_4096;
-
- case 6144:
- return DFT_6144;
-
- case 8192:
- return DFT_8192;
-
- default:
- printf("unsupported ofdm symbol size \n");
- assert(0);
- }
-
- return DFT_SIZE_IDXTABLESIZE;
-}
-
int nr_slot_fep(PHY_VARS_NR_UE *ue,
UE_nr_rxtx_proc_t *proc,
unsigned char symbol,
@@ -96,7 +55,7 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
nb_prefix_samples0 = frame_parms->nb_prefix_samples;
}
- dft_size_idx_t dftsize = get_dft_size_idx(frame_parms->ofdm_symbol_size);
+ dft_size_idx_t dftsize = get_dft(frame_parms->ofdm_symbol_size);
// This is for misalignment issues
int32_t tmp_dft_in[8192] __attribute__ ((aligned (32)));
@@ -195,7 +154,7 @@ int nr_slot_fep_init_sync(PHY_VARS_NR_UE *ue,
}
unsigned int frame_length_samples = frame_parms->samples_per_frame;
- dft_size_idx_t dftsize = get_dft_size_idx(frame_parms->ofdm_symbol_size);
+ dft_size_idx_t dftsize = get_dft(frame_parms->ofdm_symbol_size);
// This is for misalignment issues
int32_t tmp_dft_in[8192] __attribute__ ((aligned (32)));
@@ -289,7 +248,7 @@ int nr_slot_fep_ul(NR_DL_FRAME_PARMS *frame_parms,
unsigned int nb_prefix_samples = frame_parms->nb_prefix_samples;
unsigned int nb_prefix_samples0 = frame_parms->nb_prefix_samples0;
- dft_size_idx_t dftsize = get_dft_size_idx(frame_parms->ofdm_symbol_size);
+ dft_size_idx_t dftsize = get_dft(frame_parms->ofdm_symbol_size);
// This is for misalignment issues
int32_t tmp_dft_in[8192] __attribute__ ((aligned (32)));
diff --git a/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c b/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
index 70a06d472745b17c3a10393fcadcf955d8767be7..4548a3a1f12a63bfb8ee876b5f25a8240f0e944a 100644
--- a/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+++ b/openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
@@ -665,6 +665,10 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
ch[0] = ch_0 / 4;
ch[1] = ch_1 / 4;
+#if NO_INTERP
+ for (int i=0;i<12;i++) ((int32_t*)ul_ch)[i] = *(int32_t*)ch;
+ ul_ch+=24;
+#else
multadd_real_vector_complex_scalar(filt8_avlip0,
ch,
ul_ch,
@@ -682,6 +686,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
ul_ch,
8);
ul_ch -= 24;
+#endif
for (pilot_cnt=4; pilot_cnt<4*(nb_rb_pusch-1); pilot_cnt += 4) {
@@ -716,6 +721,10 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
ch[0] = ch_0 / 4;
ch[1] = ch_1 / 4;
+#if NO_INTERP
+ for (int i=0;i<12;i++) ((int32_t*)ul_ch)[i] = *(int32_t*)ch;
+ ul_ch+=24;
+#else
ul_ch[6] += (ch[0] * 1365)>>15; // 1/12*16384
ul_ch[7] += (ch[1] * 1365)>>15; // 1/12*16384
@@ -737,6 +746,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
ul_ch,
8);
ul_ch -= 16;
+#endif
}
// Last PRB
ch_0 = ((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15;
@@ -770,6 +780,10 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
ch[0] = ch_0 / 4;
ch[1] = ch_1 / 4;
+#if NO_INTERP
+ for (int i=0;i<12;i++) ((int32_t*)ul_ch)[i] = *(int32_t*)ch;
+ ul_ch+=24;
+#else
ul_ch[6] += (ch[0] * 1365)>>15; // 1/12*16384
ul_ch[7] += (ch[1] * 1365)>>15; // 1/12*16384
@@ -784,6 +798,7 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
ch,
ul_ch,
8);
+#endif
}
#ifdef DEBUG_PUSCH
ul_ch = (int16_t *)&ul_ch_estimates[p*gNB->frame_parms.nb_antennas_rx+aarx][ch_offset];
@@ -890,7 +905,6 @@ void nr_pusch_ptrs_processing(PHY_VARS_gNB *gNB,
/*------------------------------------------------------------------------------------------------------- */
nr_ptrs_cpe_estimation(*K_ptrs,*ptrsReOffset,*dmrsConfigType,*nb_rb,
rel15_ul->rnti,
- (int16_t *)&gNB->pusch_vars[ulsch_id]->ul_ch_ptrs_estimates_ext[aarx][symbol*nb_re_pusch],
nr_tti_rx,
symbol,frame_parms->ofdm_symbol_size,
(int16_t*)&gNB->pusch_vars[ulsch_id]->rxdataF_comp[aarx][(symbol * nb_re_pusch)],
diff --git a/openair1/PHY/NR_REFSIG/dmrs_nr.c b/openair1/PHY/NR_REFSIG/dmrs_nr.c
index 2e270318f822301e822ffd358870c63961c60593..ca901e1452c698b5ec1b0a3dadf755dfd11e62e3 100644
--- a/openair1/PHY/NR_REFSIG/dmrs_nr.c
+++ b/openair1/PHY/NR_REFSIG/dmrs_nr.c
@@ -295,74 +295,6 @@ uint16_t get_dmrs_freq_idx_ul(uint16_t n, uint8_t k_prime, uint8_t delta, uint8_
#define CHECK_DMRS_PBCH_SEQUENCE
-void generate_dmrs_pbch(uint32_t dmrs_pbch_bitmap[DMRS_PBCH_I_SSB][DMRS_PBCH_N_HF][DMRS_BITMAP_SIZE], uint16_t Nid_cell)
-{
- uint32_t cinit;
- int i_ssb;
- int n_hf;
- int _i_ssb;
-
-#ifdef CHECK_DMRS_PBCH_SEQUENCE
-
- uint32_t dmrs_bitmap[DMRS_PBCH_I_SSB][DMRS_PBCH_N_HF][DMRS_BITMAP_SIZE];
- uint32_t *dmrs_sequence = calloc(CELL_DMRS_LENGTH, sizeof(uint32_t));
- if (dmrs_sequence == NULL) {
- msg("Fatal error: memory allocation problem \n");
- assert(0);
- }
- else
- {
- printf("Check of demodulation reference signal of pbch sequence \n");
- }
-
-#endif
-
- /* for each slot number */
- for (i_ssb = 0; i_ssb<DMRS_PBCH_I_SSB; i_ssb++) {
-
- /* for each ofdm position */
- for (n_hf=0; n_hf<DMRS_PBCH_N_HF; n_hf++) {
-
- _i_ssb = i_ssb + 4*n_hf;
-
- cinit = (((_i_ssb + 1)*((Nid_cell>>4) + 1))<<11) + ((_i_ssb + 1)<<6) + (Nid_cell%4);
-
- pseudo_random_sequence_optimised(DMRS_BITMAP_SIZE, &(dmrs_pbch_bitmap[i_ssb][n_hf][0]), cinit);
-
-#ifdef CHECK_DMRS_PBCH_SEQUENCE
-
- /* it allows checking generated with standard generation code */
- pseudo_random_sequence(DMRS_BITMAP_SIZE*sizeof(uint32_t), dmrs_sequence, cinit);
-
- int j = 0;
- int k = 0;
-
- /* format for getting bitmap from uint32_t */
- for (int i=0; i<DMRS_BITMAP_SIZE; i++) {
- dmrs_bitmap[i_ssb][n_hf][i] = 0;
- /* convert to bitmap */
- for (; j < k + 32; j++) {
- dmrs_bitmap[i_ssb][n_hf][i] |= (dmrs_sequence[j]<<j);
- }
- k = j;
- }
-
- for (int i=0; i<DMRS_BITMAP_SIZE; i++) {
- if (dmrs_pbch_bitmap[i_ssb][n_hf][i] != dmrs_bitmap[i_ssb][n_hf][i]) {
- printf("Error in gold sequence computation for ns %d l %d and index %i : 0x%x 0x%x \n", i_ssb, n_hf, i, dmrs_pbch_bitmap[i_ssb][n_hf][i], dmrs_bitmap[i_ssb][n_hf][i]);
- assert(0);
- }
- }
-
-#endif
-
- }
- }
-
-#ifdef CHECK_DMRS_PBCH_SEQUENCE
- free(dmrs_sequence);
-#endif
-}
/* return the position of next dmrs symbol in a slot */
int8_t get_next_dmrs_symbol_in_slot(uint16_t ul_dmrs_symb_pos, uint8_t counter, uint8_t end_symbol)
{
diff --git a/openair1/PHY/NR_REFSIG/dmrs_nr.h b/openair1/PHY/NR_REFSIG/dmrs_nr.h
index b9e9ca6f0dc7dda7f6f6ffd93e1a414e66710785..13a83be53f770932e8f350710a65aed371711212 100644
--- a/openair1/PHY/NR_REFSIG/dmrs_nr.h
+++ b/openair1/PHY/NR_REFSIG/dmrs_nr.h
@@ -53,7 +53,6 @@
int pseudo_random_sequence(int M_PN, uint32_t *c, uint32_t cinit);
void lte_gold_new(LTE_DL_FRAME_PARMS *frame_parms, uint32_t lte_gold_table[20][2][14], uint16_t Nid_cell);
-void generate_dmrs_pbch(uint32_t dmrs_pbch_bitmap[DMRS_PBCH_I_SSB][DMRS_PBCH_N_HF][DMRS_BITMAP_SIZE], uint16_t Nid_cell);
uint16_t get_dmrs_freq_idx_ul(uint16_t n, uint8_t k_prime, uint8_t delta, uint8_t dmrs_type);
uint8_t allowed_xlsch_re_in_dmrs_symbol(uint16_t k,
diff --git a/openair1/PHY/NR_REFSIG/pss_nr.h b/openair1/PHY/NR_REFSIG/pss_nr.h
index c65ca3799d6348c81c39fae8a9a2d627f6fcedfa..b78a89b12c8085304c26b6f2bee0345b09557269 100644
--- a/openair1/PHY/NR_REFSIG/pss_nr.h
+++ b/openair1/PHY/NR_REFSIG/pss_nr.h
@@ -120,8 +120,6 @@ EXTERN time_stats_t generic_time[TIME_LAST];
/************** FUNCTION ******************************************/
-idft_size_idx_t get_idft(int ofdm_symbol_size);
-dft_size_idx_t get_dft(int ofdm_symbol_size);
void init_context_synchro_nr(NR_DL_FRAME_PARMS *frame_parms_ue);
void free_context_synchro_nr(void);
void init_context_pss_nr(NR_DL_FRAME_PARMS *frame_parms_ue);
diff --git a/openair1/PHY/NR_REFSIG/ptrs_nr.c b/openair1/PHY/NR_REFSIG/ptrs_nr.c
index 68134eb02ddb61b2dd7d63b54180cebc05bd64e1..5df4a25656f1cf12f2356c26501c3ae6a6304b87 100644
--- a/openair1/PHY/NR_REFSIG/ptrs_nr.c
+++ b/openair1/PHY/NR_REFSIG/ptrs_nr.c
@@ -230,7 +230,6 @@ int8_t get_next_estimate_in_slot(uint16_t ptrsSymbPos,uint16_t dmrsSymbPos, ui
* dmrsConfigType: DMRS configuration type
* nb_rb : No. of resource blocks
* rnti : RNTI
- * ptrs_ch_p : pointer to ptrs channel structure
* Ns :
* symbol : OFDM symbol
* ofdm_symbol_size: OFDM Symbol Size
@@ -249,7 +248,6 @@ void nr_ptrs_cpe_estimation(uint8_t K_ptrs,
uint8_t dmrsConfigType,
uint16_t nb_rb,
uint16_t rnti,
- int16_t *ptrs_ch_p,
unsigned char Ns,
unsigned char symbol,
uint16_t ofdm_symbol_size,
@@ -269,6 +267,7 @@ void nr_ptrs_cpe_estimation(uint8_t K_ptrs,
}
uint16_t sc_per_symbol = (nb_rb + K_ptrs - 1)/K_ptrs;
c16_t ptrs_p[(1 + sc_per_symbol/4)*4];
+ c16_t ptrs_ch_p[(1 + sc_per_symbol/4)*4];
c16_t dmrs_comp_p[(1 + sc_per_symbol/4)*4];
double abs = 0.0;
double real = 0.0;
@@ -306,13 +305,13 @@ void nr_ptrs_cpe_estimation(uint8_t K_ptrs,
*ptrs_sc = re_cnt;
/*Multiple compensated data with conj of PTRS */
- mult_cpx_vector((int16_t*)dmrs_comp_p, (int16_t*)ptrs_p, ptrs_ch_p,(1 + sc_per_symbol/4)*4,15); // 2^15 shifted
+ mult_cpx_vector((int16_t*)dmrs_comp_p, (int16_t*)ptrs_p, (int16_t*)ptrs_ch_p, (1 + sc_per_symbol/4)*4, 15); // 2^15 shifted
/* loop over all ptrs sub carriers in a symbol */
/* sum the error vector */
for(int i = 0;i < sc_per_symbol; i++) {
- real+= ptrs_ch_p[(2*i)];
- imag+= ptrs_ch_p[(2*i)+1];
+ real += ptrs_ch_p[i].r;
+ imag += ptrs_ch_p[i].i;
}
#ifdef DEBUG_PTRS
alpha = atan(imag/real);
diff --git a/openair1/PHY/NR_REFSIG/ptrs_nr.h b/openair1/PHY/NR_REFSIG/ptrs_nr.h
index 41acde0d0648ecbef152dfae6a7e39aca0e614c0..f46c5c7aeecb65e28740d9616d5ea8b2931008d8 100644
--- a/openair1/PHY/NR_REFSIG/ptrs_nr.h
+++ b/openair1/PHY/NR_REFSIG/ptrs_nr.h
@@ -96,7 +96,6 @@ void nr_ptrs_cpe_estimation(uint8_t K_ptrs,
uint8_t dmrsConfigType,
uint16_t nb_rb,
uint16_t rnti,
- int16_t *ptrs_ch_p,
unsigned char Ns,
unsigned char symbol,
uint16_t ofdm_symbol_size,
diff --git a/openair1/PHY/NR_REFSIG/ss_pbch_nr.h b/openair1/PHY/NR_REFSIG/ss_pbch_nr.h
index 44f8549258cf11ff7a4a8ef3310653f92697d609..5572604e5559e085a91176239d91c56821334538 100644
--- a/openair1/PHY/NR_REFSIG/ss_pbch_nr.h
+++ b/openair1/PHY/NR_REFSIG/ss_pbch_nr.h
@@ -80,8 +80,6 @@
/* see TS 38211 7.4.1.4 Demodulation reference signals for PBCH */
#define DMRS_PBCH_I_SSB (8) /* maximum index value for SSB/PBCH which can have alength of L=4 or L=8 */
#define DMRS_PBCH_N_HF (2) /* half frame indication - 0 for first part of frame and 1 for second part of frame */
-#define DMRS_ALIGNMENT_32_BIT (20) /* it is just for ensuring a 32 bits alignment for storing dmrs pbch into a 32 bits map */
-#define DMRS_BITMAP_SIZE ((DMRS_PBCH_NUMBER-DMRS_ALIGNMENT_32_BIT)/32) /* size is divided by 32 (to get bitmap on uint32) DMRS_PBCH_NUMBER should be a multiple of 32 */
#endif /* SS_PBCH_NR_H */
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
index 8e97a8cbdce1e908de6c2b208c5ca7c444d49d28..548cc6dbd42909a55c3d799cc886d0722d5c8622 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
@@ -310,7 +310,7 @@ int nr_dlsch_encoding(PHY_VARS_gNB *gNB,
uint32_t A = rel15->TBSize[0]<<3;
unsigned char *a=harq->pdu;
if ( rel15->rnti != SI_RNTI)
- trace_NRpdu(DIRECTION_DOWNLINK, a, rel15->TBSize[0], 0, WS_C_RNTI, rel15->rnti, frame, slot,0, 0);
+ trace_NRpdu(DIRECTION_DOWNLINK, a, rel15->TBSize[0], WS_C_RNTI, rel15->rnti, frame, slot,0, 0);
NR_gNB_SCH_STATS_t *stats=NULL;
int first_free=-1;
diff --git a/openair1/PHY/NR_TRANSPORT/nr_prach.c b/openair1/PHY/NR_TRANSPORT/nr_prach.c
index b12a58526d9a202ae842aedc5e4f99d9fe8e78c1..eb012532ce6ffd2799ed9149760a63a5f982750b 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_prach.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_prach.c
@@ -175,11 +175,19 @@ void rx_nr_prach_ru(RU_t *ru,
int msg1_frequencystart = ru->config.prach_config.num_prach_fd_occasions_list[numRA].k1.value;
int sample_offset_slot;
- if (!(slot%(fp->slots_per_subframe/2)))
- sample_offset_slot = (prachStartSymbol==0?0:fp->ofdm_symbol_size*prachStartSymbol+fp->nb_prefix_samples0+fp->nb_prefix_samples*(prachStartSymbol-1));
- else
- sample_offset_slot = (prachStartSymbol==0?0:prachStartSymbol*(fp->ofdm_symbol_size+fp->nb_prefix_samples));
- //to be checked for mu=0;
+ if (prachStartSymbol == 0) {
+ sample_offset_slot = 0;
+ } else if (fp->slots_per_subframe == 1) {
+ if (prachStartSymbol <= 7)
+ sample_offset_slot = (fp->ofdm_symbol_size + fp->nb_prefix_samples) * (prachStartSymbol - 1) + (fp->ofdm_symbol_size + fp->nb_prefix_samples0);
+ else
+ sample_offset_slot = (fp->ofdm_symbol_size + fp->nb_prefix_samples) * (prachStartSymbol - 2) + (fp->ofdm_symbol_size + fp->nb_prefix_samples0) * 2;
+ } else {
+ if (!(slot%(fp->slots_per_subframe/2)))
+ sample_offset_slot = (fp->ofdm_symbol_size + fp->nb_prefix_samples) * (prachStartSymbol - 1) + (fp->ofdm_symbol_size + fp->nb_prefix_samples0);
+ else
+ sample_offset_slot = (fp->ofdm_symbol_size + fp->nb_prefix_samples) * prachStartSymbol;
+ }
LOG_D(PHY,"frame %d, slot %d: doing rx_nr_prach_ru for format %d, numRA %d, prachStartSymbol %d, prachOccasion %d\n",frame,slot,prachFormat,numRA,prachStartSymbol,prachOccasion);
@@ -193,89 +201,167 @@ void rx_nr_prach_ru(RU_t *ru,
prach[aa] = (int16_t*)&ru->common.rxdata[aa][fp->get_samples_slot_timestamp(slot2,fp,0)+sample_offset_slot-ru->N_TA_offset];
}
- idft_size_idx_t dftsize;
- int dftlen=0;
+ int reps;
+ int Ncp;
+ int dftlen;
int mu = fp->numerology_index;
- int Ncp = 0;
- int16_t *prach2;
if (prach_sequence_length == 0) {
LOG_D(PHY,"PRACH (ru %d) in %d.%d, format %d, msg1_frequencyStart %d\n",
ru->idx,frame,slot2,prachFormat,msg1_frequencystart);
- AssertFatal(prachFormat<4,"Illegal prach format %d for length 839\n",prachFormat);
switch (prachFormat) {
case 0:
+ reps = 1;
Ncp = 3168;
+ dftlen = 24576;
break;
-
+
case 1:
+ reps = 2;
Ncp = 21024;
+ dftlen = 24576;
break;
-
+
case 2:
+ reps = 4;
Ncp = 4688;
+ dftlen = 24576;
break;
-
+
case 3:
+ reps = 4;
Ncp = 3168;
+ dftlen = 6144;
+ break;
+
+ default:
+ AssertFatal(1==0, "Illegal prach format %d for length 839\n", prachFormat);
break;
-
}
}
else {
LOG_D(PHY,"PRACH (ru %d) in %d.%d, format %s, msg1_frequencyStart %d,startSymbol %d\n",
ru->idx,frame,slot,prachfmt[prachFormat],msg1_frequencystart,prachStartSymbol);
-
switch (prachFormat) {
case 4: //A1
- Ncp = 288/(1<<mu);
+ reps = 2;
+ Ncp = 288 >> mu;
break;
-
+
case 5: //A2
- Ncp = 576/(1<<mu);
+ reps = 4;
+ Ncp = 576 >> mu;
break;
-
+
case 6: //A3
- Ncp = 864/(1<<mu);
+ reps = 6;
+ Ncp = 864 >> mu;
break;
-
+
case 7: //B1
- Ncp = 216/(1<<mu);
- break;
-
+ reps = 2;
+ Ncp = 216 >> mu;
+ break;
+
/*
// B2 and B3 do not exist in FAPI
case 4: //B2
- Ncp = 360/(1<<mu);
+ reps = 4;
+ Ncp = 360 >> mu;
break;
-
+
case 5: //B3
- Ncp = 504/(1<<mu);
+ reps = 6;
+ Ncp = 504 >> mu;
break;
*/
+
case 8: //B4
- Ncp = 936/(1<<mu);
+ reps = 12;
+ Ncp = 936 >> mu;
break;
-
+
case 9: //C0
- Ncp = 1240/(1<<mu);
+ reps = 1;
+ Ncp = 1240 >> mu;
break;
-
+
case 10: //C2
- Ncp = 2048/(1<<mu);
+ reps = 4;
+ Ncp = 2048 >> mu;
break;
-
+
default:
AssertFatal(1==0,"unknown prach format %x\n",prachFormat);
break;
}
+ dftlen = 2048 >> mu;
+ }
+
+ //actually what we should be checking here is how often the current prach crosses a 0.5ms boundary. I am not quite sure for which paramter set this would be the case, so I will ignore it for now and just check if the prach starts on a 0.5ms boundary
+ if(fp->numerology_index == 0) {
+ if (prachStartSymbol == 0 || prachStartSymbol == 7)
+ Ncp += 16;
+ }
+ else {
+ if (slot%(fp->slots_per_subframe/2)==0 && prachStartSymbol == 0)
+ Ncp += 16;
}
+
+ switch(fp->samples_per_subframe) {
+ case 7680:
+ // 5 MHz @ 7.68 Ms/s
+ Ncp >>= 2;
+ dftlen >>= 2;
+ break;
+
+ case 15360:
+ // 10, 15 MHz @ 15.36 Ms/s
+ Ncp >>= 1;
+ dftlen >>= 1;
+ break;
+
+ case 30720:
+ // 20, 25, 30 MHz @ 30.72 Ms/s
+ Ncp = Ncp;
+ dftlen = dftlen;
+ break;
+
+ case 46080:
+ // 40 MHz @ 46.08 Ms/s
+ Ncp = (Ncp*3)/2;
+ dftlen = (dftlen*3)/2;
+ break;
+
+ case 61440:
+ // 40, 50, 60 MHz @ 61.44 Ms/s
+ Ncp <<= 1;
+ dftlen <<= 1;
+ break;
+
+ case 92160:
+ // 50, 60, 70, 80, 90 MHz @ 92.16 Ms/s
+ Ncp *= 3;
+ dftlen *= 3;
+ break;
+
+ case 122880:
+ // 70, 80, 90, 100 MHz @ 122.88 Ms/s
+ Ncp <<= 2;
+ dftlen <<= 2;
+ break;
+
+ default:
+ AssertFatal(1==0,"sample rate %f MHz not supported for numerology %d\n", fp->samples_per_subframe / 1000.0, mu);
+ }
+
+ const idft_size_idx_t dftsize = get_dft(dftlen);
+
// Do forward transform
if (LOG_DEBUGFLAG(PRACH)) {
- LOG_D(PHY,"rx_prach: Doing PRACH FFT for nb_rx:%d Ncp:%d\n",ru->nb_rx, Ncp);
+ LOG_D(PHY, "rx_prach: Doing PRACH FFT for nb_rx:%d Ncp:%d dftlen:%d\n", ru->nb_rx, Ncp, dftlen);
}
-
// Note: Assumes PUSCH SCS @ 30 kHz, take values for formats 0-2 and adjust for others below
int kbar = 1;
@@ -299,357 +385,13 @@ void rx_nr_prach_ru(RU_t *ru,
k*=K;
k+=kbar;
- int reps=1;
-
for (int aa=0; aa<ru->nb_rx; aa++) {
AssertFatal(prach[aa]!=NULL,"prach[%d] is null\n",aa);
// do DFT
- if (mu==1) {
- switch(fp->samples_per_subframe) {
- case 15360:
- // 10, 15 MHz @ 15.36 Ms/s
- prach2 = prach[aa] + (1*Ncp); // Ncp is for 30.72 Ms/s, so divide by 2 to bring to 15.36 Ms/s and multiply by 2 for I/Q
- if (prach_sequence_length == 0) {
- if (prachFormat == 0 || prachFormat == 1 || prachFormat == 2) {
- dftlen=12288;
- dft(DFT_12288,prach2,rxsigF[aa],1);
- }
- if (prachFormat == 1 || prachFormat == 2) {
- dft(DFT_12288,prach2+24576,rxsigF[aa]+24576,1);
- reps++;
- }
- if (prachFormat == 2) {
- dft(DFT_12288,prach2+(24576*2),rxsigF[aa]+(24576*2),1);
- dft(DFT_12288,prach2+(24576*3),rxsigF[aa]+(24576*3),1);
- reps+=2;
- }
- if (prachFormat == 3) {
- dftlen=3072;
- for (int i=0;i<4;i++) dft(DFT_3072,prach2+(i*3072*2),rxsigF[aa]+(i*3072*2),1);
- reps=4;
- }
- } else { // 839 sequence
- if (prachStartSymbol == 0) prach2+=16; // 8 samples @ 15.36 Ms/s in first symbol of each half subframe (15/30 kHz only)
-
- dftlen=512;
- dft(DFT_512,prach2,rxsigF[aa],1);
- if (prachFormat != 9/*C0*/) {
- dft(DFT_512,prach2+1024,rxsigF[aa]+1024,1);
- reps++;
- }
- if (prachFormat == 5/*A2*/ || prachFormat == 6/*A3*/|| prachFormat == 8/*B4*/ || prachFormat == 10/*C2*/) {
- dft(DFT_512,prach2+1024*2,rxsigF[aa]+1024*2,1);
- dft(DFT_512,prach2+1024*3,rxsigF[aa]+1024*3,1);
- reps+=2;
- }
- if (prachFormat == 6/*A3*/ || prachFormat == 8/*B4*/) {
- dft(DFT_512,prach2+1024*4,rxsigF[aa]+1024*4,1);
- dft(DFT_512,prach2+1024*5,rxsigF[aa]+1024*5,1);
- reps+=2;
- }
- if (prachFormat == 8/*B4*/) {
- for (int i=6;i<12;i++) dft(DFT_512,prach2+(1024*i),rxsigF[aa]+(1024*i),1);
- reps+=6;
- }
- }
- break;
-
- case 30720:
- // 20, 25, 30 MHz @ 30.72 Ms/s
- prach2 = prach[aa] + (2*Ncp); // Ncp is for 30.72 Ms/s, so just multiply by 2 for I/Q
- if (prach_sequence_length == 0) {
- if (prachFormat == 0 || prachFormat == 1 || prachFormat == 2) {
- dftlen=24576;
- dft(DFT_24576,prach2,rxsigF[aa],1);
- }
- if (prachFormat == 1 || prachFormat == 2) {
- dft(DFT_24576,prach2+49152,rxsigF[aa]+49152,1);
- reps++;
- }
- if (prachFormat == 2) {
- dft(DFT_24576,prach2+(49152*2),rxsigF[aa]+(49152*2),1);
- dft(DFT_24576,prach2+(49152*3),rxsigF[aa]+(49152*3),1);
- reps+=2;
- }
- if (prachFormat == 3) {
- dftlen=6144;
- for (int i=0;i<4;i++) dft(DFT_6144,prach2+(i*6144*2),rxsigF[aa]+(i*6144*2),1);
- reps=4;
- }
- } else { // 839 sequence
- if (prachStartSymbol == 0) prach2+=32; // 16 samples @ 30.72 Ms/s in first symbol of each half subframe (15/30 kHz only)
-
- dftlen=1024;
- dft(DFT_1024,prach2,rxsigF[aa],1);
- if (prachFormat != 9/*C0*/) {
- dft(DFT_1024,prach2+2048,rxsigF[aa]+2048,1);
- reps++;
- }
- if (prachFormat == 5/*A2*/ || prachFormat == 6/*A3*/|| prachFormat == 8/*B4*/ || prachFormat == 10/*C2*/) {
- dft(DFT_1024,prach2+2048*2,rxsigF[aa]+2048*2,1);
- dft(DFT_1024,prach2+2048*3,rxsigF[aa]+2048*3,1);
- reps+=2;
- }
- if (prachFormat == 6/*A3*/ || prachFormat == 8/*B4*/) {
- dft(DFT_1024,prach2+2048*4,rxsigF[aa]+2048*4,1);
- dft(DFT_1024,prach2+2048*5,rxsigF[aa]+2048*5,1);
- reps+=2;
- }
- if (prachFormat == 8/*B4*/) {
- for (int i=6;i<12;i++) dft(DFT_1024,prach2+(2048*i),rxsigF[aa]+(2048*i),1);
- reps+=6;
- }
- }
- break;
-
- case 61440:
- // 40, 50, 60 MHz @ 61.44 Ms/s
- prach2 = prach[aa] + (4*Ncp); // Ncp is for 30.72 Ms/s, so multiply by 2 for I/Q, and 2 to bring to 61.44 Ms/s
- if (prach_sequence_length == 0) {
- if (prachFormat == 0 || prachFormat == 1 || prachFormat == 2) {
- dftlen=49152;
- dft(DFT_49152,prach2,rxsigF[aa],1);
- }
- if (prachFormat == 1 || prachFormat == 2) {
- dft(DFT_49152,prach2+98304,rxsigF[aa]+98304,1);
- reps++;
- }
- if (prachFormat == 2) {
- dft(DFT_49152,prach2+(98304*2),rxsigF[aa]+(98304*2),1);
- dft(DFT_49152,prach2+(98304*3),rxsigF[aa]+(98304*3),1);
- reps+=2;
- }
- if (prachFormat == 3) {
- dftlen=12288;
- for (int i=0;i<4;i++) dft(DFT_12288,prach2+(i*12288*2),rxsigF[aa]+(i*12288*2),1);
- reps=4;
- }
- } else { // 839 sequence
- if (prachStartSymbol == 0) prach2+=64; // 32 samples @ 61.44 Ms/s in first symbol of each half subframe (15/30 kHz only)
-
- dftlen=2048;
- dft(DFT_2048,prach2,rxsigF[aa],1);
- if (prachFormat != 9/*C0*/) {
- dft(DFT_2048,prach2+4096,rxsigF[aa]+4096,1);
- reps++;
- }
- if (prachFormat == 5/*A2*/ || prachFormat == 6/*A3*/|| prachFormat == 8/*B4*/ || prachFormat == 10/*C2*/) {
- dft(DFT_2048,prach2+4096*2,rxsigF[aa]+4096*2,1);
- dft(DFT_2048,prach2+4096*3,rxsigF[aa]+4096*3,1);
- reps+=2;
- }
- if (prachFormat == 6/*A3*/ || prachFormat == 8/*B4*/) {
- dft(DFT_2048,prach2+4096*4,rxsigF[aa]+4096*4,1);
- dft(DFT_2048,prach2+4096*5,rxsigF[aa]+4096*5,1);
- reps+=2;
- }
- if (prachFormat == 8/*B4*/) {
- for (int i=6;i<12;i++) dft(DFT_2048,prach2+(4096*i),rxsigF[aa]+(4096*i),1);
- reps+=6;
- }
- }
- break;
-
- case 46080:
- // 40 MHz @ 46.08 Ms/s
- prach2 = prach[aa] + (3*Ncp); // 46.08 is 1.5 * 30.72, times 2 for I/Q
- if (prach_sequence_length == 0) {
- if (prachFormat == 0 || prachFormat == 1 || prachFormat == 2) {
- dftlen=36864;
- dft(DFT_36864,prach2,rxsigF[aa],1);
- }
- if (prachFormat == 1 || prachFormat == 2) {
- dft(DFT_36864,prach2+73728,rxsigF[aa]+73728,1);
- reps++;
- }
- if (prachFormat == 2) {
- dft(DFT_36864,prach2+(73728*2),rxsigF[aa]+(73728*2),1);
- dft(DFT_36864,prach2+(73728*3),rxsigF[aa]+(73728*3),1);
- reps+=2;
- }
- if (prachFormat == 3) {
- dftlen=9216;
- for (int i=0;i<4;i++) dft(DFT_9216,prach2+(i*9216*2),rxsigF[aa]+(i*9216*2),1);
- reps=4;
- }
- } else { // 839 sequence
- if (prachStartSymbol == 0) prach2+=48; // 24 samples @ 46.08 Ms/s in first symbol of each half subframe (15/30 kHz only)
-
- dftlen=1536;
- dft(DFT_1536,prach2,rxsigF[aa],1);
- if (prachFormat != 9/*C0*/) {
- dft(DFT_1536,prach2+3072,rxsigF[aa]+3072,1);
- reps++;
- }
- if (prachFormat == 5/*A2*/ || prachFormat == 6/*A3*/|| prachFormat == 8/*B4*/ || prachFormat == 10/*C2*/) {
- dft(DFT_1536,prach2+3072*2,rxsigF[aa]+3072*2,1);
- dft(DFT_1536,prach2+3072*3,rxsigF[aa]+3072*3,1);
- reps+=2;
- }
- if (prachFormat == 6/*A3*/ || prachFormat == 8/*B4*/) {
- dft(DFT_1536,prach2+3072*4,rxsigF[aa]+3072*4,1);
- dft(DFT_1536,prach2+3072*5,rxsigF[aa]+3072*5,1);
- reps+=2;
- }
- if (prachFormat == 8/*B4*/) {
- for (int i=6;i<12;i++) dft(DFT_1536,prach2+(3072*i),rxsigF[aa]+(3072*i),1);
- reps+=6;
- }
- }
- break;
-
- case 122880:
- // 70, 80, 90, 100 MHz @ 122.88 Ms/s
- prach2 = prach[aa] + (8*Ncp);
- if (prach_sequence_length == 0) {
- if (prachFormat == 0 || prachFormat == 1 || prachFormat == 2) {
- dftlen=98304;
- dft(DFT_98304,prach2,rxsigF[aa],1);
- }
- if (prachFormat == 1 || prachFormat == 2) {
- dft(DFT_98304,prach2+196608,rxsigF[aa]+196608,1);
- reps++;
- }
- if (prachFormat == 2) {
- dft(DFT_98304,prach2+(196608*2),rxsigF[aa]+(196608*2),1);
- dft(DFT_98304,prach2+(196608*3),rxsigF[aa]+(196608*3),1);
- reps+=2;
- }
- if (prachFormat == 3) {
- dftlen=24576;
- for (int i=0;i<4;i++) dft(DFT_24576,prach2+(i*2*24576),rxsigF[aa]+(i*2*24576),1);
- reps=4;
- }
- } else { // 839 sequence
- if (prachStartSymbol == 0) prach2+=128; // 64 samples @ 122.88 Ms/s in first symbol of each half subframe (15/30 kHz only)
-
- dftlen=4096;
- dft(DFT_4096,prach2,rxsigF[aa],1);
- if (prachFormat != 9/*C0*/) {
- dft(DFT_4096,prach2+8192,rxsigF[aa]+8192,1);
- reps++;
- }
-
- if (prachFormat == 5/*A2*/ || prachFormat == 6/*A3*/|| prachFormat == 8/*B4*/ || prachFormat == 10/*C2*/) {
- dft(DFT_4096,prach2+8192*2,rxsigF[aa]+8192*2,1);
- dft(DFT_4096,prach2+8192*3,rxsigF[aa]+8192*3,1);
- reps+=2;
- }
- if (prachFormat == 6/*A3*/ || prachFormat == 8/*B4*/) {
- dft(DFT_4096,prach2+8192*4,rxsigF[aa]+8192*4,1);
- dft(DFT_4096,prach2+8192*5,rxsigF[aa]+8192*5,1);
- reps+=2;
- }
- if (prachFormat == 8/*B4*/) {
- for (int i=6;i<12;i++) dft(DFT_4096,prach2+(8192*i),rxsigF[aa]+(8192*i),1);
- reps+=6;
- }
- }
- break;
-
- case 92160:
- // 80, 90 MHz @ 92.16 Ms/s
- prach2 = prach[aa] + (6*Ncp);
- if (prach_sequence_length == 0) {
- if (prachFormat == 0 || prachFormat == 1 || prachFormat == 2) {
- dftlen=73728;
- dft(DFT_73728,prach2,rxsigF[aa],1);
- }
- if (prachFormat == 1 || prachFormat == 2) {
- dft(DFT_73728,prach2+147456,rxsigF[aa]+147456,1);
- reps++;
- }
- if (prachFormat == 2) {
- dft(DFT_73728,prach2+(147456*2),rxsigF[aa]+(147456*2),1);
- dft(DFT_73728,prach2+(147456*3),rxsigF[aa]+(147456*3),1);
- reps+=2;
- }
- if (prachFormat == 3) {
- dftlen=18432;
- for (int i=0;i<4;i++) dft(DFT_18432,prach2+(i*2*18432),rxsigF[aa]+(i*2*18432),1);
- reps=4;
- }
- } else {
- if (prachStartSymbol == 0) prach2+=96; // 64 samples @ 122.88 Ms/s in first symbol of each half subframe (15/30 kHz only)
-
- dftlen=3072;
- dft(DFT_3072,prach2,rxsigF[aa],1);
- if (prachFormat != 9/*C0*/) {
- dft(DFT_3072,prach2+6144,rxsigF[aa]+6144,1);
- reps++;
- }
-
- if (prachFormat == 5/*A2*/ || prachFormat == 6/*A3*/|| prachFormat == 8/*B4*/ || prachFormat == 10/*C2*/) {
- dft(DFT_3072,prach2+6144*2,rxsigF[aa]+6144*2,1);
- dft(DFT_3072,prach2+6144*3,rxsigF[aa]+6144*3,1);
- reps+=2;
- }
- if (prachFormat == 6/*A3*/ || prachFormat == 8/*B4*/) {
- dft(DFT_3072,prach2+6144*4,rxsigF[aa]+6144*4,1);
- dft(DFT_3072,prach2+6144*5,rxsigF[aa]+6144*5,1);
- reps+=2;
- }
- if (prachFormat == 8/*B4*/) {
- for (int i=6;i<12;i++) dft(DFT_3072,prach2+(6144*i),rxsigF[aa]+(6144*i),1);
- reps+=6;
- }
- }
- break;
- default:
- AssertFatal(1==0,"sample_rate %f MHz not support for NR PRACH yet\n", fp->samples_per_subframe / 1000.0);
- }
- }
- else if (mu==3) {
- if (fp->threequarter_fs) {
- AssertFatal(1==0,"3/4 sampling not supported for numerology %d\n",mu);
- }
- if (prach_sequence_length == 0) {
- AssertFatal(1==0,"long prach not supported for numerology %d\n",mu);
- }
- if (fp->N_RB_UL == 32) {
- prach2 = prach[aa] + (Ncp<<2); // Ncp is for 30.72 Ms/s, so multiply by 2 for I/Q, and 2 for 61.44Msps
- if (slot%(fp->slots_per_subframe/2)==0 && prachStartSymbol == 0)
- prach2+=64; // 32 samples @ 61.44 Ms/s in first symbol of each half subframe
- dftlen=512;
- dftsize = DFT_512;
- }
- else if (fp->N_RB_UL == 66) {
- prach2 = prach[aa] + (Ncp<<3); // Ncp is for 30.72 Ms/s, so multiply by 4 for I/Q, and 2 for 122.88Msps
- if (slot%(fp->slots_per_subframe/2)==0 && prachStartSymbol == 0)
- prach2+=128; // 64 samples @ 122.88 Ms/s in first symbol of each half subframe
- dftlen=1024;
- dftsize = DFT_1024;
- }
- else {
- AssertFatal(1==0,"N_RB_UL %d not support for numerology %d\n",fp->N_RB_UL,mu);
- }
-
- dft(dftsize,prach2,rxsigF[aa],1);
- if (prachFormat != 9/*C0*/) {
- dft(dftsize,prach2+dftlen*2,rxsigF[aa]+dftlen*2,1);
- reps++;
- }
-
- if (prachFormat == 5/*A2*/ || prachFormat == 6/*A3*/|| prachFormat == 8/*B4*/ || prachFormat == 10/*C2*/) {
- dft(dftsize,prach2+dftlen*4,rxsigF[aa]+dftlen*4,1);
- dft(dftsize,prach2+dftlen*6,rxsigF[aa]+dftlen*6,1);
- reps+=2;
- }
- if (prachFormat == 6/*A3*/ || prachFormat == 8/*B4*/) {
- dft(dftsize,prach2+dftlen*8,rxsigF[aa]+dftlen*8,1);
- dft(dftsize,prach2+dftlen*10,rxsigF[aa]+dftlen*10,1);
- reps+=2;
- }
- if (prachFormat == 8/*B4*/) {
- for (int i=6;i<12;i++)
- dft(dftsize,prach2+(dftlen*2*i),rxsigF[aa]+(dftlen*2*i),1);
- reps+=6;
- }
- }
- else {
- AssertFatal(1==0,"Numerology not supported\n");
- }
+ int16_t *prach2 = prach[aa] + (2*Ncp); // times 2 for complex samples
+ for (int i = 0; i < reps; i++)
+ dft(dftsize, prach2 + 2*dftlen*i, rxsigF[aa] + 2*dftlen*i, 1);
//LOG_M("ru_rxsigF_tmp.m","rxsFtmp", rxsigF[aa], dftlen*2*reps, 1, 1);
diff --git a/openair1/PHY/NR_TRANSPORT/pucch_rx.c b/openair1/PHY/NR_TRANSPORT/pucch_rx.c
index fa177b98f50dc5c758c16d2c2a9a4f3d3480a80a..83093494916429ced83b20d46448cda2f533de47 100644
--- a/openair1/PHY/NR_TRANSPORT/pucch_rx.c
+++ b/openair1/PHY/NR_TRANSPORT/pucch_rx.c
@@ -190,7 +190,7 @@ void nr_decode_pucch0(PHY_VARS_gNB *gNB,
pucch_pdu->bit_len_harq,pucch_pdu->sr_flag);
NR_gNB_UCI_STATS_t *uci_stats=NULL;
- NR_gNB_UCI_STATS_t *first_uci_stats=NULL;
+ NR_gNB_UCI_STATS_t *first_uci_stats = gNB->uci_stats;
for (int i=0;i<NUMBER_OF_NR_UCI_STATS_MAX;i++)
if (gNB->uci_stats[i].rnti == pucch_pdu->rnti) {
uci_stats = &gNB->uci_stats[i];
diff --git a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
index 3b4ce9a42354c76b127bc338bbc822c3974f95f3..037851be0c388f218e7561e2252a1787ba79e4ad 100644
--- a/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
+++ b/openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
@@ -34,6 +34,7 @@
//#define DEBUG_PDSCH
//#define DEBUG_PDCCH
+#define NO_INTERP 1
int nr_pbch_dmrs_correlation(PHY_VARS_NR_UE *ue,
UE_nr_rxtx_proc_t *proc,
@@ -692,7 +693,7 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
k = bwp_start_subcarrier;
int re_offset = k;
-#ifdef DEBUG_CH
+#ifdef DEBUG_PDSCH
printf("PDSCH Channel Estimation : ThreadId %d, gNB_id %d ch_offset %d, symbol_offset %d OFDM size %d, Ncp=%d, Ns=%d, k=%d symbol %d\n",proc->thread_id, gNB_id,ch_offset,symbol_offset,ue->frame_parms.ofdm_symbol_size,
ue->frame_parms.Ncp,Ns,k, symbol);
#endif
@@ -1244,6 +1245,10 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
ch[0] = ch_0 / 6;
ch[1] = ch_1 / 6;
+#if NO_INTERP
+ for (int i=0;i<12;i++) ((int32_t*)dl_ch)[i] = *(int32_t*)ch;
+ dl_ch+=24;
+#else
multadd_real_vector_complex_scalar(filt8_avlip0,
ch,
dl_ch,
@@ -1261,6 +1266,7 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
dl_ch,
8);
dl_ch -= 24;
+#endif
for (pilot_cnt=6; pilot_cnt<6*(nb_rb_pdsch-1); pilot_cnt += 6) {
@@ -1308,6 +1314,11 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
ch[0] = ch_0 / 6;
ch[1] = ch_1 / 6;
+
+#if NO_INTERP
+ for (int i=0;i<12;i++) ((int32_t*)dl_ch)[i] = *(int32_t*)ch;
+ dl_ch+=24;
+#else
dl_ch[6] += (ch[0] * 1365)>>15; // 1/12*16384
dl_ch[7] += (ch[1] * 1365)>>15; // 1/12*16384
@@ -1329,6 +1340,7 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
dl_ch,
8);
dl_ch -= 16;
+#endif
}
ch_0 = ((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15;
ch_1 = ((int32_t)pil[0]*rxF[1] + (int32_t)pil[1]*rxF[0])>>15;
@@ -1375,6 +1387,10 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
ch[0] = ch_0 / 6;
ch[1] = ch_1 / 6;
+#if NO_INTERP
+ for (int i=0;i<12;i++) ((int32_t*)dl_ch)[i] = *(int32_t*)ch;
+ dl_ch+=24;
+#else
dl_ch[6] += (ch[0] * 1365)>>15; // 1/12*16384
dl_ch[7] += (ch[1] * 1365)>>15; // 1/12*16384
@@ -1389,6 +1405,7 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
ch,
dl_ch,
8);
+#endif
}
else { // this is case without frequency-domain linear interpolation, just take average of LS channel estimates of 4 DMRS REs and use a common value for the whole PRB
int32_t ch_0, ch_1;
@@ -1424,6 +1441,10 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
ch[0] = ch_0 / 4;
ch[1] = ch_1 / 4;
+#if NO_INTERP
+ for (int i=0;i<12;i++) ((int32_t*)dl_ch)[i] = *(int32_t*)ch;
+ dl_ch+=24;
+#else
multadd_real_vector_complex_scalar(filt8_avlip0,
ch,
dl_ch,
@@ -1441,6 +1462,7 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
dl_ch,
8);
dl_ch -= 24;
+#endif
for (pilot_cnt=4; pilot_cnt<4*(nb_rb_pdsch-1); pilot_cnt += 4) {
int32_t ch_0, ch_1;
@@ -1476,6 +1498,10 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
ch[0] = ch_0 / 4;
ch[1] = ch_1 / 4;
+#if NO_INTERP
+ for (int i=0;i<12;i++) ((int32_t*)dl_ch)[i] = *(int32_t*)ch;
+ dl_ch+=24;
+#else
dl_ch[6] += (ch[0] * 1365)>>15; // 1/12*16384
dl_ch[7] += (ch[1] * 1365)>>15; // 1/12*16384
@@ -1497,6 +1523,7 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
dl_ch,
8);
dl_ch -= 16;
+#endif
}
ch_0 = ((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15;
@@ -1530,6 +1557,10 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
ch[0] = ch_0 / 4;
ch[1] = ch_1 / 4;
+#if NO_INTERP
+ for (int i=0;i<12;i++) ((int32_t*)dl_ch)[i] = *(int32_t*)ch;
+ dl_ch+=24;
+#else
dl_ch[6] += (ch[0] * 1365)>>15; // 1/12*16384
dl_ch[7] += (ch[1] * 1365)>>15; // 1/12*16384
@@ -1544,6 +1575,7 @@ int nr_pdsch_channel_estimation(PHY_VARS_NR_UE *ue,
ch,
dl_ch,
8);
+#endif
}
#ifdef DEBUG_PDSCH
dl_ch = (int16_t *)&dl_ch_estimates[p*ue->frame_parms.nb_antennas_rx+aarx][ch_offset];
@@ -1673,7 +1705,6 @@ void nr_pdsch_ptrs_processing(PHY_VARS_NR_UE *ue,
/*------------------------------------------------------------------------------------------------------- */
nr_ptrs_cpe_estimation(*K_ptrs,*ptrsReOffset,*dmrsConfigType,*nb_rb,
rnti,
- (int16_t *)&pdsch_vars[gNB_id]->dl_ch_ptrs_estimates_ext[aarx][symbol*nb_re_pdsch],
nr_slot_rx,
symbol,frame_parms->ofdm_symbol_size,
(int16_t*)&pdsch_vars[gNB_id]->rxdataF_comp0[aarx][(symbol * nb_re_pdsch)],
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_prach.c b/openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
index 4927fe37a2516eac1dd8d6524067f8c5cf350cdf..8437b8f8f3782eda710138cffe054c74ea02a40f 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
@@ -67,7 +67,7 @@ int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, int frame, uint8_t
uint8_t Mod_id, fd_occasion, preamble_index, restricted_set, not_found;
uint16_t rootSequenceIndex, prach_fmt_id, NCS, *prach_root_sequence_map, preamble_offset = 0;
uint16_t preamble_shift = 0, preamble_index0, n_shift_ra, n_shift_ra_bar, d_start=INT16_MAX, numshift, N_ZC, u, offset, offset2, first_nonzero_root_idx;
- int16_t prach_tmp[98304*2*4] __attribute__((aligned(32)));
+ int16_t prach_tmp[(4688+4*24576)*4*2] __attribute__((aligned(32)));
int16_t Ncp = 0, amp, *prach, *prach2, *prachF, *Xu;
int32_t Xu_re, Xu_im;
@@ -102,10 +102,19 @@ int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, int frame, uint8_t
nrUE_config->prach_config.num_prach_fd_occasions_list[fd_occasion].prach_root_sequence_index,
ue->X_u);
- if (slot % (fp->slots_per_subframe / 2) == 0)
- sample_offset_slot = (prachStartSymbol==0?0:fp->ofdm_symbol_size*prachStartSymbol+fp->nb_prefix_samples0+fp->nb_prefix_samples*(prachStartSymbol-1));
- else
- sample_offset_slot = (fp->ofdm_symbol_size + fp->nb_prefix_samples) * prachStartSymbol;
+ if (prachStartSymbol == 0) {
+ sample_offset_slot = 0;
+ } else if (fp->slots_per_subframe == 1) {
+ if (prachStartSymbol <= 7)
+ sample_offset_slot = (fp->ofdm_symbol_size + fp->nb_prefix_samples) * (prachStartSymbol - 1) + (fp->ofdm_symbol_size + fp->nb_prefix_samples0);
+ else
+ sample_offset_slot = (fp->ofdm_symbol_size + fp->nb_prefix_samples) * (prachStartSymbol - 2) + (fp->ofdm_symbol_size + fp->nb_prefix_samples0) * 2;
+ } else {
+ if (slot % (fp->slots_per_subframe / 2) == 0)
+ sample_offset_slot = (fp->ofdm_symbol_size + fp->nb_prefix_samples) * (prachStartSymbol - 1) + (fp->ofdm_symbol_size + fp->nb_prefix_samples0);
+ else
+ sample_offset_slot = (fp->ofdm_symbol_size + fp->nb_prefix_samples) * prachStartSymbol;
+ }
prach_start = fp->get_samples_slot_timestamp(slot, fp, 0) + sample_offset_slot;
@@ -232,897 +241,254 @@ int32_t generate_nr_prach(PHY_VARS_NR_UE *ue, uint8_t gNB_id, int frame, uint8_t
preamble_offset,
first_nonzero_root_idx);
- Xu = (int16_t*)ue->X_u[preamble_offset-first_nonzero_root_idx];
-
- #if defined (PRACH_WRITE_OUTPUT_DEBUG)
- LOG_M("X_u.m", "X_u", (int16_t*)ue->X_u[preamble_offset-first_nonzero_root_idx], N_ZC, 1, 1);
- #endif
-
- /********************************************************
- *
- * In function init_prach_tables:
- * to compute quantized roots of unity ru(n) = 32767 * exp j*[ (2 * PI * n) / N_ZC ]
- *
- * In compute_prach_seq:
- * to calculate Xu = DFT xu = xu (inv_u*k) * Xu[0] (This is a Zadoff-Chou sequence property: DFT ZC sequence is another ZC sequence)
- *
- * In generate_prach:
- * to do the cyclic-shifted DFT by multiplying Xu[k] * ru[k*preamble_shift] as:
- * If X[k] = DFT x(n) -> X_shifted[k] = DFT x(n+preamble_shift) = X[k] * exp -j*[ (2*PI*k*preamble_shift) / N_ZC ]
- *
- *********************************************************/
-
- if (mu==1) {
- switch(fp->samples_per_subframe) {
- case 15360:
- // 10, 15 MHz @ 15.36 Ms/s
- if (prach_sequence_length == 0) {
- if (prach_fmt_id == 0 || prach_fmt_id == 1 || prach_fmt_id == 2)
- dftlen = 12288;
- if (prach_fmt_id == 3)
- dftlen = 3072;
- } else { // 839 sequence
- dftlen = 512;
- }
- break;
-
- case 30720:
- // 20, 25, 30 MHz @ 30.72 Ms/s
- if (prach_sequence_length == 0) {
- if (prach_fmt_id == 0 || prach_fmt_id == 1 || prach_fmt_id == 2)
- dftlen = 24576;
- if (prach_fmt_id == 3)
- dftlen = 6144;
- } else { // 839 sequence
- dftlen = 1024;
- }
- break;
-
- case 46080:
- // 40 MHz @ 46.08 Ms/s
- if (prach_sequence_length == 0) {
- if (prach_fmt_id == 0 || prach_fmt_id == 1 || prach_fmt_id == 2)
- dftlen = 36864;
- if (prach_fmt_id == 3)
- dftlen = 9216;
- } else { // 839 sequence
- dftlen = 1536;
- }
- break;
-
- case 61440:
- // 40, 50, 60 MHz @ 61.44 Ms/s
- if (prach_sequence_length == 0) {
- if (prach_fmt_id == 0 || prach_fmt_id == 1 || prach_fmt_id == 2)
- dftlen = 49152;
- if (prach_fmt_id == 3)
- dftlen = 12288;
- } else { // 839 sequence
- dftlen = 2048;
- }
- break;
-
- case 92160:
- // 50, 60, 70, 80, 90 MHz @ 92.16 Ms/s
- if (prach_sequence_length == 0) {
- if (prach_fmt_id == 0 || prach_fmt_id == 1 || prach_fmt_id == 2)
- dftlen = 73728;
- if (prach_fmt_id == 3)
- dftlen = 18432;
- } else { // 839 sequence
- dftlen = 3072;
- }
- break;
-
- case 122880:
- // 70, 80, 90, 100 MHz @ 122.88 Ms/s
- if (prach_sequence_length == 0) {
- if (prach_fmt_id == 0 || prach_fmt_id == 1 || prach_fmt_id == 2)
- dftlen = 98304;
- if (prach_fmt_id == 3)
- dftlen = 24576;
- } else { // 839 sequence
- dftlen = 4096;
- }
- break;
-
- default:
- AssertFatal(1==0,"sample rate %f MHz not supported for numerology %d\n", fp->samples_per_subframe / 1000.0, mu);
- }
- }
- else if (mu==3) {
- if (fp->threequarter_fs)
- AssertFatal(1==0,"3/4 sampling not supported for numerology %d\n",mu);
-
- if (prach_sequence_length == 0)
- AssertFatal(1==0,"long prach not supported for numerology %d\n",mu);
-
- if (fp->N_RB_UL == 32)
- dftlen=512;
- else if (fp->N_RB_UL == 66)
- dftlen=1024;
- else
- AssertFatal(1==0,"N_RB_UL %d not support for numerology %d\n",fp->N_RB_UL,mu);
- }
-
-
- for (offset=0,offset2=0; offset<N_ZC; offset++,offset2+=preamble_shift) {
-
- if (offset2 >= N_ZC)
- offset2 -= N_ZC;
-
- Xu_re = (((int32_t)Xu[offset<<1]*amp)>>15);
- Xu_im = (((int32_t)Xu[1+(offset<<1)]*amp)>>15);
- prachF[k++]= ((Xu_re*nr_ru[offset2<<1]) - (Xu_im*nr_ru[1+(offset2<<1)]))>>15;
- prachF[k++]= ((Xu_im*nr_ru[offset2<<1]) + (Xu_re*nr_ru[1+(offset2<<1)]))>>15;
-
- if (k==dftlen) k=0;
- }
-
- #if defined (PRACH_WRITE_OUTPUT_DEBUG)
- LOG_M("prachF.m", "prachF", &prachF[1804], 1024, 1, 1);
- LOG_M("Xu.m", "Xu", Xu, N_ZC, 1, 1);
- #endif
-
+ // Ncp and dftlen here is given in terms of T_s wich is 30.72MHz sampling
if (prach_sequence_length == 0) {
-
- AssertFatal(prach_fmt_id < 4, "Illegal PRACH format %d for sequence length 839\n", prach_fmt_id);
-
- // Ncp here is given in terms of T_s wich is 30.72MHz sampling
switch (prach_fmt_id) {
case 0:
Ncp = 3168;
+ dftlen = 24576;
break;
+
case 1:
Ncp = 21024;
+ dftlen = 24576;
break;
+
case 2:
Ncp = 4688;
+ dftlen = 24576;
break;
+
case 3:
Ncp = 3168;
+ dftlen = 6144;
break;
- }
+ default:
+ AssertFatal(1==0, "Illegal PRACH format %d for sequence length 839\n", prach_fmt_id);
+ break;
+ }
} else {
-
switch (prach_fmt_id) {
case 4: //A1
- Ncp = 288/(1<<mu);
+ Ncp = 288 >> mu;
break;
+
case 5: //A2
- Ncp = 576/(1<<mu);
+ Ncp = 576 >> mu;
break;
+
case 6: //A3
- Ncp = 864/(1<<mu);
+ Ncp = 864 >> mu;
break;
+
case 7: //B1
- Ncp = 216/(1<<mu);
- break;
+ Ncp = 216 >> mu;
+ break;
+
/*
case 4: //B2
- Ncp = 360/(1<<mu);
+ Ncp = 360 >> mu;
break;
+
case 5: //B3
- Ncp = 504/(1<<mu);
+ Ncp = 504 >> mu;
break;
*/
+
case 8: //B4
- Ncp = 936/(1<<mu);
+ Ncp = 936 >> mu;
break;
+
case 9: //C0
- Ncp = 1240/(1<<mu);
+ Ncp = 1240 >> mu;
break;
+
case 10: //C2
- Ncp = 2048/(1<<mu);
+ Ncp = 2048 >> mu;
break;
+
default:
AssertFatal(1==0,"Unknown PRACH format ID %d\n", prach_fmt_id);
break;
}
+ dftlen = 2048 >> mu;
}
- #ifdef NR_PRACH_DEBUG
- LOG_D(PHY, "PRACH [UE %d] Ncp %d, dftlen %d \n", Mod_id, Ncp, dftlen);
- #endif
-
//actually what we should be checking here is how often the current prach crosses a 0.5ms boundary. I am not quite sure for which paramter set this would be the case, so I will ignore it for now and just check if the prach starts on a 0.5ms boundary
- uint8_t use_extended_prach_prefix = 0;
if(fp->numerology_index == 0) {
if (prachStartSymbol == 0 || prachStartSymbol == 7)
- use_extended_prach_prefix = 1;
+ Ncp += 16;
}
else {
if (slot%(fp->slots_per_subframe/2)==0 && prachStartSymbol == 0)
- use_extended_prach_prefix = 1;
+ Ncp += 16;
}
- if (mu == 3) {
- switch (fp->samples_per_subframe) {
- case 61440: // 32 PRB case, 61.44 Msps
- Ncp<<=1; //to account for 61.44Mbps
- // This is after cyclic prefix
- prach2 = prach+(Ncp<<1); //times 2 for complex samples
- if (prach_sequence_length == 0)
- AssertFatal(1==0,"no long PRACH for this PRACH size %d\n",fp->N_RB_UL);
- else {
- if (use_extended_prach_prefix)
- Ncp+=32; // 16*kappa, kappa=2 for 61.44Msps
- prach2 = prach+(Ncp<<1); //times 2 for complex samples
- if (prach_fmt_id == 4 || prach_fmt_id == 7 || prach_fmt_id == 9) {
- idft(IDFT_512,prachF,prach2,1);
- // here we have |empty | Prach512 |
- if (prach_fmt_id != 9) {
- memmove(prach2+(512<<1),prach2,(512<<2));
- prach_len = (512*2)+Ncp;
- }
- else prach_len = (512*1)+Ncp;
- memmove(prach,prach+(512<<1),(Ncp<<2));
- // here we have |Prefix | Prach512 | Prach512 (if ! 0xc0) |
- } else if (prach_fmt_id == 5) { // 6x512
- idft(IDFT_512,prachF,prach2,1);
- // here we have |empty | Prach512 |
- memmove(prach2+(512<<1),prach2,(512<<2));
- // here we have |empty | Prach512 | Prach512| empty512 | empty512 |
- memmove(prach2+(512<<2),prach2,(512<<3));
- // here we have |empty | Prach512 | Prach512| Prach512 | Prach512 |
- memmove(prach,prach+(512<<1),(Ncp<<2));
- // here we have |Prefix | Prach512 |
- prach_len = (512*4)+Ncp;
- } else if (prach_fmt_id == 6) { // 6x512
- idft(IDFT_512,prachF,prach2,1);
- // here we have |empty | Prach512 |
- memmove(prach2+(512<<1),prach2,(512<<2));
- // here we have |empty | Prach512 | Prach512| empty512 | empty512 | empty512 | empty512
- memmove(prach2+(512<<2),prach2,(512<<3));
- // here we have |empty | Prach512 | Prach512| Prach512 | Prach512 | empty512 | empty512
- memmove(prach2+(512<<3),prach2,(512<<3));
- // here we have |empty | Prach512 | Prach512| Prach512 | Prach512 | Prach512 | Prach512
- memmove(prach,prach+(512<<1),(Ncp<<2));
- // here we have |Prefix | Prach512 |
- prach_len = (512*6)+Ncp;
- } else if (prach_fmt_id == 8) { // 12x512
- idft(IDFT_512,prachF,prach2,1);
- // here we have |empty | Prach512 |
- memmove(prach2+(512<<1),prach2,(512<<2));
- // here we have |empty | Prach512 | Prach512| empty512 | empty512 | empty512 | empty512
- memmove(prach2+(512<<2),prach2,(512<<3));
- // here we have |empty | Prach512 | Prach512| Prach512 | Prach512 | empty512 | empty512
- memmove(prach2+(512<<3),prach2,(512<<3));
- // here we have |empty | Prach512 | Prach512| Prach512 | Prach512 | Prach512 | Prach512
- memmove(prach2+(512<<1)*6,prach2,(512<<2)*6);
- // here we have |empty | Prach512 | Prach512| Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512| Prach512 | Prach512 | Prach512 | Prach512|
- memmove(prach,prach+(512<<1),(Ncp<<2));
- // here we have |Prefix | Prach512 | Prach512| Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512| Prach512 | Prach512 | Prach512 | Prach512|
- prach_len = (512*12)+Ncp;
- }
- }
- break;
+ switch(fp->samples_per_subframe) {
+ case 7680:
+ // 5 MHz @ 7.68 Ms/s
+ Ncp >>= 2;
+ dftlen >>= 2;
+ break;
- case 122880: // 66 PRB case, 122.88 Msps
- Ncp<<=2; //to account for 122.88Mbps
- // This is after cyclic prefix
- prach2 = prach+(Ncp<<1); //times 2 for complex samples
- if (prach_sequence_length == 0)
- AssertFatal(1==0,"no long PRACH for this PRACH size %d\n",fp->N_RB_UL);
- else {
- if (use_extended_prach_prefix)
- Ncp+=64; // 16*kappa, kappa=4 for 122.88Msps
- prach2 = prach+(Ncp<<1); //times 2 for complex samples
- if (prach_fmt_id == 4 || prach_fmt_id == 7 || prach_fmt_id == 9) {
- idft(IDFT_1024,prachF,prach2,1);
- // here we have |empty | Prach1024 |
- if (prach_fmt_id != 9) {
- memmove(prach2+(1024<<1),prach2,(1024<<2));
- prach_len = (1024*2)+Ncp;
- }
- else prach_len = (1024*1)+Ncp;
- memmove(prach,prach+(1024<<1),(Ncp<<2));
- // here we have |Prefix | Prach1024 | Prach1024 (if ! 0xc0) |
- } else if (prach_fmt_id == 5) { // 6x1024
- idft(IDFT_1024,prachF,prach2,1);
- // here we have |empty | Prach1024 |
- memmove(prach2+(1024<<1),prach2,(1024<<2));
- // here we have |empty | Prach1024 | Prach1024| empty1024 | empty1024 |
- memmove(prach2+(1024<<2),prach2,(1024<<3));
- // here we have |empty | Prach1024 | Prach1024| Prach1024 | Prach1024 |
- memmove(prach,prach+(1024<<1),(Ncp<<2));
- // here we have |Prefix | Prach1024 |
- prach_len = (1024*4)+Ncp;
- } else if (prach_fmt_id == 6) { // 6x1024
- idft(IDFT_1024,prachF,prach2,1);
- // here we have |empty | Prach1024 |
- memmove(prach2+(1024<<1),prach2,(1024<<2));
- // here we have |empty | Prach1024 | Prach1024| empty1024 | empty1024 | empty1024 | empty1024
- memmove(prach2+(1024<<2),prach2,(1024<<3));
- // here we have |empty | Prach1024 | Prach1024| Prach1024 | Prach1024 | empty1024 | empty1024
- memmove(prach2+(1024<<3),prach2,(1024<<3));
- // here we have |empty | Prach1024 | Prach1024| Prach1024 | Prach1024 | Prach1024 | Prach1024
- memmove(prach,prach+(1024<<1),(Ncp<<2));
- // here we have |Prefix | Prach1024 |
- prach_len = (1024*6)+Ncp;
- } else if (prach_fmt_id == 8) { // 12x1024
- idft(IDFT_1024,prachF,prach2,1);
- // here we have |empty | Prach1024 |
- memmove(prach2+(1024<<1),prach2,(1024<<2));
- // here we have |empty | Prach1024 | Prach1024| empty1024 | empty1024 | empty1024 | empty1024
- memmove(prach2+(1024<<2),prach2,(1024<<3));
- // here we have |empty | Prach1024 | Prach1024| Prach1024 | Prach1024 | empty1024 | empty1024
- memmove(prach2+(1024<<3),prach2,(1024<<3));
- // here we have |empty | Prach1024 | Prach1024| Prach1024 | Prach1024 | Prach1024 | Prach1024
- memmove(prach2+(1024<<1)*6,prach2,(1024<<2)*6);
- // here we have |empty | Prach1024 | Prach1024| Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024| Prach1024 | Prach1024 | Prach1024 | Prach1024|
- memmove(prach,prach+(1024<<1),(Ncp<<2));
- // here we have |Prefix | Prach1024 | Prach1024| Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024| Prach1024 | Prach1024 | Prach1024 | Prach1024|
- prach_len = (1024*12)+Ncp;
- }
- }
- break;
+ case 15360:
+ // 10, 15 MHz @ 15.36 Ms/s
+ Ncp >>= 1;
+ dftlen >>= 1;
+ break;
- default:
- AssertFatal(1==0,"sample rate %f MHz not supported for numerology %d\n", fp->samples_per_subframe / 1000.0, mu);
- }
- } else if (mu == 1) {
- switch (fp->samples_per_subframe) {
- case 15360: // full sampling @ 15.36 Ms/s
- Ncp = Ncp/2; // to account for 15.36 Ms/s
- // This is after cyclic prefix
- prach2 = prach+(2*Ncp); // times 2 for complex samples
- if (prach_sequence_length == 0){
- if (prach_fmt_id == 0) { // 24576 samples @ 30.72 Ms/s, 12288 samples @ 15.36 Ms/s
- idft(IDFT_12288,prachF,prach2,1);
- // here we have | empty | Prach12288 |
- memmove(prach,prach+(12288<<1),(Ncp<<2));
- // here we have | Prefix | Prach12288 |
- prach_len = 12288+Ncp;
- } else if (prach_fmt_id == 1) { // 24576 samples @ 30.72 Ms/s, 12288 samples @ 15.36 Ms/s
- idft(IDFT_12288,prachF,prach2,1);
- // here we have | empty | Prach12288 | empty12288 |
- memmove(prach2+(12288<<1),prach2,(12288<<2));
- // here we have | empty | Prach12288 | Prach12288 |
- memmove(prach,prach+(12288<<2),(Ncp<<2));
- // here we have | Prefix | Prach12288 | Prach12288 |
- prach_len = (12288*2)+Ncp;
- } else if (prach_fmt_id == 2) { // 24576 samples @ 30.72 Ms/s, 12288 samples @ 15.36 Ms/s
- idft(IDFT_12288,prachF,prach2,1);
- // here we have | empty | Prach12288 | empty12288 | empty12288 | empty12288 |
- memmove(prach2+(12288<<1),prach2,(12288<<2));
- // here we have | empty | Prach12288 | Prach12288 | empty12288 | empty12288 |
- memmove(prach2+(12288<<2),prach2,(12288<<3));
- // here we have | empty | Prach12288 | Prach12288 | Prach12288 | Prach12288 |
- memmove(prach,prach+(12288<<3),(Ncp<<2));
- // here we have | Prefix | Prach12288 | Prach12288 | Prach12288 | Prach12288 |
- prach_len = (12288*4)+Ncp;
- } else if (prach_fmt_id == 3) { // 6144 samples @ 30.72 Ms/s, 3072 samples @ 15.36 Ms/s
- idft(IDFT_3072,prachF,prach2,1);
- // here we have | empty | Prach3072 | empty3072 | empty3072 | empty3072 |
- memmove(prach2+(3072<<1),prach2,(3072<<2));
- // here we have | empty | Prach3072 | Prach3072 | empty3072 | empty3072 |
- memmove(prach2+(3072<<2),prach2,(3072<<3));
- // here we have | empty | Prach3072 | Prach3072 | Prach3072 | Prach3072 |
- memmove(prach,prach+(3072<<3),(Ncp<<2));
- // here we have | Prefix | Prach3072 | Prach3072 | Prach3072 | Prach3072 |
- prach_len = (3072*4)+Ncp;
- }
- } else { // short PRACH sequence
- if (use_extended_prach_prefix)
- Ncp += 8; // 16*kappa, kappa=0.5 for 15.36 Ms/s
- prach2 = prach+(2*Ncp); // times 2 for complex samples
- if (prach_fmt_id == 9) {
- idft(IDFT_512,prachF,prach2,1);
- // here we have | empty | Prach512 |
- memmove(prach,prach+(512<<1),(Ncp<<2));
- // here we have | Prefix | Prach512 |
- prach_len = (512*1)+Ncp;
- } else if (prach_fmt_id == 4 || prach_fmt_id == 7) {
- idft(IDFT_512,prachF,prach2,1);
- // here we have | empty | Prach512 | empty512 |
- memmove(prach2+(512<<1),prach2,(512<<2));
- // here we have | empty | Prach512 | Prach512 |
- memmove(prach,prach+(512<<1),(Ncp<<2));
- // here we have | Prefix | Prach512 | Prach512 |
- prach_len = (512*2)+Ncp;
- } else if (prach_fmt_id == 5) { // 4x512
- idft(IDFT_512,prachF,prach2,1);
- // here we have | empty | Prach512 | empty512 | empty512 | empty512 |
- memmove(prach2+(512<<1),prach2,(512<<2));
- // here we have | empty | Prach512 | Prach512 | empty512 | empty512 |
- memmove(prach2+(512<<2),prach2,(512<<3));
- // here we have | empty | Prach512 | Prach512 | Prach512 | Prach512 |
- memmove(prach,prach+(512<<1),(Ncp<<2));
- // here we have | Prefix | Prach512 | Prach512 | Prach512 | Prach512 |
- prach_len = (512*4)+Ncp;
- } else if (prach_fmt_id == 6) { // 6x512
- idft(IDFT_512,prachF,prach2,1);
- // here we have | empty | Prach512 | empty512 | empty512 | empty512 | empty512 | empty512 |
- memmove(prach2+(512<<1),prach2,(512<<2));
- // here we have | empty | Prach512 | Prach512 | empty512 | empty512 | empty512 | empty512 |
- memmove(prach2+(512<<2),prach2,(512<<3));
- // here we have | empty | Prach512 | Prach512 | Prach512 | Prach512 | empty512 | empty512 |
- memmove(prach2+(512<<3),prach2,(512<<3));
- // here we have | empty | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 |
- memmove(prach,prach+(512<<1),(Ncp<<2));
- // here we have | Prefix | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 |
- prach_len = (512*6)+Ncp;
- } else if (prach_fmt_id == 8) { // 12x512
- idft(IDFT_512,prachF,prach2,1);
- // here we have | empty | Prach512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 |
- memmove(prach2+(512<<1),prach2,(512<<2));
- // here we have | empty | Prach512 | Prach512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 |
- memmove(prach2+(512<<2),prach2,(512<<3));
- // here we have | empty | Prach512 | Prach512 | Prach512 | Prach512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 |
- memmove(prach2+(512<<3),prach2,(512<<3));
- // here we have | empty | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | empty512 | empty512 | empty512 | empty512 | empty512 | empty512 |
- memmove(prach2+(512<<1)*6,prach2,(512<<2)*6);
- // here we have | empty | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 |
- memmove(prach,prach+(512<<1),(Ncp<<2));
- // here we have | Prefix | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 | Prach512 |
- prach_len = (512*12)+Ncp;
- }
- }
- break;
+ case 30720:
+ // 20, 25, 30 MHz @ 30.72 Ms/s
+ Ncp = Ncp;
+ dftlen = dftlen;
+ break;
- case 30720: // full sampling @ 30.72 Ms/s
- Ncp = Ncp*1; // to account for 30.72 Ms/s
- // This is after cyclic prefix
- prach2 = prach+(2*Ncp); // times 2 for complex samples
- if (prach_sequence_length == 0){
- if (prach_fmt_id == 0) { // 24576 samples @ 30.72 Ms/s
- idft(IDFT_24576,prachF,prach2,1);
- // here we have | empty | Prach24576 |
- memmove(prach,prach+(24576<<1),(Ncp<<2));
- // here we have | Prefix | Prach24576 |
- prach_len = 24576+Ncp;
- } else if (prach_fmt_id == 1) { // 24576 samples @ 30.72 Ms/s
- idft(IDFT_24576,prachF,prach2,1);
- // here we have | empty | Prach24576 | empty24576 |
- memmove(prach2+(24576<<1),prach2,(24576<<2));
- // here we have | empty | Prach24576 | Prach24576 |
- memmove(prach,prach+(24576<<2),(Ncp<<2));
- // here we have | Prefix | Prach24576 | Prach24576 |
- prach_len = (24576*2)+Ncp;
- } else if (prach_fmt_id == 2) { // 24576 samples @ 30.72 Ms/s
- idft(IDFT_24576,prachF,prach2,1);
- // here we have | empty | Prach24576 | empty24576 | empty24576 | empty24576 |
- memmove(prach2+(24576<<1),prach2,(24576<<2));
- // here we have | empty | Prach24576 | Prach24576 | empty24576 | empty24576 |
- memmove(prach2+(24576<<2),prach2,(24576<<3));
- // here we have | empty | Prach24576 | Prach24576 | Prach24576 | Prach24576 |
- memmove(prach,prach+(24576<<3),(Ncp<<2));
- // here we have | Prefix | Prach24576 | Prach24576 | Prach24576 | Prach24576 |
- prach_len = (24576*4)+Ncp;
- } else if (prach_fmt_id == 3) { // 6144 samples @ 30.72 Ms/s
- idft(IDFT_6144,prachF,prach2,1);
- // here we have | empty | Prach6144 | empty6144 | empty6144 | empty6144 |
- memmove(prach2+(6144<<1),prach2,(6144<<2));
- // here we have | empty | Prach6144 | Prach6144 | empty6144 | empty6144 |
- memmove(prach2+(6144<<2),prach2,(6144<<3));
- // here we have | empty | Prach6144 | Prach6144 | Prach6144 | Prach6144 |
- memmove(prach,prach+(6144<<3),(Ncp<<2));
- // here we have | Prefix | Prach6144 | Prach6144 | Prach6144 | Prach6144 |
- prach_len = (6144*4)+Ncp;
- }
- } else { // short PRACH sequence
- if (use_extended_prach_prefix)
- Ncp += 16; // 16*kappa, kappa=1 for 30.72Msps
- prach2 = prach+(2*Ncp); // times 2 for complex samples
- if (prach_fmt_id == 9) {
- idft(IDFT_1024,prachF,prach2,1);
- // here we have | empty | Prach1024 |
- memmove(prach,prach+(1024<<1),(Ncp<<2));
- // here we have | Prefix | Prach1024 |
- prach_len = (1024*1)+Ncp;
- } else if (prach_fmt_id == 4 || prach_fmt_id == 7) {
- idft(IDFT_1024,prachF,prach2,1);
- // here we have | empty | Prach1024 | empty1024 |
- memmove(prach2+(1024<<1),prach2,(1024<<2));
- // here we have | empty | Prach1024 | Prach1024 |
- memmove(prach,prach+(1024<<1),(Ncp<<2));
- // here we have | Prefix | Prach1024 | Prach1024 |
- prach_len = (1024*2)+Ncp;
- } else if (prach_fmt_id == 5) { // 4x1024
- idft(IDFT_1024,prachF,prach2,1);
- // here we have | empty | Prach1024 | empty1024 | empty1024 | empty1024 |
- memmove(prach2+(1024<<1),prach2,(1024<<2));
- // here we have | empty | Prach1024 | Prach1024 | empty1024 | empty1024 |
- memmove(prach2+(1024<<2),prach2,(1024<<3));
- // here we have | empty | Prach1024 | Prach1024 | Prach1024 | Prach1024 |
- memmove(prach,prach+(1024<<1),(Ncp<<2));
- // here we have | Prefix | Prach1024 | Prach1024 | Prach1024 | Prach1024 |
- prach_len = (1024*4)+Ncp;
- } else if (prach_fmt_id == 6) { // 6x1024
- idft(IDFT_1024,prachF,prach2,1);
- // here we have | empty | Prach1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 |
- memmove(prach2+(1024<<1),prach2,(1024<<2));
- // here we have | empty | Prach1024 | Prach1024 | empty1024 | empty1024 | empty1024 | empty1024 |
- memmove(prach2+(1024<<2),prach2,(1024<<3));
- // here we have | empty | Prach1024 | Prach1024 | Prach1024 | Prach1024 | empty1024 | empty1024 |
- memmove(prach2+(1024<<3),prach2,(1024<<3));
- // here we have | empty | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 |
- memmove(prach,prach+(1024<<1),(Ncp<<2));
- // here we have | Prefix | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 |
- prach_len = (1024*6)+Ncp;
- } else if (prach_fmt_id == 8) { // 12x1024
- idft(IDFT_1024,prachF,prach2,1);
- // here we have | empty | Prach1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 |
- memmove(prach2+(1024<<1),prach2,(1024<<2));
- // here we have | empty | Prach1024 | Prach1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 |
- memmove(prach2+(1024<<2),prach2,(1024<<3));
- // here we have | empty | Prach1024 | Prach1024 | Prach1024 | Prach1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 |
- memmove(prach2+(1024<<3),prach2,(1024<<3));
- // here we have | empty | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 | empty1024 |
- memmove(prach2+(1024<<1)*6,prach2,(1024<<2)*6);
- // here we have | empty | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 |
- memmove(prach,prach+(1024<<1),(Ncp<<2));
- // here we have | Prefix | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 | Prach1024 |
- prach_len = (1024*12)+Ncp;
- }
- }
- break;
+ case 46080:
+ // 40 MHz @ 46.08 Ms/s
+ Ncp = (Ncp*3)/2;
+ dftlen = (dftlen*3)/2;
+ break;
- case 61440: // full sampling @ 61.44 Ms/s
- Ncp = Ncp*2; // to account for 61.44 Ms/s
- // This is after cyclic prefix
- prach2 = prach+(Ncp<<1); //times 2 for complex samples
- if (prach_sequence_length == 0){
- if (prach_fmt_id == 0) { //24576 samples @ 30.72 Ms/s, 49152 samples @ 61.44 Ms/s
- idft(IDFT_49152,prachF,prach2,1);
- // here we have |empty | Prach49152|
- memmove(prach,prach+(49152<<1),(Ncp<<2));
- // here we have |Prefix | Prach49152|
- prach_len = 49152+Ncp;
- } else if (prach_fmt_id == 1) { //24576 samples @ 30.72 Ms/s, 49152 samples @ 61.44 Ms/s
- idft(IDFT_49152,prachF,prach2,1);
- memmove(prach2+(49152<<1),prach2,(49152<<2));
- // here we have |empty | Prach49152 | Prach49152|
- memmove(prach,prach+(49152<<2),(Ncp<<2));
- // here we have |Prefix | Prach49152 | Prach49152|
- prach_len = (49152*2)+Ncp;
- } else if (prach_fmt_id == 2) { //24576 samples @ 30.72 Ms/s, 49152 samples @ 61.44 Ms/s
- idft(IDFT_49152,prachF,prach2,1);
- memmove(prach2+(49152<<1),prach2,(49152<<2));
- // here we have |empty | Prach49152 | Prach49152| empty49152 | empty49152
- memmove(prach2+(49152<<2),prach2,(49152<<3));
- // here we have |empty | Prach49152 | Prach49152| Prach49152 | Prach49152
- memmove(prach,prach+(49152<<3),(Ncp<<2));
- // here we have |Prefix | Prach49152 | Prach49152| Prach49152 | Prach49152
- prach_len = (49152*4)+Ncp;
- } else if (prach_fmt_id == 3) { // 6144 samples @ 30.72 Ms/s, 12288 samples @ 61.44 Ms/s
- idft(IDFT_12288,prachF,prach2,1);
- memmove(prach2+(12288<<1),prach2,(12288<<2));
- // here we have |empty | Prach12288 | Prach12288| empty12288 | empty12288
- memmove(prach2+(12288<<2),prach2,(12288<<3));
- // here we have |empty | Prach12288 | Prach12288| Prach12288 | Prach12288
- memmove(prach,prach+(12288<<3),(Ncp<<2));
- // here we have |Prefix | Prach12288 | Prach12288| Prach12288 | Prach12288
- prach_len = (12288*4)+Ncp;
- }
- } else { // short PRACH sequence
- if (use_extended_prach_prefix)
- Ncp+=32; // 16*kappa, kappa=2 for 61.44Msps
- prach2 = prach+(Ncp<<1); //times 2 for complex samples
- if (prach_fmt_id == 4 || prach_fmt_id == 7 || prach_fmt_id == 9) {
- idft(IDFT_2048,prachF,prach2,1);
- // here we have |empty | Prach2048 |
- if (prach_fmt_id != 9) {
- memmove(prach2+(2048<<1),prach2,(2048<<2));
- prach_len = (2048*2)+Ncp;
- }
- else prach_len = (2048*1)+Ncp;
- memmove(prach,prach+(2048<<1),(Ncp<<2));
- // here we have |Prefix | Prach2048 | Prach2048 (if ! 0xc0) |
- } else if (prach_fmt_id == 5) { // 6x2048
- idft(IDFT_2048,prachF,prach2,1);
- // here we have |empty | Prach2048 |
- memmove(prach2+(2048<<1),prach2,(2048<<2));
- // here we have |empty | Prach2048 | Prach2048| empty2048 | empty2048 |
- memmove(prach2+(2048<<2),prach2,(2048<<3));
- // here we have |empty | Prach2048 | Prach2048| Prach2048 | Prach2048 |
- memmove(prach,prach+(2048<<1),(Ncp<<2));
- // here we have |Prefix | Prach2048 |
- prach_len = (2048*4)+Ncp;
- } else if (prach_fmt_id == 6) { // 6x2048
- idft(IDFT_2048,prachF,prach2,1);
- // here we have |empty | Prach2048 |
- memmove(prach2+(2048<<1),prach2,(2048<<2));
- // here we have |empty | Prach2048 | Prach2048| empty2048 | empty2048 | empty2048 | empty2048
- memmove(prach2+(2048<<2),prach2,(2048<<3));
- // here we have |empty | Prach2048 | Prach2048| Prach2048 | Prach2048 | empty2048 | empty2048
- memmove(prach2+(2048<<3),prach2,(2048<<3));
- // here we have |empty | Prach2048 | Prach2048| Prach2048 | Prach2048 | Prach2048 | Prach2048
- memmove(prach,prach+(2048<<1),(Ncp<<2));
- // here we have |Prefix | Prach2048 |
- prach_len = (2048*6)+Ncp;
- } else if (prach_fmt_id == 8) { // 12x2048
- idft(IDFT_2048,prachF,prach2,1);
- // here we have |empty | Prach2048 |
- memmove(prach2+(2048<<1),prach2,(2048<<2));
- // here we have |empty | Prach2048 | Prach2048| empty2048 | empty2048 | empty2048 | empty2048
- memmove(prach2+(2048<<2),prach2,(2048<<3));
- // here we have |empty | Prach2048 | Prach2048| Prach2048 | Prach2048 | empty2048 | empty2048
- memmove(prach2+(2048<<3),prach2,(2048<<3));
- // here we have |empty | Prach2048 | Prach2048| Prach2048 | Prach2048 | Prach2048 | Prach2048
- memmove(prach2+(2048<<1)*6,prach2,(2048<<2)*6);
- // here we have |empty | Prach2048 | Prach2048| Prach2048 | Prach2048 | Prach2048 | Prach2048 | Prach2048 | Prach2048| Prach2048 | Prach2048 | Prach2048 | Prach2048|
- memmove(prach,prach+(2048<<1),(Ncp<<2));
- // here we have |Prefix | Prach2048 | Prach2048| Prach2048 | Prach2048 | Prach2048 | Prach2048 | Prach2048 | Prach2048| Prach2048 | Prach2048 | Prach2048 | Prach2048|
- prach_len = (2048*12)+Ncp;
- }
- }
- break;
+ case 61440:
+ // 40, 50, 60 MHz @ 61.44 Ms/s
+ Ncp <<= 1;
+ dftlen <<= 1;
+ break;
- case 46080: // threequarter sampling @ 46.08 Ms/s
- Ncp = (Ncp*3)/2;
- prach2 = prach+(Ncp<<1);
- if (prach_sequence_length == 0){
- if (prach_fmt_id == 0) {
- idft(IDFT_36864,prachF,prach2,1);
- // here we have |empty | Prach73728|
- memmove(prach,prach+(36864<<1),(Ncp<<2));
- // here we have |Prefix | Prach73728|
- prach_len = (36864*1)+Ncp;
- } else if (prach_fmt_id == 1) {
- idft(IDFT_36864,prachF,prach2,1);
- memmove(prach2+(36864<<1),prach2,(36864<<2));
- // here we have |empty | Prach73728 | Prach73728|
- memmove(prach,prach+(36864<<2),(Ncp<<2));
- // here we have |Prefix | Prach73728 | Prach73728|
- prach_len = (36864*2)+Ncp;
- } else if (prach_fmt_id == 2) {
- idft(IDFT_36864,prachF,prach2,1);
- memmove(prach2+(36864<<1),prach2,(36864<<2));
- // here we have |empty | Prach73728 | Prach73728| empty73728 | empty73728
- memmove(prach2+(36864<<2),prach2,(36864<<3));
- // here we have |empty | Prach73728 | Prach73728| Prach73728 | Prach73728
- memmove(prach,prach+(36864<<3),(Ncp<<2));
- // here we have |Prefix | Prach73728 | Prach73728| Prach73728 | Prach73728
- prach_len = (36864*4)+Ncp;
- } else if (prach_fmt_id == 3) {
- idft(IDFT_9216,prachF,prach2,1);
- memmove(prach2+(9216<<1),prach2,(9216<<2));
- // here we have |empty | Prach9216 | Prach9216| empty9216 | empty9216
- memmove(prach2+(9216<<2),prach2,(9216<<3));
- // here we have |empty | Prach9216 | Prach9216| Prach9216 | Prach9216
- memmove(prach,prach+(9216<<3),(Ncp<<2));
- // here we have |Prefix | Prach9216 | Prach9216| Prach9216 | Prach9216
- prach_len = (9216*4)+Ncp;
- }
- } else { // short sequence
- if (use_extended_prach_prefix)
- Ncp+=24; // 16*kappa, kappa=1.5 for 46.08Msps
- prach2 = prach+(Ncp<<1); //times 2 for complex samples
- if (prach_fmt_id == 4 || prach_fmt_id == 7 || prach_fmt_id == 9) {
- idft(IDFT_1536,prachF,prach2,1);
- // here we have |empty | Prach1536 |
- if (prach_fmt_id != 9) {
- memmove(prach2+(1536<<1),prach2,(1536<<2));
- prach_len = (1536*2)+Ncp;
- } else prach_len = (1536*1)+Ncp;
-
- memmove(prach,prach+(1536<<1),(Ncp<<2));
- // here we have |Prefix | Prach1536 | Prach1536 (if ! 0xc0) |
-
- } else if (prach_fmt_id == 5) { // 6x1536
- idft(IDFT_1536,prachF,prach2,1);
- // here we have |empty | Prach1536 |
- memmove(prach2+(1536<<1),prach2,(1536<<2));
- // here we have |empty | Prach1536 | Prach1536| empty1536 | empty1536 |
- memmove(prach2+(1536<<2),prach2,(1536<<3));
- // here we have |empty | Prach1536 | Prach1536| Prach1536 | Prach1536 |
- memmove(prach,prach+(1536<<1),(Ncp<<2));
- // here we have |Prefix | Prach1536 |
- prach_len = (1536*4)+Ncp;
- } else if (prach_fmt_id == 6) { // 6x1536
- idft(IDFT_1536,prachF,prach2,1);
- // here we have |empty | Prach1536 |
- memmove(prach2+(1536<<1),prach2,(1536<<2));
- // here we have |empty | Prach1536 | Prach1536| empty1536 | empty1536 | empty1536 | empty1536
- memmove(prach2+(1536<<2),prach2,(1536<<3));
- // here we have |empty | Prach1536 | Prach1536| Prach1536 | Prach1536 | empty1536 | empty1536
- memmove(prach2+(1536<<3),prach2,(1536<<3));
- // here we have |empty | Prach1536 | Prach1536| Prach1536 | Prach1536 | Prach1536 | Prach1536
- memmove(prach,prach+(1536<<1),(Ncp<<2));
- // here we have |Prefix | Prach1536 |
- prach_len = (1536*6)+Ncp;
- } else if (prach_fmt_id == 8) { // 12x1536
- idft(IDFT_1536,prachF,prach2,1);
- // here we have |empty | Prach1536 |
- memmove(prach2+(1536<<1),prach2,(1536<<2));
- // here we have |empty | Prach1536 | Prach1536| empty1536 | empty1536 | empty1536 | empty1536
- memmove(prach2+(1536<<2),prach2,(1536<<3));
- // here we have |empty | Prach1536 | Prach1536| Prach1536 | Prach1536 | empty1536 | empty1536
- memmove(prach2+(1536<<3),prach2,(1536<<3));
- // here we have |empty | Prach1536 | Prach1536| Prach1536 | Prach1536 | Prach1536 | Prach1536
- memmove(prach2+(1536<<1)*6,prach2,(1536<<2)*6);
- // here we have |empty | Prach1536 | Prach1536| Prach1536 | Prach1536 | Prach1536 | Prach1536 | Prach1536 | Prach1536| Prach1536 | Prach1536 | Prach1536 | Prach1536|
- memmove(prach,prach+(1536<<1),(Ncp<<2));
- // here we have |Prefix | Prach1536 | Prach1536| Prach1536 | Prach1536 | Prach1536 | Prach1536 | Prach1536 | Prach1536| Prach1536 | Prach1536 | Prach1536 | Prach1536|
- prach_len = (1536*12)+Ncp;
- }
- }
- break;
+ case 92160:
+ // 50, 60, 70, 80, 90 MHz @ 92.16 Ms/s
+ Ncp *= 3;
+ dftlen *= 3;
+ break;
- case 122880: // full sampling @ 122.88 Ms/s
- Ncp<<=2; //to account for 122.88Mbps
- // This is after cyclic prefix
- prach2 = prach+(Ncp<<1); //times 2 for complex samples
- if (prach_sequence_length == 0){
- if (prach_fmt_id == 0) { //24576 samples @ 30.72 Ms/s, 98304 samples @ 122.88 Ms/s
- idft(IDFT_98304,prachF,prach2,1);
- // here we have |empty | Prach98304|
- memmove(prach,prach+(98304<<1),(Ncp<<2));
- // here we have |Prefix | Prach98304|
- prach_len = (98304*1)+Ncp;
- } else if (prach_fmt_id == 1) {
- idft(IDFT_98304,prachF,prach2,1);
- memmove(prach2+(98304<<1),prach2,(98304<<2));
- // here we have |empty | Prach98304 | Prach98304|
- memmove(prach,prach+(98304<<2),(Ncp<<2));
- // here we have |Prefix | Prach98304 | Prach98304|
- prach_len = (98304*2)+Ncp;
- } else if (prach_fmt_id == 2) {
- idft(IDFT_98304,prachF,prach2,1);
- memmove(prach2+(98304<<1),prach2,(98304<<2));
- // here we have |empty | Prach98304 | Prach98304| empty98304 | empty98304
- memmove(prach2+(98304<<2),prach2,(98304<<3));
- // here we have |empty | Prach98304 | Prach98304| Prach98304 | Prach98304
- memmove(prach,prach+(98304<<3),(Ncp<<2));
- // here we have |Prefix | Prach98304 | Prach98304| Prach98304 | Prach98304
- prach_len = (98304*4)+Ncp;
- } else if (prach_fmt_id == 3) { // 4x6144, Ncp 3168
- idft(IDFT_24576,prachF,prach2,1);
- memmove(prach2+(24576<<1),prach2,(24576<<2));
- // here we have |empty | Prach24576 | Prach24576| empty24576 | empty24576
- memmove(prach2+(24576<<2),prach2,(24576<<3));
- // here we have |empty | Prach24576 | Prach24576| Prach24576 | Prach24576
- memmove(prach,prach+(24576<<3),(Ncp<<2));
- // here we have |Prefix | Prach24576 | Prach24576| Prach24576 | Prach24576
- prach_len = (24576*4)+Ncp;
- }
- } else { // short sequence
- if (use_extended_prach_prefix)
- Ncp+=64; // 16*kappa, kappa=4 for 122.88Msps
- prach2 = prach+(Ncp<<1); //times 2 for complex samples
- if (prach_fmt_id == 4 || prach_fmt_id == 7 || prach_fmt_id == 9) {
- idft(IDFT_4096,prachF,prach2,1);
- // here we have |empty | Prach4096 |
- if (prach_fmt_id != 9) {
- memmove(prach2+(4096<<1),prach2,(4096<<2));
- prach_len = (4096*2)+Ncp;
- } else prach_len = (4096*1)+Ncp;
- memmove(prach,prach+(4096<<1),(Ncp<<2));
- // here we have |Prefix | Prach4096 | Prach4096 (if ! 0xc0) |
- } else if (prach_fmt_id == 5) { // 4x4096
- idft(IDFT_4096,prachF,prach2,1);
- // here we have |empty | Prach4096 |
- memmove(prach2+(4096<<1),prach2,(4096<<2));
- // here we have |empty | Prach4096 | Prach4096| empty4096 | empty4096 |
- memmove(prach2+(4096<<2),prach2,(4096<<3));
- // here we have |empty | Prach4096 | Prach4096| Prach4096 | Prach4096 |
- memmove(prach,prach+(4096<<1),(Ncp<<2));
- // here we have |Prefix | Prach4096 |
- prach_len = (4096*4)+Ncp;
- } else if (prach_fmt_id == 6) { // 6x4096
- idft(IDFT_4096,prachF,prach2,1);
- // here we have |empty | Prach4096 |
- memmove(prach2+(4096<<1),prach2,(4096<<2));
- // here we have |empty | Prach4096 | Prach4096| empty4096 | empty4096 | empty4096 | empty4096
- memmove(prach2+(4096<<2),prach2,(4096<<3));
- // here we have |empty | Prach4096 | Prach4096| Prach4096 | Prach4096 | empty4096 | empty4096
- memmove(prach2+(4096<<3),prach2,(4096<<3));
- // here we have |empty | Prach4096 | Prach4096| Prach4096 | Prach4096 | Prach4096 | Prach4096
- memmove(prach,prach+(4096<<1),(Ncp<<2));
- // here we have |Prefix | Prach4096 |
- prach_len = (4096*6)+Ncp;
- } else if (prach_fmt_id == 8) { // 12x4096
- idft(IDFT_4096,prachF,prach2,1);
- // here we have |empty | Prach4096 |
- memmove(prach2+(4096<<1),prach2,(4096<<2));
- // here we have |empty | Prach4096 | Prach4096| empty4096 | empty4096 | empty4096 | empty4096
- memmove(prach2+(4096<<2),prach2,(4096<<3));
- // here we have |empty | Prach4096 | Prach4096| Prach4096 | Prach4096 | empty4096 | empty4096
- memmove(prach2+(4096<<3),prach2,(4096<<3));
- // here we have |empty | Prach4096 | Prach4096| Prach4096 | Prach4096 | Prach4096 | Prach4096
- memmove(prach2+(4096<<1)*6,prach2,(4096<<2)*6);
- // here we have |empty | Prach4096 | Prach4096| Prach4096 | Prach4096 | Prach4096 | Prach4096 | Prach4096 | Prach4096| Prach4096 | Prach4096 | Prach4096 | Prach4096|
- memmove(prach,prach+(4096<<1),(Ncp<<2));
- // here we have |Prefix | Prach4096 | Prach4096| Prach4096 | Prach4096 | Prach4096 | Prach4096 | Prach4096 | Prach4096| Prach4096 | Prach4096 | Prach4096 | Prach4096|
- prach_len = (4096*12)+Ncp;
- }
- }
- break;
+ case 122880:
+ // 70, 80, 90, 100 MHz @ 122.88 Ms/s
+ Ncp <<= 2;
+ dftlen <<= 2;
+ break;
- case 92160: // three quarter sampling @ 92.16 Ms/s
- Ncp = (Ncp*3); //to account for 92.16 Msps
- prach2 = prach+(Ncp<<1); //times 2 for complex samples
- if (prach_sequence_length == 0){
- if (prach_fmt_id == 0) {
- idft(IDFT_73728,prachF,prach2,1);
- // here we have |empty | Prach73728|
- memmove(prach,prach+(73728<<1),(Ncp<<2));
- // here we have |Prefix | Prach73728|
- prach_len = (73728*1)+Ncp;
- } else if (prach_fmt_id == 1) {
- idft(IDFT_73728,prachF,prach2,1);
- memmove(prach2+(73728<<1),prach2,(73728<<2));
- // here we have |empty | Prach73728 | Prach73728|
- memmove(prach,prach+(73728<<2),(Ncp<<2));
- // here we have |Prefix | Prach73728 | Prach73728|
- prach_len = (73728*2)+Ncp;
- } if (prach_fmt_id == 2) {
- idft(IDFT_73728,prachF,prach2,1);
- memmove(prach2+(73728<<1),prach2,(73728<<2));
- // here we have |empty | Prach73728 | Prach73728| empty73728 | empty73728
- memmove(prach2+(73728<<2),prach2,(73728<<3));
- // here we have |empty | Prach73728 | Prach73728| Prach73728 | Prach73728
- memmove(prach,prach+(73728<<3),(Ncp<<2));
- // here we have |Prefix | Prach73728 | Prach73728| Prach73728 | Prach73728
- prach_len = (73728*4)+Ncp;
- } else if (prach_fmt_id == 3) {
- idft(IDFT_18432,prachF,prach2,1);
- memmove(prach2+(18432<<1),prach2,(18432<<2));
- // here we have |empty | Prach18432 | Prach18432| empty18432 | empty18432
- memmove(prach2+(18432<<2),prach2,(18432<<3));
- // here we have |empty | Prach18432 | Prach18432| Prach18432 | Prach18432
- memmove(prach,prach+(18432<<3),(Ncp<<2));
- // here we have |Prefix | Prach18432 | Prach18432| Prach18432 | Prach18432
- prach_len = (18432*4)+Ncp;
- }
- } else { // short sequence
- if (use_extended_prach_prefix)
- Ncp+=48; // 16*kappa, kappa=3 for 92.16Msps
- prach2 = prach+(Ncp<<1); //times 2 for complex samples
- if (prach_fmt_id == 4 || prach_fmt_id == 7 || prach_fmt_id == 9) {
- idft(IDFT_3072,prachF,prach2,1);
- // here we have |empty | Prach3072 |
- if (prach_fmt_id != 9) {
- memmove(prach2+(3072<<1),prach2,(3072<<2));
- prach_len = (3072*2)+Ncp;
- } else prach_len = (3072*1)+Ncp;
- memmove(prach,prach+(3072<<1),(Ncp<<2));
- // here we have |Prefix | Prach3072 | Prach3072 (if ! 0xc0) |
- } else if (prach_fmt_id == 6) { // 6x3072
- idft(IDFT_3072,prachF,prach2,1);
- // here we have |empty | Prach3072 |
- memmove(prach2+(3072<<1),prach2,(3072<<2));
- // here we have |empty | Prach3072 | Prach3072| empty3072 | empty3072 | empty3072 | empty3072
- memmove(prach2+(3072<<2),prach2,(3072<<3));
- // here we have |empty | Prach3072 | Prach3072| Prach3072 | Prach3072 | empty3072 | empty3072
- memmove(prach2+(3072<<3),prach2,(3072<<3));
- // here we have |empty | Prach3072 | Prach3072| Prach3072 | Prach3072 | Prach3072 | Prach3072
- memmove(prach,prach+(3072<<1),(Ncp<<2));
- // here we have |Prefix | Prach3072 |
- prach_len = (3072*6)+Ncp;
- } else if (prach_fmt_id == 5) { // 4x3072
- idft(IDFT_3072,prachF,prach2,1);
- // here we have |empty | Prach3072 |
- memmove(prach2+(3072<<1),prach2,(3072<<2));
- // here we have |empty | Prach3072 | Prach3072| empty3072 | empty3072 |
- memmove(prach2+(3072<<2),prach2,(3072<<3));
- // here we have |empty | Prach3072 | Prach3072| Prach3072 | Prach3072 |
- memmove(prach,prach+(3072<<1),(Ncp<<2));
- // here we have |Prefix | Prach3072 |
- prach_len = (3072*4)+Ncp;
- } else if (prach_fmt_id == 6) { // 12x3072
- idft(IDFT_3072,prachF,prach2,1);
- // here we have |empty | Prach3072 |
- memmove(prach2+(3072<<1),prach2,(3072<<2));
- // here we have |empty | Prach3072 | Prach3072| empty3072 | empty3072 | empty3072 | empty3072
- memmove(prach2+(3072<<2),prach2,(3072<<3));
- // here we have |empty | Prach3072 | Prach3072| Prach3072 | Prach3072 | empty3072 | empty3072
- memmove(prach2+(3072<<3),prach2,(3072<<3));
- // here we have |empty | Prach3072 | Prach3072| Prach3072 | Prach3072 | Prach3072 | Prach3072
- memmove(prach2+(3072<<1)*6,prach2,(3072<<2)*6);
- // here we have |empty | Prach3072 | Prach3072| Prach3072 | Prach3072 | Prach3072 | Prach3072 | Prach3072 | Prach3072| Prach3072 | Prach3072 | Prach3072 | Prach3072|
- memmove(prach,prach+(3072<<1),(Ncp<<2));
- // here we have |Prefix | Prach3072 | Prach3072| Prach3072 | Prach3072 | Prach3072 | Prach3072 | Prach3072 | Prach3072| Prach3072 | Prach3072 | Prach3072 | Prach3072|
- prach_len = (3072*12)+Ncp;
- }
- }
- break;
+ default:
+ AssertFatal(1==0,"sample rate %f MHz not supported for numerology %d\n", fp->samples_per_subframe / 1000.0, mu);
+ }
- default:
- AssertFatal(1==0,"sample rate %f MHz not supported for numerology %d\n", fp->samples_per_subframe / 1000.0, mu);
+ #ifdef NR_PRACH_DEBUG
+ LOG_I(PHY, "PRACH [UE %d] Ncp %d, dftlen %d \n", Mod_id, Ncp, dftlen);
+ #endif
+
+ /********************************************************
+ *
+ * In function init_prach_tables:
+ * to compute quantized roots of unity ru(n) = 32767 * exp j*[ (2 * PI * n) / N_ZC ]
+ *
+ * In compute_prach_seq:
+ * to calculate Xu = DFT xu = xu (inv_u*k) * Xu[0] (This is a Zadoff-Chou sequence property: DFT ZC sequence is another ZC sequence)
+ *
+ * In generate_prach:
+ * to do the cyclic-shifted DFT by multiplying Xu[k] * ru[k*preamble_shift] as:
+ * If X[k] = DFT x(n) -> X_shifted[k] = DFT x(n+preamble_shift) = X[k] * exp -j*[ (2*PI*k*preamble_shift) / N_ZC ]
+ *
+ *********************************************************/
+
+ Xu = (int16_t*)ue->X_u[preamble_offset-first_nonzero_root_idx];
+
+ #if defined (PRACH_WRITE_OUTPUT_DEBUG)
+ LOG_M("X_u.m", "X_u", (int16_t*)ue->X_u[preamble_offset-first_nonzero_root_idx], N_ZC, 1, 1);
+ #endif
+
+ for (offset=0,offset2=0; offset<N_ZC; offset++,offset2+=preamble_shift) {
+
+ if (offset2 >= N_ZC)
+ offset2 -= N_ZC;
+
+ Xu_re = (((int32_t)Xu[offset<<1]*amp)>>15);
+ Xu_im = (((int32_t)Xu[1+(offset<<1)]*amp)>>15);
+ prachF[k++]= ((Xu_re*nr_ru[offset2<<1]) - (Xu_im*nr_ru[1+(offset2<<1)]))>>15;
+ prachF[k++]= ((Xu_im*nr_ru[offset2<<1]) + (Xu_re*nr_ru[1+(offset2<<1)]))>>15;
+
+ if (k==dftlen) k=0;
+ }
+
+ #if defined (PRACH_WRITE_OUTPUT_DEBUG)
+ LOG_M("prachF.m", "prachF", &prachF[1804], 1024, 1, 1);
+ LOG_M("Xu.m", "Xu", Xu, N_ZC, 1, 1);
+ #endif
+
+ // This is after cyclic prefix
+ prach2 = prach+(2*Ncp); // times 2 for complex samples
+ const idft_size_idx_t idft_size = get_idft(dftlen);
+ idft(idft_size, prachF, prach, 1);
+ memmove(prach2, prach, (dftlen<<2));
+
+ if (prach_sequence_length == 0) {
+ if (prach_fmt_id == 0) {
+ // here we have | empty | Prach |
+ memcpy(prach, prach+(dftlen<<1), (Ncp<<2));
+ // here we have | Prefix | Prach |
+ prach_len = dftlen+Ncp;
+ } else if (prach_fmt_id == 1) {
+ // here we have | empty | Prach | empty |
+ memcpy(prach2+(dftlen<<1), prach2, (dftlen<<2));
+ // here we have | empty | Prach | Prach |
+ memcpy(prach, prach+(dftlen<<2), (Ncp<<2));
+ // here we have | Prefix | Prach | Prach |
+ prach_len = (dftlen*2)+Ncp;
+ } else if (prach_fmt_id == 2 || prach_fmt_id == 3) {
+ // here we have | empty | Prach | empty | empty | empty |
+ memcpy(prach2+(dftlen<<1), prach2, (dftlen<<2));
+ // here we have | empty | Prach | Prach | empty | empty |
+ memcpy(prach2+(dftlen<<2), prach2, (dftlen<<3));
+ // here we have | empty | Prach | Prach | Prach | Prach |
+ memcpy(prach, prach+(dftlen<<3), (Ncp<<2));
+ // here we have | Prefix | Prach | Prach | Prach | Prach |
+ prach_len = (dftlen*4)+Ncp;
+ }
+ } else { // short PRACH sequence
+ if (prach_fmt_id == 9) {
+ // here we have | empty | Prach |
+ memcpy(prach, prach+(dftlen<<1), (Ncp<<2));
+ // here we have | Prefix | Prach |
+ prach_len = (dftlen*1)+Ncp;
+ } else if (prach_fmt_id == 4 || prach_fmt_id == 7) {
+ // here we have | empty | Prach | empty |
+ memcpy(prach2+(dftlen<<1), prach2, (dftlen<<2));
+ // here we have | empty | Prach | Prach |
+ memcpy(prach, prach+(dftlen<<1), (Ncp<<2));
+ // here we have | Prefix | Prach | Prach |
+ prach_len = (dftlen*2)+Ncp;
+ } else if (prach_fmt_id == 5) { // 4xdftlen
+ // here we have | empty | Prach | empty | empty | empty |
+ memcpy(prach2+(dftlen<<1), prach2, (dftlen<<2));
+ // here we have | empty | Prach | Prach | empty | empty |
+ memcpy(prach2+(dftlen<<2), prach2, (dftlen<<3));
+ // here we have | empty | Prach | Prach | Prach | Prach |
+ memcpy(prach, prach+(dftlen<<1), (Ncp<<2));
+ // here we have | Prefix | Prach | Prach | Prach | Prach |
+ prach_len = (dftlen*4)+Ncp;
+ } else if (prach_fmt_id == 6) { // 6xdftlen
+ // here we have | empty | Prach | empty | empty | empty | empty | empty |
+ memcpy(prach2+(dftlen<<1), prach2, (dftlen<<2));
+ // here we have | empty | Prach | Prach | empty | empty | empty | empty |
+ memcpy(prach2+(dftlen<<2), prach2, (dftlen<<3));
+ // here we have | empty | Prach | Prach | Prach | Prach | empty | empty |
+ memcpy(prach2+(dftlen<<3), prach2, (dftlen<<3));
+ // here we have | empty | Prach | Prach | Prach | Prach | Prach | Prach |
+ memcpy(prach, prach+(dftlen<<1), (Ncp<<2));
+ // here we have | Prefix | Prach | Prach | Prach | Prach | Prach | Prach |
+ prach_len = (dftlen*6)+Ncp;
+ } else if (prach_fmt_id == 8) { // 12xdftlen
+ // here we have | empty | Prach | empty | empty | empty | empty | empty | empty | empty | empty | empty | empty | empty |
+ memcpy(prach2+(dftlen<<1), prach2, (dftlen<<2));
+ // here we have | empty | Prach | Prach | empty | empty | empty | empty | empty | empty | empty | empty | empty | empty |
+ memcpy(prach2+(dftlen<<2), prach2, (dftlen<<3));
+ // here we have | empty | Prach | Prach | Prach | Prach | empty | empty | empty | empty | empty | empty | empty | empty |
+ memcpy(prach2+(dftlen<<3), prach2, (dftlen<<3));
+ // here we have | empty | Prach | Prach | Prach | Prach | Prach | Prach | empty | empty | empty | empty | empty | empty |
+ memcpy(prach2+(dftlen<<1)*6, prach2, (dftlen<<2)*6);
+ // here we have | empty | Prach | Prach | Prach | Prach | Prach | Prach | Prach | Prach | Prach | Prach | Prach | Prach |
+ memcpy(prach, prach+(dftlen<<1), (Ncp<<2));
+ // here we have | Prefix | Prach | Prach | Prach | Prach | Prach | Prach | Prach | Prach | Prach | Prach | Prach | Prach |
+ prach_len = (dftlen*12)+Ncp;
}
}
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
index d3f362b90cc4aeb2c5af6773e1ac92241001b240..80b803779dcc0dff1c042e9d5527dd09f56a97e1 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ue_rf_helpers.c
@@ -67,7 +67,7 @@ void nr_rf_card_config_gain(openair0_config_t *openair0_cfg,
openair0_cfg->autocal[i] = 1;
if (i < openair0_cfg->rx_num_channels) {
- LOG_I(PHY, "HW: Configuring channel %d (rf_chain %d): setting tx_gain %f, rx_gain %f\n",
+ LOG_I(PHY, "HW: Configuring channel %d (rf_chain %d): setting tx_gain %.0f, rx_gain %.0f\n",
i,
rf_chain,
openair0_cfg->tx_gain[i],
@@ -103,11 +103,12 @@ void nr_rf_card_config_freq(openair0_config_t *openair0_cfg,
openair0_cfg->autocal[i] = 1;
if (i < openair0_cfg->rx_num_channels) {
- LOG_I(PHY, "HW: Configuring channel %d (rf_chain %d): setting tx_freq %f Hz, rx_freq %f Hz\n",
+ LOG_I(PHY, "HW: Configuring channel %d (rf_chain %d): setting tx_freq %.0f Hz, rx_freq %.0f Hz, tune_offset %.0f\n",
i,
rf_chain,
openair0_cfg->tx_freq[i],
- openair0_cfg->rx_freq[i]);
+ openair0_cfg->rx_freq[i],
+ openair0_cfg->tune_offset);
}
}
diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
index 450805a26ccbc861b013ad8483a7139a929c0898..a07a19d085f43c0628416d699595fdaf09126d43 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
@@ -171,7 +171,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
trace_NRpdu(DIRECTION_UPLINK,
harq_process_ul_ue->a,
harq_process_ul_ue->pusch_pdu.pusch_data.tb_size,
- 0, WS_C_RNTI, rnti, frame, slot, 0, 0);
+ WS_C_RNTI, rnti, frame, slot, 0, 0);
if (nr_ulsch_encoding(UE, ulsch_ue, frame_parms, harq_pid, G) == -1)
return;
diff --git a/openair1/PHY/NR_UE_TRANSPORT/pss_nr.c b/openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
index 13ed436273ee9d0f79ee8b308b6596873c559dd8..d2034f3abf45d567d1915be0ce40736227bd613f 100644
--- a/openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
+++ b/openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
@@ -48,126 +48,8 @@
#include "PHY/NR_REFSIG/sss_nr.h"
#include "PHY/NR_UE_TRANSPORT/cic_filter_nr.h"
-/*******************************************************************
-*
-* NAME : get_idft
-*
-* PARAMETERS : size of ofdm symbol
-*
-* RETURN : index pointing to the dft func in the dft library
-*
-* DESCRIPTION : get idft function depending of ofdm size
-*
-*********************************************************************/
-
//#define DBG_PSS_NR
-idft_size_idx_t get_idft(int ofdm_symbol_size)
-{
-
-
- switch (ofdm_symbol_size) {
- case 128:
- return IDFT_128;
- break;
-
- case 256:
- return IDFT_256;
- break;
-
- case 512:
- return IDFT_512;
- break;
-
- case 1024:
- return IDFT_1024;
- break;
-
- case 1536:
- return IDFT_1536;
- break;
-
- case 2048:
- return IDFT_2048;
- break;
-
- case 3072:
- return IDFT_3072;
- break;
-
- case 4096:
- return IDFT_4096;
- break;
-
- case 8192:
- return IDFT_8192;
- break;
-
- default:
- printf("function get_idft : unsupported ofdm symbol size \n");
- assert(0);
- break;
- }
- return IDFT_SIZE_IDXTABLESIZE; // never reached and will trigger assertion in idft function
-}
-
-/*******************************************************************
-*
-* NAME : get_dft
-*
-* PARAMETERS : size of ofdm symbol
-*
-* RETURN : function for discrete fourier transform
-*
-* DESCRIPTION : get dft function depending of ofdm size
-*
-*********************************************************************/
-
-dft_size_idx_t get_dft(int ofdm_symbol_size)
-{
-
-
- switch (ofdm_symbol_size) {
- case 128:
- return DFT_128;
- break;
-
- case 256:
- return DFT_256;
- break;
-
- case 512:
- return DFT_512;
- break;
-
- case 1024:
- return DFT_1024;
- break;
-
- case 1536:
- return DFT_1536;
- break;
-
- case 2048:
- return DFT_2048;
- break;
-
- case 4096:
- return DFT_4096;
- break;
-
- case 8192:
- return DFT_8192;
- break;
-
- default:
- printf("function get_dft : unsupported ofdm symbol size \n");
- assert(0);
- break;
- }
- return DFT_SIZE_IDXTABLESIZE; // never reached and will trigger assertion in idft function;
-}
-
/*******************************************************************
*
* NAME : generate_pss_nr
diff --git a/openair1/PHY/TOOLS/tools_defs.h b/openair1/PHY/TOOLS/tools_defs.h
index 145fbe4a31a2867e21f1ba645ea0ebef125a0a55..839beb3dc9a4f5911ed775dff3e37eaadc59f3ee 100644
--- a/openair1/PHY/TOOLS/tools_defs.h
+++ b/openair1/PHY/TOOLS/tools_defs.h
@@ -33,7 +33,9 @@
extern "C" {
#endif
+#include <stdio.h>
#include <stdint.h>
+#include <assert.h>
#include "PHY/sse_intrin.h"
#define CEILIDIV(a,b) ((a+b-1)/b)
@@ -315,6 +317,65 @@ typedef enum dft_size_idx {
#define SZ_iENUM(Sz) IDFT_ ## Sz,
+/*******************************************************************
+*
+* NAME : get_dft
+*
+* PARAMETERS : size of ofdm symbol
+*
+* RETURN : function for discrete fourier transform
+*
+* DESCRIPTION : get dft function depending of ofdm size
+*
+*********************************************************************/
+static inline
+dft_size_idx_t get_dft(int ofdm_symbol_size)
+{
+ switch (ofdm_symbol_size) {
+ case 128:
+ return DFT_128;
+ case 256:
+ return DFT_256;
+ case 512:
+ return DFT_512;
+ case 1024:
+ return DFT_1024;
+ case 1536:
+ return DFT_1536;
+ case 2048:
+ return DFT_2048;
+ case 3072:
+ return DFT_3072;
+ case 4096:
+ return DFT_4096;
+ case 6144:
+ return DFT_6144;
+ case 8192:
+ return DFT_8192;
+ case 9216:
+ return DFT_9216;
+ case 12288:
+ return DFT_12288;
+ case 18432:
+ return DFT_18432;
+ case 24576:
+ return DFT_24576;
+ case 36864:
+ return DFT_36864;
+ case 49152:
+ return DFT_49152;
+ case 73728:
+ return DFT_73728;
+ case 98304:
+ return DFT_98304;
+ default:
+ printf("function get_dft : unsupported ofdm symbol size \n");
+ assert(0);
+ break;
+ }
+ return DFT_SIZE_IDXTABLESIZE; // never reached and will trigger assertion in idft function;
+}
+
typedef enum idft_size_idx {
FOREACH_IDFTSZ(SZ_iENUM)
IDFT_SIZE_IDXTABLESIZE
@@ -340,6 +401,64 @@ struct {
#endif
+/*******************************************************************
+*
+* NAME : get_idft
+*
+* PARAMETERS : size of ofdm symbol
+*
+* RETURN : index pointing to the dft func in the dft library
+*
+* DESCRIPTION : get idft function depending of ofdm size
+*
+*********************************************************************/
+static inline
+idft_size_idx_t get_idft(int ofdm_symbol_size)
+{
+ switch (ofdm_symbol_size) {
+ case 128:
+ return IDFT_128;
+ case 256:
+ return IDFT_256;
+ case 512:
+ return IDFT_512;
+ case 1024:
+ return IDFT_1024;
+ case 1536:
+ return IDFT_1536;
+ case 2048:
+ return IDFT_2048;
+ case 3072:
+ return IDFT_3072;
+ case 4096:
+ return IDFT_4096;
+ case 6144:
+ return IDFT_6144;
+ case 8192:
+ return IDFT_8192;
+ case 9216:
+ return IDFT_9216;
+ case 12288:
+ return IDFT_12288;
+ case 18432:
+ return IDFT_18432;
+ case 24576:
+ return IDFT_24576;
+ case 36864:
+ return IDFT_36864;
+ case 49152:
+ return IDFT_49152;
+ case 73728:
+ return IDFT_73728;
+ case 98304:
+ return IDFT_98304;
+ default:
+ printf("function get_idft : unsupported ofdm symbol size \n");
+ assert(0);
+ break;
+ }
+ return IDFT_SIZE_IDXTABLESIZE; // never reached and will trigger assertion in idft function
+}
/*!\fn int32_t rotate_cpx_vector(int16_t *x,int16_t *alpha,int16_t *y,uint32_t N,uint16_t output_shift)
diff --git a/openair1/PHY/defs_gNB.h b/openair1/PHY/defs_gNB.h
index 2ced28821ace6a6d5e2a8407f7345ebcb5ea9b86..647619819ff96be882fb131fbb435f70432320ac 100644
--- a/openair1/PHY/defs_gNB.h
+++ b/openair1/PHY/defs_gNB.h
@@ -428,10 +428,6 @@ typedef struct {
/// - first index: rx antenna id [0..nb_antennas_rx[
/// - second index: ? [0..2*ofdm_symbol_size[
int32_t **rxdataF_ext;
- /// \brief Holds the received data in the frequency domain for the allocated RBs in normal format.
- /// - first index: rx antenna id [0..nb_antennas_rx[
- /// - second index (definition from phy_init_lte_eNB()): ? [0..12*N_RB_UL*frame_parms->symbols_per_tti[
- int32_t **rxdataF_ext2;
/// \brief Hold the channel estimates in time domain based on DRS.
/// - first index: rx antenna id [0..nb_antennas_rx[
/// - second index: ? [0..4*ofdm_symbol_size[
@@ -444,14 +440,6 @@ typedef struct {
/// - first index: ? [0..7] (hard coded) FIXME! accessed via \c nb_antennas_rx
/// - second index: ? [0..12*N_RB_UL*frame_parms->symbols_per_tti[
int32_t **ul_ch_estimates_ext;
- /// \brief Hold the PTRS phase estimates in frequency domain.
- /// - first index: rx antenna id [0..nb_antennas_rx[
- /// - second index: ? [0..12*N_RB_UL*frame_parms->symbols_per_tti[
- int32_t **ul_ch_ptrs_estimates;
- /// \brief Uplink phase estimates extracted in PRBS.
- /// - first index: ? [0..7] (hard coded) FIXME! accessed via \c nb_antennas_rx
- /// - second index: ? [0..12*N_RB_UL*frame_parms->symbols_per_tti[
- int32_t **ul_ch_ptrs_estimates_ext;
/// \brief Holds the compensated signal.
/// - first index: rx antenna id [0..nb_antennas_rx[
/// - second index: ? [0..12*N_RB_UL*frame_parms->symbols_per_tti[
diff --git a/openair1/PHY/defs_nr_UE.h b/openair1/PHY/defs_nr_UE.h
index 82de7ed96ea014d117fc68f37d2c0129f575775a..baf8dff8a8ef24c4e68864cc30c8dc4449946cb8 100644
--- a/openair1/PHY/defs_nr_UE.h
+++ b/openair1/PHY/defs_nr_UE.h
@@ -279,10 +279,6 @@ typedef struct {
/// - first index: ? [0..7] (hard coded) FIXME! accessed via \c nb_antennas_rx
/// - second index: ? [0..168*N_RB_DL[
int32_t **dl_ch_estimates_ext;
- /// \brief Downlink channel estimates extracted in PRBS.
- /// - first index: ? [0..7] (hard coded) FIXME! accessed via \c nb_antennas_rx
- /// - second index: ? [0..168*N_RB_DL[
- int32_t **dl_ch_ptrs_estimates_ext;
/// \brief Downlink beamforming channel estimates in frequency domain.
/// - first index: ? [0..7] (hard coded) FIXME! accessed via \c nb_antennas_rx
/// - second index: samples? [0..symbols_per_tti*(ofdm_symbol_size+LTE_CE_FILTER_LENGTH)[
diff --git a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
index 99731c8cb1916435a858e36f5d30ce72edf54bcf..6ee9a95b59ef104df0b898db4fe25ab0e5165b71 100644
--- a/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+++ b/openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
@@ -134,7 +134,6 @@ void nr_fill_rx_indication(fapi_nr_rx_indication_t *rx_ind,
trace_NRpdu(DIRECTION_DOWNLINK,
dlsch0->harq_processes[dlsch0->current_harq_pid]->b,
dlsch0->harq_processes[dlsch0->current_harq_pid]->TBS / 8,
- pdu_type,
WS_C_RNTI,
dlsch0->rnti,
proc->frame_rx,
diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c
index d7503ce738211870c7833e0d691e0895bb3f202e..99236c9a43cc9f3a2c3cad1737cb00fe64e71fe3 100644
--- a/openair1/SIMULATION/NR_PHY/dlsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlsim.c
@@ -96,7 +96,6 @@ uint16_t sl_ahead=0;
uint64_t downlink_frequency[MAX_NUM_CCs][4];
THREAD_STRUCT thread_struct;
nfapi_ue_release_request_body_t release_rntis;
-uint32_t N_RB_DL = 106;
//Fixme: Uniq dirty DU instance, by global var, datamodel need better management
instance_t DUuniqInstance=0;
instance_t CUuniqInstance=0;
@@ -270,9 +269,9 @@ int g_mcsIndex = -1, g_mcsTableIdx = 0, g_rbStart = -1, g_rbSize = -1, g_nrOfLay
void nr_dlsim_preprocessor(module_id_t module_id,
frame_t frame,
sub_frame_t slot) {
- NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
- AssertFatal(UE_info->num_UEs == 1, "can have only a single UE\n");
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[0];
+ NR_UE_info_t *UE_info = RC.nrmac[module_id]->UE_info.list[0];
+ AssertFatal(RC.nrmac[module_id]->UE_info.list[1]==NULL, "can have only a single UE\n");
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl;
NR_ServingCellConfigCommon_t *scc = RC.nrmac[0]->common_channels[0].ServingCellConfigCommon;
/* manually set free CCE to 0 */
@@ -282,14 +281,14 @@ void nr_dlsim_preprocessor(module_id_t module_id,
find_aggregation_candidates(&sched_ctrl->aggregation_level,
&nr_of_candidates,
sched_ctrl->search_space,4);
- sched_ctrl->coreset = get_coreset(module_id, scc, sched_ctrl->active_bwp->bwp_Dedicated, sched_ctrl->search_space, target_ss);
+ sched_ctrl->coreset = get_coreset(RC.nrmac[module_id], scc, sched_ctrl->active_bwp->bwp_Dedicated, sched_ctrl->search_space, target_ss);
sched_ctrl->cce_index = 0;
NR_pdsch_semi_static_t *ps = &sched_ctrl->pdsch_semi_static;
nr_set_pdsch_semi_static(NULL,
scc,
- UE_info->CellGroup[0],
+ UE_info->CellGroup,
sched_ctrl->active_bwp,
NULL,
/* tda = */ 0,
@@ -658,7 +657,7 @@ int main(int argc, char **argv)
default:
case 'h':
- printf("%s -h(elp) -p(extended_prefix) -N cell_id -f output_filename -F input_filename -g channel_model -n n_frames -t Delayspread -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant -i Intefrence0 -j Interference1 -A interpolation_file -C(alibration offset dB) -N CellId\n",
+ printf("%s -h(elp) -p(extended_prefix) -N cell_id -f output_filename -F input_filename -g channel_model -n n_frames -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant -i Intefrence0 -j Interference1 -A interpolation_file -C(alibration offset dB) -N CellId\n",
argv[0]);
printf("-h This message\n");
printf("-L <log level, 0(errors), 1(warning), 2(analysis), 3(info), 4(debug), 5(trace)>\n");
@@ -667,7 +666,7 @@ int main(int argc, char **argv)
printf("-n Number of frames to simulate\n");
printf("-s Starting SNR, runs from SNR0 to SNR0 + 5 dB. If n_frames is 1 then just SNR is simulated\n");
printf("-S Ending SNR, runs from SNR0 to SNR1\n");
- printf("-t Delay spread for multipath channel\n");
+ //printf("-t Delay spread for multipath channel\n");
printf("-g [A,B,C,D,E,F,G,R] Use 3GPP SCM (A,B,C,D) or 36-101 (E-EPA,F-EVA,G-ETU) models or R for MIMO model (ignores delay spread and Ricean factor)\n");
printf("-y Number of TX antennas used in gNB\n");
printf("-z Number of RX antennas used in UE\n");
@@ -837,8 +836,7 @@ int main(int argc, char **argv)
gNB_mac->pre_processor_dl = nr_dlsim_preprocessor;
phy_init_nr_gNB(gNB,0,1);
N_RB_DL = gNB->frame_parms.N_RB_DL;
- NR_UE_info_t *UE_info = &RC.nrmac[0]->UE_info;
- UE_info->num_UEs=1;
+ NR_UE_info_t *UE_info = RC.nrmac[0]->UE_info.list[0];
// stub to configure frame_parms
// nr_phy_config_request_sim(gNB,N_RB_DL,N_RB_DL,mu,Nid_cell,SSB_positions);
@@ -853,10 +851,14 @@ int main(int argc, char **argv)
double fs,bw;
- if (mu == 1 && N_RB_DL == 217) {
+ if (mu == 0 && N_RB_DL == 25) {
+ fs = 7.68e6;
+ bw = 5e6;
+ }
+ else if (mu == 1 && N_RB_DL == 217) {
fs = 122.88e6;
bw = 80e6;
- }
+ }
else if (mu == 1 && N_RB_DL == 245) {
fs = 122.88e6;
bw = 90e6;
@@ -877,6 +879,10 @@ int main(int argc, char **argv)
fs = 61.44e6;
bw = 60e6;
}
+ else if (mu == 1 && N_RB_DL == 24) {
+ fs = 15.36e6;
+ bw = 10e6;
+ }
else if (mu == 3 && N_RB_DL == 66) {
fs = 122.88e6;
bw = 100e6;
@@ -1098,10 +1104,10 @@ int main(int argc, char **argv)
clear_nr_nfapi_information(RC.nrmac[0], 0, frame, slot);
- UE_info->UE_sched_ctrl[0].harq_processes[harq_pid].ndi = !(trial&1);
+ UE_info->UE_sched_ctrl.harq_processes[harq_pid].ndi = !(trial&1);
- UE_info->UE_sched_ctrl[0].harq_processes[harq_pid].round = round;
+ UE_info->UE_sched_ctrl.harq_processes[harq_pid].round = round;
for (int i=0; i<MAX_NUM_CORESET; i++)
gNB_mac->pdcch_cand[i] = 0;
diff --git a/openair1/SIMULATION/NR_PHY/prachsim.c b/openair1/SIMULATION/NR_PHY/prachsim.c
index 325cbb1eccf0915f7b5b98c1bb257f39c6953df6..33717c944dcd5e7eff84e679d9dbc456b10e080e 100644
--- a/openair1/SIMULATION/NR_PHY/prachsim.c
+++ b/openair1/SIMULATION/NR_PHY/prachsim.c
@@ -240,7 +240,7 @@ int main(int argc, char **argv){
int i, l, aa, aarx, **txdata, trial, n_frames = 1, prach_start, rx_prach_start; //, ntrials=1;
int N_RB_UL = 106, delay = 0, NCS_config = 13, rootSequenceIndex = 1, threequarter_fs = 0, mu = 1, fd_occasion = 0, loglvl = OAILOG_INFO, numRA = 0, prachStartSymbol = 0;
uint8_t snr1set = 0, ue_speed1set = 0, transmission_mode = 1, n_tx = 1, n_rx = 1, awgn_flag = 0, msg1_frequencystart = 0, num_prach_fd_occasions = 1, prach_format=0;
- uint8_t frame = 1, slot=19, slot_gNB=19, config_index = 98, prach_sequence_length = 1, restrictedSetConfig = 0, N_dur, N_t_slot, start_symbol;
+ uint8_t config_index = 98, prach_sequence_length = 1, restrictedSetConfig = 0, N_dur, N_t_slot, start_symbol;
uint16_t Nid_cell = 0, preamble_tx = 0, preamble_delay, format, format0, format1;
uint32_t tx_lev = 10000, prach_errors = 0; //,tx_lev_dB;
uint64_t SSB_positions = 0x01;
@@ -536,7 +536,7 @@ int main(int argc, char **argv){
frame_parms->N_RB_UL = N_RB_UL;
frame_parms->threequarter_fs = threequarter_fs;
frame_parms->frame_type = TDD;
- frame_parms->freq_range = (mu==1 ? nr_FR1 : nr_FR2);
+ frame_parms->freq_range = (mu != 3 ? nr_FR1 : nr_FR2);
frame_parms->numerology_index = mu;
nr_phy_config_request_sim(gNB, N_RB_UL, N_RB_UL, mu, Nid_cell, SSB_positions);
@@ -546,9 +546,11 @@ int main(int argc, char **argv){
frame_parms->numerology_index,
frame_parms->N_RB_UL*(180e3)*(1 << frame_parms->numerology_index));
- uint8_t subframe = slot/frame_parms->slots_per_subframe;
+ uint8_t frame = 1;
+ uint8_t subframe = 9;
+ uint8_t slot = 10 * frame_parms->slots_per_subframe - 1;
- if (config_index<67 && mu==1) { prach_sequence_length=0; slot = subframe*2; slot_gNB = 1+(subframe*2); }
+ if (config_index<67 && mu != 3) { prach_sequence_length=0; slot = subframe * frame_parms->slots_per_subframe; }
uint16_t N_ZC = prach_sequence_length == 0 ? 839 : 139;
printf("Config_index %d, prach_sequence_length %d\n",config_index,prach_sequence_length);
@@ -569,9 +571,11 @@ int main(int argc, char **argv){
ru->gNB_list[0] = gNB;
gNB->gNB_config.carrier_config.num_tx_ant.value = 1;
gNB->gNB_config.carrier_config.num_rx_ant.value = 1;
- if (mu==1)
+ if (mu == 0)
+ gNB->gNB_config.tdd_table.tdd_period.value = 7;
+ else if (mu == 1)
gNB->gNB_config.tdd_table.tdd_period.value = 6;
- else if (mu==3)
+ else if (mu == 3)
gNB->gNB_config.tdd_table.tdd_period.value = 3;
else {
printf("unsupported numerology %d\n",mu);
@@ -585,7 +589,7 @@ int main(int argc, char **argv){
int ret = get_nr_prach_info_from_index(config_index,
(int)frame,
- (int)slot_gNB,
+ (int)slot,
absoluteFrequencyPointA,
mu,
frame_parms->frame_type,
@@ -717,12 +721,7 @@ int main(int argc, char **argv){
bw = N_RB_UL*(180e3)*(1 << frame_parms->numerology_index);
AssertFatal(bw<=122.88e6,"Illegal channel bandwidth %f (mu %d,N_RB_UL %d)\n", bw, frame_parms->numerology_index, N_RB_UL);
- if (bw <= 30.72e6)
- fs = 30.72e6;
- else if (bw <= 61.44e6)
- fs = 61.44e6;
- else if (bw <= 122.88e6)
- fs = 122.88e6;
+ fs = frame_parms->samples_per_subframe * 1e3;
LOG_I(PHY,"Running with bandwidth %f Hz, fs %f samp/s, FRAME_LENGTH_COMPLEX_SAMPLES %d\n",bw,fs,FRAME_LENGTH_COMPLEX_SAMPLES);
diff --git a/openair1/SIMULATION/NR_PHY/ulsim.c b/openair1/SIMULATION/NR_PHY/ulsim.c
index 6a0d48904da5d39e9b1ddb5fd302e47965850239..248c4084e0667c1ad1c231236e2c4fa84e0844a0 100644
--- a/openair1/SIMULATION/NR_PHY/ulsim.c
+++ b/openair1/SIMULATION/NR_PHY/ulsim.c
@@ -91,7 +91,6 @@ double cpuf;
uint64_t downlink_frequency[MAX_NUM_CCs][4];
THREAD_STRUCT thread_struct;
nfapi_ue_release_request_body_t release_rntis;
-uint32_t N_RB_DL = 106;
//Fixme: Uniq dirty DU instance, by global var, datamodel need better management
instance_t DUuniqInstance=0;
@@ -306,7 +305,6 @@ int main(int argc, char **argv)
int32_t txlev_sum = 0, atxlev[4];
int start_rb = 0;
int UE_id =0; // [hna] only works for UE_id = 0 because NUMBER_OF_NR_UE_MAX is set to 1 (phy_init_nr_gNB causes segmentation fault)
- float target_error_rate = 0.01;
int print_perf = 0;
cpuf = get_cpu_freq_GHz();
int msg3_flag = 0;
@@ -314,7 +312,7 @@ int main(int argc, char **argv)
float roundStats[100];
double effRate[100];
double effTP[100];
- //float eff_tp_check = 0.7;
+ float eff_tp_check = 0.7;
uint8_t snrRun;
int prb_inter = 0;
@@ -322,8 +320,8 @@ int main(int argc, char **argv)
int modify_dmrs = 0;
/* L_PTRS = ptrs_arg[0], K_PTRS = ptrs_arg[1] */
int ptrs_arg[2] = {-1,-1};// Invalid values
- /* DMRS TYPE = dmrs_arg[0], Add Pos = dmrs_arg[1] */
- int dmrs_arg[2] = {-1,-1};// Invalid values
+ /* mapping type = dmrs_arg[0], Add Pos = dmrs_arg[1], dmrs config type = dmrs_arg[2] */
+ int dmrs_arg[3] = {-1,-1,-1};// Invalid values
uint16_t ptrsSymPos = 0;
uint16_t ptrsSymbPerSlot = 0;
uint16_t ptrsRePerSymb = 0;
@@ -350,7 +348,7 @@ int main(int argc, char **argv)
/* initialize the sin-cos table */
InitSinLUT();
- while ((c = getopt(argc, argv, "a:b:c:d:ef:g:h:i:kl:m:n:p:r:s:u:w:y:z:F:G:H:M:N:PR:S:T:U:L:Z:W:")) != -1) {
+ while ((c = getopt(argc, argv, "a:b:c:d:ef:g:h:ikl:m:n:p:r:s:t:u:w:y:z:F:G:H:M:N:PR:S:T:U:L:Z:W:")) != -1) {
printf("handling optarg %c\n",c);
switch (c) {
@@ -488,11 +486,10 @@ int main(int argc, char **argv)
start_rb = atoi(optarg);
break;
-/*
case 't':
eff_tp_check = (float)atoi(optarg)/100;
break;
-*/
+
/*
case 'r':
ricean_factor = pow(10,-.1*atof(optarg));
@@ -594,7 +591,7 @@ int main(int argc, char **argv)
default:
case 'h':
- printf("%s -h(elp) -p(extended_prefix) -N cell_id -f output_filename -F input_filename -g channel_model -n n_frames -t Delayspread -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant -i Intefrence0 -j Interference1 -A interpolation_file -C(alibration offset dB) -N CellId -Z Enable SC-FDMA in Uplink \n", argv[0]);
+ printf("%s -h(elp) -p(extended_prefix) -N cell_id -f output_filename -F input_filename -g channel_model -n n_frames -s snr0 -S snr1 -x transmission_mode -y TXant -z RXant -i Intefrence0 -j Interference1 -A interpolation_file -C(alibration offset dB) -N CellId -Z Enable SC-FDMA in Uplink \n", argv[0]);
//printf("-d Use TDD\n");
printf("-d Introduce delay in terms of number of samples\n");
printf("-f Number of frames to simulate\n");
@@ -606,7 +603,7 @@ int main(int argc, char **argv)
printf("-m MCS value\n");
printf("-n Number of trials to simulate\n");
printf("-p Use extended prefix mode\n");
- printf("-t Delay spread for multipath channel\n");
+ //printf("-t Delay spread for multipath channel\n");
printf("-u Set the numerology\n");
printf("-w Start PRB for PUSCH\n");
//printf("-x Transmission mode (1,2,6 for the moment)\n");
@@ -649,16 +646,37 @@ int main(int argc, char **argv)
double sampling_frequency;
double bandwidth;
- if (N_RB_UL >= 217) sampling_frequency = 122.88;
- else if (N_RB_UL >= 106) sampling_frequency = 61.44;
- else if (N_RB_UL >= 32) sampling_frequency = 32.72;
- else { printf("Need at least 106 PRBs\b"); exit(-1); }
- if (N_RB_UL == 273) bandwidth = 100;
- else if (N_RB_UL == 217) bandwidth = 80;
- else if (N_RB_UL == 106) bandwidth = 40;
- else if (N_RB_UL == 32) bandwidth = 50;
- else { printf("Add N_RB_UL %d\n",N_RB_UL); exit(-1); }
+ if (mu == 0 && N_RB_UL == 25 ) {
+ sampling_frequency = 7.68;
+ bandwidth = 5;
+ }
+ else if (mu == 1 && N_RB_UL == 273) {
+ sampling_frequency = 122.88;
+ bandwidth = 100;
+ }
+ else if (mu == 1 && N_RB_UL == 217) {
+ sampling_frequency = 122.88;
+ bandwidth = 80;
+ }
+ else if (mu == 1 && N_RB_UL == 106) {
+ sampling_frequency = 61.44;
+ bandwidth = 40;
+ }
+ else if (mu == 1 && N_RB_UL == 24) {
+ sampling_frequency = 15.36;
+ bandwidth = 10;
+ }
+ else if (mu == 3 && N_RB_UL == 32) {
+ sampling_frequency = 61.44;
+ bandwidth = 50;
+ }
+ else {
+ printf("Add N_RB_UL %d\n",N_RB_UL);
+ exit(-1);
+ }
+
LOG_I( PHY,"++++++++++++++++++++++++++++++++++++++++++++++%i+++++++++++++++++++++++++++++++++++++++++",loglvl);
+
if (openair0_cfg[0].threequarter_fs == 1) sampling_frequency*=.75;
UE2gNB = new_channel_desc_scm(n_tx, n_rx, channel_model,
@@ -872,8 +890,12 @@ int main(int argc, char **argv)
/* Additional DMRS positions */
if(dmrs_arg[1] >= 0 && dmrs_arg[1] <=3 )
add_pos = dmrs_arg[1];
+ /* DMRS Conf Type 1 or 2 */
+ if(dmrs_arg[2] == 1)
+ dmrs_config_type = pusch_dmrs_type1;
+ else if(dmrs_arg[2] == 2)
+ dmrs_config_type = pusch_dmrs_type2;
}
- printf("NOTE: DMRS config is modified with Mapping Type %d , Additional Position %d \n", mapping_type, add_pos );
uint8_t length_dmrs = pusch_len1;
uint16_t l_prime_mask = get_l_prime(nb_symb_sch, mapping_type, add_pos, length_dmrs, start_symbol, NR_MIB__dmrs_TypeA_Position_pos2);
@@ -892,6 +914,7 @@ int main(int argc, char **argv)
AssertFatal(index >= 0, "Num RBs not configured according to 3GPP 38.211 section 6.3.1.4. For PUSCH with transform precoding, num RBs cannot be multiple of any other primenumber other than 2,3,5\n");
dmrs_config_type = pusch_dmrs_type1;
+ nb_re_dmrs = 6;
printf("[ULSIM]: TRANSFORM PRECODING ENABLED. Num RBs: %d, index for DMRS_SEQ: %d\n", nb_rb, index);
}
@@ -1560,7 +1583,7 @@ int main(int argc, char **argv)
if(n_trials==1)
break;
- if ((float)n_errors[0][snrRun]/(float)n_trials <= target_error_rate) {
+ if (effRate[snrRun] > (eff_tp_check*TBS)) {
printf("*************\n");
printf("PUSCH test OK\n");
printf("*************\n");
diff --git a/openair2/F1AP/f1ap_du_ue_context_management.c b/openair2/F1AP/f1ap_du_ue_context_management.c
index 7b20bfb2aa54aa81962809ce9c7bdd6a21d0a72d..e19f077592aa33d8cd763a3a37f5c15a57b2d060 100644
--- a/openair2/F1AP/f1ap_du_ue_context_management.c
+++ b/openair2/F1AP/f1ap_du_ue_context_management.c
@@ -683,15 +683,15 @@ int DU_handle_UE_CONTEXT_RELEASE_COMMAND(instance_t instance,
"RNTI obtained through DU ID (%x) is different from CU ID (%x)\n",
rnti, ctxt.rnti);
int UE_out_of_sync = 0;
-
if (RC.nrrrc && RC.nrrrc[instance]->node_type == ngran_gNB_DU) {
- for (int n = 0; n < MAX_MOBILES_PER_GNB; ++n) {
- if (RC.nrmac[instance]->UE_info.active[n] == TRUE
- && rnti == RC.nrmac[instance]->UE_info.rnti[n]) {
+ UE_iterator(RC.nrmac[instance]->UE_info.list, UE) {
+ if (UE->rnti == rnti) {
UE_out_of_sync = 0;
break;
}
}
+ if (!UE)
+ LOG_E(F1AP,"Not found rnti: %x\n", rnti);
} else {
for (int n = 0; n < MAX_MOBILES_PER_ENB; ++n) {
if (RC.mac[instance]->UE_info.active[n] == TRUE
@@ -701,7 +701,6 @@ int DU_handle_UE_CONTEXT_RELEASE_COMMAND(instance_t instance,
}
}
}
-
/* We don't need the Cause */
/* Optional RRC Container: if present, send to UE */
F1AP_FIND_PROTOCOLIE_BY_ID(F1AP_UEContextReleaseCommandIEs_t, ie, container,
diff --git a/openair2/GNB_APP/gnb_config.c b/openair2/GNB_APP/gnb_config.c
index 24950259cb41a9118f58bed95447d9f0fc07ce73..40bd0fb90eed2a0b045db75b773ded9642c60e5e 100644
--- a/openair2/GNB_APP/gnb_config.c
+++ b/openair2/GNB_APP/gnb_config.c
@@ -213,15 +213,20 @@ void fill_scc_sim(NR_ServingCellConfigCommon_t *scc,uint64_t *ssb_bitmap,int N_R
// *scc->n_TimingAdvanceOffset=NR_ServingCellConfigCommon__n_TimingAdvanceOffset_n0;
*scc->ssb_periodicityServingCell=NR_ServingCellConfigCommon__ssb_periodicityServingCell_ms20;
scc->dmrs_TypeA_Position=NR_ServingCellConfigCommon__dmrs_TypeA_Position_pos2;
- *scc->ssbSubcarrierSpacing=NR_SubcarrierSpacing_kHz30;
- *scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB=641032;
- *scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0]=78;
- scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA=640000;
+ *scc->ssbSubcarrierSpacing=mu_dl;
+ if (mu_dl == 0) {
+ *scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB=520432;
+ *scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0]=38;
+ scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA=520000;
+ } else {
+ *scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencySSB=641032;
+ *scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0]=78;
+ scc->downlinkConfigCommon->frequencyInfoDL->absoluteFrequencyPointA=640000;
+ }
scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->offsetToCarrier=0;
- scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->subcarrierSpacing=NR_SubcarrierSpacing_kHz30;
-
+ scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->subcarrierSpacing=mu_dl;
scc->downlinkConfigCommon->frequencyInfoDL->scs_SpecificCarrierList.list.array[0]->carrierBandwidth=N_RB_DL;
- scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth=13036;
+ scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.locationAndBandwidth=275*(N_RB_DL-1);
scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters.subcarrierSpacing=mu_dl;//NR_SubcarrierSpacing_kHz30;
*scc->downlinkConfigCommon->initialDownlinkBWP->pdcch_ConfigCommon->choice.setup->controlResourceSetZero=12;
*scc->downlinkConfigCommon->initialDownlinkBWP->pdcch_ConfigCommon->choice.setup->searchSpaceZero=0;
@@ -235,13 +240,13 @@ void fill_scc_sim(NR_ServingCellConfigCommon_t *scc,uint64_t *ssb_bitmap,int N_R
timedomainresourceallocation1->startSymbolAndLength=57;
ASN_SEQUENCE_ADD(&scc->downlinkConfigCommon->initialDownlinkBWP->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList->list,
timedomainresourceallocation1);
- *scc->uplinkConfigCommon->frequencyInfoUL->frequencyBandList->list.array[0]=78;
+ *scc->uplinkConfigCommon->frequencyInfoUL->frequencyBandList->list.array[0]=mu_ul?78:38;
*scc->uplinkConfigCommon->frequencyInfoUL->absoluteFrequencyPointA=-1;
scc->uplinkConfigCommon->frequencyInfoUL->scs_SpecificCarrierList.list.array[0]->offsetToCarrier=0;
- scc->uplinkConfigCommon->frequencyInfoUL->scs_SpecificCarrierList.list.array[0]->subcarrierSpacing=NR_SubcarrierSpacing_kHz30;
+ scc->uplinkConfigCommon->frequencyInfoUL->scs_SpecificCarrierList.list.array[0]->subcarrierSpacing=mu_ul;
scc->uplinkConfigCommon->frequencyInfoUL->scs_SpecificCarrierList.list.array[0]->carrierBandwidth=N_RB_UL;
*scc->uplinkConfigCommon->frequencyInfoUL->p_Max=20;
- scc->uplinkConfigCommon->initialUplinkBWP->genericParameters.locationAndBandwidth=13036;
+ scc->uplinkConfigCommon->initialUplinkBWP->genericParameters.locationAndBandwidth=275*(N_RB_UL-1);
scc->uplinkConfigCommon->initialUplinkBWP->genericParameters.subcarrierSpacing=mu_ul;//NR_SubcarrierSpacing_kHz30;
scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->rach_ConfigGeneric.prach_ConfigurationIndex=98;
scc->uplinkConfigCommon->initialUplinkBWP->rach_ConfigCommon->choice.setup->rach_ConfigGeneric.msg1_FDM=NR_RACH_ConfigGeneric__msg1_FDM_one;
@@ -277,8 +282,11 @@ void fill_scc_sim(NR_ServingCellConfigCommon_t *scc,uint64_t *ssb_bitmap,int N_R
*scc->uplinkConfigCommon->initialUplinkBWP->pucch_ConfigCommon->choice.setup->p0_nominal=-90;
scc->ssb_PositionsInBurst->present=NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_mediumBitmap;
*ssb_bitmap=0xff;
- scc->tdd_UL_DL_ConfigurationCommon->referenceSubcarrierSpacing=NR_SubcarrierSpacing_kHz30;
- scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity=NR_TDD_UL_DL_Pattern__dl_UL_TransmissionPeriodicity_ms5;
+ scc->tdd_UL_DL_ConfigurationCommon->referenceSubcarrierSpacing=mu_dl;
+ if (mu_dl == 0)
+ scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity=NR_TDD_UL_DL_Pattern__dl_UL_TransmissionPeriodicity_ms10;
+ else
+ scc->tdd_UL_DL_ConfigurationCommon->pattern1.dl_UL_TransmissionPeriodicity=NR_TDD_UL_DL_Pattern__dl_UL_TransmissionPeriodicity_ms5;
scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSlots=7;
scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofDownlinkSymbols=6;
scc->tdd_UL_DL_ConfigurationCommon->pattern1.nrofUplinkSlots=2;
diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
index e5cabb452155f7ac44bb9ad986d012d0b52eae3b..3fd1802432a75b72901c4ef2d71f069ed281f25c 100644
--- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
@@ -1686,7 +1686,7 @@ int get_nr_prach_info_from_index(uint8_t index,
}
if ( (s_map>>subframe)&0x01 ) {
*N_RA_slot = table_6_3_3_2_3_prachConfig_Index[index][6]; // Number of RACH slots within a subframe
- if (mu == 1) {
+ if (mu == 1 && index >= 67) {
if ( (*N_RA_slot <= 1) && (slot%2 == 0) )
return 0; // no prach in even slots @ 30kHz for 1 prach per subframe
}
diff --git a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
index 77e3d60373c60c7ac3fae5f407a7bc6aef769daf..2dec0664f344a34756369c149b1821549151f614 100644
--- a/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
@@ -1095,7 +1095,7 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
fill_scheduled_response(&scheduled_response, &dcireq.dl_config_req, NULL, NULL, mod_id, cc_id, rx_frame, rx_slot, dl_info->thread_id, dl_info->phy_data);
if(mac->if_module != NULL && mac->if_module->scheduled_response != NULL)
LOG_D(NR_MAC,"1# scheduled_response transmitted, %d, %d\n", rx_frame, rx_slot);
- mac->if_module->scheduled_response(&scheduled_response);
+ mac->if_module->scheduled_response(&scheduled_response);
}
else {
// this is for Msg2/Msg4
diff --git a/openair2/LAYER2/NR_MAC_gNB/config.c b/openair2/LAYER2/NR_MAC_gNB/config.c
index b524f6ab4e9ae8e64016314753e0343c5f45e42b..0e55b519abb7c24720c50837f24b538ca4ff4956 100644
--- a/openair2/LAYER2/NR_MAC_gNB/config.c
+++ b/openair2/LAYER2/NR_MAC_gNB/config.c
@@ -455,18 +455,17 @@ int nr_mac_enable_ue_rrc_processing_timer(module_id_t Mod_idP, rnti_t rnti, NR_S
if (rrc_reconfiguration_delay == 0) {
return -1;
}
- const int UE_id = find_nr_UE_id(Mod_idP,rnti);
- if (UE_id < 0) {
+
+ NR_UE_info_t *UE_info = find_nr_UE(&RC.nrmac[Mod_idP]->UE_info,rnti);
+ if (!UE_info) {
LOG_W(NR_MAC, "Could not find UE for RNTI 0x%04x\n", rnti);
return -1;
}
-
- NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl;
const uint16_t sf_ahead = 6/(0x01<<subcarrierSpacing) + ((6%(0x01<<subcarrierSpacing))>0);
const uint16_t sl_ahead = sf_ahead * (0x01<<subcarrierSpacing);
sched_ctrl->rrc_processing_timer = (rrc_reconfiguration_delay<<subcarrierSpacing) + sl_ahead;
- LOG_I(NR_MAC, "Activating RRC processing timer for UE %d with %d ms\n", UE_id, rrc_reconfiguration_delay);
+ LOG_I(NR_MAC, "Activating RRC processing timer for UE %04x with %d ms\n", UE_info->rnti, rrc_reconfiguration_delay);
return 0;
}
@@ -593,11 +592,15 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
if(CellGroup->spCellConfig && CellGroup->spCellConfig->spCellConfigDedicated)
servingCellConfig = CellGroup->spCellConfig->spCellConfigDedicated;
- NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
if (add_ue == 1 && get_softmodem_params()->phy_test) {
- const int UE_id = add_new_nr_ue(Mod_idP, rnti, CellGroup);
- LOG_I(NR_MAC,"Added new UE_id %d/%x with initial CellGroup\n",UE_id,rnti);
- process_CellGroup(CellGroup,&UE_info->UE_sched_ctrl[UE_id]);
+ NR_UE_info_t* UE = add_new_nr_ue(RC.nrmac[Mod_idP], rnti, CellGroup);
+ if (UE)
+ LOG_I(NR_MAC,"Added new UE %x with initial CellGroup\n", rnti);
+ else {
+ LOG_E(NR_MAC,"Error adding UE %04x\n", rnti);
+ return -1;
+ }
+ process_CellGroup(CellGroup,&UE->UE_sched_ctrl);
} else if (add_ue == 1 && !get_softmodem_params()->phy_test) {
const int CC_id = 0;
NR_COMMON_channels_t *cc = &RC.nrmac[Mod_idP]->common_channels[CC_id];
@@ -644,12 +647,18 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
LOG_I(NR_MAC,"Added new RA process for UE RNTI %04x with initial CellGroup\n", rnti);
} else { // CellGroup has been updated
NR_ServingCellConfigCommon_t *scc = RC.nrmac[Mod_idP]->common_channels[0].ServingCellConfigCommon;
- const int UE_id = find_nr_UE_id(Mod_idP,rnti);
+ NR_UE_info_t * UE = find_nr_UE(&RC.nrmac[Mod_idP]->UE_info,rnti);
+ if (!UE) {
+ LOG_E(NR_MAC, "Can't find UE %04x\n", rnti);
+ return -1;
+ }
int target_ss;
- UE_info->CellGroup[UE_id] = CellGroup;
- LOG_I(NR_MAC,"Modified UE_id %d/%x with CellGroup\n",UE_id,rnti);
- process_CellGroup(CellGroup,&UE_info->UE_sched_ctrl[UE_id]);
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+
+ UE->CellGroup = CellGroup;
+ LOG_I(NR_MAC,"Modified rnti %04x with CellGroup\n",rnti);
+ process_CellGroup(CellGroup,&UE->UE_sched_ctrl);
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
+
const NR_PDSCH_ServingCellConfig_t *pdsch = servingCellConfig ? servingCellConfig->pdsch_ServingCellConfig->choice.setup : NULL;
if (get_softmodem_params()->sa) {
// add all available DL HARQ processes for this UE in SA
@@ -672,7 +681,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
genericParameters = &scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters;
}
sched_ctrl->search_space = get_searchspace(sib1 ? sib1->message.choice.c1->choice.systemInformationBlockType1 : NULL, scc, bwpd, target_ss);
- sched_ctrl->coreset = get_coreset(Mod_idP, scc, bwpd, sched_ctrl->search_space, target_ss);
+ sched_ctrl->coreset = get_coreset(RC.nrmac[Mod_idP], scc, bwpd, sched_ctrl->search_space, target_ss);
sched_ctrl->sched_pdcch = set_pdcch_structure(RC.nrmac[Mod_idP],
sched_ctrl->search_space,
sched_ctrl->coreset,
@@ -685,7 +694,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig &&
CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup
)
- compute_csi_bitlen (CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup, UE_info, UE_id, Mod_idP);
+ compute_csi_bitlen (CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup, UE);
}
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG, VCD_FUNCTION_OUT);
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
index 929373923571ad64022c5a6e313398ce2a2d6eba..d7e2c78c3513472468e05fe22691722e964603a4 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
@@ -104,167 +104,6 @@ void clear_nr_nfapi_information(gNB_MAC_INST * gNB,
TX_req[CC_idP].Number_of_PDUs = 0;
}
-/*
-void check_nr_ul_failure(module_id_t module_idP,
- int CC_id,
- int UE_id,
- frame_t frameP,
- sub_frame_t slotP) {
-
- NR_UE_info_t *UE_info = &RC.nrmac[module_idP]->UE_info;
- nfapi_nr_dl_dci_request_t *DL_req = &RC.nrmac[module_idP]->DL_req[0];
- uint16_t rnti = UE_RNTI(module_idP, UE_id);
- NR_COMMON_channels_t *cc = RC.nrmac[module_idP]->common_channels;
-
- // check uplink failure
- if ((UE_info->UE_sched_ctrl[UE_id].ul_failure_timer > 0) &&
- (UE_info->UE_sched_ctrl[UE_id].ul_out_of_sync == 0)) {
- LOG_I(MAC, "UE %d rnti %x: UL Failure timer %d \n", UE_id, rnti,
- UE_info->UE_sched_ctrl[UE_id].ul_failure_timer);
- if (UE_info->UE_sched_ctrl[UE_id].ra_pdcch_order_sent == 0) {
- UE_info->UE_sched_ctrl[UE_id].ra_pdcch_order_sent = 1;
-
- // add a format 1A dci for this UE to request an RA procedure (only one UE per subframe)
- nfapi_nr_dl_dci_request_pdu_t *dl_config_pdu = &DL_req[CC_id].dl_tti_request_body.dl_config_pdu_list[DL_req[CC_id].dl_tti_request_body.number_pdu];
- memset((void *) dl_config_pdu, 0,sizeof(nfapi_dl_dci_request_pdu_t));
- dl_config_pdu->pdu_type = NFAPI_DL_CONFIG_DCI_DL_PDU_TYPE;
- dl_config_pdu->pdu_size = (uint8_t) (2 + sizeof(nfapi_dl_config_dci_dl_pdu));
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.tl.tag = NFAPI_DL_DCI_REQUEST_DCI_DL_PDU_REL8_TAG;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.dci_format = NFAPI_DL_DCI_FORMAT_1A;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.aggregation_level = get_aggregation(get_bw_index(module_idP, CC_id),
- UE_info->UE_sched_ctrl[UE_id].
- dl_cqi[CC_id], format1A);
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti = rnti;
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.rnti_type = 1; // CRNTI : see Table 4-10 from SCF082 - nFAPI specifications
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.transmission_power = 6000; // equal to RS power
-
- AssertFatal((cc[CC_id].mib->message.dl_Bandwidth >= 0) && (cc[CC_id].mib->message.dl_Bandwidth < 6),
- "illegal dl_Bandwidth %d\n",
- (int) cc[CC_id].mib->message.dl_Bandwidth);
- dl_config_pdu->dci_dl_pdu.dci_dl_pdu_rel8.resource_block_coding = nr_pdcch_order_table[cc[CC_id].mib->message.dl_Bandwidth];
- DL_req[CC_id].dl_tti_request_body.number_dci++;
- DL_req[CC_id].dl_tti_request_body.number_pdu++;
- DL_req[CC_id].dl_tti_request_body.tl.tag = NFAPI_DL_TTI_REQUEST_BODY_TAG;
- LOG_I(MAC,
- "UE %d rnti %x: sending PDCCH order for RAPROC (failure timer %d), resource_block_coding %d \n",
- UE_id, rnti,
- UE_info->UE_sched_ctrl[UE_id].ul_failure_timer,
- dl_config_pdu->dci_dl_pdu.
- dci_dl_pdu_rel8.resource_block_coding);
- } else { // ra_pdcch_sent==1
- LOG_I(MAC,
- "UE %d rnti %x: sent PDCCH order for RAPROC waiting (failure timer %d) \n",
- UE_id, rnti,
- UE_info->UE_sched_ctrl[UE_id].ul_failure_timer);
- if ((UE_info->UE_sched_ctrl[UE_id].ul_failure_timer % 40) == 0) UE_info->UE_sched_ctrl[UE_id].ra_pdcch_order_sent = 0; // resend every 4 frames
- }
-
- UE_info->UE_sched_ctrl[UE_id].ul_failure_timer++;
- // check threshold
- if (UE_info->UE_sched_ctrl[UE_id].ul_failure_timer > 20000) {
- // inform RRC of failure and clear timer
- LOG_I(MAC,
- "UE %d rnti %x: UL Failure after repeated PDCCH orders: Triggering RRC \n",
- UE_id, rnti);
- mac_eNB_rrc_ul_failure(module_idP, CC_id, frameP, subframeP,rnti);
- UE_info->UE_sched_ctrl[UE_id].ul_failure_timer = 0;
- UE_info->UE_sched_ctrl[UE_id].ul_out_of_sync = 1;
-
- //Inform the controller about the UE deactivation. Should be moved to RRC agent in the future
- if (rrc_agent_registered[module_idP]) {
- LOG_W(MAC, "notify flexran Agent of UE state change\n");
- agent_rrc_xface[module_idP]->flexran_agent_notify_ue_state_change(module_idP,
- rnti, PROTOCOL__FLEX_UE_STATE_CHANGE_TYPE__FLUESC_DEACTIVATED);
- }
- }
- } // ul_failure_timer>0
-
-}
-*/
-/*
-void schedule_nr_SRS(module_id_t module_idP, frame_t frameP, sub_frame_t subframeP)
-{
- gNB_MAC_INST *gNB = RC.nrmac[module_idP];
- NR_UE_info_t *UE_info = &gNB->UE_info;
- nfapi_ul_config_request_body_t *ul_req;
- int CC_id, UE_id;
- NR_COMMON_channels_t *cc = RC.nrmac[module_idP]->common_channels;
- SoundingRS_UL_ConfigCommon_t *soundingRS_UL_ConfigCommon;
- struct SoundingRS_UL_ConfigDedicated *soundingRS_UL_ConfigDedicated;
- uint8_t TSFC;
- uint16_t deltaTSFC; // bitmap
- uint8_t srs_SubframeConfig;
-
- // table for TSFC (Period) and deltaSFC (offset)
- const uint16_t deltaTSFCTabType1[15][2] = { {1, 1}, {1, 2}, {2, 2}, {1, 5}, {2, 5}, {4, 5}, {8, 5}, {3, 5}, {12, 5}, {1, 10}, {2, 10}, {4, 10}, {8, 10}, {351, 10}, {383, 10} }; // Table 5.5.3.3-2 3GPP 36.211 FDD
- const uint16_t deltaTSFCTabType2[14][2] = { {2, 5}, {6, 5}, {10, 5}, {18, 5}, {14, 5}, {22, 5}, {26, 5}, {30, 5}, {70, 10}, {74, 10}, {194, 10}, {326, 10}, {586, 10}, {210, 10} }; // Table 5.5.3.3-2 3GPP 36.211 TDD
-
- uint16_t srsPeriodicity, srsOffset;
-
- for (CC_id = 0; CC_id < MAX_NUM_CCs; CC_id++) {
- soundingRS_UL_ConfigCommon = &cc[CC_id].radioResourceConfigCommon->soundingRS_UL_ConfigCommon;
- // check if SRS is enabled in this frame/subframe
- if (soundingRS_UL_ConfigCommon) {
- srs_SubframeConfig = soundingRS_UL_ConfigCommon->choice.setup.srs_SubframeConfig;
- if (cc[CC_id].tdd_Config == NULL) { // FDD
- deltaTSFC = deltaTSFCTabType1[srs_SubframeConfig][0];
- TSFC = deltaTSFCTabType1[srs_SubframeConfig][1];
- } else { // TDD
- deltaTSFC = deltaTSFCTabType2[srs_SubframeConfig][0];
- TSFC = deltaTSFCTabType2[srs_SubframeConfig][1];
- }
- // Sounding reference signal subframes are the subframes satisfying ns/2 mod TSFC (- deltaTSFC
- uint16_t tmp = (subframeP % TSFC);
-
- if ((1 << tmp) & deltaTSFC) {
- // This is an SRS subframe, loop over UEs
- for (UE_id = 0; UE_id < MAX_MOBILES_PER_GNB; UE_id++) {
- if (!RC.nrmac[module_idP]->UE_info.active[UE_id]) continue;
- ul_req = &RC.nrmac[module_idP]->UL_req[CC_id].ul_config_request_body;
- // drop the allocation if the UE hasn't send RRCConnectionSetupComplete yet
- if (mac_eNB_get_rrc_status(module_idP,UE_RNTI(module_idP, UE_id)) < RRC_CONNECTED) continue;
-
- AssertFatal(UE_info->UE_template[CC_id][UE_id].physicalConfigDedicated != NULL,
- "physicalConfigDedicated is null for UE %d\n",
- UE_id);
-
- if ((soundingRS_UL_ConfigDedicated = UE_info->UE_template[CC_id][UE_id].physicalConfigDedicated->soundingRS_UL_ConfigDedicated) != NULL) {
- if (soundingRS_UL_ConfigDedicated->present == SoundingRS_UL_ConfigDedicated_PR_setup) {
- get_srs_pos(&cc[CC_id],
- soundingRS_UL_ConfigDedicated->choice.
- setup.srs_ConfigIndex,
- &srsPeriodicity, &srsOffset);
- if (((10 * frameP + subframeP) % srsPeriodicity) == srsOffset) {
- // Program SRS
- ul_req->srs_present = 1;
- nfapi_ul_config_request_pdu_t * ul_config_pdu = &ul_req->ul_config_pdu_list[ul_req->number_of_pdus];
- memset((void *) ul_config_pdu, 0, sizeof(nfapi_ul_config_request_pdu_t));
- ul_config_pdu->pdu_type = NFAPI_UL_CONFIG_SRS_PDU_TYPE;
- ul_config_pdu->pdu_size = 2 + (uint8_t) (2 + sizeof(nfapi_ul_config_srs_pdu));
- ul_config_pdu->srs_pdu.srs_pdu_rel8.tl.tag = NFAPI_UL_CONFIG_REQUEST_SRS_PDU_REL8_TAG;
- ul_config_pdu->srs_pdu.srs_pdu_rel8.size = (uint8_t)sizeof(nfapi_ul_config_srs_pdu);
- ul_config_pdu->srs_pdu.srs_pdu_rel8.rnti = UE_info->UE_template[CC_id][UE_id].rnti;
- ul_config_pdu->srs_pdu.srs_pdu_rel8.srs_bandwidth = soundingRS_UL_ConfigDedicated->choice.setup.srs_Bandwidth;
- ul_config_pdu->srs_pdu.srs_pdu_rel8.frequency_domain_position = soundingRS_UL_ConfigDedicated->choice.setup.freqDomainPosition;
- ul_config_pdu->srs_pdu.srs_pdu_rel8.srs_hopping_bandwidth = soundingRS_UL_ConfigDedicated->choice.setup.srs_HoppingBandwidth;;
- ul_config_pdu->srs_pdu.srs_pdu_rel8.transmission_comb = soundingRS_UL_ConfigDedicated->choice.setup.transmissionComb;
- ul_config_pdu->srs_pdu.srs_pdu_rel8.i_srs = soundingRS_UL_ConfigDedicated->choice.setup.srs_ConfigIndex;
- ul_config_pdu->srs_pdu.srs_pdu_rel8.sounding_reference_cyclic_shift = soundingRS_UL_ConfigDedicated->choice.setup.cyclicShift; // ul_config_pdu->srs_pdu.srs_pdu_rel10.antenna_port = ;//
- // ul_config_pdu->srs_pdu.srs_pdu_rel13.number_of_combs = ;//
- RC.nrmac[module_idP]->UL_req[CC_id].sfn_sf = (frameP << 4) + subframeP;
- RC.nrmac[module_idP]->UL_req[CC_id].header.message_id = NFAPI_UL_CONFIG_REQUEST;
- ul_req->number_of_pdus++;
- } // if (((10*frameP+subframeP) % srsPeriodicity) == srsOffset)
- } // if (soundingRS_UL_ConfigDedicated->present == SoundingRS_UL_ConfigDedicated_PR_setup)
- } // if ((soundingRS_UL_ConfigDedicated = UE_info->UE_template[CC_id][UE_id].physicalConfigDedicated->soundingRS_UL_ConfigDedicated)!=NULL)
- } // for (UE_id ...
- } // if((1<<tmp) & deltaTSFC)
-
- } // SRS config
- }
-}
-*/
-
bool is_xlsch_in_slot(uint64_t bitmap, sub_frame_t slot) {
if (slot>=64) return false; //quickfix for FR2 where there are more than 64 slots (bitmap to be removed)
@@ -372,7 +211,6 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
schedule_nr_prach(module_idP, f, s);
}
-
// Schedule CSI-RS transmission
nr_csirs_scheduling(module_idP, frame, slot, nr_slots_per_frame[*scc->ssbSubcarrierSpacing]);
@@ -398,10 +236,10 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
nr_schedule_ue_spec(module_idP, frame, slot);
stop_meas(&gNB->schedule_dlsch);
- nr_schedule_pucch(module_idP, frame, slot);
+ nr_schedule_pucch(RC.nrmac[module_idP], frame, slot);
// This schedule SR after PUCCH for multiplexing
- nr_sr_reporting(module_idP, frame, slot);
+ nr_sr_reporting(RC.nrmac[module_idP], frame, slot);
stop_meas(&RC.nrmac[module_idP]->eNB_scheduler);
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
index 19db162d96a499dac4da86240d388052a6e6608e..302685bfaf7a9e9ebf2b8ff1fec73bfd46ede8fe 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
@@ -539,8 +539,10 @@ void nr_initiate_ra_proc(module_id_t module_idP,
for (int i = 0; i < NR_NB_RA_PROC_MAX; i++) {
NR_RA_t *ra = &cc->ra[i];
pr_found = 0;
- const int UE_id = find_nr_UE_id(module_idP, ra->rnti);
- if (UE_id != -1) {
+ const NR_UE_info_t * UE = find_nr_UE(&nr_mac->UE_info, ra->rnti);
+ if (UE) {
+ // the UE is already registered
+ LOG_W(NR_MAC, "Received RA for existing RNTI %04x\n", ra->rnti);
continue;
}
if (ra->state == RA_IDLE) {
@@ -634,7 +636,7 @@ void nr_initiate_ra_proc(module_id_t module_idP,
AssertFatal(ra->ra_ss!=NULL,"SearchSpace cannot be null for RA\n");
- ra->coreset = get_coreset(module_idP, scc, bwp, ra->ra_ss, NR_SearchSpace__searchSpaceType_PR_common);
+ ra->coreset = get_coreset(nr_mac, scc, bwp, ra->ra_ss, NR_SearchSpace__searchSpaceType_PR_common);
ra->sched_pdcch = set_pdcch_structure(nr_mac,
ra->ra_ss,
ra->coreset,
@@ -669,7 +671,7 @@ void nr_initiate_ra_proc(module_id_t module_idP,
ra->rnti = (taus() % 65518) + 1;
loop++;
} while (loop != 100
- && !((find_nr_UE_id(module_idP, ra->rnti) == -1) && (find_nr_RA_id(module_idP, CC_id, ra->rnti) == -1)
+ && !((find_nr_UE(&nr_mac->UE_info, ra->rnti) == NULL) && (find_nr_RA_id(module_idP, CC_id, ra->rnti) == -1)
&& ra->rnti >= 1 && ra->rnti <= 65519));
if (loop == 100) {
LOG_E(NR_MAC, "%s:%d:%s: [RAPROC] initialisation random access aborted\n", __FILE__, __LINE__, __FUNCTION__);
@@ -682,7 +684,7 @@ void nr_initiate_ra_proc(module_id_t module_idP,
ra->beam_id = beam_index;
LOG_I(NR_MAC,
- "[gNB %d][RAPROC] CC_id %d Frame %d Activating Msg2 generation in frame %d, slot %d using RA rnti %x SSB "
+ "[gNB %d][RAPROC] CC_id %d Frame %d Activating Msg2 generation in frame %d, slot %d using RA rnti %x SSB, new rnti %04x "
"index %u RA index %d\n",
module_idP,
CC_id,
@@ -690,6 +692,7 @@ void nr_initiate_ra_proc(module_id_t module_idP,
ra->Msg2_frame,
ra->Msg2_slot,
ra->RA_rnti,
+ ra->rnti,
cc->ssb_index[beam_index],
i);
@@ -1517,7 +1520,7 @@ void nr_generate_Msg2(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
}
ra->state = WAIT_Msg3;
- LOG_D(NR_MAC,"[gNB %d][RAPROC] Frame %d, Subframe %d: RA state %d\n", module_idP, frameP, slotP, ra->state);
+ LOG_W(NR_MAC,"[gNB %d][RAPROC] Frame %d, Subframe %d: rnti %04x RA state %d\n", module_idP, frameP, slotP, ra->rnti, ra->state);
}
}
@@ -1560,9 +1563,14 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
ra->rnti = ra->crnti;
}
- int UE_id = find_nr_UE_id(module_idP, ra->rnti);
- NR_UE_info_t *UE_info = &nr_mac->UE_info;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_info_t * UE = find_nr_UE(&nr_mac->UE_info, ra->rnti);
+ if (!UE) {
+ LOG_E(NR_MAC,"want to generate Msg4, but rnti %04x not in the table\n", ra->rnti);
+ return;
+ }
+
+ LOG_I(NR_MAC,"Generate msg4, rnti: %04x\n", ra->rnti);
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
NR_BWP_t *genericParameters = bwp ? & bwp->bwp_Common->genericParameters : &scc->downlinkConfigCommon->initialDownlinkBWP->genericParameters;
@@ -1595,7 +1603,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
// Remove UE associated to TC-RNTI
if(harq->round==0 && ra->msg3_dcch_dtch) {
- mac_remove_nr_ue(module_idP, tc_rnti);
+ mac_remove_nr_ue(nr_mac, tc_rnti);
}
// get CCEindex, needed also for PUCCH and then later for PDCCH
@@ -1626,7 +1634,7 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
LOG_D(NR_MAC,"[RAPROC] Msg4 r_pucch %d (CCEIndex %d, nb_of_candidates %d, delta_PRI %d)\n", r_pucch, CCEIndex, nr_of_candidates, delta_PRI);
- int alloc = nr_acknack_scheduling(module_idP, UE_id, frameP, slotP, r_pucch, 1);
+ int alloc = nr_acknack_scheduling(module_idP, UE, frameP, slotP, r_pucch, 1);
AssertFatal(alloc>=0,"Couldn't find a pucch allocation for ack nack (msg4)\n");
NR_sched_pucch_t *pucch = &sched_ctrl->sched_pucch[alloc];
harq->feedback_slot = pucch->ul_slot;
@@ -1942,10 +1950,9 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
if(ra->msg3_dcch_dtch) {
// If the UE used MSG3 to transfer a DCCH or DTCH message, then contention resolution is successful upon transmission of PDCCH
- LOG_I(NR_MAC, "(ue %i, rnti 0x%04x) CBRA procedure succeeded!\n", UE_id, ra->rnti);
+ LOG_I(NR_MAC, "(ue rnti 0x%04x) CBRA procedure succeeded!\n", ra->rnti);
nr_clear_ra_proc(module_idP, CC_id, frameP, ra);
- UE_info->active[UE_id] = true;
- UE_info->Msg4_ACKed[UE_id] = true;
+ UE->Msg4_ACKed = true;
remove_front_nr_list(&sched_ctrl->feedback_dl_harq);
harq->feedback_slot = -1;
@@ -1962,28 +1969,27 @@ void nr_generate_Msg4(module_id_t module_idP, int CC_id, frame_t frameP, sub_fra
void nr_check_Msg4_Ack(module_id_t module_id, int CC_id, frame_t frame, sub_frame_t slot, NR_RA_t *ra) {
- int UE_id = find_nr_UE_id(module_id, ra->rnti);
+ NR_UE_info_t * UE = find_nr_UE(&RC.nrmac[module_id]->UE_info, ra->rnti);
const int current_harq_pid = ra->harq_pid;
- NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
NR_UE_harq_t *harq = &sched_ctrl->harq_processes[current_harq_pid];
- NR_mac_stats_t *stats = &UE_info->mac_stats[UE_id];
+ NR_mac_stats_t *stats = &UE->mac_stats;
- LOG_D(NR_MAC, "ue %d, rnti 0x%04x, harq is waiting %d, round %d, frame %d %d, harq id %d\n", UE_id, ra->rnti, harq->is_waiting, harq->round, frame, slot, current_harq_pid);
+ LOG_D(NR_MAC, "ue rnti 0x%04x, harq is waiting %d, round %d, frame %d %d, harq id %d\n", ra->rnti, harq->is_waiting, harq->round, frame, slot, current_harq_pid);
if (harq->is_waiting == 0) {
if (harq->round == 0) {
+
if (stats->dl.errors == 0) {
- LOG_A(NR_MAC, "(ue %i, rnti 0x%04x) Received Ack of RA-Msg4. CBRA procedure succeeded!\n", UE_id, ra->rnti);
- UE_info->active[UE_id] = true;
- UE_info->Msg4_ACKed[UE_id] = true;
+ LOG_A(NR_MAC, "(UE RNTI 0x%04x) Received Ack of RA-Msg4. CBRA procedure succeeded!\n", ra->rnti);
+ UE->Msg4_ACKed = true;
// Pause scheduling according to:
// 3GPP TS 38.331 Section 12 Table 12.1-1: UE performance requirements for RRC procedures for UEs
const NR_COMMON_channels_t *common_channels = &RC.nrmac[module_id]->common_channels[0];
const NR_SIB1_t *sib1 = common_channels->sib1 ? common_channels->sib1->message.choice.c1->choice.systemInformationBlockType1 : NULL;
- const NR_ServingCellConfig_t *servingCellConfig = UE_info->CellGroup[UE_id] ? UE_info->CellGroup[UE_id]->spCellConfig->spCellConfigDedicated : NULL;
+ const NR_ServingCellConfig_t *servingCellConfig = UE->CellGroup ? UE->CellGroup->spCellConfig->spCellConfigDedicated : NULL;
NR_BWP_t *genericParameters = get_dl_bwp_genericParameters(sched_ctrl->active_bwp,
common_channels->ServingCellConfigCommon,
sib1);
@@ -1991,9 +1997,9 @@ void nr_check_Msg4_Ack(module_id_t module_id, int CC_id, frame_t frame, sub_fram
NR_RRC_SETUP_DELAY_MS + NR_RRC_BWP_SWITCHING_DELAY_MS : NR_RRC_SETUP_DELAY_MS;
sched_ctrl->rrc_processing_timer = (delay_ms << genericParameters->subcarrierSpacing);
- LOG_I(NR_MAC, "(%d.%d) Activating RRC processing timer for UE %d with %d ms\n", frame, slot, UE_id, delay_ms);
+ LOG_I(NR_MAC, "(%d.%d) Activating RRC processing timer for UE %04x with %d ms\n", frame, slot, UE->rnti, delay_ms);
} else {
- LOG_I(NR_MAC, "(ue %i, rnti 0x%04x) RA Procedure failed at Msg4!\n", UE_id, ra->rnti);
+ LOG_I(NR_MAC, "(ue rnti 0x%04x) RA Procedure failed at Msg4!\n", ra->rnti);
}
nr_clear_ra_proc(module_id, CC_id, frame, ra);
@@ -2001,7 +2007,7 @@ void nr_check_Msg4_Ack(module_id_t module_id, int CC_id, frame_t frame, sub_fram
remove_nr_list(&sched_ctrl->retrans_dl_harq, current_harq_pid);
}
} else {
- LOG_D(NR_MAC, "(ue %i, rnti 0x%04x) Received Nack of RA-Msg4. Preparing retransmission!\n", UE_id, ra->rnti);
+ LOG_I(NR_MAC, "(UE %04x) Received Nack of RA-Msg4. Preparing retransmission!\n", ra->rnti);
ra->Msg4_frame = (frame + 1) % 1024;
ra->Msg4_slot = 1;
ra->state = Msg4;
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
index 4fc4eae1a27c229d4c590fbee93e1b4e07eb325a..95834e84c5a8e4112fd683b3ff37d8f5c3bfb71d 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
@@ -59,8 +59,7 @@ const int get_dl_tda(const gNB_MAC_INST *nrmac, const NR_ServingCellConfigCommon
AssertFatal(tdd || nrmac->common_channels->frame_type == FDD, "Dynamic TDD not handled yet\n");
// Use special TDA in case of CSI-RS
- const NR_UE_info_t *UE_info = &nrmac->UE_info;
- if(UE_info->sched_csirs)
+ if(nrmac->UE_info.sched_csirs)
return 1;
if (tdd && tdd->nrofDownlinkSymbols > 1) { // if there is a mixed slot where we can transmit DL
@@ -317,10 +316,9 @@ int nr_write_ce_dlsch_pdu(module_id_t module_idP,
void nr_store_dlsch_buffer(module_id_t module_id,
frame_t frame,
sub_frame_t slot) {
- NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
- for (int UE_id = UE_info->list.head; UE_id >= 0; UE_id = UE_info->list.next[UE_id]) {
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ UE_iterator(RC.nrmac[module_id]->UE_info.list, UE) {
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
sched_ctrl->num_total_bytes = 0;
sched_ctrl->dl_pdus_total = 0;
@@ -328,13 +326,11 @@ void nr_store_dlsch_buffer(module_id_t module_id,
// Note: DL_SCH_LCID_DCCH, DL_SCH_LCID_DCCH1, DL_SCH_LCID_DTCH
for (int i = 0; i < sched_ctrl->dl_lc_num; ++i) {
const int lcid = sched_ctrl->dl_lc_ids[i];
- const uint16_t rnti = UE_info->rnti[UE_id];
- LOG_D(NR_MAC, "In %s: UE %d/%x: LCID %d\n", __FUNCTION__, UE_id, rnti, lcid);
-
+ const uint16_t rnti = UE->rnti;
+ LOG_D(NR_MAC, "In %s: UE %x: LCID %d\n", __FUNCTION__, rnti, lcid);
if (lcid == DL_SCH_LCID_DTCH && sched_ctrl->rrc_processing_timer > 0) {
continue;
}
-
start_meas(&RC.nrmac[module_id]->rlc_status_ind);
sched_ctrl->rlc_status[lcid] = mac_rlc_status_ind(module_id,
rnti,
@@ -360,7 +356,7 @@ void nr_store_dlsch_buffer(module_id_t module_id,
slot,
lcid < 4 ? "DCCH":"DTCH",
lcid,
- UE_id,
+ UE->rnti,
sched_ctrl->rlc_status[lcid].bytes_in_buffer,
sched_ctrl->num_total_bytes,
sched_ctrl->dl_pdus_total,
@@ -374,15 +370,14 @@ bool allocate_dl_retransmission(module_id_t module_id,
sub_frame_t slot,
uint16_t *rballoc_mask,
int *n_rb_sched,
- int UE_id,
+ NR_UE_info_t * UE,
int current_harq_pid) {
gNB_MAC_INST *nr_mac = RC.nrmac[module_id];
const NR_ServingCellConfigCommon_t *scc = nr_mac->common_channels->ServingCellConfigCommon;
- NR_UE_info_t *UE_info = &nr_mac->UE_info;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
NR_sched_pdsch_t *retInfo = &sched_ctrl->harq_processes[current_harq_pid].sched_pdsch;
- NR_CellGroupConfig_t *cg = UE_info->CellGroup[UE_id];
+ NR_CellGroupConfig_t *cg = UE->CellGroup;
NR_BWP_DownlinkDedicated_t *bwpd =
cg &&
@@ -422,7 +417,7 @@ bool allocate_dl_retransmission(module_id_t module_id,
rbStart++;
if (rbStart >= bwpSize) {
- LOG_D(NR_MAC, "cannot allocate retransmission for UE %d/RNTI %04x: no resources\n", UE_id, UE_info->rnti[UE_id]);
+ LOG_D(NR_MAC, "cannot allocate retransmission for RNTI %04x: no resources\n", UE->rnti);
return false;
}
@@ -495,7 +490,7 @@ bool allocate_dl_retransmission(module_id_t module_id,
/* Find a free CCE */
const int cid = sched_ctrl->coreset->controlResourceSetId;
- const uint16_t Y = get_Y(cid%3, slot, UE_info->rnti[UE_id]);
+ const uint16_t Y = get_Y(cid%3, slot, UE->rnti);
uint8_t nr_of_candidates;
for (int i=0; i<5; i++) {
@@ -517,8 +512,8 @@ bool allocate_dl_retransmission(module_id_t module_id,
Y);
if (CCEIndex<0) {
- LOG_D(MAC, "%4d.%2d could not find CCE for DL DCI retransmission UE %d/RNTI %04x\n",
- frame, slot, UE_id, UE_info->rnti[UE_id]);
+ LOG_D(MAC, "%4d.%2d could not find CCE for DL DCI retransmission RNTI %04x\n",
+ frame, slot, UE->rnti);
return false;
}
@@ -526,12 +521,11 @@ bool allocate_dl_retransmission(module_id_t module_id,
* allocation after CCE alloc fail would be more complex) */
int r_pucch = nr_get_pucch_resource(sched_ctrl->coreset, sched_ctrl->active_ubwp, ubwpd, CCEIndex);
- const int alloc = nr_acknack_scheduling(module_id, UE_id, frame, slot, r_pucch, 0);
+ const int alloc = nr_acknack_scheduling(module_id, UE, frame, slot, r_pucch, 0);
if (alloc<0) {
LOG_D(MAC,
- "could not find PUCCH for UE %d/%04x@%d.%d\n",
- UE_id,
- UE_info->rnti[UE_id],
+ "could not find PUCCH for UE %04x@%d.%d\n",
+ UE->rnti,
frame,
slot);
RC.nrmac[module_id]->pdcch_cand[cid]--;
@@ -557,48 +551,54 @@ bool allocate_dl_retransmission(module_id_t module_id,
return true;
}
-float thr_ue[MAX_MOBILES_PER_GNB];
uint32_t pf_tbs[3][29]; // pre-computed, approximate TBS values for PF coefficient
+typedef struct UEsched_s {
+ float coef;
+ NR_UE_info_t * UE;
+} UEsched_t;
+
+static int comparator(const void *p, const void *q) {
+ return ((UEsched_t*)p)->coef < ((UEsched_t*)q)->coef;
+}
void pf_dl(module_id_t module_id,
frame_t frame,
sub_frame_t slot,
- NR_list_t *UE_list,
+ NR_UE_info_t **UE_list,
int max_num_ue,
int n_rb_sched,
uint16_t *rballoc_mask) {
gNB_MAC_INST *mac = RC.nrmac[module_id];
- NR_UE_info_t *UE_info = &mac->UE_info;
NR_ServingCellConfigCommon_t *scc=mac->common_channels[0].ServingCellConfigCommon;
- float coeff_ue[MAX_MOBILES_PER_GNB];
// UEs that could be scheduled
- int ue_array[MAX_MOBILES_PER_GNB];
- int layers[MAX_MOBILES_PER_GNB];
- NR_list_t UE_sched = { .head = -1, .next = ue_array, .tail = -1, .len = MAX_MOBILES_PER_GNB };
+ UEsched_t UE_sched[MAX_MOBILES_PER_GNB] = {0};
+ int remainUEs = max_num_ue;
+ int curUE = 0;
/* Loop UE_info->list to check retransmission */
- for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
- if (UE_info->Msg4_ACKed[UE_id] != true) continue;
+ UE_iterator(UE_list, UE) {
+ if (UE->Msg4_ACKed != true)
+ continue;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
if (sched_ctrl->ul_failure==1 && get_softmodem_params()->phy_test==0) continue;
- const NR_mac_dir_stats_t *stats = &UE_info->mac_stats[UE_id].dl;
+ const NR_mac_dir_stats_t *stats = &UE->mac_stats.dl;
NR_sched_pdsch_t *sched_pdsch = &sched_ctrl->sched_pdsch;
NR_pdsch_semi_static_t *ps = &sched_ctrl->pdsch_semi_static;
/* get the PID of a HARQ process awaiting retrnasmission, or -1 otherwise */
sched_pdsch->dl_harq_pid = sched_ctrl->retrans_dl_harq.head;
- layers[UE_id] = ps->nrOfLayers; // initialization of layers to the previous value in the strcuture
+ UE->layers = ps->nrOfLayers; // initialization of layers to the previous value in the strcuture
/* Calculate Throughput */
const float a = 0.0005f; // corresponds to 200ms window
- const uint32_t b = stats->current_bytes;
- thr_ue[UE_id] = (1 - a) * thr_ue[UE_id] + a * b;
+ const uint32_t b = UE->mac_stats.dl.current_bytes;
+ UE->dl_thr_ue = (1 - a) * UE->dl_thr_ue + a * b;
/* retransmission */
if (sched_pdsch->dl_harq_pid >= 0) {
/* Allocate retransmission */
- bool r = allocate_dl_retransmission(module_id, frame, slot, rballoc_mask, &n_rb_sched, UE_id, sched_pdsch->dl_harq_pid);
+ bool r = allocate_dl_retransmission(module_id, frame, slot, rballoc_mask, &n_rb_sched, UE, sched_pdsch->dl_harq_pid);
if (!r) {
LOG_D(NR_MAC, "%4d.%2d retransmission can NOT be allocated\n", frame, slot);
@@ -606,9 +606,12 @@ void pf_dl(module_id_t module_id,
}
/* reduce max_num_ue once we are sure UE can be allocated, i.e., has CCE */
- max_num_ue--;
+ remainUEs--;
- if (max_num_ue < 0) return;
+ if (remainUEs == 0)
+ // we have filled all with mandatory retransmissions
+ // no need to schedule new transmissions
+ return;
} else {
/* Check DL buffer and skip this UE if no bytes and no TA necessary */
if (sched_ctrl->num_total_bytes == 0 && frame != (sched_ctrl->ta_frame + 10) % 1024)
@@ -619,7 +622,7 @@ void pf_dl(module_id_t module_id,
const int max_mcs_table = ps->mcsTableIdx == 1 ? 27 : 28;
const int max_mcs = min(sched_ctrl->dl_max_mcs, max_mcs_table);
sched_pdsch->mcs = get_mcs_from_bler(bo, stats, &sched_ctrl->dl_bler_stats, max_mcs, frame);
- layers[UE_id] = set_dl_nrOfLayers(sched_ctrl);
+ UE->layers = set_dl_nrOfLayers(sched_ctrl);
const uint8_t Qm = nr_get_Qm_dl(sched_pdsch->mcs, ps->mcsTableIdx);
const uint16_t R = nr_get_code_rate_dl(sched_pdsch->mcs, ps->mcsTableIdx);
uint32_t tbs = nr_compute_tbs(Qm,
@@ -629,40 +632,26 @@ void pf_dl(module_id_t module_id,
0, /* N_PRB_DMRS * N_DMRS_SLOT */
0 /* N_PRB_oh, 0 for initialBWP */,
0 /* tb_scaling */,
- layers[UE_id]) >> 3;
- coeff_ue[UE_id] = (float) tbs / thr_ue[UE_id];
- LOG_D(NR_MAC,"b %d, thr_ue[%d] %f, tbs %d, coeff_ue[%d] %f\n",
- b, UE_id, thr_ue[UE_id], tbs, UE_id, coeff_ue[UE_id]);
+ UE->layers) >> 3;
+ float coeff_ue = (float) tbs / UE->dl_thr_ue;
+ LOG_D(NR_MAC,"UE %04x b %d, thr_ue %f, tbs %d, coeff_ue %f\n",
+ UE->rnti, b, UE->dl_thr_ue, tbs, coeff_ue);
/* Create UE_sched list for UEs eligible for new transmission*/
- add_tail_nr_list(&UE_sched, UE_id);
+ UE_sched[curUE].coef=coeff_ue;
+ UE_sched[curUE].UE=UE;
+ curUE++;
}
}
+ qsort(UE_sched, sizeof(*UE_sched), sizeofArray(UE_sched), comparator);
+ UEsched_t *iterator = UE_sched;
+
const int min_rbSize = 5;
/* Loop UE_sched to find max coeff and allocate transmission */
- while (max_num_ue > 0 && n_rb_sched >= min_rbSize && UE_sched.head >= 0) {
- /* Find max coeff from UE_sched*/
- int *max = &UE_sched.head; /* assume head is max */
- int *p = &UE_sched.next[*max];
-
- while (*p >= 0) {
- /* if the current one has larger coeff, save for later */
- if (coeff_ue[*p] > coeff_ue[*max])
- max = p;
-
- p = &UE_sched.next[*p];
- }
-
- /* remove the max one: do not use remove_nr_list() it goes through the
- * whole list every time. Note that UE_sched.tail might not be set
- * correctly anymore */
- const int UE_id = *max;
- p = &UE_sched.next[*max];
- *max = UE_sched.next[*max];
- *p = -1;
- NR_CellGroupConfig_t *cg = UE_info->CellGroup[UE_id];
+ while (remainUEs> 0 && n_rb_sched >= min_rbSize && iterator->UE != NULL) {
+ NR_CellGroupConfig_t *cg = iterator->UE->CellGroup;
NR_BWP_DownlinkDedicated_t *bwpd =
cg &&
@@ -677,26 +666,33 @@ void pf_dl(module_id_t module_id,
cg->spCellConfig->spCellConfigDedicated->uplinkConfig ?
cg->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP : NULL;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
- const uint16_t rnti = UE_info->rnti[UE_id];
- const NR_SIB1_t *sib1 = RC.nrmac[module_id]->common_channels[0].sib1 ? RC.nrmac[module_id]->common_channels[0].sib1->message.choice.c1->choice.systemInformationBlockType1 : NULL;
+ NR_UE_sched_ctrl_t *sched_ctrl = &iterator->UE->UE_sched_ctrl;
+ const uint16_t rnti = iterator->UE->rnti;
+ const NR_SIB1_t *sib1 = RC.nrmac[module_id]->common_channels[0].sib1 ?
+ RC.nrmac[module_id]->common_channels[0].sib1->message.choice.c1->choice.systemInformationBlockType1 :
+ NULL;
NR_BWP_t *genericParameters = get_dl_bwp_genericParameters(sched_ctrl->active_bwp,
RC.nrmac[module_id]->common_channels[0].ServingCellConfigCommon,
sib1);
- const int coresetid = (sched_ctrl->active_bwp||bwpd) ? sched_ctrl->coreset->controlResourceSetId : RC.nrmac[module_id]->sched_ctrlCommon->coreset->controlResourceSetId;
- const uint16_t bwpSize = coresetid == 0 ? RC.nrmac[module_id]->cset0_bwp_size : NRRIV2BW(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);
+ const int coresetid = (sched_ctrl->active_bwp||bwpd) ?
+ sched_ctrl->coreset->controlResourceSetId :
+ RC.nrmac[module_id]->sched_ctrlCommon->coreset->controlResourceSetId;
+ const uint16_t bwpSize = coresetid == 0 ?
+ RC.nrmac[module_id]->cset0_bwp_size :
+ NRRIV2BW(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);
int rbStart = 0; // start wrt BWPstart
if (sched_ctrl->available_dl_harq.head < 0) {
- LOG_D(MAC, "UE %d RNTI %04x has no free HARQ process, skipping\n", UE_id, UE_info->rnti[UE_id]);
+ LOG_D(MAC, "RNTI %04x has no free HARQ process, skipping\n", iterator->UE->rnti);
+ iterator++;
continue;
}
/* Find a free CCE */
const int cid = sched_ctrl->coreset->controlResourceSetId;
- const uint16_t Y = get_Y(cid%3, slot, UE_info->rnti[UE_id]);
+ const uint16_t Y = get_Y(cid%3, slot, iterator->UE->rnti);
uint8_t nr_of_candidates;
for (int i=0; i<5; i++) {
@@ -718,7 +714,8 @@ void pf_dl(module_id_t module_id,
Y);
if (CCEIndex<0) {
- LOG_D(NR_MAC, "%4d.%2d could not find CCE for DL DCI UE %d/RNTI %04x\n", frame, slot, UE_id, rnti);
+ LOG_D(NR_MAC, "%4d.%2d could not find CCE for DL DCI RNTI %04x\n", frame, slot, rnti);
+ iterator++;
continue;
}
@@ -726,33 +723,25 @@ void pf_dl(module_id_t module_id,
* allocation after CCE alloc fail would be more complex) */
int r_pucch = nr_get_pucch_resource(sched_ctrl->coreset, sched_ctrl->active_ubwp, ubwpd, CCEIndex);
- const int alloc = nr_acknack_scheduling(module_id, UE_id, frame, slot, r_pucch, 0);
+ const int alloc = nr_acknack_scheduling(module_id, iterator->UE, frame, slot, r_pucch, 0);
if (alloc<0) {
LOG_D(NR_MAC,
- "could not find PUCCH for UE %d/%04x@%d.%d\n",
- UE_id,
+ "could not find PUCCH for %04x@%d.%d\n",
rnti,
frame,
slot);
mac->pdcch_cand[cid]--;
+ iterator++;
continue;
}
- /* reduce max_num_ue once we are sure UE can be allocated, i.e., has CCE
- * and PUCCH */
- max_num_ue--;
- AssertFatal(max_num_ue >= 0, "Illegal max_num_ue %d\n", max_num_ue);
sched_ctrl->cce_index = CCEIndex;
fill_pdcch_vrb_map(mac,
/* CC_id = */ 0,
&sched_ctrl->sched_pdcch,
CCEIndex,
sched_ctrl->aggregation_level);
- /* reduce max_num_ue once we are sure UE can be allocated, i.e., has CCE */
- max_num_ue--;
-
- if (max_num_ue < 0) return;
/* MCS has been set above */
const int tda = get_dl_tda(RC.nrmac[module_id], scc, slot);
@@ -760,14 +749,14 @@ void pf_dl(module_id_t module_id,
NR_sched_pdsch_t *sched_pdsch = &sched_ctrl->sched_pdsch;
NR_pdsch_semi_static_t *ps = &sched_ctrl->pdsch_semi_static;
- if (ps->nrOfLayers != layers[UE_id] || ps->time_domain_allocation != tda) {
+ if (ps->nrOfLayers != iterator->UE->layers || ps->time_domain_allocation != tda ) {
nr_set_pdsch_semi_static(sib1,
scc,
- UE_info->CellGroup[UE_id],
+ iterator->UE->CellGroup,
sched_ctrl->active_bwp,
bwpd,
tda,
- layers[UE_id],
+ iterator->UE->layers,
sched_ctrl,
ps);
}
@@ -812,21 +801,24 @@ void pf_dl(module_id_t module_id,
for (int rb = 0; rb < sched_pdsch->rbSize; rb++)
rballoc_mask[rb + sched_pdsch->rbStart] ^= slbitmap;
+
+ remainUEs--;
+ iterator++;
}
}
void nr_fr1_dlsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t slot) {
- NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
+ NR_UEs_t *UE_info = &RC.nrmac[module_id]->UE_info;
- if (UE_info->num_UEs == 0)
+ if (UE_info->list[0] == NULL)
return;
NR_ServingCellConfigCommon_t *scc = RC.nrmac[module_id]->common_channels[0].ServingCellConfigCommon;
const int CC_id = 0;
/* Get bwpSize and TDAfrom the first UE */
/* This is temporary and it assumes all UEs have the same BWP and TDA*/
- int UE_id = UE_info->list.head;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_info_t *UE=UE_info->list[0];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
const int tda = get_dl_tda(RC.nrmac[module_id], scc, slot);
int startSymbolIndex, nrOfSymbols;
const struct NR_PDSCH_TimeDomainResourceAllocationList *tdaList = sched_ctrl->active_bwp ?
@@ -842,10 +834,10 @@ void nr_fr1_dlsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t
sib1);
NR_BWP_DownlinkDedicated_t *bwpd =
- UE_info->CellGroup[UE_id] &&
- UE_info->CellGroup[UE_id]->spCellConfig &&
- UE_info->CellGroup[UE_id]->spCellConfig->spCellConfigDedicated ?
- UE_info->CellGroup[UE_id]->spCellConfig->spCellConfigDedicated->initialDownlinkBWP : NULL;
+ UE->CellGroup &&
+ UE->CellGroup->spCellConfig &&
+ UE->CellGroup->spCellConfig->spCellConfigDedicated ?
+ UE->CellGroup->spCellConfig->spCellConfigDedicated->initialDownlinkBWP : NULL;
const int coresetid = (sched_ctrl->active_bwp||bwpd) ? sched_ctrl->coreset->controlResourceSetId : RC.nrmac[module_id]->sched_ctrlCommon->coreset->controlResourceSetId;
@@ -874,7 +866,7 @@ void nr_fr1_dlsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t
pf_dl(module_id,
frame,
slot,
- &UE_info->list,
+ UE_info->list,
MAX_MOBILES_PER_GNB,
n_rb_sched,
rballoc_mask);
@@ -921,18 +913,17 @@ void nr_schedule_ue_spec(module_id_t module_id,
gNB_mac->pre_processor_dl(module_id, frame, slot);
const int CC_id = 0;
NR_ServingCellConfigCommon_t *scc = gNB_mac->common_channels[CC_id].ServingCellConfigCommon;
- NR_UE_info_t *UE_info = &gNB_mac->UE_info;
+ NR_UEs_t *UE_info = &gNB_mac->UE_info;
nfapi_nr_dl_tti_request_body_t *dl_req = &gNB_mac->DL_req[CC_id].dl_tti_request_body;
- NR_list_t *UE_list = &UE_info->list;
- for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ UE_iterator(UE_info->list, UE) {
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
if (sched_ctrl->ul_failure==1 && get_softmodem_params()->phy_test==0) continue;
NR_sched_pdsch_t *sched_pdsch = &sched_ctrl->sched_pdsch;
- UE_info->mac_stats[UE_id].dl.current_bytes = 0;
- NR_CellGroupConfig_t *cg = UE_info->CellGroup[UE_id];
+ UE->mac_stats.dl.current_bytes = 0;
+ NR_CellGroupConfig_t *cg = UE->CellGroup;
NR_BWP_DownlinkDedicated_t *bwpd =
cg &&
@@ -946,13 +937,13 @@ void nr_schedule_ue_spec(module_id_t module_id,
* If we add the CE, ta_apply will be reset */
if (frame == (sched_ctrl->ta_frame + 10) % 1024) {
sched_ctrl->ta_apply = true; /* the timer is reset once TA CE is scheduled */
- LOG_D(NR_MAC, "[UE %d][%d.%d] UL timing alignment procedures: setting flag for Timing Advance command\n", UE_id, frame, slot);
+ LOG_D(NR_MAC, "[UE %04x][%d.%d] UL timing alignment procedures: setting flag for Timing Advance command\n", UE->rnti, frame, slot);
}
if (sched_pdsch->rbSize <= 0)
continue;
- const rnti_t rnti = UE_info->rnti[UE_id];
+ const rnti_t rnti = UE->rnti;
/* pre-computed PDSCH values that only change if time domain
* allocation/DMRS parameters change. Updated in the preprocessor through
* nr_set_pdsch_semi_static() */
@@ -968,8 +959,8 @@ void nr_schedule_ue_spec(module_id_t module_id,
/* PP has not selected a specific HARQ Process, get a new one */
current_harq_pid = sched_ctrl->available_dl_harq.head;
AssertFatal(current_harq_pid >= 0,
- "no free HARQ process available for UE %d\n",
- UE_id);
+ "no free HARQ process available for UE %04x\n",
+ UE->rnti);
remove_front_nr_list(&sched_ctrl->available_dl_harq);
sched_pdsch->dl_harq_pid = current_harq_pid;
} else {
@@ -989,12 +980,11 @@ void nr_schedule_ue_spec(module_id_t module_id,
harq->feedback_frame = pucch->frame;
harq->feedback_slot = pucch->ul_slot;
harq->is_waiting = true;
- UE_info->mac_stats[UE_id].dl.rounds[harq->round]++;
+ UE->mac_stats.dl.rounds[harq->round]++;
LOG_D(NR_MAC,
- "%4d.%2d [DLSCH/PDSCH/PUCCH] UE %d RNTI %04x DCI L %d start %3d RBs %3d startSymbol %2d nb_symbol %2d dmrspos %x MCS %2d nrOfLayers %d TBS %4d HARQ PID %2d round %d RV %d NDI %d dl_data_to_ULACK %d (%d.%d) PUCCH allocation %d TPC %d\n",
+ "%4d.%2d [DLSCH/PDSCH/PUCCH] RNTI %04x DCI L %d start %3d RBs %3d startSymbol %2d nb_symbol %2d dmrspos %x MCS %2d nrOfLayers %d TBS %4d HARQ PID %2d round %d RV %d NDI %d dl_data_to_ULACK %d (%d.%d) PUCCH allocation %d TPC %d\n",
frame,
slot,
- UE_id,
rnti,
sched_ctrl->aggregation_level,
sched_pdsch->rbStart,
@@ -1037,7 +1027,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
dl_tti_pdcch_pdu->PDUSize = (uint8_t)(2+sizeof(nfapi_nr_dl_tti_pdcch_pdu));
dl_req->nPDUs += 1;
pdcch_pdu = &dl_tti_pdcch_pdu->pdcch_pdu.pdcch_pdu_rel15;
- LOG_D(NR_MAC,"Trying to configure DL pdcch for UE %d, bwp %d, cs %d\n",UE_id,bwp_id,coresetid);
+ LOG_D(NR_MAC,"Trying to configure DL pdcch for UE %04x, bwp %d, cs %d\n", UE->rnti, bwp_id, coresetid);
NR_ControlResourceSet_t *coreset = (bwp||bwpd)? sched_ctrl->coreset:gNB_mac->sched_ctrlCommon->coreset;
nr_configure_pdcch(pdcch_pdu, coreset, genericParameters, &sched_ctrl->sched_pdcch);
gNB_mac->pdcch_pdu_idx[CC_id][coresetid] = pdcch_pdu;
@@ -1099,8 +1089,8 @@ void nr_schedule_ue_spec(module_id_t module_id,
pdsch_pdu->NrOfSymbols = ps->nrOfSymbols;
// Precoding
if (sched_ctrl->set_pmi) {
- int report_id = sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.csi_report_id;
- nr_csi_report_t *csi_report = &UE_info->csi_report_template[UE_id][report_id];
+ const int report_id = sched_ctrl->CSI_report.cri_ri_li_pmi_cqi_report.csi_report_id;
+ nr_csi_report_t *csi_report = &UE->csi_report_template[report_id];
pdsch_pdu->precodingAndBeamforming.prg_size = pdsch_pdu->rbSize;
pdsch_pdu->precodingAndBeamforming.prgs_list[0].pm_idx = set_pm_index(sched_ctrl,
nrOfLayers,
@@ -1241,17 +1231,16 @@ void nr_schedule_ue_spec(module_id_t module_id,
* from RLC or encode MAC CEs. The TX_req structure is filled below
* or copy data to FAPI structures */
LOG_D(NR_MAC,
- "%d.%2d DL retransmission UE %d/RNTI %04x HARQ PID %d round %d NDI %d\n",
+ "%d.%2d DL retransmission RNTI %04x HARQ PID %d round %d NDI %d\n",
frame,
slot,
- UE_id,
rnti,
current_harq_pid,
harq->round,
harq->ndi);
AssertFatal(harq->sched_pdsch.tb_size == TBS,
- "UE %d mismatch between scheduled TBS and buffered TB for HARQ PID %d\n",
- UE_id,
+ "UE %04x mismatch between scheduled TBS and buffered TB for HARQ PID %d\n",
+ UE->rnti,
current_harq_pid);
T(T_GNB_MAC_RETRANSMISSION_DL_PDU_WITH_DATA, T_INT(module_id), T_INT(CC_id), T_INT(rnti),
T_INT(frame), T_INT(slot), T_INT(current_harq_pid), T_INT(harq->round), T_BUFFER(harq->transportBlock, TBS));
@@ -1323,7 +1312,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
lcid_bytes += len;
}
- UE_info->mac_stats[UE_id].dl.lc_bytes[lcid] += lcid_bytes;
+ UE->mac_stats.dl.lc_bytes[lcid] += lcid_bytes;
}
} else if (get_softmodem_params()->phy_test || get_softmodem_params()->do_ra) {
/* we will need the large header, phy-test typically allocates all
@@ -1361,10 +1350,8 @@ void nr_schedule_ue_spec(module_id_t module_id,
buf=bufEnd;
}
- NR_mac_stats_t *mac_stats = &UE_info->mac_stats[UE_id];
- mac_stats->dl.total_bytes += TBS;
- mac_stats->dl.current_bytes = TBS;
-
+ UE->mac_stats.dl.total_bytes += TBS;
+ UE->mac_stats.dl.current_bytes = TBS;
/* save retransmission information */
harq->sched_pdsch = *sched_pdsch;
/* save which time allocation has been used, to be used on
@@ -1376,10 +1363,10 @@ void nr_schedule_ue_spec(module_id_t module_id,
sched_ctrl->ta_apply = false;
sched_ctrl->ta_frame = frame;
LOG_D(NR_MAC,
- "%d.%2d UE %d TA scheduled, resetting TA frame\n",
+ "%d.%2d UE %04x TA scheduled, resetting TA frame\n",
frame,
slot,
- UE_id);
+ UE->rnti);
}
T(T_GNB_MAC_DL_PDU_WITH_DATA, T_INT(module_id), T_INT(CC_id), T_INT(rnti),
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
index 8cca07a51a9b142ad9896911b835536c29008947..aff03a5323f79eeaea11761b3f64b0b57b354525 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
@@ -69,7 +69,6 @@ void nr_schedule_css_dlsch_phytest(module_id_t module_idP,
nfapi_nr_pdu_t *TX_req;
uint16_t rnti = 0x1234;
-
// int time_domain_assignment,k0;
NR_ServingCellConfigCommon_t *scc=cc->ServingCellConfigCommon;
@@ -152,8 +151,6 @@ void nr_schedule_css_dlsch_phytest(module_id_t module_idP,
NrOfSymbols = NrOfSymbols_tmp;
StartSymbolIndex = StartSymbolIndex_tmp;
mappingtype = mappingtype_tmp;
- // k0 = *scc->downlinkConfigCommon->initialDownlinkBWP->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList->list.array[i]->k0;
- // time_domain_assignment = i;
}
}
AssertFatal(StartSymbolIndex>=0,"StartSymbolIndex is negative\n");
@@ -165,78 +162,6 @@ void nr_schedule_css_dlsch_phytest(module_id_t module_idP,
StartSymbolIndex,
mappingtype, 1);
- /*
- AssertFatal(k0==0,"k0 is not zero for Initial DL BWP TimeDomain Alloc\n");
- nr_configure_css_dci_initial(pdcch_pdu_rel15,
- scs,
- scs,
- FR,
- 0,
- 0,
- 0,
- sfn_sf, slotP,
- slots_per_frame,
- dlBWP_carrier_bandwidth);
-
-
- pdu_rel15->frequency_domain_assignment = PRBalloc_to_locationandbandwidth0(pdsch_pdu_rel15->rbSize,
- pdsch_pdu_rel15->rbStart,
- dlBWP_carrier_bandwidth);
- pdu_rel15->time_domain_assignment = time_domain_assignment;
-
- pdu_rel15->vrb_to_prb_mapping = 1;
- pdu_rel15->mcs = 9;
- pdu_rel15->tb_scaling = 1;
-
- pdu_rel15->ra_preamble_index = 25;
- pdu_rel15->format_indicator = 1;
- pdu_rel15->ndi = 1;
- pdu_rel15->rv = 0;
- pdu_rel15->harq_pid = 0;
- pdu_rel15->dai = 2;
- pdu_rel15->tpc = 2;
- pdu_rel15->pucch_resource_indicator = 7;
- pdu_rel15->pdsch_to_harq_feedback_timing_indicator = 7;
-
- LOG_D(MAC, "[gNB scheduler phytest] DCI type 1 payload: freq_alloc %d, time_alloc %d, vrb to prb %d, mcs %d tb_scaling %d ndi %d rv %d\n",
- pdu_rel15->frequency_domain_assignment,
- pdu_rel15->time_domain_assignment,
- pdu_rel15->vrb_to_prb_mapping,
- pdu_rel15->mcs,
- pdu_rel15->tb_scaling,
- pdu_rel15->ndi,
- pdu_rel15->rv);
-
- params_rel15->rnti = rnti;
- params_rel15->rnti_type = NFAPI_NR_RNTI_C;
- params_rel15->dci_format = NFAPI_NR_DL_DCI_FORMAT_1_0;
- //params_rel15->aggregation_level = 1;
- LOG_D(MAC, "DCI type 1 params: rnti %x, rnti_type %d, dci_format %d\n \
- coreset params: mux_pattern %d, n_rb %d, n_symb %d, rb_offset %d \n \
- ss params : nb_ss_sets_per_slot %d, first symb %d, nb_slots %d, sfn_mod2 %d, first slot %d\n",
- params_rel15->rnti,
- params_rel15->rnti_type,
- params_rel15->dci_format,
- params_rel15->mux_pattern,
- params_rel15->n_rb,
- params_rel15->n_symb,
- params_rel15->rb_offset,
- params_rel15->nb_ss_sets_per_slot,
- params_rel15->first_symbol,
- params_rel15->nb_slots,
- params_rel15->sfn_mod2,
- params_rel15->first_slot);
- nr_get_tbs_dl(&dl_tti_pdsch_pdu->pdsch_pdu, dl_tti_dci_pdu->dci_dl_pdu,0);
- LOG_D(MAC, "DLSCH PDU: start PRB %d n_PRB %d start symbol %d nb_symbols %d nb_layers %d nb_codewords %d mcs %d\n",
- pdsch_pdu_rel15->rbStart,
- pdsch_pdu_rel15->rbSize,
- pdsch_pdu_rel15->StartSymbolIndex,
- pdsch_pdu_rel15->NrOfSymbols,
- pdsch_pdu_rel15->nrOfLayers,
- pdsch_pdu_rel15->NrOfCodewords,
- pdsch_pdu_rel15->mcsIndex[0]);
- */
-
nr_mac->DL_req[CC_id].dl_tti_request_body.nPDUs+=2;
TX_req = &nr_mac->TX_req[CC_id].pdu_list[nr_mac->TX_req[CC_id].Number_of_PDUs];
@@ -266,21 +191,16 @@ void nr_preprocessor_phytest(module_id_t module_id,
{
if (!is_xlsch_in_slot(dlsch_slot_bitmap, slot))
return;
- NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
+ NR_UE_info_t *UE = RC.nrmac[module_id]->UE_info.list[0];
NR_ServingCellConfigCommon_t *scc = RC.nrmac[module_id]->common_channels[0].ServingCellConfigCommon;
- const int UE_id = 0;
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
const int CC_id = 0;
- AssertFatal(UE_info->active[UE_id],
- "%s(): expected UE %d to be active\n",
- __func__,
- UE_id);
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
const int tda = get_dl_tda(RC.nrmac[module_id], scc, slot);
NR_pdsch_semi_static_t *ps = &sched_ctrl->pdsch_semi_static;
ps->nrOfLayers = target_dl_Nl;
if (ps->time_domain_allocation != tda || ps->nrOfLayers != target_dl_Nl)
- nr_set_pdsch_semi_static(NULL, scc, UE_info->CellGroup[UE_id], sched_ctrl->active_bwp, NULL, tda, target_dl_Nl, sched_ctrl, ps);
+ nr_set_pdsch_semi_static(NULL, scc, UE->CellGroup, sched_ctrl->active_bwp, NULL, tda, target_dl_Nl,sched_ctrl , ps);
/* find largest unallocated chunk */
const int bwpSize = NRRIV2BW(sched_ctrl->active_bwp->bwp_Common->genericParameters.locationAndBandwidth, MAX_BWP_SIZE);
@@ -316,7 +236,7 @@ void nr_preprocessor_phytest(module_id_t module_id,
sched_ctrl->dl_lc_num = 1;
const int lcid = DL_SCH_LCID_DTCH;
sched_ctrl->dl_lc_ids[sched_ctrl->dl_lc_num - 1] = lcid;
- const uint16_t rnti = UE_info->rnti[UE_id];
+ const uint16_t rnti = UE->rnti;
/* update sched_ctrl->num_total_bytes so that postprocessor schedules data,
* if available */
sched_ctrl->rlc_status[lcid] = mac_rlc_status_ind(module_id,
@@ -343,7 +263,7 @@ void nr_preprocessor_phytest(module_id_t module_id,
AssertFatal(nr_of_candidates>0,"nr_of_candidates is 0\n");
const int cid = sched_ctrl->coreset->controlResourceSetId;
- const uint16_t Y = get_Y(cid%3, slot, UE_info->rnti[UE_id]);
+ const uint16_t Y = get_Y(cid%3, slot, UE->rnti);
int CCEIndex = find_pdcch_candidate(RC.nrmac[module_id],
CC_id,
@@ -354,17 +274,16 @@ void nr_preprocessor_phytest(module_id_t module_id,
Y);
AssertFatal(CCEIndex >= 0,
- "%s(): could not find CCE for UE %d\n",
+ "%s(): could not find CCE for UE %04x\n",
__func__,
- UE_id);
+ UE->rnti);
int r_pucch = nr_get_pucch_resource(sched_ctrl->coreset, sched_ctrl->active_ubwp, NULL, CCEIndex);
- const int alloc = nr_acknack_scheduling(module_id, UE_id, frame, slot, r_pucch, 0);
+ const int alloc = nr_acknack_scheduling(module_id, UE, frame, slot, r_pucch, 0);
if (alloc < 0) {
LOG_D(MAC,
- "%s(): could not find PUCCH for UE %d/%04x@%d.%d\n",
+ "%s(): could not find PUCCH for UE %04x@%d.%d\n",
__func__,
- UE_id,
rnti,
frame,
slot);
@@ -422,19 +341,16 @@ bool nr_ul_preprocessor_phytest(module_id_t module_id, frame_t frame, sub_frame_
NR_COMMON_channels_t *cc = nr_mac->common_channels;
NR_ServingCellConfigCommon_t *scc = cc->ServingCellConfigCommon;
const int mu = scc->uplinkConfigCommon->initialUplinkBWP->genericParameters.subcarrierSpacing;
- NR_UE_info_t *UE_info = &nr_mac->UE_info;
+ NR_UE_info_t *UE = nr_mac->UE_info.list[0];
- AssertFatal(UE_info->num_UEs <= 1,
- "%s() cannot handle more than one UE, but found %d\n",
- __func__,
- UE_info->num_UEs);
- if (UE_info->num_UEs == 0)
+ AssertFatal(nr_mac->UE_info.list[1] == NULL,
+ "cannot handle more than one UE\n");
+ if (UE == NULL)
return false;
- const int UE_id = 0;
const int CC_id = 0;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
const struct NR_PUSCH_TimeDomainResourceAllocationList *tdaList =
sched_ctrl->active_ubwp->bwp_Common->pusch_ConfigCommon->choice.setup->pusch_TimeDomainAllocationList;
@@ -523,7 +439,7 @@ bool nr_ul_preprocessor_phytest(module_id_t module_id, frame_t frame, sub_frame_
AssertFatal(nr_of_candidates>0,"nr_of_candidates is 0\n");
const int cid = sched_ctrl->coreset->controlResourceSetId;
- const uint16_t Y = get_Y(cid%3, slot, UE_info->rnti[UE_id]);
+ const uint16_t Y = get_Y(cid%3, slot, UE->rnti);
int CCEIndex = find_pdcch_candidate(nr_mac,
CC_id,
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 1e749a95923d9251bc2bc077df9c3c42105d6cff..65d2ce09c5044ef5f9165396dd63ca55c79ac6d5 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -288,7 +288,7 @@ NR_PDSCH_TimeDomainResourceAllocationList_t *get_pdsch_TimeDomainAllocationList(
}
-NR_ControlResourceSet_t *get_coreset(module_id_t module_idP,
+NR_ControlResourceSet_t *get_coreset(gNB_MAC_INST *nrmac,
NR_ServingCellConfigCommon_t *scc,
void *bwp,
NR_SearchSpace_t *ss,
@@ -298,7 +298,7 @@ NR_ControlResourceSet_t *get_coreset(module_id_t module_idP,
if (ss_type == NR_SearchSpace__searchSpaceType_PR_common) { // common search space
NR_ControlResourceSet_t *coreset;
if(coreset_id == 0) {
- coreset = RC.nrmac[module_idP]->sched_ctrlCommon->coreset; // this is coreset 0
+ coreset = nrmac->sched_ctrlCommon->coreset; // this is coreset 0
} else if (bwp) {
coreset = ((NR_BWP_Downlink_t*)bwp)->bwp_Common->pdcch_ConfigCommon->choice.setup->commonControlResourceSet;
} else if (scc->downlinkConfigCommon->initialDownlinkBWP->pdcch_ConfigCommon->choice.setup->commonControlResourceSet) {
@@ -607,11 +607,10 @@ void nr_set_pdsch_semi_static(const NR_SIB1_t *sib1,
bwpd->pdsch_Config &&
bwpd->pdsch_Config->choice.setup &&
bwpd->pdsch_Config->choice.setup->mcs_Table) {
- if (*bwpd->pdsch_Config->choice.setup->mcs_Table == 0) {
+ if (*bwpd->pdsch_Config->choice.setup->mcs_Table == 0)
ps->mcsTableIdx = 1;
- } else {
+ else
ps->mcsTableIdx = 2;
- }
} else {
ps->mcsTableIdx = 0;
}
@@ -628,9 +627,9 @@ void nr_set_pdsch_semi_static(const NR_SIB1_t *sib1,
ps->mapping_type = tdaList->list.array[tda]->mappingType;
if (pdsch_Config) {
if (ps->mapping_type == NR_PDSCH_TimeDomainResourceAllocation__mappingType_typeB)
- ps->dmrsConfigType = pdsch_Config->dmrs_DownlinkForPDSCH_MappingTypeB->choice.setup->dmrs_Type == NULL ? 0 : 1;
+ ps->dmrsConfigType = pdsch_Config->dmrs_DownlinkForPDSCH_MappingTypeB->choice.setup->dmrs_Type != NULL;
else
- ps->dmrsConfigType = pdsch_Config->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type == NULL ? 0 : 1;
+ ps->dmrsConfigType = pdsch_Config->dmrs_DownlinkForPDSCH_MappingTypeA->choice.setup->dmrs_Type != NULL;
}
else
ps->dmrsConfigType = NFAPI_NR_DMRS_TYPE1;
@@ -2135,10 +2134,11 @@ int extract_length(int startSymbolAndLength) {
/*
* Dump the UL or DL UE_info into LOG_T(MAC)
*/
-void dump_nr_list(NR_list_t *listP)
+void dump_nr_list(NR_UE_info_t **list)
{
- for (int j = listP->head; j >= 0; j = listP->next[j])
- LOG_T(NR_MAC, "NR list node %d => %d\n", j, listP->next[j]);
+ UE_iterator(list, UE) {
+ LOG_T(NR_MAC, "NR list UEs rntis %04x\n", (*list)->rnti);
+ }
}
/*
@@ -2193,7 +2193,7 @@ void destroy_nr_list(NR_list_t *list)
{
free(list->next);
}
-
+//------------------------------------------------------------------------------
/*
* Add an ID to an NR_list at the end, traversing the whole list. Note:
* add_tail_nr_list() is a faster alternative, but this implementation ensures
@@ -2222,16 +2222,7 @@ void remove_nr_list(NR_list_t *listP, int id)
prev = cur;
cur = &listP->next[*cur];
}
- if (*cur == -1) {
- cur = &listP->head;
- prev=&listP->head;
- while (*cur != -1 && *cur != id) {
- LOG_I(NR_MAC,"remove_nr_list : id %d, *cur %d\n",id,*cur);
- prev = cur;
- cur = &listP->next[*cur];
- }
- AssertFatal(1==0, "ID %d not found in UE_list\n", id);
- }
+ AssertFatal(*cur != -1, "ID %d not found in UE_list\n", id);
int *next = &listP->next[*cur];
*cur = listP->next[*cur];
*next = -1;
@@ -2276,21 +2267,17 @@ void remove_front_nr_list(NR_list_t *listP)
listP->tail = -1;
}
-int find_nr_UE_id(module_id_t mod_idP, rnti_t rntiP)
+NR_UE_info_t * find_nr_UE(NR_UEs_t* UEs, rnti_t rntiP)
//------------------------------------------------------------------------------
{
- int UE_id;
- NR_UE_info_t *UE_info = &RC.nrmac[mod_idP]->UE_info;
-
- for (UE_id = 0; UE_id < MAX_MOBILES_PER_GNB; UE_id++) {
- if (UE_info->active[UE_id]) {
- if (UE_info->rnti[UE_id] == rntiP) {
- return UE_id;
- }
+ UE_iterator(UEs->list, UE) {
+ if (UE->rnti == rntiP) {
+ LOG_D(NR_MAC,"Search and found rnti: %04x\n", rntiP);
+ return UE;
}
}
-
- return -1;
+ LOG_W(NR_MAC,"Search for not existing rnti: %04x\n", rntiP);
+ return NULL;
}
uint16_t get_Y(int cid, int slot, rnti_t rnti) {
@@ -2363,39 +2350,80 @@ int get_ul_bwp_id(const NR_ServingCellConfig_t *servingCellConfig)
return 1;
}
+/* hack data to remove UE in the phy */
+int rnti_to_remove[10];
+volatile int rnti_to_remove_count;
+pthread_mutex_t rnti_to_remove_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+void delete_nr_ue_data(NR_UE_info_t *UE, NR_COMMON_channels_t *ccPtr)
+{
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
+ destroy_nr_list(&sched_ctrl->available_dl_harq);
+ destroy_nr_list(&sched_ctrl->feedback_dl_harq);
+ destroy_nr_list(&sched_ctrl->retrans_dl_harq);
+ destroy_nr_list(&sched_ctrl->available_ul_harq);
+ destroy_nr_list(&sched_ctrl->feedback_ul_harq);
+ destroy_nr_list(&sched_ctrl->retrans_ul_harq);
+ LOG_I(NR_MAC, "Remove NR rnti 0x%04x\n", UE->rnti);
+ const rnti_t rnti = UE->rnti;
+ free(UE);
+ /* hack to remove UE in the phy */
+ if (pthread_mutex_lock(&rnti_to_remove_mutex))
+ exit(1);
+ if (rnti_to_remove_count == 10)
+ exit(1);
+ rnti_to_remove[rnti_to_remove_count] = rnti;
+ LOG_W(NR_MAC, "to remove in mac rnti_to_remove[%d] = 0x%04x\n", rnti_to_remove_count, rnti);
+ rnti_to_remove_count++;
+ if (pthread_mutex_unlock(&rnti_to_remove_mutex))
+ exit(1);
+
+ /* clear RA process(es?) associated to the UE */
+ for (int cc_id = 0; cc_id < NFAPI_CC_MAX; cc_id++) {
+ for (int i = 0; i < NR_NB_RA_PROC_MAX; i++) {
+ NR_COMMON_channels_t *cc = &ccPtr[cc_id];
+ if (cc->ra[i].rnti == rnti) {
+ LOG_D(NR_MAC, "free RA process %d for rnti %04x\n", i, rnti);
+ /* is it enough? */
+ cc->ra[i].cfra = false;
+ cc->ra[i].rnti = 0;
+ cc->ra[i].crnti = 0;
+ }
+ }
+ }
+}
+
//------------------------------------------------------------------------------
-int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellGroup)
+NR_UE_info_t *add_new_nr_ue(gNB_MAC_INST *nr_mac, rnti_t rntiP, NR_CellGroupConfig_t *CellGroup)
{
- gNB_MAC_INST *nr_mac = RC.nrmac[mod_idP];
NR_ServingCellConfigCommon_t *scc = nr_mac->common_channels[0].ServingCellConfigCommon;
- NR_UE_info_t *UE_info = &nr_mac->UE_info;
- LOG_I(NR_MAC, "[gNB %d] Adding UE with rnti 0x%04x (num_UEs %d)\n",
- mod_idP,
- rntiP,
- UE_info->num_UEs);
- dump_nr_list(&UE_info->list);
-
- for (int i = 0; i < MAX_MOBILES_PER_GNB; i++) {
- if (UE_info->active[i]) {
- LOG_D(NR_MAC,"UE %x is active, skipping\n",rntiP);
- continue;
- }
- int UE_id = i;
- UE_info->num_UEs++;
- UE_info->active[UE_id] = true;
- if (CellGroup) UE_info->Msg4_ACKed[UE_id] = true;
- else UE_info->Msg4_ACKed[UE_id] = false;
- UE_info->rnti[UE_id] = rntiP;
- UE_info->CellGroup[UE_id] = CellGroup;
- add_nr_list(&UE_info->list, UE_id);
- memset(&UE_info->mac_stats[UE_id], 0, sizeof(NR_mac_stats_t));
- if (CellGroup &&
- CellGroup->spCellConfig &&
- CellGroup->spCellConfig->spCellConfigDedicated &&
- CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig &&
- CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup)
- compute_csi_bitlen (CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup, UE_info, UE_id, mod_idP);
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UEs_t *UE_info = &nr_mac->UE_info;
+ LOG_I(NR_MAC, "Adding UE with rnti 0x%04x\n",
+ rntiP);
+ dump_nr_list(UE_info->list);
+
+ // We will attach at the end, to mitigate race conditions
+ // This is not good, but we will fix it progressively
+ NR_UE_info_t *UE=calloc(1,sizeof(NR_UE_info_t));
+ if(!UE) {
+ LOG_E(NR_MAC,"want to add UE %04x but the fixed allocated size is full\n",rntiP);
+ return NULL;
+ }
+
+ UE->rnti = rntiP;
+ UE->CellGroup = CellGroup;
+
+ if (CellGroup)
+ UE->Msg4_ACKed = true;
+ else
+ UE->Msg4_ACKed = false;
+ if (CellGroup &&
+ CellGroup->spCellConfig &&
+ CellGroup->spCellConfig->spCellConfigDedicated &&
+ CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig &&
+ CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup)
+ compute_csi_bitlen (CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup, UE);
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
memset(sched_ctrl, 0, sizeof(*sched_ctrl));
sched_ctrl->dl_max_mcs = 28; /* do not limit MCS for individual UEs */
sched_ctrl->set_pmi = false;
@@ -2406,7 +2434,6 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellG
sched_ctrl->pucch_consecutive_dtx_cnt = 0;
sched_ctrl->pusch_consecutive_dtx_cnt = 0;
sched_ctrl->ul_failure = 0;
-
sched_ctrl->sched_srs.frame = -1;
sched_ctrl->sched_srs.slot = -1;
sched_ctrl->sched_srs.srs_scheduled = false;
@@ -2416,11 +2443,8 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellG
sched_ctrl->pusch_semi_static.time_domain_allocation = -1;
const NR_ServingCellConfig_t *servingCellConfig = CellGroup && CellGroup->spCellConfig ? CellGroup->spCellConfig->spCellConfigDedicated : NULL;
- /* Set default BWPs */
- const struct NR_ServingCellConfig__downlinkBWP_ToAddModList *bwpList = servingCellConfig ? servingCellConfig->downlinkBWP_ToAddModList : NULL;
- if (bwpList) AssertFatal(bwpList->list.count <= NR_MAX_NUM_BWP,
- "downlinkBWP_ToAddModList has %d BWP!\n",
- bwpList->list.count);
+ /* Set default BWPs */
+ const struct NR_ServingCellConfig__downlinkBWP_ToAddModList *bwpList = servingCellConfig ? servingCellConfig->downlinkBWP_ToAddModList : NULL;
const int bwp_id = servingCellConfig ? *servingCellConfig->firstActiveDownlinkBWP_Id : 0;
sched_ctrl->active_bwp = bwpList && bwp_id > 0 ? bwpList->list.array[bwp_id - 1] : NULL;
@@ -2433,10 +2457,12 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellG
scc,
sched_ctrl->active_bwp ? sched_ctrl->active_bwp->bwp_Dedicated : NULL,
target_ss);
- sched_ctrl->coreset = get_coreset(mod_idP, scc,
- sched_ctrl->active_bwp ? (void*)sched_ctrl->active_bwp->bwp_Dedicated : NULL,
- sched_ctrl->search_space, target_ss);
- sched_ctrl->sched_pdcch = set_pdcch_structure(RC.nrmac[mod_idP],
+ sched_ctrl->coreset = get_coreset(nr_mac,
+ scc,
+ sched_ctrl->active_bwp ? sched_ctrl->active_bwp->bwp_Dedicated : NULL,
+ sched_ctrl->search_space,
+ target_ss);
+ sched_ctrl->sched_pdcch = set_pdcch_structure(nr_mac,
sched_ctrl->search_space,
sched_ctrl->coreset,
scc,
@@ -2445,16 +2471,18 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellG
sched_ctrl->next_dl_bwp_id = -1;
sched_ctrl->next_ul_bwp_id = -1;
const struct NR_UplinkConfig__uplinkBWP_ToAddModList *ubwpList = servingCellConfig ? servingCellConfig->uplinkConfig->uplinkBWP_ToAddModList : NULL;
- if (ubwpList) AssertFatal(ubwpList->list.count <= NR_MAX_NUM_BWP,
+ if (ubwpList)
+ AssertFatal(ubwpList->list.count <= NR_MAX_NUM_BWP,
"uplinkBWP_ToAddModList has %d BWP!\n",
ubwpList->list.count);
const int ul_bwp_id = servingCellConfig ? *servingCellConfig->uplinkConfig->firstActiveUplinkBWP_Id : 0;
sched_ctrl->active_ubwp = ubwpList && ul_bwp_id > 0 ? ubwpList->list.array[ul_bwp_id - 1] : NULL;
/* get Number of HARQ processes for this UE */
- if (servingCellConfig) AssertFatal(servingCellConfig->pdsch_ServingCellConfig->present == NR_SetupRelease_PDSCH_ServingCellConfig_PR_setup,
- "no pdsch-ServingCellConfig found for UE %d\n",
- UE_id);
+ if (servingCellConfig)
+ AssertFatal(servingCellConfig->pdsch_ServingCellConfig->present == NR_SetupRelease_PDSCH_ServingCellConfig_PR_setup,
+ "no pdsch-ServingCellConfig found for UE %04x\n",
+ UE->rnti);
const NR_PDSCH_ServingCellConfig_t *pdsch = servingCellConfig ? servingCellConfig->pdsch_ServingCellConfig->choice.setup : NULL;
// pdsch == NULL in SA -> will create default (8) number of HARQ processes
create_dl_harq_list(sched_ctrl, pdsch);
@@ -2465,21 +2493,27 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellG
add_tail_nr_list(&sched_ctrl->available_ul_harq, harq);
create_nr_list(&sched_ctrl->feedback_ul_harq, 16);
create_nr_list(&sched_ctrl->retrans_ul_harq, 16);
- LOG_D(NR_MAC, "[gNB %d] Add NR UE_id %d : rnti %x\n",
- mod_idP,
- UE_id,
- rntiP);
- dump_nr_list(&UE_info->list);
- return (UE_id);
+
+ pthread_mutex_lock(&UE_info->mutex);
+ int i;
+ for(i=0; i<MAX_MOBILES_PER_GNB; i++)
+ if (UE_info->list[i] == NULL) {
+ UE_info->list[i] = UE;
+ break;
+ }
+ if (i == MAX_MOBILES_PER_GNB) {
+ LOG_E(NR_MAC,"Try to add UE %04x but the list is full\n", rntiP);
+ delete_nr_ue_data(UE, nr_mac->common_channels);
+ pthread_mutex_unlock(&UE_info->mutex);
+ return NULL;
}
+ pthread_mutex_unlock(&UE_info->mutex);
- // printf("MAC: cannot add new UE for rnti %x\n", rntiP);
- LOG_E(NR_MAC, "error in add_new_ue(), could not find space in UE_info, Dumping UE list\n");
- dump_nr_list(&UE_info->list);
- return -1;
+ LOG_D(NR_MAC, "Add NR rnti %x\n", rntiP);
+ dump_nr_list(UE_info->list);
+ return (UE);
}
-
void create_dl_harq_list(NR_UE_sched_ctrl_t *sched_ctrl,
const NR_PDSCH_ServingCellConfig_t *pdsch) {
const int nrofHARQ = pdsch && pdsch->nrofHARQ_ProcessesForPDSCH ?
@@ -2512,66 +2546,30 @@ void create_dl_harq_list(NR_UE_sched_ctrl_t *sched_ctrl,
}
}
-/* hack data to remove UE in the phy */
-int rnti_to_remove[10];
-volatile int rnti_to_remove_count;
-pthread_mutex_t rnti_to_remove_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-void mac_remove_nr_ue(module_id_t mod_id, rnti_t rnti)
+void mac_remove_nr_ue(gNB_MAC_INST *nr_mac, rnti_t rnti)
{
- int UE_id;
- int i;
- int cc_id;
- NR_UE_info_t *UE_info = &RC.nrmac[mod_id]->UE_info;
-
- for (i = 0; i < MAX_MOBILES_PER_GNB; i++) {
-
- if (UE_info->active[i] != TRUE)
- continue;
- if (UE_info->rnti[i] != rnti)
- continue;
-
- /* UE found, remove it */
- UE_id = i;
-
- UE_info->num_UEs--;
- UE_info->active[UE_id] = FALSE;
- UE_info->rnti[UE_id] = 0;
- remove_nr_list(&UE_info->list, UE_id);
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
- destroy_nr_list(&sched_ctrl->available_dl_harq);
- destroy_nr_list(&sched_ctrl->feedback_dl_harq);
- destroy_nr_list(&sched_ctrl->retrans_dl_harq);
- destroy_nr_list(&sched_ctrl->available_ul_harq);
- destroy_nr_list(&sched_ctrl->feedback_ul_harq);
- destroy_nr_list(&sched_ctrl->retrans_ul_harq);
- LOG_I(NR_MAC, "[gNB %d] Remove NR UE_id %d: rnti 0x%04x\n",
- mod_id,
- UE_id,
- rnti);
-
- /* hack to remove UE in the phy */
- if (pthread_mutex_lock(&rnti_to_remove_mutex)) exit(1);
- if (rnti_to_remove_count == 10) exit(1);
- rnti_to_remove[rnti_to_remove_count] = rnti;
- LOG_W(NR_MAC, "to remove in mac rnti_to_remove[%d] = 0x%04x\n", rnti_to_remove_count, rnti);
- rnti_to_remove_count++;
- if (pthread_mutex_unlock(&rnti_to_remove_mutex)) exit(1);
- }
-
- /* clear RA process(es?) associated to the UE */
- for (cc_id = 0; cc_id < NFAPI_CC_MAX; cc_id++) {
- NR_COMMON_channels_t *cc = &RC.nrmac[mod_id]->common_channels[cc_id];
- for (i = 0; i < NR_NB_RA_PROC_MAX; i++) {
- if (cc->ra[i].rnti == rnti) {
- LOG_D(NR_MAC, "free RA process %d for rnti %d\n", i, rnti);
- /* is it enough? */
- cc->ra[i].cfra = false;
- cc->ra[i].rnti = 0;
- cc->ra[i].crnti = 0;
- }
- }
- }
+ NR_UEs_t *UE_info = &nr_mac->UE_info;
+ pthread_mutex_lock(&UE_info->mutex);
+ UE_iterator(UE_info->list, UE) {
+ if (UE->rnti==rnti)
+ break;
+ }
+
+ if (!UE) {
+ LOG_W(NR_MAC,"Call to del rnti %04x, but not existing\n", rnti);
+ pthread_mutex_unlock(&UE_info->mutex);
+ return;
+ }
+
+ NR_UE_info_t * newUEs[MAX_MOBILES_PER_GNB+1]={0};
+ int newListIdx=0;
+ for (int i=0; i<MAX_MOBILES_PER_GNB; i++)
+ if(UE_info->list[i] && UE_info->list[i]->rnti != rnti)
+ newUEs[newListIdx++]=UE_info->list[i];
+ memcpy(UE_info->list, newUEs, sizeof(UE_info->list));
+ pthread_mutex_unlock(&UE_info->mutex);
+
+ delete_nr_ue_data(UE, nr_mac->common_channels);
}
void nr_mac_remove_ra_rnti(module_id_t mod_id, rnti_t rnti) {
@@ -2595,20 +2593,18 @@ uint8_t nr_get_tpc(int target, uint8_t cqi, int incr) {
}
-void get_pdsch_to_harq_feedback(int Mod_idP,
- int UE_id,
+void get_pdsch_to_harq_feedback( NR_UE_info_t * UE,
int bwp_id,
NR_SearchSpace__searchSpaceType_PR ss_type,
int *max_fb_time,
uint8_t *pdsch_to_harq_feedback) {
- NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
- NR_CellGroupConfig_t *CellGroup = UE_info->CellGroup[UE_id];
+ NR_CellGroupConfig_t *CellGroup = UE->CellGroup;
NR_BWP_DownlinkDedicated_t *bwpd=NULL;
NR_BWP_UplinkDedicated_t *ubwpd=NULL;
if (ss_type == NR_SearchSpace__searchSpaceType_PR_ue_Specific) {
- AssertFatal(CellGroup!=NULL,"Cellgroup is not defined for UE_id %d\n",UE_id);
+ AssertFatal(CellGroup!=NULL,"Cellgroup is not defined for UE %04x\n",UE->rnti);
AssertFatal(CellGroup->spCellConfig!=NULL,"Cellgroup->spCellConfig is null\n");
AssertFatal(CellGroup->spCellConfig->spCellConfigDedicated!=NULL,"CellGroup->spCellConfig->spCellConfigDedicated is null\n");
}
@@ -2692,22 +2688,19 @@ void nr_csirs_scheduling(int Mod_idP,
int n_slots_frame){
int CC_id = 0;
- NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
- NR_list_t *UE_list = &UE_info->list;
+ NR_UEs_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
gNB_MAC_INST *gNB_mac = RC.nrmac[Mod_idP];
uint16_t *vrb_map = gNB_mac->common_channels[CC_id].vrb_map;
UE_info->sched_csirs = false;
- for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
-
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ UE_iterator(UE_info->list, UE) {
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
if (sched_ctrl->rrc_processing_timer > 0) {
continue;
}
-
- NR_CellGroupConfig_t *CellGroup = UE_info->CellGroup[UE_id];
+ NR_CellGroupConfig_t *CellGroup = UE->CellGroup;
if (!CellGroup || !CellGroup->spCellConfig || !CellGroup->spCellConfig->spCellConfigDedicated ||
!CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig) continue;
@@ -2723,6 +2716,7 @@ void nr_csirs_scheduling(int Mod_idP,
NR_BWP_t *genericParameters = sched_ctrl->active_bwp ?
&sched_ctrl->active_bwp->bwp_Common->genericParameters :
&gNB_mac->common_channels[0].ServingCellConfigCommon->downlinkConfigCommon->initialDownlinkBWP->genericParameters;
+
for (int id = 0; id < csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.count; id++){
nzpcsi = csi_measconfig->nzp_CSI_RS_ResourceToAddModList->list.array[id];
NR_CSI_RS_ResourceMapping_t resourceMapping = nzpcsi->resourceMapping;
@@ -2899,18 +2893,17 @@ void nr_csirs_scheduling(int Mod_idP,
void nr_mac_update_timers(module_id_t module_id,
frame_t frame,
sub_frame_t slot) {
+ NR_UEs_t *UE_info = &RC.nrmac[module_id]->UE_info;
- NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
- const NR_list_t *UE_list = &UE_info->list;
- for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ UE_iterator(UE_info->list, UE) {
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
if (sched_ctrl->rrc_processing_timer > 0) {
sched_ctrl->rrc_processing_timer--;
if (sched_ctrl->rrc_processing_timer == 0) {
- LOG_I(NR_MAC, "(%d.%d) De-activating RRC processing timer for UE %d\n", frame, slot, UE_id);
+ LOG_I(NR_MAC, "(%d.%d) De-activating RRC processing timer for UE %04x\n", frame, slot, UE->rnti);
const NR_SIB1_t *sib1 = RC.nrmac[module_id]->common_channels[0].sib1 ? RC.nrmac[module_id]->common_channels[0].sib1->message.choice.c1->choice.systemInformationBlockType1 : NULL;
- NR_CellGroupConfig_t *cg = UE_info->CellGroup[UE_id];
+ NR_CellGroupConfig_t *cg = UE->CellGroup;
NR_ServingCellConfigCommon_t *scc = RC.nrmac[module_id]->common_channels[0].ServingCellConfigCommon;
const NR_ServingCellConfig_t *spCellConfigDedicated = cg && cg->spCellConfig ? cg->spCellConfig->spCellConfigDedicated : NULL;
@@ -2984,327 +2977,22 @@ void schedule_nr_bwp_switch(module_id_t module_id,
frame_t frame,
sub_frame_t slot) {
- NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
- const NR_list_t *UE_list = &UE_info->list;
+ NR_UEs_t *UE_info = &RC.nrmac[module_id]->UE_info;
// TODO: Implementation of a algorithm to perform:
// - DL BWP selection: sched_ctrl->next_dl_bwp_id = dl_bwp_id
// - UL BWP selection: sched_ctrl->next_ul_bwp_id = ul_bwp_id
- for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ UE_iterator(UE_info->list, UE) {
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
if (sched_ctrl->rrc_processing_timer == 0 &&
- UE_info->Msg4_ACKed[UE_id] == true &&
+ UE->Msg4_ACKed &&
((sched_ctrl->next_dl_bwp_id >= 0 && sched_ctrl->active_bwp && sched_ctrl->active_bwp->bwp_Id != sched_ctrl->next_dl_bwp_id) ||
(sched_ctrl->next_ul_bwp_id >= 0 && sched_ctrl->active_ubwp && sched_ctrl->active_ubwp->bwp_Id != sched_ctrl->next_ul_bwp_id))) {
- LOG_W(NR_MAC,"(%d.%d) [UE_id %d] Schedule BWP switch from dl_bwp_id %ld to %ld and from ul_bwp_id %ld to %ld\n",
- frame, slot, UE_id, sched_ctrl->active_bwp->bwp_Id, sched_ctrl->next_dl_bwp_id, sched_ctrl->active_ubwp->bwp_Id, sched_ctrl->next_ul_bwp_id);
- nr_mac_rrc_bwp_switch_req(module_id, frame, slot, UE_info->rnti[UE_id], sched_ctrl->next_dl_bwp_id, sched_ctrl->next_ul_bwp_id);
- }
- }
-}
-
-/*void fill_nfapi_coresets_and_searchspaces(NR_CellGroupConfig_t *cg,
- nfapi_nr_coreset_t *coreset,
- nfapi_nr_search_space_t *search_space) {
-
- nfapi_nr_coreset_t *cs;
- nfapi_nr_search_space_t *ss;
- NR_ServingCellConfigCommon_t *scc=cg->spCellConfig->reconfigurationWithSync->spCellConfigCommon;
- AssertFatal(cg->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.count == 1,
- "downlinkBWP_ToAddModList has %d BWP!\n",
- cg->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.count);
-
- NR_BWP_Downlink_t *bwp=cg->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.array[0];
- struct NR_PDCCH_Config__controlResourceSetToAddModList *coreset_list = bwp->bwp_Dedicated->pdcch_Config->choice.setup->controlResourceSetToAddModList;
- AssertFatal(coreset_list->list.count>0,
- "cs list has 0 elements\n");
- for (int i=0;i<coreset_list->list.count;i++) {
- NR_ControlResourceSet_t *coreset_i=coreset_list->list.array[i];
- cs = coreset + coreset_i->controlResourceSetId;
-
- cs->coreset_id = coreset_i->controlResourceSetId;
- AssertFatal(coreset_i->frequencyDomainResources.size <=8 && coreset_i->frequencyDomainResources.size>0,
- "coreset_i->frequencyDomainResources.size=%d\n",
- (int)coreset_i->frequencyDomainResources.size);
-
- for (int f=0;f<coreset_i->frequencyDomainResources.size;f++)
- ((uint8_t*)&cs->frequency_domain_resources)[coreset_i->frequencyDomainResources.size-1-f]=coreset_i->frequencyDomainResources.buf[f];
-
- cs->frequency_domain_resources>>=coreset_i->frequencyDomainResources.bits_unused;
-
- cs->duration = coreset_i->duration;
- // Need to add information about TCI_StateIDs
-
- if (coreset_i->cce_REG_MappingType.present == NR_ControlResourceSet__cce_REG_MappingType_PR_nonInterleaved)
- cs->cce_reg_mapping_type = NFAPI_NR_CCE_REG_MAPPING_NON_INTERLEAVED;
- else {
- cs->cce_reg_mapping_type = NFAPI_NR_CCE_REG_MAPPING_INTERLEAVED;
-
- if (coreset_i->cce_REG_MappingType.choice.interleaved->reg_BundleSize==NR_ControlResourceSet__cce_REG_MappingType__interleaved__reg_BundleSize_n6)
- cs->reg_bundle_size = 6;
- else cs->reg_bundle_size = 2+coreset_i->cce_REG_MappingType.choice.interleaved->reg_BundleSize;
-
- if (coreset_i->cce_REG_MappingType.choice.interleaved->interleaverSize==NR_ControlResourceSet__cce_REG_MappingType__interleaved__interleaverSize_n6)
- cs->interleaver_size = 6;
- else cs->interleaver_size = 2+coreset_i->cce_REG_MappingType.choice.interleaved->interleaverSize;
-
- if (coreset_i->cce_REG_MappingType.choice.interleaved->shiftIndex)
- cs->shift_index = *coreset_i->cce_REG_MappingType.choice.interleaved->shiftIndex;
- else cs->shift_index = 0;
- }
-
- if (coreset_i->precoderGranularity == NR_ControlResourceSet__precoderGranularity_sameAsREG_bundle)
- cs->precoder_granularity = NFAPI_NR_CSET_SAME_AS_REG_BUNDLE;
- else cs->precoder_granularity = NFAPI_NR_CSET_ALL_CONTIGUOUS_RBS;
- if (coreset_i->tci_PresentInDCI == NULL) cs->tci_present_in_dci = 0;
- else cs->tci_present_in_dci = 1;
-
- if (coreset_i->tci_PresentInDCI == NULL) cs->dmrs_scrambling_id = 0;
- else cs->dmrs_scrambling_id = *coreset_i->tci_PresentInDCI;
- }
-
- struct NR_PDCCH_ConfigCommon__commonSearchSpaceList *commonSearchSpaceList = bwp->bwp_Common->pdcch_ConfigCommon->choice.setup->commonSearchSpaceList;
- AssertFatal(commonSearchSpaceList->list.count>0,
- "common SearchSpace list has 0 elements\n");
- // Common searchspace list
- for (int i=0;i<commonSearchSpaceList->list.count;i++) {
- NR_SearchSpace_t *searchSpace_i=commonSearchSpaceList->list.array[i];
- ss=search_space + searchSpace_i->searchSpaceId;
- if (searchSpace_i->controlResourceSetId) ss->coreset_id = *searchSpace_i->controlResourceSetId;
- switch(searchSpace_i->monitoringSlotPeriodicityAndOffset->present) {
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL1;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL2;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl2;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl4:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL4;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl4;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl5:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL5;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl5;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl8:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL8;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl8;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl10:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL10;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl10;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl16:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL16;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl16;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl20:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL20;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl20;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl40:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL40;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl40;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl80:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL80;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl80;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl160:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL160;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl160;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl320:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL320;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl320;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl640:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL640;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl640;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1280:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL1280;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl1280;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2560:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL2560;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl2560;
- break;
- default:
- AssertFatal(1==0,"Shouldn't get here\n");
- break;
- }
- if (searchSpace_i->duration) ss->duration = *searchSpace_i->duration;
- else ss->duration = 1;
-
-
- AssertFatal(searchSpace_i->monitoringSymbolsWithinSlot->size == 2,
- "ss_i->monitoringSymbolsWithinSlot = %d != 2\n",
- (int)searchSpace_i->monitoringSymbolsWithinSlot->size);
- ((uint8_t*)&ss->monitoring_symbols_in_slot)[1] = searchSpace_i->monitoringSymbolsWithinSlot->buf[0];
- ((uint8_t*)&ss->monitoring_symbols_in_slot)[0] = searchSpace_i->monitoringSymbolsWithinSlot->buf[1];
-
- AssertFatal(searchSpace_i->nrofCandidates!=NULL,"searchSpace_%d->nrofCandidates is null\n",(int)searchSpace_i->searchSpaceId);
- if (searchSpace_i->nrofCandidates->aggregationLevel1 == NR_SearchSpace__nrofCandidates__aggregationLevel1_n8)
- ss->number_of_candidates[0] = 8;
- else ss->number_of_candidates[0] = searchSpace_i->nrofCandidates->aggregationLevel1;
- if (searchSpace_i->nrofCandidates->aggregationLevel2 == NR_SearchSpace__nrofCandidates__aggregationLevel2_n8)
- ss->number_of_candidates[1] = 8;
- else ss->number_of_candidates[1] = searchSpace_i->nrofCandidates->aggregationLevel2;
- if (searchSpace_i->nrofCandidates->aggregationLevel4 == NR_SearchSpace__nrofCandidates__aggregationLevel4_n8)
- ss->number_of_candidates[2] = 8;
- else ss->number_of_candidates[2] = searchSpace_i->nrofCandidates->aggregationLevel4;
- if (searchSpace_i->nrofCandidates->aggregationLevel8 == NR_SearchSpace__nrofCandidates__aggregationLevel8_n8)
- ss->number_of_candidates[3] = 8;
- else ss->number_of_candidates[3] = searchSpace_i->nrofCandidates->aggregationLevel8;
- if (searchSpace_i->nrofCandidates->aggregationLevel16 == NR_SearchSpace__nrofCandidates__aggregationLevel16_n8)
- ss->number_of_candidates[4] = 8;
- else ss->number_of_candidates[4] = searchSpace_i->nrofCandidates->aggregationLevel16;
-
- AssertFatal(searchSpace_i->searchSpaceType->present==NR_SearchSpace__searchSpaceType_PR_common,
- "searchspace %d is not common\n",(int)searchSpace_i->searchSpaceId);
- AssertFatal(searchSpace_i->searchSpaceType->choice.common!=NULL,
- "searchspace %d common is null\n",(int)searchSpace_i->searchSpaceId);
- ss->search_space_type = NFAPI_NR_SEARCH_SPACE_TYPE_COMMON;
- if (searchSpace_i->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0)
- ss->css_formats_0_0_and_1_0 = 1;
- if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_0) {
- ss->css_format_2_0 = 1;
- // add aggregation info
- }
- if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_1)
- ss->css_format_2_1 = 1;
- if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_2)
- ss->css_format_2_2 = 1;
- if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_3)
- ss->css_format_2_3 = 1;
- }
-
- struct NR_PDCCH_Config__searchSpacesToAddModList *dedicatedSearchSpaceList = bwp->bwp_Dedicated->pdcch_Config->choice.setup->searchSpacesToAddModList;
- AssertFatal(dedicatedSearchSpaceList->list.count>0,
- "Dedicated Search Space list has 0 elements\n");
- // Dedicated searchspace list
- for (int i=0;i<dedicatedSearchSpaceList->list.count;i++) {
- NR_SearchSpace_t *searchSpace_i=dedicatedSearchSpaceList->list.array[i];
- ss=search_space + searchSpace_i->searchSpaceId;
- ss->search_space_id = searchSpace_i->searchSpaceId;
- if (searchSpace_i->controlResourceSetId) ss->coreset_id = *searchSpace_i->controlResourceSetId;
- switch(searchSpace_i->monitoringSlotPeriodicityAndOffset->present) {
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL1;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL2;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl2;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl4:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL4;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl4;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl5:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL5;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl5;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl8:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL8;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl8;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl10:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL10;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl10;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl16:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL16;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl16;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl20:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL20;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl20;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl40:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL40;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl40;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl80:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL80;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl80;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl160:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL160;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl160;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl320:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL320;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl320;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl640:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL640;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl640;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl1280:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL1280;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl1280;
- break;
- case NR_SearchSpace__monitoringSlotPeriodicityAndOffset_PR_sl2560:
- ss->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL2560;
- ss->slot_monitoring_offset = searchSpace_i->monitoringSlotPeriodicityAndOffset->choice.sl2560;
- break;
- default:
- AssertFatal(1==0,"Shouldn't get here\n");
- break;
- }
- if (searchSpace_i->duration) ss->duration = *searchSpace_i->duration;
- else ss->duration = 1;
-
-
- AssertFatal(searchSpace_i->monitoringSymbolsWithinSlot->size == 2,
- "ss_i->monitoringSymbolsWithinSlot = %d != 2\n",
- (int)searchSpace_i->monitoringSymbolsWithinSlot->size);
- ((uint8_t*)&ss->monitoring_symbols_in_slot)[1] = searchSpace_i->monitoringSymbolsWithinSlot->buf[0];
- ((uint8_t*)&ss->monitoring_symbols_in_slot)[0] = searchSpace_i->monitoringSymbolsWithinSlot->buf[1];
-
- AssertFatal(searchSpace_i->nrofCandidates!=NULL,"searchSpace_%d->nrofCandidates is null\n",(int)searchSpace_i->searchSpaceId);
- if (searchSpace_i->nrofCandidates->aggregationLevel1 == NR_SearchSpace__nrofCandidates__aggregationLevel1_n8)
- ss->number_of_candidates[0] = 8;
- else ss->number_of_candidates[0] = searchSpace_i->nrofCandidates->aggregationLevel1;
- if (searchSpace_i->nrofCandidates->aggregationLevel2 == NR_SearchSpace__nrofCandidates__aggregationLevel2_n8)
- ss->number_of_candidates[1] = 8;
- else ss->number_of_candidates[1] = searchSpace_i->nrofCandidates->aggregationLevel2;
- if (searchSpace_i->nrofCandidates->aggregationLevel4 == NR_SearchSpace__nrofCandidates__aggregationLevel4_n8)
- ss->number_of_candidates[2] = 8;
- else ss->number_of_candidates[2] = searchSpace_i->nrofCandidates->aggregationLevel4;
- if (searchSpace_i->nrofCandidates->aggregationLevel8 == NR_SearchSpace__nrofCandidates__aggregationLevel8_n8)
- ss->number_of_candidates[3] = 8;
- else ss->number_of_candidates[3] = searchSpace_i->nrofCandidates->aggregationLevel8;
- if (searchSpace_i->nrofCandidates->aggregationLevel16 == NR_SearchSpace__nrofCandidates__aggregationLevel16_n8)
- ss->number_of_candidates[4] = 8;
- else ss->number_of_candidates[4] = searchSpace_i->nrofCandidates->aggregationLevel16;
-
- if (searchSpace_i->searchSpaceType->present==NR_SearchSpace__searchSpaceType_PR_ue_Specific && searchSpace_i->searchSpaceType->choice.ue_Specific!=NULL) {
-
- ss->search_space_type = NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC;
-
- ss->uss_dci_formats = searchSpace_i->searchSpaceType->choice.ue_Specific-> dci_Formats;
-
- } else if (searchSpace_i->searchSpaceType->present==NR_SearchSpace__searchSpaceType_PR_common && searchSpace_i->searchSpaceType->choice.common!=NULL) {
- ss->search_space_type = NFAPI_NR_SEARCH_SPACE_TYPE_COMMON;
-
- if (searchSpace_i->searchSpaceType->choice.common->dci_Format0_0_AndFormat1_0)
- ss->css_formats_0_0_and_1_0 = 1;
- if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_0) {
- ss->css_format_2_0 = 1;
- // add aggregation info
- }
- if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_1)
- ss->css_format_2_1 = 1;
- if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_2)
- ss->css_format_2_2 = 1;
- if (searchSpace_i->searchSpaceType->choice.common->dci_Format2_3)
- ss->css_format_2_3 = 1;
+ LOG_W(NR_MAC,"%4d.%2d UE %04x Schedule BWP switch from dl_bwp_id %ld to %ld and from ul_bwp_id %ld to %ld\n",
+ frame, slot, UE->rnti, sched_ctrl->active_bwp->bwp_Id, sched_ctrl->next_dl_bwp_id, sched_ctrl->active_ubwp->bwp_Id, sched_ctrl->next_ul_bwp_id);
+ nr_mac_rrc_bwp_switch_req(module_id, frame, slot, UE->rnti, sched_ctrl->next_dl_bwp_id, sched_ctrl->next_ul_bwp_id);
}
}
}
-*/
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_srs.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_srs.c
index 18b723ccc00befaa620a9650ca63f5fc4c3dbd94..7a21ad82e8d9e52f5ac910c6d96d57b4b17607bf 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_srs.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_srs.c
@@ -34,19 +34,18 @@
extern RAN_CONTEXT_t RC;
-void nr_configure_srs(nfapi_nr_srs_pdu_t *srs_pdu, int module_id, int CC_id, int UE_id, NR_SRS_Resource_t *srs_resource) {
+void nr_configure_srs(nfapi_nr_srs_pdu_t *srs_pdu, int module_id, int CC_id,NR_UE_info_t* UE, NR_SRS_Resource_t *srs_resource) {
gNB_MAC_INST *nrmac = RC.nrmac[module_id];
NR_ServingCellConfigCommon_t *scc = nrmac->common_channels[CC_id].ServingCellConfigCommon;
- NR_UE_info_t *UE_info = &nrmac->UE_info;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
const NR_SIB1_t *sib1 = nrmac->common_channels[0].sib1 ? nrmac->common_channels[0].sib1->message.choice.c1->choice.systemInformationBlockType1 : NULL;
NR_BWP_t *genericParameters = get_ul_bwp_genericParameters(sched_ctrl->active_ubwp,
scc,
sib1);
- srs_pdu->rnti = UE_info->rnti[UE_id];
+ srs_pdu->rnti = UE->rnti;
srs_pdu->handle = 0;
srs_pdu->bwp_size = NRRIV2BW(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);;
srs_pdu->bwp_start = NRRIV2PRBOFFSET(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);;
@@ -83,7 +82,7 @@ void nr_configure_srs(nfapi_nr_srs_pdu_t *srs_pdu, int module_id, int CC_id, int
srs_pdu->t_offset = get_nr_srs_offset(srs_resource->resourceType.choice.periodic->periodicityAndOffset_p);
}
-void nr_fill_nfapi_srs(int module_id, int CC_id, int UE_id, sub_frame_t slot, NR_SRS_Resource_t *srs_resource) {
+void nr_fill_nfapi_srs(int module_id, int CC_id, NR_UE_info_t* UE, sub_frame_t slot, NR_SRS_Resource_t *srs_resource) {
nfapi_nr_ul_tti_request_t *future_ul_tti_req = &RC.nrmac[module_id]->UL_tti_req_ahead[0][slot];
AssertFatal(future_ul_tti_req->n_pdus <
@@ -95,7 +94,7 @@ void nr_fill_nfapi_srs(int module_id, int CC_id, int UE_id, sub_frame_t slot, NR
memset(srs_pdu, 0, sizeof(nfapi_nr_srs_pdu_t));
future_ul_tti_req->n_pdus += 1;
- nr_configure_srs(srs_pdu, module_id, CC_id, UE_id, srs_resource);
+ nr_configure_srs(srs_pdu, module_id, CC_id, UE, srs_resource);
}
/*******************************************************************
@@ -112,22 +111,20 @@ void nr_fill_nfapi_srs(int module_id, int CC_id, int UE_id, sub_frame_t slot, NR
void nr_schedule_srs(int module_id, frame_t frame) {
gNB_MAC_INST *nrmac = RC.nrmac[module_id];
- NR_UE_info_t *UE_info = &nrmac->UE_info;
- const NR_list_t *UE_list = &UE_info->list;
-
- for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
+ NR_UEs_t *UE_info = &nrmac->UE_info;
+ UE_iterator(UE_info->list, UE) {
const int CC_id = 0;
NR_ServingCellConfigCommon_t *scc = RC.nrmac[module_id]->common_channels[CC_id].ServingCellConfigCommon;
- NR_CellGroupConfig_t *cg = UE_info->CellGroup[UE_id];
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_CellGroupConfig_t *cg = UE->CellGroup;
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
sched_ctrl->sched_srs.frame = -1;
sched_ctrl->sched_srs.slot = -1;
sched_ctrl->sched_srs.srs_scheduled = false;
if((sched_ctrl->ul_failure == 1 && get_softmodem_params()->phy_test==0) ||
- !UE_info->Msg4_ACKed[UE_id] || sched_ctrl->rrc_processing_timer > 0) {
+ !UE->Msg4_ACKed || sched_ctrl->rrc_processing_timer > 0) {
continue;
}
@@ -188,11 +185,11 @@ void nr_schedule_srs(int module_id, frame_t frame) {
// Check if UE will transmit the SRS in this frame
if ( ((frame - offset/n_slots_frame)*n_slots_frame)%period == 0) {
LOG_D(NR_MAC,"Scheduling SRS reception for %d.%d\n", frame, offset%n_slots_frame);
- nr_fill_nfapi_srs(module_id, CC_id, UE_id, offset%n_slots_frame, srs_resource);
+ nr_fill_nfapi_srs(module_id, CC_id, UE, offset%n_slots_frame, srs_resource);
sched_ctrl->sched_srs.frame = frame;
sched_ctrl->sched_srs.slot = offset%n_slots_frame;
sched_ctrl->sched_srs.srs_scheduled = true;
}
}
}
-}
\ No newline at end of file
+}
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
index b9292876e350101907409e9843e5c1f3166cd64b..a86767ffbce097ee61c6324195a01ff050bf893a 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
@@ -38,17 +38,15 @@
extern RAN_CONTEXT_t RC;
-void nr_fill_nfapi_pucch(module_id_t mod_id,
- frame_t frame,
- sub_frame_t slot,
- const NR_sched_pucch_t *pucch,
- int UE_id)
-{
- gNB_MAC_INST *nr_mac = RC.nrmac[mod_id];
- NR_UE_info_t *UE_info = &nr_mac->UE_info;
+static void nr_fill_nfapi_pucch(gNB_MAC_INST *nrmac,
+ frame_t frame,
+ sub_frame_t slot,
+ const NR_sched_pucch_t *pucch,
+ NR_UE_info_t* UE)
+{
nfapi_nr_ul_tti_request_t *future_ul_tti_req =
- &RC.nrmac[mod_id]->UL_tti_req_ahead[0][pucch->ul_slot];
+ &nrmac->UL_tti_req_ahead[0][pucch->ul_slot];
AssertFatal(future_ul_tti_req->SFN == pucch->frame
&& future_ul_tti_req->Slot == pucch->ul_slot,
"Current %4d.%2d : future UL_tti_req's frame.slot %4d.%2d does not match PUCCH %4d.%2d\n",
@@ -57,9 +55,12 @@ void nr_fill_nfapi_pucch(module_id_t mod_id,
future_ul_tti_req->Slot,
pucch->frame,
pucch->ul_slot);
- AssertFatal(future_ul_tti_req->n_pdus <
- sizeof(future_ul_tti_req->pdus_list) / sizeof(future_ul_tti_req->pdus_list[0]),
- "Invalid future_ul_tti_req->n_pdus %d\n", future_ul_tti_req->n_pdus);
+ // n_pdus is number of pdus, so, in the array, it is the index of the next free element
+ if (future_ul_tti_req->n_pdus >= sizeofArray(future_ul_tti_req->pdus_list) ) {
+ LOG_E(NR_MAC,"future_ul_tti_req->n_pdus %d is full, slot: %d, sr flag %d dropping request\n",
+ future_ul_tti_req->n_pdus, pucch->ul_slot, pucch->sr_flag);
+ return;
+ }
future_ul_tti_req->pdus_list[future_ul_tti_req->n_pdus].pdu_type = NFAPI_NR_UL_CONFIG_PUCCH_PDU_TYPE;
future_ul_tti_req->pdus_list[future_ul_tti_req->n_pdus].pdu_size = sizeof(nfapi_nr_pucch_pdu_t);
nfapi_nr_pucch_pdu_t *pucch_pdu = &future_ul_tti_req->pdus_list[future_ul_tti_req->n_pdus].pucch_pdu;
@@ -77,9 +78,9 @@ void nr_fill_nfapi_pucch(module_id_t mod_id,
pucch->dai_c,
pucch->csi_bits,
pucch->resource_indicator);
-
- NR_ServingCellConfigCommon_t *scc = RC.nrmac[mod_id]->common_channels->ServingCellConfigCommon;
- NR_CellGroupConfig_t *cg=UE_info->CellGroup[UE_id];
+ NR_COMMON_channels_t * common_ch=nrmac->common_channels;
+ NR_ServingCellConfigCommon_t *scc = common_ch->ServingCellConfigCommon;
+ NR_CellGroupConfig_t *cg=UE->CellGroup;
NR_BWP_UplinkDedicated_t *ubwpd = cg && cg->spCellConfig && cg->spCellConfig->spCellConfigDedicated &&
cg->spCellConfig->spCellConfigDedicated->uplinkConfig ?
@@ -88,14 +89,14 @@ void nr_fill_nfapi_pucch(module_id_t mod_id,
LOG_D(NR_MAC,"%4d.%2d Calling nr_configure_pucch (ubwpd %p,r_pucch %d) pucch to be scheduled in %4d.%2d\n",
frame,slot,ubwpd,pucch->r_pucch,pucch->frame,pucch->ul_slot);
- const NR_SIB1_t *sib1 = nr_mac->common_channels[0].sib1 ? nr_mac->common_channels[0].sib1->message.choice.c1->choice.systemInformationBlockType1 : NULL;
+ const NR_SIB1_t *sib1 = common_ch->sib1 ? common_ch->sib1->message.choice.c1->choice.systemInformationBlockType1 : NULL;
nr_configure_pucch(sib1,
pucch_pdu,
scc,
- UE_info->CellGroup[UE_id],
- UE_info->UE_sched_ctrl[UE_id].active_ubwp,
+ UE->CellGroup,
+ UE->UE_sched_ctrl.active_ubwp,
ubwpd,
- UE_info->rnti[UE_id],
+ UE->rnti,
pucch->resource_indicator,
pucch->csi_bits,
pucch->dai_c,
@@ -139,22 +140,18 @@ int diff_rsrp_ssb_csi_meas_10_1_6_1_2[16] = {
};
-void nr_schedule_pucch(int Mod_idP,
+void nr_schedule_pucch(gNB_MAC_INST *nrmac,
frame_t frameP,
sub_frame_t slotP)
{
- gNB_MAC_INST *nrmac = RC.nrmac[Mod_idP];
if (!is_xlsch_in_slot(nrmac->ulsch_slot_bitmap[slotP / 64], slotP))
return;
- NR_UE_info_t *UE_info = &nrmac->UE_info;
- const NR_list_t *UE_list = &UE_info->list;
-
- for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ UE_iterator(nrmac->UE_info.list, UE) {
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
const int n = sizeof(sched_ctrl->sched_pucch) / sizeof(*sched_ctrl->sched_pucch);
for (int i = 0; i < n; i++) {
- NR_sched_pucch_t *curr_pucch = &UE_info->UE_sched_ctrl[UE_id].sched_pucch[i];
+ NR_sched_pucch_t *curr_pucch = &UE->UE_sched_ctrl.sched_pucch[i];
const uint16_t O_ack = curr_pucch->dai_c;
const uint16_t O_csi = curr_pucch->csi_bits;
const uint8_t O_sr = curr_pucch->sr_flag;
@@ -162,9 +159,11 @@ void nr_schedule_pucch(int Mod_idP,
|| frameP != curr_pucch->frame
|| slotP != curr_pucch->ul_slot)
continue;
- if (O_csi > 0) LOG_D(NR_MAC,"Scheduling PUCCH[%d] RX for UE %d in %4d.%2d O_ack %d, O_sr %d, O_csi %d\n",
- i,UE_id,curr_pucch->frame,curr_pucch->ul_slot,O_ack,O_sr,O_csi);
- nr_fill_nfapi_pucch(Mod_idP, frameP, slotP, curr_pucch, UE_id);
+
+ if (O_csi > 0)
+ LOG_D(NR_MAC,"Scheduling PUCCH[%d] RX for UE %04x in %4d.%2d O_ack %d, O_sr %d, O_csi %d\n",
+ i,UE->rnti,curr_pucch->frame,curr_pucch->ul_slot,O_ack,O_sr,O_csi);
+ nr_fill_nfapi_pucch(nrmac, frameP, slotP, curr_pucch, UE);
memset(curr_pucch, 0, sizeof(*curr_pucch));
}
}
@@ -565,7 +564,7 @@ void compute_cqi_bitlen(struct NR_CSI_ReportConfig *csi_reportconfig,
//!TODO : same function can be written to handle csi_resources
-void compute_csi_bitlen(NR_CSI_MeasConfig_t *csi_MeasConfig, NR_UE_info_t *UE_info, int UE_id, module_id_t Mod_idP){
+void compute_csi_bitlen(NR_CSI_MeasConfig_t *csi_MeasConfig, NR_UE_info_t *UE){
uint8_t csi_report_id = 0;
uint8_t nb_resources = 0;
NR_CSI_ReportConfig__reportQuantity_PR reportQuantity_type;
@@ -577,7 +576,7 @@ void compute_csi_bitlen(NR_CSI_MeasConfig_t *csi_MeasConfig, NR_UE_info_t *UE_in
for (csi_report_id=0; csi_report_id < csi_MeasConfig->csi_ReportConfigToAddModList->list.count; csi_report_id++){
struct NR_CSI_ReportConfig *csi_reportconfig = csi_MeasConfig->csi_ReportConfigToAddModList->list.array[csi_report_id];
// MAC structure for CSI measurement reports (per UE and per report)
- nr_csi_report_t *csi_report = &UE_info->csi_report_template[UE_id][csi_report_id];
+ nr_csi_report_t *csi_report = &UE->csi_report_template[csi_report_id];
// csi-ResourceConfigId of a CSI-ResourceConfig included in the configuration
// (either CSI-RS or SSB)
csi_ResourceConfigId = csi_reportconfig->resourcesForChannelMeasurement;
@@ -662,24 +661,22 @@ void compute_csi_bitlen(NR_CSI_MeasConfig_t *csi_MeasConfig, NR_UE_info_t *UE_in
}
-uint16_t nr_get_csi_bitlen(int Mod_idP,
- int UE_id,
+uint16_t nr_get_csi_bitlen(NR_UE_info_t *UE,
uint8_t csi_report_id) {
uint16_t csi_bitlen = 0;
uint16_t max_bitlen = 0;
- NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
L1_RSRP_bitlen_t * CSI_report_bitlen = NULL;
CSI_Meas_bitlen_t * csi_meas_bitlen = NULL;
- if (NR_CSI_ReportConfig__reportQuantity_PR_ssb_Index_RSRP==UE_info->csi_report_template[UE_id][csi_report_id].reportQuantity_type||
- NR_CSI_ReportConfig__reportQuantity_PR_cri_RSRP==UE_info->csi_report_template[UE_id][csi_report_id].reportQuantity_type){
- CSI_report_bitlen = &(UE_info->csi_report_template[UE_id][csi_report_id].CSI_report_bitlen); //This might need to be moodif for Aperiodic CSI-RS measurements
+ if (NR_CSI_ReportConfig__reportQuantity_PR_ssb_Index_RSRP==UE->csi_report_template[csi_report_id].reportQuantity_type||
+ NR_CSI_ReportConfig__reportQuantity_PR_cri_RSRP==UE->csi_report_template[csi_report_id].reportQuantity_type){
+ CSI_report_bitlen = &(UE->csi_report_template[csi_report_id].CSI_report_bitlen); //This might need to be moodif for Aperiodic CSI-RS measurements
csi_bitlen+= ((CSI_report_bitlen->cri_ssbri_bitlen * CSI_report_bitlen->nb_ssbri_cri) +
CSI_report_bitlen->rsrp_bitlen +(CSI_report_bitlen->diff_rsrp_bitlen *
(CSI_report_bitlen->nb_ssbri_cri -1 )));
} else{
- csi_meas_bitlen = &(UE_info->csi_report_template[UE_id][csi_report_id].csi_meas_bitlen); //This might need to be moodif for Aperiodic CSI-RS measurements
+ csi_meas_bitlen = &(UE->csi_report_template[csi_report_id].csi_meas_bitlen); //This might need to be moodif for Aperiodic CSI-RS measurements
uint16_t temp_bitlen;
for (int i=0; i<8; i++) {
temp_bitlen = (csi_meas_bitlen->cri_bitlen+
@@ -705,11 +702,10 @@ void nr_csi_meas_reporting(int Mod_idP,
NR_ServingCellConfigCommon_t *scc = RC.nrmac[Mod_idP]->common_channels->ServingCellConfigCommon;
const int n_slots_frame = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
- NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
- NR_list_t *UE_list = &UE_info->list;
- for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
- const NR_CellGroupConfig_t *CellGroup = UE_info->CellGroup[UE_id];
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+
+ UE_iterator(RC.nrmac[Mod_idP]->UE_info.list, UE ) {
+ const NR_CellGroupConfig_t *CellGroup = UE->CellGroup;
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
if ((sched_ctrl->rrc_processing_timer > 0) || (sched_ctrl->ul_failure==1 && get_softmodem_params()->phy_test==0)) {
continue;
}
@@ -761,13 +757,13 @@ void nr_csi_meas_reporting(int Mod_idP,
&& !curr_pucch->sr_flag
&& curr_pucch->dai_c == 0,
"PUCCH not free at index 1 for UE %04x\n",
- UE_info->rnti[UE_id]);
+ UE->rnti);
curr_pucch->r_pucch = -1;
curr_pucch->frame = frame;
curr_pucch->ul_slot = sched_slot;
curr_pucch->resource_indicator = res_index;
curr_pucch->csi_bits +=
- nr_get_csi_bitlen(Mod_idP,UE_id,csi_report_id);
+ nr_get_csi_bitlen(UE,csi_report_id);
const NR_SIB1_t *sib1 = RC.nrmac[Mod_idP]->common_channels[0].sib1 ? RC.nrmac[Mod_idP]->common_channels[0].sib1->message.choice.c1->choice.systemInformationBlockType1 : NULL;
NR_BWP_t *genericParameters = get_ul_bwp_genericParameters(sched_ctrl->active_ubwp,
@@ -819,37 +815,37 @@ void nr_csi_meas_reporting(int Mod_idP,
}
}
-__attribute__((unused))
-static void handle_dl_harq(module_id_t mod_id,
- int UE_id,
+static void handle_dl_harq(NR_UE_info_t * UE,
int8_t harq_pid,
- bool success)
+ bool success,
+ int harq_round_max)
{
- NR_UE_info_t *UE_info = &RC.nrmac[mod_id]->UE_info;
- NR_UE_harq_t *harq = &UE_info->UE_sched_ctrl[UE_id].harq_processes[harq_pid];
+ NR_UE_harq_t *harq = &UE->UE_sched_ctrl.harq_processes[harq_pid];
harq->feedback_slot = -1;
harq->is_waiting = false;
if (success) {
- add_tail_nr_list(&UE_info->UE_sched_ctrl[UE_id].available_dl_harq, harq_pid);
+ add_tail_nr_list(&UE->UE_sched_ctrl.available_dl_harq, harq_pid);
harq->round = 0;
harq->ndi ^= 1;
- } else if (harq->round >= RC.nrmac[mod_id]->harq_round_max - 1) {
- add_tail_nr_list(&UE_info->UE_sched_ctrl[UE_id].available_dl_harq, harq_pid);
+
+ } else if (harq->round >= harq_round_max - 1) {
+ add_tail_nr_list(&UE->UE_sched_ctrl.available_dl_harq, harq_pid);
harq->round = 0;
harq->ndi ^= 1;
- NR_mac_stats_t *stats = &UE_info->mac_stats[UE_id];
+
+ NR_mac_stats_t *stats = &UE->mac_stats;
stats->dl.errors++;
- LOG_D(NR_MAC, "retransmission error for UE %d (total %"PRIu64")\n", UE_id, stats->dl.errors);
+ LOG_D(NR_MAC, "retransmission error for UE %04x (total %"PRIu64")\n", UE->rnti, stats->dl.errors);
+
} else {
- LOG_D(PHY,"NACK for: pid %d, ue %x\n",harq_pid, UE_id);
- add_tail_nr_list(&UE_info->UE_sched_ctrl[UE_id].retrans_dl_harq, harq_pid);
+ LOG_D(PHY,"NACK for: pid %d, ue %04x\n",harq_pid, UE->rnti);
+ add_tail_nr_list(&UE->UE_sched_ctrl.retrans_dl_harq, harq_pid);
harq->round++;
}
}
-int checkTargetSSBInFirst64TCIStates_pdschConfig(int ssb_index_t, int Mod_idP, int UE_id) {
- NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
- NR_CellGroupConfig_t *CellGroup = UE_info->CellGroup[UE_id] ;
+int checkTargetSSBInFirst64TCIStates_pdschConfig(int ssb_index_t, NR_UE_info_t * UE) {
+ NR_CellGroupConfig_t *CellGroup = UE->CellGroup;
int nb_tci_states = CellGroup->spCellConfig->spCellConfigDedicated->initialDownlinkBWP->pdsch_Config->choice.setup->tci_StatesToAddModList->list.count;
NR_TCI_State_t *tci =NULL;
int i;
@@ -874,13 +870,12 @@ int checkTargetSSBInFirst64TCIStates_pdschConfig(int ssb_index_t, int Mod_idP, i
return -1;
}
-int checkTargetSSBInTCIStates_pdcchConfig(int ssb_index_t, int Mod_idP, int UE_id) {
- NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
- NR_CellGroupConfig_t *CellGroup = UE_info->CellGroup[UE_id] ;
+int checkTargetSSBInTCIStates_pdcchConfig(int ssb_index_t, NR_UE_info_t *UE) {
+ NR_CellGroupConfig_t *CellGroup = UE->CellGroup ;
int nb_tci_states = CellGroup->spCellConfig->spCellConfigDedicated->initialDownlinkBWP->pdsch_Config->choice.setup->tci_StatesToAddModList->list.count;
NR_TCI_State_t *tci =NULL;
NR_TCI_StateId_t *tci_id = NULL;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
NR_ControlResourceSet_t *coreset = sched_ctrl->coreset;
int i;
int flag = 0;
@@ -935,7 +930,7 @@ int get_diff_rsrp(uint8_t index, int strongest_rsrp) {
//identifies the target SSB Beam index
//keeps the required date for PDCCH and PDSCH TCI state activation/deactivation CE consutruction globally
//handles triggering of PDCCH and PDSCH MAC CEs
-void tci_handling(module_id_t Mod_idP, int UE_id, frame_t frame, slot_t slot) {
+void tci_handling(NR_UE_info_t *UE, frame_t frame, slot_t slot) {
int strongest_ssb_rsrp = 0;
int cqi_idx = 0;
@@ -947,10 +942,10 @@ void tci_handling(module_id_t Mod_idP, int UE_id, frame_t frame, slot_t slot) {
int ssb_index[MAX_NUM_SSB] = {0};
int ssb_rsrp[MAX_NUM_SSB] = {0};
uint8_t idx = 0;
- NR_UE_info_t *UE_info = &RC.nrmac[Mod_idP]->UE_info;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
- const int bwp_id = sched_ctrl->active_bwp ? sched_ctrl->active_bwp->bwp_Id : 0;
- NR_CellGroupConfig_t *CellGroup = UE_info->CellGroup[UE_id];
+
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
+ const int bwp_id = sched_ctrl->active_bwp ? 1 : 0;
+ NR_CellGroupConfig_t *CellGroup = UE->CellGroup;
//bwp indicator
int n_dl_bwp=0;
@@ -960,7 +955,7 @@ void tci_handling(module_id_t Mod_idP, int UE_id, frame_t frame, slot_t slot) {
n_dl_bwp = CellGroup->spCellConfig->spCellConfigDedicated->downlinkBWP_ToAddModList->list.count;
uint8_t nr_ssbri_cri = 0;
- uint8_t nb_of_csi_ssb_report = UE_info->csi_report_template[UE_id][cqi_idx].nb_of_csi_ssb_report;
+ uint8_t nb_of_csi_ssb_report = UE->csi_report_template[cqi_idx].nb_of_csi_ssb_report;
int better_rsrp_reported = -140-(-0); /*minimum_measured_RSRP_value - minimum_differntail_RSRP_value*///considering the minimum RSRP value as better RSRP initially
uint8_t diff_rsrp_idx = 0;
uint8_t i, j;
@@ -1031,7 +1026,7 @@ void tci_handling(module_id_t Mod_idP, int UE_id, frame_t frame, slot_t slot) {
The length of the field is 7 bits
*/
if(sched_ctrl->UE_mac_ce_ctrl.pdcch_state_ind.coresetId == 0) {
- int tci_state_id = checkTargetSSBInFirst64TCIStates_pdschConfig(ssb_index[target_ssb_beam_index], Mod_idP, UE_id);
+ int tci_state_id = checkTargetSSBInFirst64TCIStates_pdschConfig(ssb_index[target_ssb_beam_index], UE);
if( tci_state_id != -1)
sched_ctrl->UE_mac_ce_ctrl.pdcch_state_ind.tciStateId = tci_state_id;
@@ -1041,7 +1036,7 @@ void tci_handling(module_id_t Mod_idP, int UE_id, frame_t frame, slot_t slot) {
int flag = 0;
for(i =0; ssb_index_sorted[i]!=0; i++) {
- tci_state_id = checkTargetSSBInFirst64TCIStates_pdschConfig(ssb_index_sorted[i], Mod_idP, UE_id) ;
+ tci_state_id = checkTargetSSBInFirst64TCIStates_pdschConfig(ssb_index_sorted[i],UE) ;
if(tci_state_id != -1 && ssb_rsrp_sorted[i] > ssb_rsrp[curr_ssb_beam_index] && ssb_rsrp_sorted[i] - ssb_rsrp[curr_ssb_beam_index] > L1_RSRP_HYSTERIS) {
sched_ctrl->UE_mac_ce_ctrl.pdcch_state_ind.tciStateId = tci_state_id;
@@ -1055,7 +1050,7 @@ void tci_handling(module_id_t Mod_idP, int UE_id, frame_t frame, slot_t slot) {
}
}
} else {
- int tci_state_id = checkTargetSSBInTCIStates_pdcchConfig(ssb_index[target_ssb_beam_index], Mod_idP, UE_id);
+ int tci_state_id = checkTargetSSBInTCIStates_pdcchConfig(ssb_index[target_ssb_beam_index], UE);
if (tci_state_id !=-1)
sched_ctrl->UE_mac_ce_ctrl.pdcch_state_ind.tciStateId = tci_state_id;
@@ -1065,7 +1060,7 @@ void tci_handling(module_id_t Mod_idP, int UE_id, frame_t frame, slot_t slot) {
int flag = 0;
for(i =0; ssb_index_sorted[i]!=0; i++) {
- tci_state_id = checkTargetSSBInTCIStates_pdcchConfig(ssb_index_sorted[i], Mod_idP, UE_id);
+ tci_state_id = checkTargetSSBInTCIStates_pdcchConfig(ssb_index_sorted[i], UE);
if( tci_state_id != -1 && ssb_rsrp_sorted[i] > ssb_rsrp[curr_ssb_beam_index] && ssb_rsrp_sorted[i] - ssb_rsrp[curr_ssb_beam_index] > L1_RSRP_HYSTERIS) {
sched_ctrl->UE_mac_ce_ctrl.pdcch_state_ind.tciStateId = tci_state_id;
@@ -1126,15 +1121,14 @@ uint8_t pickandreverse_bits(uint8_t *payload, uint16_t bitlen, uint8_t start_bit
}
-void evaluate_rsrp_report(NR_UE_info_t *UE_info,
+void evaluate_rsrp_report(NR_UE_info_t *UE,
NR_UE_sched_ctrl_t *sched_ctrl,
- int UE_id,
uint8_t csi_report_id,
uint8_t *payload,
int *cumul_bits,
NR_CSI_ReportConfig__reportQuantity_PR reportQuantity_type){
- nr_csi_report_t *csi_report = &UE_info->csi_report_template[UE_id][csi_report_id];
+ nr_csi_report_t *csi_report = &UE->csi_report_template[csi_report_id];
uint8_t cri_ssbri_bitlen = csi_report->CSI_report_bitlen.cri_ssbri_bitlen;
uint16_t curr_payload;
@@ -1186,7 +1180,7 @@ void evaluate_rsrp_report(NR_UE_info_t *UE_info,
}
csi_report->nb_of_csi_ssb_report++;
int strongest_ssb_rsrp = get_measured_rsrp(sched_ctrl->CSI_report.ssb_cri_report.RSRP);
- NR_mac_stats_t *stats = &UE_info->mac_stats[UE_id];
+ NR_mac_stats_t *stats = &UE->mac_stats;
// including ssb rsrp in mac stats
stats->cumul_rsrp += strongest_ssb_rsrp;
stats->num_rsrp_meas++;
@@ -1324,22 +1318,19 @@ void extract_pucch_csi_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
const nfapi_nr_uci_pucch_pdu_format_2_3_4_t *uci_pdu,
frame_t frame,
slot_t slot,
- int UE_id,
- module_id_t Mod_idP) {
-
+ NR_UE_info_t *UE,
+ NR_ServingCellConfigCommon_t *scc)
+{
/** From Table 6.3.1.1.2-3: RI, LI, CQI, and CRI of codebookType=typeI-SinglePanel */
- NR_ServingCellConfigCommon_t *scc =
- RC.nrmac[Mod_idP]->common_channels->ServingCellConfigCommon;
const int n_slots_frame = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
uint8_t *payload = uci_pdu->csi_part1.csi_part1_payload;
uint16_t bitlen = uci_pdu->csi_part1.csi_part1_bit_len;
NR_CSI_ReportConfig__reportQuantity_PR reportQuantity_type = NR_CSI_ReportConfig__reportQuantity_PR_NOTHING;
- NR_UE_info_t *UE_info = &(RC.nrmac[Mod_idP]->UE_info);
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
int cumul_bits = 0;
int r_index = -1;
for (int csi_report_id = 0; csi_report_id < csi_MeasConfig->csi_ReportConfigToAddModList->list.count; csi_report_id++ ) {
- nr_csi_report_t *csi_report = &UE_info->csi_report_template[UE_id][csi_report_id];
+ nr_csi_report_t *csi_report = &UE->csi_report_template[csi_report_id];
csi_report->nb_of_csi_ssb_report = 0;
uint8_t cri_bitlen = 0;
uint8_t ri_bitlen = 0;
@@ -1354,10 +1345,10 @@ void extract_pucch_csi_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
LOG_D(MAC,"SFN/SF:%d/%d reportQuantity type = %d\n",frame,slot,reportQuantity_type);
switch(reportQuantity_type){
case NR_CSI_ReportConfig__reportQuantity_PR_cri_RSRP:
- evaluate_rsrp_report(UE_info,sched_ctrl,UE_id,csi_report_id,payload,&cumul_bits,reportQuantity_type);
+ evaluate_rsrp_report(UE,sched_ctrl,csi_report_id,payload,&cumul_bits,reportQuantity_type);
break;
case NR_CSI_ReportConfig__reportQuantity_PR_ssb_Index_RSRP:
- evaluate_rsrp_report(UE_info,sched_ctrl,UE_id,csi_report_id,payload,&cumul_bits,reportQuantity_type);
+ evaluate_rsrp_report(UE,sched_ctrl,csi_report_id,payload,&cumul_bits,reportQuantity_type);
break;
case NR_CSI_ReportConfig__reportQuantity_PR_cri_RI_CQI:
cri_bitlen = csi_report->csi_meas_bitlen.cri_bitlen;
@@ -1413,7 +1404,7 @@ void extract_pucch_csi_report(NR_CSI_MeasConfig_t *csi_MeasConfig,
}
}
-static NR_UE_harq_t *find_harq(module_id_t mod_id, frame_t frame, sub_frame_t slot, int UE_id)
+static NR_UE_harq_t *find_harq(frame_t frame, sub_frame_t slot, NR_UE_info_t * UE, int harq_round_max)
{
/* In case of realtime problems: we can only identify a HARQ process by
* timing. If the HARQ process's feedback_frame/feedback_slot is not the one we
@@ -1421,7 +1412,7 @@ static NR_UE_harq_t *find_harq(module_id_t mod_id, frame_t frame, sub_frame_t sl
* skip this HARQ process, which is what happens in the loop below.
* Similarly, we might be "in advance", in which case we need to skip
* this result. */
- NR_UE_sched_ctrl_t *sched_ctrl = &RC.nrmac[mod_id]->UE_info.UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
int8_t pid = sched_ctrl->feedback_dl_harq.head;
if (pid < 0)
return NULL;
@@ -1437,7 +1428,7 @@ static NR_UE_harq_t *find_harq(module_id_t mod_id, frame_t frame, sub_frame_t sl
frame,
slot);
remove_front_nr_list(&sched_ctrl->feedback_dl_harq);
- handle_dl_harq(mod_id, UE_id, pid, 0);
+ handle_dl_harq(UE, pid, 0, harq_round_max);
pid = sched_ctrl->feedback_dl_harq.head;
if (pid < 0)
return NULL;
@@ -1462,20 +1453,19 @@ void handle_nr_uci_pucch_0_1(module_id_t mod_id,
sub_frame_t slot,
const nfapi_nr_uci_pucch_pdu_format_0_1_t *uci_01)
{
- int UE_id = find_nr_UE_id(mod_id, uci_01->rnti);
- if (UE_id < 0) {
+ NR_UE_info_t * UE = find_nr_UE(&RC.nrmac[mod_id]->UE_info, uci_01->rnti);
+ if (!UE) {
LOG_E(NR_MAC, "%s(): unknown RNTI %04x in PUCCH UCI\n", __func__, uci_01->rnti);
return;
}
- NR_UE_info_t *UE_info = &RC.nrmac[mod_id]->UE_info;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
if (((uci_01->pduBitmap >> 1) & 0x01)) {
// iterate over received harq bits
for (int harq_bit = 0; harq_bit < uci_01->harq->num_harq; harq_bit++) {
const uint8_t harq_value = uci_01->harq->harq_list[harq_bit].harq_value;
const uint8_t harq_confidence = uci_01->harq->harq_confidence_level;
- NR_UE_harq_t *harq = find_harq(mod_id, frame, slot, UE_id);
+ NR_UE_harq_t *harq = find_harq(frame, slot, UE, RC.nrmac[mod_id]->harq_round_max);
if (!harq) {
LOG_E(NR_MAC, "Oh no! Could not find a harq in %s!\n", __FUNCTION__);
break;
@@ -1484,8 +1474,8 @@ void handle_nr_uci_pucch_0_1(module_id_t mod_id,
const int8_t pid = sched_ctrl->feedback_dl_harq.head;
remove_front_nr_list(&sched_ctrl->feedback_dl_harq);
LOG_D(NR_MAC,"%4d.%2d bit %d pid %d ack/nack %d\n",frame, slot, harq_bit,pid,harq_value);
- handle_dl_harq(mod_id, UE_id, pid, harq_value == 0 && harq_confidence == 0);
- if (harq_confidence == 1) UE_info->mac_stats[UE_id].pucch0_DTX++;
+ handle_dl_harq(UE, pid, harq_value == 0 && harq_confidence == 0, RC.nrmac[mod_id]->harq_round_max);
+ if (harq_confidence == 1) UE->mac_stats.pucch0_DTX++;
}
}
@@ -1510,19 +1500,21 @@ void handle_nr_uci_pucch_2_3_4(module_id_t mod_id,
sub_frame_t slot,
const nfapi_nr_uci_pucch_pdu_format_2_3_4_t *uci_234)
{
- int UE_id = find_nr_UE_id(mod_id, uci_234->rnti);
- if (UE_id < 0) {
+ NR_UE_info_t * UE = find_nr_UE(&RC.nrmac[mod_id]->UE_info, uci_234->rnti);
+ if (!UE) {
LOG_E(NR_MAC, "%s(): unknown RNTI %04x in PUCCH UCI\n", __func__, uci_234->rnti);
return;
}
- AssertFatal(RC.nrmac[mod_id]->UE_info.CellGroup[UE_id],"Cellgroup is null for UE %d/%x\n",UE_id,uci_234->rnti);
- AssertFatal(RC.nrmac[mod_id]->UE_info.CellGroup[UE_id]->spCellConfig, "Cellgroup->spCellConfig is null for UE %d/%x\n",UE_id,uci_234->rnti);
- AssertFatal(RC.nrmac[mod_id]->UE_info.CellGroup[UE_id]->spCellConfig->spCellConfigDedicated, "Cellgroup->spCellConfig->spCellConfigDedicated is null for UE %d/%x\n",UE_id,uci_234->rnti);
- if ( RC.nrmac[mod_id]->UE_info.CellGroup[UE_id]->spCellConfig->spCellConfigDedicated->csi_MeasConfig==NULL) return;
+ AssertFatal(UE->CellGroup,"Cellgroup is null for UE %04x\n", uci_234->rnti);
+ AssertFatal(UE->CellGroup->spCellConfig,
+ "Cellgroup->spCellConfig is null for UE %04x\n", uci_234->rnti);
+ AssertFatal(UE->CellGroup->spCellConfig->spCellConfigDedicated,
+ "Cellgroup->spCellConfig->spCellConfigDedicated is null for UE %04x\n", uci_234->rnti);
+ if ( UE->CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig==NULL)
+ return;
- NR_CSI_MeasConfig_t *csi_MeasConfig = RC.nrmac[mod_id]->UE_info.CellGroup[UE_id]->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup;
- NR_UE_info_t *UE_info = &RC.nrmac[mod_id]->UE_info;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_CSI_MeasConfig_t *csi_MeasConfig = UE->CellGroup->spCellConfig->spCellConfigDedicated->csi_MeasConfig->choice.setup;
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
// tpc (power control)
// TODO PUCCH2 SNR computation is not correct -> ignore the following
@@ -1535,20 +1527,20 @@ void handle_nr_uci_pucch_2_3_4(module_id_t mod_id,
// iterate over received harq bits
for (int harq_bit = 0; harq_bit < uci_234->harq.harq_bit_len; harq_bit++) {
const int acknack = ((uci_234->harq.harq_payload[harq_bit >> 3]) >> harq_bit) & 0x01;
- NR_UE_harq_t *harq = find_harq(mod_id, frame, slot, UE_id);
+ NR_UE_harq_t *harq = find_harq(frame, slot, UE, RC.nrmac[mod_id]->harq_round_max);
if (!harq)
break;
DevAssert(harq->is_waiting);
const int8_t pid = sched_ctrl->feedback_dl_harq.head;
remove_front_nr_list(&sched_ctrl->feedback_dl_harq);
- handle_dl_harq(mod_id, UE_id, pid, uci_234->harq.harq_crc != 1 && acknack);
+ handle_dl_harq(UE, pid, uci_234->harq.harq_crc != 1 && acknack, RC.nrmac[mod_id]->harq_round_max);
}
}
if ((uci_234->pduBitmap >> 2) & 0x01) {
//API to parse the csi report and store it into sched_ctrl
- extract_pucch_csi_report(csi_MeasConfig, uci_234, frame, slot, UE_id, mod_id);
+ extract_pucch_csi_report(csi_MeasConfig, uci_234, frame, slot, UE, RC.nrmac[mod_id]->common_channels->ServingCellConfigCommon);
//TCI handling function
- tci_handling(mod_id, UE_id,frame, slot);
+ tci_handling(UE,frame, slot);
}
if ((uci_234->pduBitmap >> 3) & 0x01) {
//@TODO:Handle CSI Report 2
@@ -1616,12 +1608,11 @@ bool test_acknack_vrb_occupation(NR_UE_sched_ctrl_t *sched_ctrl,
// if the function returns -1 it was not possible to schedule acknack
// when current pucch is ready to be scheduled nr_fill_nfapi_pucch is called
int nr_acknack_scheduling(int mod_id,
- int UE_id,
+ NR_UE_info_t * UE,
frame_t frame,
sub_frame_t slot,
int r_pucch,
int is_common) {
-
const int CC_id = 0;
const int minfbtime = RC.nrmac[mod_id]->minRXTXTIMEpdsch;
const NR_ServingCellConfigCommon_t *scc = RC.nrmac[mod_id]->common_channels[CC_id].ServingCellConfigCommon;
@@ -1639,8 +1630,8 @@ int nr_acknack_scheduling(int mod_id,
* * SR uses format 0 and is allocated in the first UL (mixed) slot (and not
* later)
* * each UE has dedicated PUCCH Format 0 resources, and we use index 0! */
- NR_UE_sched_ctrl_t *sched_ctrl = &RC.nrmac[mod_id]->UE_info.UE_sched_ctrl[UE_id];
- NR_CellGroupConfig_t *cg = RC.nrmac[mod_id]->UE_info.CellGroup[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
+ NR_CellGroupConfig_t *cg = UE->CellGroup;
NR_PUCCH_Config_t *pucch_Config = NULL;
if (sched_ctrl->active_ubwp) {
@@ -1675,11 +1666,13 @@ int nr_acknack_scheduling(int mod_id,
const int f = pucch->frame;
const int s = pucch->ul_slot;
LOG_D(NR_MAC, "In %s: %4d.%2d DAI = 2 pucch currently in %4d.%2d, advancing by 1 slot\n", __FUNCTION__, frame, slot, f, s);
- if (!(csi_pucch
- && csi_pucch->csi_bits > 0
- && csi_pucch->frame == f
- && csi_pucch->ul_slot == s))
- nr_fill_nfapi_pucch(mod_id, frame, slot, pucch, UE_id);
+
+ if (!(csi_pucch
+ && csi_pucch->csi_bits > 0
+ && csi_pucch->frame == f
+ && csi_pucch->ul_slot == s))
+ nr_fill_nfapi_pucch(RC.nrmac[mod_id], frame, slot, pucch, UE);
+
memset(pucch, 0, sizeof(*pucch));
pucch->frame = s == n_slots_frame - 1 ? (f + 1) % 1024 : f;
if(((s + 1)%nr_slots_period) == 0)
@@ -1696,7 +1689,8 @@ int nr_acknack_scheduling(int mod_id,
&& csi_pucch->ul_slot == pucch->ul_slot
&& !csi_pucch->simultaneous_harqcsi) {
LOG_D(NR_MAC,"Cannot multiplex csi_pucch for %d.%d\n",csi_pucch->frame,csi_pucch->ul_slot);
- nr_fill_nfapi_pucch(mod_id, frame, slot, csi_pucch, UE_id);
+ nr_fill_nfapi_pucch(RC.nrmac[mod_id], frame, slot, csi_pucch, UE);
+
memset(csi_pucch, 0, sizeof(*csi_pucch));
pucch->frame = pucch->ul_slot == n_slots_frame - 1 ? (pucch->frame + 1) % 1024 : pucch->frame;
if(((pucch->ul_slot + 1)%nr_slots_period) == 0)
@@ -1723,7 +1717,7 @@ int nr_acknack_scheduling(int mod_id,
const int bwp_id = sched_ctrl->active_bwp ? sched_ctrl->active_bwp->bwp_Id : 0;
int max_fb_time = 0;
- get_pdsch_to_harq_feedback(mod_id, UE_id, bwp_id, ss_type, &max_fb_time, pdsch_to_harq_feedback);
+ get_pdsch_to_harq_feedback(UE, bwp_id, ss_type, &max_fb_time, pdsch_to_harq_feedback);
LOG_D(NR_MAC, "In %s: 1b. DL %4d.%2d, UL_ACK %4d.%2d, DAI_C %d\n", __FUNCTION__, frame,slot,pucch->frame,pucch->ul_slot,pucch->dai_c);
/* there is a HARQ. Check whether we can use it for this ACKNACK */
@@ -1750,14 +1744,14 @@ int nr_acknack_scheduling(int mod_id,
csi_pucch->csi_bits > 0 &&
csi_pucch->frame == f &&
csi_pucch->ul_slot == s))
- nr_fill_nfapi_pucch(mod_id, frame, slot, pucch, UE_id);
+ nr_fill_nfapi_pucch(RC.nrmac[mod_id], frame, slot, pucch, UE);
memset(pucch, 0, sizeof(*pucch));
pucch->frame = s == n_slots_frame - 1 ? (f + 1) % 1024 : f;
if(((s + 1)%nr_slots_period) == 0)
pucch->ul_slot = (s + 1 + first_ul_slot_period) % n_slots_frame;
else
pucch->ul_slot = (s + 1) % n_slots_frame;
- return nr_acknack_scheduling(mod_id, UE_id, frame, slot, r_pucch,is_common);
+ return nr_acknack_scheduling(mod_id, UE, frame, slot, r_pucch,is_common);
}
pucch->timing_indicator = i;
@@ -1783,10 +1777,11 @@ int nr_acknack_scheduling(int mod_id,
((pucch->frame*n_slots_frame + pucch->ul_slot) <
(frame*n_slots_frame + slot))) {
AssertFatal(pucch->sr_flag + pucch->dai_c == 0,
- "expected no SR/AckNack for UE %d in %4d.%2d, but has %d/%d for %4d.%2d\n",
- UE_id, frame, slot, pucch->sr_flag, pucch->dai_c, pucch->frame, pucch->ul_slot);
+ "expected no SR/AckNack for UE %04x in %4d.%2d, but has %d/%d for %4d.%2d\n",
+ UE->rnti, frame, slot, pucch->sr_flag, pucch->dai_c, pucch->frame, pucch->ul_slot);
const int s = next_ul_slot;
pucch->frame = s < n_slots_frame ? frame : (frame + 1) % 1024;
+
pucch->ul_slot = s % n_slots_frame;
}
@@ -1834,11 +1829,11 @@ int nr_acknack_scheduling(int mod_id,
}
if (ind_found==-1) {
LOG_D(NR_MAC,
- "%4d.%2d could not find pdsch_to_harq_feedback for UE %d: earliest "
+ "%4d.%2d could not find pdsch_to_harq_feedback for UE %04x: earliest "
"ack slot %d\n",
frame,
slot,
- UE_id,
+ UE->rnti,
pucch->ul_slot);
return -1;
}
@@ -1852,8 +1847,9 @@ int nr_acknack_scheduling(int mod_id,
// FIXME currently we support at most 11 bits in pucch2 so skip also in that case
if(!csi_pucch->simultaneous_harqcsi
|| ((csi_pucch->csi_bits + csi_pucch->dai_c) >= 11)) {
+
LOG_D(NR_MAC,"Cannot multiplex csi_pucch %d +csi_pucch->dai_c %d for %d.%d\n",csi_pucch->csi_bits,csi_pucch->dai_c,csi_pucch->frame,csi_pucch->ul_slot);
- nr_fill_nfapi_pucch(mod_id, frame, slot, csi_pucch, UE_id);
+ nr_fill_nfapi_pucch(RC.nrmac[mod_id], frame, slot, csi_pucch, UE);
memset(csi_pucch, 0, sizeof(*csi_pucch));
/* advance the UL slot information in PUCCH by one so we won't schedule in
* the same slot again */
@@ -1865,7 +1861,7 @@ int nr_acknack_scheduling(int mod_id,
pucch->ul_slot = (s + 1 + first_ul_slot_period) % n_slots_frame;
else
pucch->ul_slot = (s + 1) % n_slots_frame;
- return nr_acknack_scheduling(mod_id, UE_id, frame, slot, r_pucch,is_common);
+ return nr_acknack_scheduling(mod_id, UE, frame, slot, r_pucch,is_common);
}
// multiplexing harq and csi in a pucch
else {
@@ -1902,29 +1898,26 @@ int nr_acknack_scheduling(int mod_id,
}
-void nr_sr_reporting(int Mod_idP, frame_t SFN, sub_frame_t slot)
+void nr_sr_reporting(gNB_MAC_INST *nrmac, frame_t SFN, sub_frame_t slot)
{
- gNB_MAC_INST *nrmac = RC.nrmac[Mod_idP];
if (!is_xlsch_in_slot(nrmac->ulsch_slot_bitmap[slot / 64], slot))
return;
NR_ServingCellConfigCommon_t *scc = nrmac->common_channels->ServingCellConfigCommon;
const int n_slots_frame = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
- NR_UE_info_t *UE_info = &nrmac->UE_info;
- NR_list_t *UE_list = &UE_info->list;
- for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ UE_iterator(nrmac->UE_info.list, UE) {
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
if (sched_ctrl->ul_failure==1) continue;
NR_PUCCH_Config_t *pucch_Config = NULL;
if (sched_ctrl->active_ubwp) {
pucch_Config = sched_ctrl->active_ubwp->bwp_Dedicated->pucch_Config->choice.setup;
- } else if (RC.nrmac[Mod_idP]->UE_info.CellGroup[UE_id] &&
- RC.nrmac[Mod_idP]->UE_info.CellGroup[UE_id]->spCellConfig &&
- RC.nrmac[Mod_idP]->UE_info.CellGroup[UE_id]->spCellConfig->spCellConfigDedicated &&
- RC.nrmac[Mod_idP]->UE_info.CellGroup[UE_id]->spCellConfig->spCellConfigDedicated->uplinkConfig &&
- RC.nrmac[Mod_idP]->UE_info.CellGroup[UE_id]->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP &&
- RC.nrmac[Mod_idP]->UE_info.CellGroup[UE_id]->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP->pucch_Config->choice.setup) {
- pucch_Config = RC.nrmac[Mod_idP]->UE_info.CellGroup[UE_id]->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP->pucch_Config->choice.setup;
+ } else if (UE->CellGroup &&
+ UE->CellGroup->spCellConfig &&
+ UE->CellGroup->spCellConfig->spCellConfigDedicated &&
+ UE->CellGroup->spCellConfig->spCellConfigDedicated->uplinkConfig &&
+ UE->CellGroup->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP &&
+ UE->CellGroup->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP->pucch_Config->choice.setup) {
+ pucch_Config = UE->CellGroup->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP->pucch_Config->choice.setup;
}
else continue;
@@ -1971,7 +1964,7 @@ void nr_sr_reporting(int Mod_idP, frame_t SFN, sub_frame_t slot)
continue;
nfapi_nr_pucch_pdu_t *pdu = &ul_tti_req->pdus_list[i].pucch_pdu;
/* check that it is our PUCCH F0. Assuming there can be only one */
- if (pdu->rnti == UE_info->rnti[UE_id]
+ if (pdu->rnti == UE->rnti
&& pdu->format_type == 0 // does not use NR_PUCCH_Resource__format_PR_format0
&& pdu->initial_cyclic_shift == pucch_res->format.choice.format0->initialCyclicShift
&& pdu->nr_of_symbols == pucch_res->format.choice.format0->nrofSymbols
@@ -1981,7 +1974,7 @@ void nr_sr_reporting(int Mod_idP, frame_t SFN, sub_frame_t slot)
nfapi_allocated = true;
break;
}
- else if (pdu->rnti == UE_info->rnti[UE_id]
+ else if (pdu->rnti == UE->rnti
&& pdu->format_type == 2 // does not use NR_PUCCH_Resource__format_PR_format0
&& pdu->nr_of_symbols == pucch_res->format.choice.format2->nrofSymbols
&& pdu->start_symbol_index == pucch_res->format.choice.format2->startingSymbolIndex) {
@@ -1991,7 +1984,7 @@ void nr_sr_reporting(int Mod_idP, frame_t SFN, sub_frame_t slot)
break;
}
- else if (pdu->rnti == UE_info->rnti[UE_id]
+ else if (pdu->rnti == UE->rnti
&& pdu->format_type == 1 // does not use NR_PUCCH_Resource__format_PR_format0
&& pdu->nr_of_symbols == pucch_res->format.choice.format1->nrofSymbols
&& pdu->start_symbol_index == pucch_res->format.choice.format1->startingSymbolIndex) {
@@ -2001,7 +1994,7 @@ void nr_sr_reporting(int Mod_idP, frame_t SFN, sub_frame_t slot)
break;
}
- else if (pdu->rnti == UE_info->rnti[UE_id]
+ else if (pdu->rnti == UE->rnti
&& pdu->format_type == 3 // does not use NR_PUCCH_Resource__format_PR_format0
&& pdu->nr_of_symbols == pucch_res->format.choice.format3->nrofSymbols
&& pdu->start_symbol_index == pucch_res->format.choice.format3->startingSymbolIndex) {
@@ -2011,7 +2004,7 @@ void nr_sr_reporting(int Mod_idP, frame_t SFN, sub_frame_t slot)
break;
}
- else if (pdu->rnti == UE_info->rnti[UE_id]
+ else if (pdu->rnti == UE->rnti
&& pdu->format_type == 4 // does not use NR_PUCCH_Resource__format_PR_format0
&& pdu->nr_of_symbols == pucch_res->format.choice.format4->nrofSymbols
&& pdu->start_symbol_index == pucch_res->format.choice.format4->startingSymbolIndex) {
@@ -2043,7 +2036,7 @@ void nr_sr_reporting(int Mod_idP, frame_t SFN, sub_frame_t slot)
.resource_indicator = found,
.r_pucch = -1
};
- nr_fill_nfapi_pucch(Mod_idP, SFN, slot, &sched_sr, UE_id);
+ nr_fill_nfapi_pucch(nrmac, SFN, slot, &sched_sr, UE);
}
}
}
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
index e375d580f0b84761fb00c9a97617c024b02ea2a6..5571d27597020bbac65627304ecca5df6ce718fd 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
@@ -86,8 +86,8 @@ const int get_ul_tda(const gNB_MAC_INST *nrmac, const NR_ServingCellConfigCommon
// F: length of L is 0:8 or 1:16 bits wide
// R: Reserved bit, set to zero.
-int nr_process_mac_pdu(module_id_t module_idP,
- int UE_id,
+int nr_process_mac_pdu( instance_t module_idP,
+ NR_UE_info_t* UE,
uint8_t CC_id,
frame_t frameP,
sub_frame_t slot,
@@ -98,11 +98,10 @@ int nr_process_mac_pdu(module_id_t module_idP,
uint8_t done = 0;
- NR_UE_info_t *UE_info = &RC.nrmac[module_idP]->UE_info;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
if ( pduP[0] != UL_SCH_LCID_PADDING )
- trace_NRpdu(DIRECTION_UPLINK, pduP, pdu_len, UE_id, WS_C_RNTI, UE_info->rnti[UE_id], frameP, 0, 0, 0);
+ trace_NRpdu(DIRECTION_UPLINK, pduP, pdu_len, WS_C_RNTI, UE->rnti, frameP, 0, 0, 0);
#ifdef ENABLE_MAC_PAYLOAD_DEBUG
LOG_I(NR_MAC, "In %s: dumping MAC PDU in %d.%d:\n", __func__, frameP, slot);
@@ -199,7 +198,7 @@ int nr_process_mac_pdu(module_id_t module_idP,
for (int i = 0; i < NR_NB_RA_PROC_MAX; i++) {
NR_RA_t *ra = &RC.nrmac[module_idP]->common_channels[CC_id].ra[i];
- if (ra->state >= WAIT_Msg3 && ra->rnti == UE_info->rnti[UE_id]) {
+ if (ra->state >= WAIT_Msg3 && ra->rnti == UE->rnti) {
ra->crnti = ((pduP[1]&0xFF)<<8)|(pduP[2]&0xFF);
ra->msg3_dcch_dtch = true;
LOG_I(NR_MAC, "Received UL_SCH_LCID_C_RNTI with C-RNTI 0x%04x\n", ra->crnti);
@@ -260,22 +259,23 @@ int nr_process_mac_pdu(module_id_t module_idP,
if (!get_mac_len(pduP, pdu_len, &mac_len, &mac_subheader_len))
return 0;
- rnti_t crnti = UE_info->rnti[UE_id];
- int UE_idx = UE_id;
+ rnti_t crnti = UE->rnti;
+ NR_UE_info_t* UE_idx = UE;
for (int i = 0; i < NR_NB_RA_PROC_MAX; i++) {
NR_RA_t *ra = &RC.nrmac[module_idP]->common_channels[CC_id].ra[i];
- if (ra->state >= WAIT_Msg3 && ra->rnti == UE_info->rnti[UE_id]) {
+ if (ra->state >= WAIT_Msg3 && ra->rnti == UE->rnti) {
uint8_t *next_subpduP = pduP + mac_subheader_len + mac_len;
if ((pduP[mac_subheader_len+mac_len] & 0x3F) == UL_SCH_LCID_C_RNTI) {
crnti = ((next_subpduP[1]&0xFF)<<8)|(next_subpduP[2]&0xFF);
- UE_idx = find_nr_UE_id(module_idP, crnti);
+ LOG_W(NR_MAC, " UL_SCH_LCID_SRB for rnti %04x\n", crnti);
+ UE_idx = find_nr_UE(&RC.nrmac[module_idP]->UE_info, crnti);
break;
}
}
}
- if (UE_info->CellGroup[UE_idx]) {
- LOG_D(NR_MAC, "[UE %d] Frame %d : ULSCH -> UL-DCCH %d (gNB %d, %d bytes), rnti: 0x%04x \n", module_idP, frameP, rx_lcid, module_idP, mac_len, crnti);
+ if (UE_idx->CellGroup) {
+ LOG_D(NR_MAC, "Frame %d : ULSCH -> UL-DCCH %d (gNB %ld, %d bytes), rnti: 0x%04x \n", frameP, rx_lcid, module_idP, mac_len, crnti);
mac_rlc_data_ind(module_idP,
crnti,
module_idP,
@@ -288,7 +288,7 @@ int nr_process_mac_pdu(module_id_t module_idP,
1,
NULL);
} else {
- AssertFatal(1==0,"[UE %d] Frame/Slot %d.%d : Received LCID %d which is not configured, dropping packet\n",UE_id,frameP,slot,rx_lcid);
+ AssertFatal(1==0,"[UE %04x] Frame/Slot %d.%d : Received LCID %d which is not configured, dropping packet\n",UE->rnti,frameP,slot,rx_lcid);
}
break;
case UL_SCH_LCID_SRB3:
@@ -326,7 +326,7 @@ int nr_process_mac_pdu(module_id_t module_idP,
frameP,
0,
0,
- UE_info->rnti[UE_id],
+ UE->rnti,
CCCH,
pduP + mac_subheader_len,
mac_len,
@@ -338,18 +338,19 @@ int nr_process_mac_pdu(module_id_t module_idP,
if (!get_mac_len(pduP, pdu_len, &mac_len, &mac_subheader_len))
return 0;
- LOG_D(NR_MAC, "[UE %x] %d.%d: ULSCH -> UL-%s %d (gNB %d, %d bytes)\n",
- UE_info->rnti[UE_id],
+
+ LOG_D(NR_MAC, "[UE %04x] %d.%d : ULSCH -> UL-%s %d (gNB %ld, %d bytes)\n",
+ UE->rnti,
frameP,
slot,
rx_lcid<4?"DCCH":"DTCH",
rx_lcid,
module_idP,
mac_len);
- UE_info->mac_stats[UE_id].ul.lc_bytes[rx_lcid] += mac_len;
+ UE->mac_stats.ul.lc_bytes[rx_lcid] += mac_len;
mac_rlc_data_ind(module_idP,
- UE_info->rnti[UE_id],
+ UE->rnti,
module_idP,
frameP,
ENB_FLAG_YES,
@@ -400,15 +401,14 @@ int nr_process_mac_pdu(module_id_t module_idP,
return 0;
}
-void abort_nr_ul_harq(module_id_t mod_id, int UE_id, int8_t harq_pid)
+void abort_nr_ul_harq( NR_UE_info_t* UE, int8_t harq_pid)
{
- NR_UE_info_t *UE_info = &RC.nrmac[mod_id]->UE_info;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
NR_UE_ul_harq_t *harq = &sched_ctrl->ul_harq_processes[harq_pid];
harq->ndi ^= 1;
harq->round = 0;
- UE_info->mac_stats[UE_id].ul.errors++;
+ UE->mac_stats.ul.errors++;
add_tail_nr_list(&sched_ctrl->available_ul_harq, harq_pid);
/* the transmission failed: the UE won't send the data we expected initially,
@@ -424,11 +424,11 @@ void handle_nr_ul_harq(const int CC_idP,
sub_frame_t slot,
const nfapi_nr_crc_t *crc_pdu)
{
- gNB_MAC_INST *gNB_mac = RC.nrmac[mod_id];
- int UE_id = find_nr_UE_id(mod_id, crc_pdu->rnti);
- if (UE_id < 0) {
+ NR_UE_info_t* UE = find_nr_UE(&RC.nrmac[mod_id]->UE_info, crc_pdu->rnti);
+ if (!UE) {
+ LOG_W(NR_MAC, "handle harq for rnti %04x, in RA process\n", crc_pdu->rnti);
for (int i = 0; i < NR_NB_RA_PROC_MAX; ++i) {
- NR_RA_t *ra = &gNB_mac->common_channels[CC_idP].ra[i];
+ NR_RA_t *ra = &RC.nrmac[mod_id]->common_channels[CC_idP].ra[i];
if (ra->state >= WAIT_Msg3 &&
ra->rnti == crc_pdu->rnti)
return;
@@ -436,8 +436,7 @@ void handle_nr_ul_harq(const int CC_idP,
LOG_E(NR_MAC, "%s(): unknown RNTI 0x%04x in PUSCH\n", __func__, crc_pdu->rnti);
return;
}
- NR_UE_info_t *UE_info = &RC.nrmac[mod_id]->UE_info;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
int8_t harq_pid = sched_ctrl->feedback_ul_harq.head;
LOG_D(NR_MAC, "Comparing crc_pdu->harq_id vs feedback harq_pid = %d %d\n",crc_pdu->harq_id, harq_pid);
while (crc_pdu->harq_id != harq_pid || harq_pid < 0) {
@@ -451,8 +450,9 @@ void handle_nr_ul_harq(const int CC_idP,
remove_front_nr_list(&sched_ctrl->feedback_ul_harq);
sched_ctrl->ul_harq_processes[harq_pid].is_waiting = false;
- if(sched_ctrl->ul_harq_processes[harq_pid].round >= gNB_mac->harq_round_max - 1) {
- abort_nr_ul_harq(mod_id, UE_id, harq_pid);
+
+ if(sched_ctrl->ul_harq_processes[harq_pid].round >= RC.nrmac[mod_id]->harq_round_max - 1) {
+ abort_nr_ul_harq(UE, harq_pid);
} else {
sched_ctrl->ul_harq_processes[harq_pid].round++;
add_tail_nr_list(&sched_ctrl->retrans_ul_harq, harq_pid);
@@ -472,8 +472,8 @@ void handle_nr_ul_harq(const int CC_idP,
harq_pid,
crc_pdu->rnti);
add_tail_nr_list(&sched_ctrl->available_ul_harq, harq_pid);
- } else if (harq->round >= gNB_mac->harq_round_max - 1) {
- abort_nr_ul_harq(mod_id, UE_id, harq_pid);
+ } else if (harq->round >= RC.nrmac[mod_id]->harq_round_max - 1) {
+ abort_nr_ul_harq(UE, harq_pid);
LOG_D(NR_MAC,
"RNTI %04x: Ulharq id %d crc failed in all rounds\n",
crc_pdu->rnti,
@@ -503,15 +503,15 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
const uint16_t rssi){
gNB_MAC_INST *gNB_mac = RC.nrmac[gnb_mod_idP];
- NR_UE_info_t *UE_info = &gNB_mac->UE_info;
const int current_rnti = rntiP;
- const int UE_id = find_nr_UE_id(gnb_mod_idP, current_rnti);
+ LOG_D(NR_MAC, "rx_sdu for rnti %04x\n", current_rnti);
const int target_snrx10 = gNB_mac->pusch_target_snrx10;
const int pusch_failure_thres = gNB_mac->pusch_failure_thres;
-
- if (UE_id != -1) {
- NR_UE_sched_ctrl_t *UE_scheduling_control = &UE_info->UE_sched_ctrl[UE_id];
+
+ NR_UE_info_t* UE = find_nr_UE(&gNB_mac->UE_info, current_rnti);
+ if (UE) {
+ NR_UE_sched_ctrl_t *UE_scheduling_control = &UE->UE_sched_ctrl;
const int8_t harq_pid = UE_scheduling_control->feedback_ul_harq.head;
if (sduP)
@@ -519,15 +519,14 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
T_INT(rntiP), T_INT(frameP), T_INT(slotP), T_INT(harq_pid),
T_BUFFER(sduP, sdu_lenP));
- UE_info->mac_stats[UE_id].ul.total_bytes += sdu_lenP;
- LOG_D(NR_MAC, "[gNB %d][PUSCH %d] CC_id %d %d.%d Received ULSCH sdu from PHY (rnti %x, UE_id %d) ul_cqi %d TA %d sduP %p, rssi %d\n",
+ UE->mac_stats.ul.total_bytes += sdu_lenP;
+ LOG_D(NR_MAC, "[gNB %d][PUSCH %d] CC_id %d %d.%d Received ULSCH sdu from PHY (rnti %04x) ul_cqi %d TA %d sduP %p, rssi %d\n",
gnb_mod_idP,
harq_pid,
CC_idP,
frameP,
slotP,
current_rnti,
- UE_id,
ul_cqi,
timing_advance,
sduP,
@@ -540,11 +539,13 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
UE_scheduling_control->ta_update = timing_advance;
UE_scheduling_control->raw_rssi = rssi;
UE_scheduling_control->pusch_snrx10 = ul_cqi * 5 - 640;
- LOG_D(NR_MAC, "[UE %d] PUSCH TPC %d(SNRx10 %d) and TA %d\n",UE_id,UE_scheduling_control->tpc0,UE_scheduling_control->pusch_snrx10,UE_scheduling_control->ta_update);
+
+ LOG_D(NR_MAC, "[UE %04x] PUSCH TPC %d and TA %d\n",UE->rnti,UE_scheduling_control->tpc0,UE_scheduling_control->ta_update);
}
else{
- LOG_D(NR_MAC,"[UE %d] Detected DTX : increasing UE TX power\n",UE_id);
+ LOG_D(NR_MAC,"[UE %04x] Detected DTX : increasing UE TX power\n",UE->rnti);
UE_scheduling_control->tpc0 = 1;
+
}
#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
@@ -562,13 +563,13 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
if (sduP != NULL){
LOG_D(NR_MAC, "Received PDU at MAC gNB \n");
- UE_info->UE_sched_ctrl[UE_id].pusch_consecutive_dtx_cnt = 0;
+ UE->UE_sched_ctrl.pusch_consecutive_dtx_cnt = 0;
const uint32_t tb_size = UE_scheduling_control->ul_harq_processes[harq_pid].sched_pusch.tb_size;
UE_scheduling_control->sched_ul_bytes -= tb_size;
if (UE_scheduling_control->sched_ul_bytes < 0)
UE_scheduling_control->sched_ul_bytes = 0;
- nr_process_mac_pdu(gnb_mod_idP, UE_id, CC_idP, frameP, slotP, sduP, sdu_lenP);
+ nr_process_mac_pdu(gnb_mod_idP, UE, CC_idP, frameP, slotP, sduP, sdu_lenP);
}
else {
NR_UE_ul_harq_t *cur_harq = &UE_scheduling_control->ul_harq_processes[harq_pid];
@@ -580,13 +581,15 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
UE_scheduling_control->sched_ul_bytes = 0;
}
if (ul_cqi <= 128) {
- UE_info->UE_sched_ctrl[UE_id].pusch_consecutive_dtx_cnt++;
- UE_info->mac_stats[UE_id].ulsch_DTX++;
+ UE->UE_sched_ctrl.pusch_consecutive_dtx_cnt++;
+ UE->mac_stats.ulsch_DTX++;
}
- if (!get_softmodem_params()->phy_test && UE_info->UE_sched_ctrl[UE_id].pusch_consecutive_dtx_cnt >= pusch_failure_thres) {
- LOG_W(NR_MAC,"%d.%d Detected UL Failure on PUSCH after %d PUSCH DTX, stopping scheduling\n",
- frameP,slotP,UE_info->UE_sched_ctrl[UE_id].pusch_consecutive_dtx_cnt);
- UE_info->UE_sched_ctrl[UE_id].ul_failure = 1;
+
+ if (!get_softmodem_params()->phy_test && UE->UE_sched_ctrl.pusch_consecutive_dtx_cnt >= pusch_failure_thres) {
+ LOG_W(NR_MAC,"Detected UL Failure on PUSCH after %d PUSCH DTX, stopping scheduling\n",
+ UE->UE_sched_ctrl.pusch_consecutive_dtx_cnt);
+ UE->UE_sched_ctrl.ul_failure = 1;
+
nr_mac_gNB_rrc_ul_failure(gnb_mod_idP,CC_idP,frameP,slotP,rntiP);
}
}
@@ -607,7 +610,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
T(T_GNB_MAC_UL_PDU_WITH_DATA, T_INT(gnb_mod_idP), T_INT(CC_idP),
T_INT(rntiP), T_INT(frameP), T_INT(slotP), T_INT(-1) /* harq_pid */,
T_BUFFER(sduP, sdu_lenP));
-
+
/* we don't know this UE (yet). Check whether there is a ongoing RA (Msg 3)
* and check the corresponding UE's RNTI match, in which case we activate
* it. */
@@ -615,7 +618,7 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
NR_RA_t *ra = &gNB_mac->common_channels[CC_idP].ra[i];
if (ra->state != WAIT_Msg3)
continue;
-
+
if(no_sig) {
LOG_D(NR_MAC, "Random Access %i failed at state %i (no signal)\n", i, ra->state);
nr_mac_remove_ra_rnti(gnb_mod_idP, ra->rnti);
@@ -638,20 +641,20 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
continue;
}
- int UE_id=-1;
- UE_id = add_new_nr_ue(gnb_mod_idP, ra->rnti, ra->CellGroup);
- if (UE_id<0) {
- LOG_D(NR_MAC, "Random Access %i discarded at state %i (TC_RNTI %04x RNTI %04x): max number of users achieved!\n", i, ra->state,ra->rnti,current_rnti);
+ NR_UE_info_t* UE = add_new_nr_ue(gNB_mac, ra->rnti, ra->CellGroup);
+ if (!UE) {
+ LOG_W(NR_MAC, "Random Access %i discarded at state %i (TC_RNTI %04x RNTI %04x): max number of users achieved!\n", i, ra->state,ra->rnti,current_rnti);
+
nr_mac_remove_ra_rnti(gnb_mod_idP, ra->rnti);
nr_clear_ra_proc(gnb_mod_idP, CC_idP, frameP, ra);
return;
}
- UE_info->UE_beam_index[UE_id] = ra->beam_id;
+ UE->UE_beam_index = ra->beam_id;
// re-initialize ta update variables after RA procedure completion
- UE_info->UE_sched_ctrl[UE_id].ta_frame = frameP;
+ UE->UE_sched_ctrl.ta_frame = frameP;
LOG_D(NR_MAC,
"reset RA state information for RA-RNTI 0x%04x/index %d\n",
@@ -660,27 +663,24 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
LOG_I(NR_MAC,
"[gNB %d][RAPROC] PUSCH with TC_RNTI 0x%04x received correctly, "
- "adding UE MAC Context UE_id %d/RNTI 0x%04x\n",
+ "adding UE MAC Context RNTI 0x%04x\n",
gnb_mod_idP,
current_rnti,
- UE_id,
ra->rnti);
- NR_UE_sched_ctrl_t *UE_scheduling_control = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *UE_scheduling_control = &UE->UE_sched_ctrl;
UE_scheduling_control->tpc0 = nr_get_tpc(target_snrx10,ul_cqi,30);
if (timing_advance != 0xffff)
UE_scheduling_control->ta_update = timing_advance;
UE_scheduling_control->raw_rssi = rssi;
UE_scheduling_control->pusch_snrx10 = ul_cqi * 5 - 640;
- LOG_D(NR_MAC, "[UE %d] PUSCH TPC %d and TA %d\n",UE_id,UE_scheduling_control->tpc0,UE_scheduling_control->ta_update);
+ LOG_D(NR_MAC, "[UE %04x] PUSCH TPC %d and TA %d\n",UE->rnti,UE_scheduling_control->tpc0,UE_scheduling_control->ta_update);
if(ra->cfra) {
- LOG_A(NR_MAC, "(ue %i, rnti 0x%04x) CFRA procedure succeeded!\n", UE_id, ra->rnti);
+ LOG_A(NR_MAC, "(rnti 0x%04x) CFRA procedure succeeded!\n", ra->rnti);
nr_mac_remove_ra_rnti(gnb_mod_idP, ra->rnti);
nr_clear_ra_proc(gnb_mod_idP, CC_idP, frameP, ra);
- UE_info->active[UE_id] = true;
-
process_CellGroup(ra->CellGroup, UE_scheduling_control);
} else {
@@ -696,25 +696,25 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
// First byte corresponds to R/LCID MAC sub-header
memcpy(ra->cont_res_id, &sduP[1], sizeof(uint8_t) * 6);
- if (nr_process_mac_pdu(gnb_mod_idP, UE_id, CC_idP, frameP, slotP, sduP, sdu_lenP) == 0) {
+ if (nr_process_mac_pdu(gnb_mod_idP, UE, CC_idP, frameP, slotP, sduP, sdu_lenP) == 0) {
ra->state = Msg4;
ra->Msg4_frame = (frameP + 2) % 1024;
ra->Msg4_slot = 1;
if (ra->msg3_dcch_dtch) {
// Check if the UE identified by C-RNTI still exists at the gNB
- int UE_id_C = find_nr_UE_id(gnb_mod_idP, ra->crnti);
- if (UE_id_C < 0) {
+ NR_UE_info_t * UE_C = find_nr_UE(&gNB_mac->UE_info, ra->crnti);
+ if (!UE_C) {
// The UE identified by C-RNTI no longer exists at the gNB
// Let's abort the current RA, so the UE will trigger a new RA later but using RRCSetupRequest instead. A better solution may be implemented
- mac_remove_nr_ue(gnb_mod_idP, ra->rnti);
+ mac_remove_nr_ue(gNB_mac, ra->rnti);
nr_clear_ra_proc(gnb_mod_idP, CC_idP, frameP, ra);
return;
} else {
// The UE identified by C-RNTI still exists at the gNB
// Reset uplink failure flags/counters/timers at MAC and at RRC so gNB will resume again scheduling resources for this UE
- UE_info->UE_sched_ctrl[UE_id_C].pusch_consecutive_dtx_cnt = 0;
- UE_info->UE_sched_ctrl[UE_id_C].ul_failure = 0;
+ UE_C->UE_sched_ctrl.pusch_consecutive_dtx_cnt = 0;
+ UE_C->UE_sched_ctrl.ul_failure = 0;
nr_mac_gNB_rrc_ul_failure_reset(gnb_mod_idP, frameP, slotP, ra->crnti);
}
}
@@ -753,7 +753,9 @@ void nr_rx_sdu(const module_id_t gnb_mod_idP,
return;
}
+
LOG_D(NR_MAC, "Random Access %i Msg3 CRC did not pass)\n", i);
+
ra->msg3_round++;
ra->state = Msg3_retransmission;
}
@@ -836,19 +838,20 @@ long get_K2(NR_ServingCellConfigCommon_t *scc,
return 3;
}
-bool nr_UE_is_to_be_scheduled(module_id_t mod_id, int CC_id, int UE_id, frame_t frame, sub_frame_t slot)
+static bool nr_UE_is_to_be_scheduled(const NR_ServingCellConfigCommon_t *scc,
+ int CC_id, NR_UE_info_t* UE, frame_t frame, sub_frame_t slot, uint32_t ulsch_max_frame_inactivity)
{
- const NR_ServingCellConfigCommon_t *scc = RC.nrmac[mod_id]->common_channels->ServingCellConfigCommon;
const int n = nr_slots_per_frame[*scc->ssbSubcarrierSpacing];
const int now = frame * n + slot;
- const struct gNB_MAC_INST_s *nrmac = RC.nrmac[mod_id];
- const NR_UE_sched_ctrl_t *sched_ctrl = &nrmac->UE_info.UE_sched_ctrl[UE_id];
+
+ const NR_UE_sched_ctrl_t *sched_ctrl =&UE->UE_sched_ctrl;
+
const NR_TDD_UL_DL_Pattern_t *tdd =
scc->tdd_UL_DL_ConfigurationCommon ? &scc->tdd_UL_DL_ConfigurationCommon->pattern1 : NULL;
int num_slots_per_period;
- int last_ul_slot,last_ul_sched;
+ int last_ul_slot;
int tdd_period_len[8] = {500,625,1000,1250,2000,2500,5000,10000};
if (tdd) { // Force the default transmission in a full slot as early as possible in the UL portion of TDD period (last_ul_slot)
num_slots_per_period = n*tdd_period_len[tdd->dl_UL_TransmissionPeriodicity]/10000;
@@ -859,14 +862,14 @@ bool nr_UE_is_to_be_scheduled(module_id_t mod_id, int CC_id, int UE_id, frame_t
last_ul_slot = sched_ctrl->last_ul_slot;
}
- last_ul_sched = sched_ctrl->last_ul_frame * n + last_ul_slot;
+ const int last_ul_sched = sched_ctrl->last_ul_frame * n + last_ul_slot;
const int diff = (now - last_ul_sched + 1024 * n) % (1024 * n);
/* UE is to be scheduled if
* (1) we think the UE has more bytes awaiting than what we scheduled
* (2) there is a scheduling request
* (3) or we did not schedule it in more than 10 frames */
const bool has_data = sched_ctrl->estimated_ul_buffer > sched_ctrl->sched_ul_bytes;
- const bool high_inactivity = diff >= (nrmac->ulsch_max_frame_inactivity>0 ? (nrmac->ulsch_max_frame_inactivity * n) : num_slots_per_period);
+ const bool high_inactivity = diff >= (ulsch_max_frame_inactivity > 0 ? ulsch_max_frame_inactivity * n : num_slots_per_period);
LOG_D(NR_MAC,
"%4d.%2d UL inactivity %d slots has_data %d SR %d\n",
frame,
@@ -877,34 +880,26 @@ bool nr_UE_is_to_be_scheduled(module_id_t mod_id, int CC_id, int UE_id, frame_t
return has_data || sched_ctrl->SR || high_inactivity;
}
-int next_list_entry_looped(NR_list_t *list, int UE_id)
-{
- if (UE_id < 0)
- return list->head;
- return list->next[UE_id] < 0 ? list->head : list->next[UE_id];
-}
-
-bool allocate_ul_retransmission(module_id_t module_id,
- frame_t frame,
- sub_frame_t slot,
- uint16_t *rballoc_mask,
- int *n_rb_sched,
- int UE_id,
- int harq_pid)
+static bool allocate_ul_retransmission(gNB_MAC_INST *nrmac,
+ frame_t frame,
+ sub_frame_t slot,
+ uint16_t *rballoc_mask,
+ int *n_rb_sched,
+ NR_UE_info_t* UE,
+ int harq_pid,
+ const NR_SIB1_t *sib1,
+ const NR_ServingCellConfigCommon_t *scc,
+ const int tda)
{
const int CC_id = 0;
- gNB_MAC_INST *nr_mac = RC.nrmac[module_id];
- const NR_ServingCellConfigCommon_t *scc = nr_mac->common_channels[CC_id].ServingCellConfigCommon;
- NR_UE_info_t *UE_info = &nr_mac->UE_info;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
NR_sched_pusch_t *retInfo = &sched_ctrl->ul_harq_processes[harq_pid].sched_pusch;
- NR_CellGroupConfig_t *cg = UE_info->CellGroup[UE_id];
+ NR_CellGroupConfig_t *cg = UE->CellGroup;
NR_BWP_UplinkDedicated_t *ubwpd = cg && cg->spCellConfig && cg->spCellConfig->spCellConfigDedicated &&
cg->spCellConfig->spCellConfigDedicated->uplinkConfig ?
cg->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP : NULL;
- const NR_SIB1_t *sib1 = RC.nrmac[module_id]->common_channels[0].sib1 ? RC.nrmac[module_id]->common_channels[0].sib1->message.choice.c1->choice.systemInformationBlockType1 : NULL;
NR_BWP_t *genericParameters = get_ul_bwp_genericParameters(sched_ctrl->active_ubwp,
(NR_ServingCellConfigCommon_t *)scc,
sib1);
@@ -913,7 +908,6 @@ bool allocate_ul_retransmission(module_id_t module_id,
const uint16_t bwpSize = NRRIV2BW(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);
const uint8_t nrOfLayers = 1;
const uint8_t num_dmrs_cdm_grps_no_data = (sched_ctrl->active_bwp || ubwpd) ? 1 : 2;
- const int tda = get_ul_tda(nr_mac, scc, retInfo->slot);
LOG_D(NR_MAC,"retInfo->time_domain_allocation = %d, tda = %d\n", retInfo->time_domain_allocation, tda);
LOG_D(NR_MAC,"num_dmrs_cdm_grps_no_data %d, tbs %d\n",num_dmrs_cdm_grps_no_data, retInfo->tb_size);
if (tda == retInfo->time_domain_allocation) {
@@ -943,7 +937,7 @@ bool allocate_ul_retransmission(module_id_t module_id,
while (rbStart < bwpSize && (rballoc_mask[rbStart] & slbitmap) != slbitmap)
rbStart++;
if (rbStart + retInfo->rbSize > bwpSize) {
- LOG_W(NR_MAC, "cannot allocate retransmission of UE %d/RNTI %04x: no resources (rbStart %d, retInfo->rbSize %d, bwpSize %d\n", UE_id, UE_info->rnti[UE_id], rbStart, retInfo->rbSize, bwpSize);
+ LOG_W(NR_MAC, "cannot allocate retransmission of RNTI %04x: no resources (rbStart %d, retInfo->rbSize %d, bwpSize %d\n", UE->rnti, rbStart, retInfo->rbSize, bwpSize);
return false;
}
LOG_D(NR_MAC, "%s(): retransmission keeping TDA %d and TBS %d\n", __func__, tda, retInfo->tb_size);
@@ -994,7 +988,7 @@ bool allocate_ul_retransmission(module_id_t module_id,
/* Find a free CCE */
const int cid = sched_ctrl->coreset->controlResourceSetId;
- const uint16_t Y = get_Y(cid%3, slot, UE_info->rnti[UE_id]);
+ const uint16_t Y = get_Y(cid%3, slot, UE->rnti);
uint8_t nr_of_candidates;
for (int i=0; i<5; i++) {
// for now taking the lowest value among the available aggregation levels
@@ -1004,7 +998,7 @@ bool allocate_ul_retransmission(module_id_t module_id,
1<<i);
if(nr_of_candidates>0) break;
}
- int CCEIndex = find_pdcch_candidate(RC.nrmac[module_id],
+ int CCEIndex = find_pdcch_candidate(nrmac,
CC_id,
sched_ctrl->aggregation_level,
nr_of_candidates,
@@ -1013,12 +1007,12 @@ bool allocate_ul_retransmission(module_id_t module_id,
Y);
if (CCEIndex<0) {
- LOG_D(NR_MAC, "%4d.%2d no free CCE for retransmission UL DCI UE %04x\n", frame, slot, UE_info->rnti[UE_id]);
+ LOG_D(NR_MAC, "%4d.%2d no free CCE for retransmission UL DCI UE %04x\n", frame, slot, UE->rnti);
return false;
}
sched_ctrl->cce_index = CCEIndex;
- fill_pdcch_vrb_map(RC.nrmac[module_id],
+ fill_pdcch_vrb_map(nrmac,
CC_id,
&sched_ctrl->sched_pdcch,
CCEIndex,
@@ -1034,11 +1028,10 @@ bool allocate_ul_retransmission(module_id_t module_id,
NR_sched_pusch_t *sched_pusch = &sched_ctrl->sched_pusch;
LOG_D(NR_MAC,
- "%4d.%2d Allocate UL retransmission UE %d/RNTI %04x sched %4d.%2d (%d RBs)\n",
+ "%4d.%2d Allocate UL retransmission RNTI %04x sched %4d.%2d (%d RBs)\n",
frame,
slot,
- UE_id,
- UE_info->rnti[UE_id],
+ UE->rnti,
sched_pusch->frame,
sched_pusch->slot,
sched_pusch->rbSize);
@@ -1065,12 +1058,20 @@ void update_ul_ue_R_Qm(NR_sched_pusch_t *sched_pusch, const NR_pusch_semi_static
}
}
-float ul_thr_ue[MAX_MOBILES_PER_GNB];
uint32_t ul_pf_tbs[3][29]; // pre-computed, approximate TBS values for PF coefficient
+typedef struct UEsched_s {
+ float coef;
+ NR_UE_info_t * UE;
+} UEsched_t;
+
+static int comparator(const void *p, const void *q) {
+ return ((UEsched_t*)p)->coef < ((UEsched_t*)q)->coef;
+}
+
void pf_ul(module_id_t module_id,
frame_t frame,
sub_frame_t slot,
- NR_list_t *UE_list,
+ NR_UE_info_t *UE_list[],
int max_num_ue,
int n_rb_sched,
uint16_t *rballoc_mask) {
@@ -1078,28 +1079,29 @@ void pf_ul(module_id_t module_id,
const int CC_id = 0;
gNB_MAC_INST *nrmac = RC.nrmac[module_id];
NR_ServingCellConfigCommon_t *scc = nrmac->common_channels[CC_id].ServingCellConfigCommon;
- NR_UE_info_t *UE_info = &nrmac->UE_info;
const NR_SIB1_t *sib1 = RC.nrmac[module_id]->common_channels[0].sib1 ? RC.nrmac[module_id]->common_channels[0].sib1->message.choice.c1->choice.systemInformationBlockType1 : NULL;
- const int min_rb = nrmac->min_grant_prb;
- float coeff_ue[MAX_MOBILES_PER_GNB];
+
+ const int min_rb = 5;
// UEs that could be scheduled
- int ue_array[MAX_MOBILES_PER_GNB];
- NR_list_t UE_sched = { .head = -1, .next = ue_array, .tail = -1, .len = MAX_MOBILES_PER_GNB };
+ UEsched_t UE_sched[MAX_MOBILES_PER_GNB] = {0};
+ int remainUEs=max_num_ue;
+ int curUE=0;
/* Loop UE_list to calculate throughput and coeff */
- for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
+ UE_iterator(UE_list, UE) {
- if (UE_info->Msg4_ACKed[UE_id] != true) continue;
+ if (UE->Msg4_ACKed != true)
+ continue;
- LOG_D(NR_MAC,"pf_ul: preparing UL scheduling for UE %d\n",UE_id);
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ LOG_D(NR_MAC,"pf_ul: preparing UL scheduling for UE %04x\n",UE->rnti);
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
NR_BWP_t *genericParameters = get_ul_bwp_genericParameters(sched_ctrl->active_ubwp,
scc,
sib1);
int rbStart = 0; // wrt BWP start
- NR_CellGroupConfig_t *cg = UE_info->CellGroup[UE_id];
+ NR_CellGroupConfig_t *cg = UE->CellGroup;
NR_BWP_UplinkDedicated_t *ubwpd = cg && cg->spCellConfig && cg->spCellConfig->spCellConfigDedicated &&
cg->spCellConfig->spCellConfigDedicated->uplinkConfig ?
cg->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP : NULL;
@@ -1107,45 +1109,46 @@ void pf_ul(module_id_t module_id,
const uint16_t bwpSize = NRRIV2BW(genericParameters->locationAndBandwidth, MAX_BWP_SIZE);
NR_sched_pusch_t *sched_pusch = &sched_ctrl->sched_pusch;
NR_pusch_semi_static_t *ps = &sched_ctrl->pusch_semi_static;
- const NR_mac_dir_stats_t *stats = &UE_info->mac_stats[UE_id].ul;
+ const NR_mac_dir_stats_t *stats = &UE->mac_stats.ul;
/* Calculate throughput */
const float a = 0.0005f; // corresponds to 200ms window
const uint32_t b = stats->current_bytes;
- ul_thr_ue[UE_id] = (1 - a) * ul_thr_ue[UE_id] + a * b;
+ UE->ul_thr_ue = (1 - a) * UE->ul_thr_ue + a * b;
/* Check if retransmission is necessary */
sched_pusch->ul_harq_pid = sched_ctrl->retrans_ul_harq.head;
- LOG_D(NR_MAC,"pf_ul: UE %d harq_pid %d\n",UE_id,sched_pusch->ul_harq_pid);
+ LOG_D(NR_MAC,"pf_ul: UE %04x harq_pid %d\n",UE->rnti,sched_pusch->ul_harq_pid);
if (sched_pusch->ul_harq_pid >= 0) {
/* Allocate retransmission*/
- bool r = allocate_ul_retransmission(
- module_id, frame, slot, rballoc_mask, &n_rb_sched, UE_id, sched_pusch->ul_harq_pid);
+ const int tda = get_ul_tda(nrmac, scc, sched_pusch->slot);
+ bool r = allocate_ul_retransmission(nrmac, frame, slot, rballoc_mask, &n_rb_sched, UE, sched_pusch->ul_harq_pid, sib1, scc, tda);
if (!r) {
- LOG_D(NR_MAC, "%4d.%2d UL retransmission UE RNTI %04x can NOT be allocated\n", frame, slot, UE_info->rnti[UE_id]);
+ LOG_D(NR_MAC, "%4d.%2d UL retransmission UE RNTI %04x can NOT be allocated\n", frame, slot, UE->rnti);
continue;
}
- else LOG_D(NR_MAC,"%4d.%2d UL Retransmission UE RNTI %04x to be allocated, max_num_ue %d\n",frame,slot,UE_info->rnti[UE_id],max_num_ue);
+ else LOG_D(NR_MAC,"%4d.%2d UL Retransmission UE RNTI %04x to be allocated, max_num_ue %d\n",frame,slot,UE->rnti,max_num_ue);
/* reduce max_num_ue once we are sure UE can be allocated, i.e., has CCE */
- max_num_ue--;
- if (max_num_ue < 0)
- return;
- continue;
- }
+ remainUEs--;
+ if (remainUEs == 0)
+ // we have filled all with mandatory retransmissions
+ // no need to schedule new transmissions
+ return;
+ continue;
+ }
const int B = max(0, sched_ctrl->estimated_ul_buffer - sched_ctrl->sched_ul_bytes);
/* preprocessor computed sched_frame/sched_slot */
- const bool do_sched = nr_UE_is_to_be_scheduled(module_id, 0, UE_id, sched_pusch->frame, sched_pusch->slot);
+ const bool do_sched = nr_UE_is_to_be_scheduled(scc, 0, UE, sched_pusch->frame, sched_pusch->slot, nrmac->ulsch_max_frame_inactivity);
- LOG_D(NR_MAC,"pf_ul: do_sched UE %d => %s\n",UE_id,do_sched ? "yes" : "no");
- if ((B == 0 && !do_sched) || (sched_ctrl->rrc_processing_timer > 0)) {
+ LOG_D(NR_MAC,"pf_ul: do_sched UE %04x => %s\n",UE->rnti,do_sched ? "yes" : "no");
+ if ((B == 0 && !do_sched) || (sched_ctrl->rrc_processing_timer > 0))
continue;
- }
-
+
const NR_bler_options_t *bo = &nrmac->ul_bler;
const int max_mcs = bo->max_mcs; /* no per-user maximum MCS yet */
- sched_pusch->mcs = get_mcs_from_bler(bo, stats, &sched_ctrl->ul_bler_stats, max_mcs, frame);
+ sched_pusch->mcs = get_mcs_from_bler(bo, stats, &UE->UE_sched_ctrl.ul_bler_stats, max_mcs, frame);
/* Schedule UE on SR or UL inactivity and no data (otherwise, will be scheduled
* based on data to transmit) */
@@ -1153,32 +1156,35 @@ void pf_ul(module_id_t module_id,
/* if no data, pre-allocate 5RB */
/* Find a free CCE */
const int cid = sched_ctrl->coreset->controlResourceSetId;
- const uint16_t Y = get_Y(cid%3, slot, UE_info->rnti[UE_id]);
+ const uint16_t Y = get_Y(cid%3, slot, UE->rnti);
uint8_t nr_of_candidates;
for (int i=0; i<5; i++) {
- // for now taking the lowest value among the available aggregation levels
- find_aggregation_candidates(&sched_ctrl->aggregation_level,
- &nr_of_candidates,
- sched_ctrl->search_space,
- 1<<i);
- if(nr_of_candidates>0) break;
+ // for now taking the lowest value among the available aggregation levels
+ find_aggregation_candidates(&sched_ctrl->aggregation_level,
+ &nr_of_candidates,
+ sched_ctrl->search_space,
+ 1<<i);
+ if(nr_of_candidates>0) break;
}
int CCEIndex = find_pdcch_candidate(RC.nrmac[module_id],
- CC_id,
- sched_ctrl->aggregation_level,
- nr_of_candidates,
- &sched_ctrl->sched_pdcch,
- sched_ctrl->coreset,
- Y);
-
+ CC_id,
+ sched_ctrl->aggregation_level,
+ nr_of_candidates,
+ &sched_ctrl->sched_pdcch,
+ sched_ctrl->coreset,
+ Y);
+
if (CCEIndex<0) {
- LOG_D(NR_MAC, "%4d.%2d no free CCE for UL DCI UE %04x (BSR 0)\n", frame, slot, UE_info->rnti[UE_id]);
- continue;
+ LOG_D(NR_MAC, "%4d.%2d no free CCE for UL DCI UE %04x (BSR 0)\n", frame, slot, UE->rnti);
+ continue;
}
/* reduce max_num_ue once we are sure UE can be allocated, i.e., has CCE */
- max_num_ue--;
- if (max_num_ue < 0)
- return;
+ remainUEs--;
+
+ if (remainUEs == 0)
+ // we have filled all with mandatory retransmissions
+ // no need to schedule new transmissions
+ return;
/* Save PUSCH field */
/* we want to avoid a lengthy deduction of DMRS and other parameters in
@@ -1209,8 +1215,8 @@ void pf_ul(module_id_t module_id,
while (rbStart < bwpSize && (rballoc_mask[rbStart] & slbitmap) != slbitmap)
rbStart++;
if (rbStart + min_rb >= bwpSize) {
- LOG_W(NR_MAC, "cannot allocate continuous UL data for UE %d/RNTI %04x: no resources (rbStart %d, min_rb %d, bwpSize %d\n",
- UE_id, UE_info->rnti[UE_id],rbStart,min_rb,bwpSize);
+ LOG_W(NR_MAC, "cannot allocate continuous UL data for RNTI %04x: no resources (rbStart %d, min_rb %d, bwpSize %d\n",
+ UE->rnti,rbStart,min_rb,bwpSize);
return;
}
@@ -1245,40 +1251,27 @@ void pf_ul(module_id_t module_id,
}
/* Create UE_sched for UEs eligibale for new data transmission*/
- add_tail_nr_list(&UE_sched, UE_id);
-
/* Calculate coefficient*/
const uint32_t tbs = ul_pf_tbs[ps->mcs_table][sched_pusch->mcs];
- coeff_ue[UE_id] = (float) tbs / ul_thr_ue[UE_id];
- LOG_D(NR_MAC,"b %d, ul_thr_ue[%d] %f, tbs %d, coeff_ue[%d] %f\n",
- b, UE_id, ul_thr_ue[UE_id], tbs, UE_id, coeff_ue[UE_id]);
+ float coeff_ue = (float) tbs / UE->ul_thr_ue;
+ LOG_D(NR_MAC,"rnti %04x b %d, ul_thr_ue %f, tbs %d, coeff_ue %f\n",
+ UE->rnti, b, UE->ul_thr_ue, tbs, coeff_ue);
+ UE_sched[curUE].coef=coeff_ue;
+ UE_sched[curUE].UE=UE;
+ curUE++;
}
-
+ qsort(UE_sched, sizeof(*UE_sched), sizeofArray(UE_sched), comparator);
+ UEsched_t *iterator=UE_sched;
+
const int min_rbSize = 5;
/* Loop UE_sched to find max coeff and allocate transmission */
- while (UE_sched.head >= 0 && max_num_ue> 0 && n_rb_sched >= min_rbSize) {
- /* Find max coeff */
- int *max = &UE_sched.head; /* Find max coeff: assume head is max */
- int *p = &UE_sched.next[*max];
- while (*p >= 0) {
- /* Find max coeff: if the current one has larger coeff, save for later */
- if (coeff_ue[*p] > coeff_ue[*max])
- max = p;
- p = &UE_sched.next[*p];
- }
- /* Find max coeff: remove the max one: do not use remove_nr_list() since it
- * goes through the whole list every time. Note that UE_sched.tail might
- * not be set correctly anymore */
- const int UE_id = *max;
- p = &UE_sched.next[*max];
- *max = UE_sched.next[*max];
- *p = -1;
+ while (remainUEs> 0 && n_rb_sched >= min_rbSize && iterator->UE != NULL) {
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &iterator->UE->UE_sched_ctrl;
const int cid = sched_ctrl->coreset->controlResourceSetId;
- const uint16_t Y = get_Y(cid%3, slot, UE_info->rnti[UE_id]);
+ const uint16_t Y = get_Y(cid%3, slot, iterator->UE->rnti);
uint8_t nr_of_candidates;
for (int i=0; i<5; i++) {
// for now taking the lowest value among the available aggregation levels
@@ -1286,7 +1279,8 @@ void pf_ul(module_id_t module_id,
&nr_of_candidates,
sched_ctrl->search_space,
1<<i);
- if(nr_of_candidates>0) break;
+ if(nr_of_candidates>0)
+ break;
}
int CCEIndex = find_pdcch_candidate(RC.nrmac[module_id],
CC_id,
@@ -1296,16 +1290,13 @@ void pf_ul(module_id_t module_id,
sched_ctrl->coreset,
Y);
if (CCEIndex<0) {
- LOG_D(NR_MAC, "%4d.%2d no free CCE for UL DCI UE %04x\n", frame, slot, UE_info->rnti[UE_id]);
+ LOG_D(NR_MAC, "%4d.%2d no free CCE for UL DCI UE %04x\n", frame, slot, iterator->UE->rnti);
+ iterator++;
continue;
}
- else LOG_D(NR_MAC, "%4d.%2d free CCE for UL DCI UE %04x\n",frame,slot, UE_info->rnti[UE_id]);
-
- /* reduce max_num_ue once we are sure UE can be allocated, i.e., has CCE */
- max_num_ue--;
- AssertFatal(max_num_ue >= 0, "Illegal max_num_ue %d\n", max_num_ue);
+ else LOG_D(NR_MAC, "%4d.%2d free CCE for UL DCI UE %04x\n",frame,slot, iterator->UE->rnti);
- NR_CellGroupConfig_t *cg = UE_info->CellGroup[UE_id];
+ NR_CellGroupConfig_t *cg = iterator->UE->CellGroup;
NR_BWP_UplinkDedicated_t *ubwpd = cg && cg->spCellConfig && cg->spCellConfig->spCellConfigDedicated
&& cg->spCellConfig->spCellConfigDedicated->uplinkConfig ?
cg->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP : NULL;
@@ -1352,11 +1343,12 @@ void pf_ul(module_id_t module_id,
max_rbSize++;
if (rbStart + min_rb >= bwpSize) {
- LOG_W(NR_MAC, "cannot allocate UL data for UE %d/RNTI %04x: no resources (rbStart %d, min_rb %d, bwpSize %d\n",
- UE_id, UE_info->rnti[UE_id],rbStart,min_rb,bwpSize);
+ LOG_W(NR_MAC, "cannot allocate UL data for RNTI %04x: no resources (rbStart %d, min_rb %d, bwpSize %d)\n",
+ iterator->UE->rnti,rbStart,min_rb,bwpSize);
return;
}
- else LOG_D(NR_MAC,"allocating UL data for UE %d/RNTI %04x (rbStsart %d, min_rb %d, bwpSize %d\n",UE_id, UE_info->rnti[UE_id],rbStart,min_rb,bwpSize);
+ else
+ LOG_D(NR_MAC,"allocating UL data for RNTI %04x (rbStsart %d, min_rb %d, bwpSize %d)\n", iterator->UE->rnti,rbStart,min_rb,bwpSize);
/* Calculate the current scheduling bytes and the necessary RBs */
const int B = cmax(sched_ctrl->estimated_ul_buffer - sched_ctrl->sched_ul_bytes, 0);
@@ -1389,7 +1381,11 @@ void pf_ul(module_id_t module_id,
n_rb_sched -= sched_pusch->rbSize;
for (int rb = 0; rb < sched_ctrl->sched_pusch.rbSize; rb++)
+
rballoc_mask[rb + sched_ctrl->sched_pusch.rbStart] ^= slbitmap;
+ /* reduce max_num_ue once we are sure UE can be allocated, i.e., has CCE */
+ remainUEs--;
+ iterator++;
}
}
@@ -1406,9 +1402,8 @@ bool nr_fr1_ulsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t
const int mu = scc ? scc->uplinkConfigCommon->initialUplinkBWP->genericParameters.subcarrierSpacing :
scc_sib1->uplinkConfigCommon->initialUplinkBWP.genericParameters.subcarrierSpacing;
- NR_UE_info_t *UE_info = &nr_mac->UE_info;
-
- if (UE_info->num_UEs == 0)
+ if (nr_mac->UE_info.list[0] == NULL)
+ // no UEs
return false;
const int CC_id = 0;
@@ -1417,8 +1412,7 @@ bool nr_fr1_ulsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t
* have the same K2 (we don't support multiple/different K2s via different
* TDAs yet). If the TDA is negative, it means that there is no UL slot to
* schedule now (slot + k2 is not UL slot) */
- int UE_id = UE_info->list.head;
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ NR_UE_sched_ctrl_t *sched_ctrl = &nr_mac->UE_info.list[0]->UE_sched_ctrl;
const int temp_tda = get_ul_tda(nr_mac, scc, slot);
int K2 = get_K2(scc, scc_sib1, sched_ctrl->active_ubwp, temp_tda, mu);
const int sched_frame = (frame + (slot + K2 >= nr_slots_per_frame[mu])) & 1023;
@@ -1444,9 +1438,8 @@ bool nr_fr1_ulsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t
return false;
// Avoid slots with the SRS
- const NR_list_t *UE_list = &UE_info->list;
- for (int UE_idx = UE_list->head; UE_idx >= 0; UE_idx = UE_list->next[UE_idx]) {
- NR_sched_srs_t sched_srs = UE_info->UE_sched_ctrl[UE_idx].sched_srs;
+ UE_iterator(nr_mac->UE_info.list, UE) {
+ NR_sched_srs_t sched_srs = UE->UE_sched_ctrl.sched_srs;
if(sched_srs.srs_scheduled && sched_srs.frame==sched_frame && sched_srs.slot==sched_slot) {
return false;
}
@@ -1454,10 +1447,11 @@ bool nr_fr1_ulsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t
sched_ctrl->sched_pusch.slot = sched_slot;
sched_ctrl->sched_pusch.frame = sched_frame;
- for (UE_id = UE_info->list.next[UE_id]; UE_id >= 0; UE_id = UE_info->list.next[UE_id]) {
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ UE_iterator(nr_mac->UE_info.list, UE2) {
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE2->UE_sched_ctrl;
AssertFatal(K2 == get_K2(scc,scc_sib1,sched_ctrl->active_ubwp, tda, mu),
- "Different K2, %d(UE%d) != %ld(UE%d)\n", K2, 0, get_K2(scc,scc_sib1,sched_ctrl->active_ubwp, tda, mu), UE_id);
+ "Different K2, %d(UE%d) != %ld(UE%04x)\n",
+ K2, 0, get_K2(scc,scc_sib1,sched_ctrl->active_ubwp, tda, mu), UE2->rnti);
sched_ctrl->sched_pusch.slot = sched_slot;
sched_ctrl->sched_pusch.frame = sched_frame;
}
@@ -1517,7 +1511,7 @@ bool nr_fr1_ulsch_preprocessor(module_id_t module_id, frame_t frame, sub_frame_t
pf_ul(module_id,
frame,
slot,
- &UE_info->list,
+ nr_mac->UE_info.list,
2,
len,
rballoc_mask);
@@ -1578,30 +1572,28 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
NR_ServingCellConfigCommon_t *scc = RC.nrmac[module_id]->common_channels[0].ServingCellConfigCommon;
- NR_UE_info_t *UE_info = &RC.nrmac[module_id]->UE_info;
+ NR_UEs_t *UE_info = &RC.nrmac[module_id]->UE_info;
const NR_SIB1_t *sib1 = RC.nrmac[module_id]->common_channels[0].sib1 ? RC.nrmac[module_id]->common_channels[0].sib1->message.choice.c1->choice.systemInformationBlockType1 : NULL;
- const NR_list_t *UE_list = &UE_info->list;
- for (int UE_id = UE_list->head; UE_id >= 0; UE_id = UE_list->next[UE_id]) {
- NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
+ UE_iterator( UE_info->list, UE) {
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
if (sched_ctrl->ul_failure == 1 && get_softmodem_params()->phy_test==0) continue;
- NR_CellGroupConfig_t *cg = UE_info->CellGroup[UE_id];
+ NR_CellGroupConfig_t *cg = UE->CellGroup;
NR_BWP_UplinkDedicated_t *ubwpd = cg && cg->spCellConfig && cg->spCellConfig->spCellConfigDedicated &&
cg->spCellConfig->spCellConfigDedicated->uplinkConfig ?
cg->spCellConfig->spCellConfigDedicated->uplinkConfig->initialUplinkBWP : NULL;
- NR_mac_stats_t *mac_stats = &UE_info->mac_stats[UE_id];
- mac_stats->ul.current_bytes = 0;
+ UE->mac_stats.ul.current_bytes = 0;
/* dynamic PUSCH values (RB alloc, MCS, hence R, Qm, TBS) that change in
* every TTI are pre-populated by the preprocessor and used below */
NR_sched_pusch_t *sched_pusch = &sched_ctrl->sched_pusch;
- LOG_D(NR_MAC,"UE %x : sched_pusch->rbSize %d\n",UE_info->rnti[UE_id],sched_pusch->rbSize);
+ LOG_D(NR_MAC,"UE %04x : sched_pusch->rbSize %d\n",UE->rnti,sched_pusch->rbSize);
if (sched_pusch->rbSize <= 0)
continue;
- uint16_t rnti = UE_info->rnti[UE_id];
+ uint16_t rnti = UE->rnti;
sched_ctrl->SR = false;
int8_t harq_id = sched_pusch->ul_harq_pid;
@@ -1609,8 +1601,8 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
/* PP has not selected a specific HARQ Process, get a new one */
harq_id = sched_ctrl->available_ul_harq.head;
AssertFatal(harq_id >= 0,
- "no free HARQ process available for UE %d\n",
- UE_id);
+ "no free HARQ process available for UE %04x\n",
+ UE->rnti);
remove_front_nr_list(&sched_ctrl->available_ul_harq);
sched_pusch->ul_harq_pid = harq_id;
} else {
@@ -1636,10 +1628,10 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
NR_pusch_semi_static_t *ps = &sched_ctrl->pusch_semi_static;
/* Statistics */
- AssertFatal(cur_harq->round < 8, "Indexing UL rounds[%d] is out of bounds\n", cur_harq->round);
- mac_stats->ul.rounds[cur_harq->round]++;
+ AssertFatal(cur_harq->round < 8, "Indexing ulsch_rounds[%d] is out of bounds\n", cur_harq->round);
+ UE->mac_stats.ul.rounds[cur_harq->round]++;
if (cur_harq->round == 0) {
- mac_stats->ulsch_total_bytes_scheduled += sched_pusch->tb_size;
+ UE->mac_stats.ulsch_total_bytes_scheduled += sched_pusch->tb_size;
/* Save information on MCS, TBS etc for the current initial transmission
* so we have access to it when retransmitting */
cur_harq->sched_pusch = *sched_pusch;
@@ -1659,7 +1651,7 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
cur_harq->round,
cur_harq->ndi);
}
- mac_stats->ul.current_bytes = sched_pusch->tb_size;
+ UE->mac_stats.ul.current_bytes = sched_pusch->tb_size;
sched_ctrl->last_ul_frame = sched_pusch->frame;
sched_ctrl->last_ul_slot = sched_pusch->slot;
@@ -1842,7 +1834,7 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
pdcch_pdu_coreset[coresetid] = pdcch_pdu;
}
- LOG_D(NR_MAC,"Configuring ULDCI/PDCCH in %d.%d at CCE %d, rnti %x\n", frame,slot,sched_ctrl->cce_index,rnti);
+ LOG_D(NR_MAC,"Configuring ULDCI/PDCCH in %d.%d at CCE %d, rnti %04x\n", frame,slot,sched_ctrl->cce_index,rnti);
/* Fill PDCCH DL DCI PDU */
nfapi_nr_dl_dci_pdu_t *dci_pdu = &pdcch_pdu->dci_pdu[pdcch_pdu->numDlDci];
@@ -1880,7 +1872,7 @@ void nr_schedule_ulsch(module_id_t module_id, frame_t frame, sub_frame_t slot)
&uldci_payload,
ps->dci_format,
ps->time_domain_allocation,
- UE_info->UE_sched_ctrl[UE_id].tpc0,
+ UE->UE_sched_ctrl.tpc0,
n_ubwp,
bwp_id);
fill_dci_pdu_rel15(scc,
diff --git a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
index 13e0d67814776e1124579d70294913a6844bc93d..bdceb288b5597f67b1694383bd929b5180cff958 100644
--- a/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+++ b/openair2/LAYER2/NR_MAC_gNB/mac_proto.h
@@ -203,7 +203,7 @@ void config_uldci(const NR_SIB1_t *sib1,
int n_ubwp,
int bwp_id);
-void nr_schedule_pucch(int Mod_idP,
+void nr_schedule_pucch(gNB_MAC_INST* nrmac,
frame_t frameP,
sub_frame_t slotP);
@@ -218,15 +218,14 @@ void nr_csi_meas_reporting(int Mod_idP,
frame_t frameP,
sub_frame_t slotP);
-int nr_acknack_scheduling(int Mod_idP,
- int UE_id,
+int nr_acknack_scheduling( int Mod_idP,
+ NR_UE_info_t * UE,
frame_t frameP,
sub_frame_t slotP,
int r_pucch,
int do_common);
-void get_pdsch_to_harq_feedback(int Mod_idP,
- int UE_id,
+void get_pdsch_to_harq_feedback(NR_UE_info_t *,
int bwp_id,
NR_SearchSpace__searchSpaceType_PR ss_type,
int *max_fb_time,
@@ -336,7 +335,7 @@ NR_PDSCH_TimeDomainResourceAllocationList_t *get_pdsch_TimeDomainAllocationList(
const NR_SIB1_t *sib1);
/* find coreset within the search space */
-NR_ControlResourceSet_t *get_coreset(module_id_t module_idP,
+NR_ControlResourceSet_t *get_coreset(gNB_MAC_INST *nrmac,
NR_ServingCellConfigCommon_t *scc,
void *bwp,
NR_SearchSpace_t *ss,
@@ -394,7 +393,6 @@ int NRRIV2BW(int locationAndBandwidth,int N_RB);
int NRRIV2PRBOFFSET(int locationAndBandwidth,int N_RB);
/* Functions to manage an NR_list_t */
-void dump_nr_list(NR_list_t *listP);
void create_nr_list(NR_list_t *listP, int len);
void resize_nr_list(NR_list_t *list, int new_len);
void destroy_nr_list(NR_list_t *list);
@@ -404,13 +402,13 @@ void add_tail_nr_list(NR_list_t *listP, int id);
void add_front_nr_list(NR_list_t *listP, int id);
void remove_front_nr_list(NR_list_t *listP);
-int find_nr_UE_id(module_id_t mod_idP, rnti_t rntiP);
+NR_UE_info_t * find_nr_UE(NR_UEs_t* UEs, rnti_t rntiP);
int find_nr_RA_id(module_id_t mod_idP, int CC_idP, rnti_t rntiP);
-int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP, NR_CellGroupConfig_t *CellGroup);
+NR_UE_info_t*add_new_nr_ue(gNB_MAC_INST *nr_mac, rnti_t rntiP, NR_CellGroupConfig_t *CellGroup);
-void mac_remove_nr_ue(module_id_t mod_id, rnti_t rnti);
+void mac_remove_nr_ue(gNB_MAC_INST *nr_mac, rnti_t rnti);
void nr_mac_remove_ra_rnti(module_id_t mod_id, rnti_t rnti);
@@ -424,7 +422,7 @@ int allocate_nr_CCEs(gNB_MAC_INST *nr_mac,
int nr_get_default_pucch_res(int pucch_ResourceCommon);
-void compute_csi_bitlen(NR_CSI_MeasConfig_t *csi_MeasConfig, NR_UE_info_t *UE_info, int UE_id, module_id_t Mod_idP);
+void compute_csi_bitlen(NR_CSI_MeasConfig_t *csi_MeasConfig, NR_UE_info_t *UE);
int get_dlscs(nfapi_nr_config_request_t *cfg);
@@ -525,7 +523,7 @@ int get_dci_format(NR_UE_sched_ctrl_t *sched_ctrl);
const int get_dl_tda(const gNB_MAC_INST *nrmac, const NR_ServingCellConfigCommon_t *scc, int slot);
const int get_ul_tda(const gNB_MAC_INST *nrmac, const NR_ServingCellConfigCommon_t *scc, int slot);
-bool find_free_CCE(module_id_t module_id, sub_frame_t slot, int UE_id);
+bool find_free_CCE(sub_frame_t slot, NR_UE_info_t *UE);
bool nr_find_nb_rb(uint16_t Qm,
uint16_t R,
@@ -544,7 +542,7 @@ int get_mcs_from_bler(const NR_bler_options_t *bler_options,
int max_mcs,
frame_t frame);
-void nr_sr_reporting(int Mod_idP, frame_t frameP, sub_frame_t slotP);
+void nr_sr_reporting(gNB_MAC_INST *nrmac, frame_t frameP, sub_frame_t slotP);
void dump_mac_stats(gNB_MAC_INST *gNB, char *output, int strlen, bool reset_rsrp);
diff --git a/openair2/LAYER2/NR_MAC_gNB/main.c b/openair2/LAYER2/NR_MAC_gNB/main.c
index f9b13ddeba3233278c8b50ecb48365f168069d35..d65c362a6564645cef78816942cc65c57e0fd36e 100644
--- a/openair2/LAYER2/NR_MAC_gNB/main.c
+++ b/openair2/LAYER2/NR_MAC_gNB/main.c
@@ -57,52 +57,51 @@ void *nrmac_stats_thread(void *arg) {
AssertFatal(fd!=NULL,"Cannot open nrMAC_stats.log, error %s\n",strerror(errno));
while (oai_exit == 0) {
- dump_mac_stats(gNB,output,MACSTATSSTRLEN,false);
- fprintf(fd,"%s\n",output);
- fflush(fd);
- usleep(200000);
- fseek(fd,0,SEEK_SET);
+ dump_mac_stats(gNB,output,MACSTATSSTRLEN,false);
+ fprintf(fd,"%s\n",output);
+ fflush(fd);
+ usleep(200000);
+ fseek(fd,0,SEEK_SET);
}
fclose(fd);
return NULL;
}
void clear_mac_stats(gNB_MAC_INST *gNB) {
- memset((void*)gNB->UE_info.mac_stats,0,MAX_MOBILES_PER_GNB*sizeof(NR_mac_stats_t));
+ UE_iterator(gNB->UE_info.list, UE) {
+ memset(&UE->mac_stats,0,sizeof(UE->mac_stats));
+ }
}
void dump_mac_stats(gNB_MAC_INST *gNB, char *output, int strlen, bool reset_rsrp)
{
- NR_UE_info_t *UE_info = &gNB->UE_info;
int num = 1;
int stroff=0;
- if (UE_info->num_UEs == 0) return;
+ pthread_mutex_lock(&gNB->UE_info.mutex);
+ UE_iterator(gNB->UE_info.list, UE) {
+ NR_UE_sched_ctrl_t *sched_ctrl = &UE->UE_sched_ctrl;
+ NR_mac_stats_t *stats = &UE->mac_stats;
+ const int avg_rsrp = stats->num_rsrp_meas > 0 ? stats->cumul_rsrp / stats->num_rsrp_meas : 0;
- for (int UE_id = UE_info->list.head; UE_id >= 0; UE_id = UE_info->list.next[UE_id]) {
+ stroff+=sprintf(output+stroff,"UE RNTI %04x (%d) PH %d dB PCMAX %d dBm, average RSRP %d (%d meas), UL-SNR %d dB\n",
+ UE->rnti,
+ num++,
+ sched_ctrl->ph,
+ sched_ctrl->pcmax,
+ avg_rsrp,
+ stats->num_rsrp_meas,
+ stats->srs_wide_band_snr);
+ stroff+=sprintf(output+stroff,"UE %04x: CQI %d, RI %d, PMI (%d,%d)\n",
+ UE->rnti,
+ UE->UE_sched_ctrl.CSI_report.cri_ri_li_pmi_cqi_report.wb_cqi_1tb,
+ UE->UE_sched_ctrl.CSI_report.cri_ri_li_pmi_cqi_report.ri+1,
+ UE->UE_sched_ctrl.CSI_report.cri_ri_li_pmi_cqi_report.pmi_x1,
+ UE->UE_sched_ctrl.CSI_report.cri_ri_li_pmi_cqi_report.pmi_x2);
+
+ stroff+=sprintf(output+stroff,"UE %04x: dlsch_rounds %"PRIu64"/%"PRIu64"/%"PRIu64"/%"PRIu64", dlsch_errors %"PRIu64", pucch0_DTX %d, BLER %.5f MCS %d\n",
+ UE->rnti,
- const NR_UE_sched_ctrl_t *sched_ctrl = &UE_info->UE_sched_ctrl[UE_id];
- NR_mac_stats_t *stats = &UE_info->mac_stats[UE_id];
- const int avg_rsrp = stats->num_rsrp_meas > 0 ? stats->cumul_rsrp / stats->num_rsrp_meas : 0;
- stroff+=sprintf(output+stroff,"UE ID %d RNTI %04x (%d/%d) PH %d dB PCMAX %d dBm, average RSRP %d (%d meas), UL-SNR %d dB\n",
- UE_id,
- UE_info->rnti[UE_id],
- num++,
- UE_info->num_UEs,
- sched_ctrl->ph,
- sched_ctrl->pcmax,
- avg_rsrp,
- stats->num_rsrp_meas,
- stats->srs_wide_band_snr);
- stroff+=sprintf(output+stroff,"UE %d: CQI %d, RI %d, PMI (%d,%d)\n",
- UE_id,
- UE_info->UE_sched_ctrl[UE_id].CSI_report.cri_ri_li_pmi_cqi_report.wb_cqi_1tb,
- UE_info->UE_sched_ctrl[UE_id].CSI_report.cri_ri_li_pmi_cqi_report.ri+1,
- UE_info->UE_sched_ctrl[UE_id].CSI_report.cri_ri_li_pmi_cqi_report.pmi_x1,
- UE_info->UE_sched_ctrl[UE_id].CSI_report.cri_ri_li_pmi_cqi_report.pmi_x2);
-
- stroff+=sprintf(output+stroff,"UE %d: dlsch_rounds %"PRIu64"/%"PRIu64"/%"PRIu64"/%"PRIu64", dlsch_errors %"PRIu64", pucch0_DTX %d, BLER %.5f MCS %d\n",
- UE_id,
stats->dl.rounds[0], stats->dl.rounds[1],
stats->dl.rounds[2], stats->dl.rounds[3],
stats->dl.errors,
@@ -113,9 +112,9 @@ void dump_mac_stats(gNB_MAC_INST *gNB, char *output, int strlen, bool reset_rsrp
stats->num_rsrp_meas = 0;
stats->cumul_rsrp = 0;
}
- stroff+=sprintf(output+stroff,"UE %d: dlsch_total_bytes %"PRIu64"\n", UE_id, stats->dl.total_bytes);
- stroff+=sprintf(output+stroff,"UE %d: ulsch_rounds %"PRIu64"/%"PRIu64"/%"PRIu64"/%"PRIu64", ulsch_DTX %d, ulsch_errors %"PRIu64", BLER %.5f MCS %d\n",
- UE_id,
+ stroff+=sprintf(output+stroff,"UE %04x: dlsch_total_bytes %"PRIu64"\n", UE->rnti, stats->dl.total_bytes);
+ stroff+=sprintf(output+stroff,"UE %04x: ulsch_rounds %"PRIu64"/%"PRIu64"/%"PRIu64"/%"PRIu64", ulsch_DTX %d, ulsch_errors %"PRIu64", BLER %.5f MCS %d\n",
+ UE->rnti,
stats->ul.rounds[0], stats->ul.rounds[1],
stats->ul.rounds[2], stats->ul.rounds[3],
stats->ulsch_DTX,
@@ -123,20 +122,22 @@ void dump_mac_stats(gNB_MAC_INST *gNB, char *output, int strlen, bool reset_rsrp
sched_ctrl->ul_bler_stats.bler,
sched_ctrl->ul_bler_stats.mcs);
stroff+=sprintf(output+stroff,
- "UE %d: ulsch_total_bytes_scheduled %"PRIu64", ulsch_total_bytes_received %"PRIu64"\n",
- UE_id,
+ "UE %04x: ulsch_total_bytes_scheduled %"PRIu64", ulsch_total_bytes_received %"PRIu64"\n",
+ UE->rnti,
stats->ulsch_total_bytes_scheduled, stats->ul.total_bytes);
for (int lc_id = 0; lc_id < 63; lc_id++) {
if (stats->dl.lc_bytes[lc_id] > 0) {
- stroff+=sprintf(output+stroff, "UE %d: LCID %d: %"PRIu64" bytes TX\n", UE_id, lc_id, stats->dl.lc_bytes[lc_id]);
- LOG_D(NR_MAC, "UE %d: LCID %d: %"PRIu64" bytes TX\n", UE_id, lc_id, stats->dl.lc_bytes[lc_id]);
+ stroff+=sprintf(output+stroff, "UE %04x: LCID %d: %"PRIu64" bytes TX\n", UE->rnti, lc_id, stats->dl.lc_bytes[lc_id]);
+ LOG_D(NR_MAC, "UE %04x: LCID %d: %"PRIu64" bytes TX\n", UE->rnti, lc_id, stats->dl.lc_bytes[lc_id]);
}
if (stats->ul.lc_bytes[lc_id] > 0) {
- stroff+=sprintf(output+stroff, "UE %d: LCID %d: %"PRIu64" bytes RX\n", UE_id, lc_id, stats->ul.lc_bytes[lc_id]);
- LOG_D(NR_MAC, "UE %d: LCID %d: %"PRIu64" bytes RX\n", UE_id, lc_id, stats->ul.lc_bytes[lc_id]);
+ stroff+=sprintf(output+stroff, "UE %04x: LCID %d: %"PRIu64" bytes RX\n", UE->rnti, lc_id, stats->ul.lc_bytes[lc_id]);
+ LOG_D(NR_MAC, "UE %04x: LCID %d: %"PRIu64" bytes RX\n", UE->rnti, lc_id, stats->ul.lc_bytes[lc_id]);
+
}
}
}
+ pthread_mutex_unlock(&gNB->UE_info.mutex);
print_meas(&gNB->eNB_scheduler, "DL & UL scheduling timing stats", NULL, NULL);
print_meas(&gNB->schedule_dlsch,"dlsch scheduler",NULL,NULL);
print_meas(&gNB->rlc_data_req, "rlc_data_req",NULL,NULL);
@@ -147,8 +148,6 @@ void dump_mac_stats(gNB_MAC_INST *gNB, char *output, int strlen, bool reset_rsrp
void mac_top_init_gNB(void)
{
module_id_t i;
- int list_el;
- NR_UE_info_t *UE_info;
gNB_MAC_INST *nrmac;
LOG_I(MAC, "[MAIN] Init function start:nb_nr_macrlc_inst=%d\n",RC.nb_nr_macrlc_inst);
@@ -182,6 +181,8 @@ void mac_top_init_gNB(void)
RC.nrmac[i]->first_MIB = true;
+ pthread_mutex_init(&RC.nrmac[i]->UE_info.mutex, NULL);
+
if (get_softmodem_params()->phy_test) {
RC.nrmac[i]->pre_processor_dl = nr_preprocessor_phytest;
RC.nrmac[i]->pre_processor_ul = nr_ul_preprocessor_phytest;
@@ -210,16 +211,9 @@ void mac_top_init_gNB(void)
// Initialize Linked-List for Active UEs
for (i = 0; i < RC.nb_nr_macrlc_inst; i++) {
-
nrmac = RC.nrmac[i];
nrmac->if_inst = NR_IF_Module_init(i);
-
- UE_info = &nrmac->UE_info;
- UE_info->num_UEs = 0;
- create_nr_list(&UE_info->list, MAX_MOBILES_PER_GNB);
- for (list_el = 0; list_el < MAX_MOBILES_PER_GNB; list_el++) {
- UE_info->active[list_el] = false;
- }
+ memset(&nrmac->UE_info, 0, sizeof(nrmac->UE_info));
}
srand48(0);
diff --git a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
index 478200a3479790691deddfa3121ee91da0318d70..54d9974d4ad5b74be7f1424cbf4751a93f5686bf 100644
--- a/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+++ b/openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
@@ -91,6 +91,7 @@ typedef struct {
int len;
} NR_list_t;
+
typedef enum {
RA_IDLE = 0,
Msg2 = 1,
@@ -704,24 +705,34 @@ typedef struct NR_bler_options {
/*! \brief UE list used by gNB to order UEs/CC for scheduling*/
#define MAX_CSI_REPORTCONFIG 48
typedef struct {
+ rnti_t rnti;
/// scheduling control info
- nr_csi_report_t csi_report_template[MAX_MOBILES_PER_GNB][MAX_CSI_REPORTCONFIG];
- NR_UE_sched_ctrl_t UE_sched_ctrl[MAX_MOBILES_PER_GNB];
- NR_mac_stats_t mac_stats[MAX_MOBILES_PER_GNB];
- NR_list_t list;
- int num_UEs;
- bool active[MAX_MOBILES_PER_GNB];
- rnti_t rnti[MAX_MOBILES_PER_GNB];
- NR_CellGroupConfig_t *CellGroup[MAX_MOBILES_PER_GNB];
+ nr_csi_report_t csi_report_template[MAX_CSI_REPORTCONFIG];
+ NR_UE_sched_ctrl_t UE_sched_ctrl;
+ NR_mac_stats_t mac_stats;
+ NR_CellGroupConfig_t *CellGroup;
/// CCE indexing
- int m[MAX_MOBILES_PER_GNB];
+ int m;
// UE selected beam index
- uint8_t UE_beam_index[MAX_MOBILES_PER_GNB];
- bool Msg4_ACKed[MAX_MOBILES_PER_GNB];
+ uint8_t UE_beam_index;
+ bool Msg4_ACKed;
/// Sched CSI-RS: scheduling decisions
- bool sched_csirs;
+ NR_gNB_UCI_STATS_t uci_statS;
+ float ul_thr_ue;
+ float dl_thr_ue;
+ int layers;
} NR_UE_info_t;
+typedef struct {
+ /// scheduling control info
+ // last element always NULL
+ pthread_mutex_t mutex;
+ NR_UE_info_t *list[MAX_MOBILES_PER_GNB+1];
+ bool sched_csirs;
+} NR_UEs_t;
+
+#define UE_iterator(BaSe, VaR) NR_UE_info_t ** VaR##pptr=BaSe, *VaR; while ((VaR=*(VaR##pptr++)))
+
typedef void (*nr_pp_impl_dl)(module_id_t mod_id,
frame_t frame,
sub_frame_t slot);
@@ -782,7 +793,7 @@ typedef struct gNB_MAC_INST_s {
/// NFAPI DL PDU structure
nfapi_nr_tx_data_request_t TX_req[NFAPI_CC_MAX];
int pdcch_cand[MAX_NUM_CORESET];
- NR_UE_info_t UE_info;
+ NR_UEs_t UE_info;
/// UL handle
uint32_t ul_handle;
diff --git a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
index ccc4786464de2f9d3d0f10473f698d559b9f1b28..211b566c5a986adf462e5b354818cf50cb4db62f 100644
--- a/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+++ b/openair2/NR_PHY_INTERFACE/NR_IF_Module.c
@@ -407,9 +407,6 @@ static void match_crc_rx_pdu(nfapi_nr_rx_data_indication_t *rx_ind, nfapi_nr_crc
void NR_UL_indication(NR_UL_IND_t *UL_info) {
AssertFatal(UL_info!=NULL,"UL_info is null\n");
-#ifdef DUMP_FAPI
- dump_ul(UL_info);
-#endif
module_id_t module_id = UL_info->module_id;
int CC_id = UL_info->CC_id;
NR_Sched_Rsp_t *sched_info = &NR_Sched_INFO[module_id][CC_id];
diff --git a/openair2/RRC/NR/nr_rrc_config.c b/openair2/RRC/NR/nr_rrc_config.c
index 66088fdc3d6e877b80cd41b683442b3617c8fb83..e59f7d5caceee6c83e8c6de625da2dd89d810418 100644
--- a/openair2/RRC/NR/nr_rrc_config.c
+++ b/openair2/RRC/NR/nr_rrc_config.c
@@ -542,7 +542,7 @@ void set_dl_mcs_table(int scs, NR_UE_NR_Capability_t *cap,
}
AssertFatal(bw_rb>0,"Could not find scs-SpecificCarrierList element for scs %d",scs);
int bw = get_supported_band_index(scs, band, bw_rb);
- AssertFatal(bw>0,"Supported band corresponding to %d RBs not found\n", bw_rb);
+ AssertFatal(bw>=0,"Supported band corresponding to %d RBs not found\n", bw_rb);
bool supported = false;
if (band>256) {
diff --git a/openair2/RRC/NR/rrc_gNB.c b/openair2/RRC/NR/rrc_gNB.c
index 3d41787a2d7d1d73a4de123e19c88edd7fdede75..f5879a0c49aa675899b1951abc1e796bbd4a4937 100755
--- a/openair2/RRC/NR/rrc_gNB.c
+++ b/openair2/RRC/NR/rrc_gNB.c
@@ -1643,7 +1643,7 @@ rrc_gNB_generate_RRCReestablishment(
ue_context->Srb0.Tx_buffer.payload_size);
#if(0)
/* TODO : It may be needed if gNB goes into full stack working. */
- UE_id = find_nr_UE_id(module_id, rnti);
+ UE = find_nr_UE(module_id, rnti);
if (UE_id != -1) {
/* Activate reject timer, if RRCComplete not received after 10 frames, reject UE */
RC.nrmac[module_id]->UE_info.UE_sched_ctrl[UE_id].ue_reestablishment_reject_timer = 1;
@@ -3549,6 +3549,7 @@ void nr_rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id) {
FILE *fd=NULL;//fopen("nrRRCstats.log","w");
RB_FOREACH(ue_context_p, rrc_nr_ue_tree_s, &(RC.nrrrc[ctxt_pP->module_id]->rrc_ue_head)) {
ctxt_pP->rnti = ue_context_p->ue_id_rnti;
+ gNB_MAC_INST *nrmac=RC.nrmac[ctxt_pP->module_id]; //WHAT A BEAUTIFULL RACE CONDITION !!!
if (fd) {
if (ue_context_p->ue_context.Initialue_identity_5g_s_TMSI.presence == TRUE) {
@@ -3588,7 +3589,7 @@ void nr_rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id) {
// Remove here the MAC and RRC context when RRC is not connected or gNB is not connected to CN5G
if(ue_context_p->ue_context.StatusRrc < NR_RRC_CONNECTED || ue_context_p->ue_context.gNB_ue_ngap_id == 0) {
- mac_remove_nr_ue(ctxt_pP->module_id, ctxt_pP->rnti);
+ mac_remove_nr_ue(nrmac, ctxt_pP->rnti);
rrc_rlc_remove_ue(ctxt_pP);
pdcp_remove_UE(ctxt_pP);
@@ -3612,7 +3613,7 @@ void nr_rrc_subframe_process(protocol_ctxt_t *const ctxt_pP, const int CC_id) {
ue_context_p->ue_context.rnti);
ue_context_p->ue_context.ue_release_timer_rrc = 0;
- mac_remove_nr_ue(ctxt_pP->module_id, ctxt_pP->rnti);
+ mac_remove_nr_ue(nrmac, ctxt_pP->rnti);
rrc_rlc_remove_ue(ctxt_pP);
pdcp_remove_UE(ctxt_pP);
newGtpuDeleteAllTunnels(ctxt_pP->instance, ctxt_pP->rnti);
diff --git a/openair2/RRC/NR/rrc_gNB_nsa.c b/openair2/RRC/NR/rrc_gNB_nsa.c
index 8040fcb13c34f12eaa3b1086e44a8b2ac77ade1f..07a6bd85be15c05e7b980dbf875a985816288506 100644
--- a/openair2/RRC/NR/rrc_gNB_nsa.c
+++ b/openair2/RRC/NR/rrc_gNB_nsa.c
@@ -426,7 +426,8 @@ void rrc_remove_nsa_user(gNB_RRC_INST *rrc, int rnti) {
rrc_rlc_remove_ue(&ctxt);
- mac_remove_nr_ue(rrc->module_id, rnti);
+ // WHAT A RACE CONDITION
+ mac_remove_nr_ue(RC.nrmac[rrc->module_id], rnti);
gtpv1u_enb_delete_tunnel_req_t tmp={0};
tmp.rnti=rnti;
tmp.from_gnb=1;
diff --git a/openair2/UTIL/OPT/opt.h b/openair2/UTIL/OPT/opt.h
index ae6a3eb2a65fb4e8dac6eabaa69942381afbc445..d08790a05847387c2b807eb67da9b407cd05b036 100644
--- a/openair2/UTIL/OPT/opt.h
+++ b/openair2/UTIL/OPT/opt.h
@@ -109,11 +109,14 @@ typedef enum radio_type_e {
extern int opt_enabled;
#define trace_pdu(x...) if (opt_enabled) trace_pdu_implementation(0, x)
-#define trace_NRpdu(x...) if (opt_enabled) trace_pdu_implementation(1, x)
+#define trace_NRpdu(x...) if (opt_enabled) nr_trace_pdu_implementation(1, x)
void trace_pdu_implementation(int nr, int direction, uint8_t *pdu_buffer, unsigned int pdu_buffer_size,
int ueid, int rntiType, int rnti, uint16_t sysFrame, uint8_t subframe,
int oob_event, int oob_event_value);
+void nr_trace_pdu_implementation(int nr, int direction, uint8_t *pdu_buffer, unsigned int pdu_buffer_size,
+ int rntiType, int rnti, uint16_t sysFrame, uint8_t subframe,
+ int oob_event, int oob_event_value);
int init_opt(void);
diff --git a/openair2/UTIL/OPT/probe.c b/openair2/UTIL/OPT/probe.c
index 8731eb294a5a64ab9a4b57ffb7fd8e1d5fde5594..9359c48e95a93a6b7363c0b2ea773a1974ca3f99 100644
--- a/openair2/UTIL/OPT/probe.c
+++ b/openair2/UTIL/OPT/probe.c
@@ -476,6 +476,14 @@ static void SendFrameNR(guint8 radioType, guint8 direction, guint8 rntiType,
extern RAN_CONTEXT_t RC;
#include <openair1/PHY/phy_extern_ue.h>
/* Remote serveraddress (where Wireshark is running) */
+void nr_trace_pdu_implementation(int nr, int direction, uint8_t *pdu_buffer, unsigned int pdu_buffer_size,
+ int rntiType, int rnti, uint16_t sysFrameNumber, uint8_t subFrameNumber, int oob_event,
+ int oob_event_value) {
+ trace_pdu_implementation(nr, direction, pdu_buffer, pdu_buffer_size,
+ rnti, rntiType, rnti, sysFrameNumber, subFrameNumber, oob_event,
+ oob_event_value);
+}
+
void trace_pdu_implementation(int nr, int direction, uint8_t *pdu_buffer, unsigned int pdu_buffer_size,
int ueid, int rntiType, int rnti, uint16_t sysFrameNumber, uint8_t subFrameNumber, int oob_event,
int oob_event_value) {
diff --git a/targets/ARCH/COMMON/common_lib.h b/targets/ARCH/COMMON/common_lib.h
index 95e5e3ed030ed00934224ee55a2ece4f7e60296e..78acc373ee5ac3df3ad2d9822a6a7a400a5bb9d1 100644
--- a/targets/ARCH/COMMON/common_lib.h
+++ b/targets/ARCH/COMMON/common_lib.h
@@ -188,6 +188,7 @@ typedef struct {
//! \brief Center frequency in Hz for TX.
//! index: [0..rx_num_channels[ !!! see lte-ue.c:427 FIXME iterates over rx_num_channels
double tx_freq[4];
+ double tune_offset;
//! \brief memory
//! \brief Pointer to Calibration table for RX gains
rx_gain_calib_table_t *rx_gain_calib_table;
diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
index ba3bf0c4f30c10a52b78527807f3955c16279ad5..89762843458452c97a672c2e63f602cea233461d 100644
--- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
@@ -747,8 +747,12 @@ static bool is_equal(double a, double b) {
void *freq_thread(void *arg) {
openair0_device *device=(openair0_device *)arg;
usrp_state_t *s = (usrp_state_t *)device->priv;
- s->usrp->set_tx_freq(device->openair0_cfg[0].tx_freq[0]);
- s->usrp->set_rx_freq(device->openair0_cfg[0].rx_freq[0]);
+ uhd::tune_request_t tx_tune_req(device->openair0_cfg[0].tx_freq[0],
+ device->openair0_cfg[0].tune_offset);
+ uhd::tune_request_t rx_tune_req(device->openair0_cfg[0].rx_freq[0],
+ device->openair0_cfg[0].tune_offset);
+ s->usrp->set_tx_freq(tx_tune_req);
+ s->usrp->set_rx_freq(rx_tune_req);
return NULL;
}
/*! \brief Set frequencies (TX/RX). Spawns a thread to handle the frequency change to not block the calling thread
@@ -760,14 +764,18 @@ void *freq_thread(void *arg) {
int trx_usrp_set_freq(openair0_device *device, openair0_config_t *openair0_cfg, int dont_block) {
usrp_state_t *s = (usrp_state_t *)device->priv;
pthread_t f_thread;
- printf("Setting USRP TX Freq %f, RX Freq %f\n",openair0_cfg[0].tx_freq[0],openair0_cfg[0].rx_freq[0]);
+ printf("Setting USRP TX Freq %f, RX Freq %f, tune_offset: %f, dont_block: %d\n",
+ openair0_cfg[0].tx_freq[0],openair0_cfg[0].rx_freq[0],
+ openair0_cfg[0].tune_offset, dont_block);
// spawn a thread to handle the frequency change to not block the calling thread
if (dont_block == 1)
pthread_create(&f_thread,NULL,freq_thread,(void *)device);
else {
- s->usrp->set_tx_freq(device->openair0_cfg[0].tx_freq[0]);
- s->usrp->set_rx_freq(device->openair0_cfg[0].rx_freq[0]);
+ uhd::tune_request_t tx_tune_req(openair0_cfg[0].tx_freq[0], openair0_cfg[0].tune_offset);
+ uhd::tune_request_t rx_tune_req(openair0_cfg[0].rx_freq[0], openair0_cfg[0].tune_offset);
+ s->usrp->set_tx_freq(tx_tune_req);
+ s->usrp->set_rx_freq(rx_tune_req);
}
return(0);
@@ -780,9 +788,11 @@ int trx_usrp_set_freq(openair0_device *device, openair0_config_t *openair0_cfg,
*/
int openair0_set_rx_frequencies(openair0_device *device, openair0_config_t *openair0_cfg) {
usrp_state_t *s = (usrp_state_t *)device->priv;
- uhd::tune_request_t rx_tune_req(openair0_cfg[0].rx_freq[0]);
- rx_tune_req.rf_freq_policy = uhd::tune_request_t::POLICY_MANUAL;
- rx_tune_req.rf_freq = openair0_cfg[0].rx_freq[0];
+ uhd::tune_request_t rx_tune_req(openair0_cfg[0].rx_freq[0], openair0_cfg[0].tune_offset);
+ printf("In openair0_set_rx_frequencies, freq: %f, tune offset: %f\n",
+ openair0_cfg[0].rx_freq[0], openair0_cfg[0].tune_offset);
+ //rx_tune_req.rf_freq_policy = uhd::tune_request_t::POLICY_MANUAL;
+ //rx_tune_req.rf_freq = openair0_cfg[0].rx_freq[0];
s->usrp->set_rx_freq(rx_tune_req);
return(0);
}
@@ -1277,7 +1287,9 @@ extern "C" {
for(int i=0; i<((int) s->usrp->get_rx_num_channels()); i++) {
if (i<openair0_cfg[0].rx_num_channels) {
s->usrp->set_rx_rate(openair0_cfg[0].sample_rate,i+choffset);
- s->usrp->set_rx_freq(openair0_cfg[0].rx_freq[i],i+choffset);
+ uhd::tune_request_t rx_tune_req(openair0_cfg[0].rx_freq[i],
+ openair0_cfg[0].tune_offset);
+ s->usrp->set_rx_freq(rx_tune_req, i+choffset);
set_rx_gain_offset(&openair0_cfg[0],i,bw_gain_adjust);
::uhd::gain_range_t gain_range = s->usrp->get_rx_gain_range(i+choffset);
// limit to maximum gain
@@ -1303,7 +1315,9 @@ extern "C" {
if (i<openair0_cfg[0].tx_num_channels) {
s->usrp->set_tx_rate(openair0_cfg[0].sample_rate,i+choffset);
- s->usrp->set_tx_freq(openair0_cfg[0].tx_freq[i],i+choffset);
+ uhd::tune_request_t tx_tune_req(openair0_cfg[0].tx_freq[i],
+ openair0_cfg[0].tune_offset);
+ s->usrp->set_tx_freq(tx_tune_req, i+choffset);
s->usrp->set_tx_gain(gain_range_tx.stop()-openair0_cfg[0].tx_gain[i],i+choffset);
LOG_I(HW,"USRP TX_GAIN:%3.2lf gain_range:%3.2lf tx_gain:%3.2lf\n", gain_range_tx.stop()-openair0_cfg[0].tx_gain[i], gain_range_tx.stop(), openair0_cfg[0].tx_gain[i]);
}
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpn300.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpn300.conf
new file mode 100644
index 0000000000000000000000000000000000000000..6af135608888ea1f106e839710851e7c26fa4ca2
--- /dev/null
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band66.tm1.25PRB.usrpn300.conf
@@ -0,0 +1,266 @@
+Active_gNBs = ( "gNB-Eurecom-5GNRBox");
+# Asn1_verbosity, choice in: none, info, annoying
+Asn1_verbosity = "none";
+
+gNBs =
+(
+ {
+ ////////// Identification parameters:
+ gNB_ID = 0xe00;
+
+ cell_type = "CELL_MACRO_GNB";
+
+ gNB_name = "gNB-Eurecom-5GNRBox";
+
+ // Tracking area code, 0x0000 and 0xfffe are reserved values
+ tracking_area_code = 1;
+
+ plmn_list = ({mcc = 208; mnc = 93; mnc_length = 2;});
+
+ tr_s_preference = "local_mac";
+
+ ////////// Physical parameters:
+
+ ssb_SubcarrierOffset = 0;
+ pdsch_AntennaPorts = 1;
+ pusch_AntennaPorts = 1;
+ min_rxtxtime = 6;
+
+ servingCellConfigCommon = (
+ {
+ #spCellConfigCommon
+
+ physCellId = 0;
+
+# downlinkConfigCommon
+ #frequencyInfoDL
+ # this is 2150 MHz + 12 PRBs@15kHz SCS (same as initial BWP), points to Subcarrier 0 of RB#10 of SSB block
+ absoluteFrequencySSB = 430432;
+ dl_frequencyBand = 66;
+ # this is 2150 MHz
+ dl_absoluteFrequencyPointA = 430000;
+ #scs-SpecificCarrierList
+ dl_offstToCarrier = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ dl_subcarrierSpacing = 0;
+ dl_carrierBandwidth = 25;
+ #initialDownlinkBWP
+ #genericParameters
+ # this is RBstart=0,L=25 (275*(L-1))+RBstart
+ initialDLBWPlocationAndBandwidth = 6600;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ initialDLBWPsubcarrierSpacing = 0;
+ #pdcch-ConfigCommon
+ initialDLBWPcontrolResourceSetZero = 0;
+ initialDLBWPsearchSpaceZero = 0;
+
+ #uplinkConfigCommon
+ #frequencyInfoUL
+ ul_frequencyBand = 66;
+ ul_absoluteFrequencyPointA = 350000;
+ #scs-SpecificCarrierList
+ ul_offstToCarrier = 0;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ ul_subcarrierSpacing = 0;
+ ul_carrierBandwidth = 25;
+ pMax = 20;
+ #initialUplinkBWP
+ #genericParameters
+ initialULBWPlocationAndBandwidth = 6600;
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ initialULBWPsubcarrierSpacing = 0;
+ #rach-ConfigCommon
+ #rach-ConfigGeneric
+ prach_ConfigurationIndex = 98;
+#prach_msg1_FDM
+#0 = one, 1=two, 2=four, 3=eight
+ prach_msg1_FDM = 0;
+ prach_msg1_FrequencyStart = 0;
+ zeroCorrelationZoneConfig = 13;
+ preambleReceivedTargetPower = -118;
+#preamblTransMax (0...10) = (3,4,5,6,7,8,10,20,50,100,200)
+ preambleTransMax = 6;
+#powerRampingStep
+# 0=dB0,1=dB2,2=dB4,3=dB6
+ powerRampingStep = 1;
+#ra_ReponseWindow
+#1,2,4,8,10,20,40,80
+ ra_ResponseWindow = 4;
+#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
+#1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8=sixteen
+ ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR = 4;
+#oneHalf (0..15) 4,8,12,16,...60,64
+ ssb_perRACH_OccasionAndCB_PreamblesPerSSB = 15;
+#ra_ContentionResolutionTimer
+#(0..7) 8,16,24,32,40,48,56,64
+ ra_ContentionResolutionTimer = 7;
+ rsrp_ThresholdSSB = 19;
+#prach-RootSequenceIndex_PR
+#1 = 839, 2 = 139
+ prach_RootSequenceIndex_PR = 2;
+ prach_RootSequenceIndex = 1;
+ # SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
+ msg1_SubcarrierSpacing = 0;
+# restrictedSetConfig
+# 0=unrestricted, 1=restricted type A, 2=restricted type B
+ restrictedSetConfig = 0;
+
+ msg3_DeltaPreamble = 1;
+ p0_NominalWithGrant =-90;
+
+# pucch-ConfigCommon setup :
+# pucchGroupHopping
+# 0 = neither, 1= group hopping, 2=sequence hopping
+ pucchGroupHopping = 0;
+ hoppingId = 40;
+ p0_nominal = -90;
+# ssb_PositionsInBurs_BitmapPR
+# 1=short, 2=medium, 3=long
+ ssb_PositionsInBurst_PR = 2;
+ ssb_PositionsInBurst_Bitmap = 0x1;
+
+# ssb_periodicityServingCell
+# 0 = ms5, 1=ms10, 2=ms20, 3=ms40, 4=ms80, 5=ms160, 6=spare2, 7=spare1
+ ssb_periodicityServingCell = 2;
+
+# dmrs_TypeA_position
+# 0 = pos2, 1 = pos3
+ dmrs_TypeA_Position = 0;
+
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ subcarrierSpacing = 0;
+
+
+ #tdd-UL-DL-ConfigurationCommon
+# subcarrierSpacing
+# 0=kHz15, 1=kHz30, 2=kHz60, 3=kHz120
+ referenceSubcarrierSpacing = 0;
+ # pattern1
+ # dl_UL_TransmissionPeriodicity
+ # 0=ms0p5, 1=ms0p625, 2=ms1, 3=ms1p25, 4=ms2, 5=ms2p5, 6=ms5, 7=ms10
+ dl_UL_TransmissionPeriodicity = 6;
+ nrofDownlinkSlots = 7;
+ nrofDownlinkSymbols = 6;
+ nrofUplinkSlots = 2;
+ nrofUplinkSymbols = 4;
+
+ ssPBCH_BlockPower = -25;
+ }
+
+ );
+
+
+ # ------- SCTP definitions
+ SCTP :
+ {
+ # Number of streams to use in input/output
+ SCTP_INSTREAMS = 2;
+ SCTP_OUTSTREAMS = 2;
+ };
+
+
+ ////////// MME parameters:
+ mme_ip_address = ( { ipv4 = "192.168.12.26";
+ ipv6 = "192:168:30::17";
+ active = "yes";
+ preference = "ipv4";
+ }
+ );
+
+ NETWORK_INTERFACES :
+ {
+
+ GNB_INTERFACE_NAME_FOR_S1_MME = "eth0";
+ GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.111/24";
+ GNB_INTERFACE_NAME_FOR_S1U = "eth0";
+ GNB_IPV4_ADDRESS_FOR_S1U = "192.168.12.111/24";
+ GNB_PORT_FOR_S1U = 2152; # Spec 2152
+ };
+ }
+);
+
+MACRLCs = (
+ {
+ num_cc = 1;
+ tr_s_preference = "local_L1";
+ tr_n_preference = "local_RRC";
+ }
+);
+
+L1s = (
+ {
+ num_cc = 1;
+ tr_n_preference = "local_mac";
+ thread_pool_size = 8;
+ ofdm_offset_divisor = 8; #set this to UINT_MAX for offset 0
+ }
+);
+
+RUs = (
+ {
+ local_rf = "yes";
+ nb_tx = 1;
+ nb_rx = 1;
+ att_tx = 0;
+ att_rx = 0;
+ bands = [7];
+ max_pdschReferenceSignalPower = -27;
+ max_rxgain = 50;
+ eNB_instances = [0];
+ ## beamforming 1x2 matrix: 1 layer x 2 antennas
+ bf_weights = [0x00007fff, 0x0000];
+ ## beamforming 1x4 matrix: 1 layer x 4 antennas
+ #bf_weights = [0x00007fff, 0x0000,0x0000, 0x0000];
+ ## beamforming 2x2 matrix:
+ #bf_weights = [0x00007fff, 0x00000000, 0x00000000, 0x00007fff];
+ ## beamforming 4x4 matrix:
+ #bf_weights = [0x00007fff, 0x0000, 0x0000, 0x0000, 0x00000000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff, 0x0000, 0x0000, 0x0000, 0x0000, 0x00007fff];
+ sdr_addrs = "addr=192.168.10.2,mgmt_addr=192.168.10.2,second_addr=192.168.20.2";
+ clock_src = "external";
+ # if_freq = 3700000000L;
+ # if_offset = 1000000;
+ }
+);
+
+THREAD_STRUCT = (
+ {
+ #three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
+ parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
+ #two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
+ worker_config = "WORKER_DISABLE";
+ }
+);
+
+security = {
+ # preferred ciphering algorithms
+ # the first one of the list that an UE supports in chosen
+ # valid values: nea0, nea1, nea2, nea3
+ ciphering_algorithms = ( "nea0" );
+
+ # preferred integrity algorithms
+ # the first one of the list that an UE supports in chosen
+ # valid values: nia0, nia1, nia2, nia3
+ integrity_algorithms = ( "nia2", "nia0" );
+
+ # setting 'drb_ciphering' to "no" disables ciphering for DRBs, no matter
+ # what 'ciphering_algorithms' configures; same thing for 'drb_integrity'
+ drb_ciphering = "yes";
+ drb_integrity = "no";
+};
+
+ log_config :
+ {
+ global_log_level ="info";
+ hw_log_level ="info";
+ phy_log_level ="info";
+ mac_log_level ="info";
+ rlc_log_level ="info";
+ pdcp_log_level ="info";
+ rrc_log_level ="info";
+ };
+
diff --git a/targets/RT/USER/lte-ru.c b/targets/RT/USER/lte-ru.c
index 571551cee9a61bf1fd8cf88f4977e937c6a61d00..836709b473c76334760d2e703bfd8dcce715a1b2 100644
--- a/targets/RT/USER/lte-ru.c
+++ b/targets/RT/USER/lte-ru.c
@@ -1371,11 +1371,12 @@ void fill_rf_config(RU_t *ru,
cfg->tx_gain[i] = (double)ru->att_tx;
cfg->rx_gain[i] = ru->max_rxgain-(double)ru->att_rx;
cfg->configFilename = rf_config_file;
- LOG_I(PHY,"channel %d, Setting tx_gain offset %f, rx_gain offset %f, tx_freq %f, rx_freq %f\n",
+ LOG_I(PHY,"channel %d, Setting tx_gain offset %.0f, rx_gain offset %.0f, tx_freq %.0f, rx_freq %.0f, tune_offset %.0f Hz\n",
i, cfg->tx_gain[i],
cfg->rx_gain[i],
cfg->tx_freq[i],
- cfg->rx_freq[i]);
+ cfg->rx_freq[i],
+ cfg->tune_offset);
}
}
@@ -2972,6 +2973,8 @@ RU_t **RCconfig_RU(int nb_RU,int nb_L1_inst,PHY_VARS_eNB ***eNB,uint64_t *ru_mas
ru[j]->openair0_cfg.time_source = unset;
}
+ ru[j]->openair0_cfg.tune_offset = get_softmodem_params()->tune_offset;
+
LOG_I(PHY,"RU %d is_slave=%s\n",j,*(RUParamList.paramarray[j][RU_IS_SLAVE_IDX].strptr));
if (strcmp(*(RUParamList.paramarray[j][RU_IS_SLAVE_IDX].strptr), "yes") == 0) ru[j]->is_slave=1;
diff --git a/targets/RT/USER/lte-uesoftmodem.c b/targets/RT/USER/lte-uesoftmodem.c
index 089941c7dfc0de799960b9206bf2f771e5564e11..678b6e0401cb81d846e4b8d65989257e04e8d6c8 100644
--- a/targets/RT/USER/lte-uesoftmodem.c
+++ b/targets/RT/USER/lte-uesoftmodem.c
@@ -446,6 +446,7 @@ void init_openair0(LTE_DL_FRAME_PARMS *frame_parms,int rxgain) {
openair0_cfg[card].num_rb_dl=frame_parms->N_RB_DL;
openair0_cfg[card].clock_source = get_softmodem_params()->clock_source;
openair0_cfg[card].time_source = get_softmodem_params()->timing_source;
+ openair0_cfg[card].tune_offset = get_softmodem_params()->tune_offset;
openair0_cfg[card].tx_num_channels=min(2,frame_parms->nb_antennas_tx);
openair0_cfg[card].rx_num_channels=min(2,frame_parms->nb_antennas_rx);
@@ -464,11 +465,12 @@ void init_openair0(LTE_DL_FRAME_PARMS *frame_parms,int rxgain) {
openair0_cfg[card].tx_gain[i] = tx_gain[0][i];
openair0_cfg[card].rx_gain[i] = rxgain - rx_gain_off;
openair0_cfg[card].configFilename = get_softmodem_params()->rf_config_file;
- printf("Card %d, channel %d, Setting tx_gain %f, rx_gain %f, tx_freq %f, rx_freq %f\n",
+ printf("Card %d, channel %d, Setting tx_gain %.0f, rx_gain %.0f, tx_freq %.0f, rx_freq %.0f, tune_offset %.0f\n",
card,i, openair0_cfg[card].tx_gain[i],
openair0_cfg[card].rx_gain[i],
openair0_cfg[card].tx_freq[i],
- openair0_cfg[card].rx_freq[i]);
+ openair0_cfg[card].rx_freq[i],
+ openair0_cfg[card].tune_offset);
}
if (usrp_args) openair0_cfg[card].sdr_addrs = usrp_args;