Commit Graph
7909 Commits
Author SHA1 Message Date
Raymond Knopp 5ba8b83856 Merge remote-tracking branch 'origin/aw2s-n41' into harq_latency_control
Conflicts:
	openair1/SIMULATION/NR_PHY/dlsim.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB_nsa.c
	openair2/RRC/NR/rrc_gNB_reconfig.c
	targets/ARCH/AW2SORI/oaiori.c
2022-02-13 12:24:45 +01:00
Raymond Knopp da54df5bb2 Merge remote-tracking branch 'origin/develop' into harq_latency_control
Conflicts:
	cmake_targets/phy_simulators
	openair1/PHY/CODING/crc_byte.c
	openair2/GNB_APP/gnb_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/RRC/NR/rrc_gNB.c
2022-02-13 09:55:01 +01:00
Raymond Knopp 74fd3f029a changes for AW2S NR support in ORI library 2022-02-13 09:44:15 +01:00
Raymond Knopp b9b24588af Merge remote-tracking branch 'origin/develop' into aw2s-n41
Conflicts:
	cmake_targets/phy_simulators
	openair1/PHY/NR_TRANSPORT/pucch_rx.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2022-02-11 12:21:29 +01:00
Robert Schmidt 7e92d44fc2 Merge remote-tracking branch 'origin/oai-ue-time-meas' into integration_2022_wk06_a 2022-02-10 18:57:28 +01:00
Robert Schmidt a36555b254 Merge remote-tracking branch 'origin/develop-SRS' into integration_2022_wk06_a 2022-02-08 18:06:53 +01:00
rmagueta e8657ec854 Merge remote-tracking branch 'origin/develop' into develop-SRS
# Conflicts:
#	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
2022-02-08 09:31:32 +00:00
Robert Schmidt 9594e422bc Merge remote-tracking branch 'origin/NR_pdcch_improvements' into integration_2022_wk06 2022-02-07 18:48:52 +01:00
Robert Schmidt ce9d1bd7c5 Always schedule PUCCH to prevent stale PUCCH config 2022-02-07 14:23:17 +01:00
Robert Schmidt b13ea677a2 Give warning when UL Failure on NR link 2022-02-07 14:23:17 +01:00
francescomani 8dcf0d011d two bugfixes: local pdcch_pdu in ul and wrong initialization place in find_candidate 2022-02-07 13:40:15 +01:00
Robert Schmidt c14d9a3c2a Merge remote-tracking branch 'origin/thread_pool_size' into integration_2022_wk05_b 2022-02-04 19:13:48 +01:00
Robert Schmidt 66137d2bf9 Merge remote-tracking branch 'origin/bler_txoptim' into integration_2022_wk05_b 2022-02-04 19:11:33 +01:00
Robert Schmidt 0b39690044 Merge remote-tracking branch 'origin/episys-remove-log-minimal' into integration_2022_wk05_b 2022-02-04 19:07:09 +01:00
Robert Schmidt 49df71ddaa Merge remote-tracking branch 'origin/episys-nfapi-p5-bug-fixes' into integration_2022_wk05_b 2022-02-04 19:07:09 +01:00
francescomani 2408f82ace Merge remote-tracking branch 'origin/develop' into NR_pdcch_improvements 2022-02-02 18:13:46 +01:00
Raymond Knopp 7c40c74883 Merge branch 'aw2s-n41' of https://gitlab.eurecom.fr/oai/openairinterface5g into aw2s-n41
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.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
2022-02-01 21:59:44 +01:00
Raymond Knopp 86560439e7 nr-softmodem fixed after merge` 2022-02-01 21:55:49 +01:00
francescomani 8ecef89ab4 Merge remote-tracking branch 'origin/NR_pdcch_improvements' into aw2s-n41 2022-02-01 16:16:45 +01:00
Melissa Elkadi 5e182c4e50 Adding a few more LOG_A's for critical milestones 2022-02-01 05:41:24 -08:00
Raymond Knopp 495f0150da Merge branch 'NR_pdcch_improvements' into aw2s-n41
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.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
2022-02-01 10:56:20 +01:00
Raymond Knopp 7d4bdfb566 Merge remote-tracking branch 'origin/develop' into aw2s-n41 2022-02-01 10:46:13 +01:00
francescomani e346608b04 bugfix after nr_set_pdsch_semi_static 2022-01-31 19:28:08 +01:00
francescomani e4acf7e21d bugfix for pdu_index in sib1 sched function 2022-01-31 19:21:06 +01:00
hardy 27ac95f5e0 Merge remote-tracking branch 'origin/nr-fix-harq-round' into integration_2022_wk05 2022-01-28 16:58:15 +01:00
Robert Schmidt d7e7954cde Remove commented code 2022-01-28 16:20:06 +01:00
francescomani aec56c9a86 additional review comments 2022-01-27 12:22:03 +01:00
francescomani 5eb9e1f421 compute Y every time 2022-01-26 10:31:10 +01:00
Melissa Elkadi 4c4d317822 Removing commented code that causes SEG_FAULT in NSA mode 2022-01-25 16:57:58 +01:00
luis_pereira87 0e159f8b6b Merge remote-tracking branch 'origin/develop' into bler_txoptim
# Conflicts:
#	openair1/SCHED_NR/fapi_nr_l1.c
2022-01-25 08:49:16 +00:00
francescomani e7f544e139 Merge remote-tracking branch 'origin/develop' into NR_pdcch_improvements 2022-01-24 19:08:21 +01:00
Cedric Roux fe4c988c97 nr ue: fix security setting of DRB
Maybe this fix won't work for non-openair gNB. We use the same keys and
algorithms as for SRBs, which is what openair gNB does.

(I hope I'm right there.)

To be changed if needed.
2022-01-24 15:56:45 +01:00
luis_pereira87 d0bbcaef50 Merge remote-tracking branch 'origin/develop' into thread_pool_size
# Conflicts:
#	ci-scripts/conf_files/gNB_SA_n78_106PRB.2x2_usrpn310.conf
#	ci-scripts/conf_files/gNB_SA_n78_133PRB.2x2_usrpn310.conf
#	openair2/GNB_APP/L1_nr_paramdef.h
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/du_gnb.conf
2022-01-24 11:13:38 +00: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
hardy 08c9d4ae4c Merge remote-tracking branch 'origin/tx-thread-update' into integration_2022_wk04_a 2022-01-21 16:39:24 +01:00
Laurent Thomas 1eb1c17f0c merge develo 2022-01-19 16:46:46 +01:00
hardy bbe79b5b3a Merge remote-tracking branch 'origin/NR_UE_Capabilities' into integration_2022_wk03_b 2022-01-19 15:40:43 +01:00
Thomas Schlichter df98bdb372 move nr_rv_round_map from gNB_scheduler_phytest.c to gNB_scheduler.c 2022-01-19 15:17:26 +01:00
luis_pereira87 38d5b38910 Revert ulsch scheduler min_rb to 5 2022-01-18 18:02:07 +00:00
luis_pereira87 978b4a1728 Merge remote-tracking branch 'origin/develop' into bler_txoptim
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
2022-01-18 17:44:30 +00:00
rmagueta ef021c23e0 Merge remote-tracking branch 'origin/develop' into develop-SRS
# Conflicts:
#	openair1/PHY/LTE_UE_TRANSPORT/pcfich_ue.c
2022-01-17 15:46:27 +00:00
francescomani 533897605f Merge remote-tracking branch 'origin/develop' into NR_pdcch_improvements 2022-01-17 15:36:55 +01:00
Laurent THOMAS 3f2dd17191 code review comments + re-test 2022-01-13 16:04:16 +01:00
luis_pereira87 24ebf98ebf Add descriptive help string for CONFIG_STRING_L1_THREAD_POOL_SIZE 2022-01-13 09:55:11 +00:00
luis_pereira87 07f31c6465 Merge remote-tracking branch 'origin/develop' into thread_pool_size 2022-01-13 09:19:31 +00:00
Laurent THOMAS d751568689 fix a bug in call to realloc inside a function 2022-01-12 16:12:36 +01:00
luis_pereira87 fb7795a0f4 Fix build warning after merge with develop 2022-01-10 14:20:41 +00:00
luis_pereira87 015e360d42 Merge remote-tracking branch 'origin/develop' into bler_txoptim
# Conflicts:
#	ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf
#	ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
#	openair1/SCHED_NR/fapi_nr_l1.c
2022-01-10 14:03:55 +00:00
francescomani 42bf576596 review fixes 2022-01-10 14:09:21 +01:00
Laurent THOMAS b4b457345d merge develop 2022-01-10 12:49:47 +01:00