matzakos
906fd2b68f
Merge branch NR_SA_F1AP_RFSIMULATOR3 into NR_SA_F1AP_5GRECORDS
2021-03-09 15:24:11 +01:00
Raymond Knopp
666aee7fc2
addition of GNB-CU-Configuration-Update/Update-Acknowledge/Update-Failure
2021-03-08 10:57:00 +01:00
masayuki.harada
c9906d1a70
Merge remote-tracking branch 'remotes/oai/NR_SA_F1AP_RFSIMULATOR3' into NR_SA_F1AP_RFSIMULATOR3_Lo
...
# Conflicts:
# openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2021-03-08 13:43:39 +09:00
Xue Song
834d6f1055
Merge branch 'master' into NR_SA_F1AP_RFSIMULATOR3_Lo
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-softmodem.c
executables/nr-uesoftmodem.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
2021-03-05 19:07:43 +09:00
wf
d6763661be
du-cu tested ok
2021-03-04 19:30:49 +08:00
wf
44d40219f2
modify fro comments, no warning now
2021-03-04 16:42:20 +08:00
Raymond Knopp
14379074a7
added TDD configuration information to F1-Setup-Request based on the configuration file contents.. Corrected some bugs in F1AP encoding for TDD.
2021-02-25 23:44:29 +01:00
Raymond Knopp
4d9ebf0ac0
Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_RFSIMULATOR2
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-softmodem.c
executables/nr-uesoftmodem.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
openair3/NGAP/ngap_gNB.c
openair3/NGAP/ngap_gNB_nas_procedures.c
2021-02-24 23:00:04 +01:00
hardy
accae67113
Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08
2021-02-23 09:31:05 +01:00
hardy
90d6a57a3c
Merge remote-tracking branch 'origin/NR_UL_SCFDMA_100MHz' into integration_2021_wk08
2021-02-23 09:30:22 +01:00
Cedric Roux
73f3a458cf
NSA: finalize nea2 security for gNB
...
- a new section in the configuration file to select security algorithms,
with new code to deal with it
- cleanup CG-ConfigInfo: specs seem to indicate that we must not
add mcg_RB_Config; the gNB has to deal with that
- as a consequence, modify fill_default_rbconfig() that is called in
every cases and needs security and bearer parameters
The new section in the configuration file looks like:
security = {
# preferred ciphering algorithms
# the first one of the list that an UE supports in chosen
# valid values: nea0, nea1, nea2, nea3
ciphering_algorithms = ( "nea0", "nea2" );
# preferred integrity algorithms
# the first one of the list that an UE supports in chosen
# valid values: nia0, nia1, nia2, nia3
integrity_algorithms = ( "nia0" );
};
2021-02-15 15:25:52 +01:00
Mahesh
eb19e02cf3
Merging MR978 with develop
2021-02-11 22:50:25 +05:30
dir
d2aa132616
Msg3_transformprecoder value initialised to TRANSFORM PRECODING DISABLED
2021-02-09 15:16:40 +02:00
Sakthivel Velumani
8902902706
Merge branch 'develop' into ue-fixes
2021-02-08 15:06:17 +01:00
Mahesh
0e6f1e6ad6
Merge conflicts resolved
2021-02-08 18:05:29 +05:30
Xue Song
52edf0c123
Merge branch 'master' into develop_SA_rfsim_for_F1
...
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
2021-02-04 18:16:37 +09:00
Xue Song
1dd6b3b2a0
fix some warnings
2021-02-04 11:30:44 +09:00
Xue Song
6a3b7b40a5
Merge branch 'master' into develop_SA_L3
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_NGAP.c
openair2/RRC/NR_UE/rrc_UE.c
2021-02-03 14:58:07 +09:00
Mahesh
ae422aca1f
Merge conficts resolved
2021-02-02 09:36:49 +05:30
Sakthivel Velumani
c9dcff3d7e
Merge branch 'develop' into ue-fixes
2021-02-01 16:07:58 +01:00
Sakthivel Velumani
a241df5006
Fixed compile warnings
2021-01-31 17:35:08 +01:00
Sakthivel Velumani
0eb2e06725
Moved pusch thread parameter to L1 in config file
2021-01-29 13:14:14 +01:00
hardy
9c810b311d
Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b
2021-01-29 07:40:07 +01:00
Xue Song
cf3694be28
modify the f1 establishment process
2021-01-28 16:35:10 +09:00
Xue Song
73ff5dec81
modify INITIAL_UL_RRC_MESSAGE_TRANSFER
...
fix build errors about nrUE
c-plane is ok
2021-01-20 15:13:49 +09:00
He Shanyun
e4ff0d5b31
Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3
2021-01-20 01:51:32 +00:00
Xue Song
133ecd52fa
msg1/2/3/4/5 is ok
2021-01-16 18:00:03 +09:00
Mahesh
185fcbf7fe
Merged latest commit(MR957)
2021-01-15 18:53:02 +05:30
Xue Song
01a87a1fba
split gNB into CU and DU
2021-01-15 19:57:26 +09:00
Xue Song
b0a76fd662
add du handle f1ap setup response
2020-12-24 02:58:29 +00:00
Laurent
42a110338c
itti dynamic queue creation, and 64 bits instance id
2020-12-23 13:56:01 +01:00
Xue Song
1fcd879f97
modify F1 Setup Response
...
add rrc_gNB_process_f1_setup_req
2020-12-23 10:03:04 +00:00
Xue Song
1cc09da83f
Merge branch 'develop_SA_L3' into develop_SA_F1
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/RRC/NR/rrc_gNB.c
2020-12-23 15:11:17 +09:00
Xue Song
cb0d7c3dd5
modify F1 Setup Request
2020-12-23 01:58:17 +00:00
Xue Song
f09c6fbd0d
Add RCconfig_NR_DU_F1
...
Initialize F1AP
2020-12-22 01:29:23 +00:00
Mahesh
024849983a
Merge develop(w51 2) to nfapi_nr
...
Setting of nFAPI mode in NR yet to be updated
2020-12-18 23:26:21 +05:30
Wu.Jing
19118c13d1
Merge branch 'master' into develop_SA_L3
2020-12-18 11:52:59 +09:00
Xue Song
45ec62f963
read config about f1
2020-12-17 05:50:57 +00:00
rmagueta
06cb91d795
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
...
Conflicts:
openair2/LAYER2/NR_MAC_UE/mac_defs.h
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2020-12-10 16:24:28 +00:00
Remi Hardy
3d8be663a0
Merge remote-tracking branch 'origin/NR_FR2_RRC_SSB' into rh_wk50_debug
...
Conflicts:
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2020-12-09 13:16:41 +01:00
rmagueta
104b8ab21a
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
2020-12-02 16:28:38 +00:00
Mahesh
e174ebdc30
Resolved merge conflicts with nfapi_nr_develop
2020-12-02 16:28:18 +05:30
rmagueta
46de16b6e1
Minor updates in LOGs
2020-11-30 12:26:12 +00:00
hardy
279a721d23
Merge remote-tracking branch 'origin/remove_x2_gnb_hardcoding' into integration_2020_wk49
2020-11-30 10:34:52 +01:00
Francesco Mani
8a9e242856
Merge remote-tracking branch 'origin/develop' into NR_FR2_RRC_SSB
2020-11-27 11:33:52 +01:00
rmagueta
81d64b3dec
Minor corrections
2020-11-26 03:12:59 +00:00
rmagueta
1d8a61f9e5
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop-sib1
...
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/L2_nr_interface.c
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_defs.h
2020-11-25 18:17:39 +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
Mahesh
87105d77cf
Merged latest develop to nfapi
2020-11-19 22:33:39 +05:30
Xue Song
e524cd9482
Add rrc_gNB_process_NGAP_PDUSESSION_SETUP_REQ
...
Add rrc_gNB_send_NGAP_PDUSESSION_SETUP_RESP
Fix some problems about pdu session setup
2020-11-17 19:03:55 +09:00