Commit Graph
1730 Commits
Author SHA1 Message Date
matzakos a19f2e3254 Merge remote-tracking branch 'origin/aw2s-n41' into F1_interop_ACC 2022-01-24 15:11:50 +01:00
Raymond Knopp 90c66bb7b1 Merge remote-tracking branch 'origin/develop' into aw2s-n41
Conflicts:
	executables/nr-softmodem.c
	openair1/PHY/NR_TRANSPORT/nr_dlsch.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair1/SIMULATION/NR_PHY/ulsim.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2022-01-24 11:11:46 +01:00
francescomani 27599b0b08 fix for phy-simulators compilation 2022-01-19 15:41:18 +01:00
matzakos e5899e2f74 Merge remote-tracking branch 'origin/develop' into F1C_extensions_develop 2022-01-17 13:19:45 +01:00
Laurent THOMAS a5c5264ef3 merge develop 2022-01-14 21:09:02 +01:00
Laurent THOMAS d751568689 fix a bug in call to realloc inside a function 2022-01-12 16:12:36 +01:00
Laurent THOMAS d108d9c651 fix loop on wrong array size in 4G dlsim 2022-01-12 15:22:10 +01:00
hardy ec286386dc Merge remote-tracking branch 'origin/NR-LogsSanAddrFix' into integration_2022_wk02 2022-01-12 14:27:00 +01:00
Laurent THOMAS 586b91b461 fix dlsim regression 2022-01-12 11:35:49 +01:00
frtabu 52fc3ff5a5 Switch loglvl to ARNING by default as for other simulators 2022-01-04 15:35:25 +01:00
Raymond Knopp fefa42c889 phy simulators remove measurments printf and check/allow log level config 2022-01-04 15:34:03 +01:00
Robert Schmidt 6c823168fe Merge remote-tracking branch 'origin/episys-merge-nsa' into integration_2021_wk51_d 2021-12-24 10:13:27 +01:00
Laurent THOMAS 792b6b4e0b merge develop 2021-12-23 22:52:36 +01:00
hardy 0b4d3d92a2 Merge remote-tracking branch 'origin/NR_RRC_configuration_functions' into integration_2021_wk51_c 2021-12-23 10:44:42 +01:00
Laurent THOMAS d73ec04635 merge develop 2021-12-20 09:29:52 +01:00
Laurent THOMAS 0f00e57148 merge develop 2021-12-17 16:29:53 +01:00
francescomani 196c757293 workaround to avoid segfault (setting back dlsch length to 12 symbols) 2021-12-14 18:08:11 +01:00
francescomani 4d689e8073 another attempt to fix phy simulators 2021-12-10 09:37:10 +01:00
francescomani d93cc63a1e fix for phy-simulators 2021-12-09 14:58:32 +01:00
Melissa Elkadi 118bd8b36f Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-06 13:23:21 -08:00
Melissa Elkadi fd2f61debc Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-12-03 05:44:34 -08:00
Laurent Thomas 1f1f85c7bc Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into tx-proc-optim 2021-12-02 14:17:49 +01:00
matzakos 1da693dd78 Merge remote-tracking branch 'origin/develop' into NR_F1C_F1U_extensions 2021-12-02 13:54:08 +01:00
francescomani b765b02129 Merge remote-tracking branch 'origin/develop' into NR_UE_acknack 2021-12-02 09:23:27 +01:00
Raymond Knopp 6fb731ea5d Merge remote-tracking branch 'origin/NR_2port_CSIRS' into CSI-SA
Conflicts:
	ci-scripts/xml_files/fr1_sa_quectel.xml
	executables/nr-gnb.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.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_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
