Commit Graph
327 Commits
Author SHA1 Message Date
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
Thomas Schlichter e639e79220 Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS 2022-05-18 10:51:19 +02:00
Roberto Louro Magueta 8ac68929bc Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair1/PHY/defs_nr_common.h
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.162PRB.2x2.usrpn300.conf
2022-05-17 19:13:38 +01:00
Roberto Louro Magueta 5c754f2300 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
2022-05-11 14:19:33 +01:00
Roberto Louro Magueta 4c1b432718 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4
# Conflicts:
#	openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_coding.c
2022-05-11 13:45:56 +01:00
rmagueta 4b3aa7233e Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
2022-04-30 15:14:20 +01:00
Thomas Schlichter 7815293443 Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS 2022-04-29 10:15:15 +02:00
francescomani 3547940e3f Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM 2022-04-28 14:26:24 +02:00
francescomani d05f2b3add Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-04-28 11:54:51 +02:00
Robert Schmidt 48cb251044 Merge remote-tracking branch 'origin/NR_SR_fixes' into integration_2022_wk17 2022-04-26 16:29:25 +02:00
Robert Schmidt 28c3205f22 Merge remote-tracking branch 'origin/fix-rfsim-ue4G-sync' into integration_2022_wk17
Conflicts:
	targets/ARCH/rfsimulator/simulator.c
2022-04-26 15:16:09 +02:00
francescomani 815a15e544 fixes for SR in pucch0 2022-04-14 17:43:02 +02:00
rmagueta d6072cb5d2 Fix build after merge 2022-04-12 14:31:39 +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
francescomani 02b66061b1 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-04-12 10:14:21 +02:00
francescomani 8927c648d4 Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM 2022-04-12 09:55:57 +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
rmagueta 8c056ceefc Merge remote-tracking branch 'origin/develop' into develop-CSI 2022-04-08 18:19:06 +01:00
francescomani 680c605e32 Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM 2022-04-08 17:02:35 +02:00
francescomani 1ab64d26aa Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-04-08 16:50:02 +02:00
Sakthivel Velumani 2c23b28ba6 Merge branch 'develop' into ldpc-decoder-memory 2022-04-05 16:02:35 +05:30
francescomani ed9c35a170 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-04-03 16:20:59 +02:00
francescomani 03510c83b7 Merge remote-tracking branch 'origin/develop' into nr_gold_init_improv 2022-04-03 15:33:30 +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
Thomas Schlichter 729cf143e0 Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS 2022-04-01 10:28:11 +02:00
rmagueta 139a33d644 Remove multiple nr_gold_csi_rs initializations 2022-03-28 14:36:01 +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
Laurent THOMAS c0568a997a fix bugs, delete dead code 2022-03-28 12:05:18 +02:00
francescomani 65d0318504 using tbslbrm at mac also for ulsch as in scf spec 2022-03-25 17:52:44 +01:00
Sakthivel Velumani f305b486dd Merge branch 'develop' into ldpc-decoder-memory 2022-03-24 17:02:46 +05:30
francescomani 8fbe727b32 Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM 2022-03-24 12:31:38 +01:00
Thomas Schlichter 88c0028757 Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS 2022-03-24 11:39:22 +01:00
francescomani af0f4a08ea Merge remote-tracking branch 'origin/develop' into nr_gold_init_improv 2022-03-23 11:02:34 +01:00
francescomani fb118a76a8 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-03-22 13:21:43 +01:00
francescomani 12f9dd95eb Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-22 09:44:40 +01:00
francescomani eefc779817 Merge remote-tracking branch 'origin/develop' into nr_gold_init_improv 2022-03-17 18:33:45 +01:00
Thomas Schlichter d104ef73b7 gNB: fix memory allocations for PUSCH in phy_init_nr_gNB() 2022-03-14 16:39:17 +01:00
Thomas Schlichter 9e90b8f22c remove unneeded global arrays ul_ch_ptrs_estimates, ul_ch_ptrs_estimates_ext, dl_ch_ptrs_estimates and dl_ch_ptrs_estimates_ext 2022-03-14 16:39:17 +01:00
Sakthivel Velumani 91426a08bd Merge branch 'develop' into ldpc-decoder-memory 2022-03-11 12:39:26 +05:30
francescomani 06d488bb23 ulsch memory optimization 2022-03-09 17:35:38 +01:00
francescomani deee2a9ca1 Merge remote-tracking branch 'origin/develop' into NR_MIMO_memory 2022-03-08 09:16:18 +01:00
rmagueta bbe806a870 Merge remote-tracking branch 'origin/develop' into develop-CSI
# Conflicts:
#	openair1/SIMULATION/NR_PHY/dlsim.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	openair2/RRC/NR/nr_rrc_config.c
#	openair2/RRC/NR/nr_rrc_config.h
#	openair2/RRC/NR/rrc_gNB.c
#	openair2/RRC/NR/rrc_gNB_nsa.c
2022-03-07 13:10:40 +00:00
francescomani b8935b7761 Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-03-07 10:37:48 +01:00
francescomani 8dfc5d59b4 Merge remote-tracking branch 'origin/develop' into nr_mimo_precoding_codebook_I 2022-03-07 09:26:08 +01:00
Robert Schmidt cadbf67f67 Merge remote-tracking branch 'origin/tx-thread-stats-fix' into integration_2022_wk09_b 2022-03-05 13:34:15 +01:00
francescomani c36c8ccae0 addressing additional review and some wrong allocation 2022-03-02 18:54:35 +01:00
rmagueta 6c27a40f09 Creation of nr_csi_rs_info_t 2022-03-02 16:30:54 +00:00
francescomani eec513ab4f Merge remote-tracking branch 'origin/develop' into NR_DL_TBSLBRM 2022-03-01 16:05:30 +01:00
francescomani 9e26621d4b Merge remote-tracking branch 'origin/develop' into bupt-ulmimo-4 2022-03-01 15:54:31 +01:00
francescomani 43ea92bf8f Merge remote-tracking branch 'origin/develop' into NR_MIMO_memory 2022-03-01 15:08:30 +01:00