Commit Graph
9284 Commits
Author SHA1 Message Date
francescomani 85b48193d4 fix msg3 retransmissions with OAI UE 2022-06-08 16:45:30 +02:00
Cedric Roux f71766c3ee Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78
Conflicts:
	openair2/F1AP/f1ap_du_ue_context_management.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/RRC/NR/MESSAGES/asn1_msg.h
	openair2/RRC/NR/rrc_gNB.c
	openair3/ocp-gtpu/gtp_itf.cpp

There were some important conflicts in openair3/ocp-gtpu/gtp_itf.cpp
I rewrote a bit the function Gtpv1uHandleGpdu(). It might have been
done wrongly.
To be tested and fixed if needed.

To redo the merge, if needed:
git checkout 9b2a163ebb
git merge 5ea828e149
2022-06-08 15:48:24 +02:00
francescomani e24edde2fd remove commented code 2022-06-08 15:09:53 +02:00
francescomani bc1227f9a0 Merge remote-tracking branch 'origin/develop' into NR_remove_ssb_offset_from_configfile 2022-06-08 14:52:47 +02:00
francescomani 539e5e89f3 Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources 2022-06-08 14:45:33 +02:00
francescomani 9f4153b55b Merge remote-tracking branch 'origin/develop' into NR_UE_multi_SSB_meas 2022-06-08 14:10:54 +02:00
francescomani 4ffef42472 Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization 2022-06-08 13:39:39 +02:00
Roberto Louro Magueta fa94c338a8 Updates in FAPI so in the future to be able to have a TPMI on MAC at gNB based on SRS 2022-06-08 11:37:03 +01:00
francescomani 6c69393eda genericParameters in the new structure 2022-06-08 12:22:16 +02:00
Robert Schmidt b1d07fb3e0 print_meas_log(): do not write beyond memory end 2022-06-07 17:41:21 +02:00
francescomani 4d4f7dd616 initial commit for MAC UE BWP structure (bwp id) 2022-06-07 12:11:37 +02:00
francescomani 0b55910c48 possible fix in type setting of Y for coreset 2022-06-06 16:40:09 +02:00
francescomani b5583d47de temporary workaround for RRC passing CG to MAC (forced encoding of message at MAC) 2022-06-06 11:52:12 +02:00
Robert Schmidt 5f37ab35b4 Merge remote-tracking branch 'origin/develop-CSI' into integration_2022_wk22 2022-06-04 10:08:38 +02:00
Robert Schmidt 4e34462488 Merge remote-tracking branch 'origin/preambleTransMax_CE_rel13-in-configuration' into integration_2022_wk22 2022-06-04 10:08:31 +02:00
Robert Schmidt 7b3191d1a6 Merge remote-tracking branch 'origin/NR_SS0_config_fix' into integration_2022_wk22 2022-06-04 10:08:25 +02:00
Robert Schmidt 6e7160ac03 Merge remote-tracking branch 'origin/multiple_pdu_MR' into integration_2022_wk22 2022-06-04 10:08:10 +02:00
Robert Schmidt bea2ec5c3b Use snprintf() in dump_mac_stats() 2022-06-04 09:33:18 +02:00
Robert Schmidt f8f20827e9 Rename DL&UL scheduling timing stats 2022-06-04 09:32:00 +02:00
Robert Schmidt 59e10dc8da Clean up MAC stats: don't show timing stats in console log, only file 2022-06-04 09:31:54 +02:00
Melissa Elkadi cc2c3b9123 Adding required LOG_As for EpiSci CI testing. (Proxy)
In commit 05c07c401f,
four of the LOG_A logs were demoted. These are required
for the L2 simulator proxy CI testbed.
2022-06-03 16:40:46 -07:00
Robert Schmidt 43701ddbd6 Phy-test scheduler: update MCS so it is shown in logs 2022-06-03 17:11:05 +02:00
Roberto Louro Magueta 0a496f44c4 Add comment about 3GPP TS 38.133 - Section 8 - Table 8.2.1.2.7-2 2022-06-02 19:41:53 +01:00
Roberto Louro Magueta 319bef7c87 Use UE capability to select the the number of SRS ports 2022-06-02 19:28:48 +01:00
KARIM BOUTIBA cd4bc84bd8 small fix in nr_sdap_get_entity 2022-06-02 08:05:21 +00:00
Roberto Louro Magueta 17ed513a60 Fix after merge 2022-06-01 19:09:22 +01:00
Roberto Louro Magueta c0a1c0d11d Merge remote-tracking branch 'origin/develop-SRS-MIMO' into develop-SRS-feedback 2022-06-01 17:54:18 +01:00
Roberto Louro Magueta b8f68c81fb Merge remote-tracking branch 'origin/develop-SRS-Measurements' into develop-SRS-MIMO 2022-06-01 17:30:33 +01:00
Roberto Louro Magueta 616927c04d Fixes after merge 2022-06-01 17:22:59 +01:00
francescomani b96df49e15 postpone initialization of UL_tti_req_ahead to when sl_ahead is available 2022-06-01 17:09:08 +02:00
Roberto Louro Magueta 1bb0ce90cc Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_srs.c
#	openair2/LAYER2/NR_MAC_gNB/main.c
2022-06-01 15:46:37 +01:00
Roberto Louro Magueta 91189bd4f8 Fixes after merge 2022-06-01 14:30:45 +01:00
Roberto Louro Magueta 98f5478f7d Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	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-06-01 12:29:34 +01:00
francescomani a531342054 update ss and coreset after updating bwp 2022-06-01 12:35:31 +02:00
Roberto Louro Magueta 2c3eb996a4 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/config.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
2022-06-01 11:06:49 +01:00
francescomani 9a43678ed0 Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources 2022-06-01 09:06:57 +02:00
francescomani 13ed1200b4 Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization 2022-06-01 08:45:35 +02:00
Roberto Louro Magueta 8759eae05e Fix in get_pusch_nb_antenna_ports 2022-05-31 17:44:18 +01:00
Francesco Mani 426bc2f088 fix in get_ul_tda call for rtx 2022-05-31 09:36:39 +00:00
Roberto Louro Magueta d6e960e4d7 Implementation of tables and get values to precoding information 2022-05-30 20:50:00 +01:00
Roberto Louro Magueta 762eba239e Implementation of tables and get values to SRS resource indicator 2022-05-30 15:28:03 +01:00
Raymond Knopp 83d40a9b7c Add missing parameter preambleTransMax_CE_rel13
To SIB2 and its passing to RRC. Parameter was read but not transfered
before. Basic LTE-M functionality should ok on develop branch with this
fix. Tested with uBlox SARA-R4 (QCOM chipset)
2022-05-30 16:19:35 +02:00
Robert Schmidt df8f632ae3 Make sched_csirs common to all UEs 2022-05-30 14:52:50 +02:00
Robert Schmidt 23c8336a37 Fix warning 2022-05-30 14:50:55 +02:00
Robert Schmidt ac9e47ba68 Merge remote-tracking branch 'origin/cleanup-2022-mai-UEid-management' into integration_2022_wk21b 2022-05-30 12:02:58 +02:00
Laurent THOMAS 16e8154d71 Handle full UL TTI Req list more gracefully 2022-05-28 16:44:50 +02:00
Laurent THOMAS 9ba33d4dec Correctly format code to avoid warnings/ambiguities 2022-05-28 16:44:49 +02:00
Robert Schmidt b6adb32989 Delete commented code 2022-05-28 16:37:47 +02:00
Laurent THOMAS 236f7d56e5 Remove UEid in the MAC
After this commit, only the RNTI is used as an identifier in the MAC.
Further, it removes some module_id, but a lot of them remain (the goal
to remove all is still far from us)
2022-05-28 16:37:26 +02:00
rmagueta 82ef4b3dfc Merge remote-tracking branch 'origin/develop-SRS-MIMO' into develop-SRS-feedback 2022-05-27 12:04:35 +01:00