astyling gNB_scheduler_phytest.c

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -41,45 +41,36 @@ extern RAN_CONTEXT_t RC;
  * current version has only a DCI for type 1 PDCCH for C_RNTI*/
 void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
                                    frame_t       frameP,
-                                   sub_frame_t   slotP)
-{
+                                   sub_frame_t   slotP) {
   uint8_t  CC_id;
-
   gNB_MAC_INST                        *nr_mac      = RC.nrmac[module_idP];
   NR_COMMON_channels_t                *cc          = nr_mac->common_channels;
   nfapi_nr_dl_config_request_body_t   *dl_req;
   nfapi_nr_dl_config_request_pdu_t  *dl_config_dci_pdu;
   nfapi_nr_dl_config_request_pdu_t  *dl_config_dlsch_pdu;
   nfapi_tx_request_pdu_t            *TX_req;
-
   nfapi_nr_config_request_t *cfg = &nr_mac->config[0];
   uint16_t rnti = 0x1234;
-
   uint16_t sfn_sf = frameP << 7 | slotP;
   int dl_carrier_bandwidth = cfg->rf_config.dl_carrier_bandwidth.value;
-
   // everything here is hard-coded to 30 kHz
   int scs = get_dlscs(cfg);
   int slots_per_frame = get_spf(cfg);
+
   for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
     LOG_D(MAC, "Scheduling common search space DCI type 1 for CC_id %d\n",CC_id);
-
-
     dl_req = &nr_mac->DL_req[CC_id].dl_config_request_body;
     dl_config_dci_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
-    memset((void*)dl_config_dci_pdu,0,sizeof(nfapi_nr_dl_config_request_pdu_t));
+    memset((void *)dl_config_dci_pdu,0,sizeof(nfapi_nr_dl_config_request_pdu_t));
     dl_config_dci_pdu->pdu_type = NFAPI_NR_DL_CONFIG_DCI_DL_PDU_TYPE;
     dl_config_dci_pdu->pdu_size = (uint8_t)(2+sizeof(nfapi_nr_dl_config_dci_dl_pdu));
-
     dl_config_dlsch_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu+1];
-    memset((void*)dl_config_dlsch_pdu,0,sizeof(nfapi_nr_dl_config_request_pdu_t));
+    memset((void *)dl_config_dlsch_pdu,0,sizeof(nfapi_nr_dl_config_request_pdu_t));
     dl_config_dlsch_pdu->pdu_type = NFAPI_NR_DL_CONFIG_DLSCH_PDU_TYPE;
     dl_config_dlsch_pdu->pdu_size = (uint8_t)(2+sizeof(nfapi_nr_dl_config_dlsch_pdu));
-
     nfapi_nr_dl_config_dci_dl_pdu_rel15_t *dci_dl_pdu_rel15 = &dl_config_dci_pdu->dci_dl_pdu.dci_dl_pdu_rel15;
     nfapi_nr_dl_config_pdcch_parameters_rel15_t *params_rel15 = &dl_config_dci_pdu->dci_dl_pdu.pdcch_params_rel15;
     nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_pdu_rel15 = &dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15;
-
     dlsch_pdu_rel15->start_prb = 0;
     dlsch_pdu_rel15->n_prb = 50;
     dlsch_pdu_rel15->start_symbol = 2;
@@ -90,22 +81,17 @@ void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
     dlsch_pdu_rel15->mcs_idx = 9;
     dlsch_pdu_rel15->ndi = 1;
     dlsch_pdu_rel15->redundancy_version = 0;
-
-
     nr_configure_css_dci_initial(params_rel15,
                                  scs, scs, nr_FR1, 0, 0, 0,
                                  sfn_sf, slotP,
                                  slots_per_frame,
                                  dl_carrier_bandwidth);
-
     params_rel15->first_slot = 0;
-
     dci_dl_pdu_rel15->frequency_domain_assignment = get_RIV(dlsch_pdu_rel15->start_prb, dlsch_pdu_rel15->n_prb, cfg->rf_config.dl_carrier_bandwidth.value);
     dci_dl_pdu_rel15->time_domain_assignment = 3; // row index used here instead of SLIV
     dci_dl_pdu_rel15->vrb_to_prb_mapping = 1;
     dci_dl_pdu_rel15->mcs = 9;
     dci_dl_pdu_rel15->tb_scaling = 1;
