use pointer to structure instead of module_id inside MAC

executables/nr-ue.c

@@ -343,7 +343,7 @@ static void *NRUE_phy_stub_standalone_pnf_task(void *arg)
 
     if (is_nr_UL_slot(mac->tdd_UL_DL_ConfigurationCommon, ul_info.slot, mac->frame_type)) {
       LOG_D(NR_MAC, "Slot %d. calling nr_ue_ul_ind()\n", ul_info.slot);
-      nr_ue_ul_scheduler(&ul_info);
+      nr_ue_ul_scheduler(mac, &ul_info);
     }
     process_queued_nr_nfapi_msgs(mac, sfn_slot);
   }

openair2/LAYER2/NR_MAC_UE/config_ue.c

@@ -132,11 +132,10 @@ void set_tdd_config_nr_ue(fapi_nr_tdd_table_t *tdd_table,
 
 static void config_common_ue_sa(NR_UE_MAC_INST_t *mac,
                                 NR_ServingCellConfigCommonSIB_t *scc,
-                                module_id_t module_id,
                                 int cc_idP)
 {
   fapi_nr_config_request_t *cfg = &mac->phy_config.config_req;
-  mac->phy_config.Mod_id = module_id;
+  mac->phy_config.Mod_id = mac->ue_id;
   mac->phy_config.CC_id = cc_idP;
 
   LOG_D(MAC, "Entering SA UE Config Common\n");
@@ -271,12 +270,11 @@ static void config_common_ue_sa(NR_UE_MAC_INST_t *mac,
 
 static void config_common_ue(NR_UE_MAC_INST_t *mac,
                              NR_ServingCellConfigCommon_t *scc,
-                             module_id_t module_id,
                              int cc_idP)
 {
   fapi_nr_config_request_t *cfg = &mac->phy_config.config_req;
 
-  mac->phy_config.Mod_id = module_id;
+  mac->phy_config.Mod_id = mac->ue_id;
   mac->phy_config.CC_id = cc_idP;
   
   // carrier config
@@ -695,13 +693,11 @@ static int nr_get_ms_bucketsizeduration(long bucketsizeduration)
   }
 }
 
-void nr_configure_mac_config_logicalChannelBearer(module_id_t module_id,
+static void nr_configure_mac_config_logicalChannelBearer(NR_UE_MAC_INST_t *mac,
                                                          long channel_identity,
                                                          NR_LogicalChannelConfig_t *lc_config)
 {
-  NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
-
-  LOG_I(NR_MAC, "[MACLogicalChannelConfig]Applying RRC Logical Channel Config %d to lcid %li\n", module_id, channel_identity);
+  LOG_I(NR_MAC, "Applying RRC Logical Channel Config to lcid %li\n", channel_identity);
   mac->logicalChannelConfig[channel_identity - 1] = lc_config;
 
   // initialize the variable Bj for every LCID
@@ -724,11 +720,10 @@ void nr_configure_mac_config_logicalChannelBearer(module_id_t module_id,
     mac->scheduling_info.lc_sched_info[channel_identity - 1].LCGID = 0;
 }
 
-static void configure_logicalChannelBearer(module_id_t module_id,
+static void configure_logicalChannelBearer(NR_UE_MAC_INST_t *mac,
                                            struct NR_CellGroupConfig__rlc_BearerToAddModList *rlc_toadd_list,
                                            struct NR_CellGroupConfig__rlc_BearerToReleaseList *rlc_torelease_list)
 {
-  NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
   if (rlc_torelease_list) {
     for (int i = 0; i < rlc_torelease_list->list.count; i++) {
       if (rlc_torelease_list->list.array[i]) {
@@ -776,7 +771,7 @@ static void configure_logicalChannelBearer(module_id_t module_id,
       }
       if (mac_lc_config) {
         mac->lc_ordered_info[i].logicalChannelConfig_ordered = mac_lc_config;
-        nr_configure_mac_config_logicalChannelBearer(module_id, lc_identity, mac_lc_config);
+        nr_configure_mac_config_logicalChannelBearer(mac, lc_identity, mac_lc_config);
       }
     }
 
@@ -827,7 +822,7 @@ void nr_rrc_mac_config_req_mib(module_id_t module_id,
     mac->get_sib1 = true;
   else if (sched_sib == 2)
     mac->get_otherSI = true;
-  nr_ue_decode_mib(module_id, cc_idP);
+  nr_ue_decode_mib(mac, cc_idP);
 }
 
 static void setup_puschpowercontrol(NR_PUSCH_PowerControl_t *source, NR_PUSCH_PowerControl_t *target)
@@ -1381,7 +1376,7 @@ void nr_rrc_mac_config_req_reset(module_id_t module_id,
   reset_mac_inst(mac);
   reset_ra(&mac->ra);
   release_mac_configuration(mac);
-  nr_ue_init_mac(module_id);
+  nr_ue_init_mac(mac);
 
   // Sending to PHY a request to resync
   // with no target cell ID
@@ -1404,7 +1399,7 @@ void nr_rrc_mac_config_req_sib1(module_id_t module_id,
   UPDATE_MAC_IE(mac->tdd_UL_DL_ConfigurationCommon, scc->tdd_UL_DL_ConfigurationCommon, NR_TDD_UL_DL_ConfigCommon_t);
   UPDATE_MAC_IE(mac->si_SchedulingInfo, si_SchedulingInfo, NR_SI_SchedulingInfo_t);
 
-  config_common_ue_sa(mac, scc, module_id, cc_idP);
+  config_common_ue_sa(mac, scc, cc_idP);
   configure_common_BWP_dl(mac,
                           0, // bwp-id
                           &scc->downlinkConfigCommon.initialDownlinkBWP);
@@ -1430,7 +1425,6 @@ void nr_rrc_mac_config_req_sib1(module_id_t module_id,
 }
 
 static void handle_reconfiguration_with_sync(NR_UE_MAC_INST_t *mac,
-                                             module_id_t module_id,
                                              int cc_idP,
                                              const NR_ReconfigurationWithSync_t *reconfigurationWithSync)
 {
@@ -1451,7 +1445,7 @@ static void handle_reconfiguration_with_sync(NR_UE_MAC_INST_t *mac,
       mac->physCellId = *scc->physCellId;
     mac->dmrs_TypeA_Position = scc->dmrs_TypeA_Position;
     UPDATE_MAC_IE(mac->tdd_UL_DL_ConfigurationCommon, scc->tdd_UL_DL_ConfigurationCommon, NR_TDD_UL_DL_ConfigCommon_t);
-    config_common_ue(mac, scc, module_id, cc_idP);
+    config_common_ue(mac, scc, cc_idP);
     if (scc->downlinkConfigCommon)
       configure_common_BWP_dl(mac,
                               0, // bwp-id
@@ -1467,7 +1461,7 @@ static void handle_reconfiguration_with_sync(NR_UE_MAC_INST_t *mac,
   nr_ue_mac_default_configs(mac);
 
   if (!get_softmodem_params()->emulate_l1) {
-    mac->synch_request.Mod_id = module_id;
+    mac->synch_request.Mod_id = mac->ue_id;
     mac->synch_request.CC_id = cc_idP;
     mac->synch_request.synch_req.target_Nid_cell = mac->physCellId;
     mac->if_module->synch_request(&mac->synch_request);
@@ -1948,7 +1942,7 @@ void nr_rrc_mac_config_req_cg(module_id_t module_id,
     mac->servCellIndex = spCellConfig->servCellIndex ? *spCellConfig->servCellIndex : 0;
     if (spCellConfig->reconfigurationWithSync) {
       LOG_A(NR_MAC, "Received reconfigurationWithSync\n");
-      handle_reconfiguration_with_sync(mac, module_id, cc_idP, spCellConfig->reconfigurationWithSync);
+      handle_reconfiguration_with_sync(mac, cc_idP, spCellConfig->reconfigurationWithSync);
     }
     if (scd) {
       configure_servingcell_info(&mac->sc_info, scd);
@@ -1956,7 +1950,7 @@ void nr_rrc_mac_config_req_cg(module_id_t module_id,
     }
   }
 
-  configure_logicalChannelBearer(module_id,
+  configure_logicalChannelBearer(mac,
                                  cell_group_config->rlc_BearerToAddModList,
                                  cell_group_config->rlc_BearerToReleaseList);
 

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -146,8 +146,8 @@
   } while (0)
 
 /**\brief initialize the field in nr_mac instance
-   \param module_id      module id */
-void nr_ue_init_mac(module_id_t module_idP);
+   \param mac      MAC pointer */
+void nr_ue_init_mac(NR_UE_MAC_INST_t *mac);
 
 void send_srb0_rrc(int ue_id, const uint8_t *sdu, sdu_size_t sdu_len, void *data);
 
@@ -155,7 +155,7 @@ void send_srb0_rrc(int ue_id, const uint8_t *sdu, sdu_size_t sdu_len, void *data
    \param mac           mac instance */
 void nr_ue_mac_default_configs(NR_UE_MAC_INST_t *mac);
 
-void nr_ue_decode_mib(module_id_t module_id, int cc_id);
+void nr_ue_decode_mib(NR_UE_MAC_INST_t *mac, int cc_id);
 
 void release_common_ss_cset(NR_BWP_PDCCH_t *pdcch);
 
@@ -166,7 +166,7 @@ void release_common_ss_cset(NR_BWP_PDCCH_t *pdcch);
    \param sibs_mask      sibs mask
    \param pduP           pointer to pdu
    \param pdu_length     length of pdu */
-int8_t nr_ue_decode_BCCH_DL_SCH(module_id_t module_id,
+int8_t nr_ue_decode_BCCH_DL_SCH(NR_UE_MAC_INST_t *mac,
                                 int cc_id,
                                 unsigned int gNB_index,
                                 uint8_t ack_nack,
@@ -208,17 +208,17 @@ void release_mac_configuration(NR_UE_MAC_INST_t *mac);
           performs BSR/SR/PHR procedures, random access procedure handler and DLSCH/ULSCH procedures.
    \param dl_info     DL indication
    \param ul_info     UL indication*/
-void nr_ue_ul_scheduler(nr_uplink_indication_t *ul_info);
-void nr_ue_dl_scheduler(nr_downlink_indication_t *dl_info);
+void nr_ue_ul_scheduler(NR_UE_MAC_INST_t *mac, nr_uplink_indication_t *ul_info);
+void nr_ue_dl_scheduler(NR_UE_MAC_INST_t *mac, nr_downlink_indication_t *dl_info);
 
-/*! \fn int8_t nr_ue_get_SR(module_id_t module_idP, frame_t frameP, slot_t slotP);
+/*! \fn int8_t nr_ue_get_SR(NR_UE_MAC_INST_t *mac, 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
 DTCH and forms BSR elements and PHR in MAC header.  CRNTI element is not supported yet.  It computes transport block for up to 3
 SDUs and generates header and forms the complete MAC SDU. \param[in]  module_idP Instance id of UE in machine \param[in] frameP
 subframe number \param[in] slotP slot number
 */
-int8_t nr_ue_get_SR(module_id_t module_idP, frame_t frameP, slot_t slotP);
+int8_t nr_ue_get_SR(NR_UE_MAC_INST_t *mac, frame_t frameP, slot_t slotP);
 
 /*! \fn  nr_update_bsr
    \brief get the rlc stats and update the bsr level for each lcid
@@ -227,7 +227,7 @@ int8_t nr_ue_get_SR(module_id_t module_idP, frame_t frameP, slot_t slotP);
 \param[in] slotP number
 \param[in] gNB_index
 */
-bool nr_update_bsr(module_id_t module_idP, frame_t frameP, slot_t slotP, uint8_t gNB_index);
+bool nr_update_bsr(NR_UE_MAC_INST_t *mac, frame_t frameP, slot_t slotP, uint8_t gNB_index);
 
 /*! \fn  nr_locate_BsrIndexByBufferSize (int *table, int size, int value)
    \brief locate the BSR level in the table as defined in 38.321. This function requires that he values in table to be monotonic, either increasing or decreasing. The returned value is not less than 0, nor greater than n-1, where n is the size of table.
@@ -260,14 +260,19 @@ int nr_get_sf_periodicBSRTimer(uint8_t bucketSize);
 */
 int nr_get_sf_retxBSRTimer(uint8_t retxBSR_Timer);
 
-int8_t nr_ue_process_dci(module_id_t module_id,
+int8_t nr_ue_process_dci(NR_UE_MAC_INST_t *mac,
                          int cc_id,
                          frame_t frame,
                          int slot,
                          dci_pdu_rel15_t *dci,
                          fapi_nr_dci_indication_pdu_t *dci_ind);
-int nr_ue_process_dci_indication_pdu(module_id_t module_id, int cc_id, int gNB_index, frame_t frame, int slot, fapi_nr_dci_indication_pdu_t *dci);
-int8_t nr_ue_process_csirs_measurements(module_id_t module_id,
+int nr_ue_process_dci_indication_pdu(NR_UE_MAC_INST_t *mac,
+                                     int cc_id,
+                                     int gNB_index,
+                                     frame_t frame,
+                                     int slot,
+                                     fapi_nr_dci_indication_pdu_t *dci);
+int8_t nr_ue_process_csirs_measurements(NR_UE_MAC_INST_t *mac,
                                         frame_t frame,
                                         int slot,
                                         fapi_nr_csirs_measurements_t *csirs_measurements);
@@ -312,11 +317,9 @@ uint8_t get_rsrp_diff_index(int best_rsrp,int current_rsrp);
 @param pdu_id             index of DL PDU
 @returns void
 */
-void nr_ue_send_sdu(nr_downlink_indication_t *dl_info,
-                    int pdu_id);
+void nr_ue_send_sdu(NR_UE_MAC_INST_t *mac, nr_downlink_indication_t *dl_info, int pdu_id);
 
-void nr_ue_process_mac_pdu(nr_downlink_indication_t *dl_info,
-                           int pdu_id);
+void nr_ue_process_mac_pdu(NR_UE_MAC_INST_t *mac,nr_downlink_indication_t *dl_info, int pdu_id);
 
 int nr_write_ce_ulsch_pdu(uint8_t *mac_ce,
                           NR_UE_MAC_INST_t *mac,
@@ -334,7 +337,7 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac,
 
 void ue_dci_configuration(NR_UE_MAC_INST_t *mac, fapi_nr_dl_config_request_t *dl_config, const frame_t frame, const int slot);
 
-uint8_t nr_ue_get_sdu(module_id_t module_idP,
+uint8_t nr_ue_get_sdu(NR_UE_MAC_INST_t *mac,
                       int cc_id,
                       frame_t frameP,
                       sub_frame_t subframe,
@@ -393,7 +396,7 @@ and fills the PRACH PDU per each FD occasion.
 @param slotP Slot index
 @returns void
 */
-void nr_ue_pucch_scheduler(module_id_t module_idP, frame_t frameP, int slotP, void *phy_data);
+void nr_ue_pucch_scheduler(NR_UE_MAC_INST_t *mac, frame_t frameP, int slotP, void *phy_data);
 void nr_schedule_csirs_reception(NR_UE_MAC_INST_t *mac, int frame, int slot);
 void nr_schedule_csi_for_im(NR_UE_MAC_INST_t *mac, int frame, int slot);
 void schedule_ta_command(fapi_nr_dl_config_request_t *dl_config, NR_UL_TIME_ALIGNMENT_t *ul_time_alignment);
@@ -409,11 +412,11 @@ void nr_ue_msg3_scheduler(NR_UE_MAC_INST_t *mac,
                           sub_frame_t current_slot,
                           uint8_t Msg3_tda_id);
 
-void nr_ue_contention_resolution(module_id_t module_id, int cc_id, frame_t frame, int slot, NR_PRACH_RESOURCES_t *prach_resources);
+void nr_ue_contention_resolution(NR_UE_MAC_INST_t *mac, int cc_id, frame_t frame, int slot, NR_PRACH_RESOURCES_t *prach_resources);
 
-void nr_ra_failed(uint8_t mod_id, uint8_t CC_id, NR_PRACH_RESOURCES_t *prach_resources, frame_t frame, int slot);
+void nr_ra_failed(NR_UE_MAC_INST_t *mac, uint8_t CC_id, NR_PRACH_RESOURCES_t *prach_resources, frame_t frame, int slot);
 
-void nr_ra_succeeded(const module_id_t mod_id, const uint8_t gNB_index, const frame_t frame, const int slot);
+void nr_ra_succeeded(NR_UE_MAC_INST_t *mac, const uint8_t gNB_index, const frame_t frame, const int slot);
 
 void nr_get_RA_window(NR_UE_MAC_INST_t *mac);
 
@@ -428,7 +431,7 @@ andom-access to transmit a BSR along with the C-RNTI control element (see 5.1.4
 @param gNB_id gNB index
 @param nr_slot_tx slot for PRACH transmission
 @returns indication to generate PRACH to phy */
-uint8_t nr_ue_get_rach(module_id_t mod_id,
+uint8_t nr_ue_get_rach(NR_UE_MAC_INST_t *mac,
                        int CC_id,
                        frame_t frame,
                        uint8_t gNB_id,
@@ -440,7 +443,7 @@ uint8_t nr_ue_get_rach(module_id_t mod_id,
 @param gNB_index gNB index
 @param rach_ConfigDedicated
 @returns void */
-void nr_get_prach_resources(module_id_t mod_id,
+void nr_get_prach_resources(NR_UE_MAC_INST_t *mac,
                             int CC_id,
                             uint8_t gNB_id,
                             NR_PRACH_RESOURCES_t *prach_resources,
@@ -449,22 +452,19 @@ void nr_get_prach_resources(module_id_t mod_id,
 void prepare_msg4_feedback(NR_UE_MAC_INST_t *mac, int pid, int ack_nack);
 void configure_initial_pucch(PUCCH_sched_t *pucch, int res_ind);
 
-void init_RA(module_id_t mod_id,
+void init_RA(NR_UE_MAC_INST_t *mac,
              NR_PRACH_RESOURCES_t *prach_resources,
              NR_RACH_ConfigCommon_t *nr_rach_ConfigCommon,
              NR_RACH_ConfigGeneric_t *rach_ConfigGeneric,
              NR_RACH_ConfigDedicated_t *rach_ConfigDedicated);
 
-int16_t get_prach_tx_power(module_id_t mod_id);
+int16_t get_prach_tx_power(NR_UE_MAC_INST_t *mac);
 
 void set_ra_rnti(NR_UE_MAC_INST_t *mac, fapi_nr_ul_config_prach_pdu *prach_pdu);
 
-void nr_Msg1_transmitted(module_id_t mod_id);
-
-void nr_Msg3_transmitted(module_id_t mod_id, uint8_t CC_id, frame_t frameP, slot_t slotP, uint8_t gNB_id);
-void nr_get_msg3_payload(module_id_t mod_id, uint8_t *buf, int TBS_max);
-
-void nr_ue_msg2_scheduler(module_id_t mod_id, uint16_t rach_frame, uint16_t rach_slot, uint16_t *msg2_frame, uint16_t *msg2_slot);
+void nr_Msg1_transmitted(NR_UE_MAC_INST_t *mac);
+void nr_Msg3_transmitted(NR_UE_MAC_INST_t *mac, uint8_t CC_id, frame_t frameP, slot_t slotP, uint8_t gNB_id);
+void nr_get_msg3_payload(NR_UE_MAC_INST_t *mac, uint8_t *buf, int TBS_max);
 
 int8_t nr_ue_process_dci_freq_dom_resource_assignment(nfapi_nr_ue_pusch_pdu_t *pusch_config_pdu,
                                                       fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu,

openair2/LAYER2/NR_MAC_UE/main_ue_nr.c

@@ -53,10 +53,9 @@ void send_srb0_rrc(int ue_id, const uint8_t *sdu, sdu_size_t sdu_len, void *data
   itti_send_msg_to_task(TASK_RRC_NRUE, ue_id, message_p);
 }
 
-void nr_ue_init_mac(module_id_t module_idP)
+void nr_ue_init_mac(NR_UE_MAC_INST_t *mac)
 {
-  LOG_I(NR_MAC, "[UE%d] Applying default macMainConfig\n", module_idP);
-  NR_UE_MAC_INST_t *mac = get_mac_inst(module_idP);
+  LOG_I(NR_MAC, "[UE%d] Initializing MAC\n", mac->ue_id);
   mac->first_sync_frame = -1;
   mac->get_sib1 = false;
   mac->get_otherSI = false;
@@ -112,9 +111,9 @@ NR_UE_MAC_INST_t *nr_l2_init_ue(int nb_inst)
   AssertFatal(nr_ue_mac_inst, "Couldn't allocate %d instances of MAC module\n", nb_inst);
 
   for (int j = 0; j < nb_inst; j++) {
-    nr_ue_init_mac(j);
     NR_UE_MAC_INST_t *mac = get_mac_inst(j);
     mac->ue_id = j;
+    nr_ue_init_mac(mac);
     nr_ue_mac_default_configs(mac);
     if (get_softmodem_params()->sa)
       ue_init_config_request(mac, get_softmodem_params()->numerology);
@@ -134,6 +133,7 @@ NR_UE_MAC_INST_t *get_mac_inst(module_id_t module_id)
 {
   NR_UE_MAC_INST_t *mac = &nr_ue_mac_inst[(int)module_id];
   AssertFatal(mac, "Couldn't get MAC inst %d\n", module_id);
+  AssertFatal(mac->ue_id == module_id, "MAC ID %d doesn't match with input %d\n", mac->ue_id, module_id);
   return mac;
 }