luis_pereira87
|
db1d423a49
|
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
# openair1/PHY/NR_TRANSPORT/pucch_rx.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair2/GNB_APP/L1_nr_paramdef.h
|
2021-04-22 09:41:53 +01:00 |
|
Raymond Knopp
|
7ed637a954
|
added n1L1_stats.log. improvements to noise level (PUCCH/PUSCH) and signal level (PUCCH) computations. added DTX detection parameters for PUCCH/PUSCH/PRACH in L1 section of configuration file. hotfix from C. Roux for SRB PDCP integrity. extra logging to debug missing PUSCH/DCI at UE.
|
2021-04-22 09:32:06 +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
|
307098da4a
|
merge develop
|
2021-04-09 12:39:33 +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
|
f6d53094c4
|
added DUtoCURRCContainer IE in UL INITIAL RRC MESSAGE TRANSFER
added generation of initial Master Cell Group Configuration for both CU/DU and monolithic gNB.
Tested until transmission of RRCSetupComplete from UE
|
2021-03-23 21:52:57 +01:00 |
|
Thomas Schlichter
|
dade64ea43
|
Merge remote-tracking branch 'develop' into NR_DL_MIMO
|
2021-03-19 11:18:02 +01:00 |
|
Raymond Knopp
|
9dd6e3bb82
|
Merge remote-tracking branch 'origin/develop-SA-CBRA-CUDU' into NR_SA_F1AP_5GRECORDS
Conflicts:
executables/nr-uesoftmodem.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/RRC/NR/L2_nr_interface.c
|
2021-03-18 07:50:08 +01:00 |
|
Thomas Schlichter
|
8768deaf74
|
Merge remote-tracking branch 'develop' into ptrs_rrc_config
|
2021-03-16 14:01:32 +01:00 |
|
Thomas Schlichter
|
3152df445e
|
Merge remote-tracking branch 'develop' into NR_DL_MIMO
|
2021-03-16 13:37:07 +01:00 |
|
He Shanyun
|
8965dd782b
|
Merge remote-tracking branch 'remotes/origin/develop_SA_CUDU_rfsim_with_5gc' into integration_w5GC
Conflicts:
cmake_targets/CMakeLists.txt
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
|
2021-03-11 14:39:36 +09:00 |
|
Shweta Shrivastava
|
7eec3e3bcc
|
Merge branch 'develop' into ptrs_rrc_config
|
2021-03-10 22:37:44 -06:00 |
|
Raymond Knopp
|
3700759aa2
|
fixed byte-endian of fiveGS-TAC IE in F1AP.
|
2021-03-09 12:32:22 +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
|
ff994453a4
|
Merge remote-tracking branch 'remotes/oai/develop' into HEAD
# Conflicts:
# openair3/S1AP/s1ap_eNB.c
# openair3/S1AP/s1ap_eNB_handlers.c
|
2021-03-08 14:51:11 +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 |
|
Xue Song
|
b6febe214f
|
add GTPV1U_GNB_TUNNEL_DATA_REQ and UDP_DATA_IND
if the UE is running with noS1, u-plane for rfsim with Free5GC + CU/DU is OK
|
2021-02-25 14:00:14 +09: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
|
0b4335accc
|
NSA: some work on security (for PDCP)
- compute correct kgNB
- propagate properly NR security capabilities of an UE
(involves: rrc, s1ap, x2ap)
|
2021-02-12 16:01:37 +01:00 |
|
Thomas Schlichter
|
14e84f8782
|
Merge remote-tracking branch 'develop' into NR_DL_MIMO
|
2021-02-09 10:02:54 +01:00 |
|
Laurent Thomas
|
fa63d9a4e6
|
merge develop
|
2021-02-08 11:56:42 +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 |
|
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 |
|
Khodr Saaifan
|
283a060497
|
Allow gNB to read pusch_AntennPorts from config file
|
2021-02-02 09:02:19 +01:00 |
|
Laurent Thomas
|
6b37681854
|
merge develop, minor code addition
|
2021-02-01 09:02:57 +01:00 |
|
hardy
|
9c810b311d
|
Merge remote-tracking branch 'origin/itti-enhancement' into integration_2021_wk04_b
|
2021-01-29 07:40:07 +01:00 |
|
Laurent Thomas
|
954b0f559d
|
new gtp before tests
|
2021-01-25 12:59:38 +01:00 |
|
He Shanyun
|
e4ff0d5b31
|
Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3
|
2021-01-20 01:51:32 +00:00 |
|
masayuki.harada
|
27413fc4fc
|
Fix merge miss.
|
2021-01-06 20:13:02 +09:00 |
|
Haruki NAOI
|
46407ca42b
|
Add S1down auto recovery.
(cherry picked from commit 2339972ceaeb75fe18c0b2ae9ea69216dd919668)
|
2021-01-06 19:51:11 +09:00 |
|
Laurent
|
d253301c1a
|
intptr_t instead of int64_t for instance_t
|
2020-12-27 12:09:20 +01:00 |
|
Laurent
|
42a110338c
|
itti dynamic queue creation, and 64 bits instance id
|
2020-12-23 13:56:01 +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
|
08511b8207
|
fix some warnings
modify some issues
add f1ap ue context procedure
|
2020-12-20 08:59:50 +00:00 |
|
Wu.Jing
|
37d52bdf60
|
Merge branch 'develop_SA_SIM' into develop_SA_L3
Conflicts:
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR_UE/rrc_UE.c
openair2/RRC/NR_UE/rrc_defs.h
openair3/NGAP/ngap_gNB_nas_procedures.c
|
2020-12-18 17:38:07 +09:00 |
|
Wu.Jing
|
19118c13d1
|
Merge branch 'master' into develop_SA_L3
|
2020-12-18 11:52:59 +09:00 |
|
Shweta Shrivastava
|
f9b87d84ab
|
Add dedicated config to RRC config request from GNB APP -> RRC
|
2020-12-05 13:45:38 -06: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
|
2d5ad4d0b1
|
Minor updates in the SIB1 content
|
2020-11-26 16:05:07 +00:00 |
|
yaojie
|
59c2b9eb06
|
fixed warnings and add ie for PDUSessionResourceReleaseCommandTransfer
|
2020-11-26 15:56:39 +09: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 |
|
rmagueta
|
301fd47406
|
SIB1: Added more parameters to the message
|
2020-11-25 16:08:57 +00:00 |
|
Xue Song
|
6e2f63bf1f
|
Add rrc_gNB_process_NGAP_PDUSESSION_RELEASE_COMMAND and rrc_gNB_send_NGAP_PDUSESSION_RELEASE_RESPONSE
|
2020-11-25 18:55:59 +09: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 |
|
hardy
|
a0d58f224c
|
Merge remote-tracking branch 'origin/NR_SA_NGAP_RRC_wk42' into integration_2020_wk48
|
2020-11-19 14:57:08 +01:00 |
|
yaojie
|
959681424c
|
fix some errors and warnings.
|
2020-11-18 03:12:59 +00:00 |
|
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 |
|
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 |
|