-    
     dci_dl_pdu_rel15->ra_preamble_index = 25;
     dci_dl_pdu_rel15->format_indicator = 1;
     dci_dl_pdu_rel15->ndi = 1;
@@ -115,7 +101,6 @@ void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
     dci_dl_pdu_rel15->tpc = 2;
     dci_dl_pdu_rel15->pucch_resource_indicator = 7;
     dci_dl_pdu_rel15->pdsch_to_harq_feedback_timing_indicator = 7;
-
     LOG_D(MAC, "[gNB scheduler phytest] DCI type 1 payload: freq_alloc %d, time_alloc %d, vrb to prb %d, mcs %d tb_scaling %d ndi %d rv %d\n",
           dci_dl_pdu_rel15->frequency_domain_assignment,
           dci_dl_pdu_rel15->time_domain_assignment,
@@ -124,7 +109,6 @@ void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
           dci_dl_pdu_rel15->tb_scaling,
           dci_dl_pdu_rel15->ndi,
           dci_dl_pdu_rel15->rv);
-
     params_rel15->rnti = rnti;
     params_rel15->rnti_type = NFAPI_NR_RNTI_C;
     params_rel15->dci_format = NFAPI_NR_DL_DCI_FORMAT_1_0;
@@ -154,11 +138,9 @@ void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
           dlsch_pdu_rel15->nb_layers,
           dlsch_pdu_rel15->nb_codewords,
           dlsch_pdu_rel15->mcs_idx);
-
     dl_req->number_dci++;
     dl_req->number_pdsch_rnti++;
     dl_req->number_pdu+=2;
-
     TX_req = &nr_mac->TX_req[CC_id].tx_request_body.tx_pdu_list[nr_mac->TX_req[CC_id].tx_request_body.number_of_pdus];
     TX_req->pdu_length = 6;
     TX_req->pdu_index = nr_mac->pdu_index[CC_id]++;
@@ -169,39 +151,32 @@ void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
     nr_mac->TX_req[CC_id].sfn_sf = sfn_sf;
     nr_mac->TX_req[CC_id].tx_request_body.tl.tag = NFAPI_TX_REQUEST_BODY_TAG;
     nr_mac->TX_req[CC_id].header.message_id = NFAPI_TX_REQUEST;
-
   }
 }
 
 int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
                          nfapi_tx_request_pdu_t *TX_req,
                          nfapi_nr_config_request_t *cfg,
-						  nfapi_nr_coreset_t* coreset,
-						  nfapi_nr_search_space_t* search_space,
+                         nfapi_nr_coreset_t *coreset,
+                         nfapi_nr_search_space_t *search_space,
                          int16_t pdu_index,
-              nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config){
-
+                         nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config) {
   nfapi_nr_dl_config_request_pdu_t  *dl_config_dci_pdu;
   nfapi_nr_dl_config_request_pdu_t  *dl_config_dlsch_pdu;
   int TBS;
   uint16_t rnti = 0x1234;
   int dl_carrier_bandwidth = cfg->rf_config.dl_carrier_bandwidth.value;
-
-
   dl_config_dci_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu];
-	          memset((void*)dl_config_dci_pdu,0,sizeof(nfapi_nr_dl_config_request_pdu_t));
+  memset((void *)dl_config_dci_pdu,0,sizeof(nfapi_nr_dl_config_request_pdu_t));
   dl_config_dci_pdu->pdu_type = NFAPI_NR_DL_CONFIG_DCI_DL_PDU_TYPE;
   dl_config_dci_pdu->pdu_size = (uint8_t)(2+sizeof(nfapi_nr_dl_config_dci_dl_pdu));
-
   dl_config_dlsch_pdu = &dl_req->dl_config_pdu_list[dl_req->number_pdu+1];
-	          memset((void*)dl_config_dlsch_pdu,0,sizeof(nfapi_nr_dl_config_request_pdu_t));
+  memset((void *)dl_config_dlsch_pdu,0,sizeof(nfapi_nr_dl_config_request_pdu_t));
   dl_config_dlsch_pdu->pdu_type = NFAPI_NR_DL_CONFIG_DLSCH_PDU_TYPE;
   dl_config_dlsch_pdu->pdu_size = (uint8_t)(2+sizeof(nfapi_nr_dl_config_dlsch_pdu));
