hardy
69cc0767c0
Merge remote-tracking branch 'origin/ldpc_short_codeword_fixes' into integration_2020_wk51_2
2020-12-16 11:09:56 +01:00
hardy
02bb4ac913
Merge remote-tracking branch 'origin/fix_do_ra_data' into integration_2020_wk51
2020-12-14 13:33:38 +01:00
hardy
3bccd95755
Merge remote-tracking branch 'origin/256_QAM_demod' into integration_2020_wk51
2020-12-14 13:32:29 +01:00
Thomas Schlichter
ac73df698d
Merge branch 'develop' into 'fix_do_ra_data'
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2020-12-10 13:40:08 +01:00
cig
05d4b9205b
Do configuration of DRB UM in RA mode
...
- do DRB preconfiguration for deafult C-RNTI if !do_ra
- moved redundant configuration code at RLC layer to new RLC functions
2020-12-01 15:10:04 +01:00
cig
33bab5ba4a
Changes to support DL IP traffic and timing adjustments in do-ra mode:
...
- enabled procedures that were already called for phy-test mode
- enabled setup of DRB for the current C-RNTI
- enhanced information, debugging and warning logging at MAC/RLC/PDCP level
2020-12-01 15:09:57 +01:00
Thomas Schlichter
d7d2faa0bf
fix cppcheck warning in rrc_gNB_internode.c
2020-11-27 15:56:15 +01:00
Francesco Mani
8a9e242856
Merge remote-tracking branch 'origin/develop' into NR_FR2_RRC_SSB
2020-11-27 11:33:52 +01:00
Rahul Gottipati
a7229204a9
Added 256 QAM demodulation routines for PDSCH
2020-11-27 14:58:41 +05:30
hardy
08b30babdc
Merge remote-tracking branch 'origin/rrc-enb-phy-testmode' into integration_2020_wk48_2
2020-11-25 12:25:08 +01:00
Thomas Schlichter
6803e78ceb
Merge remote-tracking branch 'develop'
...
Conflicts:
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair2/RRC/NR/nr_rrc_proto.h
2020-11-24 16:58:58 +01:00
Navid Nikaein
a1d901277e
Check if the file is openned first
2020-11-24 14:28:17 +01:00
Francesco Mani
de6650f023
modifications in RRC for lower number of RBs
2020-11-19 15:25:31 +01:00
masayuki.harada
be31d514b4
Fix warning and compile error.
2020-11-17 22:09:41 +09:00
masayuki.harada
e3d3c6e418
Merge branch 'NR_SA_NGAP_RRC_wk42' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_SA_NGAP_RRC_wk42
2020-11-16 13:59:33 +09:00
zhenghuangkun@cn.fujitsu.com
f64bba177a
Modify SA source code
2020-11-13 07:37:22 +00:00
Parminder Singh
4fe5986845
Corrected conditional statement wrt OAI Formatting Rules
2020-11-12 19:29:10 +01:00
Florian Kaltenberger
781ec26cf2
also fixing PRACH issue in UE + config files
2020-11-11 15:38:21 +01:00
Francesco Mani
b1bffcee81
extend bitmap for SSB in RRC to FR2
2020-11-10 19:03:29 +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
Parminder Singh
443f1817e5
Merge remote-tracking branch 'origin/develop' into fhg_shp_phase_noise_est
2020-11-08 18:47:29 +01:00
hardy
3917b1ae0f
Merge remote-tracking branch 'origin/NR_RRCConfiguration_FR2' into integration_2020_wk45_2
2020-11-05 16:53:13 +01:00
Parminder Singh
0ce350d1cf
Merge remote-tracking branch 'origin/develop' into fhg-shp-dl-ptrs
2020-11-04 16:20:50 +01:00
Florian Kaltenberger
0d30561ecd
Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration_FR2
2020-11-03 16:55:20 +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
masayuki.harada
483f4b2d1b
Fix merge miss.
2020-10-28 04:21:41 +09:00
masayuki.harada
dc288b7bc8
Merge branch 'develop_SA_L3' into NR_SA_NGAP_RRC_wk42
...
# Conflicts:
# openair2/GNB_APP/gnb_paramdef.h
# openair2/RRC/NR/rrc_gNB.c
2020-10-28 03:57:14 +09:00
masayuki.harada
8cff73dc39
Fix merge error.
2020-10-28 03:19:41 +09:00
masayuki.harada
5c49c67f98
Merge remote-tracking branch 'remotes/origin/develop_SA_RRC' into develop_SA_L3
...
# Conflicts:
# openair2/RRC/NR_UE/rrc_UE.c
# openair2/RRC/NR_UE/rrc_defs.h
2020-10-27 20:47:03 +09:00
masayuki.harada
1956fd3b72
Merge commit 'b67badef1b2fd390d801e20644b08df0d5880583' into develop_SA_L3
...
# Conflicts:
# common/utils/ocp_itti/intertask_interface.h
# openair2/RRC/NR/rrc_gNB.c
# openair3/NGAP/ngap_gNB_nas_procedures.c
2020-10-27 20:25:16 +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
He Shanyun
5880c1f8c7
add nas message for registration request
2020-10-27 09:28:47 +00:00
Xue Song
356a4d83e9
fix nrUE build error
2020-10-27 07:41:53 +00:00
Laurent
7ec149cc35
merge develop
2020-10-27 08:23:59 +01:00
He Shanyun
b67badef1b
fix build error of phy simulator
2020-10-27 02:59:52 +00: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
Parminder Singh
a7982741aa
RRC sub-function to add PTRS configuration for DL
...
- Added a function to add PTRS values in RRC context.
- This function can be used to overwrite the PTRS values also.
- When RRC config file contains PTRS values then this function can be used
respectively in RRC context.
2020-10-26 10:01:15 +01:00
masayuki.harada
1ce1e8f82b
Merge branch 'oai_develop'
...
# Conflicts:
# ci-scripts/Jenkinsfile-gitlab
2020-10-26 15:03:58 +09:00
Xue Song
d5f95c6c79
fix some error
2020-10-23 08:00:21 +00:00
Xue Song
ce85677762
modify some issues
2020-10-23 03:42:06 +00: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
masayuki.harada
a21ba6c7dc
Merge remote-tracking branch 'remotes/origin/develop_SA_L3' into NR_SA_NGAP_RRC_wk42
2020-10-22 19:59:13 +09:00
zhanghuiqin
f3c922b1c1
fix RRCReject
2020-10-22 09:19:27 +00:00
Francesco Mani
76abeaf30e
Merge remote-tracking branch 'origin/develop' into NR_CSI_reporting
2020-10-22 09:26:51 +02:00
He Shanyun
028be9e486
fix build error of phy simulator
2020-10-22 05:55:51 +00:00
Laurent
5c69510f17
merge develop, improve doc
2020-10-21 14:38:17 +02:00
masayuki.harada
a6a39d9951
Merge branch 'develop_SA_L3' into NR_SA_NGAP_RRC_wk42
...
# Conflicts:
# openair2/RRC/NR/rrc_gNB.c
2020-10-21 16:41:09 +09:00