Raphael Defosseux
e3499d948f
Merge remote-tracking branch 'origin/nr_rrc_asn1_16_4_1' into integration_2021_w33
2021-08-13 14:28:09 +02:00
Raphael Defosseux
5f9e0a235d
Merge remote-tracking branch 'origin/code-cleanup-20210716' into integration_2021_w32
2021-08-09 10:07:45 +02:00
Raphael Defosseux
7b2420760f
Merge remote-tracking branch 'origin/NR_UE_reworking_UCI_procedures' into integration_2021_w32
2021-08-06 10:37:22 +02:00
Laurent THOMAS
b7857a505e
try to fix CUDA, and fix infinite loop in nr UE uplink data collect
2021-08-05 17:31:31 +02:00
Laurent THOMAS
3cbf516885
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into code-cleanup-20210716
2021-08-04 19:57:45 +02:00
Raghavendra Dinavahi
2380646da0
Updated ASN to Spec 38.331 version 16.4.1
2021-08-03 14:27:11 +02:00
Raphael Defosseux
5adf940b99
Merge remote-tracking branch 'origin/ci_nsa_2x2_implem' into develop
2021-08-02 09:58:35 +02:00
Laurent OpenCells
d649434be9
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into code-cleanup-20210716
2021-07-29 22:29:52 +02:00
Laurent OpenCells
c3612b969f
fix regression on cuda test
2021-07-29 11:56:59 +02:00
Raphael Defosseux
3cfb169b37
fix(build): protobuf location has changed
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2021-07-29 08:29:27 +02:00
Laurent OpenCells
4a5a73bd9c
overkilling: oai support multiple versions of ubuntu
2021-07-25 23:49:41 +02:00
Laurent OpenCells
4700b7bbc6
overkilling: oai support multiple versions of ubuntu
2021-07-25 20:49:31 +02:00
Laurent OpenCells
754e8e3043
CMakeList cleanup,improvement and trial to run in ubuntu 16
2021-07-25 13:52:01 +02:00
Laurent Thomas
b3f3a1db57
try another gcc option for ubuntu 16, one fix in fapi p7
2021-07-23 16:38:01 +02:00
francescomani
bd816e5175
Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures
2021-07-23 13:51:41 +02:00
Laurent OpenCells
f62b7e1f9e
nfapi work around (missing malloc)
2021-07-22 15:32:09 +02:00
Laurent OpenCells
39c63eb158
move function declaration in not duplicated files (.h instead of .c)
2021-07-22 13:19:37 +02:00
hardy
c72ac04f63
remove nasmesh compile ; nokrnmod =1 by default
2021-07-22 11:34:41 +02:00
francescomani
227529c129
Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures
2021-07-21 17:49:33 +02:00
rmagueta
3ea6d6f878
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS-abs
...
# Conflicts:
# openair1/PHY/INIT/nr_init_ru.c
2021-07-19 13:51:38 +01:00
Thomas Schlichter
c3482e376d
Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer
2021-07-05 16:25:26 +02:00
francescomani
a49ebe249b
Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures
2021-07-01 16:38:41 +02:00
rmagueta
160cb0b930
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts2
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# cmake_targets/build_oai
# cmake_targets/tools/build_helper
# executables/nr-gnb.c
# openair1/PHY/INIT/nr_init_ru.c
# openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
# openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
# openair2/F1AP/f1ap_du_rrc_message_transfer.c
# openair2/F1AP/f1ap_du_rrc_message_transfer.h
# openair2/F1AP/f1ap_du_task.c
# openair2/GNB_APP/gnb_app.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/config.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
# openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
# openair2/RRC/LTE/rrc_eNB_GTPV1U.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/rrc_UE.c
# openair3/NAS/NR_UE/nr_nas_msg_sim.c
# openair3/ocp-gtpu/gtp_itf.cpp
# targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-06-30 17:00:30 +01:00
Thomas Schlichter
6f89a63d2c
Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer
2021-06-23 14:00:07 +02:00
rmagueta
5293e9bbe0
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# common/utils/system.c
2021-06-18 14:41:01 +01:00
Laurent THOMAS
1b62c91532
add configurable USIM
2021-06-14 16:32:29 +02:00
rmagueta
72654d70b2
Revert build for ITTI_SIM OR RFSIM_NAS in CMakeLists
2021-06-04 18:24:12 +01:00
luis_pereira87
9068db43e0
Update CMakeLists.txt to choose NEW_GTPU for NR binaries, and keep legacy GTPU for LTE
2021-06-01 19:00:07 +01:00
rmagueta
42365c9a0f
Set NEW_GTPU to false
2021-05-31 13:55:40 +01:00
Xenofon Foukas
db4769bc35
Fixes to L2NFAPI_NOS1 dataplane traffic forwarding
...
This commit fixes a bug that makes the dataplane traffic of all the
emulated UEs to go through the interface of the first UE (oaitun_ue1).
The fix uses the last octet of the IP assigned to each UE to map it to its
UE_id, which is then used to get its RNTI and the correct PDCP queue.
For the emulator to work properly, the routing tables of the emulated UEs
must also be set. This patch introduces a script (setup_routes.sh) in
cmake_targets/tools that configures the routing tables. This script
must be run at the UE host machine once the UEs have successfully attached,
passing the number of emulated UEs as the argument. For example, in the
case of 16 emulated UEs, one must run "./setup_routes.sh 16".
2021-05-24 16:33:12 +01:00
Thomas Schlichter
97c199dd84
Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer
2021-05-21 08:38:14 +02:00
Laurent THOMAS
96e3d00ac7
fix again RU compilation case
2021-05-19 15:25:42 +01:00
Thomas Schlichter
ff5eb3e657
Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer
2021-05-19 11:42:04 +00:00
rmagueta
8c5725ed46
Merge remote-tracking branch 'origin/fix-compile' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# openair2/RRC/NR_UE/rrc_UE.c
# openair2/SIMULATION/NR_RRC/itti_sim.c
2021-05-19 12:09:27 +01:00
Laurent THOMAS
d40486b100
fix again RU compilation case
2021-05-19 12:08:51 +02:00
francescomani
cd9a8f963f
moving pucch functions for harq at MAC (version still to be tested)
2021-05-18 11:04:10 +02:00
luis_pereira87
7743c84e30
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
2021-05-18 09:41:58 +01:00
hardy
2067d79a2d
Merge remote-tracking branch 'origin/ci_hotfix_module_ue_ip_address' into integration_2021_wk20_a
2021-05-17 18:39:24 +02:00
Raphael Defosseux
bee7e57b4b
RHEL8-UHD support: revert back to 4.0.0.0 version
...
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr >
2021-05-17 14:55:20 +02:00
rmagueta
fd3a45de82
Fix build issues
2021-05-17 12:01:32 +01:00
rmagueta
cf605f4c77
Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# cmake_targets/CMakeLists.txt
# cmake_targets/build_oai
# openair1/PHY/INIT/nr_init_ru.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
# openair1/SCHED_NR/phy_procedures_nr_gNB.c
# openair1/SIMULATION/NR_PHY/ulsim.c
# openair2/COMMON/platform_constants.h
# openair2/ENB_APP/enb_config.c
# openair2/F1AP/f1ap_cu_interface_management.c
# openair2/F1AP/f1ap_cu_rrc_message_transfer.c
# openair2/F1AP/f1ap_cu_ue_context_management.c
# openair2/F1AP/f1ap_du_interface_management.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_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_primitives.c
# openair2/RRC/LTE/rrc_eNB.c
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR_UE/rrc_UE.c
2021-05-17 01:36:39 +01:00
Laurent THOMAS
b5bbfdade3
after merge, remain compile errors
2021-05-16 23:57:35 +02:00
Eurecom
6e49488f74
Merge branch 'gnb-n300-fixes' into NR_SA_F1AP_5GRECORDS
2021-05-13 09:06:46 +02:00
Laurent THOMAS
7d3c60ed37
small fixes, make all compile is same tree
2021-05-11 14:34:27 +02:00
hardy
681beefd76
Merge remote-tracking branch 'origin/nr-dmrs-fixes' into integration_2021_wk19
2021-05-10 21:41:44 +02:00
Laurent THOMAS
c631c96975
bug fixes
2021-05-10 11:29:44 +01:00
Laurent THOMAS
7ee6b61f4b
bug fixes
2021-05-10 11:29:49 +02:00
rmagueta
4b5cef595a
Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
# openair1/PHY/NR_TRANSPORT/nr_ulsch.c
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
# openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
2021-05-03 18:44:54 +01:00
rmagueta
c0f3394048
Fix LTE build error
2021-05-03 18:07:07 +01:00
Raymond Knopp
3fa878101e
handling of SDAP header, move RAR to slot last DL slot in TDD period (need change in configuration file)
2021-05-02 22:32:58 +02:00