Commit Graph
319 Commits
Author SHA1 Message Date
hardy c834ea5899 Merge remote-tracking branch 'origin/NR_min_channel_bw_for_type0_pdcch' into integration_2021_wk42_b 2021-10-22 14:35:49 +02:00
francescomani a8d2265a9d Merge remote-tracking branch 'origin/develop' into NR_cleanup_MACPHY 2021-10-20 15:50:18 +02:00
francescomani 652d0f57eb improve sib1 code for aggregation levels 2021-10-06 16:45:46 +02:00
francescomani 169d286919 some more lines of cleanup 2021-09-29 16:04:48 +02:00
francescomani 773d55f422 some cleanup of MAC and PHY cross compilation 2021-09-27 17:29:17 +02:00
francescomani 55c5d758a5 removing hardcoding of min bw size for type0 pdcch 2021-09-16 17:45:56 +02:00
Eurecom 18e51299aa minor changes for testing 2021-09-10 16:51:50 +02:00
Eurecom efed5abbfe commit before merge with develop 2021-09-04 22:42:32 +02:00
Eurecom bafd82a935 Merge remote-tracking branch 'origin/NR_UE_SA' into bandwidth-testing
Conflicts:
	executables/nr-ru.c
	openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
	openair1/SCHED_NR/phy_procedures_nr_gNB.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/RRC/NR/MESSAGES/asn1_msg.c
	openair2/RRC/NR/nr_rrc_proto.h
	openair2/RRC/NR/rrc_gNB.c
	openair2/RRC/NR/rrc_gNB_reconfig.c
2021-08-21 07:48:04 +02:00
Eurecom f41890b3f5 testing in SA, initialBWP 2021-08-20 14:17:37 +02:00
Eurecom dc92538744 DCI formats 1_1/0_1 on initialBWP 2021-08-17 13:44:50 +02:00
Eurecom 2d5e095120 testing on another machine. 2021-08-13 21:47:21 +02:00
francescomani e083bd4330 Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-08-13 15:09:52 +02:00
Raphael Defosseux 5f9e0a235d Merge remote-tracking branch 'origin/code-cleanup-20210716' into integration_2021_w32 2021-08-09 10:07:45 +02:00
Eurecom 969a7a08fe Merge remote-tracking branch 'origin/develop' into bandwidth-testing
Conflicts:
	openair2/GNB_APP/MACRLC_nr_paramdef.h
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
2021-08-04 12:09:42 +02:00
francescomani 5c70aa96c4 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-26 07:39:57 +02:00
francescomani ef84130e7c Merge remote-tracking branch 'origin/develop' into NR_UE_SA 2021-07-23 16:01:43 +02:00
magounaki d1dec5ed0e for testing with another machine. 2021-07-23 15:53:49 +02:00
francescomani bd816e5175 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-23 13:51:41 +02:00
Laurent OpenCells f62b7e1f9e nfapi work around (missing malloc) 2021-07-22 15:32:09 +02:00
francescomani 227529c129 Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-21 17:49:33 +02:00
Laurent OpenCells 3f436e3e2f merge develop (was in conflict) 2021-07-20 17:26:15 +02:00
rmagueta 3ea6d6f878 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS-abs
# Conflicts:
#	openair1/PHY/INIT/nr_init_ru.c
2021-07-19 13:51:38 +01:00
Eurecom 6eea5b9cba testing ok for 40,50,60 MHz BW. 2021-07-18 15:31:09 +02:00
Eurecom 3c303223f0 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into bandwidth-testing
Conflicts:
	openair1/PHY/LTE_TRANSPORT/if5_tools.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
	openair2/LAYER2/nr_rlc/nr_rlc_oai_api.c
	openair2/RRC/NR/rrc_gNB_reconfig.c
