maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,547 Commits 5 Branches 0 Tags
5427ec25b6e292dab97185b207e4f07d4d566b57
Commit Graph
2932 Commits
Author SHA1 Message Date
francescomani 5427ec25b6 applying config_srs to all the instances 2022-07-25 15:24:58 +02:00
francescomani 56e73266cb Merge remote-tracking branch 'origin/develop' into NR_RRC_harmonization_after_BWP 2022-07-25 15:02:38 +02:00
luis_pereira87 b1a3cbb068 Fix segmentation fault when changing BWP 2022-07-20 12:55:17 +01:00
Robert Schmidt bc3600a3f9 Merge remote-tracking branch 'origin/f1-undefined' into integration_2022_wk29 2022-07-19 18:12:48 +02:00
Robert Schmidt fcb07ef5fd Merge remote-tracking branch 'origin/NR_SSB_fix' into integration_2022_wk29 2022-07-19 18:12:40 +02:00
Robert Schmidt 04251d5b06 Correctly initialize protocol_ctxt in F1 code 
In the previous version, not all fields, and in particular the
`eNB_index`, were not initialized, leading to errors when they were used
(e.g., the PDCP code checks that eNB_index == 0).
 2022-07-18 17:39:55 +02:00
francescomani 79586c03f4 fix for pointa and ssboffset 2022-07-07 08:57:37 +02:00
Roberto Louro Magueta 53f0773624 Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements 2022-07-05 11:07:43 +01:00
francescomani 38dc925e75 temporary workaround for CQI MCS table 2022-06-29 16:06:58 +02:00
francescomani f76ec13b89 some fixes 2022-06-28 15:47:18 +02:00
Robert Schmidt ff5ec94d33 Address review: drop bool defines 2022-06-28 09:38:48 +02:00
francescomani 0196dd6dc2 Merge remote-tracking branch 'origin/develop' into NR_RRC_harmonization_after_BWP 2022-06-27 14:44:04 +02:00
Roberto Louro Magueta 86755bc495 Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements 
# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-06-27 11:06:55 +01:00
Robert Schmidt 0b91791f67 Use (std) bool instead of custom bool types 
OAI is riddled with boolean_t, FALSE, TRUE, etc. This makes no sense, as
there is a standard bool type, and could lead to nasty bugs if a
definition of a bool is non-standard (0 == false, true == !false). This
commit removes all non-standard bools in the whole project.
 2022-06-27 10:07:48 +02:00
luis_pereira87 a9faf533b4 Fix SA with COTS UE in monolithic mode after merge 2022-06-24 14:51:38 +01:00
Robert Schmidt 0e04fba03d Fix build warnings 2022-06-23 16:18:50 +02:00
Robert Schmidt b37050ac6e Merge remote-tracking branch 'origin/F1_interop_ACC_n78' into integration_2022_wk25 2022-06-23 14:09:33 +02:00
Robert Schmidt 644422ebec Merge remote-tracking branch 'origin/NR_PUCCH_RRC_Resources' into integration_2022_wk25 2022-06-22 17:20:38 +02:00
Cedric Roux d0fa56b1de compilation fix 2022-06-20 15:15:11 +02:00
francescomani a4e2c2b799 addressing review 2022-06-20 11:58:06 +02:00
francescomani fb6fa64bc7 Merge remote-tracking branch 'origin/develop' into NR_remove_ssb_offset_from_configfile 2022-06-20 09:33:50 +02:00
Cedric Roux 5cd674483b Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78 2022-06-19 18:41:27 +02:00
Roberto Louro Magueta 8fee72e81f Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements 2022-06-19 02:16:41 +01:00
Robert Schmidt 9ff4630071 Merge remote-tracking branch 'origin/NR_RRC_MAC_CellGroup' into integration_2022_wk24 2022-06-17 12:11:37 +02:00
Robert Schmidt 2399da33cb Merge remote-tracking branch 'origin/csi-multi-ues-fix' into integration_2022_wk24 2022-06-16 22:26:00 +02:00
Roberto Louro Magueta f6cbde5343 Add const qualifier in some variables 2022-06-16 12:49:13 +01:00
Roberto Louro Magueta 7f21567f83 Merge remote-tracking branch 'origin/develop' into 5g-nr-low-snr-performance 
# Conflicts:
#	cmake_targets/autotests/test_case_list.xml
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
 2022-06-15 11:17:06 +01:00
Cedric Roux 2521e46593 Merge remote-tracking branch 'origin/F1C_extensions_develop' into F1_interop_ACC_n78 
Conflicts:
	openair2/F1AP/f1ap_du_interface_management.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.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/rrc_gNB.c
	openair3/ocp-gtpu/gtp_itf.cpp
 2022-06-15 11:28:37 +02:00
Karim Boutiba 079ad360e0 solve the conflict between cri-RSRP and cri-RI-PMI-CQI in the case of multiple UEs 2022-06-14 13:38:12 +00:00
luis_pereira87 ed74875025 Call rrc_mac_config_req_gNB function only when running nr-softmodem as a DU or in monolithic mode 2022-06-14 11:29:56 +01:00
Cedric Roux 1ad8f254c2 Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78 2022-06-13 16:59:59 +02:00
rmagueta 7b770042ad Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/main.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-06-13 12:00:11 +01:00
francescomani 045de837ab Merge remote-tracking branch 'origin/develop' into NR_PUCCH_RRC_Resources 2022-06-13 10:25:05 +02:00
luis_pereira87 131db89dfc Merge remote-tracking branch 'origin/develop' into NR_RRC_MAC_CellGroup 
# Conflicts:
#	openair1/PHY/INIT/nr_init.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
 2022-06-13 08:19:39 +01:00
Robert Schmidt b193ccf6ee Merge remote-tracking branch 'origin/develop' into 5g-nr-low-snr-performance 2022-06-10 13:50:47 +02:00
luis_pereira87 e7a491415c Improvements on RRC passing CellGroup to MAC to get COTS UE working 2022-06-09 10:08:28 +01:00
francescomani 0aec0d91c6 temporary workaround for RRC passing CG to MAC (forced encoding of message at MAC) 2022-06-09 09:35:42 +01:00
Robert Schmidt 894c45eae5 Add comment to fix fill_mastercellGroupConfig() 2022-06-09 10:20:39 +02:00
Roberto Louro Magueta 8c577ff253 Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements 
# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
 2022-06-09 00:56:55 +01:00
Robert Schmidt 12c0f52fea Merge remote-tracking branch 'origin/develop' into F1_interop_ACC_n78 2022-06-08 19:45:17 +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 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 4ffef42472 Merge remote-tracking branch 'origin/develop' into NR_coreset_harmonization 2022-06-08 13:39:39 +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 6e7160ac03 Merge remote-tracking branch 'origin/multiple_pdu_MR' into integration_2022_wk22 2022-06-04 10:08:10 +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 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