TX path MAC PDU fix

openair1/SCHED_NR_UE/phy_procedures_nr_ue_sl.c

@@ -505,7 +505,7 @@ void psbch_pscch_pssch_processing(PHY_VARS_NR_UE *ue,
     //VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME(VCD_SIGNAL_DUMPER_FUNCTIONS_UE_SLOT_FEP_PSBCH, VCD_FUNCTION_OUT);
 
   }
-  else if (phy_data->sl_rx_action == SL_NR_CONFIG_TYPE_RX_PSCCH && !get_nrUE_params()->sync_ref){
+  else if (phy_data->sl_rx_action == SL_NR_CONFIG_TYPE_RX_PSCCH){
 
     fapi_nr_dl_config_dci_dl_pdu_rel15_t *rel15 = &phy_data->phy_pdcch_config.pdcch_config[0];
     LOG_D(NR_PHY,"pscch_numsym = %d\n",phy_data->nr_sl_pscch_pdu.pscch_numsym);
@@ -568,7 +568,7 @@ void psbch_pscch_pssch_processing(PHY_VARS_NR_UE *ue,
     nr_ue_pdcch_procedures(ue, proc, 1, pscch_est_size, pscch_dl_ch_estimates, phy_data, 0, rxdataF); 
     LOG_D(NR_PHY,"returned from nr_ue_pdcch_procedures\n");
   }
-  if (phy_data->sl_rx_action == SL_NR_CONFIG_TYPE_RX_PSSCH_SCI && !get_nrUE_params()->sync_ref){
+  if (phy_data->sl_rx_action == SL_NR_CONFIG_TYPE_RX_PSSCH_SCI){
 
     LOG_D(NR_PHY,"sci2_len = %d\n",phy_data->nr_sl_pssch_sci_pdu.sci2_len);
     LOG_D(NR_PHY,"sci2_beta_offset = %d\n",phy_data->nr_sl_pssch_sci_pdu.sci2_beta_offset);

openair2/LAYER2/NR_MAC_UE/nr_ue_sci_slsch.c

@@ -760,7 +760,7 @@ void config_pssch_sci_pdu_rx(sl_nr_rx_config_pssch_sci_pdu_t *nr_sl_pssch_sci_pd
     AssertFatal(nr_sl_pssch_sci_pdu->pssch_numsym>8, "num_pssch_ymbols %d is not ok for 3 DMRS (min 9)\n",nr_sl_pssch_sci_pdu->pssch_numsym);
     nr_sl_pssch_sci_pdu->dmrs_symbol_position = sl_dmrs_mask3[nr_sl_pssch_sci_pdu->pssch_numsym-9];
   } else if (num_dmrs_symbols == 4) {
-    AssertFatal(nr_sl_pssch_sci_pdu->pssch_numsym>10, "num_pssch_ymbols %d is not ok for 4 DMRS (min 11)\n",nr_sl_pssch_sci_pdu->pssch_numsym);
+    AssertFatal(nr_sl_pssch_sci_pdu->pssch_numsym>10, "num_pssch_ymbols %d is not ok for 4 DMRS (min 11) sci_pdu->dmrs_pattern.val %d\n",nr_sl_pssch_sci_pdu->pssch_numsym,sci_pdu->dmrs_pattern.val);
     nr_sl_pssch_sci_pdu->dmrs_symbol_position = sl_dmrs_mask4[nr_sl_pssch_sci_pdu->pssch_numsym-11];
   }