-
   nfapi_nr_dl_config_dci_dl_pdu_rel15_t *pdu_rel15 = &dl_config_dci_pdu->dci_dl_pdu.dci_dl_pdu_rel15;
   nfapi_nr_dl_config_pdcch_parameters_rel15_t *params_rel15 = &dl_config_dci_pdu->dci_dl_pdu.pdcch_params_rel15;
   nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_pdu_rel15 = &dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15;
-
   dlsch_pdu_rel15->start_prb = 0;
   dlsch_pdu_rel15->n_prb = 50;
   dlsch_pdu_rel15->start_symbol = 2;
@@ -226,13 +201,11 @@ int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
                                      search_space,
                                      *cfg,
                                      dl_carrier_bandwidth);
-
   pdu_rel15->frequency_domain_assignment = get_RIV(dlsch_pdu_rel15->start_prb, dlsch_pdu_rel15->n_prb, cfg->rf_config.dl_carrier_bandwidth.value);
   pdu_rel15->time_domain_assignment = 3; // row index used here instead of SLIV;
   pdu_rel15->vrb_to_prb_mapping = 1;
   pdu_rel15->mcs = dlsch_pdu_rel15->mcs_idx;
   pdu_rel15->tb_scaling = 1;
-
   pdu_rel15->ra_preamble_index = 25;
   pdu_rel15->format_indicator = 1;
   pdu_rel15->ndi = 1;
@@ -242,7 +215,6 @@ int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
   pdu_rel15->tpc = 2;
   pdu_rel15->pucch_resource_indicator = 7;
   pdu_rel15->pdsch_to_harq_feedback_timing_indicator = 7;
-
   LOG_D(MAC, "[gNB scheduler phytest] DCI type 1 payload: freq_alloc %d, time_alloc %d, vrb to prb %d, mcs %d tb_scaling %d ndi %d rv %d\n",
         pdu_rel15->frequency_domain_assignment,
         pdu_rel15->time_domain_assignment,
@@ -251,11 +223,9 @@ int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
         pdu_rel15->tb_scaling,
         pdu_rel15->ndi,
         pdu_rel15->rv);
-
   params_rel15->rnti = rnti;
   params_rel15->rnti_type = NFAPI_NR_RNTI_C;
   params_rel15->dci_format = NFAPI_NR_DL_DCI_FORMAT_1_0;
-
   //params_rel15->aggregation_level = 1;
   LOG_D(MAC, "DCI params: rnti %d, rnti_type %d, dci_format %d, config type %d\n \
 	                      coreset params: mux_pattern %d, n_rb %d, n_symb %d, rb_offset %d  \n \
@@ -271,7 +241,6 @@ int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
         params_rel15->first_symbol,
         params_rel15->search_space_type);
   nr_get_tbs_dl(&dl_config_dlsch_pdu->dlsch_pdu, dl_config_dci_pdu->dci_dl_pdu, *cfg);
-		    // Hardcode it for now
   TBS = dl_config_dlsch_pdu->dlsch_pdu.dlsch_pdu_rel15.transport_block_size;
   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",
         dlsch_pdu_rel15->start_prb,
@@ -282,15 +251,12 @@ int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
         dlsch_pdu_rel15->nb_codewords,
         dlsch_pdu_rel15->mcs_idx,
         TBS);
-
   dl_req->number_dci++;
   dl_req->number_pdsch_rnti++;
   dl_req->number_pdu+=2;
-
   TX_req->pdu_length = dlsch_pdu_rel15->transport_block_size/8;
   TX_req->pdu_index = pdu_index++;
   TX_req->num_segments = 1;
-
   return TBS/8; //Return TBS in bytes
 }
 
@@ -303,25 +269,19 @@ int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
 void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
                                    frame_t       frameP,
                                    sub_frame_t   slotP,
