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
Laurent THOMAS
a0922cef2f
merge develop
2021-03-04 14:49:38 +01:00
Laurent THOMAS
6c7dc65981
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into gnb-threadpool
2021-03-04 12:05:01 +01:00
Melissa Elkadi
e3168a7d8c
Merge remote-tracking branch 'eurecom/develop' into eurecom-episys-merge
2021-03-03 16:12:04 -08:00
Shruthi
28d02f8722
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into develop
2021-03-03 23:15:12 +05:30
Shruthi
9fce798a0e
Fixed errors in nFAPI after first merge
2021-03-03 23:09:02 +05:30
Thomas Schlichter
7a6f789aed
Merge remote-tracking branch 'develop' into NR_FDD_FIX
2021-03-03 17:59:17 +01:00
cig
f2bc1012be
Minor cleanup UE
...
- removed commented out code
- improved logging in UL channel estimation
- minor fixes according to OAI coding guidelines
- moving fetching TDD configuration parameters in nr-ue.c only in TDD case
2021-03-03 17:58:07 +01:00
luis_pereira87
d0b9146cd0
Msg4 transmitted from MAC to RRC through ITTI (TASK_RRC_NRUE created)
2021-03-03 01:27:50 +00:00
francescomani
97ed2dfe5b
Merge remote-tracking branch 'origin/develop' into NR_10MHz
2021-03-02 14:31:12 +01:00
rmagueta
ce5b59c938
Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-03-02 12:58:32 +00:00
Laurent Thomas
9ce7f94518
record/replay for 5G, nrscope bug fix
2021-02-28 21:39:53 +01:00
Melissa Elkadi
8b2b78e477
Fixed remote_addr.sin_port
...
For some reason the htons invocation got deleted which broke
the VNF P7 interface.
Also fixed some build issues, not sure how these got onto the
develop branch to begin with.
2021-02-26 15:57:35 -08:00
hardy
8d05695722
Merge remote-tracking branch 'origin/benetel_driver_update' into integration_2021_wk09_b
2021-02-26 16:09:05 +01:00
Sakthivel Velumani
0e2ecd7bce
Merge branch 'develop' into gnb-threadpool
2021-02-25 13:48:13 +01:00
francescomani
9afb19858a
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-02-25 12:04:24 +01: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
Raymond Knopp
11c3a26414
Merge remote-tracking branch 'origin/develop' into oairu
...
Conflicts:
openair2/RRC/LTE/rrc_eNB.c
2021-02-24 21:52:14 +01:00
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
rmagueta
48811d0f34
Merge branch 'develop' into develop-SA-CBRA
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:29:53 +00:00
Raymond Knopp
d5cff2c3c3
nfapi_setmode dummy for oairu exectuable
2021-02-23 14:07:12 +01:00
Raymond Knopp
a6e16e7c8a
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-23 11:51:29 +01:00
hardy
3199b81584
Merge remote-tracking branch 'origin/enhance-rfsim' into integration_2021_wk08
2021-02-23 09:30:42 +01:00
Raymond Knopp
596b54bcbe
synchronization for oairu
2021-02-22 21:47:12 +01:00
Florian Kaltenberger
670c807a56
Merge remote-tracking branch 'origin/develop' into benetel_driver_update
2021-02-19 11:46:41 +01:00
Mahesh
7ea8211b85
Code fixes for NSA test
2021-02-18 16:19:12 +05:30
cig
e023f67ed8
Compute and apply symbol rotation for DL and UL
...
- now done according to the proper DL/UL frequency
- this makes it compatible with FDD mode
2021-02-17 14:14:06 +01:00
Xue Song
bd765c7505
C-plane for rfsim with Free5GC + CU/DU separation is OK
2021-02-16 14:14:55 +09:00
cig
94d956fa55
Fixed warning about use of wrong enum
2021-02-15 13:24:20 +01:00
Laurent Thomas
abfa103247
fix re-reading and end marker code
2021-02-15 10:54:35 +01:00
Raymond Knopp
5ed79a27de
Merge remote-tracking branch 'origin/develop' into oairu
2021-02-14 07:18:13 +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
Sakthivel Velumani
3776379eb1
Merge branch 'develop' into gnb-threadpool
2021-02-13 17:00:00 +01:00
Sakthivel Velumani
08ab234501
Removing sync_thread
2021-02-13 15:14:03 +01:00
cig
24fc20e2e2
Bugfix in USRP flags configuration for NR UE
...
- missing check on duplex mode before fetching the TDD period
- missing flags configuration for FDD mode
2021-02-12 17:02:20 +01:00
Thomas Schlichter
d2f353acf6
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-02-12 15:33:51 +01:00
Mahesh
7f4ffe29c8
Fix whitespaces
2021-02-12 01:25:09 +05:30
Mahesh
eb19e02cf3
Merging MR978 with develop
2021-02-11 22:50:25 +05:30
francescomani
cb296fa050
Merge remote-tracking branch 'origin/develop' into NR_FAPI_beamindex_SSB_RO
2021-02-11 18:15:12 +01:00
Laurent Thomas
c93482c4c6
trivial merge with develop"
2021-02-11 13:27:00 +01:00
Sakthivel Velumani
7854133bc2
Removing some of the old pthreads
...
Leaving ru_thread and L1 stats thread
2021-02-10 22:00:09 +01:00
Laurent Thomas
2c5bd9fa8c
improve rfsim
2021-02-10 17:49:14 +01:00
Sakthivel Velumani
31fb7f3120
Merge branch 'develop' into gnb-threadpool
2021-02-10 14:56:09 +01:00
Sakthivel Velumani
2e0ed038d3
Using only one threadPool for nr-softmodem
2021-02-10 15:45:40 +01:00
Xue Song
e1a92eadba
Merge branch 'master' into develop_SA_rfsim_for_F1
...
Conflicts:
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/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-10 15:56:50 +09:00
He Shanyun
01999cfcc7
fix build error of enb and ittisim
2021-02-10 01:07:02 +00:00
Florian Kaltenberger
04a4a6f451
Merge remote-tracking branch 'origin/develop' into benetel_driver_update
2021-02-09 11:13:01 +01:00
Thomas Schlichter
14e84f8782
Merge remote-tracking branch 'develop' into NR_DL_MIMO
2021-02-09 10:02:54 +01:00
Sakthivel Velumani
d29e09cdb1
Passing tx timestamp through pipeline
2021-02-08 23:59:33 +01:00