maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'NR_RRC_harq_hacks' of https://gitlab.eurecom.fr/oai/openairinterface5g into NR_RRC_harq_hacks

Browse Source 
Conflicts:
	openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
This commit is contained in:
Raymond Knopp
2020-05-26 16:39:50 +02:00
parent 0a45909bd1 c042f7c26a
commit dad2d8bce7
7 changed files with 28 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair1/SIMULATION/NR_PHY/prachsim.c
+5 -4
View File
@@ -89,7 +89,7 @@ int main(int argc, char **argv){
int i, aa, aarx, **txdata, trial, n_frames = 1, prach_start, rx_prach_start; //, ntrials=1;
int N_RB_UL = 106, delay = 0, NCS_config = 13, rootSequenceIndex = 1, threequarter_fs = 0, mu = 1, fd_occasion = 0, loglvl = OAILOG_INFO, numRA = 0, prachStartSymbol = 0;
uint8_t snr1set = 0, ue_speed1set = 0, transmission_mode = 1, n_tx = 1, n_rx = 1, awgn_flag = 0, msg1_frequencystart = 0, num_prach_fd_occasions = 1, prach_format;
uint8_t frame = 1, subframe = 9, slot=19, config_index = 98, prach_sequence_length = 1, num_root_sequences = 16, restrictedSetConfig = 0, N_dur, N_t_slot, start_symbol;
uint8_t frame = 1, subframe = 9, slot=19, slot_gNB=19, config_index = 98, prach_sequence_length = 1, num_root_sequences = 16, restrictedSetConfig = 0, N_dur, N_t_slot, start_symbol;
uint16_t Nid_cell = 0, preamble_tx = 0, preamble_delay, format, format0, format1;
uint32_t tx_lev = 10000, prach_errors = 0, samp_count; //,tx_lev_dB;
uint64_t SSB_positions = 0x01, absoluteFrequencyPointA = 640000;
@@ -318,7 +318,7 @@ int main(int argc, char **argv){
}
if (config_index<67) { prach_sequence_length=0; slot = subframe*2; }
if (config_index<67) { prach_sequence_length=0; slot = subframe*2; slot_gNB = 1+(subframe*2); }
printf("Config_index %d, prach_sequence_length %d\n",config_index,prach_sequence_length);
@@ -384,9 +384,9 @@ int main(int argc, char **argv){
gNB->proc.slot_rx = slot;
get_nr_prach_info_from_index(config_index,
int ret = get_nr_prach_info_from_index(config_index,
(int)frame,
(int)slot,
(int)slot_gNB,
absoluteFrequencyPointA,
mu,
frame_parms->frame_type,
@@ -395,6 +395,7 @@ int main(int argc, char **argv){
&N_t_slot,
&N_dur);
if (ret == 0) {printf("No prach in %d.%d, mu %d, config_index %d\n",frame,slot,mu,config_index); exit(-1);}
format0 = format&0xff; // first column of format from table
format1 = (format>>8)&0xff; // second column of format from table