-                                   nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config)
-{
+                                   nfapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config) {
   LOG_D(MAC, "In nr_schedule_uss_dlsch_phytest \n");
   uint8_t  CC_id;
-
   gNB_MAC_INST                        *nr_mac      = RC.nrmac[module_idP];
   //NR_COMMON_channels_t                *cc           = nr_mac->common_channels;
   nfapi_nr_dl_config_request_body_t   *dl_req;
   nfapi_tx_request_pdu_t            *TX_req;
   uint16_t rnti = 0x1234;
-
   nfapi_nr_config_request_t *cfg = &nr_mac->config[0];
-
   uint16_t sfn_sf = frameP << 7 | slotP;
-
   // everything here is hard-coded to 30 kHz
   //int scs = get_dlscs(cfg);
   //int slots_per_frame = get_spf(cfg);
-
   int TBS;
   int TBS_bytes;
   int lcid;
@@ -338,26 +298,20 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
   unsigned char sdu_lcids[NB_RB_MAX];
   int padding = 0, post_padding = 0;
   UE_list_t *UE_list = &nr_mac->UE_list;
-
   DLSCH_PDU DLSCH_pdu;
   //DLSCH_PDU *DLSCH_pdu = (DLSCH_PDU*) malloc(sizeof(DLSCH_PDU));
 
-
   for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-
     LOG_D(MAC, "Scheduling UE specific search space DCI type 1 for CC_id %d\n",CC_id);
-
     dl_req = &nr_mac->DL_req[CC_id].dl_config_request_body;
     TX_req = &nr_mac->TX_req[CC_id].tx_request_body.tx_pdu_list[nr_mac->TX_req[CC_id].tx_request_body.number_of_pdus];
 
     //The --NOS1 use case currently schedules DLSCH transmissions only when there is IP traffic arriving
     //through the LTE stack
-	    if (IS_SOFTMODEM_NOS1){
-
+    if (IS_SOFTMODEM_NOS1) {
       memset(&DLSCH_pdu, 0, sizeof(DLSCH_pdu));
       int ta_update = 31;
       ta_len = 0;
-
       // Hardcode it for now
       TBS = 6784/8; //TBS in bytes
       //nr_get_tbs_dl(&dl_config_dlsch_pdu->dlsch_pdu, dl_config_dci_pdu->dci_dl_pdu, *cfg);
@@ -365,7 +319,6 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
 
       for (lcid = NB_RB_MAX - 1; lcid >= DTCH; lcid--) {
         // TODO: check if the lcid is active
-
         LOG_D(MAC, "[eNB %d], Frame %d, DTCH%d->DLSCH, Checking RLC status (tbs %d, len %d)\n",
               module_idP, frameP, lcid, TBS,
               TBS - ta_len - header_length_total - sdu_length_total - 3);
@@ -391,7 +344,6 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
                   lcid,
                   header_length_total,
                   TBS);
-
             sdu_lengths[num_sdus] = mac_rlc_data_req(module_idP,
                                     rnti,
                                     module_idP,
@@ -403,23 +355,18 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
                                     (char *)&dlsch_buffer[sdu_length_total],
                                     0,
                                     0);
-
             LOG_D(MAC,
                   "[eNB %d][USER-PLANE DEFAULT DRB] Got %d bytes for DTCH %d \n",
                   module_idP, sdu_lengths[num_sdus], lcid);
-
             sdu_lcids[num_sdus] = lcid;
             sdu_length_total += sdu_lengths[num_sdus];
             UE_list->eNB_UE_stats[CC_id][UE_id].num_pdu_tx[lcid]++;
             UE_list->eNB_UE_stats[CC_id][UE_id].lcid_sdu[num_sdus] = lcid;
             UE_list->eNB_UE_stats[CC_id][UE_id].sdu_length_tx[lcid] = sdu_lengths[num_sdus];
             UE_list->eNB_UE_stats[CC_id][UE_id].num_bytes_tx[lcid] += sdu_lengths[num_sdus];
-
             header_length_last = 1 + 1 + (sdu_lengths[num_sdus] >= 128);
             header_length_total += header_length_last;
-
             num_sdus++;
-
             UE_list->UE_sched_ctrl[UE_id].uplane_inactivity_timer = 0;
           }
         } else {
@@ -434,10 +381,7 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
         header_length_total++;
       }
 
-
       if (ta_len + sdu_length_total + header_length_total > 0) {
-
-
         if (TBS - header_length_total - sdu_length_total - ta_len <= 2) {
           padding = TBS - header_length_total - sdu_length_total - ta_len;
           post_padding = 0;
@@ -454,14 +398,11 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
                                        NULL,    // contention res id
                                        padding, post_padding);
         LOG_D(MAC, "Offset bits: %d \n", offset);
-
         // Probably there should be other actions done before that
         // cycle through SDUs and place in dlsch_buffer
-
         //memcpy(&UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0][offset], dlsch_buffer, sdu_length_total);
         memcpy(&nr_mac->UE_list.DLSCH_pdu[CC_id][0][UE_id].payload[0][offset], dlsch_buffer, sdu_length_total);
 
-
         // fill remainder of DLSCH with 0
         for (int j = 0; j < (TBS - sdu_length_total - offset); j++) {
           //UE_list->DLSCH_pdu[CC_id][0][UE_id].payload[0][offset + sdu_length_total + j] = 0;
@@ -469,55 +410,52 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
         }
 
         TBS_bytes = configure_fapi_dl_Tx(dl_req, TX_req, cfg, &nr_mac->coreset[CC_id][1], &nr_mac->search_space[CC_id][1], nr_mac->pdu_index[CC_id], dlsch_config);
-
-        #if defined(ENABLE_MAC_PAYLOAD_DEBUG)
+#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
         LOG_I(MAC, "Printing first 10 payload bytes at the gNB side, Frame: %d, slot: %d, , TBS size: %d \n \n", frameP, slotP, TBS_bytes);
+
         for(int i = 0; i < 10; i++) { // TBS_bytes dlsch_pdu_rel15->transport_block_size/8 6784/8
           LOG_I(MAC, "%x. ", ((uint8_t *)nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0])[i]);
         }
-        #endif
 
+#endif
         //TX_req->segments[0].segment_length = 8;
         TX_req->segments[0].segment_length = TBS_bytes +2;
         TX_req->segments[0].segment_data = nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0];