2021-07-18 09:16:14 +02:00
Laurent OpenCells 78da843624 code-cleanup-20210716 2021-07-16 17:16:15 +02:00
francescomani 2fe8dd7657 Merge remote-tracking branch 'origin/develop-NR_SA_F1AP_5GRECORDS-abs' into NR_UE_SA 2021-07-14 10:35:09 +02:00
rmagueta b98836940a Change log levels 2021-07-13 12:00:25 +01:00
Eurecom 8c482709dc changes for initialBWP size different than Coreset0. Tested with 50 MHz 2x2 configuration, initialBWP with 133 PRBs. 2021-07-11 19:42:01 +02:00
francescomani 72fc7bfafc Revert "RSRP tables in mac common"
This reverts commit b38cc83233.
2021-07-05 18:05:26 +02:00
francescomani 19c356ee23 first implementation of MAC function for SSB RSRP (to be verified) 2021-07-05 18:00:44 +02:00
Thomas Schlichter c3482e376d Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer 2021-07-05 16:25:26 +02:00
francescomani b38cc83233 RSRP tables in mac common 2021-07-05 15:43:05 +02:00
francescomani cb0de3ba03 csi period and offset in mac common 2021-07-02 17:29:23 +02:00
francescomani a49ebe249b Merge remote-tracking branch 'origin/develop' into NR_UE_reworking_UCI_procedures 2021-07-01 16:38:41 +02:00
rmagueta 160cb0b930 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into develop-NR_SA_F1AP_5GRECORDS-lts2
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	cmake_targets/build_oai
#	cmake_targets/tools/build_helper
#	executables/nr-gnb.c
#	openair1/PHY/INIT/nr_init_ru.c
#	openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
#	openair2/F1AP/f1ap_du_rrc_message_transfer.c
#	openair2/F1AP/f1ap_du_rrc_message_transfer.h
#	openair2/F1AP/f1ap_du_task.c
#	openair2/GNB_APP/gnb_app.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.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_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_entity.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
#	openair2/RRC/LTE/rrc_eNB_GTPV1U.c
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_NGAP.c
#	openair2/RRC/NR_UE/rrc_UE.c
#	openair3/NAS/NR_UE/nr_nas_msg_sim.c
#	openair3/ocp-gtpu/gtp_itf.cpp
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
2021-06-30 17:00:30 +01:00
Laurent THOMAS aef67d0310 fix merge NR_SA_F1AP_5GRECORDS and fix warnings, a regression in UE (LCID lopp) 2021-06-21 21:01:59 +02:00
francescomani 2ffceb333c function for SR periodicity in mac common 2021-05-21 18:19:16 +02:00
francescomani f84d6767c3 Merge remote-tracking branch 'origin/NR_SA_F1AP_5GRECORDS' into NR_UE_SA 2021-05-20 16:13:46 +02:00
Thomas Schlichter ff5eb3e657 Merge remote-tracking branch 'origin/develop' into nr-dl-mimo-2layer 2021-05-19 11:42:04 +00:00
francescomani cd9a8f963f moving pucch functions for harq at MAC (version still to be tested) 2021-05-18 11:04:10 +02:00
rmagueta cf605f4c77 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	cmake_targets/CMakeLists.txt
#	cmake_targets/build_oai
#	openair1/PHY/INIT/nr_init_ru.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch.c
#	openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
#	openair1/SCHED_NR/phy_procedures_nr_gNB.c
#	openair1/SIMULATION/NR_PHY/ulsim.c
#	openair2/COMMON/platform_constants.h
#	openair2/ENB_APP/enb_config.c
#	openair2/F1AP/f1ap_cu_interface_management.c
#	openair2/F1AP/f1ap_cu_rrc_message_transfer.c
#	openair2/F1AP/f1ap_cu_ue_context_management.c
#	openair2/F1AP/f1ap_du_interface_management.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/RRC/LTE/rrc_eNB.c
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR_UE/rrc_UE.c
2021-05-17 01:36:39 +01:00
rmagueta 0ef6ef2b28 Code format improvements in differences for develop 2021-05-12 19:29:10 +01:00
hardy 681beefd76 Merge remote-tracking branch 'origin/nr-dmrs-fixes' into integration_2021_wk19 2021-05-10 21:41:44 +02:00
Thomas Schlichter 4db9c78450 fix PDSCH DMRS configuration type 2 2021-05-06 20:27:56 +02:00
francescomani 5bacfb4015 another attempt at fixing FR2 RA 2021-05-06 15:32:23 +02:00
francescomani 4a00aa25ef improvements in pdsch allocation for sib1 2021-04-30 18:56:43 +02:00
rmagueta 0a3f128e27 Merge remote-tracking branch 'origin/develop' into develop-NR_SA_F1AP_5GRECORDS
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_dci_configuration.c
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/LAYER2/NR_MAC_gNB/config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_bch.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_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
#	openair2/RRC/LTE/rrc_eNB_GTPV1U.c
2021-04-27 15:46:18 +01:00
Raymond Knopp d88ce5b9bf Merge remote-tracking branch 'origin/develop' into oairu 2021-04-27 11:58:31 +02:00
Thomas Schlichter 0da9ec9cfb Merge remote-tracking branch 'origin/develop' into nr-dmrs-fixes 2021-04-27 10:27:31 +02:00