Merge remote-tracking branch 'origin/ue-small-fixes' into integration_2024_w17

openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c

@@ -43,7 +43,7 @@ void fill_dci_search_candidates(const NR_SearchSpace_t *ss,
                                 fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15,
                                 const uint32_t Y)
 {
-  LOG_D(NR_MAC_DCI, "Filling search candidates for DCI\n");
+  LOG_T(NR_MAC_DCI, "Filling search candidates for DCI\n");
 
   int i = 0;
   for (int maxL = 16; maxL > 0; maxL >>= 1) {
@@ -54,7 +54,7 @@ void fill_dci_search_candidates(const NR_SearchSpace_t *ss,
                                 maxL);
     if (max_number_of_candidates == 0)
       continue;
-    LOG_D(NR_MAC_DCI, "L %d, max number of candidates %d, aggregation %d\n", maxL, max_number_of_candidates, aggregation);
+    LOG_T(NR_MAC_DCI, "L %d, max number of candidates %d, aggregation %d\n", maxL, max_number_of_candidates, aggregation);
     int N_cce_sym = 0; // nb of rbs of coreset per symbol
     for (int f = 0; f < 6; f++) {
       for (int t = 0; t < 8; t++) {
@@ -66,7 +66,7 @@ void fill_dci_search_candidates(const NR_SearchSpace_t *ss,
       continue;
     for (int j = 0; j < max_number_of_candidates; j++) {
       int first_cce = aggregation * ((Y + ((j * N_cces) / (aggregation * max_number_of_candidates)) + 0) % (N_cces / aggregation));
-      LOG_D(NR_MAC_DCI,
+      LOG_T(NR_MAC_DCI,
             "Candidate %d of %d first_cce %d (L %d N_cces %d Y %d)\n",
             j,
             max_number_of_candidates,
@@ -79,7 +79,7 @@ void fill_dci_search_candidates(const NR_SearchSpace_t *ss,
       for (int k = 0; k < i; k++) {
         if (rel15->CCE[k] == first_cce && rel15->L[k] == aggregation) {
           duplicated = true;
-          LOG_D(NR_MAC_DCI, "Candidate %d of %d is duplicated\n", j, max_number_of_candidates);
+          LOG_T(NR_MAC_DCI, "Candidate %d of %d is duplicated\n", j, max_number_of_candidates);
         }
       }
       if (!duplicated) {
@@ -315,7 +315,7 @@ void config_dci_pdu(NR_UE_MAC_INST_t *mac,
 
   #ifdef DEBUG_DCI
     for (int i = 0; i < rel15->num_dci_options; i++) {
-      LOG_D(NR_MAC_DCI,
+      LOG_T(NR_MAC_DCI,
             "[DCI_CONFIG] Configure DCI PDU: rnti_type %d BWPSize %d BWPStart %d rel15->SubcarrierSpacing %d rel15->dci_format %d "
             "rel15->dci_length %d sps %d monitoringSymbolsWithinSlot %d \n",
             rnti_type,

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -700,7 +700,7 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
             pusch_config_pdu->dfts_ofdm.low_papr_group_number);
     }
     else {
-      if (pusch_config_pdu->scid == 0 && NR_DMRS_ulconfig &&
+      if (pusch_config_pdu->scid == 0 && NR_DMRS_ulconfig && NR_DMRS_ulconfig->transformPrecodingDisabled &&
           NR_DMRS_ulconfig->transformPrecodingDisabled->scramblingID0)
         pusch_config_pdu->ul_dmrs_scrambling_id = *NR_DMRS_ulconfig->transformPrecodingDisabled->scramblingID0;
       if (pusch_config_pdu->scid == 1 && NR_DMRS_ulconfig &&

openair3/NAS/NR_UE/nr_nas_msg_sim.c

@@ -642,8 +642,6 @@ static void decodeRegistrationAccept(const uint8_t *buf, int len, nr_ue_nas_t *n
 
 static void generateRegistrationComplete(nr_ue_nas_t *nas, as_nas_info_t *initialNasMsg, SORTransparentContainer *sortransparentcontainer)
 {
-  //wait send RRCReconfigurationComplete and InitialContextSetupResponse
-  sleep(1);
   int length = 0;
   int size = 0;
   fgs_nas_message_t nas_msg;
@@ -781,8 +779,6 @@ static void generateDeregistrationRequest(nr_ue_nas_t *nas, as_nas_info_t *initi
 
 static void generatePduSessionEstablishRequest(nr_ue_nas_t *nas, as_nas_info_t *initialNasMsg, nas_pdu_session_req_t *pdu_req)
 {
-  //wait send RegistrationComplete
-  usleep(100*150);
   int size = 0;
   fgs_nas_message_t nas_msg={0};