2021-12-01 14:51:10 +01:00
hardy 8757c17d9c Merge remote-tracking branch 'origin/Fix_harq_value_scf' into integration_2021_wk48_d 2021-12-01 12:32:38 +01:00
hardy 4be0407bd9 Merge remote-tracking branch 'origin/nr_ldpc_dlsch_decoding_parallel' into integration_2021_wk48_d 2021-12-01 12:31:50 +01:00
Mario Joa-Ng d47f127602 fix the problem in nr_dlschsim where init_dlsch_tpool() is missing. 2021-11-24 15:10:20 -05:00
francescomani 2a1c6c0543 improve readability in pucchsim 2021-11-22 16:47:34 +01:00
francescomani 59e727049d bugfix in dmrs_ports handling at UE for pdsch 2021-11-16 12:04:00 +01:00
francescomani 0e3aa93ed6 Merge remote-tracking branch 'origin/develop' into Fix_harq_value_scf 2021-11-15 17:18:21 +01:00
francescomani 174ee99d3c fix in dlsim 2021-11-15 16:47:56 +01:00
Laurent THOMAS 66073d50fc merge develop 2021-11-15 10:25:52 +01:00
Raymond Knopp e51cd863fe Merge branch 'bler_txoptim' into F1C_extensions_develop
Conflicts:
	cmake_targets/CMakeLists.txt
	common/utils/nr/nr_common.c
	openair1/PHY/INIT/nr_parms.c
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair1/PHY/NR_UE_TRANSPORT/dci_nr.c
	openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
	openair1/PHY/NR_UE_TRANSPORT/pucch_nr.c
	openair1/SCHED_NR/fapi_nr_l1.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
	openair1/SIMULATION/NR_PHY/dlschsim.c
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/GNB_APP/gnb_config.c
	openair2/LAYER2/NR_MAC_UE/config_ue.c
	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/NR_MAC_gNB/main.c
	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
	openair2/RRC/NR/L2_nr_interface.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/rrc_gNB_NGAP.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.c
	openair3/NAS/NR_UE/nr_nas_msg_sim.h
	openair3/ocp-gtpu/gtp_itf.cpp
	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
2021-11-14 21:18:50 +01:00
Raymond Knopp c2fbcbcabc Merge branch 'bler_txoptim' of https://gitlab.eurecom.fr/oai/openairinterface5g into bler_txoptim 2021-11-14 17:28:56 +01:00
Raymond Knopp 654279f91f warning in ulsim.c 2021-11-14 12:23:10 +01:00
Raymond Knopp 66d9f83cd0 nr_ulsim working again 2021-11-14 11:21:33 +01:00
matzakos 40263348f9 Merge with NR_F1C_F1U_extensions and resolve conflicts 2021-11-12 17:01:27 +01:00
francescomani 2eac9f53c7 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-11-11 16:35:46 +01:00
Raymond Knopp 95343c6658 Merge remote-tracking branch 'origin/develop' into tx-proc-optim
Conflicts:
	common/utils/nr/nr_common.h
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
2021-11-11 08:34:06 +01:00
Raymond Knopp dee9bbb119 dlschsim fixed 2021-11-11 07:54:23 +01:00
Melissa Elkadi 046258f1ba Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-09 15:17:58 -08:00
rmagueta 70d3c7973c Merge remote-tracking branch 'origin/develop' into bler_txoptim 2021-11-09 10:39:49 +00:00
Raymond Knopp bac8bc569c minor changes in dlschsim, still doesn't work :-( 2021-11-09 10:51:00 +01:00
Mario Joa-Ng 30bfd72920 fix parallelization of LDPC decoding in dlsim 2021-11-08 11:59:17 -05:00
hardy 4c2c7f92a5 Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b 2021-11-08 13:12:52 +01:00
francescomani c64872924b fix for harq value in fapi indication according to scf 2021-11-04 10:02:29 +01:00
Laurent THOMAS d49165f07a merge develop 2021-11-03 17:28:06 +01:00
Raymond Knopp 64e610361f merge from Laurent's TX-optimization-lts (cherry-picked dlsch_encoding component) 2021-10-31 22:43:20 +01:00
Eurecom a0f6545733 added 133/162 PRBs to nr_dlsim 2021-10-31 21:14:53 +01:00