-
-
         nr_mac->TX_req[CC_id].tx_request_body.number_of_pdus++;
         nr_mac->TX_req[CC_id].sfn_sf = sfn_sf;
         nr_mac->TX_req[CC_id].tx_request_body.tl.tag = NFAPI_TX_REQUEST_BODY_TAG;
         nr_mac->TX_req[CC_id].header.message_id = NFAPI_TX_REQUEST;
       } //if (ta_len + sdu_length_total + header_length_total > 0)
     } //if (IS_SOFTMODEM_NOS1)
-
     //When the --NOS1 option is not enabled, DLSCH transmissions with random data
     //occur every time that the current function is called (dlsch phytest mode)
-	  else{
+    else {
       TBS_bytes = configure_fapi_dl_Tx(dl_req, TX_req, cfg, &nr_mac->coreset[CC_id][1], &nr_mac->search_space[CC_id][1], nr_mac->pdu_index[CC_id], dlsch_config);
-		  // HOT FIX for all zero pdu problem
-		  // ------------------------------------------------------------------------------------------------
 
       for(int i = 0; i < TBS_bytes; i++) { //
         ((uint8_t *)nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0])[i] = (unsigned char) rand();
         //LOG_I(MAC, "%x. ", ((uint8_t *)nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0])[i]);
       }
-                  #if defined(ENABLE_MAC_PAYLOAD_DEBUG)
-                  	if (frameP%100 == 0){
+
+#if defined(ENABLE_MAC_PAYLOAD_DEBUG)
+
+      if (frameP%100 == 0) {
         LOG_I(MAC, "Printing first 10 payload bytes at the gNB side, Frame: %d, slot: %d, TBS size: %d \n", frameP, slotP, TBS_bytes);
+
         for(int i = 0; i < 10; i++) {
           LOG_I(MAC, "%x. ", ((uint8_t *)nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0])[i]);
         }
       }
-		 #endif
 
+#endif
       //TX_req->segments[0].segment_length = 8;
       TX_req->segments[0].segment_length = TBS_bytes +2;
       TX_req->segments[0].segment_data = nr_mac->UE_list.DLSCH_pdu[CC_id][0][0].payload[0];
-
       nr_mac->TX_req[CC_id].tx_request_body.number_of_pdus++;
       nr_mac->TX_req[CC_id].sfn_sf = sfn_sf;
       nr_mac->TX_req[CC_id].tx_request_body.tl.tag = NFAPI_TX_REQUEST_BODY_TAG;
       nr_mac->TX_req[CC_id].header.message_id = NFAPI_TX_REQUEST;
-		  // ------------------------------------------------------------------------------------------------
+
     }
   } //for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++)
 }
