maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,723 Commits 5 Branches 0 Tags
4e4a0b7ba3535c8a7e1f90706ab1c7cec97f21b1
Commit Graph
588 Commits
Author SHA1 Message Date
Robert Schmidt 0c9006ec66 Do not initialize MAC multiple times 2022-08-07 19:49:08 +02:00
Robert Schmidt f52809a8fb Add MAC-RRC UL stubs for F1AP and direct 2022-08-07 19:49:08 +02:00
Robert Schmidt a21c31a6a5 Merge remote-tracking branch 'origin/HARQ_rv_circular_array' into integration_2022_wk30b 2022-08-02 11:04:04 +02:00
francescomani 840cf403db Make max num of HARQ tx configurable per UL/DL 
Contributors
  francescomani <email@francescomani.it>
  Robert Schmidt <robert.schmidt@openairinterface.org>
 2022-08-01 16:53:43 +02:00
Roberto Louro Magueta 6ba60eb181 Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements 
# Conflicts:
#	openair2/RRC/NR/nr_rrc_config.h
 2022-07-20 19:59:34 +01:00
Roberto Louro Magueta d68f7d6270 Add help string 2022-07-05 17:50:58 +01: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
Roberto Louro Magueta 2141d6b5af Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements 
# Conflicts:
#	openair2/RRC/NR/nr_rrc_config.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band66.fr1.106PRB.usrpn300.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.24PRB.usrpb210.conf
 2022-06-27 10:24:58 +01: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
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 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
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
rmagueta 607561af6c Merge remote-tracking branch 'origin/develop' into develop-CSI-Measurements 
# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-06-13 10:32:21 +01:00
Sakthivel Velumani 1d99c8e695 LDPC iterations as command line parameter 2022-06-08 21:32:07 +05:30
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
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 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
rmagueta 264eebfb3f Fix build after merge 2022-05-27 11:54:53 +01:00
rmagueta 628a11cde5 Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements 
# Conflicts:
#	openair2/GNB_APP/MACRLC_nr_paramdef.h
#	openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
 2022-05-27 11:38:32 +01:00
rmagueta 2f3079b808 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/nr_rrc_config.c
 2022-05-27 11:13:02 +01:00
Robert Schmidt 21a820b061 Merge remote-tracking branch 'origin/support-15-kHz-SCS' into integration_2022_wk21b 2022-05-27 10:05:57 +02:00
Roberto Louro Magueta 01c6129ee1 Merge remote-tracking branch 'origin/develop' into develop-SRS-Measurements 
# Conflicts:
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-05-23 10:43:50 +01:00
Roberto Louro Magueta 9887982e00 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-05-19 13:21:00 +01:00
Robert Schmidt 34b821433b Add UL BLER options and read from config 2022-05-18 16:44:54 +02:00
Robert Schmidt 17cbc4dbf4 Generalize get_mcs_from_bler() 2022-05-18 16:44:54 +02:00
Thomas Schlichter e639e79220 Merge remote-tracking branch 'origin/develop' into support-15-kHz-SCS 2022-05-18 10:51:19 +02:00
francescomani 085014f601 Merge remote-tracking branch 'origin/develop' into NR_remove_ssb_offset_from_configfile 2022-05-18 10:25:47 +02:00
luis_pereira87 2f3ce42d3b Improve code readability in fix_scd function 2022-05-12 17:04:09 +01:00
luis_pereira87 9f51b3f8b1 Harmonize and reuse the nr_rrc_config_dl_tda function to prepare PDSCH-TimeDomainResourceAllocation list 2022-05-12 14:42:47 +01:00
Roberto Louro Magueta 08975e451f Update the ul_prbblacklist based on SRS measurements and an ul_prbblack_SNR_threshold 2022-05-10 14:03:24 +01:00
francescomani a037987b47 remove ssb subcarrier offset from config file 2022-05-09 18:28:56 +02:00
luis_pereira87 c587fe366d Improve log and cosmetic changes 2022-05-06 16:06:31 +01:00
Roberto Louro Magueta fc5632eeb9 Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
#	openair1/PHY/NR_TRANSPORT/nr_dci.c
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/GNB_APP/gnb_config.c
#	openair2/GNB_APP/gnb_paramdef.h
#	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
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/cu_gnb.conf
 2022-05-06 13:16:48 +01:00
luis_pereira87 a8e6bf9bd5 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair2/GNB_APP/gnb_config.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.h
#	openair2/RRC/NR/nr_rrc_defs.h
#	openair2/RRC/NR/nr_rrc_proto.h
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-05-06 11:29:55 +01:00
Robert Schmidt 94aeb43847 Merge remote-tracking branch 'origin/NR_RRC_processing_timer' into integration_2022_wk18 2022-05-04 12:26:01 +02:00
luis_pereira87 7597a582f9 Merge remote-tracking branch 'origin/NR_RRC_processing_timer' into Dedicated-BWPs 
# Conflicts:
#	openair2/GNB_APP/gnb_config.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_primitives.c
#	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
 2022-05-03 14:00:57 +01:00
luis_pereira87 ca06668682 Handle RRC processing time at gNB 2022-05-02 12:03:55 +01:00
rmagueta d01cd03ad3 Merge branch 'NR_RRC_processing_timer' into Dedicated-BWPs 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/RRC/NR/rrc_gNB_reconfig.c
 2022-04-30 16:40:58 +01:00
rmagueta 2ddb68754e Merge remote-tracking branch 'origin/develop' into NR_RRC_processing_timer 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
 2022-04-30 16:22:09 +01:00
rmagueta 751335765f Merge remote-tracking branch 'origin/develop-CSI' into develop-CSI-Measurements 
# Conflicts:
#	openair1/PHY/NR_ESTIMATION/nr_measurements_gNB.c
#	openair1/PHY/NR_TRANSPORT/pucch_rx.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_ulsch.c
#	openair2/RRC/NR/nr_rrc_config.c
 2022-04-30 15:52:48 +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 3ec401f2f6 Merge remote-tracking branch 'origin/develop' into tdd25period_for_MR 2022-04-28 17:26:33 +02:00
francescomani 33663e68b0 rename frame_type 2022-04-19 18:37:14 +02:00
luis_pereira87 44c0c8d321 Merge branch 'NR_RRC_processing_timer' into Dedicated-BWPs 
# Conflicts:
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
#	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
#	openair2/RRC/NR/L2_nr_interface.c
#	openair2/RRC/NR/rrc_gNB.c
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
#	targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.2x2.usrpn300.conf
 2022-04-19 12:39:28 +01:00
luis_pereira87 a39c310bd4 Merge remote-tracking branch 'origin/develop' into Dedicated-BWPs 
# Conflicts:
#	openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
#	openair2/RRC/NR/MESSAGES/asn1_msg.c
 2022-04-19 10:21:57 +01:00
luis_pereira87 0270b7b1fb Move RRC processing timer implementation from RRC to MAC 2022-04-14 15:49:29 +01:00
Raymond Knopp e721f6af04 Merge remote-tracking branch 'origin/tdd25period_for_MR' into F1_interop_ACC_n78 
Conflicts:
	openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
 2022-04-14 11:14:36 +02:00