Commit Graph
1246 Commits
Author SHA1 Message Date
Florian Kaltenberger 464509e324 adding LPP ASN1 message definitions and code generation 2021-12-07 15:28:27 +01:00
ahadi 6b8f83b849 update 2021-11-03 15:24:24 +01:00
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
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
Raghavendra Dinavahi 2380646da0 Updated ASN to Spec 38.331 version 16.4.1 2021-08-03 14:27:11 +02:00
Laurent OpenCells c3612b969f fix regression on cuda test 2021-07-29 11:56:59 +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
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
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
Laurent THOMAS 96e3d00ac7 fix again RU compilation case 2021-05-19 15:25:42 +01: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
francescomani cd9a8f963f moving pucch functions for harq at MAC (version still to be tested) 2021-05-18 11:04:10 +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
Laurent THOMAS 7d3c60ed37 small fixes, make all compile is same tree 2021-05-11 14:34:27 +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
rmagueta 655c5481e3 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	executables/nr-uesoftmodem.h
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	openair2/RRC/NR_UE/L2_interface_ue.c
2021-04-30 18:00:27 +01:00
Laurent THOMAS 04b28b4518 fixes from testing 2021-04-30 16:47:40 +02:00
Raymond Knopp d88ce5b9bf Merge remote-tracking branch 'origin/develop' into oairu 2021-04-27 11:58:31 +02:00
Raymond Knopp 2be602e938 Merge remote-tracking branch 'origin/develop' into NR_SA_F1AP_5GRECORDS 2021-04-26 10:51:18 +02:00
rmagueta 45de9e7b25 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS 2021-04-24 13:27:11 +01:00
Laurent THOMAS 2a1025165c fix, third trial T_IDs.h 2021-04-21 14:49:44 +02:00
Laurent THOMAS d0e091294e more on T_IDs.h 2021-04-21 12:44:40 +02:00
Laurent THOMAS b8480de3c5 try fix T_IDs.h 2021-04-21 12:15:17 +02:00
rmagueta 31a753b38f Fix build error 2021-04-15 18:02:53 +01: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
hardy c4745c3e46 Merge remote-tracking branch 'origin/new-gtpu' into integration_2020_wk15
Conflicts:
	cmake_targets/CMakeLists.txt
	openair1/PHY/TOOLS/time_meas.h
	openair2/LAYER2/PDCP_v10.1.0/pdcp_fifo.c
	openair2/LAYER2/RLC/rlc.h
2021-04-14 14:56:04 +02:00
hardy 246afc7ccb Merge remote-tracking branch 'origin/sim-channels' into integration_2020_wk15 2021-04-14 14:37:09 +02:00
Raymond Knopp 1236f4c389 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	cmake_targets/build_oai
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2021-04-12 16:03:09 +02:00
Laurent Thomas ab3ac5b29e Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sim-channels 2021-04-09 14:49:48 +02:00
Laurent Thomas 307098da4a merge develop 2021-04-09 12:39:33 +02:00
Raymond Knopp 0b59ce4faf Merge remote-tracking branch 'origin/develop' into oairu 2021-04-07 15:50:46 +02:00
Raymond Knopp 2473a25ca1 Merge remote-tracking branch 'origin/develop-SA-CBRA' into NR_SA_F1AP_5GRECORDS
Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
2021-04-06 16:38:37 +02:00
Laurent Thomas 89598e3bad Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into sanitize-v1 2021-04-06 12:11:29 +02:00