Skip to content
Snippets Groups Projects
Commit 97cd2105 authored by knopp's avatar knopp
Browse files

Merge remote-tracking branch 'origin/develop-nr' into nr_prach 

Conflicts:
	cmake_targets/build_oai
	executables/nr-gnb.c
	openair1/PHY/INIT/nr_init.c
	openair1/PHY/defs_gNB.h
	openair1/SCHED_NR/fapi_nr_l1.c
	openair2/LAYER2/NR_MAC_gNB/config.c
	openair2/LAYER2/NR_MAC_gNB/mac_proto.h
	openair2/RRC/NR/rrc_gNB.c
parents 1f228ee4 e6792d75
No related branches found
No related tags found
8 merge requests!1757Draft: Use pMAX value in configuration file, instead of hardcoded '23' in asn1_msg.c,!1493fix DL arq errors in UE,!1093Issue in generating NR PRACH for High Speed case,!1074PBCH test case support for non-zero bchpyload,!918Develop nfapi,!847Nr vcd,!774Nr rrc configuration merge develop,!738Nr rrc configuration
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 338 additions and 281 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment