Commit Graph
5640 Commits
Author SHA1 Message Date
hardy 11eeafd328 Merge remote-tracking branch 'origin/repair-TA' into integration_2020_wk48_2 2020-11-24 15:27:21 +01:00
Navid Nikaein a1d901277e Check if the file is openned first 2020-11-24 14:28:17 +01:00
wu.jing 0fdc671177 fix merge problems in ittisim 2020-11-24 10:44:09 +00:00
wu.jing c994c2ad8f Merge branch 'develop_SA_SIM' into develop_SA_L3
Conflicts:
	common/utils/ocp_itti/intertask_interface.h
	openair2/COMMON/gtpv1_u_messages_types.h
	openair2/GNB_APP/gnb_config.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.h
	openair3/NGAP/ngap_gNB_nas_procedures.c
2020-11-24 09:15:52 +00:00
Francesco Mani d5af323ab2 taking into account sl_ahead when scheduling msg2 2020-11-24 09:08:20 +01:00
yaojie 716e16151a fixed the problem of pdu-session replace e-rab 2020-11-24 16:56:47 +09:00
Shweta Shrivastava 06f55552fe Fix small error 2020-11-24 01:04:46 -06:00
Shweta Shrivastava 683ff6eb39 DCI sanity checks for MCS and frequency domain assignment 2020-11-24 00:53:25 -06:00
Shweta Shrivastava 9ff55751ee DCI sanity check for pucch_resource_indicator value 2020-11-24 00:42:14 -06:00
wu.jing 2473722717 fix ittisim build error after merge 2020-11-24 14:06:51 +08:00
wu.jing f3d51a58fb Merge branch 'develop_SA_RRC' into develop_SA_SIM
Conflicts:
	common/utils/ocp_itti/intertask_interface.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair2/RRC/NR_UE/rrc_UE.c
	openair2/RRC/NR_UE/rrc_defs.h
	openair3/NGAP/ngap_gNB_nas_procedures.c
2020-11-24 05:15:06 +00:00
Xue Song 598eeb79d4 Derive keys from kgnb 2020-11-24 11:58:33 +09:00
rmagueta c02287171a File configuration for the SA. 2020-11-23 23:39:18 +00:00
Francesco Mani a5d45a2c19 indentation in gNB MAC rach functions 2020-11-23 19:19:48 +01:00
Francesco Mani 3e1959c8dd increase size of RA window definition for fr2 2020-11-23 18:16:34 +01:00
Francesco Mani 0075aefe31 fix in mac ue mib procedures 2020-11-23 17:58:56 +01:00
Francesco Mani c5b7a3a441 fix scheduling msg2 2020-11-23 16:08:01 +01:00
yaojie ac9028110d add NGAP_UERadioCapabilityInfoIndication 2020-11-23 17:40:42 +09:00
yaojie 2ed816d98c fix the task name of itti_alloc_new_message 2020-11-23 14:37:59 +09:00
rmagueta 93d93c81dd Minor correction in the fill_dmrs_mask() function 2020-11-20 19:19:20 +00:00
Florian Kaltenberger e3b3fa82b8 Merge branch 'NR_FR2_RRC_SSB' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_FR2_RRC_SSB 2020-11-20 14:13:54 +01:00
Sakthivel Velumani 0aa14f183e Editing an error message 2020-11-20 13:39:54 +01:00
Francesco Mani 82c4380a4e uci mac functions in a new file 2020-11-20 10:22:10 +01:00
Robert Schmidt d116c60831 Improve DLSCH MAC scheduling logging 2020-11-20 09:54:38 +01:00
Robert Schmidt e6bb685b5d re-enable TA 2020-11-20 09:54:34 +01:00
Robert Schmidt bc088c975b Account for OH in preprocessor 2020-11-20 09:54:34 +01:00
Robert Schmidt d89716541f Fix: Always place padding subPDU if space permits 2020-11-20 09:54:37 +01:00
Robert Schmidt d245f7b958 Fix: Use DL-SCH long subheader when L >= 256 2020-11-20 09:54:34 +01:00
Robert Schmidt 3ff26c8f84 Fix: Reset HARQ feedback slot
If we schedule in a second slot, this ensures that the correct HARQ
process' NDI is toggled.
2020-11-20 09:52:42 +01:00
yaojie 9d579b7a47 fix errors and warnings 2020-11-20 14:39:45 +09:00
Thomas Schlichter 291c94d34c Merge remote-tracking branch 'origin/nr_ue_tti_cleanup' into integration_2020_wk48
Conflicts:
	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
	openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
2020-11-19 18:42:30 +01:00
Francesco Mani de6650f023 modifications in RRC for lower number of RBs 2020-11-19 15:25:31 +01:00
hardy 4c3ee5f0e0 Merge remote-tracking branch 'origin/fix-itti-segv' into integration_2020_wk48 2020-11-19 14:59:39 +01:00
hardy b57ef17b1c Merge remote-tracking branch 'origin/bch-fixes-bitmap' into integration_2020_wk48 2020-11-19 14:58:02 +01:00
hardy a0d58f224c Merge remote-tracking branch 'origin/NR_SA_NGAP_RRC_wk42' into integration_2020_wk48 2020-11-19 14:57:08 +01:00
rmagueta 479019a70f Minor correction in the gNB_scheduler 2020-11-19 11:06:54 +00:00
rmagueta 252a9151cd Merge branch 'develop-sib1' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
 Conflicts:
	ci-scripts/conf_files/gnb.band78.tm1.106PRB.usrpn300.conf
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/RRC/NR/rrc_gNB_reconfig.c
	openair2/RRC/NR_UE/rrc_defs.h
2020-11-19 10:55:17 +00:00
rmagueta 4d290f71cf Minor correction in the gNB_scheduler 2020-11-19 10:53:08 +00:00
rmagueta 3b9bdfc7d4 Minor corrections 2020-11-19 10:18:09 +00:00
rmagueta 749d6af42e Merge develop-sib1 into this branch 2020-11-19 02:22:47 +00:00
rmagueta b97e1b578b Merge develop into this branch 2020-11-18 13:06:08 +00:00
rmagueta f184239f10 Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
 Conflicts:
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/rrc_gNB.c
2020-11-18 11:57:46 +00:00
rmagueta ee516a07c8 Add TDDIndex 4 in config file. 2020-11-18 11:28:37 +00:00
Thomas Schlichter f41502cd19 fix compile warnings introduced by merge with develop 2020-11-18 10:38:15 +01:00
Thomas Schlichter e059eeabc8 Merge remote-tracking branch 'develop' 2020-11-18 10:37:20 +01:00
yaojie f8f489ec22 add NGAP UE CONTEXT RELEASE MESSAGE 2020-11-18 18:33:58 +09:00
Laurent a592d0eb6f fix warnings 2020-11-18 08:53:02 +01:00
yaojie 959681424c fix some errors and warnings. 2020-11-18 03:12:59 +00:00
masayuki.harada be31d514b4 Fix warning and compile error. 2020-11-17 22:09:41 +09:00
Florian Kaltenberger e595ec0d8d Merge remote-tracking branch 'origin/develop' into NR_FR2_RRC_SSB 2020-11-17 13:57:51 +01:00