Commit Graph
5253 Commits
Author SHA1 Message Date
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 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 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 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
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
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
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
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
Melissa Elkadi 8e90e7415a Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm 2022-03-29 13:41:35 -07:00
francescomani 6e48ec9266 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-28 18:32:59 +02: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
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
francescomani af0f4a08ea Merge remote-tracking branch 'origin/develop' into nr_gold_init_improv 2022-03-23 11:02:34 +01:00
Melissa Elkadi 0df18854fc Merge branch 'eurecom-develop' into episys-throughput-updates-and-downlink-siso-cm 2022-03-22 11:52:34 -07:00
francescomani 12f9dd95eb Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-22 09:44:40 +01:00
luis_pereira87 eb8e4b4999 Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
2022-03-22 05:47:56 +00:00
rmagueta 199680d24d Address reviewer comments 2022-03-21 17:37:29 +00:00
Robert Schmidt 937f593028 Merge remote-tracking branch 'origin/develop' into episys-throughput-updates-and-downlink-siso-cm 2022-03-21 13:36:38 +01:00
rmagueta f0f8acb06a Merge remote-tracking branch 'origin/develop' into fix-initialBWP-procedures
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
2022-03-21 10:10:21 +00:00
Robert Schmidt d3b80b4785 Merge remote-tracking branch 'origin/nr-ue-fixes' into integration_2022_wk11 2022-03-18 16:48:43 +01:00
francescomani 256a00af77 default SIB TDA = 1 (and chech to avoid csi-rs overlapping) 2022-03-18 11:10:21 +01:00
Melissa Elkadi 91d42fd5ec Fixing memory leaks and hoping to fix num_dci_option bug 2022-03-17 12:44:30 -07:00
luis_pereira87 f439095c6e Fix bug after merge 2022-03-17 18:19:42 +00:00
francescomani eefc779817 Merge remote-tracking branch 'origin/develop' into nr_gold_init_improv 2022-03-17 18:33:45 +01:00
Robert Schmidt b1eaa6606b Merge remote-tracking branch 'origin/NR_MIMO_memory' into integration_2022_wk11 2022-03-17 17:45:00 +01:00
francescomani 8ef72fb939 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-17 07:51:35 +01:00
rmagueta b59b84e904 Merge remote-tracking branch 'origin/develop' into develop-CSI 2022-03-17 01:03:35 +00:00
Robert Schmidt 7cbca077e0 Merge remote-tracking branch 'origin/NR_UL_VRB_MAP_improv' into integration_2022_wk11 2022-03-16 23:26:59 +01:00
luis_pereira87 9b737d0985 Move ternary operators to outside of functions input parameters 2022-03-14 11:48:09 +00:00
Robert Schmidt 0c5242ea85 Apply review comment 2022-03-11 11:36:07 +00:00
francescomani 48cd851cab SA SR bugfix 2022-03-10 18:31:46 +01:00
francescomani e7508533b6 review fix 2022-03-09 14:57:26 +01:00
Melissa Elkadi d1cd5b771b Clean up to nFAPI and error checking UL_TTI_REQ n_pdus
We seprarated out the large if block in the push/pull
of the UL_TTI_REQ fields to make it easier to read
and debug. Furthermore, we add in AsserFatals before
indexing in UL_TTI_REQ PDU list to ensure we are not
indexing past the end of the array.
2022-03-08 07:47:44 -08:00
rmagueta db0ce84aa5 Fix FAPI for CSI-RS pdu and associated procedures 2022-03-08 13:18:17 +00:00