Raymond Knopp
7185b95591
debugging with AW2S RRU. Added statistics for ULSCH/UCI in PHY and MAC.
2020-12-24 16:10:03 +01:00
hardy
b16d7b2eed
Merge remote-tracking branch 'origin/NR_mac_uci_functions_rework' into integration_2020_wk48_2
2020-11-25 18:15:43 +01:00
Francesco Mani
82c4380a4e
uci mac functions in a new file
2020-11-20 10:22:10 +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
zhenghuangkun
5cbffcc3c4
Fix ITTI build error
2020-11-17 09:03:06 +00:00
hardy
e9fff748c6
Merge remote-tracking branch 'origin/NR_UE_MAC_scheduler' into integration_2020_wk46
2020-11-10 17:23:36 +01:00
cig
7e1ac1fa49
Merge remote-tracking branch 'origin/develop' into fhg-fdd-custom-if
2020-11-10 10:41:10 +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
6056de78b3
fixing dependency in CMakeLists.txt
2020-11-08 17:02:40 +01:00
Laurent
7d603191db
merge develop
2020-10-29 16:29:32 +01:00
Laurent
136d9ccb67
add documentation and code review comments
2020-10-29 16:14:55 +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
Thomas Schlichter
4cac02e014
Merge remote-tracking branch 'eurecom/develop' into fhg-fdd-custom-if
2020-10-28 14:08:23 +01:00
masayuki.harada
8cff73dc39
Fix merge error.
2020-10-28 03:19:41 +09:00
masayuki.harada
4649f0f615
Merge remote-tracking branch 'remotes/origin/develop_SA_SIM' into develop_SA_L3
2020-10-27 19:47:49 +09:00
cig
6862affdf4
Cleanup RF HW configuration at UE side
...
- removed redundant initialisation of variables
- introduced two "RF helpers" function that are replacing shared code in the sync routines
- added a new .c file and updated the cmakelists and .h files
2020-10-27 11:09:17 +01:00
He Shanyun
5880c1f8c7
add nas message for registration request
2020-10-27 09:28:47 +00:00
hardy
779362dcb7
Merge remote-tracking branch 'origin/NR_CSI_reporting' into integration_2020_wk44
2020-10-26 17:30:17 +01:00
hardy
89d7353ddf
Merge remote-tracking branch 'origin/fixes-tun' into integration_2020_wk44
2020-10-26 17:28:11 +01:00
Wu.Jing
66bc0bac1e
Merge branch 'master' into develop_SA_L3
2020-10-26 09:04:03 +00:00
Wu.Jing
08e775559b
Merge branch 'develop_SA_SIM' into develop_SA_L3
2020-10-26 09:02:18 +00:00
masayuki.harada
1ce1e8f82b
Merge branch 'oai_develop'
...
# Conflicts:
# ci-scripts/Jenkinsfile-gitlab
2020-10-26 15:03:58 +09: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
yaojie
bfd2c35c35
fix warning/error
2020-10-21 07:30:20 +00:00
hardy
639d957e30
Merge remote-tracking branch 'origin/flexran-apps' into integration_2020_wk42
2020-10-19 10:49:44 +02:00
Laurent
6b7eb07224
remove gtp work
2020-10-16 12:01:20 +02:00
Laurent
dd43752bbe
add thread pool init
2020-10-16 11:41:14 +02:00
Wu.Jing
b2722225ab
Merge branch 'master' into develop_SA_L3
2020-10-15 08:26:42 +00:00
masayuki.harada
af35e37c74
Merge branch 'oai_develop'
...
# Conflicts:
# openair2/RRC/NR/rrc_gNB.c
2020-10-15 15:25:04 +09:00
He Shanyun
e6ddb5379c
add process for itti simulator
2020-10-14 03:22:55 +00:00
yaojie
602424f616
handle bcch message in rrc_nrue_task
2020-10-13 07:13:42 +00:00
Robert Schmidt
4c7035e6e3
Remove UESIM_EXPANSION
...
This completely removes the UESIM_EXPANSION define: it does not compile
at the moment. Its function was to multiplex multiple UEs on the same
TUN interface. However, this functionality is not needed since it is
possible to allocate many TUN devices (i.e., >= 32).
2020-10-13 09:07:46 +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
Laurent
4f2d8ebfcd
merge develop, use Linux crypto library
2020-10-12 18:24:08 +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
b7d71d58ad
Merge remote-tracking branch 'origin/fix_rrc_x2_ticking' into NR_CSI_reporting
2020-10-12 17:14:55 +02:00
Francesco Mani
d0bcde029a
Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting
2020-10-12 17:08:04 +02:00
matzakos
9aba4bcf8c
Include X2 libraries in nr phy simulators to avoid linking errors
...
-Also change the place of the check on whether x2ap is enabled to trigger the ITTI tick message from RRC to X2AP.
2020-10-08 15:34:35 +02:00
Francesco Mani
3af7ab3ff8
Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting
2020-10-07 11:20:32 +02:00
Raphael Defosseux
5411461582
Merge remote-tracking branch 'origin/develop' into integration_2020_wk40
2020-10-07 10:53:36 +02:00
Robert Schmidt
f146b640d5
FlexRAN agent app: trigger UE-slice assoc through IMSI regex
2020-10-06 19:47:33 +02:00
Robert Schmidt
865348b047
FlexRAN agent app: Add sample FlexRAN app
2020-10-06 17:44:16 +02:00
Robert Schmidt
8772856fd4
FlexRAN: Add app loader/CM
2020-10-06 17:44:16 +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
hardy
8f9ba5553d
Merge remote-tracking branch 'origin/nsa_remove_band_hardcodings' into integration_2020_wk40
2020-10-06 09:30:04 +02:00
Laurent
4dacef8bb7
merge develop and test
2020-10-04 19:22:33 +02:00
laurent
5cb8e9e14d
Reduce difference with OSA develop branch for merge
2020-10-02 11:26:46 +02:00
laurent
6b50cbcae2
continue 5G SA
2020-10-01 16:13:03 +02:00