Commit Graph
135 Commits
Author SHA1 Message Date
francescomani b6ef23a395 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-25 15:01:40 +02:00
francescomani e083bd4330 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-13 15:09:52 +02:00
Rahul Gottipati 540d2e2977 Rebase to latest develop 2021-08-12 15:20:16 +05:30
Mahesh 8030549342 phy-sim build error fix 2021-08-11 16:15:49 +05:30
Laurent OpenCells 5ed848c76e more fixes on gcc warnings, misleading indentation and CPU mitigation when the traffic demand in 5G exeeds the available througput 2021-07-20 16:30:14 +02:00
francescomani 2fe8dd7657 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into NR_UE_SA 2021-07-14 10:35:09 +02:00
rmagueta ac79ceb3f4 Fix build of phy-simulators 2021-06-21 19:10:56 +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
Raymond Knopp 83ccc50f18 Merge remote-tracking branch 'origin/develop' into oairu 2021-05-10 00:39:55 +02:00
rmagueta 055f147d13 Fix build in phy-simulators 2021-05-05 19:59:24 +01:00
rmagueta 948df0e034 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	executables/softmodem-common.h
#	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
#	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/prachsim.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
2021-05-03 19:50:30 +01:00
rmagueta e924caa677 Fix phy-simulators 2021-05-01 18:39:30 +01:00
hardy 273c6ff39f Merge remote-tracking branch 'origin/ue-pdsch-pusch-parallel' into integration_2021_wk17_b 2021-04-29 11:55:17 +02:00
Raymond Knopp d88ce5b9bf Merge remote-tracking branch 'origin/develop' into oairu 2021-04-27 11:58:31 +02:00
Sakthivel Velumani e956c372df Fixed physim build issues 2021-04-22 13:42:59 +02:00
hardy b5ffe11bd8 Merge remote-tracking branch 'origin/develop-SA-CBRA' into integration_2020_wk15
Conflicts:
	openair1/PHY/TOOLS/nr_phy_scope.c
	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-04-14 15:14:03 +02: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
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
Laurent OpenCells c0ef3e6f88 fix gcc reported issues 2021-04-03 23:37:58 +02:00
Sakthivel Velumani ca9ebcc959 Merge branch 'develop' into ue-pdsch-pusch-parallel 2021-04-01 12:44:59 +02:00
rmagueta 1aab76a48d Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
2021-04-01 11:19:28 +01:00
Sakthivel Velumani 76273a2aa0 Merge branch 'ue-dci-false-detection' into ue-pdsch-pusch-parallel 2021-03-30 13:43:28 +02:00
Raymond Knopp 08b781ebfe Merge remote-tracking branch 'origin/develop' into oairu 2021-03-25 06:44:11 +01:00
rmagueta 114508c120 Minor fix in nr_prachsim 2021-03-24 16:17:48 +00:00
Florian Kaltenberger feb2b9c8bb adding rxdataF signal to debug output 2021-03-24 10:24:24 +01:00
Rohan Patil ad0f5ba26f nr_du[] not filled in High Speed case for both gNB and nrUE 2021-03-22 09:38:12 -04:00
rmagueta d37552db4c Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.h
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-03-19 15:07:08 +00:00
Laurent THOMAS 0009fefce2 Merge branch 'develop' of gitlab.eurecom.fr:oai/openairinterface5g into sim-channels 2021-03-19 11:19:58 +01:00
Sakthivel Velumani 874cefb924 Fixed build errors
Also added warning messages for gNB number of threads required
2021-03-18 20:17:41 +01:00
rmagueta 9456542678 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
2021-03-16 16:04:23 +00:00
Thomas Schlichter b7ef903cb4 Merge remote-tracking branch 'develop' into NR_10MHz 2021-03-16 16:13:17 +01:00
Raymond Knopp 94085a41cd Merge remote-tracking branch 'origin/develop' into oairu 2021-03-16 08:07:16 +01:00
Laurent THOMAS a97bf1da6e fix phy simulators, merge develop 2021-03-15 12:40:15 +01:00
Raymond Knopp 4c8fb83e82 lowmem option for allocating transport channel buffers in NR_DLSCH/NR_ULSCH. Used for unitary simulation in CI. 2021-03-14 22:47:43 +01:00
Remi Hardy c12dd11d6e Merge remote-tracking branch 'origin/develop-SA-RA' into integration_2021_wk10 2021-03-12 11:07:25 +01:00
Laurent THOMAS a0922cef2f merge develop 2021-03-04 14:49:38 +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 5f66269a8b Merge remote-tracking branch 'origin/develop' into develop-SA-RA
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-03-02 12:01:11 +00:00
rmagueta cf70265ba6 Merge remote-tracking branch 'origin/develop' into develop-SA-CBRA
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2021-02-25 13:03:06 +00: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
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
rmagueta 910154c7af Merge branch 'develop' into develop-SA-RA
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
2021-02-23 13:04:01 +00:00
Raymond Knopp a6e16e7c8a Merge remote-tracking branch 'origin/develop' into oairu 2021-02-23 11:51:29 +01:00
hardy accae67113 Merge remote-tracking branch 'origin/nr-pdcp-nea2-security' into integration_2021_wk08 2021-02-23 09:31:05 +01:00
Cedric Roux 3cfa2c266b hack: fix NR prachsim compilation
Dirty!
2021-02-15 15:25:52 +01:00
luis_pereira87 9a55e64e54 Fix build errors in physical unitary tests simulators, minor update in the documentation 2021-02-12 12:28:17 +00:00