MR2416 Simplify interface by removing dcireq_t struct that was only calling...

MR2416 Simplify interface by removing dcireq_t struct that was only calling one function and remove fill_scheduled_response that also fills only a struct in a complex way

openair1/SIMULATION/NR_PHY/dlsim.c

@@ -874,7 +874,6 @@ int main(int argc, char **argv)
   UE_mac->state = UE_CONNECTED;
   UE_mac->ra.ra_state = RA_SUCCEEDED;
 
-  nr_dcireq_t dcireq;
   nr_phy_data_t phy_data = {0};
   fapi_nr_dl_config_request_t dl_config = {.sfn = frame, .slot = slot};
   nr_scheduled_response_t scheduled_response = {.dl_config = &dl_config, .phy_data = &phy_data, .mac = UE_mac};
@@ -962,9 +961,6 @@ int main(int argc, char **argv)
       UE_proc.frame_rx = frame;
       UE_proc.nr_slot_rx = slot;
       UE_proc.gNB_id = 0;
-      
-      dcireq.frame = frame;
-      dcireq.slot = slot;
 
       NR_UE_DLSCH_t *dlsch0 = &phy_data.dlsch[0];
 
@@ -1100,8 +1096,9 @@ int main(int argc, char **argv)
         // Apply MIMO Channel
         multipath_channel(gNB2UE, s_re, s_im, r_re, r_im, slot_length, 0, (n_trials == 1) ? 1 : 0);
         add_noise(UE->common_vars.rxdata, (const double **) r_re, (const double **) r_im, sigma2, slot_length, slot_offset, ts, delay, pdu_bit_map, 0x1, frame_parms->nb_antennas_rx);
