rmagueta
45de9e7b25
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
2021-04-24 13:27:11 +01:00
Laurent THOMAS
2784cd484e
revert default values for 5GS
2021-04-21 10:37:55 +02:00
rmagueta
4301582f88
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/SIMULATION/NR_RRC/itti_sim.c
2021-04-15 15:29:03 +01:00
Laurent THOMAS
0317d6725b
sanitize, calibration tool kickoff
2021-04-02 10:12:13 +02:00
Raymond Knopp
df05672a4c
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_UE/config_ue.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB_nsa.c
2021-03-30 04:48:51 +02:00
Raymond Knopp
4d0d4fcb29
Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
...
Conflicts:
cmake_targets/CMakeLists.txt
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.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.h
openair2/LAYER2/nr_pdcp/nr_pdcp_entity_drb_am.c
openair2/LAYER2/nr_pdcp/nr_pdcp_sdu.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR_UE/rrc_UE.c
2021-03-27 15:31:22 +01:00
Raymond Knopp
a6b24211ac
configuration of SRB1 for monolithic and CU/DU, move some parameters from RRC to MACRLC section in configuration file.
2021-03-25 14:26:28 +01:00
Thomas Schlichter
3152df445e
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-03-16 13:37:07 +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
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
Thomas Schlichter
d2f353acf6
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-02-12 15:33:51 +01:00
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
Khodr Saaifan
283a060497
Allow gNB to read pusch_AntennPorts from config file
2021-02-02 09:02:19 +01:00
Sakthivel Velumani
0eb2e06725
Moved pusch thread parameter to L1 in config file
2021-01-29 13:14:14 +01: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
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
4a66c750ec
Merge remote-tracking branch 'origin/pusch-mthread-scaling-fix' into rh_wk50_debug
2020-12-09 09:49:48 +01:00
Sakthivel Velumani
e5cd573ecb
Added a local variable instead of global
2020-12-04 15:10:58 +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
hardy
279a721d23
Merge remote-tracking branch 'origin/remove_x2_gnb_hardcoding' into integration_2020_wk49
2020-11-30 10:34:52 +01: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
Sakthivel Velumani
f9c3ff3ca3
Updated the config files
2020-11-25 11:12:32 +01:00
matzakos
648ef92ac7
Remove hardcoding of x2 configuration parameters used in ENDC setup request message at gNB side
2020-11-16 15:19:39 +01:00
Xue Song
9bba3c795a
Fix GTPU's IP setting error
2020-11-09 18:04:56 +09:00
Wu.Jing
92ba7dc249
Merge branch 'develop_SA_NGAP' into develop_SA_RRC
2020-10-26 06:20:02 +00:00
rmagueta
ddb538a30e
MIB NR: pdcch_ConfigSIB1 selection and fill using the configuration file, and using a dynamic method.
2020-10-15 11:55:28 +01:00
zhenghuangkun
6ca5753555
Add author and email
2020-10-10 10:56:14 +09:00
zhenghuangkun
5217b76448
Add DownlinkNASTransport Message
...
Add UEContextReleaseCommand Message
Modify NGSetup Message Encode failed
2020-10-10 10:50:19 +09:00
zhenghuangkun
ad44cbdc94
Add author and email
2020-09-28 06:03:39 +00:00
zhenghuangkun
0f3d53e1b9
Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3
2020-09-21 02:20:35 +00:00
zhenghuangkun
b2f4b9828b
Add DownlinkNASTransport Message
...
Add UEContextReleaseCommand Message
Modify NGSetup Message Encode failed
2020-09-14 06:51:14 +00:00
zhenghuangkun
85fe26bd80
Modify NGAP Messages
2020-09-09 18:55:14 +09:00
Francesco Mani
4d0d54a98d
power target from config file functional
2020-08-19 14:25:03 +02:00
Raphael Defosseux
11783e755a
Fixing errored/missing circular dependency protection
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-05-15 15:39:11 +02:00
Raymond Knopp
914e17b57b
Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration
...
Conflicts:
executables/nr-softmodem.c
executables/nr-ue.c
executables/softmodem-common.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_decoding.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/LAYER2/NR_MAC_UE/mac_proto.h
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/nr_rrc_config.c
openair2/RRC/NR/nr_rrc_defs.h
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/rrc_gNB.c
2020-03-14 12:45:02 +01:00
frtabu
6014ca42ac
ENABLE_ITTI macro removal, modified telnet server to support all executables, modified record player to finalize switch to run-time option and allow usage with any device
2020-02-12 19:05:44 +01:00
Florian Kaltenberger
a01e93be0c
Merge remote-tracking branch 'origin/develop' into NR_RRCConfiguration
2020-02-09 21:38:04 +01:00
frtabu
64e4826c81
add softmodem-common.c and common error handler
2020-02-04 17:39:36 +01:00
cig
7344d87567
Merge branch 'fhg-ta' into fhg-ra
2020-02-03 10:45:29 +01:00
matzakos
8f46241522
ENDC: Merge NR_RRCConfiguration into nr-dual-connectivity branch
2020-01-14 12:57:35 +01:00
Raphael Defosseux
c409da3bb8
Patch provided by Gabriel Arrobo.
...
Mainly comestics and integer type management
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2020-01-09 14:10:04 +01:00
Raymond Knopp
e30ab2d0c6
Merge remote-tracking branch 'origin/develop-nr' into NR_RRCConfiguration
...
Conflicts:
cmake_targets/CMakeLists.txt
executables/nr-ru.c
executables/nr-softmodem.c
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/phy_init.h
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
openair1/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
openair1/SCHED_NR/fapi_nr_l1.c
openair1/SCHED_NR/nr_ru_procedures.c
openair1/SCHED_NR/phy_procedures_nr_common.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/sched_nr.h
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/nr_rrc_defs.h
2019-12-15 22:04:40 +01:00
Francesco Mani
63375fa139
BF weights from config file for RU case
2019-11-25 16:43:15 +01:00
matzakos
cc8be29a8d
ENDC: Restore X2AP initial configuration after merge with NR_RRCConfiguration branch
2019-10-21 17:29:21 +02:00
matzakos
5cfcc415fc
Merge remote-tracking branch 'origin/NR_RRCConfiguration' into nr-dual-connectivity
2019-10-18 17:01:00 +02:00
matzakos
7916e17666
ENDC: Add X2AP initial configuration and X2AP task in nr-softmodem. Small issue with parsing NRCCPARAMS_DESC from RCconfig_NR_X2() needs to be resolved
2019-10-08 18:48:39 +02:00
Raymond Knopp
adf76a5f51
Merge remote-tracking branch 'origin/develop-nr' into nr_prach
...
Conflicts:
cmake_targets/CMakeLists.txt
cmake_targets/build_oai
executables/nr-ru.c
executables/nr-softmodem.c
nfapi/open-nFAPI/nfapi/public_inc/nfapi_nr_interface.h
openair1/PHY/INIT/nr_init.c
openair1/PHY/NR_UE_ESTIMATION/nr_ue_measurements.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h
openair1/PHY/TOOLS/Makefile
openair1/PHY/TOOLS/lte_dfts.c
openair1/PHY/TOOLS/nr_phy_scope.c
openair1/SCHED_NR/phy_procedures_nr_common.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SIMULATION/NR_PHY/dlschsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/pbchsim.c
openair1/SIMULATION/NR_PHY/pucchsim.c
openair1/SIMULATION/NR_PHY/ulschsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/COMMON/rrc_messages_types.h
openair2/GNB_APP/RRC_nr_paramsvalues.h
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_paramdef.h
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
2019-09-05 05:01:26 +02:00
yilmazt
e823ae9d0b
phy_simulators working again
2019-07-20 17:52:32 +02:00
Raymond Knopp
1f228ee4d1
- reworked configuration file and configuration for gNB (write directly to ASN1 structure from config module instead of passing intermediate structures)
...
- added prach procedures for gNB with configuration of PRACH L1/L2 parameters
2019-06-02 23:40:57 +02:00