minor changes

openair2/LAYER2/NR_MAC_UE/config_ue_sl.c

@@ -334,6 +334,7 @@ int nr_rrc_mac_config_req_sl_preconfig(module_id_t module_id,
                                                 module_id, sync_source);
 
   NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
+  mac->src_id = src_id;
   AssertFatal(sl_preconfiguration !=NULL,"SL-Preconfig Cannot be NULL");
   AssertFatal(mac, "mac should have an instance");
 

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -621,6 +621,7 @@ typedef struct {
   nr_sci_pdu_t sci2_pdu;
   uint8_t slsch_payload[16384];
   time_stats_t rlc_data_req;
+  int src_id;
 } NR_UE_MAC_INST_t;
 
 /*@}*/

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -484,7 +484,7 @@ void nr_mac_rrc_sl_mib_ind(const module_id_t module_id,
                               uint8_t* pduP,
                               const sdu_size_t pdu_len,
                               const uint16_t rx_slss_id);
-bool nr_schedule_slsch(int frameP, int slotP, nr_sci_pdu_t *sci_pdu,
+bool nr_schedule_slsch(NR_UE_MAC_INST_t *mac, int frameP, int slotP, nr_sci_pdu_t *sci_pdu,
                        nr_sci_pdu_t *sci2_pdu,
                        uint8_t *slsch_pdu,
                        nr_sci_format_t format2, 

openair2/LAYER2/NR_MAC_UE/nr_slsch_scheduler.c

@@ -40,9 +40,9 @@
 #include "NR_MAC_UE/mac_extern.h"
 #include "NR_MAC_UE/nr_ue_sci.h"
 
-bool nr_schedule_slsch(int frameP,int slotP, nr_sci_pdu_t *sci_pdu,nr_sci_pdu_t *sci2_pdu,uint8_t *slsch_pdu,nr_sci_format_t format2, uint16_t *slsch_pdu_length_max) {
+bool nr_schedule_slsch(NR_UE_MAC_INST_t *mac, int frameP,int slotP, nr_sci_pdu_t *sci_pdu,nr_sci_pdu_t *sci2_pdu,uint8_t *slsch_pdu,nr_sci_format_t format2, uint16_t *slsch_pdu_length_max) {
 
-   mac_rlc_status_resp_t rlc_status = mac_rlc_status_ind(0, 0, 0,frameP,slotP,ENB_FLAG_NO,MBMS_FLAG_NO, 5, 0, 0);
+   mac_rlc_status_resp_t rlc_status = mac_rlc_status_ind(0, mac->src_id, 0,frameP,slotP,ENB_FLAG_NO,MBMS_FLAG_NO, 4, 0, 0);
 
 //   rlc_status.bytes_in_buffer = 0;
    *slsch_pdu_length_max = 0;

openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c

@@ -3271,7 +3271,7 @@ bool nr_ue_sl_pssch_scheduler(NR_UE_MAC_INST_t *mac,
 
   uint16_t slsch_pdu_length_max;
   tx_config->tx_config_list[0].tx_pscch_pssch_config_pdu.slsch_payload = mac->slsch_payload;
-  bool schedule_slsch = nr_schedule_slsch(frame,slot,&mac->sci1_pdu,&mac->sci2_pdu,tx_config->tx_config_list[0].tx_pscch_pssch_config_pdu.slsch_payload,NR_SL_SCI_FORMAT_2A,&slsch_pdu_length_max);
+  bool schedule_slsch = nr_schedule_slsch(mac,frame,slot,&mac->sci1_pdu,&mac->sci2_pdu,tx_config->tx_config_list[0].tx_pscch_pssch_config_pdu.slsch_payload,NR_SL_SCI_FORMAT_2A,&slsch_pdu_length_max);
 
   if (!schedule_slsch) return false;