maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,688 Commits 5 Branches 0 Tags
1f54b131b5fbb428e2474aa39ccc2aa0374c8fcd
Commit Graph
1262 Commits
Author SHA1 Message Date
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
hardy a0d58f224c Merge remote-tracking branch 'origin/NR_SA_NGAP_RRC_wk42' into integration_2020_wk48 2020-11-19 14:57:08 +01:00
Thomas Schlichter b06c7af345 NR UE: fix tti issues introduced by merge with develop 2020-11-18 10:38:04 +01:00
Thomas Schlichter e059eeabc8 Merge remote-tracking branch 'develop' 2020-11-18 10:37:20 +01:00
Thomas Schlichter 47ce347d7e NR UE cleanup: remove current_thread_id array, nr_tti_rx, nr_tti_tx, subframe_rx and subframe_tx 2020-11-13 17:29:02 +01:00
hardy 4b3a67b3a7 Merge remote-tracking branch 'origin/benetel_phase_rotation' into integration_2020_wk46_2 2020-11-13 13:21:42 +01:00
hardy e7b2c47348 Merge remote-tracking branch 'origin/nr_fdd_if_fix' into integration_2020_wk46 2020-11-12 09:27:00 +01:00
Thomas Schlichter f2502eebab fix some compile warnings 2020-11-10 21:10:55 +01:00
Thomas Schlichter 55717204dc cleanup: remove TTI related parameters from NR_DL_FRAME_PARMS 2020-11-10 19:19:51 +01:00
hardy e9fff748c6 Merge remote-tracking branch 'origin/NR_UE_MAC_scheduler' into integration_2020_wk46 2020-11-10 17:23:36 +01:00
matzakos 7772a51c07 Merge remote-tracking branch 'origin/develop' into NR_SA_NGAP_RRC_wk42 
Conflicts:
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	targets/COMMON/create_nr_tasks.c
 2020-11-09 15:52:52 +01:00
Florian Kaltenberger 6e1ad6e93b Merge remote-tracking branch 'origin/develop' into benetel_phase_rotation 2020-11-09 13:58:41 +01:00
hardy 802e8218ad Merge remote-tracking branch 'origin/noCore' into integration_2020_wk45_2 
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
 2020-11-05 16:49:21 +01:00
Shweta Shrivastava 46219d8c61 Fixed ulsim compilation error 2020-11-04 10:47:02 -06:00
Robert Schmidt 0deb5d291d Use special dlsim preprocessor 2020-11-03 14:23:50 +01:00
Laurent 7d603191db merge develop 2020-10-29 16:29:32 +01:00
matzakos 87c83aaf21 Merge remote-tracking branch 'origin/develop' into NR_SA_NGAP_RRC_wk42 
Conflicts:
	cmake_targets/CMakeLists.txt
	docker/Dockerfile.enb.rhel7.oc4-4
	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
 2020-10-29 00:19:49 +01:00
Laurent 7ec149cc35 merge develop 2020-10-27 08:23:59 +01:00
Francesco Mani 1a1ee59d39 Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting 2020-10-26 09:27:52 +01:00
masayuki.harada 1ce1e8f82b Merge branch 'oai_develop' 
# Conflicts:
#	ci-scripts/Jenkinsfile-gitlab
 2020-10-26 15:03:58 +09:00
Francesco Mani 5de83e0bb8 fixing a couple of warnings 2020-10-23 16:49:58 +02:00
Florian Kaltenberger 085dff3e1e Merge remote-tracking branch 'origin/develop' into benetel_phase_rotation 2020-10-22 21:37:23 +02:00
Laurent c8111292e9 fix warnings from merge 2020-10-22 21:06:35 +02:00
hardy 0a8bc5cdb5 Merge remote-tracking branch 'origin/fix_rrc_x2_ticking' into integration_2020_wk42_2 2020-10-22 16:23:05 +02:00
matzakos e904cf3a00 Add comments for dummy function definitions in nr phy simulators 2020-10-22 16:16:10 +02:00
Francesco Mani 76abeaf30e Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting 2020-10-22 09:26:51 +02:00
Laurent 5c69510f17 merge develop, improve doc 2020-10-21 14:38:17 +02:00
hardy 03e5b461a3 Merge remote-tracking branch 'origin/NR_MAC_SSB_RO_GlobalEdge' into integration_2020_wk42 
Solved Conflicts in:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
 2020-10-19 11:18:30 +02:00
