Code cleanup

openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c

@@ -182,7 +182,7 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
     dlsch1_harq = dlsch[1]->harq_processes[harq_pid];
 
     //printf("status TB0 = %d, status TB1 = %d \n", dlsch[0]->harq_processes[harq_pid]->status, dlsch[1]->harq_processes[harq_pid]->status);
-    LOG_D(PHY,"AbsSubframe %d.%d / Sym %d harq_pid %d,  harq status %d.%d \n", frame, nr_tti_rx, symbol, harq_pid, dlsch0_harq->status, dlsch1_harq->status);
+    LOG_D(PHY,"AbsSubframe %d.%d / Sym %d harq_pid %d, harq status %d.%d \n", frame, nr_tti_rx, symbol, harq_pid, dlsch0_harq->status, dlsch1_harq->status);
 
     if ((dlsch0_harq->status == ACTIVE) && (dlsch1_harq->status == ACTIVE)){
       codeword_TB0 = dlsch0_harq->codeword;
@@ -969,45 +969,46 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
     return(-1);
     break;
   }
+
   if (dlsch1_harq) {
-  switch (nr_get_Qm_dl(dlsch1_harq->mcs,dlsch1_harq->mcs_table)) {
+    switch (nr_get_Qm_dl(dlsch1_harq->mcs,dlsch1_harq->mcs_table)) {
-  case 2 :
+      case 2 :
-    if (rx_type==rx_standard) {
+        if (rx_type==rx_standard) {
-        nr_dlsch_qpsk_llr(frame_parms,
+            nr_dlsch_qpsk_llr(frame_parms,
-                       pdsch_vars[eNB_id]->rxdataF_comp0,
+                              pdsch_vars[eNB_id]->rxdataF_comp0,
-                       pllr_symbol_cw0,
+                              pllr_symbol_cw0,
-                       symbol,len,first_symbol_flag,nb_rb,
+                              symbol,len,first_symbol_flag,nb_rb,
-                       beamforming_mode);
+                              beamforming_mode);
+        }
+        break;
+      case 4:
+        if (rx_type==rx_standard) {
+          nr_dlsch_16qam_llr(frame_parms,
+                             pdsch_vars[eNB_id]->rxdataF_comp0,
+                             pdsch_vars[eNB_id]->llr[0],
+                             pdsch_vars[eNB_id]->dl_ch_mag0,
+                             symbol,len,first_symbol_flag,nb_rb,
+                             pdsch_vars[eNB_id]->llr128,
+                             beamforming_mode);
+        }
+        break;
+      case 6 :
+        if (rx_type==rx_standard) {
+          nr_dlsch_64qam_llr(frame_parms,
+                             pdsch_vars[eNB_id]->rxdataF_comp0,
+                             pllr_symbol_cw0,
+                             pdsch_vars[eNB_id]->dl_ch_mag0,
+                             pdsch_vars[eNB_id]->dl_ch_magb0,
+                             symbol,len,first_symbol_flag,nb_rb,
+                             pdsch_vars[eNB_id]->llr_offset[symbol],
+                             beamforming_mode);
+        }
+        break;
+      default:
+        LOG_W(PHY,"rx_dlsch.c : Unknown mod_order!!!!\n");
+        return(-1);
+        break;
     }
-    break;
-  case 4:
-    if (rx_type==rx_standard) {
-      nr_dlsch_16qam_llr(frame_parms,
-                      pdsch_vars[eNB_id]->rxdataF_comp0,
-                      pdsch_vars[eNB_id]->llr[0],
-                      pdsch_vars[eNB_id]->dl_ch_mag0,
-                      symbol,len,first_symbol_flag,nb_rb,
-                      pdsch_vars[eNB_id]->llr128,
-                      beamforming_mode);
-    }
-    break;
-  case 6 :
-    if (rx_type==rx_standard) {
-      nr_dlsch_64qam_llr(frame_parms,
-                      pdsch_vars[eNB_id]->rxdataF_comp0,
-                      pllr_symbol_cw0,
-                      pdsch_vars[eNB_id]->dl_ch_mag0,
-                      pdsch_vars[eNB_id]->dl_ch_magb0,
-                      symbol,len,first_symbol_flag,nb_rb,
-                      pdsch_vars[eNB_id]->llr_offset[symbol],
-                      beamforming_mode);
-  }
-    break;
-  default:
-    LOG_W(PHY,"rx_dlsch.c : Unknown mod_order!!!!\n");
-    return(-1);
-    break;
-  }
   }  
 
   //nr_dlsch_deinterleaving(symbol,bundle_L,(int16_t*)pllr_symbol_cw0,(int16_t*)pllr_symbol_cw0_deint, nb_rb_pdsch);

openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c

@@ -2599,7 +2599,7 @@ int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, nr
     /* PDSCH_TO_HARQ_FEEDBACK_TIME_IND (only if CRC scrambled by C-RNTI or CS-RNTI or new-RNTI)*/
     dlsch_config_pdu_1_0->pdsch_to_harq_feedback_time_ind = dci->pdsch_to_harq_feedback_time_ind;
 
-    LOG_D(MAC,"(nr_ue_procedures.c) rnti=%d dl_config->number_pdus=%d\n",
+    LOG_D(MAC,"(nr_ue_procedures.c) rnti = %x dl_config->number_pdus = %d\n",
 	  dl_config->dl_config_list[dl_config->number_pdus].dlsch_config_pdu.rnti,
 	  dl_config->number_pdus);
     LOG_D(MAC,"(nr_ue_procedures.c) frequency_domain_resource_assignment=%d \t number_rbs=%d \t start_rb=%d\n",

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c

@@ -247,8 +247,6 @@ void nr_initiate_ra_proc(module_id_t module_idP,
   // ra_rnti from 5.1.3 in 38.321
   uint16_t ra_rnti=1+symbol+(slotP*14)+(freq_index*14*80)+(ul_carrier_id*14*80*8);
 
-
-
   uint16_t msg2_frame, msg2_slot,monitoring_slot_period,monitoring_offset;
   gNB_MAC_INST *nr_mac = RC.nrmac[module_idP];
   NR_UE_list_t *UE_list = &nr_mac->UE_list;
@@ -672,7 +670,6 @@ void nr_generate_Msg2(module_id_t module_idP,
     dci_pdu->ScramblingId[numDlDci] = *scc->physCellId;
     dci_pdu->ScramblingRNTI[numDlDci] = 0;
     dci_pdu->AggregationLevel[numDlDci] = aggregation;
-    dci_pdu->powerControlOffsetSS[numDlDci] = 0;
     dci_pdu->CceIndex[numDlDci] = CCEIndex;
     dci_pdu->beta_PDCCH_1_0[numDlDci] = 0;
     dci_pdu->powerControlOffsetSS[numDlDci] = 1;