Remove commented/unused code in DLSCH/phytest scheduler

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c

@@ -483,9 +483,6 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP,
       && (is_xlsch_in_slot(dlsch_in_slot_bitmap, slot % num_slots_per_tdd))
       && slot < 10) {
     ue_sched_ctl->current_harq_pid = slot % num_slots_per_tdd;
-    //int pucch_sched;
-    //nr_update_pucch_scheduling(module_idP, UE_id, frame, slot, num_slots_per_tdd,&pucch_sched);
-    //nr_schedule_uss_dlsch_phytest(module_idP, frame, slot, &UE_info->UE_sched_ctrl[UE_id].sched_pucch[pucch_sched], NULL);
     nr_schedule_ue_spec(module_idP, frame, slot, num_slots_per_tdd);
   }
 

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c

@@ -785,8 +785,6 @@ void nr_schedule_ue_spec(module_id_t module_id,
         header_length_last = 1 + 1 + (sdu_lengths[num_sdus] >= 128);
         header_length_total += header_length_last;
         num_sdus++;
-
-        //ue_sched_ctl->uplane_inactivity_timer = 0;
       }
       else if (get_softmodem_params()->phy_test) {
         LOG_D(MAC, "Configuring DL_TX in %d.%d: random data\n", frame, slot);
@@ -803,10 +801,7 @@ void nr_schedule_ue_spec(module_id_t module_id,
       UE_info->mac_stats[UE_id].dlsch_total_bytes += TBS;
       UE_info->mac_stats[UE_id].lc_bytes_tx[lcid] += sdu_length_total;
 
-      // Check if there is data from RLC or CE
       const int post_padding = TBS >= 2 + header_length_total + sdu_length_total + ta_len;
-      // padding param currently not in use
-      //padding = TBS - header_length_total - sdu_length_total - ta_len - 1;
 
       const int ntx_req = gNB_mac->TX_req[CC_id].Number_of_PDUs;
       nfapi_nr_pdu_t *tx_req = &gNB_mac->TX_req[CC_id].pdu_list[ntx_req];

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c

@@ -525,7 +525,6 @@ void nr_fill_nfapi_dl_pdu(int Mod_idP,
   pdsch_pdu_rel15->StartSymbolIndex = StartSymbolIndex;
   pdsch_pdu_rel15->NrOfSymbols      = NrOfSymbols;
 
-  //  k0 = *bwp->bwp_Common->pdsch_ConfigCommon->choice.setup->pdsch_TimeDomainAllocationList->list.array[i]->k0;
   pdsch_pdu_rel15->dlDmrsSymbPos =
       fill_dmrs_mask(bwp->bwp_Dedicated->pdsch_Config->choice.setup,
                      scc->dmrs_TypeA_Position,
@@ -618,17 +617,6 @@ void nr_fill_nfapi_dl_pdu(int Mod_idP,
         pdcch_pdu_rel15->StartSymbolIndex,
         pdcch_pdu_rel15->DurationSymbols);
 
-  // I don't know why the following is not needed, but in this case we don't
-  // need additional calculations:
-  //const uint16_t N_RE_prime = NR_NB_SC_PER_RB * N_sh_symb - N_PRB_DMRS - N_PRB_oh;
-  //LOG_D(MAC,
-  //      "N_RE_prime %d for %d symbols %d DMRS per PRB and %d overhead\n",
-  //      N_RE_prime,
-  //      N_sh_symb,
-  //      N_PRB_DMRS,
-  //      N_PRB_oh);
-  //pdsch_pdu_rel15->nb_mod_symbols = N_RE_prime*pdsch_pdu_rel15->n_prb*pdsch_pdu_rel15->nb_codewords;
-
   LOG_D(MAC,
         "DLSCH PDU: start PRB %d n_PRB %d start symbol %d nb_symbols %d "
         "nb_layers %d nb_codewords %d mcs %d TBS: %d\n",

openair2/LAYER2/NR_MAC_gNB/mac_proto.h

@@ -167,13 +167,6 @@ void nr_fill_nfapi_dl_pdu(int Mod_id,
                           int ndi,
                           int round);
 
-int configure_fapi_dl_pdu_phytest(int Mod_id,
-                                  nfapi_nr_dl_tti_request_body_t *dl_req,
-                                  NR_sched_pucch *pucch_sched,
-                                  uint8_t *mcsIndex,
-                                  uint16_t *rbSize,
-                                  uint16_t *rbStart);
-
 void nr_rx_acknack(nfapi_nr_uci_pusch_pdu_t *uci_pusch,
                    nfapi_nr_uci_pucch_pdu_format_0_1_t *uci_01,
                    nfapi_nr_uci_pucch_pdu_format_2_3_4_t *uci_234,
@@ -187,20 +180,6 @@ void config_uldci(NR_BWP_Uplink_t *ubwp,
                   int time_domain_assignment, uint8_t tpc,
                   int n_ubwp, int bwp_id);
 
-void configure_fapi_dl_Tx(module_id_t Mod_idP,
-                          frame_t       frameP,
-                          sub_frame_t   slotP,
-                          nfapi_nr_dl_tti_request_body_t *dl_req,
-                          nfapi_nr_pdu_t *tx_req,
-                          int tbs_bytes,
-                          int16_t pdu_index);
-
-void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
-                                   frame_t       frameP,
-                                   sub_frame_t   slotP,
-                                   NR_sched_pucch *pucch_sched,
-                                   nfapi_nr_dl_tti_pdsch_pdu_rel15_t *pdsch_config);
-
 void nr_schedule_pusch(int Mod_idP,
                        int UE_id,
                        int num_slots_per_tdd,