Commit Graph
7770 Commits
Author SHA1 Message Date
luis_pereira87 bc9eeef2f8 Put back a pthread_mutex_lock for UL_INFO_mutex 2021-11-15 08:21:53 +00:00
luis_pereira87 1e96501286 Merge remote-tracking branch 'origin/develop' into bler_txoptim
# Conflicts:
#	executables/nr-gnb.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/main.c
2021-11-15 07:16:06 +00: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 02b17c79d6 commit before merge. minor changes for testing 2021-11-14 17:28:24 +01:00
Michael Cook afeb5f4de2 Fix warning about unused variable off
It's used only if LOG_M is enabled.
2021-11-14 06:29:24 -08:00
Raymond Knopp 654279f91f warning in ulsim.c 2021-11-14 12:23:10 +01:00
Raymond Knopp c8d9adca58 Merge remote-tracking branch 'origin/develop' into tx-proc-optim 2021-11-14 11:22:04 +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
Roberto Louro Magueta 7c899fd147 Revert "Init SRS parameters at gNB"
This reverts commit 6aea63a0eb
2021-11-11 17:58:11 +00:00
rmagueta 6aea63a0eb Init SRS parameters at gNB 2021-11-11 16:46:43 +00:00
francescomani 2eac9f53c7 Merge remote-tracking branch 'origin/develop' into NR_2port_CSIRS 2021-11-11 16:35:46 +01:00
rmagueta 7e8dd29828 Add SRS debug 2021-11-11 15:13:34 +00: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 07d735f93c step-by-step merging from tx-proc-optim-lts. Everything except NR_TRANSPORT merged. Some issues with 64QAM modulation 2021-11-11 08:28:10 +01:00
Raymond Knopp dee9bbb119 dlschsim fixed 2021-11-11 07:54:23 +01:00
Raymond Knopp 2d6990e68a PTRS modulation is ok 2021-11-10 23:59:16 +01:00
rmagueta dc59ed65bd Creating the empty functions required for the NR-SRS 2021-11-10 19:24:32 +00:00
rmagueta f91017e2f0 Change LOG levels 2021-11-10 17:31:49 +00:00
Melissa Elkadi 046258f1ba Merge branch 'eurecom-develop' into eurecom-episys-merge-nsa 2021-11-09 15:17:58 -08:00
Raymond Knopp bf2e231c60 shuted 128-bit SIMD for the moment in nr_pdsch.c resource mapping, because of alignment issues. Use 64-bit SIMD instead for now. To be updated. 2021-11-10 00:04:11 +01:00
Raymond Knopp 0cde0ce268 resource mapping bugfix 2021-11-09 22:19:44 +01: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
francescomani 1396004ccc Merge remote-tracking branch 'origin/develop' into scs_60_iisc 2021-11-09 10:44:34 +01:00
hardy 4b9f7ec404 Merge remote-tracking branch 'origin/ci-test-newstats' into integration_2021_wk45_c 2021-11-09 10:19:10 +01:00
Mario Joa-Ng 30bfd72920 fix parallelization of LDPC decoding in dlsim 2021-11-08 11:59:17 -05:00
francescomani c9f2f54df3 using minRXTXTIMEpdsch in acknack scheduling (for common case) 2021-11-08 15:18:05 +01:00
hardy cf41f0ccda Merge remote-tracking branch 'origin/NR_debug_sib1_reception' into integration_2021_wk45_b 2021-11-08 13:13:35 +01:00
hardy c3955ec7b8 Merge remote-tracking branch 'origin/nr_timing_fixes' into integration_2021_wk45_b 2021-11-08 13:13:12 +01:00
hardy 4c2c7f92a5 Merge remote-tracking branch 'origin/code-cleanup-2021oct24' into integration_2021_wk45_b 2021-11-08 13:12:52 +01:00
hardy 9c1336157e Merge remote-tracking branch 'origin/NR_SA_band_96' into integration_2021_wk45_b 2021-11-08 13:12:28 +01:00
francescomani 3808937231 Merge remote-tracking branch 'origin/NR_UE_acknack' into nr-fdd-scheduling 2021-11-08 11:53:50 +01:00
francescomani 3fcbfdadad Minimum value of DL to ACK 2021-11-08 10:26:14 +01:00
mjoang 4a9c74f41b rebase to develop 2021-11-05 22:46:09 -04:00
David Kim fa6aa31559 Changed log level from I to D in PUSCH detection. 2021-11-05 14:25:09 -07:00
Guido Casati 755c8d5055 Fixed calculation of num dmrs per prb at gnb side
- the param was hardcoded to 12 at gNB side
  while it was computed at UE side
- the same function used at UE side has been moved to the common file
- now the computation at gNB side is consistent with the UE
2021-11-05 16:05:10 +01:00
Guido Casati a5f18dbb20 Enhancements to the overall MAC logging
- updating to NR_MAC tag
- minor cleanups
- added more relavant info for debugging purposes
2021-11-05 16:05:10 +01:00
Guido Casati 0286138f33 Adaptations of the MAC scheduling to support FDD
- removed calls to the TDD UL/DL configuration common in FDD mode
- bugfix in the generation of prach info from index
- initial adaptation of gNB schedulers
- adapted PUCCH ack/nack scheduling by taking into account 6 slots min
  delay in FDD mode (to be integrated with latest development of PUCCH)
- made the use of nr_slots_per_frame more consistent
2021-11-05 16:05:01 +01:00
mjoang 1b2d5b0c96 minor change to clear ul_config_list array 2021-11-05 09:38:28 -04:00
mjoang 03dda0a942 fix a a bug to handle tx_req_body if the number is > 1 2021-11-04 19:35:07 -04:00
David Kim ae8e0ea3da Reverted unncessary changes. 2021-11-04 13:46:24 -07:00
David Kim d2ecd40fbd Removed unused debug log. 2021-11-04 10:34:06 -07:00
David Kim 4fb67cbd9c Resolved conflict in Merge remote-tracking branch 'origin/episys/master-nsa' into episys/david/nsa_ci_debug_for_sa 2021-11-04 10:24:48 -07:00
David Kim f4049a9fe2 Code cleanup 2021-11-04 09:31:42 -07:00
hardy 60a91cc207 Merge remote-tracking branch 'origin/NR_MAC_statisticsthread' into ci-test-newstats 2021-11-04 17:00:34 +01:00
francescomani 7ffb689aee remove rate matching assertion 2021-11-04 14:22:52 +01:00
Laurent THOMAS 9d1fe78e2e merge develop, no working yet 2021-11-04 12:53:01 +01:00
luis_pereira87 29eca46833 Merge remote-tracking branch 'origin/develop' into bler_txoptim
# Conflicts:
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/GNB_APP/gnb_config.c
2021-11-04 11:32:03 +00:00