Merge branch 'develop-nr' into nr_pdcch

Conflicts:
	cmake_targets/CMakeLists.txt

cmake_targets/CMakeLists.txt

@@ -361,11 +361,14 @@ message( FATAL_ERROR "The script ${asn1c_call} must be present" )
 endif(NOT EXISTS ${asn1c_call})
 
 message("calling ASN1C_PREFIX=NR_ asn1c -findirect-choice -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${RRC_FULL_DIR} ${RRC_GRAMMAR}")
+
 execute_process(COMMAND ${asn1c_call}  
 			${NR_RRC_FULL_DIR} 
 			${NR_RRC_GRAMMAR}
 			NR_RRC
-                        RESULT_VARIABLE ret)
+                        RESULT_VARIABLE ret
+                        OUTPUT_QUIET
+                        ERROR_QUIET )
 
 if (NOT ${ret} STREQUAL 0)
    message(FATAL_ERROR "${asn1c_call}: error")
@@ -374,7 +377,6 @@ endif (NOT ${ret} STREQUAL 0)
 if(NOT EXISTS ${fix_asn1c_call})
   message( FATAL_ERROR "The script ${fix_asn1c_call} must be present" )
 endif(NOT EXISTS ${fix_asn1c_call})
-
 execute_process(COMMAND ${fix_asn1c_call} 
 			${NR_RRC_FULL_DIR} 
 			NR_RRC 
@@ -398,6 +400,7 @@ include_directories ("${NR_RRC_FULL_DIR}")
 # add the command to generate the source code
 # Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
 
+
 add_custom_command (
   OUTPUT ${NR_RRC_FULL_DIR}/asn1_constants.h
   COMMAND ${asn1c_call}  ${NR_RRC_FULL_DIR} ${NR_RRC_GRAMMAR} RRC
@@ -434,7 +437,11 @@ message("calling ASN1C_PREFIX=S1AP_ asn1c -fcompound-names -fno-include-deps -ge
 
 execute_process(COMMAND mkdir -p ${S1AP_C_DIR}
                 COMMAND env "ASN1C_PREFIX=S1AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${S1AP_C_DIR} ${S1AP_ASN_DIR}/${S1AP_ASN_FILES}
-                RESULT_VARIABLE ret)
+                RESULT_VARIABLE ret
+                OUTPUT_QUIET
+                ERROR_QUIET
+)
+
 
 if (NOT ${ret} STREQUAL 0)
   message(FATAL_ERROR "${ret}: error")
@@ -499,7 +506,9 @@ message("calling asn1c -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -
 
 execute_process(COMMAND mkdir -p ${X2AP_C_DIR}
                 COMMAND env "ASN1C_PREFIX=X2AP_" asn1c -pdu=all -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example -D ${X2AP_C_DIR} ${X2AP_ASN_DIR}/${X2AP_ASN_FILES}
-                RESULT_VARIABLE ret)
+                RESULT_VARIABLE ret 
+                OUTPUT_QUIET
+                ERROR_QUIET )
 
 #execute_process(COMMAND ${asn1c_call}  
 #			${X2AP_C_DIR} 
@@ -1342,6 +1351,10 @@ if (${COMPILATION_AVX2} STREQUAL "True")
   set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
 endif ()
 
+if (${COMPILATION_AVX2} STREQUAL "True")
+  set(PHY_NR_UE_SRC ${PHY_NR_UE_SRC} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c)
+endif ()
+
 add_library(PHY_COMMON ${PHY_SRC_COMMON})
 add_library(PHY ${PHY_SRC})
 add_library(PHY_UE ${PHY_SRC_UE})
@@ -1463,6 +1476,7 @@ set(NR_L2_SRC_UE
   ${NR_UE_RRC_DIR}/main_ue.c
   ${NR_UE_RRC_DIR}/rrc_UE.c
 #  ${NR_UE_RRC_DIR}/mac_vars.c
+#${RRC_DIR}/rrc_UE.c
   )
 
 set(L2_NR_SRC_UE
@@ -1582,6 +1596,7 @@ set ( NR_LTE_UE_REUSE_SRC
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_dl_channel_estimation.c
   ${OPENAIR1_DIR}/PHY/LTE_ESTIMATION/lte_ue_measurements.c
   ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_demodulation.c
+  #${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
 )
 
 add_library( NR_LTE_UE_REUSE_LIB
@@ -2265,6 +2280,7 @@ target_link_libraries (lte-uesoftmodem-nos1 ${T_LIB})
 
 add_executable(nr-softmodem
   ${rrc_h}
+  ${nr_rrc_h}
   ${s1ap_h}
   ${OPENAIR_BIN_DIR}/messages_xml.h
   ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
@@ -2272,7 +2288,6 @@ add_executable(nr-softmodem
   ${OPENAIR_TARGETS}/RT/USER/nr-ru.c
   ${OPENAIR_TARGETS}/RT/USER/nr-softmodem.c
   ${OPENAIR1_DIR}/SIMULATION/TOOLS/taus.c
-  ${OPENAIR_TARGETS}/COMMON/create_tasks.c
   ${OPENAIR_TARGETS}/COMMON/create_nr_tasks.c
   ${OPENAIR_TARGETS}/ARCH/COMMON/common_lib.c
   ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c

nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_constants.h

+#ifndef _FAPI_NR_UE_CONSTANTS_H_
+#define _FAPI_NR_UE_CONSTANTS_H_
+
+//  constants defined by specification 38.331
+#define FAPI_NR_MAX_NUM_DL_ALLOCATIONS             16
+#define FAPI_NR_MAX_NUM_UL_ALLOCATIONS             16
+#define FAPI_NR_MAX_NUM_SERVING_CELLS              32
+#define FAPI_NR_MAX_NUM_ZP_CSI_RS_RESOURCE_PER_SET 16
+#define FAPI_NR_MAX_NUM_CANDIDATE_BEAMS            16
+#define FAPI_NR_MAX_RA_OCCASION_PER_CSIRS          64
+
+
+/// RX_IND
+#define FAPI_NR_RX_PDU_TYPE_MIB 0x01
+#define FAPI_NR_RX_PDU_TYPE_SIB 0x02 
+#define FAPI_NR_RX_PDU_TYPE_DLSCH 0x03 
+#define FAPI_NR_DCI_IND 0x04
+
+#define FAPI_NR_SIBS_MASK_SIB1 0x1
+
+
+/// DCI_IND
+#define FAPI_NR_DCI_TYPE_0_0 0x01
+#define FAPI_NR_DCI_TYPE_0_1 0x02
+#define FAPI_NR_DCI_TYPE_1_0 0x03
+#define FAPI_NR_DCI_TYPE_1_1 0x04
+#define FAPI_NR_DCI_TYPE_2_0 0x05
+#define FAPI_NR_DCI_TYPE_2_1 0x06
+#define FAPI_NR_DCI_TYPE_2_2 0x07
+#define FAPI_NR_DCI_TYPE_2_3 0x08
+
+
+/// TX_REQ
+
+
+/// DL_CONFIG_REQ
+
+#define FAPI_NR_DL_CONFIG_LIST_NUM 10
+
+#define FAPI_NR_DL_CONFIG_TYPE_DCI 0x01
+#define FAPI_NR_DL_CONFIG_TYPE_DLSCH 0x02
+
+#define CCE_REG_MAPPING_TYPE_INTERLEAVED 0x01
+#define CCE_REG_MAPPING_TYPE_NON_INTERLEAVED 0x02
+
+#define PRECODER_GRANULARITY_SAME_AS_REG_BUNDLE 0x01
+#define PRECODER_GRANULARITY_ALL_CONTIGUOUS_RBS 0x02
+
+/// UL_CONFIG_REQ
+#define FAPI_NR_UL_CONFIG_LIST_NUM 10
+
+#define FAPI_NR_DL_CONFIG_TYPE_PRACH 0x01
+#define FAPI_NR_DL_CONFIG_TYPE_PUCCH 0x02
+#define FAPI_NR_DL_CONFIG_TYPE_PUSCH 0x03
+
+
+#endif
\ No newline at end of file

openair1/PHY/INIT/nr_init_ue.c

@@ -658,6 +658,9 @@ int init_nr_ue_signal(PHY_VARS_NR_UE *ue,
   printf("Initializing UE vars (abstraction %"PRIu8") for eNB TXant %"PRIu8", UE RXant %"PRIu8"\n",abstraction_flag,fp->nb_antennas_tx,fp->nb_antennas_rx);
   //LOG_D(PHY,"[MSC_NEW][FRAME 00000][PHY_UE][MOD %02u][]\n", ue->Mod_id+NB_eNB_INST);
   
+  //phy_init_nr_top(&ue->frame_parms);
+  //nr_init_frame_parms_ue(&ue->frame_parms);
+
   // many memory allocation sizes are hard coded
   AssertFatal( fp->nb_antennas_rx <= 2, "hard coded allocation for ue_common_vars->dl_ch_estimates[eNB_id]" );
   AssertFatal( ue->n_connected_eNB <= NUMBER_OF_CONNECTED_eNB_MAX, "n_connected_eNB is too large" );

openair1/PHY/INIT/nr_parms.c

@@ -159,8 +159,7 @@ int nr_init_frame_parms(nfapi_nr_config_request_t* config,
   return 0;
 }
 
-int nr_init_frame_parms_ue(nfapi_nr_config_request_t* config,
-                        NR_DL_FRAME_PARMS *frame_parms)
+int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *frame_parms)
 {
 
   int N_RB = 106;
@@ -283,7 +282,7 @@ int nr_init_frame_parms_ue(nfapi_nr_config_request_t* config,
     frame_parms->ofdm_symbol_size = 2048;
     frame_parms->samples_per_tti = 30720;
     frame_parms->samples_per_subframe = 30720 * frame_parms->ttis_per_subframe;
-    frame_parms->first_carrier_offset = 2048-600;
+    //frame_parms->first_carrier_offset = 2048-600;
 
   frame_parms->slots_per_frame = 10* frame_parms->slots_per_subframe;
   frame_parms->symbols_per_slot = ((Ncp == NORMAL)? 14 : 12); // to redefine for different slot formats

openair1/PHY/INIT/phy_init.h

@@ -375,7 +375,8 @@ void phy_config_request(PHY_Config_t *phy_config);
 int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,uint8_t osf);
 void dump_frame_parms(LTE_DL_FRAME_PARMS *frame_parms);
 int nr_init_frame_parms(nfapi_nr_config_request_t* config, NR_DL_FRAME_PARMS *frame_parms);
-int nr_init_frame_parms_ue(nfapi_nr_config_request_t* config, NR_DL_FRAME_PARMS *frame_parms);
+int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *frame_parms);
+int init_nr_ue_signal(PHY_VARS_NR_UE *ue,int nb_connected_eNB,uint8_t abstraction_flag);
 void nr_dump_frame_parms(NR_DL_FRAME_PARMS *frame_parms);
 int phy_init_nr_gNB(PHY_VARS_gNB *gNB, unsigned char is_secondary_gNB, unsigned char abstraction_flag);
 void nr_phy_config_request(NR_PHY_Config_t *gNB);

openair1/PHY/MODULATION/slot_fep.c

@@ -50,7 +50,7 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
   unsigned int frame_length_samples = frame_parms->samples_per_subframe * 10;
   unsigned int rx_offset;
   //NR_UE_PDCCH *pdcch_vars  = ue->pdcch_vars[ue->current_thread_id[Ns>>1]][0];
-  uint16_t coreset_start_subcarrier = frame_parms->first_carrier_offset;
+  uint16_t coreset_start_subcarrier = frame_parms->first_carrier_offset+516;
   uint16_t nb_rb_coreset = 24;
   uint16_t bwp_start_subcarrier = frame_parms->first_carrier_offset;
   uint16_t nb_rb_pdsch = 100;
@@ -239,7 +239,7 @@ int nr_slot_fep(PHY_VARS_NR_UE *ue,
       for (aa=0; aa<frame_parms->nb_antenna_ports_eNB; aa++) {
 
 #ifdef DEBUG_FEP
-          printf("Channel estimation eNB %d, aatx %d, slot %d, symbol %d\n",eNB_id,aa,Ns,l);
+          printf("PDCCH Channel estimation eNB %d, aatx %d, slot %d, symbol %d start_sc %d\n",eNB_id,aa,Ns,l,coreset_start_subcarrier);
 #endif
 #if UE_TIMING_TRACE
           start_meas(&ue->dlsch_channel_estimation_stats);

openair1/PHY/NR_REFSIG/nr_dmrs_rx.c

@@ -53,7 +53,7 @@ int wt2[12][2] = {{1,1},{1,1},{1,1},{1,1},{1,1},{1,1},{1,-1},{1,-1},{1,-1},{1,-1
 
 short nr_rx_mod_table[NR_MOD_TABLE_SIZE_SHORT] = {0,0,23170,-23170,-23170,23170,23170,-23170,23170,23170,-23170,-23170,-23170,23170};
 
-int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
+/*int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
 						uint8_t eNB_offset,
 						unsigned int Ns,
 						unsigned int nr_gold_pdcch[7][20][3][10],
@@ -65,8 +65,6 @@ int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
   int32_t qpsk[4],n;
   int w,ind,l,ind_dword,ind_qpsk_symb,kp,k;
   short pamp;
-
-  // Compute the correct pilot amplitude, sqrt_rho_b = Q3.13
   pamp = ONE_OVER_SQRT2_Q15;
 
   // This includes complex conjugate for channel estimation
@@ -80,7 +78,6 @@ int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
   ((short *)&qpsk[3])[1] = pamp;
 
   if (p==2000) {
-	  // r_n from 38.211 7.4.1.3
         for (n=0; n<nb_rb_coreset*3; n++) {
         	for (l =0; l<length_dmrs; l++){
         		for (kp=0; kp<3; kp++){
@@ -106,7 +103,7 @@ int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
   }
 
   return(0);
-}
+}*/
 
 int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
 						uint8_t eNB_offset,
@@ -189,6 +186,35 @@ int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
   return(0);
 }
 
+int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
+						uint8_t eNB_offset,
+						unsigned int Ns,
+						unsigned int *nr_gold_pdcch,
+						int32_t *output,
+						unsigned short p,
+						unsigned short nb_rb_coreset)
+{
+
+	uint8_t idx=0;
+	uint8_t pdcch_rb_offset =0;
+	//nr_gold_pdcch += ((int)floor(ue->frame_parms.ssb_start_subcarrier/12)+pdcch_rb_offset)*3/32;
+
+	if (p==2000) {
+    	for (int i=0; i<((nb_rb_coreset*6)>>1); i++) {
+    		idx = ((((nr_gold_pdcch[(i<<1)>>5])>>((i<<1)&0x1f))&1)<<1) ^ (((nr_gold_pdcch[((i<<1)+1)>>5])>>(((i<<1)+1)&0x1f))&1);
+    		((int16_t*)output)[i<<1] = nr_rx_mod_table[(NR_MOD_TABLE_QPSK_OFFSET + idx)<<1];
+    		((int16_t*)output)[(i<<1)+1] = nr_rx_mod_table[((NR_MOD_TABLE_QPSK_OFFSET + idx)<<1) + 1];
+#ifdef DEBUG_PDCCH
+      if (i<8)
+	  printf("i %d idx %d pdcch gold %u b0-b1 %d-%d mod_dmrs %d %d\n", i, idx, nr_gold_pdcch[(i<<1)>>5], (((nr_gold_pdcch[(i<<1)>>5])>>((i<<1)&0x1f))&1),
+	  (((nr_gold_pdcch[((i<<1)+1)>>5])>>(((i<<1)+1)&0x1f))&1), ((int16_t*)output)[i<<1], ((int16_t*)output)[(i<<1)+1],&output[0]);
+#endif
+	    }
+	}
+
+	return(0);
+}
+
 int nr_pbch_dmrs_rx(unsigned int *nr_gold_pbch,
 					int32_t *output	)
 {

openair1/PHY/NR_REFSIG/nr_gold_ue.c

@@ -64,7 +64,7 @@ void nr_gold_pbch(PHY_VARS_NR_UE* ue)
 
 }
 
-void nr_gold_pdcch(PHY_VARS_NR_UE* ue,unsigned int Nid_cell, unsigned short n_idDMRS, unsigned short length_dmrs)
+void nr_gold_pdcch(PHY_VARS_NR_UE* ue,unsigned short n_idDMRS, unsigned short length_dmrs)
 {
 
   unsigned char ns,l;
@@ -74,7 +74,7 @@ void nr_gold_pdcch(PHY_VARS_NR_UE* ue,unsigned int Nid_cell, unsigned short n_id
     if (n_idDMRS)
       nid = n_idDMRS;
     else
-      nid = Nid_cell;
+      nid = ue->frame_parms.Nid_cell;
 
     for (ns=0; ns<20; ns++) {
 
@@ -95,7 +95,7 @@ void nr_gold_pdcch(PHY_VARS_NR_UE* ue,unsigned int Nid_cell, unsigned short n_id
             //printf("x1 : %x, x2 : %x\n",x1,x2);
         }
 
-        for (n=0; n<10; n++) {
+        for (n=0; n<52; n++) {
           x1 = (x1>>1) ^ (x1>>4);
           x1 = x1 ^ (x1<<31) ^ (x1<<28);
           x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
@@ -107,7 +107,7 @@ void nr_gold_pdcch(PHY_VARS_NR_UE* ue,unsigned int Nid_cell, unsigned short n_id
     }
 }
 
-void nr_gold_pdsch(PHY_VARS_NR_UE* ue,unsigned short lbar,unsigned int Nid_cell, unsigned short *n_idDMRS, unsigned short length_dmrs)
+void nr_gold_pdsch(PHY_VARS_NR_UE* ue,unsigned short lbar,unsigned short *n_idDMRS, unsigned short length_dmrs)
 {
 
   unsigned char ns,l;
@@ -122,7 +122,7 @@ void nr_gold_pdsch(PHY_VARS_NR_UE* ue,unsigned short lbar,unsigned int Nid_cell,
     if (n_idDMRS)
       nid = n_idDMRS[nscid];
     else
-      nid = Nid_cell;
+      nid = ue->frame_parms.Nid_cell;
 
     for (ns=0; ns<20; ns++) {
 

openair1/PHY/NR_REFSIG/refsig_defs_ue.h

@@ -37,10 +37,9 @@ int nr_pbch_dmrs_rx(unsigned int *nr_gold_pbch,	int32_t *output	);
 int nr_pdcch_dmrs_rx(PHY_VARS_NR_UE *ue,
 						uint8_t eNB_offset,
 						unsigned int Ns,
-						unsigned int nr_gold_pdcch[7][20][3][10],
+						unsigned int *nr_gold_pdcch,
 						int32_t *output,
 						unsigned short p,
-						int length_dmrs,
 						unsigned short nb_rb_corset);
 
 int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
@@ -55,13 +54,11 @@ int nr_pdsch_dmrs_rx(PHY_VARS_NR_UE *ue,
 void nr_gold_pbch(PHY_VARS_NR_UE* ue);
 
 void nr_gold_pdcch(PHY_VARS_NR_UE* ue,
-					unsigned int Nid_cell,
 					unsigned short n_idDMRS,
 					unsigned short length_dmrs);
 
 void nr_gold_pdsch(PHY_VARS_NR_UE* ue,
 					unsigned short lbar,
-					unsigned int Nid_cell,
 					unsigned short *n_idDMRS,
 					unsigned short length_dmrs);
 

openair1/PHY/NR_REFSIG/ss_pbch_nr.h

@@ -51,10 +51,16 @@
 #define  PSS_SC_START_NR              (52)     /* see from TS 38.211 table 7.4.3.1-1: Resources within an SS/PBCH block for PSS... */
 
 /* define ofdm symbol offset in the SS/PBCH block of NR synchronisation */
-#define  PSS_SYMBOL_NB                (4)     /* symbol numbers for each element */
-#define  PBCH_SYMBOL_NB               (5)
-#define  SSS_SYMBOL_NB                (6)
-#define  PBCH_LAST_SYMBOL_NB          (7)
+#ifdef NR_UNIT_TEST
+#define OFFSET_SS_PBCH                (0)
+#else
+#define OFFSET_SS_PBCH                (4)
+#endif
+
+#define  PSS_SYMBOL_NB                ((0) + OFFSET_SS_PBCH)   /* symbol numbers for each element */
+#define  PBCH_SYMBOL_NB               ((1) + OFFSET_SS_PBCH)
+#define  SSS_SYMBOL_NB                ((2) + OFFSET_SS_PBCH)
+#define  PBCH_LAST_SYMBOL_NB          ((3) + OFFSET_SS_PBCH)
 
 /* SS/PBCH parameters */
 #define  N_RB_SS_PBCH_BLOCK           (20)

openair1/PHY/NR_TRANSPORT/nr_pbch.c

@@ -219,6 +219,7 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
   uint8_t nushift;
   uint8_t *xbyte = pbch->pbch_a;
   memset((void*) xbyte, 0, 1);
+  uint8_t pbch_a_b[32];
 
   LOG_I(PHY, "PBCH generation started\n");
 
@@ -281,6 +282,10 @@ int nr_generate_pbch(NR_gNB_PBCH *pbch,
     printf("pbch_a_prime[%d]: 0x%02x\n", i, pbch->pbch_a_prime[i]);
 #endif
 
+for (int m=0;m<32;m++){
+pbch_a_b[m] = ((pbch->pbch_a_prime[m/8]>>(m&7))&01);
+//printf("pbch_a_b[%d] %d\n", m, pbch_a_b[m] );
+}
 
   /// CRC, coding and rate matching
   polar_encoder (pbch->pbch_a_prime, pbch->pbch_e, &frame_parms->pbch_polar_params);

openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c

@@ -113,12 +113,12 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
                                          ue->ch_est_alpha,dl_ch-(ue->frame_parms.ofdm_symbol_size<<1),
                                          1,ue->frame_parms.ofdm_symbol_size);
 #ifdef DEBUG_CH
-    printf("ch est pilot addr %p RB_DL %d\n",&pilot[p][0], ue->frame_parms.N_RB_DL);
+    printf("pbch ch est pilot addr %p RB_DL %d\n",&pilot[p][0], ue->frame_parms.N_RB_DL);
     printf("k %d, first_carrier %d\n",k,ue->frame_parms.first_carrier_offset);
     printf("rxF addr %p\n", rxF);
     printf("dl_ch addr %p\n",dl_ch);
 #endif
-    if ((ue->frame_parms.N_RB_DL&1)==0) {
+    //if ((ue->frame_parms.N_RB_DL&1)==0) {
 
       // Treat first 2 pilots specially (left edge)
       ch[0] = (int16_t)(((int32_t)pil[0]*rxF[0] - (int32_t)pil[1]*rxF[1])>>15);
@@ -214,7 +214,7 @@ int nr_pbch_channel_estimation(PHY_VARS_NR_UE *ue,
       }
 
 
-    }
+    //}
 
   }
 
@@ -257,7 +257,7 @@ int nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue,
   k = coreset_start_subcarrier;
 
 #ifdef DEBUG_CH
-  printf("PBCH Channel Estimation : ThreadId %d, eNB_offset %d cell_id %d ch_offset %d, OFDM size %d, Ncp=%d, l=%d, Ns=%d, k=%d symbol %d\n",ue->current_thread_id[Ns>>1], eNB_offset,Nid_cell,ch_offset,ue->frame_parms.ofdm_symbol_size,
+  printf("PDCCH Channel Estimation : ThreadId %d, eNB_offset %d ch_offset %d, OFDM size %d, Ncp=%d, l=%d, Ns=%d, k=%d symbol %d\n",ue->current_thread_id[Ns>>1], eNB_offset,ch_offset,ue->frame_parms.ofdm_symbol_size,
          ue->frame_parms.Ncp,l,Ns,k, symbol);
 #endif
 
@@ -266,7 +266,7 @@ int nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue,
   fr = filt16a_r1;
 
   // generate pilot
-  nr_pdcch_dmrs_rx(ue,eNB_offset,Ns,ue->nr_gold_pdcch[eNB_offset][Ns][symbol], &pilot[p][0],2000,symbol, nb_rb_coreset);
+  nr_pdcch_dmrs_rx(ue,eNB_offset,Ns,ue->nr_gold_pdcch[eNB_offset][Ns][symbol], &pilot[p][0],2000,nb_rb_coreset);
 
   for (aarx=0; aarx<ue->frame_parms.nb_antennas_rx; aarx++) {
 
@@ -279,12 +279,12 @@ int nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue,
       multadd_complex_vector_real_scalar(dl_ch-(ue->frame_parms.ofdm_symbol_size<<1),
                                          ue->ch_est_alpha,dl_ch-(ue->frame_parms.ofdm_symbol_size<<1),
                                          1,ue->frame_parms.ofdm_symbol_size);
-#ifdef DEBUG_CH
-    printf("ch est pilot addr %p RB_DL %d\n",&pilot[p][0], ue->frame_parms.N_RB_DL);
+//#ifdef DEBUG_CH
+    printf("pdcch ch est pilot addr %p RB_DL %d\n",&pilot[p][0], ue->frame_parms.N_RB_DL);
     printf("k %d, first_carrier %d\n",k,ue->frame_parms.first_carrier_offset);
     printf("rxF addr %p\n", rxF);
     printf("dl_ch addr %p\n",dl_ch);
-#endif
+//#endif
     if ((ue->frame_parms.N_RB_DL&1)==0) {
 
       // Treat first 2 pilots specially (left edge)

openair1/PHY/NR_UE_TRANSPORT/dci_nr.c

@@ -50,7 +50,7 @@
 
 //#define NR_LTE_PDCCH_DCI_SWITCH
 #define NR_PDCCH_DCI_RUN              // activates new nr functions
-#define NR_PDCCH_DCI_DEBUG            // activates NR_PDCCH_DCI_DEBUG logs
+//#define NR_PDCCH_DCI_DEBUG            // activates NR_PDCCH_DCI_DEBUG logs
 #define NR_NBR_CORESET_ACT_BWP 3      // The number of CoreSets per BWP is limited to 3 (including initial CORESET: ControlResourceId 0)
 #define NR_NBR_SEARCHSPACE_ACT_BWP 10 // The number of SearSpaces per BWP is limited to 10 (including initial SEARCHSPACE: SearchSpaceId 0)
 
@@ -535,17 +535,19 @@ void nr_pdcch_deinterleaving(NR_DL_FRAME_PARMS *frame_parms, uint16_t *z,
  * reg_bundle_size (2,3,6)
  */
 #ifdef NR_PDCCH_DCI_DEBUG
-  printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_deinterleaving)-> coreset_nbr_rb=(%lld), reg_bundle_size_L=(%d)\n",
-		  coreset_nbr_rb,reg_bundle_size_L);
+  printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_deinterleaving)-> coreset_nbr_rb=(%lld), reg_bundle_size_L=(%d), coreset_interleaver_size_R=(%d), n_shift=(%d)\n",
+		  coreset_nbr_rb,reg_bundle_size_L,coreset_interleaver_size_R,n_shift);
 #endif
 /*
  * First verify that CORESET is interleaved or not interleaved depending on parameter cce-REG-MappingType
- * To be done
- * if non-interleaved then do nothing: wbar table stays as it is
+ * if non-interleaved then do nothing: wbar table stays as it is (if REG bundle size is set to 0 by higher layer, then we consider that there is no interleaving)
+ */
+  int coreset_interleaved = 1;
+  if (reg_bundle_size_L==0) coreset_interleaved=0;
+/*
  * if interleaved then do this: wbar table has bundles interleaved. We have to de-interleave then
  * following procedure described in 38.211 Section 7.3.2.2:
  */
-  int coreset_interleaved = 1;
   uint32_t bundle_id, bundle_interleaved, c=0 ,r=-1, k, l, i=0;
   uint32_t coreset_C = (uint32_t)(coreset_nbr_rb / (coreset_interleaver_size_R*reg_bundle_size_L));
   uint16_t *wptr;
@@ -553,34 +555,34 @@ void nr_pdcch_deinterleaving(NR_DL_FRAME_PARMS *frame_parms, uint16_t *z,
   z = &wtemp_rx[0];
   bundle_id=0;
   for (k=0 ; k<9*coreset_nbr_rb*coreset_time_dur; k++){
-#ifdef NR_PDCCH_DCI_DEBUG
+    #ifdef NR_PDCCH_DCI_DEBUG
       printf("\t\t<-NR_PDCCH_DCI_DEBUG (nr_pdcch_deinterleaving)-> k=%d \t coreset_interleaved=%d reg_bundle_size_L=%d coreset_C=%d coreset_interleaver_R=%d",
               k,coreset_interleaved,reg_bundle_size_L, coreset_C,coreset_interleaver_size_R);
-#endif
+    #endif
     if (k%(9*reg_bundle_size_L)==0) {
       // calculate offset properly
       if (r==coreset_interleaver_size_R-1) {
       //if (bundle_id>=(c+1)*coreset_interleaver_size_R) {
         c++;
         r=0;
-      } else{
+      } else {
         r++;
       }
-#ifdef NR_PDCCH_DCI_DEBUG
+      #ifdef NR_PDCCH_DCI_DEBUG
        printf("\t --> time to modify bundle_interleaved and bundle_id --> r=%d c=%d",r,c);
-#endif
+      #endif
       bundle_id=c*coreset_interleaver_size_R+r;
       bundle_interleaved=(r*coreset_C+c+n_shift)%(coreset_nbr_rb * coreset_time_dur/reg_bundle_size_L);
     }
     if (coreset_interleaved == 1){
       //wptr[i+(bundle_interleaved-bundle_id)*9*reg_bundle_size_L]=wbar[i];
-#ifdef NR_PDCCH_DCI_DEBUG
+      #ifdef NR_PDCCH_DCI_DEBUG
         printf("\n\t\t\t\t\t\t\t\t\t wptr[%d] <-> wbar[%d]",i,i+(bundle_interleaved-bundle_id)*9*reg_bundle_size_L);
-#endif
+      #endif
       wptr[i]=wbar[i+(bundle_interleaved-bundle_id)*9*reg_bundle_size_L];
-#ifdef NR_PDCCH_DCI_DEBUG
-      printf("\t\t bundle_id = %d \t bundle_interleaved = %d\n",bundle_id,bundle_interleaved);
-#endif
+      #ifdef NR_PDCCH_DCI_DEBUG
+        printf("\t\t bundle_id = %d \t bundle_interleaved = %d (r=%d, c=%d)\n",bundle_id,bundle_interleaved,r,c);
+      #endif
       i++;
     } else {
       wptr[i]=wbar[i];
@@ -2758,11 +2760,11 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
  * pdcch-Config
  * pdcch-ConfigCommon
  */
-
+#if 0
 /*
  * initialize this values for testing
  */
-#if 0
+
         pdcch_vars2->coreset[nb_coreset_active].frequencyDomainResources                  = 0x1FFF2FF00000;
         //pdcch_vars2->coreset[nb_coreset_active].frequencyDomainResources                  = 0x1E0000000000;
         pdcch_vars2->coreset[nb_coreset_active].duration                                  = 2;
@@ -2782,10 +2784,11 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
           pdcch_vars[eNB_id]->searchSpace[i].searchSpaceType.sfi_nrofCandidates_aggrlevel8  = 3;
           pdcch_vars[eNB_id]->searchSpace[i].searchSpaceType.sfi_nrofCandidates_aggrlevel16 = 1;
         }
-#endif //(0)
+
 /*
  * to be removed after testing
  */
+#endif //(0)
 
   // number of RB (1 symbol) or REG (12 RE) in one CORESET: higher-layer parameter CORESET-freq-dom
   // (bit map 45 bits: each bit indicates 6 RB in CORESET -> 1 bit MSB indicates PRB 0..6 are part of CORESET)
@@ -2805,19 +2808,24 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
 
   // The UE can be assigned 4 different BWP but only one active at a time.
   // For each BWP the number of CORESETs is limited to 3 (including initial CORESET Id=0 -> ControlResourceSetId (0..maxNrofControlReourceSets-1) (0..12-1)
-  uint32_t n_BWP_start = 0;
+  //uint32_t n_BWP_start = 0;
+  //uint32_t n_rb_offset = 0;
+  uint32_t n_rb_offset = pdcch_vars2->coreset[nb_coreset_active].rb_offset;
   // start time position for CORESET
   // parameter symbol_mon is a 14 bits bitmap indicating monitoring symbols within a slot
   uint8_t start_symbol = 0;
 
   // at the moment we are considering that the PDCCH is always starting at symbol 0 of current slot
   // the following code to initialize start_symbol must be activated once we implement PDCCH demapping on symbol not equal to 0 (considering symbol_mon)
-  /*for (int i=0; i < 14; i++) {
+  for (int i=0; i < 14; i++) {
     if (symbol_mon >> (13-i) != 0) {
       start_symbol = i;
       i=14;
     }
-  }*/
+  }
+#ifdef NR_PDCCH_DCI_DEBUG
+  printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> symbol_mon=(%d) and start_symbol=%d\n",symbol_mon,start_symbol);
+#endif
 
   //
   // according to 38.213 v15.1.0: a PDCCH monitoring pattern within a slot,
@@ -2860,7 +2868,7 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
   for (int s = start_symbol; s < (start_symbol + coreset_time_dur); s++) {
     printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> we enter process pdcch ofdm symbol s=%d where coreset_time_dur=%d\n",s,coreset_time_dur);
 
-	if (is_secondary_ue == 1) {
+/*	if (is_secondary_ue == 1) {
 		pdcch_extract_rbs_single(common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[nr_tti_rx]].rxdataF,
 				common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[nr_tti_rx]].dl_ch_estimates[eNB_id+1], //add 1 to eNB_id to compensate for the shifted B/F'd pilots from the SeNB
 				pdcch_vars[eNB_id]->rxdataF_ext,
@@ -2885,7 +2893,7 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
 				0,
 				high_speed_flag,
 				frame_parms);
-	} else {
+	} else {*/
     #ifdef NR_PDCCH_DCI_DEBUG
       printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> we enter nr_pdcch_extract_rbs_single(is_secondary_ue=%d) to remove DM-RS PDCCH\n",
               is_secondary_ue);
@@ -2899,7 +2907,7 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
                                 frame_parms,
                                 coreset_freq_dom,
                                 coreset_nbr_rb,
-                                n_BWP_start);
+                                n_rb_offset);
 /*
 	printf("\t### in nr_rx_pdcch() function we enter pdcch_extract_rbs_single(is_secondary_ue=%d) to remove DM-RS PDCCH\n",is_secondary_ue);
 	pdcch_extract_rbs_single(common_vars->common_vars_rx_data_per_thread[ue->current_thread_id[nr_tti_rx]].rxdataF,
@@ -2911,7 +2919,7 @@ int32_t nr_rx_pdcch(PHY_VARS_NR_UE *ue,
 			frame_parms);
 */
 
-}
+//}
 
     #ifdef NR_PDCCH_DCI_DEBUG
       printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> we enter pdcch_channel_level(avgP=%d) => compute channel level based on ofdm symbol 0, pdcch_vars[eNB_id]->dl_ch_estimates_ext\n",avgP);
@@ -3016,9 +3024,9 @@ printf("\t### in nr_rx_pdcch() function we enter pdcch_channel_compensation(log2
     }
     if (mimo_mode == SISO) {
       #ifdef NR_PDCCH_DCI_DEBUG
-       printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> we enter pdcch_siso(for symbol 0) ---> pdcch_vars[eNB_id]->rxdataF_comp\n");
+       printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> we enter pdcch_siso ---> pdcch_vars[eNB_id]->rxdataF_comp Nothing to do here. TO BE REMOVED!!!\n");
       #endif
-      pdcch_siso(frame_parms, pdcch_vars[eNB_id]->rxdataF_comp,s);
+      //pdcch_siso(frame_parms, pdcch_vars[eNB_id]->rxdataF_comp,s);
     } else pdcch_alamouti(frame_parms, pdcch_vars[eNB_id]->rxdataF_comp,s);
 
 #ifdef MU_RECEIVER
@@ -3060,21 +3068,11 @@ printf("\t### in nr_rx_pdcch() function we enter pdcch_channel_compensation(log2
 #ifdef MU_RECEIVER
 }
 #endif //MU_RECEIVER
-
 #if T_TRACER
 T(T_UE_PHY_PDCCH_IQ, T_INT(frame_parms->N_RB_DL), T_INT(frame_parms->N_RB_DL),
   T_INT(n_pdcch_symbols),
   T_BUFFER(pdcch_vars[eNB_id]->rxdataF_comp, frame_parms->N_RB_DL*12*n_pdcch_symbols* 4));
 #endif
-
-    /* We do not enter this function: in NR the number of PDCCH symbols is determined by higher layers parameter CORESET-time-dur
-    /*/
-    printf("\t<-NR_PDCCH_DCI_DEBUG (nr_rx_pdcch)-> we do not enter function rx_pcfich()\n as the number of PDCCH symbols is determined by higher layers parameter CORESET-time-dur and n_pdcch_symbols=%d\n",n_pdcch_symbols);
-    /*
-    // decode pcfich here and find out pdcch ofdm symbol number
-    n_pdcch_symbols = rx_pcfich(frame_parms, nr_tti_rx, pdcch_vars[eNB_id],mimo_mode);
-    if (n_pdcch_symbols > 3) n_pdcch_symbols = 1;
-    */
 #ifdef DEBUG_DCI_DECODING
 	printf("demapping: nr_tti_rx %d, mi %d, tdd_config %d\n",nr_tti_rx,get_mi(frame_parms,nr_tti_rx),frame_parms->tdd_config);
 #endif

openair1/PHY/NR_UE_TRANSPORT/dci_tools_nr.c

@@ -4815,6 +4815,7 @@ int nr_extract_dci_info(PHY_VARS_NR_UE *ue,
       }
     }
   }
+
   #ifdef NR_PDCCH_DCI_TOOLS_DEBUG
     printf("\t\t<-NR_PDCCH_DCI_TOOLS_DEBUG (nr_extract_dci_info) -> Ending function nr_extract_dci_info()\n");
   #endif
@@ -6934,7 +6935,8 @@ int nr_generate_ue_ul_dlsch_params_from_dci(PHY_VARS_NR_UE *ue,
         uint8_t dci_fields_sizes[NBR_NR_DCI_FIELDS][NBR_NR_FORMATS],
         uint16_t n_RB_ULBWP,
         uint16_t n_RB_DLBWP,
-        uint16_t crc_scrambled_values[TOTAL_NBR_SCRAMBLED_VALUES])
+        uint16_t crc_scrambled_values[TOTAL_NBR_SCRAMBLED_VALUES],
+        NR_DCI_INFO_EXTRACTED_t *nr_dci_info_extracted)
 {
   /*
    * Note only format0_0 and format1_0 are implemented
@@ -6946,7 +6948,7 @@ int nr_generate_ue_ul_dlsch_params_from_dci(PHY_VARS_NR_UE *ue,
   NR_UE_DLSCH_t *dlsch0=NULL,*dlsch1=NULL;
   NR_DL_UE_HARQ_t *dlsch0_harq=NULL,*dlsch1_harq=NULL;
   NR_UE_ULSCH_t *ulsch0=NULL,*ulsch1=NULL;
-  NR_DCI_INFO_EXTRACTED_t nr_dci_info_extracted;
+  //NR_DCI_INFO_EXTRACTED_t nr_dci_info_extracted;
   uint8_t status=0,left_shift=0;
   uint64_t pdu_bitmap = 0xFFFFFFFFFFFFFFFF;
   pdu_bitmap = (pdu_bitmap << (64 - dci_length)) >> (64 - dci_length); // this variable will help to remove the bits of other fields when left-switching
@@ -6955,15 +6957,15 @@ int nr_generate_ue_ul_dlsch_params_from_dci(PHY_VARS_NR_UE *ue,
   dlsch0->active = 0;
   if (dci_fields_sizes[HARQ_PROCESS_NUMBER][dci_format-15] != 0) { // 27 HARQ_PROCESS_NUMBER (27 is the position in dci_fields_sizes array for field HARQ_PROCESS_NUMBER)
     for (int i=0; i<=HARQ_PROCESS_NUMBER; i++) left_shift = left_shift + dci_fields_sizes[i][dci_format-15];
-    nr_dci_info_extracted.harq_process_number = (uint8_t)(((((*(uint64_t *)dci_pdu)  << (left_shift - dci_fields_sizes[HARQ_PROCESS_NUMBER][dci_format-15]))) & pdu_bitmap) >> (dci_length - dci_fields_sizes[HARQ_PROCESS_NUMBER][dci_format-15]));
+    nr_dci_info_extracted->harq_process_number = (uint8_t)(((((*(uint64_t *)dci_pdu)  << (left_shift - dci_fields_sizes[HARQ_PROCESS_NUMBER][dci_format-15]))) & pdu_bitmap) >> (dci_length - dci_fields_sizes[HARQ_PROCESS_NUMBER][dci_format-15]));
     left_shift = 0;
     #ifdef NR_PDCCH_DCI_TOOLS_DEBUG
-      printf("\t<-NR_PDCCH_DCI_TOOLS_DEBUG (nr_generate_ue_ul_dlsch_params_from_dci) -> nr_dci_info_extracted->harq_process_number=%x\n",nr_dci_info_extracted.harq_process_number);
+      printf("\t<-NR_PDCCH_DCI_TOOLS_DEBUG (nr_generate_ue_ul_dlsch_params_from_dci) -> nr_dci_info_extracted->harq_process_number=%x\n",nr_dci_info_extracted->harq_process_number);
     #endif
   }
 
 
-  dlsch0_harq   = dlsch[0]->harq_processes[nr_dci_info_extracted.harq_process_number];
+  dlsch0_harq   = dlsch[0]->harq_processes[nr_dci_info_extracted->harq_process_number];
   ulsch0 = ulsch;
 /*  printf("nr_dci_info_extracted.harq_process_number = %d\n",nr_dci_info_extracted.harq_process_number);
   printf("dlsch0 = %d\n",dlsch0);

openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c

@@ -47,6 +47,7 @@
 extern openair0_config_t openair0_cfg[];
 static  nfapi_nr_config_request_t config_t;
 static  nfapi_nr_config_request_t* config =&config_t;
+int cnt=0;
 /* forward declarations */
 void set_default_frame_parms_single(nfapi_nr_config_request_t *config, NR_DL_FRAME_PARMS *frame_parms);
 
@@ -54,7 +55,7 @@ void set_default_frame_parms_single(nfapi_nr_config_request_t *config, NR_DL_FRA
 
 int nr_pbch_detection(PHY_VARS_NR_UE *ue, runmode_t mode)
 {
-
+  printf("nr pbch detec RB_DL %d\n", ue->frame_parms.N_RB_DL);
   uint8_t l,pbch_decoded,frame_mod4,pbch_tx_ant,dummy;
   NR_DL_FRAME_PARMS *frame_parms=&ue->frame_parms;
   char phich_resource[6];
@@ -174,9 +175,10 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
   //  LOG_I(PHY,"**************************************************************\n");
   // First try FDD normal prefix
   frame_parms->Ncp=NORMAL;
-  frame_parms->frame_type=FDD;
+  frame_parms->frame_type=TDD;
   set_default_frame_parms_single(config,frame_parms);
-  nr_init_frame_parms_ue(config,frame_parms);
+  nr_init_frame_parms_ue(frame_parms);
+  printf("nr_initial sync ue RB_DL %d\n", ue->frame_parms.N_RB_DL);
   /*
   write_output("rxdata0.m","rxd0",ue->common_vars.rxdata[0],10*frame_parms->samples_per_tti,1,1);
   exit(-1);
@@ -194,7 +196,9 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
   *                     --------------------------
   *          sync_pos            SS/PBCH block
   */
-
+  cnt++;
+  if (cnt >100){
+	  cnt =0;
   /* process pss search on received buffer */
   sync_pos = pss_synchro_nr(ue, NO_RATE_CHANGE);
 
@@ -211,7 +215,7 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
     else
       ue->rx_offset = FRAME_LENGTH_COMPLEX_SAMPLES + sync_pos2 - sync_pos_slot;
 
-  printf("sync_pos %d sync_pos_slot %d rx_offset\n",sync_pos,sync_pos_slot, ue->rx_offset);
+  printf("sync_pos %d sync_pos_slot %d rx_offset %d\n",sync_pos,sync_pos_slot, ue->rx_offset);
 
 
   //  write_output("rxdata1.m","rxd1",ue->common_vars.rxdata[0],10*frame_parms->samples_per_tti,1,1);
@@ -235,6 +239,11 @@ int nr_initial_sync(PHY_VARS_NR_UE *ue, runmode_t mode)
     nr_gold_pbch(ue);
     ret = nr_pbch_detection(ue,mode);
     
+    nr_gold_pdcch(ue,0, 2);
+    nr_slot_fep(ue,0, 0, ue->rx_offset, 1, 1, NR_PDCCH_EST);
+    nr_slot_fep(ue,1, 0, ue->rx_offset, 1, 1, NR_PDCCH_EST);
+	
+
 LOG_I(PHY,"[UE  %d] AUTOTEST Cell Sync : frame = %d, rx_offset %d, freq_offset %d \n",
               ue->Mod_id,
               ue->proc.proc_rxtx[0].frame_rx,
@@ -254,6 +263,10 @@ LOG_I(PHY,"[UE  %d] AUTOTEST Cell Sync : frame = %d, rx_offset %d, freq_offset %
     LOG_I(PHY,"FDD Normal prefix: SSS error condition: sync_pos %d, sync_pos_slot %d\n", sync_pos, sync_pos_slot);
 #endif
   }
+  }
+  else {
+	  ret = -1;
+  }
 
   /* Consider this is a false detection if the offset is > 1000 Hz */
   if( (abs(ue->common_vars.freq_offset) > 150) && (ret == 0) )

openair1/PHY/NR_UE_TRANSPORT/nr_pbch.c

@@ -486,11 +486,11 @@ void nr_pbch_quantize(int8_t *pbch_llr8,
   uint16_t i;
 
   for (i=0; i<len; i++) {
-    /*if (pbch_llr[i]>7)
-      pbch_llr8[i]=7;
-    else if (pbch_llr[i]<-8)
-      pbch_llr8[i]=-8;
-    else*/
+    if (pbch_llr[i]>127)
+      pbch_llr8[i]=127;
+    else if (pbch_llr[i]<-128)
+      pbch_llr8[i]=-128;
+    else
       pbch_llr8[i] = (char)(pbch_llr[i]);
 
   }
@@ -696,14 +696,27 @@ int nr_rx_pbch( PHY_VARS_NR_UE *ue,
 
   //#ifdef DEBUG_PBCH
   for (i=0; i<(NR_POLAR_PBCH_PAYLOAD_BITS>>3); i++){
-  	  printf("unscrambling pbch_a[%d] = %x \n", i,pbch_a[i]);
-  	  printf("[PBCH] decoder_output[%d] = %x\n",i,decoded_output[i]);
+  	  //printf("unscrambling pbch_a[%d] = %x \n", i,pbch_a[i]);
+  	  printf("[PBCH] decoder payload[%d] = %x\n",i,decoded_output[i]);
   }
 	  //#endif
+    ue->dl_indication.rx_ind = &ue->rx_ind; //  hang on rx_ind instance
+    //ue->rx_ind.sfn_slot = 0;  //should be set by higher-1-layer, i.e. clean_and_set_if_instance()
+    ue->rx_ind.number_pdus = ue->rx_ind.number_pdus + 1;
+    ue->rx_ind.rx_indication_body = (fapi_nr_rx_indication_body_t *)malloc(sizeof(fapi_nr_rx_indication_body_t));
+    ue->rx_ind.rx_indication_body->pdu_type = FAPI_NR_RX_PDU_TYPE_MIB;
+    ue->rx_ind.rx_indication_body->mib_pdu.pdu = &decoded_output[1];
+    ue->rx_ind.rx_indication_body->mib_pdu.additional_bits = decoded_output[0];
+    ue->rx_ind.rx_indication_body->mib_pdu.ssb_index = ssb_index;            //  confirm with TCL
+    ue->rx_ind.rx_indication_body->mib_pdu.ssb_length = Lmax;                //  confirm with TCL
+    ue->rx_ind.rx_indication_body->mib_pdu.cell_id = frame_parms->Nid_cell;  //  confirm with TCL
 
-    ue->dl_indication.rx_ind.rx_request_body.pdu_index = FAPI_NR_RX_PDU_BCCH_BCH_TYPE;
-    ue->dl_indication.rx_ind.rx_request_body.pdu_length = 3;
-    ue->dl_indication.rx_ind.rx_request_body.pdu = &decoded_output[0];
     ue->if_inst->dl_indication(&ue->dl_indication);
 
+    return 0;    
 }
+
+
+
+    
+

openair1/PHY/NR_UE_TRANSPORT/nr_transport_proto_ue.h

@@ -1352,24 +1352,6 @@ int dump_dci(NR_DL_FRAME_PARMS *frame_parms, DCI_ALLOC_t *dci);
 
 int dump_ue_stats(PHY_VARS_NR_UE *phy_vars_ue, UE_nr_rxtx_proc_t *proc, char* buffer, int length, runmode_t mode, int input_level_dBm);
 
-
-
-void generate_pcfich_reg_mapping(NR_DL_FRAME_PARMS *frame_parms);
-
-
-void pcfich_unscrambling(NR_DL_FRAME_PARMS *frame_parms,
-                         uint8_t subframe,
-                         int16_t *d);
-
-
-uint8_t rx_pcfich(NR_DL_FRAME_PARMS *frame_parms,
-                  uint8_t subframe,
-                  NR_UE_PDCCH *lte_ue_pdcch_vars,
-                  MIMO_mode_t mimo_mode);
-
-void generate_phich_reg_mapping(NR_DL_FRAME_PARMS *frame_parms);
-
-
 void init_transport_channels(uint8_t);
 
 void generate_RIV_tables(void);
@@ -1381,7 +1363,7 @@ void generate_RIV_tables(void);
   parameters are know, the routine calls some basic initialization routines (cell-specific reference signals, etc.)
   @param phy_vars_ue Pointer to UE variables
 */
-int initial_sync(PHY_VARS_NR_UE *phy_vars_ue, runmode_t mode);
+int nr_initial_sync(PHY_VARS_NR_UE *phy_vars_ue, runmode_t mode);
 
 
 /*!

openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h

@@ -282,6 +282,12 @@ typedef struct {
   uint32_t G;
   /// Current Number of RBs
   uint16_t nb_rb;
+  /// Starting RB number
+  uint16_t start_rb;
+  /// Number of Symbols
+  uint16_t nb_symbols;
+  /// Starting Symbol number
+  uint16_t start_symbol;
   /// Current subband PMI allocation
   uint16_t pmi_alloc;
   /// Current RB allocation (even slots)

openair1/PHY/NR_UE_TRANSPORT/pss_nr.c

@@ -369,7 +369,7 @@ void init_context_pss_nr(NR_DL_FRAME_PARMS *frame_parms_ue)
      assert(0);
     }
 
-    size = LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*sizeof(int)*frame_parms_ue->samples_per_subframe;
+    size = NR_NUMBER_OF_SUBFRAMES_PER_FRAME*sizeof(int)*frame_parms_ue->samples_per_subframe;
     q = malloc16(size);
     if (q != NULL) {
       pss_corr_ue[i] = q;
@@ -578,7 +578,7 @@ void restore_frame_context_pss_nr(NR_DL_FRAME_PARMS *frame_parms_ue, int rate_ch
 void decimation_synchro_nr(PHY_VARS_NR_UE *PHY_vars_UE, int rate_change, int **rxdata)
 {
   NR_DL_FRAME_PARMS *frame_parms = &(PHY_vars_UE->frame_parms);
-  int samples_for_frame = LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_tti;
+  int samples_for_frame = NR_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->samples_per_tti;
 
 #if TEST_SYNCHRO_TIMING_PSS
 
@@ -631,7 +631,7 @@ int pss_synchro_nr(PHY_VARS_NR_UE *PHY_vars_UE, int rate_change)
 
 #ifdef DBG_PSS_NR
 
-  int samples_for_frame = frame_parms->samples_per_subframe*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME;
+  int samples_for_frame = frame_parms->samples_per_subframe*NR_NUMBER_OF_SUBFRAMES_PER_FRAME;
 
   write_output("rxdata0_rand.m","rxd0_rand", &PHY_vars_UE->common_vars.rxdata[0][0], samples_for_frame, 1, 1);
 
@@ -772,7 +772,7 @@ int pss_search_time_nr(int **rxdata, ///rx data in time domain
   int result;
   int synchro_out;
   unsigned int tmp[NUMBER_PSS_SEQUENCE];
-  unsigned int length = (LTE_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->ttis_per_subframe*frame_parms->samples_per_tti);  /* 1 frame for now, it should be 2 TODO_NR */
+  unsigned int length = (NR_NUMBER_OF_SUBFRAMES_PER_FRAME*frame_parms->ttis_per_subframe*frame_parms->samples_per_tti);  /* 1 frame for now, it should be 2 TODO_NR */
 
   for (int i = 0; i < NUMBER_PSS_SEQUENCE; i++) {
 	  tmp[i] = 0;

openair1/PHY/defs_nr_UE.h

@@ -615,9 +615,9 @@ typedef struct {
 #define NR_NBR_SEARCHSPACE_ACT_BWP  10 // The number of SearchSpaces per BWP is limited to 10 (including initial SEARCHSPACE: SearchSpaceId 0)
 #ifdef NR_PDCCH_DEFS_NR_UE
 
-#define MAX_NR_DCI_DECODED_SLOT 10
-#define NBR_NR_FORMATS         8
-#define NBR_NR_DCI_FIELDS     56
+#define MAX_NR_DCI_DECODED_SLOT     10    // This value is not specified
+#define NBR_NR_FORMATS              8     // The number of formats is 8 (0_0, 0_1, 1_0, 1_1, 2_0, 2_1, 2_2, 2_3)
+#define NBR_NR_DCI_FIELDS           56    // The number of different dci fields defined in TS 38.212 subclause 7.3.1
 
 #define IDENTIFIER_DCI_FORMATS           0
 #define CARRIER_IND                      1
@@ -655,7 +655,6 @@ typedef struct {
 #define TPC_PUCCH                       33
 #define PUCCH_RESOURCE_IND              34
 #define PDSCH_TO_HARQ_FEEDBACK_TIME_IND 35
-//#define SHORT_MESSAGE_IND             33
 #define SRS_RESOURCE_IND                36
 #define PRECOD_NBR_LAYERS               37
 #define ANTENNA_PORTS                   38
@@ -774,11 +773,11 @@ typedef struct {
   int tciStatesPDCCH;
   int tciPresentInDCI;
   uint16_t pdcchDMRSScramblingID;
-
+  uint16_t rb_offset;
 } NR_UE_PDCCH_CORESET;
 
 // Slots for PDCCH Monitoring configured as periodicity and offset
-typedef enum {nr_sl1=1,nr_sl2=2,nr_sl4=4,nr_sl5=5,nr_sl8=8,nr_sl10=10,nr_sl16=16,nr_sl20=20} NR_UE_SLOT_PERIOD_OFFSET_t;
+typedef enum {nr_sl1=1,nr_sl2=2,nr_sl4=4,nr_sl5=5,nr_sl8=8,nr_sl10=10,nr_sl16=16,nr_sl20=20,nr_sl40=40,nr_sl80=80,nr_sl160=160,nr_sl320=320,nr_sl640=640,nr_sl1280=1280,nr_sl2560=2560} NR_UE_SLOT_PERIOD_OFFSET_t;
 typedef enum {nc0=0,nc1=1,nc2=2,nc3=3,nc4=4,nc5=5,nc6=6,nc8=8} NR_UE_SEARCHSPACE_nbrCAND_t;
 typedef enum {nsfi1=1,nsfi2=2} NR_UE_SEARCHSPACE_nbrCAND_SFI_t;
 typedef enum {n2_3_1=1,n2_3_2=2} NR_UE_SEARCHSPACE_nbrCAND_2_3_t;
@@ -848,9 +847,12 @@ typedef struct {
   // INTEGER (0..maxNrofSearchSpaces-1) (0..40-1)
   int searchSpaceId;
   int controlResourceSetId;
-  // FIXME! Verify type to be used for this parameter (sl1, sl2, sl4, sl5, sl8, sl10, sl16, sl20). Maybe enum.
   NR_UE_SLOT_PERIOD_OFFSET_t monitoringSlotPeriodicityAndOffset;
-  int monitoringSlotPeriodicityAndOffset_offset;
+  uint16_t monitoringSlotPeriodicityAndOffset_offset;
+  // duration is number of consecutive slots that a SearchSpace lasts in every occasion, i.e., upon every period as given in the periodicityAndOffset
+  // if the field is absent, the UE applies the value 1 slot
+  // the maximum valid duration is peridicity-1 (periodicity as given in the monitoringSlotPeriodicityAndOffset)
+  uint16_t duration;
   // bit string size 14. Bitmap to indicate symbols within slot where PDCCH has to be monitored
   // the MSB (left) bit represents first OFDM in slot
   uint16_t monitoringSymbolWithinSlot;
@@ -916,11 +918,14 @@ typedef struct {
   uint8_t dciFormat;
   uint8_t agregationLevel;
   #ifdef NR_PDCCH_DEFS_NR_UE
+  int nb_searchSpaces;
   // CORESET structure, where maximum number of CORESETs to be handled is 3 (according to 38.331 V15.1.0)
   NR_UE_PDCCH_CORESET coreset[NR_NBR_CORESET_ACT_BWP];
   // SEARCHSPACE structure, where maximum number of SEARCHSPACEs to be handled is 10 (according to 38.331 V15.1.0)
   // Each SearchSpace is associated with one ControlResourceSet 
   NR_UE_PDCCH_SEARCHSPACE searchSpace[NR_NBR_SEARCHSPACE_ACT_BWP];
+
+  uint32_t nb_search_space;
   #endif
 } NR_UE_PDCCH;
 
@@ -1036,6 +1041,8 @@ typedef struct {
   nr_ue_if_module_t *if_inst;
   nr_downlink_indication_t dl_indication;
   nr_uplink_indication_t ul_indication;
+  fapi_nr_rx_indication_t rx_ind;
+  fapi_nr_dci_indication_t dci_ind;
 
   // point to the current rxTx thread index
   uint8_t current_thread_id[10];
@@ -1086,7 +1093,7 @@ typedef struct {
   uint32_t nr_gold_pdsch[2][20][2][21];
 
   /// PDCCH DMRS
-  uint32_t nr_gold_pdcch[7][20][3][10];
+  uint32_t nr_gold_pdcch[7][20][3][52];
 
   uint32_t X_u[64][839];
 

openair1/PHY/impl_defs_nr.h

@@ -120,6 +120,9 @@ SystemInformationBlockType1_nr_t;
 #define NR_TDD_UPLINK_SLOT                 (0x3FFF) /* uplink bitmap for each symbol, there are 14 symbols per slots */
 #define NR_TDD_SET_ALL_SYMBOLS             (0x3FFF)
 
+#define NR_DOWNLINK_SLOT                   (0x01)
+#define NR_UPLINK_SLOT                     (0x02)
+
 #define FRAME_DURATION_MICRO_SEC           (10000)  /* frame duration in microsecond */
 
 typedef enum {

openair1/SCHED_NR_UE/defs.h

@@ -123,7 +123,7 @@ void phy_procedures_UE_TX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eNB
   @param r_type indicates the relaying operation: 0: no_relaying, 1: unicast relaying type 1, 2: unicast relaying type 2, 3: multicast relaying
   @param phy_vars_rn pointer to RN variables
 */
-int phy_procedures_UE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t abstraction_flag,uint8_t do_pdcch_flag,runmode_t mode,relaying_type_t r_type);
+int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t abstraction_flag,uint8_t do_pdcch_flag,runmode_t mode,relaying_type_t r_type);
 int phy_procedures_slot_parallelization_UE_RX(PHY_VARS_NR_UE *ue,UE_nr_rxtx_proc_t *proc,uint8_t eNB_id,uint8_t abstraction_flag,uint8_t do_pdcch_flag,runmode_t mode,relaying_type_t r_type);
 
 #ifdef UE_SLOT_PARALLELISATION

openair1/SCHED_NR_UE/fapi_nr_ue_l1.c

@@ -41,17 +41,69 @@ extern PHY_VARS_NR_UE ***PHY_vars_UE_g;
 
 int8_t nr_ue_scheduled_response(nr_scheduled_response_t *scheduled_response){
 
+    /// module id
+    module_id_t module_id = scheduled_response->module_id; 
+    /// component carrier id
+    uint8_t cc_id = scheduled_response->CC_id;
+    uint32_t i;
+
     if(scheduled_response != NULL){
+        NR_UE_PDCCH *pdcch_vars2 = PHY_vars_UE_g[module_id][cc_id]->pdcch_vars[0][0];
+        
         if(scheduled_response->dl_config != NULL){
+            fapi_nr_dl_config_request_t *dl_config = scheduled_response->dl_config;
+            
+
+            for(i=0; i<dl_config->number_pdus; ++i){
+                if(dl_config->dl_config_list[i].pdu_type == FAPI_NR_DL_CONFIG_TYPE_DCI){
+                    pdcch_vars2->nb_search_space = pdcch_vars2->nb_search_space + 1;
+                    fapi_nr_dl_config_dci_dl_pdu_rel15_t *dci_config = &dl_config->dl_config_list[i].dci_config_pdu.dci_config_rel15;
+                    
+                    pdcch_vars2->searchSpace[i].monitoringSymbolWithinSlot = dci_config->monitoring_symbols_within_slot;
+                    
+                    pdcch_vars2->searchSpace[i].nrofCandidates_aggrlevel1  = dci_config->number_of_candidates[0];
+                    pdcch_vars2->searchSpace[i].nrofCandidates_aggrlevel2  = dci_config->number_of_candidates[1];
+                    pdcch_vars2->searchSpace[i].nrofCandidates_aggrlevel4  = dci_config->number_of_candidates[2];
+                    pdcch_vars2->searchSpace[i].nrofCandidates_aggrlevel8  = dci_config->number_of_candidates[3];
+                    pdcch_vars2->searchSpace[i].nrofCandidates_aggrlevel16 = dci_config->number_of_candidates[4];
+
+                    pdcch_vars2->coreset[i].duration = dci_config->coreset.duration;
                     
+                    pdcch_vars2->coreset[i].frequencyDomainResources = dci_config->coreset.frequency_domain_resource;
+                    pdcch_vars2->coreset[i].rb_offset = dci_config->coreset.rb_offset;
+
+                    if(dci_config->coreset.cce_reg_mapping_type == CCE_REG_MAPPING_TYPE_INTERLEAVED){
+                        pdcch_vars2->coreset[i].cce_reg_mappingType.shiftIndex = dci_config->coreset.cce_reg_interleaved_shift_index;
+                        pdcch_vars2->coreset[i].cce_reg_mappingType.reg_bundlesize = dci_config->coreset.cce_reg_interleaved_reg_bundle_size;
+                        pdcch_vars2->coreset[i].cce_reg_mappingType.interleaversize = dci_config->coreset.cce_reg_interleaved_interleaver_size;
+                    }else{  //CCE_REG_MAPPING_TYPE_NON_INTERLEAVED
+                        pdcch_vars2->coreset[i].cce_reg_mappingType.shiftIndex = 0;
+                        pdcch_vars2->coreset[i].cce_reg_mappingType.reg_bundlesize = 0;
+                        pdcch_vars2->coreset[i].cce_reg_mappingType.interleaversize = 0;
+                    }
+                    
+                    pdcch_vars2->coreset[i].precoderGranularity = dci_config->coreset.precoder_granularity;
+                    //pdcch_vars2->coreset[i].tciStatesPDCCH;
+                    //pdcch_vars2->coreset[i].tciPresentInDCI;
+                    pdcch_vars2->coreset[i].pdcchDMRSScramblingID = dci_config->coreset.pdcch_dmrs_scrambling_id;
+                }else{  //FAPI_NR_DL_CONFIG_TYPE_DLSCH
+                    //  dlsch config pdu
+                }
+            }
+        }else{
+            pdcch_vars2->nb_search_space = 0;
         }
 
         if(scheduled_response->ul_config != NULL){
 
+        }else{
+            
         }
 
         if(scheduled_response->tx_request != NULL){
 
+        }else{
+            
         }
     }
 

openair1/SCHED_NR_UE/phy_frame_config_nr.c

@@ -250,26 +250,26 @@ int set_tdd_configuration_dedicated_nr(NR_DL_FRAME_PARMS *frame_parms)
 *
 *********************************************************************/
 
-nr_slot_t slot_select_nr(NR_DL_FRAME_PARMS *frame_parms, int nr_frame, int nr_tti)
+int slot_select_nr(NR_DL_FRAME_PARMS *frame_parms, int nr_frame, int nr_tti)
 {
   /* for FFD all slot can be considered as an uplink */
   if (frame_parms->frame_type == FDD) {
-    return (NR_TDD_UPLINK_SLOT);
+    return (NR_UPLINK_SLOT | NR_DOWNLINK_SLOT );
   }
 
   if (nr_frame%2 == 0) {
     if (frame_parms->tdd_uplink_nr[nr_tti] == NR_TDD_UPLINK_SLOT) {
-      return (NR_TDD_UPLINK_SLOT);
+      return (NR_UPLINK_SLOT);
     }
     else {
-      return (NR_TDD_DOWNLINK_SLOT);
+      return (NR_DOWNLINK_SLOT);
     }
   }
   else if ((frame_parms->tdd_uplink_nr[(frame_parms->ttis_per_subframe * LTE_NUMBER_OF_SUBFRAMES_PER_FRAME) + nr_tti] == NR_TDD_UPLINK_SLOT)) {
-    return (NR_TDD_UPLINK_SLOT);
+    return (NR_UPLINK_SLOT);
   }
   else {
-    return (NR_TDD_DOWNLINK_SLOT);
+    return (NR_DOWNLINK_SLOT);
   }
 }
 

openair1/SCHED_NR_UE/phy_frame_config_nr.h

@@ -76,7 +76,7 @@ int set_tdd_configuration_dedicated_nr(NR_DL_FRAME_PARMS *frame_parms);
  *  @param nr_tti   : slot number
     @returns nr_slot_t : downlink or uplink */
 
-nr_slot_t slot_select_nr(NR_DL_FRAME_PARMS *frame_parms, int nr_frame, int nr_tti);
+int slot_select_nr(NR_DL_FRAME_PARMS *frame_parms, int nr_frame, int nr_tti);
 
 /** \brief This function frees tdd configuration for nr
  *  @param frame_parms NR DL Frame parameters

openair1/SCHED_NR_UE/pucch_uci_ue_nr.c

@@ -154,7 +154,7 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
     if (ue->mac_enabled == 1) {
 
       /* sr_payload = 1 means that this is a positive SR, sr_payload = 0 means that it is a negative SR */
-      sr_payload = ue_get_SR(Mod_id,
+      sr_payload = nr_ue_get_SR(Mod_id,
                             CC_id,
                             frame_tx,
                             gNB_id,
@@ -385,7 +385,7 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
     }
 
     /* TS 38.212 6.3.1.2  Code block segmentation and CRC attachment */
-    /* crc attachment can be done depending of paylaod size */
+    /* crc attachment can be done depending of payload size */
     if (N_UCI < 11) {
       O_CRC = 0;  /* no additional crc bits */
     }
@@ -468,8 +468,8 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
   NR_TST_PHY_PRINTF("PUCCH ( AbsSubframe : %d.%d ) ( total payload size %d data 0x%02x ) ( ack length %d data 0x%02x ) ( sr length %d value %d ) ( csi length %d data : 0x%02x ) \n",
                          frame_tx%1024, nr_tti_tx, N_UCI,  pucch_payload, O_ACK, pucch_ack_payload, O_SR, sr_payload, csi_status, csi_payload);
 
-  NR_TST_PHY_PRINTF("PUCCH ( format : %d ) ( modulation : %s ) ( nb prb : %d ) ( nb symbols : %d ) ( max code rate*100 : %d ) ( starting_symbol_index : %d ) \n",
-                        format, (Q_m == BITS_PER_SYMBOL_QPSK ? " QPSK " : " BPSK "), nb_of_prbs, nb_symbols, max_code_rate, starting_symbol_index);
+  NR_TST_PHY_PRINTF("PUCCH ( format : %d ) ( modulation : %s ) ( nb prb : %d ) ( nb symbols total: %d ) ( nb symbols : %d ) ( max code rate*100 : %d ) ( starting_symbol_index : %d ) \n",
+                        format, (Q_m == BITS_PER_SYMBOL_QPSK ? " QPSK " : " BPSK "), nb_of_prbs, nb_symbols_total, nb_symbols, max_code_rate, starting_symbol_index);
 
   NR_TST_PHY_PRINTF("PUCCH ( starting_prb : %d ) ( second_hop : %d ) ( m_0 : %d ) ( m_CS : %d ) ( time_domain_occ %d ) (occ_length : %d ) ( occ_Index : %d ) \n",
                          starting_prb,         second_hop,         m_0,         m_CS,         time_domain_occ,      occ_length,         occ_Index);
@@ -482,6 +482,87 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
                                                   nb_of_prbs, N_sc_ctrl_RB, nb_symbols, N_UCI, O_SR, O_CSI, O_ACK,
                                                   O_CRC, n_HARQ_ACK);
 
+  /* set tx power */
+  ue->tx_power_dBm[nr_tti_tx] = pucch_tx_power;
+  ue->tx_total_RE[nr_tti_tx] = nb_of_prbs*N_SC_RB;
+
+  int tx_amp;
+
+#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706)
+
+  tx_amp = get_tx_amp(pucch_tx_power,
+                      ue->tx_power_max_dBm,
+                      ue->frame_parms.N_RB_UL,
+					  nb_of_prbs);
+#else
+  tx_amp = AMP;
+#endif
+
+  switch(format) {
+    case pucch_format0_nr:
+    {
+      nr_generate_pucch0(ue->common_vars.txdataF,
+                         &ue->frame_parms,
+                         &ue->pucch_config_dedicated_nr[gNB_id],
+						 tx_amp,
+                         nr_tti_tx,
+                         (uint8_t)m_CS,
+						 nb_symbols_total,
+                         starting_symbol_index,
+                         starting_prb);
+      break;
+    }
+    case pucch_format1_nr:
+    {
+      nr_generate_pucch1(ue->common_vars.txdataF,
+                         &ue->frame_parms,
+                         &ue->pucch_config_dedicated_nr[gNB_id],
+                         pucch_payload,
+						 tx_amp,
+                         nr_tti_tx,
+						 nb_symbols_total,
+                         starting_symbol_index,
+                         starting_prb,
+                         second_hop,
+                         (uint8_t)time_domain_occ,
+                         (uint8_t)N_UCI);
+      break;
+    }
+    case pucch_format2_nr:
+    {
+      nr_generate_pucch2(ue->common_vars.txdataF,
+                         &ue->frame_parms,
+                         &ue->pucch_config_dedicated_nr[gNB_id],
+                         pucch_payload,
+						 tx_amp,
+                         nr_tti_tx,
+						 nb_symbols_total,
+                         starting_symbol_index,
+                         nb_of_prbs,
+                         starting_prb,
+                         (uint8_t)N_UCI);
+      break;
+    }
+    case pucch_format3_nr:
+    case pucch_format4_nr:
+    {
+      nr_generate_pucch3_4(ue->common_vars.txdataF,
+                           &ue->frame_parms,
+                           format,
+                           &ue->pucch_config_dedicated_nr[gNB_id],
+                           pucch_payload,
+						   tx_amp,
+                           nr_tti_tx,
+						   nb_symbols_total,
+                           starting_symbol_index,
+                           nb_of_prbs,
+                           starting_prb,
+                           (uint8_t)N_UCI,
+                           (uint8_t)occ_length,
+                           (uint8_t)occ_Index);
+      break;
+    }
+  }
   return (TRUE);
 }
 
@@ -945,7 +1026,7 @@ boolean_t check_pucch_format(PHY_VARS_NR_UE *ue, uint8_t gNB_id, pucch_format_nr
     }
   }
 
-  NR_TST_PHY_PRINTF("PUCCH format %d nb symbols %d uci size %d selected format %d \n", format_pucch, nb_symbols_for_tx, uci_size, selected_pucch_format);
+  NR_TST_PHY_PRINTF("PUCCH format %d nb symbols total %d uci size %d selected format %d \n", format_pucch, nb_symbols_for_tx, uci_size, selected_pucch_format);
 
   if (format_pucch != selected_pucch_format) {
     if (format_pucch != selected_pucch_format_second) {

openair1/SIMULATION/NR_UE_PHY/unit_tests/build/CMakeLists.txt

@@ -55,42 +55,42 @@ set(INC_UNIT_TESTS
 
 add_executable(pss_test ${OPENAIR1_DIR}/SIMULATION/NR_UE_PHY/unit_tests/src/pss_test.c ${SRC_UNIT_TESTS} ${INC_UNIT_TESTS})
 target_link_libraries(pss_test 
-                       -Wl,--start-group UTIL SCHED_UE_LIB SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
+                       -Wl,--start-group UTIL SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
                       pthread m ${ATLAS_LIBRARIES}
                       )
                       
 add_executable(sss_test ${OPENAIR1_DIR}/SIMULATION/NR_UE_PHY/unit_tests/src/sss_test.c ${SRC_UNIT_TESTS} ${INC_UNIT_TESTS})
 target_link_libraries(sss_test 
-                       -Wl,--start-group UTIL SCHED_UE_LIB SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
+                       -Wl,--start-group UTIL SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
                       pthread m ${ATLAS_LIBRARIES}
                       )
 
 add_executable(frame_config_test ${OPENAIR1_DIR}/SIMULATION/NR_UE_PHY/unit_tests/src/frame_config_test.c ${SRC_UNIT_TESTS} ${INC_UNIT_TESTS})
 target_link_libraries(frame_config_test 
-                       -Wl,--start-group UTIL SCHED_UE_LIB SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
+                       -Wl,--start-group UTIL SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
                       pthread m ${ATLAS_LIBRARIES}
                       )
                       
 add_executable(harq_test ${OPENAIR1_DIR}/SIMULATION/NR_UE_PHY/unit_tests/src/harq_test.c ${SRC_UNIT_TESTS} ${INC_UNIT_TESTS})
 target_link_libraries(harq_test 
-                       -Wl,--start-group UTIL SCHED_UE_LIB SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
+                       -Wl,--start-group UTIL SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
                       pthread m ${ATLAS_LIBRARIES}
                       )
                       
 add_executable(srs_test ${OPENAIR1_DIR}/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c ${SRC_UNIT_TESTS} ${INC_UNIT_TESTS})
 target_link_libraries(srs_test 
-                       -Wl,--start-group UTIL SCHED_UE_LIB SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
+                       -Wl,--start-group UTIL SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
                       pthread m ${ATLAS_LIBRARIES}
                       )
                       
 add_executable(pbch_test ${OPENAIR1_DIR}/SIMULATION/NR_UE_PHY/unit_tests/src/pbch_test.c ${SRC_UNIT_TESTS} ${INC_UNIT_TESTS})
 target_link_libraries(pbch_test 
-                      -Wl,--start-group UTIL SCHED_UE_LIB SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
+                      -Wl,--start-group UTIL SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
                       pthread m ${ATLAS_LIBRARIES}
                       )
 
 add_executable(pucch_uci_test ${OPENAIR1_DIR}/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c ${SRC_UNIT_TESTS} ${INC_UNIT_TESTS})
 target_link_libraries(pucch_uci_test 
-                       -Wl,--start-group UTIL SCHED_UE_LIB SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
+                       -Wl,--start-group UTIL SCHED_NR_UE_LIB PHY PHY_COMMON PHY_UE PHY_NR_UE -Wl,--end-group
                       pthread m ${ATLAS_LIBRARIES}
                       )

openair1/SIMULATION/NR_UE_PHY/unit_tests/src/dummy_functions.c

@@ -46,6 +46,11 @@ uint32_t (*p_nr_ue_get_SR)(module_id_t module_idP,int CC_id,frame_t frameP,uint8
 
 /*****************functions****************************************/
 
+lte_subframe_t subframe_select(LTE_DL_FRAME_PARMS *frame_parms,unsigned char subframe)
+{
+	return(0);
+}
+
 PRACH_RESOURCES_t *ue_get_rach(module_id_t module_idP, int CC_id,
 			       frame_t frameP, uint8_t new_Msg3,
 			       sub_frame_t subframe){ return(NULL);}
@@ -61,7 +66,7 @@ void Msg1_transmitted(module_id_t module_idP, uint8_t CC_id,
 void Msg3_transmitted(module_id_t module_idP, uint8_t CC_id,
 		      frame_t frameP, uint8_t eNB_id){}
 
-uint32_t ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP,
+uint32_t nr_ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP,
 		   uint8_t eNB_id, rnti_t rnti, sub_frame_t subframe){
 
 	uint32_t value = 0;
@@ -193,3 +198,8 @@ void exit_fun(const char* s)
   undefined_function(__FUNCTION__);
 }
 
+uint32_t ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP,
+		          uint8_t eNB_id, rnti_t rnti, sub_frame_t subframe){
+	uint32_t value = 0;
+	return(value);
+}

openair1/SIMULATION/NR_UE_PHY/unit_tests/src/frame_config_test.c

@@ -54,26 +54,24 @@ void display_frame_configuration(NR_DL_FRAME_PARMS *frame_parms) {
   printf("\nTdd configuration tti %d downlink %d uplink %d period %d \n", frame_parms->ttis_per_subframe, frame_parms->p_tdd_UL_DL_Configuration->nrofDownlinkSlots,
       frame_parms->p_tdd_UL_DL_Configuration->nrofUplinkSlots, frame_parms->p_tdd_UL_DL_Configuration->dl_UL_TransmissionPeriodicity);
 
-  int k = (TDD_CONFIG_NB_FRAMES * LTE_NUMBER_OF_SUBFRAMES_PER_FRAME) - 1; //19;
+  int k = (TDD_CONFIG_NB_FRAMES * NR_NUMBER_OF_SUBFRAMES_PER_FRAME) - 1; //19;
   int tti = 0;
-  for (int j = 0; j < TDD_CONFIG_NB_FRAMES * frame_parms->ttis_per_subframe * LTE_NUMBER_OF_SUBFRAMES_PER_FRAME; j++) {
+  for (int j = 0; j < TDD_CONFIG_NB_FRAMES * frame_parms->ttis_per_subframe * NR_NUMBER_OF_SUBFRAMES_PER_FRAME; j++) {
     int frame = 0;
     if (j != 0) {
-      frame = (frame_parms->ttis_per_subframe * LTE_NUMBER_OF_SUBFRAMES_PER_FRAME)/j;
-      tti = (j)%(frame_parms->ttis_per_subframe * LTE_NUMBER_OF_SUBFRAMES_PER_FRAME);
+      frame = (frame_parms->ttis_per_subframe * NR_NUMBER_OF_SUBFRAMES_PER_FRAME)/j;
+      tti = (j)%(frame_parms->ttis_per_subframe * NR_NUMBER_OF_SUBFRAMES_PER_FRAME);
     }
     else {
       frame = 0;
       tti = 0;
     }
 
-    if (slot_select_nr(frame_parms, frame, tti)  == NR_TDD_DOWNLINK_SLOT) {
-    //if (frame_parms->tdd_uplink_nr[j] == NR_TDD_DOWNLINK_SLOT) {
+    if (slot_select_nr(frame_parms, frame, tti) & NR_DOWNLINK_SLOT) {
       printf(" [%3d] D", j);
     }
     else {
-      if (slot_select_nr(frame_parms, frame, tti)  == NR_TDD_UPLINK_SLOT) {
-      //if (frame_parms->tdd_uplink_nr[j] == NR_TDD_UPLINK_SLOT) {
+      if (slot_select_nr(frame_parms, frame, tti) & NR_UPLINK_SLOT) {
         printf(" [%3d] U", j);
       }
       else {
@@ -83,7 +81,7 @@ void display_frame_configuration(NR_DL_FRAME_PARMS *frame_parms) {
     }
     if (j == k) {
       printf("\n");
-      k += (TDD_CONFIG_NB_FRAMES * LTE_NUMBER_OF_SUBFRAMES_PER_FRAME); // 20
+      k += (TDD_CONFIG_NB_FRAMES * NR_NUMBER_OF_SUBFRAMES_PER_FRAME); // 20
     }
   }
   printf("\n");
@@ -120,7 +118,7 @@ void set_tti_test(NR_DL_FRAME_PARMS *frame_parms, int ttis_per_subframe)
 
 int test_frame_configuration(PHY_VARS_NR_UE *PHY_vars_UE)
 {
-  LTE_DL_FRAME_PARMS *frame_parms = &(PHY_vars_UE->frame_parms);
+  NR_DL_FRAME_PARMS *frame_parms = &(PHY_vars_UE->frame_parms);
   int v_return = 0;
 
   #define  NO_DOWNLINK_SYMBOL           (0)

openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c

@@ -256,7 +256,7 @@ int init_test(unsigned char N_tx, unsigned char N_rx, unsigned char transmission
   frame_parms->threequarter_fs      = 0;
   frame_parms->numerology_index     = NUMEROLOGY_INDEX_MAX_NR;
 
-  nr_init_frame_parms_ue(config,frame_parms);
+  nr_init_frame_parms_ue(frame_parms);
 
   PHY_vars_UE->frame_parms.Nid_cell = (3 * N_ID_1_NUMBER) + N_ID_2_NUMBER; /* set to unvalid value */
 

openair2/LAYER2/NR_MAC_UE/mac.h

@@ -49,5 +49,65 @@ typedef enum {
     PHY_HO_PRACH
 } NR_UE_L2_STATE_t;
 
+typedef struct {
+    uint8_t LCID:6;     // octet 1 [5:0]
+    uint8_t F:1;        // octet 1 [6]
+    uint8_t R:1;        // octet 1 [7]
+    uint8_t L:8;        // octet 2 [7:0]
+} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_SHORT;
+
+typedef struct {
+    uint8_t LCID:6;     // octet 1 [5:0]
+    uint8_t F:1;        // octet 1 [6]
+    uint8_t R:1;        // octet 1 [7]
+    uint8_t L1:8;       // octet 2 [7:0]
+    uint8_t L2:8;       // octet 3 [7:0]
+} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_LONG;
+
+typedef struct {
+    uint8_t LCID:5;     // octet 1 [5:0]
+    uint8_t R:2;        // octet 1 [7:6]
+} __attribute__ ((__packed__)) NR_MAC_SUBHEADER_FIXED;
+
+//  38.321 ch6.2.1, 38.331
+#define DL_SCH_LCID_CCCH                           0x00
+#define DL_SCH_LCID_SRB1                           0x01
+#define DL_SCH_LCID_SRB2                           0x02
+#define DL_SCH_LCID_SRB3                           0x03
+#define DL_SCH_LCID_RECOMMENDED_BITRATE            0x2F
+#define DL_SCH_LCID_SP_ZP_CSI_RS_RES_SET_ACT       0x30
+#define DL_SCH_LCID_PUCCH_SPATIAL_RELATION_ACT     0x31
+#define DL_SCH_LCID_SP_SRS_ACTIVATION              0x32
+#define DL_SCH_LCID_SP_CSI_REP_PUCCH_ACT           0x33
+#define DL_SCH_LCID_TCI_STATE_IND_UE_SPEC_PDCCH    0x34
+#define DL_SCH_LCID_TCI_STATE_ACT_UE_SPEC_PDSCH    0x35
+#define DL_SCH_LCID_APERIODIC_CSI_TRI_STATE_SUBSEL 0x36
+#define DL_SCH_LCID_SP_CSI_RS_CSI_IM_RES_SET_ACT   0X37 
+#define DL_SCH_LCID_DUPLICATION_ACT                0X38
+#define DL_SCH_LCID_SCell_ACT_4_OCT                0X39
+#define DL_SCH_LCID_SCell_ACT_1_OCT                0X3A
+#define DL_SCH_LCID_L_DRX                          0x3B
+#define DL_SCH_LCID_DRX                            0x3C
+#define DL_SCH_LCID_TA_COMMAND                     0x3D
+#define DL_SCH_LCID_CON_RES_ID                     0x3E
+#define DL_SCH_LCID_PADDING                        0x3F
+
+#define UL_SCH_LCID_CCCH                           0x00
+#define UL_SCH_LCID_SRB1                           0x01
+#define UL_SCH_LCID_SRB2                           0x02
+#define UL_SCH_LCID_SRB3                           0x03
+#define UL_SCH_LCID_CCCH_MSG3                      0x21
+#define UL_SCH_LCID_RECOMMENDED_BITRATE_QUERY      0x35
+#define UL_SCH_LCID_MULTI_ENTRY_PHR_4_OCT          0x36
+#define UL_SCH_LCID_CONFIGURED_GRANT_CONFIRMATION  0x37
+#define UL_SCH_LCID_MULTI_ENTRY_PHR_1_OCT          0x38
+#define UL_SCH_LCID_SINGLE_ENTRY_PHR               0x39
+#define UL_SCH_LCID_C_RNTI                         0x3A
+#define UL_SCH_LCID_S_TRUNCATED_BSR                0x3B
+#define UL_SCH_LCID_L_TRUNCATED_BSR                0x3C
+#define UL_SCH_LCID_S_BSR                          0x3D
+#define UL_SCH_LCID_L_BSR                          0x3E
+#define UL_SCH_LCID_PADDING                        0x3F
+
 
 #endif /*__LAYER2_MAC_DEFS_H__ */

openair2/LAYER2/NR_MAC_UE/mac_defs.h

@@ -59,6 +59,11 @@
 
 #define NB_NR_UE_MAC_INST 1
 
+typedef enum {
+    SFN_C_MOD_2_EQ_0, 
+    SFN_C_MOD_2_EQ_1
+} SFN_C_TYPE;
+
 /*!\brief Top level UE MAC structure */
 typedef struct {
     
@@ -71,30 +76,67 @@ typedef struct {
     NR_RNTI_Value_t 	            *cs_RNTI;
 	NR_MIB_t 			            *mib;
 
-    ///     Type0-PDCCH seach space coreset
-    fapi_nr_search_space_t type0_pdcch_ss;
-    uint32_t type0_pdcch_ss_mux_pattern;
-    float type0_pdcch_ss_big_o;
-    uint32_t type0_pdcch_ss_number_of_search_space_per_slot;
-    float type0_pdcch_ss_big_m;
-    uint32_t type0_pdcch_ss_first_symbol_index;
     ///     Type0-PDCCH seach space
+    fapi_nr_dl_config_dci_dl_pdu_rel15_t type0_pdcch_dci_config;
+    uint32_t type0_pdcch_ss_mux_pattern;
+    SFN_C_TYPE type0_pdcch_ss_sfn_c;
+    uint32_t type0_pdcch_ss_n_c;
+    uint32_t type0_pdcch_consecutive_slots;
 
+    ///     Random access parameter
+    uint16_t ra_rnti;
 
-	////	FAPI-like interface
+
+	////	FAPI-like interface message
 	fapi_nr_tx_request_t tx_request;
 	fapi_nr_ul_config_request_t ul_config_request;
 	fapi_nr_dl_config_request_t dl_config_request;
 	fapi_nr_dci_indication_t dci_indication;
 	fapi_nr_rx_indication_t rx_indication;
 
+
+
 	///     Interface module instances
 	nr_ue_if_module_t *if_module;
 	nr_scheduled_response_t	scheduled_response;
 	nr_phy_config_t phy_config;
 
 
+
+
 } NR_UE_MAC_INST_t;
 
+typedef enum seach_space_mask_e {
+    type0_pdcch  = 0x1, 
+    type0a_pdcch = 0x2,
+    type1_pdcch  = 0x4, 
+    type2_pdcch  = 0x8,
+    type3_pdcch  = 0x10
+} search_space_mask_t;
+
+typedef enum subcarrier_spacing_e {
+    scs_15kHz  = 0x1,
+    scs_30kHz  = 0x2,
+    scs_60kHz  = 0x4,
+    scs_120kHz = 0x8,
+    scs_240kHz = 0x16
+} subcarrier_spacing_t;
+
+typedef enum channel_bandwidth_e {
+    bw_5MHz   = 0x1,
+    bw_10MHz  = 0x2,
+    bw_20MHz  = 0x4,
+    bw_40MHz  = 0x8,
+    bw_80MHz  = 0x16,
+    bw_100MHz = 0x32
+} channel_bandwidth_t;
+
+typedef enum frequency_range_e {
+    FR1 = 0, 
+    FR2
+} frequency_range_t;
+
+#define NUM_SLOT_FRAME 10
+
 /*@}*/
 #endif /*__LAYER2_MAC_DEFS_H__ */

openair2/LAYER2/NR_MAC_UE/mac_extern.h

@@ -30,7 +30,7 @@
  * \warning
  */
 
-
+//	Type0-PDCCH search space
 extern const int32_t table_38213_13_1_c2[16];
 extern const int32_t table_38213_13_1_c3[16];
 extern const int32_t table_38213_13_1_c4[16];
@@ -79,3 +79,11 @@ extern const int32_t table_38213_13_11_c4[16];
 extern const float   table_38213_13_12_c1[16];
 extern const int32_t table_38213_13_12_c2[16];
 extern const float   table_38213_13_12_c3[16];
+
+extern const int32_t table_38213_10_1_1_c2[5];
+
+//  DCI extraction
+//  for PUSCH from TS 38.214 subclause 6.1.2.1.1
+extern uint8_t table_6_1_2_1_1_2_time_dom_res_alloc_A[16][3];
+//  for PDSCH from TS 38.214 subclause 5.1.2.1.1
+extern uint8_t table_5_1_2_1_1_2_time_dom_res_alloc_A[16][3];
\ No newline at end of file

openair2/LAYER2/NR_MAC_UE/mac_proto.h

@@ -43,15 +43,17 @@
    \param extra_bits     extra bits for frame calculation
    \param l_ssb_equal_64 check if ssb number of candicate is equal 64, 1=equal; 0=non equal. Reference 38.212 7.1.1
    \param pduP           pointer to pdu
-   \param pdu_length     length of pdu*/
+   \param pdu_length     length of pdu
+   \param cell_id        cell id */
 int8_t nr_ue_decode_mib(
     module_id_t module_id, 
     int cc_id, 
     uint8_t gNB_index, 
     uint8_t extra_bits, 
-    uint32_t l_ssb_equal_64, 
+    uint32_t ssb_length, 
+    uint32_t ssb_index,
     void *pduP, 
-    uint16_t pdu_len);
+    uint16_t cell_id );
 
 
 /**\brief primitive from RRC layer to MAC layer for configuration L1/L2, now supported 4 rrc messages: MIB, cell_group_config for MAC/PHY, spcell_config(serving cell config)
@@ -94,12 +96,10 @@ NR_UE_L2_STATE_t nr_ue_scheduler(
     const int cc_id,
     const frame_t rx_frame,
     const slot_t rx_slot,
+    const int32_t ssb_index,
     const frame_t tx_frame,
     const slot_t tx_slot);
 
-#endif
-
-
 
 /* \brief Get SR payload (0,1) from UE MAC
 @param Mod_id Instance id of UE in machine
@@ -112,4 +112,20 @@ NR_UE_L2_STATE_t nr_ue_scheduler(
 uint32_t ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP,
        uint8_t eNB_id, rnti_t rnti, sub_frame_t subframe);
 
+
+int8_t nr_ue_process_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_pdu_rel15_t *dci, uint16_t rnti, uint32_t dci_format);
+
+uint32_t get_ssb_frame(uint32_t test);
+uint32_t get_ssb_slot(uint32_t ssb_index);
+
+
+uint32_t mr_ue_get_SR(module_id_t module_idP, int CC_id, frame_t frameP, uint8_t eNB_id, uint16_t rnti, sub_frame_t subframe);
+
+void nr_ue_process_mac_pdu(
+    module_id_t module_idP,
+    uint8_t CC_id,
+    uint8_t *pduP, 
+    uint16_t mac_pdu_len, 
+    uint8_t eNB_index);
+#endif
 /** @}*/
\ No newline at end of file

openair2/LAYER2/NR_MAC_UE/mac_vars.c

@@ -79,12 +79,56 @@ const int32_t table_38213_13_10_c2[16] = {48, 48, 48, 48, 24, 24, 48, 48, reserv
 const int32_t table_38213_13_10_c3[16] = { 1,  1,  2,  2,  1,  1,  1,  1, reserved, reserved, reserved, reserved, reserved, reserved, reserved, reserved}; // index 08-15 reserved
 const int32_t table_38213_13_10_c4[16] = { 0,  8,  0,  8,-41, 25,-41, 49, reserved, reserved, reserved, reserved, reserved, reserved, reserved, reserved}; // index 08-15 reserved, condition A as default
 
-const float   table_38213_13_11_c1[16] = { 0,  0,  2,  2,  5,  5,  7,  7,  0,  5,  0,  0,  2,  2,  5,  5};
+const float   table_38213_13_11_c1[16] = { 0,  0,  2,  2,  5,  5,  7,  7,  0,  5,  0,  0,  2,  2,  5,  5};	//	O
 const int32_t table_38213_13_11_c2[16] = { 1,  2,  1,  2,  1,  2,  1,  2,  1,  1,  1,  1,  1,  1,  1,  1};
-const float   table_38213_13_11_c3[16] = { 1, 0.5f, 1, 0.5f, 1, 0.5f, 1, 0.5f,  1,  1,  1,  1,  1,  1,  1,  1};
+const float   table_38213_13_11_c3[16] = { 1, 0.5f, 1, 0.5f, 1, 0.5f, 1, 0.5f,  1,  1,  1,  1,  1,  1,  1,  1};	//	M
 const int32_t table_38213_13_11_c4[16] = { 0,  0,  0,  0,  0,  0,  0,  0,  0,  0,  1,  2,  1,  2,  1,  2};	// i is even as default
 
-const float   table_38213_13_12_c1[16] = { 0, 0, 2.5f, 2.5f, 5, 5, 0, 2.5f, 5, 7.5f, 7.5f, 7.5f, 0, 5, reserved, reserved}; // index 14-15 reserved
+const float   table_38213_13_12_c1[16] = { 0, 0, 2.5f, 2.5f, 5, 5, 0, 2.5f, 5, 7.5f, 7.5f, 7.5f, 0, 5, reserved, reserved}; // O, index 14-15 reserved
 const int32_t table_38213_13_12_c2[16] = { 1,  2,  1,  2,  1,  2,  2,  2,  2,  1,  2,  2,  1,  1,  reserved,  reserved}; // index 14-15 reserved
-const float   table_38213_13_12_c3[16] = { 1, 0.5f, 1, 0.5f, 1, 0.5f, 0.5f, 0.5f, 0.5f, 1, 0.5f, 0.5f, 1, 1,  reserved,  reserved}; // index 14-15 reserved
-
+const float   table_38213_13_12_c3[16] = { 1, 0.5f, 1, 0.5f, 1, 0.5f, 0.5f, 0.5f, 0.5f, 1, 0.5f, 0.5f, 1, 1,  reserved,  reserved}; // M, index 14-15 reserved
+
+const int32_t table_38213_10_1_1_c2[5] = { 0, 0, 4, 2, 1 };
+
+
+ #define mu_pusch 1
+// definition table j Table 6.1.2.1.1-4
+ #define j ((mu_pusch==3)?3:(mu_pusch==2)?2:1)
+ uint8_t table_6_1_2_1_1_2_time_dom_res_alloc_A[16][3]={ // for PUSCH from TS 38.214 subclause 6.1.2.1.1
+  {j,  0,14}, // row index 1
+  {j,  0,12}, // row index 2
+  {j,  0,10}, // row index 3
+  {j,  2,10}, // row index 4
+  {j,  4,10}, // row index 5
+  {j,  4,8},  // row index 6
+  {j,  4,6},  // row index 7
+  {j+1,0,14}, // row index 8
+  {j+1,0,12}, // row index 9
+  {j+1,0,10}, // row index 10
+  {j+2,0,14}, // row index 11
+  {j+2,0,12}, // row index 12
+  {j+2,0,10}, // row index 13
+  {j,  8,6},  // row index 14
+  {j+3,0,14}, // row index 15
+  {j+3,0,10}  // row index 16
+  };
+
+ #define dmrs_typeA_pos 2
+ uint8_t table_5_1_2_1_1_2_time_dom_res_alloc_A[16][3]={ // for PDSCH from TS 38.214 subclause 5.1.2.1.1
+  {0,(dmrs_typeA_pos == 2)?2:3, (dmrs_typeA_pos == 2)?12:11}, // row index 1
+  {0,(dmrs_typeA_pos == 2)?2:3, (dmrs_typeA_pos == 2)?10:9},  // row index 2
+  {0,(dmrs_typeA_pos == 2)?2:3, (dmrs_typeA_pos == 2)?9:8},   // row index 3
+  {0,(dmrs_typeA_pos == 2)?2:3, (dmrs_typeA_pos == 2)?7:6},   // row index 4
+  {0,(dmrs_typeA_pos == 2)?2:3, (dmrs_typeA_pos == 2)?5:4},   // row index 5
+  {0,(dmrs_typeA_pos == 2)?9:10,(dmrs_typeA_pos == 2)?4:4},   // row index 6
+  {0,(dmrs_typeA_pos == 2)?4:6, (dmrs_typeA_pos == 2)?4:4},   // row index 7
+  {0,5,7},  // row index 8
+  {0,5,2},  // row index 9
+  {0,9,2},  // row index 10
+  {0,12,2}, // row index 11
+  {0,1,13}, // row index 12
+  {0,1,6},  // row index 13
+  {0,2,4},  // row index 14
+  {0,4,7},  // row index 15
+  {0,8,4}   // row index 16
+  };
\ No newline at end of file

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.c

@@ -32,6 +32,7 @@
 
 #include "NR_IF_Module.h"
 #include "mac_proto.h"
+#include "assertions.h"
 
 #include <stdio.h>
 
@@ -39,32 +40,37 @@
 
 static nr_ue_if_module_t *nr_ue_if_module_inst[MAX_IF_MODULES];
 
+//  L2 Abstraction Layer
+int8_t handle_bcch_bch(module_id_t module_id, int cc_id, uint8_t gNB_index, uint8_t *pduP, uint8_t additional_bits, uint32_t ssb_index, uint32_t ssb_length, uint16_t cell_id){
 
-int8_t handle_bcch_bch(uint32_t pdu_len, uint8_t *pduP){
-
-    //  pdu_len = 4, 32bits
-    uint8_t extra_bits = pduP[0];
-    nr_ue_decode_mib(   (module_id_t)0,
-                        0,
-                        0,
-                        extra_bits,
-                        0,  //  Lssb = 64 is not support
-                        &pduP[1],
-                        pdu_len );
+    return nr_ue_decode_mib( module_id,
+                             cc_id,
+                             gNB_index,
+                             additional_bits,
+                             ssb_length,  //  Lssb = 64 is not support    
+                             ssb_index,
+                             pduP, 
+                             cell_id);
 
+}
 
+//  L2 Abstraction Layer
+int8_t handle_bcch_dlsch(module_id_t module_id, int cc_id, uint8_t gNB_index, uint32_t sibs_mask, uint8_t *pduP, uint32_t pdu_len){
 
     return 0;
 }
+//  L2 Abstraction Layer
+int8_t handle_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_pdu_rel15_t *dci, uint16_t rnti, uint32_t dci_type){
 
-int8_t handle_bcch_dlsch(uint32_t pdu_len, uint8_t *pduP){
+    return nr_ue_process_dci(module_id, cc_id, gNB_index, dci, rnti, dci_type);
 
-    return 0;
 }
 
 int8_t nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
 
     NR_UE_L2_STATE_t ret;
+    module_id_t module_id = ul_info->module_id;
+    NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
 
     ret = nr_ue_scheduler(
         ul_info->module_id,
@@ -72,6 +78,7 @@ int8_t nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
         ul_info->cc_id,
         ul_info->frame,
         ul_info->slot,
+        ul_info->ssb_index, 
         0, 0); //  TODO check tx/rx frame/slot is need for NR version
 
     switch(ret){
@@ -87,39 +94,116 @@ int8_t nr_ue_ul_indication(nr_uplink_indication_t *ul_info){
             break;
     }
 
+
+    mac->if_module->scheduled_response(&mac->scheduled_response);
+
     return 0;
 }
 
 int8_t nr_ue_dl_indication(nr_downlink_indication_t *dl_info){
     
+    int32_t i;
+    uint32_t ret_mask = 0x0;
     module_id_t module_id = dl_info->module_id;
     NR_UE_MAC_INST_t *mac = get_mac_inst(module_id);
 
     //  clean up scheduled_response structure
 
-    //if(dl_info->rx_ind != NULL){
+    if(dl_info->rx_ind != NULL){
         printf("[L2][IF MODULE][DL INDICATION][RX_IND]\n");
-        switch(dl_info->rx_ind.rx_request_body.pdu_index){
-            case FAPI_NR_RX_PDU_BCCH_BCH_TYPE:
-                    handle_bcch_bch(dl_info->rx_ind.rx_request_body.pdu_length, dl_info->rx_ind.rx_request_body.pdu);
+        for(i=0; i<dl_info->rx_ind->number_pdus; ++i){
+            switch(dl_info->rx_ind->rx_indication_body[i].pdu_type){
+                case FAPI_NR_RX_PDU_TYPE_MIB:
+                    ret_mask |= (handle_bcch_bch(dl_info->module_id, dl_info->cc_id, dl_info->gNB_index,
+                                (dl_info->rx_ind->rx_indication_body+i)->mib_pdu.pdu, 
+                                (dl_info->rx_ind->rx_indication_body+i)->mib_pdu.additional_bits, 
+                                (dl_info->rx_ind->rx_indication_body+i)->mib_pdu.ssb_index, 
+                                (dl_info->rx_ind->rx_indication_body+i)->mib_pdu.ssb_length,
+                                (dl_info->rx_ind->rx_indication_body+i)->mib_pdu.cell_id )) << FAPI_NR_RX_PDU_TYPE_MIB;
+                    break;
+                case FAPI_NR_RX_PDU_TYPE_SIB:
+                    ret_mask |= (handle_bcch_dlsch(dl_info->module_id, dl_info->cc_id, dl_info->gNB_index,
+                                (dl_info->rx_ind->rx_indication_body+i)->sib_pdu.sibs_mask,
+                                (dl_info->rx_ind->rx_indication_body+i)->sib_pdu.pdu,
+                                (dl_info->rx_ind->rx_indication_body+i)->sib_pdu.pdu_length )) << FAPI_NR_RX_PDU_TYPE_SIB;
                     break;
-            case FAPI_NR_RX_PDU_BCCH_DLSCH_TYPE:
-                    handle_bcch_dlsch(dl_info->rx_ind.rx_request_body.pdu_length, dl_info->rx_ind.rx_request_body.pdu);
+                case FAPI_NR_RX_PDU_TYPE_DLSCH:
+                    ret_mask |= (0) << FAPI_NR_RX_PDU_TYPE_DLSCH;
                     break;
                 default:
+
                     break;
 
             }
-    //}
+        }
+    }
+
+    
+
+    if(dl_info->dci_ind != NULL){
+        printf("[L2][IF MODULE][DL INDICATION][DCI_IND]\n");
+        for(i=0; dl_info->dci_ind->number_of_dcis; ++i){
+            fapi_nr_dci_pdu_rel15_t *dci = &dl_info->dci_ind->dci_list[i].dci;
+
+            ret_mask |= (handle_dci(
+                dl_info->module_id,
+                dl_info->cc_id,
+                dl_info->gNB_index,
+                dci, 
+                (dl_info->dci_ind->dci_list+i)->rnti, 
+                (dl_info->dci_ind->dci_list+i)->dci_format)) << FAPI_NR_DCI_IND;
+
+
+            /*switch((dl_info->dci_ind->dci_list+i)->dci_type){
+                case FAPI_NR_DCI_TYPE_0_0:
+                case FAPI_NR_DCI_TYPE_0_1:
+                case FAPI_NR_DCI_TYPE_1_1:
+                case FAPI_NR_DCI_TYPE_2_0:
+                case FAPI_NR_DCI_TYPE_2_1:
+                case FAPI_NR_DCI_TYPE_2_2:
+                case FAPI_NR_DCI_TYPE_2_3:
+                    AssertFatal(1==0, "Not yet support at this moment!\n");
+                    break;
+                
+                case FAPI_NR_DCI_TYPE_1_0:
+                    
+                    dl_config->dl_config_list[dl_config->number_pdus].pdu_type = FAPI_NR_DL_CONFIG_TYPE_DLSCH;
+
+                    //  mapping into DL_CONFIG_REQ for DL-SCH
+                    fapi_nr_dl_config_dlsch_pdu_rel15_t *dlsch_config_pdu = &dl_config->dl_config_list[dl_config->number_pdus].dlsch_config_pdu.dlsch_config_rel15;
+                    
+                    dl_config->dl_config_list[dl_config->number_pdus].dlsch_config_pdu.rnti = 0x0000;   //  TX RNTI: UE-spec
+                    memcpy(dlsch_config_pdu, dci, sizeof(fapi_nr_dci_pdu_rel15_t));
+
+                    dl_config->number_pdus = dl_config->number_pdus + 1;
+
+                    ret_mask |= (handle_dci(
+                                dl_info->module_id,
+                                dl_info->cc_id,
+                                dl_info->gNB_index,
+                                dci, 
+                                (dl_info->dci_ind->dci_list+i)->rnti, 
+                                (dl_info->dci_ind->dci_list+i)->dci_type)) << FAPI_NR_DCI_IND;
+
+                    
+
+                    break;
+
+                default:
+                    break;
+            }*/
+
+
+            //(dl_info->dci_list+i)->rnti
+            
             
-    //if(dl_info->dci_ind != NULL){
 
-    //}
 
-    if(nr_ue_if_module_inst[module_id] != NULL){
-        nr_ue_if_module_inst[module_id]->scheduled_response(&mac->scheduled_response);
+        }
     }
 
+    AssertFatal( nr_ue_if_module_inst[module_id] != NULL, "IF module is void!\n" );
+    nr_ue_if_module_inst[module_id]->scheduled_response(&mac->scheduled_response);
 
     return 0;
 }

openair2/NR_UE_PHY_INTERFACE/NR_IF_Module.h

@@ -36,9 +36,13 @@
 #include "platform_types.h"
 #include "fapi_nr_ue_interface.h"
 
+
+
 typedef struct {
     /// module id
     module_id_t module_id;
+    /// gNB index
+    uint32_t gNB_index;
     /// component carrier id
     int cc_id;
     /// frame 
@@ -48,10 +52,10 @@ typedef struct {
 
     /// NR UE FAPI-like P7 message, direction: L1 to L2
     /// data reception indication structure
-    fapi_nr_rx_indication_t rx_ind;
+    fapi_nr_rx_indication_t *rx_ind;
 
     /// dci reception indication structure
-    fapi_nr_dci_indication_t dci_ind;
+    fapi_nr_dci_indication_t *dci_ind;
 
 } nr_downlink_indication_t;
 
@@ -67,6 +71,8 @@ typedef struct {
     frame_t frame;
     /// slot
     uint32_t slot;
+    /// ssb_index, if ssb is not present in current TTI, thie value set to -1
+    int8_t ssb_index;
 } nr_uplink_indication_t;
 
 // Downlink subframe P7
@@ -175,18 +181,22 @@ int8_t nr_ue_if_module_kill(uint32_t module_id);
    \param dl_info including dci_ind and rx_request messages*/
 int8_t nr_ue_dl_indication(nr_downlink_indication_t *dl_info);
 
-
+//  TODO check
 /**\brief handle BCCH-BCH message from dl_indication
-   \param pdu_len   length(bytes) of pdu
-   \param pduP      pointer to pdu*/
-int8_t handle_bcch_bch(uint32_t pdu_len, uint8_t *pduP);
-
-
+   \param pduP            pointer to bch pdu
+   \param additional_bits corresponding to 38.212 ch.7
+   \param ssb_index       SSB index within 0 - (L_ssb-1) corresponding to 38.331 ch.13 parameter i
+   \param ssb_length      corresponding to L1 parameter L_ssb 
+   \param cell_id         cell id */
+int8_t handle_bcch_bch(module_id_t module_id, int cc_id, uint8_t gNB_index, uint8_t *pduP, uint8_t additional_bits, uint32_t ssb_index, uint32_t ssb_length, uint16_t cell_id);
+
+//  TODO check
 /**\brief handle BCCH-DL-SCH message from dl_indication
    \param pdu_len   length(bytes) of pdu
    \param pduP      pointer to pdu*/
-int8_t handle_bcch_dlsch(uint32_t pdu_len, uint8_t *pduP);
+int8_t handle_bcch_dlsch(module_id_t module_id, int cc_id, uint8_t gNB_index, uint32_t sibs_mask, uint8_t *pduP, uint32_t pdu_len);
 
+int8_t handle_dci(module_id_t module_id, int cc_id, uint8_t gNB_index, fapi_nr_dci_pdu_rel15_t *dci, uint16_t rnti, uint32_t dci_type);
 
 #endif
 

openair2/RRC/LTE/rrc_UE.c

@@ -1808,8 +1808,9 @@ rrc_ue_process_rrcConnectionReconfiguration(
         rrc_ue_process_radioResourceConfigDedicated(ctxt_pP,eNB_index, rrcConnectionReconfiguration_r8->radioResourceConfigDedicated);
       }
     
-      
-/*      void *non_criticical_ext_iterator = rrcConnectionReconfiguration_r8;
+//  LTE Rel 15 not yet here
+#if Rel15
+      void *non_criticical_ext_iterator = rrcConnectionReconfiguration_r8;
       RCCConnectionReconfiguration_v1510_IEs_t *rrc_connection_reconfiguration_v1510_IEs = (RRCConnectionReconfiguration_v1510_IEs_t *)0;
       // fetch EN-DC for NR_RRC here
       // r8
@@ -1851,7 +1852,7 @@ rrc_ue_process_rrcConnectionReconfiguration(
             case nr_Config_r15_PR_setup:
               //  process NR sCell config
               if(rrc_connection_reconfiguration_v1510_IEs->nr_Config_r15.choice.setup->nr_SecondaryCellGroupConfig_r15 != (OCTET_STRING_t *)0){
-                nr_rrc_ue_decode_rrcReconfiguration(  rrc_connection_reconfiguration_v1510_IEs->nr_Config_r15.choice.setup->nr_SecondaryCellGroupConfig_r15->buffer, 
+                nr_rrc_ue_decode_secondary_cellgroup_config(  rrc_connection_reconfiguration_v1510_IEs->nr_Config_r15.choice.setup->nr_SecondaryCellGroupConfig_r15->buffer, 
                                                               rrc_connection_reconfiguration_v1510_IEs->nr_Config_r15.choice.setup->nr_SecondaryCellGroupConfig_r15.size); 
               }
              
@@ -1862,7 +1863,8 @@ rrc_ue_process_rrcConnectionReconfiguration(
               break;
           }
         }
-      }*/
+      }
+#endif
 
 #if defined(ENABLE_ITTI)
 

openair2/RRC/NR_UE/L2_interface_ue.c

@@ -32,6 +32,7 @@
 
 #include "rrc_defs.h"
 #include "rrc_proto.h"
+#include "assertions.h"
 
 typedef uint32_t channel_t;
 
@@ -46,7 +47,7 @@ nr_mac_rrc_data_ind_ue(
 
     switch(channel){
         case NR_BCCH_BCH:
-            nr_rrc_ue_decode_NR_BCCH_BCH_Message( module_id, gNB_index, (uint8_t*)pduP, pdu_len);
+            AssertFatal( nr_rrc_ue_decode_NR_BCCH_BCH_Message( module_id, gNB_index, (uint8_t*)pduP, pdu_len) == 0, "UE decode BCCH-BCH error!\n");
             break;
         default:
             break;

openair2/RRC/NR_UE/rrc_UE.c

@@ -50,22 +50,34 @@
 // from LTE-RRC DL-DCCH RRCConnectionReconfiguration nr-secondary-cell-group-config (encoded)
 int8_t nr_rrc_ue_decode_secondary_cellgroup_config(
     const uint8_t *buffer,
-    const uint32_t size
-){
-    NR_CellGroupConfig_t *cellGroupConfig = NULL;
+    const uint32_t size ){
     
-    uper_decode(NULL,
-                &asn_DEF_NR_CellGroupConfig,   //might be added prefix later
-                (void **)&cellGroupConfig,
+    NR_CellGroupConfig_t *cell_group_config = NULL;
+    uint32_t i;
+
+    asn_dec_rval_t dec_rval = uper_decode_complete( NULL,
+                                                    &asn_DEF_NR_CellGroupConfig,
+                                                    (void **)&cell_group_config,
                                                     (uint8_t *)buffer,
-                size, 0, 0); 
+                                                    size ); 
+
+    if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
+            printf("NR_CellGroupConfig decode error\n");
+            for (i=0; i<size; i++){
+                printf("%02x ",buffer[i]);
+            }
+            printf("\n");
+            // free the memory
+            SEQUENCE_free( &asn_DEF_NR_CellGroupConfig, (void *)cell_group_config, 1 );
+            return -1;
+    }
 
     if(NR_UE_rrc_inst->cell_group_config == NULL){
-        NR_UE_rrc_inst->cell_group_config = cellGroupConfig;
-        nr_rrc_ue_process_scg_config(cellGroupConfig);
+        NR_UE_rrc_inst->cell_group_config = cell_group_config;
+        nr_rrc_ue_process_scg_config(cell_group_config);
     }else{
-        nr_rrc_ue_process_scg_config(cellGroupConfig);
-        SEQUENCE_free(&asn_DEF_NR_CellGroupConfig, (void *)cellGroupConfig, 0);
+        nr_rrc_ue_process_scg_config(cell_group_config);
+        SEQUENCE_free(&asn_DEF_NR_CellGroupConfig, (void *)cell_group_config, 0);
     }
 
     //nr_rrc_mac_config_req_ue( module_id_t module_id, int CC_id, uint8_t gNB_index, NR_MIB_t *mibP, NR_MAC_CellGroupConfig_t *mac_cell_group_configP, NR_PhysicalCellGroupConfig_t *phy_cell_group_configP, NR_SpCellConfig_t *spcell_configP );
@@ -263,34 +275,34 @@ int8_t openair_rrc_top_init_ue_nr(void){
 int8_t nr_ue_process_rlc_bearer_list(NR_CellGroupConfig_t *cell_group_config){
 
     return 0;
-};
+}
 
 int8_t nr_ue_process_secondary_cell_list(NR_CellGroupConfig_t *cell_group_config){
 
     return 0;
-};
+}
 
 int8_t nr_ue_process_mac_cell_group_config(NR_MAC_CellGroupConfig_t *mac_cell_group_config){
 
     return 0;
-};
+}
 
 int8_t nr_ue_process_physical_cell_group_config(NR_PhysicalCellGroupConfig_t *phy_cell_group_config){
 
     return 0;
-};
+}
 
 int8_t nr_ue_process_spcell_config(NR_SpCellConfig_t *spcell_config){
 
     return 0;
-};
+}
 
 /*brief decode BCCH-BCH (MIB) message*/
 int8_t nr_rrc_ue_decode_NR_BCCH_BCH_Message(
     const module_id_t module_id,
     const uint8_t     gNB_index,
     uint8_t           *const bufferP,
-    const uint8_t     buffer_len){
+    const uint8_t     buffer_len ){
     int i;
     NR_BCCH_BCH_Message_t *bcch_message = NULL;
     NR_MIB_t *mib = NR_UE_rrc_inst->mib;
@@ -308,15 +320,14 @@ int8_t nr_rrc_ue_decode_NR_BCCH_BCH_Message(
                                                     &asn_DEF_NR_BCCH_BCH_Message,
                                                    (void **)&bcch_message,
                                                    (const void *)bufferP,
-                            buffer_len
-		    );
+                                                   buffer_len );
 
     if(bcch_message->message.choice.mib->systemFrameNumber.buf != 0){
-	    if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
-		
-		for (i=0; i<buffer_len; i++)
+        if ((dec_rval.code != RC_OK) || (dec_rval.consumed == 0)) {
+            printf("NR_CellGroupConfig decode error\n");
+            for (i=0; i<buffer_len; i++){
                 printf("%02x ",bufferP[i]);
-
+            }
             printf("\n");
             // free the memory
             SEQUENCE_free( &asn_DEF_NR_BCCH_BCH_Message, (void *)bcch_message, 1 );
@@ -331,6 +342,7 @@ int8_t nr_rrc_ue_decode_NR_BCCH_BCH_Message(
 
 	    nr_rrc_mac_config_req_ue( 0, 0, 0, mib, NULL, NULL, NULL);
     }
+    
     return 0;
 }
 
@@ -340,8 +352,9 @@ int8_t nr_rrc_ue_decode_NR_DL_DCCH_Message(
     const module_id_t module_id,
     const uint8_t     gNB_index,
     const uint8_t    *bufferP,
-    const uint32_t    buffer_len){
+    const uint32_t    buffer_len ){
     //  uper_decode by nr R15 rrc_connection_reconfiguration
+    
     int32_t i;
     NR_DL_DCCH_Message_t *nr_dl_dcch_msg = NULL;
 
@@ -351,7 +364,7 @@ int8_t nr_rrc_ue_decode_NR_DL_DCCH_Message(
                                             (uint8_t *)bufferP,
                                             buffer_len, 0, 0);
 
-    if ((dec_rval.code != RC_OK) && (dec_rval.consumed == 0)) {
+    if ((dec_rval.code != RC_OK) || (dec_rval.consumed == 0)) {
 
         for (i=0; i<buffer_len; i++)
             printf("%02x ",bufferP[i]);

openair2/RRC/NR_UE/rrc_proto.h

@@ -58,7 +58,7 @@ int8_t openair_rrc_top_init_ue_nr(void);
    \param buffer  encoded NR-RRC-Connection-Reconfiguration/Secondary-Cell-Group-Config message.
    \param size    length of buffer*/
 //TODO check to use which one
-int8_t nr_rrc_ue_decode_rrcReconfiguration(const uint8_t *buffer, const uint32_t size);
+//int8_t nr_rrc_ue_decode_rrcReconfiguration(const uint8_t *buffer, const uint32_t size);
 int8_t nr_rrc_ue_decode_secondary_cellgroup_config(const uint8_t *buffer, const uint32_t size);
    
 

targets/RT/USER/nr-uesoftmodem.c

@@ -245,7 +245,7 @@ int emulate_rf = 0;
 threads_t threads= {-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1};
 
 /* forward declarations */
-void set_default_frame_parms(nfapi_nr_config_request_t *config[MAX_NUM_CCs], NR_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]);
+void set_default_frame_parms(NR_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]);
 
 
 /* see file openair2/LAYER2/MAC/main.c for why abstraction_flag is needed
@@ -628,7 +628,7 @@ int T_port = 2021;    /* default port to listen to to wait for the tracer */
 int T_dont_fork = 0;  /* default is to fork, see 'T_init' to understand */
 #endif
 
-  void set_default_frame_parms(nfapi_nr_config_request_t *config[MAX_NUM_CCs], NR_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]) {
+void set_default_frame_parms(NR_DL_FRAME_PARMS *frame_parms[MAX_NUM_CCs]) {
 
   int CC_id;
 
@@ -700,7 +700,6 @@ void set_default_frame_parms_single(nfapi_nr_config_request_t *config, NR_DL_FRA
   //int CC_id;
 
   //for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
-        frame_parms = (NR_DL_FRAME_PARMS*) malloc(sizeof(NR_DL_FRAME_PARMS));
         /* Set some default values that may be overwritten while reading options */
         frame_parms = (NR_DL_FRAME_PARMS*) malloc(sizeof(NR_DL_FRAME_PARMS));
         config = (nfapi_nr_config_request_t*) malloc(sizeof(nfapi_nr_config_request_t));
@@ -899,7 +898,7 @@ int main( int argc, char **argv ) {
     set_latency_target();
 
     // set default parameters
-    set_default_frame_parms(config,frame_parms);
+    set_default_frame_parms(frame_parms);
 
     // initialize logging
     logInit();
@@ -985,6 +984,7 @@ int main( int argc, char **argv ) {
 
   LOG_I(HW, "Version: %s\n", PACKAGE_VERSION);
 
+   // set_default_frame_parms(frame_parms);//
   // init the parameters
   for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
 
@@ -995,10 +995,10 @@ int main( int argc, char **argv ) {
 
       LOG_I(PHY,"Set nb_rx_antenna %d , nb_tx_antenna %d \n",frame_parms[CC_id]->nb_antennas_rx, frame_parms[CC_id]->nb_antennas_tx);
 
-      set_default_frame_parms(config[CC_id],frame_parms[CC_id]);
+      //set_default_frame_parms(config[CC_id],frame_parms[CC_id]);
       
     //init_ul_hopping(frame_parms[CC_id]);
-    nr_init_frame_parms_ue(config[CC_id],frame_parms[CC_id]);
+    nr_init_frame_parms_ue(frame_parms[CC_id]);
     printf("after init frame_parms %d\n",frame_parms[CC_id]->ofdm_symbol_size);
     //   phy_init_top(frame_parms[CC_id]);
     phy_init_nr_top(frame_parms[CC_id]);
@@ -1238,7 +1238,7 @@ int main( int argc, char **argv ) {
    //}
 
     // connect the TX/RX buffers
-    if (UE_flag==1) {
+    //if (UE_flag==1) {
 
         for (CC_id=0; CC_id<MAX_NUM_CCs; CC_id++) {
 
@@ -1265,7 +1265,7 @@ int main( int argc, char **argv ) {
                 printf("error reading from file\n");
         }
         //p_exmimo_config->framing.tdd_config = TXRXSWITCH_TESTRX;
-    }
+    //}
     sleep(3);