@@ -525,16 +463,13 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
 
 void nr_schedule_uss_ulsch_phytest(nfapi_nr_ul_tti_request_t *UL_tti_req,
                                    frame_t       frameP,
-                                   sub_frame_t   slotP)
-{
+                                   sub_frame_t   slotP) {
   //gNB_MAC_INST                      *nr_mac      = RC.nrmac[module_idP];
   //nfapi_nr_ul_tti_request_t         *UL_tti_req;
-
   uint16_t rnti = 0x1234;
 
   for (uint8_t CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
     LOG_D(MAC, "Scheduling UE specific PUSCH for CC_id %d\n",CC_id);
-  
     //UL_tti_req = &nr_mac->UL_tti_req[CC_id];
     UL_tti_req->sfn = frameP;
     UL_tti_req->slot = slotP;
@@ -543,7 +478,6 @@ void nr_schedule_uss_ulsch_phytest(nfapi_nr_ul_tti_request_t *UL_tti_req,
     UL_tti_req->pdus_list[0].pdu_size = sizeof(nfapi_nr_pusch_pdu_t);
     nfapi_nr_pusch_pdu_t  *pusch_pdu = &UL_tti_req->pdus_list[0].pusch_pdu;
     memset(pusch_pdu,0,sizeof(nfapi_nr_pusch_pdu_t));
-
     /*
     // original configuration
         rel15_ul->rnti                           = 0x1234;
@@ -558,23 +492,20 @@ void nr_schedule_uss_ulsch_phytest(nfapi_nr_ul_tti_request_t *UL_tti_req,
         rel15_ul->ulsch_pdu_rel15.rv             = 0;
         rel15_ul->ulsch_pdu_rel15.n_layers       = 1;
     */
-  
     pusch_pdu->pdu_bit_map = PUSCH_PDU_BITMAP_PUSCH_DATA;
     pusch_pdu->rnti = rnti;
     pusch_pdu->handle = 0; //not yet used
-
     //BWP related paramters - we don't yet use them as the PHY only uses one default BWP
     //pusch_pdu->bwp_size;
     //pusch_pdu->bwp_start;
     //pusch_pdu->subcarrier_spacing;
     //pusch_pdu->cyclic_prefix;
-
     //pusch information always include
     //this informantion seems to be redundant. with hthe mcs_index and the modulation table, the mod_order and target_code_rate can be determined.
     pusch_pdu->mcs_index = 9;
     pusch_pdu->mcs_table = 0; //0: notqam256 [TS38.214, table 5.1.3.1-1] - corresponds to nr_target_code_rate_table1 in PHY
-  pusch_pdu->target_code_rate = nr_get_code_rate(pusch_pdu->mcs_index,pusch_pdu->mcs_table+1) ; 
-  pusch_pdu->qam_mod_order = nr_get_Qm(pusch_pdu->mcs_index,pusch_pdu->mcs_table+1) ;
+    pusch_pdu->target_code_rate = nr_get_code_rate_ul(pusch_pdu->mcs_index,pusch_pdu->mcs_table+1) ;
+    pusch_pdu->qam_mod_order = nr_get_Qm_ul(pusch_pdu->mcs_index,pusch_pdu->mcs_table+1) ;
     pusch_pdu->transform_precoding = 0;
     pusch_pdu->data_scrambling_id = 0; //It equals the higher-layer parameter Data-scrambling-Identity if configured and the RNTI equals the C-RNTI, otherwise L2 needs to set it to physical cell id.;
     pusch_pdu->nrOfLayers = 1;
@@ -602,12 +533,12 @@ void nr_schedule_uss_ulsch_phytest(nfapi_nr_ul_tti_request_t *UL_tti_req,
     pusch_pdu->pusch_data.harq_process_id = 0;
     pusch_pdu->pusch_data.new_data_indicator = 0;
     pusch_pdu->pusch_data.tb_size = nr_compute_tbs(pusch_pdu->mcs_index,
+						   pusch_pdu->target_code_rate,
 						   pusch_pdu->rb_size,
 						   pusch_pdu->nr_of_symbols,
 						   6, //nb_re_dmrs - not sure where this is coming from - its not in the FAPI
 						   1, //length_dmrs - sum of bits in pusch_pdu->ul_dmrs_symb_pos
 						   pusch_pdu->nrOfLayers = 1);
-						
     pusch_pdu->pusch_data.num_cb = 0; //CBG not supported
     //pusch_pdu->pusch_data.cb_present_and_position;
     //pusch_pdu->pusch_uci;
@@ -615,8 +546,5 @@ void nr_schedule_uss_ulsch_phytest(nfapi_nr_ul_tti_request_t *UL_tti_req,
     //pusch_pdu->dfts_ofdm;
     //beamforming
     //pusch_pdu->beamforming; //not used for now
-
-
-  
   }
 }