copy RRC structures to MAC instead of passing pointer to RRC and some more cleanup

openair2/LAYER2/NR_MAC_COMMON/nr_mac.h

@@ -570,7 +570,7 @@ typedef struct NR_UE_DL_BWP {
   NR_PDSCH_TimeDomainResourceAllocationList_t *tdaList_Common;
   NR_PDSCH_Config_t *pdsch_Config;
   NR_PDSCH_ServingCellConfig_t *pdsch_servingcellconfig;
-  long *pdsch_HARQ_ACK_Codebook;
+  long pdsch_HARQ_ACK_Codebook;
   uint8_t mcsTableIdx;
   nr_dci_format_t dci_format;
 } NR_UE_DL_BWP_t;

openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c

@@ -3376,7 +3376,7 @@ uint16_t nr_dci_size(const NR_UE_DL_BWP_t *DL_BWP,
         size += 1;
       }
       // 1st DAI
-      if (DL_BWP->pdsch_HARQ_ACK_Codebook && *DL_BWP->pdsch_HARQ_ACK_Codebook == NR_PhysicalCellGroupConfig__pdsch_HARQ_ACK_Codebook_dynamic)
+      if (DL_BWP->pdsch_HARQ_ACK_Codebook == NR_PhysicalCellGroupConfig__pdsch_HARQ_ACK_Codebook_dynamic)
         dci_pdu->dai[0].nbits = 2;
       else
         dci_pdu->dai[0].nbits = 1;
