Commit Graph
8300 Commits
Author SHA1 Message Date
rmagueta 27bac2f2c4 The RI, PMI and CQI estimated at the UE are sent by the UE and correctly received by the gNB 2022-04-13 15:33:37 +01:00
rmagueta 9b1db62f38 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 2022-04-13 10:40:58 +01:00
rmagueta a81640a6df Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
2022-04-13 10:21:09 +01:00
rmagueta 40279dddf3 Get cri_bitlen, ri_bitlen, pmi_bitlen and cqi_bitlen at UE 2022-04-13 01:07:01 +01:00
rmagueta 04b234c878 Send CSI-RS measurements from PHY to MAC at UE 2022-04-12 19:06:02 +01:00
Mario Hudon 06b637c1cf Merge branch 'develop' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_UE_thread_improvement_IDCC 2022-04-12 12:59:27 -04:00
rmagueta 1d86347587 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_TRANSPORT/nr_dci.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-04-12 14:48:08 +01:00
rmagueta d5421a9c87 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/NR_REFSIG/nr_refsig.h
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
2022-04-12 14:02:43 +01:00
Robert Schmidt 3e6e9f449c Merge remote-tracking branch 'origin/fix-develop-segvs' into integration_2022_wk15 2022-04-09 13:10:00 +02:00
Robert Schmidt 9151666960 Merge remote-tracking branch 'origin/nr_gold_init_improv' into integration_2022_wk15 2022-04-09 13:09:50 +02:00
Robert Schmidt d2053ec378 Merge remote-tracking branch 'origin/nr_csirs_rrc_harmonization' into integration_2022_wk15 2022-04-09 13:09:40 +02:00
rmagueta 3969079fcd Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
2022-04-08 19:49:40 +01:00
rmagueta 8c056ceefc Merge remote-tracking branch 'origin/develop' into develop-CSI 2022-04-08 18:19:06 +01:00
Laurent THOMAS f46240ca2b fix code review remarks 2022-04-08 18:22:38 +02:00
Robert Schmidt 6ad71e290a Comment unused function that have been introduced in this integration branch 2022-04-08 11:30:19 +02:00
Robert Schmidt 054688ade4 Merge remote-tracking branch 'origin/nr_sdap' into integration_2022_wk14 2022-04-06 23:45:07 +02:00
Robert Schmidt d8d3106baf Merge remote-tracking branch 'origin/episys-throughput-updates-and-downlink-siso-cm' into integration_2022_wk14 2022-04-06 23:44:59 +02:00
rmagueta 4ee6005a50 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-04-06 13:30:04 +01:00
rmagueta 4f29c73bb6 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-04-06 10:11:49 +01:00
Mario Hudon 147efc44e1 Merge remote-tracking branch 'oai-eurecom/develop' into NR_UE_thread_improvement_IDCC 2022-04-04 14:51:15 -04:00
luis_pereira87 29f47c49c1 Fix segmentation fault for NSA 2022-04-04 11:05:52 +01:00
Robert Schmidt ec82ddea38 Don't call calculate_preferred_dl_tda() in do-ra mode
In --do-ra mode, calculate_preferred_dl_tda() would be called without a
BWP. Then, get_searchspace() would search in the scc, leading to a
segfault. Therefore, don't call calculate_preferred_dl_tda() in do-ra
mode.
2022-04-03 19:25:14 +02:00
francescomani 03510c83b7 Merge remote-tracking branch 'origin/develop' into nr_gold_init_improv 2022-04-03 15:33:30 +02:00
rmagueta e628c8c2c4 Fix build after merge 2022-04-01 20:13:06 +01:00
rmagueta 2deec7fa09 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/GNB_APP/gnb_paramdef.h
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
2022-04-01 19:36:57 +01:00
francescomani 33d153f132 Merge remote-tracking branch 'origin/develop' into nr_csirs_rrc_harmonization 2022-04-01 19:42:28 +02:00
Robert Schmidt 5d63a756e6 Merge remote-tracking branch 'origin/fix-initialBWP-procedures' into integration_2022_wk13b 2022-04-01 18:40:30 +02:00
rmagueta 25614263ba Fix build after merge 2022-04-01 16:15:58 +01:00
athanassopoulos cf30f61e65 Changes to SDAP code
1. Removed SDAP struct from protocol context.
2. Added configuration for the SDAP.
3. SDAP doesn't use pdcp_entities, the values come from function arguements.
4. Make nr_pdcp_ue_manager accessible from SDAP.
5. Avoid using the PDCP locking mechanism in SDAP.
6. Removed nr_pdcp_find_entity_sdap function.
7. Rename dummy eNB function to make GTP compile (no SDAP).
8. Fix: Regression issues with LTE
9. Fix: Regression issues with NR CU/DU
2022-04-01 17:04:08 +02:00
rmagueta c83df1b677 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	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
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-04-01 15:56:47 +01:00
Robert Schmidt 30f14c7e55 Rename dummy eNB function to make GTP compile in 4G (no SDAP) 2022-04-01 13:35:40 +02:00
athanassopoulos a826af5839 SDAP Initial Implementation 2022-04-01 13:35:40 +02:00
Robert Schmidt 8eb22e7262 Remove duplicate statements 2022-04-01 11:44:33 +02:00
rmagueta da1e542a31 Fix dl_antenna_ports after merge 2022-03-30 20:14:57 +01:00
rmagueta 4c0427ea6c Merge remote-tracking branch 'origin/nr_mimo_precoding_codebook_I' into develop-CSI-Measurements
# Conflicts:
#	openair1/PHY/INIT/nr_init_ue.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/GNB_APP/gnb_paramdef.h
#	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
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-03-30 19:23:22 +01:00
Raphael Defosseux 426ded6e31 fix(build): fix warnings on circular dependency
Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
2022-03-30 16:42:12 +02:00
Melissa Elkadi 8e90e7415a Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm 2022-03-29 13:41:35 -07:00
Robert Schmidt 69fcab9243 Merge remote-tracking branch 'origin/nr_mimo_precoding_codebook_I' into integration_2022_wk13 2022-03-29 22:09:34 +02:00
francescomani 6e48ec9266 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-28 18:32:59 +02:00
Robert Schmidt ab654ac15c Merge remote-tracking branch 'origin/force-256qam-off' into integration_2022_wk13 2022-03-28 17:48:22 +02:00
rmagueta 1d1aaa30e7 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-03-28 15:06:23 +01:00
rmagueta 181e576698 Fix warning after merge 2022-03-28 13:53:35 +01:00
rmagueta 0abcf3d9c4 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair1/PHY/INIT/nr_init_ue.c
#	openair1/PHY/NR_REFSIG/nr_gold.c
#	openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
#	openair1/PHY/defs_nr_common.h
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2022-03-28 13:32:46 +01:00
rmagueta a020c51772 Fix warning after merge 2022-03-28 10:31:50 +01:00
rmagueta 495b3f39c5 Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
2022-03-28 10:12:29 +01:00
Mario Hudon 9ee29c5bfc Merge remote-tracking branch 'oai-eurecom/develop' into NR_UE_thread_improvement_IDCC 2022-03-25 09:53:00 -04:00
Robert Schmidt bf58c6b475 Merge remote-tracking branch 'origin/fix_rballoc_mask_type' into integration_2022_wk12_a 2022-03-25 08:29:52 +01:00
luis_pereira87 ed4cc7c257 Fix segmentation fault when using CU-DU split 2022-03-24 15:37:26 +00:00
luis_pereira87 9a884af00a Fix rballoc_mask variable type from uint8_t to uint16_t 2022-03-24 14:19:02 +00:00
Robert Schmidt 7684803c64 Merge remote-tracking branch 'origin/nr-lc-sched' into integration_2022_wk12_a 2022-03-24 11:34:26 +01:00