More dynamic DCI configuration

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -154,7 +154,7 @@ unsigned char nr_generate_ulsch_pdu(uint8_t *sdus_payload,
 
 int8_t nr_ue_process_dlsch(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_indication_t *dci_ind, void *pduP, uint32_t pdu_len);
 
-void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl_config, int slot);
+void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl_config, frame_t frame, int slot);
 
 void nr_extract_dci_info(NR_UE_MAC_INST_t *mac,
                          int dci_format,

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -719,17 +719,12 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
         dl_config->number_pdus = dl_config->number_pdus + 1;
         mac->scheduled_response.dl_config = dl_config;
       }
-    } else { // get PDCCH configuration(s) from SCGConfig
-      // get Coreset and SearchSpace Information from spCellConfigDedicated
-      // DCI configuration done for BWP 1, Coreset 0, SearchSpace 0
-
-      // TBR program DCI for slot 1 if PDSCH
-      // TBR program DCI for slot 7 if RAR DCI PDSCH
+    } else { // we have an scd
 
       dcireq.module_id = mod_id;
       dcireq.gNB_index = 0;
       dcireq.cc_id     = 0;
-      dcireq.frame     = rx_frame; // TBR not needed
+      dcireq.frame     = rx_frame;
       dcireq.slot      = rx_slot;
       nr_ue_dcireq(&dcireq); //to be replaced with function pointer later
 
@@ -770,8 +765,11 @@ NR_UE_L2_STATE_t nr_ue_scheduler(nr_downlink_indication_t *dl_info, nr_uplink_in
   return UE_CONNECTION_OK;
 }
 
-// Note: msg2 is scheduled in the mixed slot or in the last dl slot
-// if they are allowed by search space configuration
+// Notes:
+// - Type1-PDCCH CSS configuration from ra-SearchSpace.
+// - Msg2 is scheduled in the mixed slot or in the last dl slot if they are allowed by the Type 1 Common Search Space configuration
+// todo:
+// - if Type1-PDCCH CSS is not configured in RRC message (Coreset and SearchSpace), UE searches in Type 0 PDCCH CSS.
 void nr_ue_msg2_scheduler(module_id_t mod_id,
                           uint16_t rach_frame,
                           uint16_t rach_slot,
@@ -870,7 +868,6 @@ void nr_ue_msg2_scheduler(module_id_t mod_id,
 // PRACH formats 9, 10, 11 are corresponding to dual PRACH format configurations A1/B1, A2/B2, A3/B3.
 // - todo:
 // - Partial configuration is actually already stored in (fapi_nr_prach_config_t) &mac->phy_config.config_req->prach_config
-//// however we need rach_ConfigGeneric to retrieve the config_index
 void nr_ue_prach_scheduler(module_id_t module_idP, frame_t frameP, sub_frame_t slotP) {
 
   uint8_t config_index, mu, N_dur, N_t_slot, start_symbol;

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -317,7 +317,8 @@ int nr_ue_dcireq(nr_dcireq_t *dcireq) {
   printf(" UE_mac->dl_config_request.slot %d VS dcireq->slot %d \n", UE_mac->dl_config_request.slot, dcireq->slot);
 
   LOG_D(PHY, "Entering UE DCI configuration frame %d slot %d \n", dcireq->frame, dcireq->slot);
-  ue_dci_configuration(UE_mac, dl_config, dcireq->slot);
+
+  ue_dci_configuration(UE_mac, dl_config, dcireq->frame, dcireq->slot);
 
   return 0;
 }