-
-        nr_ue_dcireq(&dcireq); //to be replaced with function pointer later
+        dl_config.sfn = frame;
+        dl_config.slot = slot;
+        ue_dci_configuration(UE_mac, &dl_config, frame, slot);
         nr_ue_scheduled_response(&scheduled_response);
 
         pbch_pdcch_processing(UE,

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -215,26 +215,6 @@ void release_mac_configuration(NR_UE_MAC_INST_t *mac);
 void nr_ue_ul_scheduler(nr_uplink_indication_t *ul_info);
 void nr_ue_dl_scheduler(nr_downlink_indication_t *dl_info);
 
-/**\brief fill nr_scheduled_response struct instance
-   @param nr_scheduled_response_t *    pointer to scheduled_response instance to fill
-   @param fapi_nr_dl_config_request_t* pointer to dl_config,
-   @param fapi_nr_ul_config_request_t* pointer to ul_config,
-   @param fapi_nr_tx_request_t*        pointer to tx_request;
-   @param module_id_t mod_id           module ID
-   @param int cc_id                    CC ID
-   @param frame_t frame                frame number
-   @param int slot                     reference number
-   @param void *phy_pata               pointer to a PHY specific structure to be filled in the scheduler response (can be null) */
-void fill_scheduled_response(nr_scheduled_response_t *scheduled_response,
-                             fapi_nr_dl_config_request_t *dl_config,
-                             fapi_nr_ul_config_request_t *ul_config,
-                             fapi_nr_tx_request_t *tx_request,
-                             module_id_t mod_id,
-                             int cc_id,
-                             frame_t frame,
-                             int slot,
-                             void *phy_data);
-
 /*! \fn int8_t nr_ue_get_SR(module_id_t module_idP, frame_t frameP, slot_t slotP);
    \brief Called by PHY to get sdu for PUSCH transmission.  It performs the following operations: Checks BSR for DCCH, DCCH1 and
 DTCH corresponding to previous values computed either in SR or BSR procedures.  It gets rlc status indications on DCCH,DCCH1 and

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -1171,8 +1171,7 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info)
     if (dl_info && dl_info->dci_ind && dl_info->dci_ind->number_of_dcis) {
       LOG_T(MAC,"[L2][IF MODULE][DL INDICATION][DCI_IND]\n");
       for (int i = 0; i < dl_info->dci_ind->number_of_dcis; i++) {
-        LOG_T(MAC,">>>NR_IF_Module i=%d, dl_info->dci_ind->number_of_dcis=%d\n",i,dl_info->dci_ind->number_of_dcis);
-        nr_scheduled_response_t scheduled_response;
+        LOG_T(MAC, ">>>NR_IF_Module i=%d, dl_info->dci_ind->number_of_dcis=%d\n", i, dl_info->dci_ind->number_of_dcis);
         int8_t ret = handle_dci(dl_info->module_id,
                                 dl_info->cc_id,
                                 dl_info->gNB_index,
@@ -1193,10 +1192,13 @@ int nr_ue_dl_indication(nr_downlink_indication_t *dl_info)
         LOG_T(NR_MAC, "Setting harq_pid = %d and dci_index = %d (based on format)\n", g_harq_pid, dci_index->dci_format);
 
         ret_mask |= (ret << FAPI_NR_DCI_IND);
-        AssertFatal( nr_ue_if_module_inst[module_id] != NULL, "IF module is NULL!\n" );
-        AssertFatal( nr_ue_if_module_inst[module_id]->scheduled_response != NULL, "scheduled_response is NULL!\n" );
+        AssertFatal(nr_ue_if_module_inst[module_id] != NULL, "IF module is NULL!\n");
         fapi_nr_dl_config_request_t *dl_config = get_dl_config_request(mac, dl_info->slot);
-        fill_scheduled_response(&scheduled_response, dl_config, NULL, NULL, dl_info->module_id, dl_info->cc_id, dl_info->frame, dl_info->slot, dl_info->phy_data);
+        nr_scheduled_response_t scheduled_response = {.dl_config = dl_config,
+                                                      .mac = mac,
+                                                      .module_id = dl_info->module_id,
+                                                      .CC_id = dl_info->cc_id,
+                                                      .phy_data = dl_info->phy_data};
         nr_ue_if_module_inst[module_id]->scheduled_response(&scheduled_response);
         memset(def_dci_pdu_rel15, 0, sizeof(*def_dci_pdu_rel15));
       }
@@ -1289,28 +1291,6 @@ nr_ue_if_module_t *nr_ue_if_module_init(uint32_t module_id)
   return nr_ue_if_module_inst[module_id];
 }
 
-int nr_ue_if_module_kill(uint32_t module_id) {
-
-  if (nr_ue_if_module_inst[module_id] != NULL){
-    free(nr_ue_if_module_inst[module_id]);
-  }
-  return 0;
-}
-
-int nr_ue_dcireq(nr_dcireq_t *dcireq) {
-
-  fapi_nr_dl_config_request_t *dl_config = &dcireq->dl_config_req;
-  NR_UE_MAC_INST_t *UE_mac = get_mac_inst(0);
-  dl_config->sfn = dcireq->frame;
-  dl_config->slot = dcireq->slot;
-
-  LOG_T(PHY, "Entering UE DCI configuration frame %d slot %d \n", dcireq->frame, dcireq->slot);
-
-  ue_dci_configuration(UE_mac, dl_config, dcireq->frame, dcireq->slot);
-
-  return 0;
-}
-
 void RCconfig_nr_ue_macrlc(void) {
   int j;
   paramdef_t MACRLC_Params[] = MACRLCPARAMS_DESC;

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h

@@ -58,22 +58,6 @@ typedef struct {
   /// slot
   int slot;
 
-  fapi_nr_dl_config_request_t dl_config_req;
-  fapi_nr_ul_config_request_t ul_config_req;
-} nr_dcireq_t;
-
-typedef struct {
-    /// module id
-    module_id_t module_id;
-    /// gNB index
-    uint32_t gNB_index;
-    /// component carrier id
-    int cc_id;
-    /// frame 
-    frame_t frame;
-    /// slot
-    int slot;
-
     /// NR UE FAPI-like P7 message, direction: L1 to L2
     /// data reception indication structure
     fapi_nr_rx_indication_t *rx_ind;
@@ -315,18 +299,11 @@ void check_and_process_dci(nfapi_nr_dl_tti_request_t *dl_tti_request,
 
 bool sfn_slot_matcher(void *wanted, void *candidate);
 
-/**\brief done free of memory allocation by module_id and release to pointer pool.
-   \param module_id module id*/
-int nr_ue_if_module_kill(uint32_t module_id);
-
-
 /**\brief interface between L1/L2, indicating the downlink related information, like dci_ind and rx_req
    \param dl_info including dci_ind and rx_request messages*/
 int nr_ue_dl_indication(nr_downlink_indication_t *dl_info);
 
 int nr_ue_ul_indication(nr_uplink_indication_t *ul_info);
 
-int nr_ue_dcireq(nr_dcireq_t *dcireq);
-
 #endif