maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into develop_SA_rfsim_for_F1

Browse Source 
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
	openair2/F1AP/f1ap_cu_interface_management.c
	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
	openair2/F1AP/f1ap_cu_task.c
	openair2/F1AP/f1ap_du_interface_management.c
	openair2/F1AP/f1ap_du_task.c
	openair2/GNB_APP/gnb_app.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/main_ue_nr.c
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/L2_interface_ue.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NGAP/ngap_gNB.c
This commit is contained in:
Xue Song
2021-02-04 18:16:37 +09:00
parent 1dd6b3b2a0 3b2d50374a
commit 52edf0c123
325 changed files with 6358 additions and 14457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/utils/msc/msc.c
+1 -1
View File
@@ -88,7 +88,7 @@ void *msc_task(void *args_p)
if (received_message_p != NULL) {
// msg_name = ITTI_MSG_NAME (received_message_p);
// instance = ITTI_MSG_INSTANCE (received_message_p);
// instance = ITTI_MSG_DESTINATION_INSTANCE (received_message_p);
switch (ITTI_MSG_ID(received_message_p)) {
case TIMER_HAS_EXPIRED: {
msc_flush_messages();