Melissa Elkadi
98c8ddb673
Merge remote-tracking branch 'origin/develop' into episys-merge
...
Removing references to memcpy_dl_config_req and
memcpy_tx_req because these functions are leaking
memory. For our standalone mode we have created
new/modified memcpy_dl/tx_req functions.
2021-02-24 11:49:17 -08:00
Raymond Knopp
d77f9ad096
build oairu ok
2021-02-15 08:13:15 +01:00
Raymond Knopp
a135f261b2
adjust includes for oairu target. Now test X-Ysoftmodem on another machine
2021-02-14 17:59:28 +01:00
Raymond Knopp
a446eb0ebc
Merge branch 'episys/master' into episys-merge
...
Conflicts:
common/utils/LOG/log.h
common/utils/ocp_itti/intertask_interface.cpp
nfapi/oai_integration/nfapi_vnf.c
nfapi/open-nFAPI/nfapi/src/nfapi.c
openair2/LAYER2/MAC/main_ue.c
openair2/LAYER2/PDCP_v10.1.0/pdcp.c
openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
openair2/PHY_INTERFACE/phy_stub_UE.c
openair2/RRC/LTE/rrc_UE.c
openair2/RRC/LTE/rrc_eNB.c
openair3/NAS/UE/ESM/esm_ebr_context.c
targets/COMMON/openairinterface5g_limits.h
targets/RT/USER/lte-softmodem.c
targets/RT/USER/lte-uesoftmodem.c
2021-02-13 22:52:33 +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
Raymond Knopp
846c67b9bd
Merge remote-tracking branch 'origin/develop' into oairu
...
Conflicts:
openair2/LAYER2/NR_MAC_COMMON/nr_mac.h
2021-02-07 18:23:46 +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
Raymond Knopp
4e9afb30b0
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-02 12:09:56 +01: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
Raymond Knopp
ef1fb827b5
Merge remote-tracking branch 'origin/develop' into oairu
2021-01-23 09:17:37 +01:00
He Shanyun
e4ff0d5b31
Merge remote-tracking branch 'remotes/origin/master' into develop_SA_L3
2021-01-20 01:51:32 +00:00
Melissa Elkadi
a288e502f0
Cleanup before merge
...
The clean up includes removing white space changes, adding logs,
adding comments to make various changes more obvious, etc.
2021-01-08 14:31:13 -08: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
Raymond Knopp
1b95baaf4c
update F1AP to R16.3.1. testing with OTA eNB
2021-01-01 21:45:23 +01:00
Laurent
d253301c1a
intptr_t instead of int64_t for instance_t
2020-12-27 12:09:20 +01:00
Raymond Knopp
49efcebeec
Merge remote-tracking branch 'origin/constant_power' into oairu
2020-12-26 13:11:20 +01:00
Raymond Knopp
7185b95591
debugging with AW2S RRU. Added statistics for ULSCH/UCI in PHY and MAC.
2020-12-24 16:10:03 +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
Michael Cook
cb84581678
Set max UEs to 40 (was 20)
2020-12-13 09:19:03 -08: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
zhenghuangkun@cn.fujitsu.com
f64bba177a
Modify SA source code
2020-11-13 07:37:22 +00:00
yaojie
bce573e64e
fix process NGAP_INITIAL_CONTEXT_SETUP_REQ
2020-11-06 10:36:56 +00:00
Frédéric Leroy
1426ee5ed6
feat: add optional parameter port for mme connection
2020-11-02 17:16:29 +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
Wu.Jing
08e775559b
Merge branch 'develop_SA_SIM' into develop_SA_L3
2020-10-26 09:02:18 +00:00
Xue Song
5697057f0b
Unblock ITTI SIM process
2020-10-16 05:06:19 +00:00
Wu.Jing
b2722225ab
Merge branch 'master' into develop_SA_L3
2020-10-15 08:26:42 +00:00