Add InitialContextSetupResponse Message

openair2/COMMON/ngap_messages_types.h

@@ -275,6 +275,18 @@ typedef struct pdusession_s {
   uint32_t                         gtp_teid;
 } pdusession_t;
 
+
+typedef enum pdusession_qosflow_mapping_ind_e{
+  QOSFLOW_MAPPING_INDICATION_UL = 0,
+  QOSFLOW_MAPPING_INDICATION_DL = 1,
+  QOSFLOW_MAPPING_INDICATION_NON = 0xFF
+}pdusession_qosflow_mapping_ind_t;
+
+typedef struct pdusession_associate_qosflow_s{
+  uint8_t                           qci;
+  pdusession_qosflow_mapping_ind_t  qos_flow_mapping_ind;
+}pdusession_associate_qosflow_t;
+
 typedef struct pdusession_setup_s {
   /* Unique pdusession_id for the UE. */
   uint8_t pdusession_id;
@@ -282,8 +294,14 @@ typedef struct pdusession_setup_s {
   /* The transport layer address for the IP packets */
   ngap_transport_layer_addr_t gNB_addr;
 
-  /* S-GW Tunnel endpoint identifier */
+  /* UPF Tunnel endpoint identifier */
   uint32_t gtp_teid;
+
+  /* qos flow list number */
+  uint8_t  nb_of_qos_flow;
+  
+  /* qos flow list(1 ~ 64) */
+  pdusession_associate_qosflow_t associated_qos_flows[QOSFLOW_MAX_VALUE];
 } pdusession_setup_t;
 
 typedef struct pdusession_tobe_added_s {

openair2/LAYER2/MAC/eNB_scheduler_mch.c

@@ -209,8 +209,9 @@ schedule_MBMS_NFAPI(module_id_t module_idP, uint8_t CC_id, frame_t frameP,
 		   msi_pos=0;
 		   if((frameP&3)==0)
 			msi_pos++;
-		   while((non_mbsfn_SubframeConfig & (0x100 >> msi_pos)) == (0x100>>msi_pos))
+		   while((non_mbsfn_SubframeConfig & (0x100 >> msi_pos)) == (0x100>>msi_pos)){
          msi_pos++;
+       }
 		   	mbms_mch_i=0;
 
 		   if((subframeP==0)){

openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c

@@ -837,6 +837,7 @@ void nr_schedule_uss_ulsch_phytest(int Mod_idP,
     else if(mu==2) K2=2;
          else K2=3;
   }
+  LOG_D(MAC,"nr_schedule_uss_ulsch_phytest K2 %d\n", K2);
 
   pusch_pdu->pdu_bit_map = PUSCH_PDU_BITMAP_PUSCH_DATA;
   pusch_pdu->rnti = rnti;