diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c index 4d96693831af5070dccef7e3e0bd8fee59f4b8c3..d746756d656288aa9b4d613bc1edba53076e0804 100644 --- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c +++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c @@ -399,8 +399,10 @@ void nr_configure_dci_from_pdcch_config(nfapi_nr_dl_config_pdcch_parameters_rel1 // first symbol //AssertFatal(pdcch_scs==kHz15, "PDCCH SCS above 15kHz not allowed if a symbol above 2 is monitored"); - for (int i=0; i<get_symbolsperslot(&cfg); i++) - if ((search_space->monitoring_symbols_in_slot>>(31-i))&1) { + int sps = get_symbolsperslot(&cfg); + + for (int i=0; i<sps; i++) + if ((search_space->monitoring_symbols_in_slot>>(sps-1-i))&1) { pdcch_params->first_symbol=i; break; } diff --git a/openair2/LAYER2/NR_MAC_gNB/main.c b/openair2/LAYER2/NR_MAC_gNB/main.c index 8e8a556febaed359a8d8c8886cf5aad4c4e7510c..3c999a3539f0408ea1e2661e08a55a64be169d92 100644 --- a/openair2/LAYER2/NR_MAC_gNB/main.c +++ b/openair2/LAYER2/NR_MAC_gNB/main.c @@ -65,7 +65,7 @@ void nr_init_search_space(nfapi_nr_search_space_t *search_space) search_space->duration = 5; search_space->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL10; search_space->slot_monitoring_offset = 1; - search_space->monitoring_symbols_in_slot = 0xC0000000; // first 2 ofdm symbols + search_space->monitoring_symbols_in_slot = 0x3000; // 14 bits field search_space->css_formats_0_0_and_1_0 = 1; search_space->uss_dci_formats = 0; // enum to be defined-- formats 0.0 and 1.0 for (int i=0; i<NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS; i++)