diff --git a/openair1/PHY/NR_TRANSPORT/nr_prach.c b/openair1/PHY/NR_TRANSPORT/nr_prach.c index 80760ac032..2f0ea46ecd 100644 --- a/openair1/PHY/NR_TRANSPORT/nr_prach.c +++ b/openair1/PHY/NR_TRANSPORT/nr_prach.c @@ -38,6 +38,7 @@ extern uint16_t prach_root_sequence_map_0_3[838]; extern uint16_t prach_root_sequence_map_abc[138]; extern uint16_t nr_du[838]; extern int16_t nr_ru[2*839]; +extern const char *prachfmt[9]; void init_prach_list(PHY_VARS_gNB *gNB) { @@ -137,7 +138,6 @@ void free_nr_ru_prach_entry(RU_t *ru, } -const char *prachfmt[]={"A1","A2","A3","B1","B2","B3","B4","C0","C2"}; void rx_nr_prach_ru(RU_t *ru, int prachFormat, diff --git a/openair1/PHY/NR_UE_TRANSPORT/nr_prach.c b/openair1/PHY/NR_UE_TRANSPORT/nr_prach.c index 00cddcd451..6989c0af32 100644 --- a/openair1/PHY/NR_UE_TRANSPORT/nr_prach.c +++ b/openair1/PHY/NR_UE_TRANSPORT/nr_prach.c @@ -58,7 +58,7 @@ extern int64_t table_6_3_3_2_3_prachConfig_Index [256][9]; extern int64_t table_6_3_3_2_4_prachConfig_Index [256][10]; extern uint16_t nr_du[838]; extern int16_t nr_ru[2*839]; -const char *prachfmt[]={"A1","A2","A3","B1","B2","B3","B4","C0","C2"}; +extern const char *prachfmt[9]; // Note: // - prach_fmt_id is an ID used to map to the corresponding PRACH format value in prachfmt diff --git a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c index 6f691852da..5a93d2abbf 100644 --- a/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c +++ b/openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c @@ -45,6 +45,8 @@ uint16_t NCS_restricted_TypeB_delta_f_RA_5[14] = {36,57,60,63,65,68,71,77,81,8 // Table 6.3.3.1-7 (38.211) NCS for preamble formats with delta_f_RA = 15 * 2mu KHz where mu = {0,1,2,3} uint16_t NCS_unrestricted_delta_f_RA_15[16] = {0,2,4,6,8,10,12,13,15,17,19,23,27,34,46,69}; +const char *prachfmt[]={"A1","A2","A3","B1","B2","B3","B4","C0","C2"}; + uint16_t get_NCS(uint8_t index, uint16_t format0, uint8_t restricted_set_config) { if (format0 < 3) {