@@ -3548,7 +3548,7 @@ uint16_t nr_dci_size(const NR_UE_DL_BWP_t *DL_BWP,
       // HARQ PID
       size += 4;
       // DAI
-      if (DL_BWP->pdsch_HARQ_ACK_Codebook && *DL_BWP->pdsch_HARQ_ACK_Codebook == NR_PhysicalCellGroupConfig__pdsch_HARQ_ACK_Codebook_dynamic) { // FIXME in case of more than one serving cell
+      if (DL_BWP->pdsch_HARQ_ACK_Codebook == NR_PhysicalCellGroupConfig__pdsch_HARQ_ACK_Codebook_dynamic) { // FIXME in case of more than one serving cell
         dci_pdu->dai[0].nbits = 2;
         size += dci_pdu->dai[0].nbits;
       }

openair2/LAYER2/NR_MAC_UE/config_ue.c

@@ -134,6 +134,7 @@ void config_common_ue_sa(NR_UE_MAC_INST_t *mac,
     }
   }
 
+  AssertFatal(scc->uplinkConfigCommon, "Release of uplinkConfigCommon_SIB not handled\n");
   NR_FrequencyInfoUL_SIB_t *frequencyInfoUL = &scc->uplinkConfigCommon->frequencyInfoUL;
   int UL_band_ind = frequencyInfoUL->frequencyBandList == NULL ?
                     *frequencyInfoDL->frequencyBandList.list.array[0]->freqBandIndicatorNR :
@@ -202,6 +203,11 @@ void config_common_ue_sa(NR_UE_MAC_INST_t *mac,
   // PRACH configuration
 
   uint8_t nb_preambles = 64;
+  if (!scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon)
+   // Need M -> maintain current values
+   return;
+  AssertFatal(scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->present == NR_SetupRelease_RACH_ConfigCommon_PR_setup,
+              "Cannot handle release of RACH_ConfigCommon\n");
   NR_RACH_ConfigCommon_t *rach_ConfigCommon = scc->uplinkConfigCommon->initialUplinkBWP.rach_ConfigCommon->choice.setup;
   if(rach_ConfigCommon->totalNumberOfRA_Preambles != NULL)
      nb_preambles = *rach_ConfigCommon->totalNumberOfRA_Preambles;
@@ -572,7 +578,7 @@ void configure_current_BWP(NR_UE_MAC_INST_t *mac,
 
   if(cell_group_config) {
     if (cell_group_config->physicalCellGroupConfig) {
-      DL_BWP->pdsch_HARQ_ACK_Codebook = &cell_group_config->physicalCellGroupConfig->pdsch_HARQ_ACK_Codebook;
+      DL_BWP->pdsch_HARQ_ACK_Codebook = cell_group_config->physicalCellGroupConfig->pdsch_HARQ_ACK_Codebook;
       UL_BWP->harq_ACK_SpatialBundlingPUCCH = cell_group_config->physicalCellGroupConfig->harq_ACK_SpatialBundlingPUCCH;
     }
     if (cell_group_config->spCellConfig &&
@@ -704,16 +710,58 @@ void nr_rrc_mac_config_req_mib(module_id_t module_id,
                    cc_idP);
 }
 
+void configure_tdd_configcommon(NR_UE_MAC_INST_t *mac, NR_TDD_UL_DL_ConfigCommon_t *tdd_UL_DL_ConfigurationCommon)
+{
+  if(tdd_UL_DL_ConfigurationCommon) {
+    if (!mac->tdd_UL_DL_ConfigurationCommon)
+      mac->tdd_UL_DL_ConfigurationCommon = malloc(sizeof(NR_CellGroupConfig_t));
+    memcpy(mac->tdd_UL_DL_ConfigurationCommon, tdd_UL_DL_ConfigurationCommon, sizeof(NR_TDD_UL_DL_ConfigCommon_t));
+  }
+  else if (mac->tdd_UL_DL_ConfigurationCommon) {
+    ASN_STRUCT_FREE(asn_DEF_NR_TDD_UL_DL_ConfigCommon, mac->tdd_UL_DL_ConfigurationCommon);
+    mac->tdd_UL_DL_ConfigurationCommon = NULL;
+  }
+}
+
+void configure_pmax(NR_UE_MAC_INST_t *mac, NR_P_Max_t *p_Max)
+{
+  if (p_Max) {
+    if(!mac->p_Max)
+      mac->p_Max = malloc(sizeof(NR_P_Max_t));
+    memcpy(mac->p_Max, p_Max, sizeof(NR_P_Max_t));
+  }
+  else if (mac->p_Max) {
+    ASN_STRUCT_FREE(asn_DEF_NR_P_Max, mac->p_Max);
+    mac->p_Max = NULL;
+  }
+}
+
+void configure_sinfo(NR_UE_MAC_INST_t *mac, NR_SI_SchedulingInfo_t *si_Info)
+{
+  if (si_Info) {
+    if(!mac->si_SchedulingInfo)
+      mac->si_SchedulingInfo = malloc(sizeof(NR_SI_SchedulingInfo_t));
+    memcpy(mac->si_SchedulingInfo, si_Info, sizeof(NR_SI_SchedulingInfo_t));
+  }
+  else if (mac->si_SchedulingInfo) {
+    ASN_STRUCT_FREE(asn_DEF_NR_SI_SchedulingInfo, mac->si_SchedulingInfo);
+    mac->si_SchedulingInfo = NULL;
+  }
+}
+
 void nr_rrc_mac_config_req_sib1(module_id_t module_id,
                                 int cc_idP,
-                                struct NR_SI_SchedulingInfo *si_SchedulingInfo,
+                                NR_SI_SchedulingInfo_t *si_SchedulingInfo,
                                 NR_ServingCellConfigCommonSIB_t *scc)
 {
   NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
   AssertFatal(scc, "SIB1 SCC should not be NULL\n");
-  mac->tdd_UL_DL_ConfigurationCommon = scc->tdd_UL_DL_ConfigurationCommon;
-  mac->p_Max = scc->uplinkConfigCommon->frequencyInfoUL.p_Max;
-  mac->si_SchedulingInfo = si_SchedulingInfo;
+  configure_tdd_configcommon(mac, scc->tdd_UL_DL_ConfigurationCommon);
+  NR_P_Max_t *p_Max = NULL;
+  if (scc->uplinkConfigCommon)
+    p_Max = scc->uplinkConfigCommon->frequencyInfoUL.p_Max;
+  configure_pmax(mac, p_Max);
+  configure_sinfo(mac, si_SchedulingInfo);
   mac->nr_band = *scc->downlinkConfigCommon.frequencyInfoDL.frequencyBandList.list.array[0]->freqBandIndicatorNR;
   config_common_ue_sa(mac, scc, module_id, cc_idP);
   // configure BWP only if it is a SIB1 detection in non connected state (after sync)
@@ -741,8 +789,9 @@ void handle_reconfiguration_with_sync(NR_UE_MAC_INST_t *mac,
   mac->bwp_dlcommon = scc->downlinkConfigCommon->initialDownlinkBWP;
   mac->bwp_ulcommon = scc->uplinkConfigCommon->initialUplinkBWP;
   mac->dmrs_TypeA_Position = scc->dmrs_TypeA_Position;
-  mac->tdd_UL_DL_ConfigurationCommon = scc->tdd_UL_DL_ConfigurationCommon;
-  mac->p_Max = scc->uplinkConfigCommon->frequencyInfoUL->p_Max;
+  configure_tdd_configcommon(mac, scc->tdd_UL_DL_ConfigurationCommon);
+  if (scc->uplinkConfigCommon && scc->uplinkConfigCommon->frequencyInfoUL)
+    configure_pmax(mac, scc->uplinkConfigCommon->frequencyInfoUL->p_Max);
   mac->nr_band = *scc->downlinkConfigCommon->frequencyInfoDL->frequencyBandList.list.array[0];
   mac->physCellId = *scc->physCellId;
   mac->crnti = reconfigurationWithSync->newUE_Identity;
@@ -757,7 +806,10 @@ void nr_rrc_mac_config_req_mcg(module_id_t module_id,
   LOG_I(MAC,"Applying CellGroupConfig from gNodeB\n");
   AssertFatal(cell_group_config, "CellGroupConfig should not be NULL\n");
   NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
-  mac->cg = cell_group_config;
+  if (!mac->cg)
+    mac->cg = malloc(sizeof(NR_CellGroupConfig_t));
+  memcpy(mac->cg, cell_group_config, sizeof(NR_CellGroupConfig_t));
+
   if (cell_group_config->spCellConfig)
     mac->servCellIndex = cell_group_config->spCellConfig->servCellIndex ? *cell_group_config->spCellConfig->servCellIndex : 0;
   else
@@ -801,7 +853,9 @@ void nr_rrc_mac_config_req_scg(module_id_t module_id,
   NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
   AssertFatal(scell_group_config, "scell_group_config cannot be NULL\n");
 
-  mac->cg = scell_group_config;
+  if (!mac->cg)
+    mac->cg = malloc(sizeof(NR_CellGroupConfig_t));
+  memcpy(mac->cg, scell_group_config, sizeof(NR_CellGroupConfig_t));
   mac->servCellIndex = *scell_group_config->spCellConfig->servCellIndex;
   if (scell_group_config->spCellConfig->reconfigurationWithSync)
     handle_reconfiguration_with_sync(mac, module_id, cc_idP, scell_group_config->spCellConfig->reconfigurationWithSync);

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -62,6 +62,7 @@
 #include "NR_ServingCellConfig.h"
 #include "NR_MeasConfig.h"
 #include "NR_ServingCellConfigCommonSIB.h"
+#include "NR_SI-SchedulingInfo.h"
 
 
 // ==========
@@ -435,7 +436,7 @@ typedef struct {
   NR_PHR_Config_t                 *phr_Config;
   NR_RNTI_Value_t                 *cs_RNTI;
   NR_MIB_t                        *mib;
-  struct NR_SI_SchedulingInfo *si_SchedulingInfo;
+  NR_SI_SchedulingInfo_t *si_SchedulingInfo;
   int si_window_start;
   ssb_list_info_t ssb_list;
 

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -82,7 +82,7 @@ void nr_rrc_mac_config_req_mib(module_id_t module_id,
 
 void nr_rrc_mac_config_req_sib1(module_id_t module_id,
                                 int cc_idP,
-                                struct NR_SI_SchedulingInfo *si_SchedulingInfo,
+                                NR_SI_SchedulingInfo_t *si_SchedulingInfo,
                                 NR_ServingCellConfigCommonSIB_t *scc);
 
 /**\brief initialization NR UE MAC instance(s), total number of MAC instance based on NB_NR_UE_MAC_INST*/

openair2/LAYER2/NR_MAC_UE/nr_ue_power_procedures.c

@@ -58,7 +58,7 @@ int nr_get_Pcmax(NR_UE_MAC_INST_t *mac, int Qm, bool powerBoostPi2BPSK, int scs,
 
     //TODO configure P-MAX from the upper layers according to 38.331
     int p_powerclass = 23; // dBm assuming poweclass 3 UE
-    int p_emax = mac->p_Max ? *mac->p_Max : 0;
+    int p_emax = mac->p_Max ? *mac->p_Max : p_powerclass;
     int delta_P_powerclass = 0; // for powerclass 2 needs to be changed
     if(mac->p_Max && Qm == 1 && powerBoostPi2BPSK && (nr_band == 40 || nr_band == 41 || nr_band == 77 || nr_band == 78 || nr_band == 79)) {
       p_emax += 3;

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -1352,7 +1352,8 @@ void nr_ue_configure_pucch(NR_UE_MAC_INST_t *mac,
 
     NR_PUCCH_Resource_t *pucchres = pucch->pucch_resource;
 
-    if (current_UL_BWP->harq_ACK_SpatialBundlingPUCCH != NULL || *current_DL_BWP->pdsch_HARQ_ACK_Codebook != 1) {
+    if (current_UL_BWP->harq_ACK_SpatialBundlingPUCCH != NULL ||
+        current_DL_BWP->pdsch_HARQ_ACK_Codebook != NR_PhysicalCellGroupConfig__pdsch_HARQ_ACK_Codebook_dynamic) {
       LOG_E(MAC,"PUCCH Unsupported cell group configuration\n");
       return;
     } else if (current_DL_BWP && current_DL_BWP->pdsch_servingcellconfig && current_DL_BWP->pdsch_servingcellconfig->codeBlockGroupTransmission != NULL) {

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -2023,7 +2023,7 @@ void configure_UE_BWP(gNB_MAC_INST *nr_mac,
   int target_ss;
 
   if (CellGroup && CellGroup->physicalCellGroupConfig)
-    DL_BWP->pdsch_HARQ_ACK_Codebook = &CellGroup->physicalCellGroupConfig->pdsch_HARQ_ACK_Codebook;
+    DL_BWP->pdsch_HARQ_ACK_Codebook = CellGroup->physicalCellGroupConfig->pdsch_HARQ_ACK_Codebook;
 
   if (CellGroup &&
       CellGroup->spCellConfig &&