matzakos
12eed23f63
Merge remote-tracking branch 'origin/develop' into F1C_extensions_develop
2022-03-14 11:39:13 +01:00
francescomani
03617b9165
more general SR config for period and offset
2022-03-14 10:43:59 +01:00
Raymond Knopp
e71578e7d0
Merge branch 'tdd25period_for_MR' into tdd2_5period_withRLCupdate
...
Conflicts:
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
targets/ARCH/AW2SORI/oaiori.c
2022-03-13 07:30:44 +01:00
francescomani
1ab1fde7b8
fix for fdd and other warnings
2022-03-11 14:00:30 +01:00
francescomani
a88a8dae8e
config of pucch2 in rrcsetup
2022-03-11 12:27:00 +01:00
Raymond Knopp
d24068a33b
some bugfixes for CSI reporting with PUCCH2. Configuration of cqi_Table 2 for CSI reporting when 256-QAM is enabled.
2022-03-11 01:23:39 +01:00
francescomani
63ebfff4d3
Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources
2022-03-10 15:21:47 +01:00
Raymond Knopp
6abb1e362d
Merge remote-tracking branch 'origin/tdd25period_for_MR' into F1_interop_ACC
...
Conflicts:
cmake_targets/CMakeLists.txt
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair1/SCHED_NR/fapi_nr_l1.c
openair1/SIMULATION/NR_PHY/dlschsim.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_uci.c
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
openair2/RRC/NR/MESSAGES/asn1_msg.h
openair2/RRC/NR/nr_rrc_proto.h
openair2/RRC/NR/rrc_gNB.c
openair3/ocp-gtpu/gtp_itf.cpp
targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
2022-03-09 19:16:23 +01:00
matzakos
14ec3e505d
Fix decoding of UE-capabilities-RAT-container-list at the DU after receiving it from the CU
2022-03-09 19:08:15 +01:00
luis_pereira87
00c6a4bce5
Avoid segmentation fault
2022-03-08 19:14:42 +00:00
luis_pereira87
d058e2a6ed
Increase RRC_BUF_SIZE to 1024 to solve encoding failure
2022-03-08 18:13:25 +00:00
luis_pereira87
19f532d450
Fix build after merge
2022-03-08 14:54:16 +00:00
luis_pereira87
a87e99ad69
Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs
...
# Conflicts:
# openair1/PHY/TOOLS/lte_ue_scope.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/rrc_gNB_reconfig.c
2022-03-08 14:21:00 +00:00
Robert Schmidt
d8209228e7
Hide warning of unused variable
...
From the comment above the line with the warning:
> This asn1cCalloc leaks memory but also masks a bug.
> If we delete this asn1cCalloc statement, eNB will crash in NSA mode.
> Please don't delete the following line unless the bug has been found
2022-03-07 23:24:50 +01:00
Robert Schmidt
9714877ee0
Merge remote-tracking branch 'origin/remove-NR_UE_PBCH' into integration_2022_wk10
2022-03-07 23:12:49 +01:00
Thomas Schlichter
e7500354c1
harmonize RLC and PDCP configurations in nr_DRB_preconfiguration() and fill_default_secondaryCellGroup()
...
nr_DRB_preconfiguration() is used in phy-test mode by both, OAI UE and gNB, and in all other modes by OAI UE.
Because of inconsistencies, data transfer with OAI UE was only reliably working in phy-test mode.
Ultimately, OAI UE should use nr_DRB_preconfiguration() only in phy-test mode and do proper DRB configuration instead in all other modes!
2022-03-07 16:02:01 +01:00
Melissa Elkadi
79cc21f6f5
Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm
2022-03-07 06:33:51 -08:00
rmagueta
bbe806a870
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/SIMULATION/NR_PHY/dlsim.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/RRC/NR/MESSAGES/asn1_msg.c
# openair2/RRC/NR/MESSAGES/asn1_msg.h
# openair2/RRC/NR/nr_rrc_config.c
# openair2/RRC/NR/nr_rrc_config.h
# openair2/RRC/NR/rrc_gNB.c
# openair2/RRC/NR/rrc_gNB_nsa.c
2022-03-07 13:10:40 +00:00
francescomani
b8935b7761
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-03-07 10:37:48 +01:00
francescomani
8dfc5d59b4
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-07 09:26:08 +01:00
francescomani
4e76491f79
Merge remote-tracking branch 'origin/develop' into nr_csirs_rrc_harmonization
2022-03-07 09:09:17 +01:00
Raymond Knopp
2bd90d5b49
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair2/RRC/NR/MESSAGES/asn1_msg.h
2022-03-07 07:38:03 +01:00
luis_pereira87
b2316f045e
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
...
# Conflicts:
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-03-07 01:19:20 +00:00
Raymond Knopp
fcd88de2ab
SR/CSI multiplexing fix. default sl_head=6 instead of 4 to check if RF simulator behaves better
2022-03-07 00:08:12 +01:00
Laurent Thomas
939b249ba8
Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into remove-NR_UE_PBCH
2022-03-06 15:53:09 +01:00
Laurent Thomas
aa910f52b6
debug after develop merge
2022-03-06 15:52:42 +01:00
Raymond Knopp
3402ea00cc
build for NR UE
2022-03-06 09:40:36 +01:00
Raymond Knopp
f99754a5ea
Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR
...
Conflicts:
openair1/PHY/NR_TRANSPORT/nr_dlsch.c
openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
openair2/GNB_APP/gnb_config.c
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.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_ulsch.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-03-05 21:12:32 +01:00
Robert Schmidt
0220f4a6e9
Merge remote-tracking branch 'origin/NR_RRC_256QAM_DL' into integration_2022_wk09_b
2022-03-05 13:33:18 +01:00
rmagueta
a77769d45b
Fix build after merge
2022-03-05 02:32:34 +00:00
rmagueta
a634f14f74
Merge remote-tracking branch 'origin/develop' into develop-CSI
...
# Conflicts:
# openair1/PHY/NR_TRANSPORT/nr_sch_dmrs.c
# openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
# openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
# openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
2022-03-05 01:58:51 +00:00
luis_pereira87
bb89ae3aca
Delete duplicated prototype function (update to develop implementation)
2022-03-05 01:42:26 +00:00
francescomani
4fcbdc24a3
Merge remote-tracking branch 'origin/develop' into nr_csirs_rrc_harmonization
2022-03-04 17:50:43 +01:00
luis_pereira87
11334aa45f
Delete duplicated prototype function (update to develop implementation)
2022-03-04 14:34:26 +00:00
luis_pereira87
0d92901787
Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
2022-03-04 13:09:44 +00:00
Robert Schmidt
bc2246a566
Remove usage of MSC library after last merge
2022-03-04 09:21:02 +01:00
Robert Schmidt
807e5dd71c
Merge remote-tracking branch 'origin/NR_SA_pdu_session_modify_release' into integration_2022_wk09
2022-03-03 18:05:27 +01:00
rmagueta
7fdd7547be
Merge remote-tracking branch 'origin/develop' into develop-CSI
2022-03-02 13:14:09 +00:00
Robert Schmidt
d6dc279439
Merge remote-tracking branch 'origin/NR_UE_CSIRS_scheduling' into integration_2022_wk09
2022-03-01 18:52:33 +01:00
Melissa Elkadi
bf153a2306
Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm
2022-03-01 07:23:54 -08:00
francescomani
9e26621d4b
Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
2022-03-01 15:54:31 +01:00
francescomani
e443f75d47
Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I
2022-03-01 11:20:14 +01:00
Robert Schmidt
37e09d1ca8
Merge remote-tracking branch 'origin/NR_SA_10MHz' into integration_2022_wk09
2022-02-28 23:43:10 +01:00
matzakos
e5c6ee599c
Merge with latest updates of develop and fixes for F1
...
-Problem when parsing UE_RAT_container_list at the DU through UE context setup request
-Some debug logs added to be removed once this is fixed
2022-02-28 21:51:41 +01:00
matzakos
55d59e5f2a
Merge remote-tracking branch 'origin/repair-f1-5g' into F1C_extensions_develop
2022-02-28 14:44:01 +01:00
Robert Schmidt
6d165912f5
Merge remote-tracking branch 'origin/episys-ul-info-cleanup' into integration_2022_wk08_b
2022-02-26 16:10:03 +01:00
Melissa Elkadi
2b1cc455b0
Merge branch 'episys-ul-info-cleanup' into episys/master-sa
2022-02-24 15:48:43 -08:00
francescomani
5846a9b832
checking if csi_MeasConfig was already allocated
2022-02-24 18:51:07 +01:00
rmagueta
3eaebbca93
CSI PDU received at PHY layer in new function nr_ue_csi_rs_procedures at UE
2022-02-23 20:23:34 +00:00
Laurent THOMAS
22d2e9a38f
fix warnings and race cond in polar codec
2022-02-23 18:02:55 +01:00