matzakos dc63cab2b0 Merge remote-tracking branch 'origin/develop' into fix_rrc_x2_ticking 2020-10-16 11:35:54 +02:00
Wu.Jing b2722225ab Merge branch 'master' into develop_SA_L3 2020-10-15 08:26:42 +00:00
Florian Kaltenberger 18ae5acc98 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_GlobalEdge 2020-10-13 21:47:21 +02:00
Francesco Mani 4df83dd00e Merge remote-tracking branch 'origin/fix_rrc_x2_ticking' into NR_CSI_reporting 2020-10-13 08:51:13 +02:00
Sakthivel Velumani c9c1df0bff fixed dlsim build error 
also added a log message for DCI generation in MAC
 2020-10-12 18:59:15 +02:00
Sakthivel Velumani e75108d312 fixing dlsim 2020-10-12 18:59:14 +02:00
Laurent 4f2d8ebfcd merge develop, use Linux crypto library 2020-10-12 18:24:08 +02:00
Sakthivel Velumani 4074db8515 Hotfix for DL DCI issue in UE 
Created two dci_pdu's to hold dci configuration for UL and DL DCI.
This wasn't a problem before as only one DCI was scheduled.
 2020-10-12 18:07:24 +02:00
matzakos cb7b924950 Create dummy x2 function where needed in the nr phy simulators 
-To avoid including the whole x2 libraries for the corresponding executables
 2020-10-12 17:53:40 +02:00
Francesco Mani d0bcde029a Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting 2020-10-12 17:08:04 +02:00
Francesco Mani f28d7ce8ff bugfix in dlsim and ulsim 2020-10-08 17:33:17 +02:00
Raphael Defosseux 5411461582 Merge remote-tracking branch 'origin/develop' into integration_2020_wk40 2020-10-07 10:53:36 +02:00
Laurent 6b676d1605 Fix compilation issues 2020-10-06 13:54:30 +02:00
hardy d61f45ecb9 Merge remote-tracking branch 'origin/ulsch_decode_mthread' into integration_2020_wk40 2020-10-06 11:00:09 +02:00
Thomas Schlichter 8b4d1a0f0f Merge remote-tracking branch 'NR_DL_scheduler' into integration_2020_wk40 2020-10-05 12:13:13 +02:00
Florian Kaltenberger c2889d3b49 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_GlobalEdge 2020-10-04 20:54:40 +02:00
Sakthivel Velumani 53f3874032 updating ulsim to take samples from exernal source 2020-10-02 15:11:28 +02:00
Sakthivel Velumani 3367b0f199 fixing compile warnings 2020-10-02 14:30:42 +02:00
Robert Schmidt adcd2949fe Rename NR_UE_list_t to NR_UE_info_t 
The name NR_UE_list_t is misleading: beyond being a simple "list", this
structure carries all/most UE-related MAC information. If at all, it is
a container for multiple lists. The next commit introduces a
NR_UE_list_t structure that organizes UEs in lists such that it is
easier to go through the UEs.
 2020-09-30 14:52:59 +02:00
zhenghuangkun 3efc7538ac Modify MME_MODE_ENABLED to AMF_MODE_ENABLED 
Modify kenb to kgnb
Modify some warnings
 2020-09-29 02:56:21 +00:00
Cedric Roux 1d583c14a8 nr: fix compilation of physical simulators 
Maybe not the right way to do.
To be checked.
 2020-09-22 17:42:30 +02:00
Florian Kaltenberger 79bf2b3fb0 Merge remote-tracking branch 'origin/develop' into NR_MAC_SSB_RO_GlobalEdge 2020-09-22 15:26:57 +02:00