Merge branch 'nr_initialsync' of...

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

cmake_targets/CMakeLists.txt

@@ -1246,6 +1246,8 @@ set(PHY_SRC_UE
   # actual source
   ${OPENAIR1_DIR}/PHY/INIT/nr_init.c
   ${OPENAIR1_DIR}/PHY/INIT/nr_parms.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_pss.c
+  ${OPENAIR1_DIR}/PHY/NR_TRANSPORT/nr_sss.c
   ${OPENAIR1_DIR}/PHY/TOOLS/file_output.c
   ${OPENAIR1_DIR}/PHY/TOOLS/cadd_vv.c
   ${OPENAIR1_DIR}/PHY/TOOLS/lte_dfts.c
@@ -2177,14 +2179,24 @@ target_link_libraries (lte-uesoftmodem-nos1 ${T_LIB})
 ###################################################
 
 add_executable(nr-softmodem
-  #${rrc_h}
-  #${s1ap_h}
+  ${rrc_h}
+  ${s1ap_h}
+  ${OPENAIR_BIN_DIR}/messages_xml.h
+  ${OPENAIR_TARGETS}/RT/USER/rt_wrapper.c
+  ${OPENAIR_TARGETS}/RT/USER/nr-gnb.c
+  ${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}/ARCH/COMMON/common_lib.c
+  ${OPENAIR2_DIR}/RRC/NAS/nas_config.c
+  ${OPENAIR2_DIR}/RRC/NAS/rb_config.c
+  ${OPENAIR1_DIR}/SIMULATION/ETH_TRANSPORT/netlink_init.c
   ${OPENAIR_DIR}/common/utils/utils.c
   ${OPENAIR_DIR}/common/utils/system.c
-  #${GTPU_need_ITTI}
-  #${XFORMS_SOURCE}
-  #${XFORMS_SOURCE_SOFTMODEM}
+  ${GTPU_need_ITTI}
+  ${XFORMS_SOURCE}
+  ${XFORMS_SOURCE_SOFTMODEM}
   ${T_SOURCE}
   ${CONFIG_SOURCES}
   ${SHLIB_LOADER_SOURCES}
@@ -2192,10 +2204,10 @@ add_executable(nr-softmodem
 
 target_link_libraries (nr-softmodem
   -Wl,--start-group
-  UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY_NR LFDS GTPV1U SECU_CN SECU_OSA
+  UTIL HASHTABLE SCTP_CLIENT UDP SCHED_LIB PHY_NR PHY LFDS GTPV1U SECU_CN SECU_OSA
   ${ITTI_LIB} ${FLPT_MSG_LIB} ${ASYNC_IF_LIB} ${FLEXRAN_AGENT_LIB} LFDS7 ${MSC_LIB} ${RAL_LIB} ${NAS_UE_LIB}
-  #RRC_LIB S1AP_LIB S1AP_ENB L2
-  #NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
+  RRC_LIB S1AP_LIB S1AP_ENB L2
+  NFAPI_COMMON_LIB NFAPI_LIB NFAPI_VNF_LIB NFAPI_PNF_LIB NFAPI_USER_LIB
   -Wl,--end-group z dl)
 
 target_link_libraries (nr-softmodem ${LIBXML2_LIBRARIES})

common/ran_context.h

@@ -77,6 +77,8 @@ typedef struct {
   flexran_agent_info_t **flexran;
   /// eNB context variables
   struct PHY_VARS_eNB_s ***eNB;
+  /// gNB context variables
+  struct PHY_VARS_gNB_s ***gNB;
   /// NB_IoT L1 context variables
   struct PHY_VARS_eNB_NB_IoT_s **L1_NB_IoT;
   /// RRC context variables

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

@@ -15,7 +15,8 @@
  */
 
 
-#ifndef _NFAPI_INTERFACE_H_
+#ifndef _NFAPI_INTERFACE_NR_EXTENSION_H_
+#define _NFAPI_INTERFACE_NR_EXTENSION_H_
 #define _NFAPI_INTERFACE_H_
 
 #include "stddef.h"
@@ -338,7 +339,8 @@ typedef enum {
 	NFAPI_3GPP_REL_SUPPORTED_9 = 1,
 	NFAPI_3GPP_REL_SUPPORTED_10 = 2,
 	NFAPI_3GPP_REL_SUPPORTED_11 = 4,
-	NFAPI_3GPP_REL_SUPPORTED_12 = 8
+	NFAPI_3GPP_REL_SUPPORTED_12 = 8,
+  NFAPI_3GPP_REL_SUPPORTED_15 = 64
 } nfapi_3gpp_release_supported_e;
 
 
@@ -357,7 +359,8 @@ typedef enum {
 	NFAPI_RAT_TYPE_LTE = 0,
 	NFAPI_RAT_TYPE_UTRAN = 1,
 	NFAPI_RAT_TYPE_GERAN = 2,
-	NFAPI_RAT_TYPE_NB_IOT = 3
+	NFAPI_RAT_TYPE_NB_IOT = 3,
+  NFAPI_RAT_TYPE_NR = 4
 } nfapi_rat_type_e;
 
 typedef enum {
@@ -534,6 +537,16 @@ typedef struct {
 } nfapi_pnf_phy_rel13_nb_iot_t;
 #define NFAPI_PNF_PHY_REL13_NB_IOT_TAG 0x100E
 
+typedef struct {
+  uint16_t phy_config_index;
+} nfapi_pnf_phy_rel15_info_t;
+
+typedef struct {
+  nfapi_tl_t tl;
+  uint16_t number_of_phys;
+  nfapi_pnf_phy_rel15_info_t phy[NFAPI_MAX_PNF_PHY];
+} nfapi_pnf_phy_rel15_t;
+#define NFAPI_PNF_PHY_REL15_TAG 0x100H
 
 
 typedef struct {
@@ -619,6 +632,7 @@ typedef struct {
 #define NFAPI_L23_CONFIG_SFNSF_TAG 0x00F1
 
 typedef struct {
+  nfapi_uint16_tlv_t numerology_index_mu;
 	nfapi_uint16_tlv_t duplex_mode;
 	nfapi_uint16_tlv_t pcfich_power_offset;
 	nfapi_uint16_tlv_t pb;
@@ -631,6 +645,7 @@ typedef struct {
 #define NFAPI_SUBFRAME_CONFIG_PB_TAG 0x0003
 #define NFAPI_SUBFRAME_CONFIG_DL_CYCLIC_PREFIX_TYPE_TAG 0x0004
 #define NFAPI_SUBFRAME_CONFIG_UL_CYCLIC_PREFIX_TYPE_TAG 0x0005
+#define NFAPI_SUBFRAME_CONFIG_NUMEROLOGY_INDEX_MU_TAG 0x0006
 
 typedef struct {
 	nfapi_uint16_tlv_t dl_channel_bandwidth;
@@ -656,15 +671,30 @@ typedef struct {
 #define NFAPI_PHICH_CONFIG_PHICH_DURATION_TAG 0x0015
 #define NFAPI_PHICH_CONFIG_PHICH_POWER_OFFSET_TAG 0x0016
 
+typedef enum {
+  NFAPI_HALF_FRAME_INDEX_FIRST_HALF = 0,
+  NFAPI_HALF_FRAME_INDEX_SECOND_HALF = 1
+} nfapi_half_frame_index_e;
+
 typedef struct {
 	nfapi_uint16_tlv_t primary_synchronization_signal_epre_eprers;
 	nfapi_uint16_tlv_t secondary_synchronization_signal_epre_eprers;
 	nfapi_uint16_tlv_t physical_cell_id;
+  nfapi_half_frame_index_e half_frame_index;
+  nfapi_uint16_tlv_t ssb_subcarrier_offset;
+  nfapi_uint16_tlv_t ssb_position_in_burst;
+  nfapi_uint16_tlv_t ssb_periodicity;
+  nfapi_uint16_tlv_t ss_pbch_block_power;
 } nfapi_sch_config_t;
 
 #define NFAPI_SCH_CONFIG_PRIMARY_SYNCHRONIZATION_SIGNAL_EPRE_EPRERS_TAG 0x001E
 #define NFAPI_SCH_CONFIG_SECONDARY_SYNCHRONIZATION_SIGNAL_EPRE_EPRERS_TAG 0x001F
 #define NFAPI_SCH_CONFIG_PHYSICAL_CELL_ID_TAG 0x0020
+#define NFAPI_SCH_CONFIG_HALF_FRAME_INDEX_TAG 0x0021
+#define NFAPI_SCH_CONFIG_SSB_SUBCARRIER_OFFSET_TAG 0x0022
+#define NFAPI_SCH_CONFIG_SSB_POSITION_IN_BURST 0x0023
+#define NFAPI_SCH_CONFIG_SSB_PERIODICITY 0x0024
+#define NFAPI_SCH_CONFIG_SS_PBCH_BLOCK_POWER 0x0025
 
 typedef struct {
 	nfapi_uint16_tlv_t configuration_index;
@@ -1038,6 +1068,7 @@ typedef struct {
 	nfapi_pnf_phy_rel12_t pnf_phy_rel12;
 	nfapi_pnf_phy_rel13_t pnf_phy_rel13;
 	nfapi_pnf_phy_rel13_nb_iot_t pnf_phy_rel13_nb_iot;
+  nfapi_pnf_phy_rel15_t pnf_phy_rel15;
 	nfapi_vendor_extension_tlv_t vendor_extension;
 } nfapi_pnf_param_response_t;
 

openair1/PHY/INIT/nr_parms.c

@@ -24,14 +24,15 @@
 
 /// Subcarrier spacings in Hz indexed by numerology index
 uint32_t nr_subcarrier_spacing[MAX_NUM_SUBCARRIER_SPACING] = {15e3, 30e3, 60e3, 120e3, 240e3};
+uint16_t nr_slots_per_subframe[MAX_NUM_SUBCARRIER_SPACING] = {1, 2, 4, 16, 32};
 
-int nr_init_frame_parms(nfapi_param_t nfapi_params,
+int nr_init_frame_parms(nfapi_config_request_t config,
                         NR_DL_FRAME_PARMS *frame_parms)
 {
 
-  int N_RB = nfapi_params.rf_config.dl_channel_bandwidth.value;
-  int Ncp = nfapi_params.subframe_config.dl_cyclic_prefix_type.value;
-  int mu = nfapi_params.pnf_phy_rel15.phy[0].mu;
+  int N_RB = config.rf_config.dl_channel_bandwidth.value;
+  int Ncp = config.subframe_config.dl_cyclic_prefix_type.value;
+  int mu = config.subframe_config.numerology_index_mu.value;
 
 #if DISABLE_LOG_X
   printf("Initializing frame parms for mu %d, N_RB %d, Ncp %d\n",mu, N_RB, Ncp);
@@ -46,10 +47,12 @@ int nr_init_frame_parms(nfapi_param_t nfapi_params,
 
     case NR_MU_0: //15kHz scs
       frame_parms->subcarrier_spacing = nr_subcarrier_spacing[NR_MU_0];
+      frame_parms->slots_per_subframe = nr_slots_per_subframe[NR_MU_0];
       break;
 
     case NR_MU_1: //30kHz scs
       frame_parms->subcarrier_spacing = nr_subcarrier_spacing[NR_MU_1];
+      frame_parms->slots_per_subframe = nr_slots_per_subframe[NR_MU_1];
 
       switch(N_RB){
         case 11:
@@ -61,7 +64,7 @@ int nr_init_frame_parms(nfapi_param_t nfapi_params,
 
         case 106: //40 MHz
           frame_parms->ofdm_symbol_size = 2048;
-          frame_parms->samples_per_tti = 30720;
+          //frame_parms->samples_per_tti = 30720;
           frame_parms->first_carrier_offset = 1412; //2048 - 636
           frame_parms->nb_prefix_samples0 = 160;
           frame_parms->nb_prefix_samples = 144;
@@ -74,14 +77,14 @@ int nr_init_frame_parms(nfapi_param_t nfapi_params,
         case 217: //80 MHz
           if (frame_parms->threequarter_fs) {
             frame_parms->ofdm_symbol_size = 3072;
-            frame_parms->samples_per_tti = 46080;
+            //frame_parms->samples_per_tti = 46080;
             frame_parms->first_carrier_offset = 1770; //3072 - 1302
             frame_parms->nb_prefix_samples0 = 240;
             frame_parms->nb_prefix_samples = 216;
           }
           else {
             frame_parms->ofdm_symbol_size = 4096;
-            frame_parms->samples_per_tti = 61440;
+            //frame_parms->samples_per_tti = 61440;
             frame_parms->first_carrier_offset = 2794; //4096 - 1302
             frame_parms->nb_prefix_samples0 = 320;
             frame_parms->nb_prefix_samples = 288;
@@ -97,6 +100,7 @@ int nr_init_frame_parms(nfapi_param_t nfapi_params,
 
     case NR_MU_2: //60kHz scs
       frame_parms->subcarrier_spacing = nr_subcarrier_spacing[NR_MU_2];
+      frame_parms->slots_per_subframe = nr_slots_per_subframe[NR_MU_2];
 
       switch(N_RB){ //FR1 bands only
         case 11:
@@ -118,16 +122,22 @@ int nr_init_frame_parms(nfapi_param_t nfapi_params,
 
     case NR_MU_3:
       frame_parms->subcarrier_spacing = nr_subcarrier_spacing[NR_MU_3];
+      frame_parms->slots_per_subframe = nr_slots_per_subframe[NR_MU_3];
       break;
 
     case NR_MU_4:
       frame_parms->subcarrier_spacing = nr_subcarrier_spacing[NR_MU_4];
+      frame_parms->slots_per_subframe = nr_slots_per_subframe[NR_MU_4];
       break;
 
   default:
     AssertFatal(1==0,"Invalid numerology index %d", mu);
   }
 
+  frame_parms->samples_per_subframe_wCP = frame_parms->ofdm_symbol_size * ((Ncp == 0)? 14 : 12) * frame_parms->slots_per_subframe;
+  frame_parms->samples_per_frame_wCP = 10 * frame_parms->samples_per_subframe_wCP;
+
+
   return 0;
 }
 
@@ -135,7 +145,9 @@ void nr_dump_frame_parms(NR_DL_FRAME_PARMS *frame_parms)
 {
   LOG_I(PHY,"frame_parms->scs=%d\n",frame_parms->subcarrier_spacing);
   LOG_I(PHY,"frame_parms->ofdm_symbol_size=%d\n",frame_parms->ofdm_symbol_size);
-  LOG_I(PHY,"frame_parms->samples_per_tti=%d\n",frame_parms->samples_per_tti);
   LOG_I(PHY,"frame_parms->nb_prefix_samples0=%d\n",frame_parms->nb_prefix_samples0);
   LOG_I(PHY,"frame_parms->nb_prefix_samples=%d\n",frame_parms->nb_prefix_samples);
+  LOG_I(PHY,"frame_parms->slots_per_subframe=%d\n",frame_parms->slots_per_subframe);
+  LOG_I(PHY,"frame_parms->samples_per_subframe_wCP=%d\n",frame_parms->samples_per_subframe_wCP);
+  LOG_I(PHY,"frame_parms->samples_per_frame_wCP=%d\n",frame_parms->samples_per_frame_wCP);
 }

openair1/PHY/NR_REFSIG/nr_gen_mod_table.m

+% octave script for generating NR specific modulated symbols
+%
+% 0        .. "0"
+% 1,2      .. BPSK(0),BPSK(1)
+
+% 2^15 /sqrt(2) K = 768;
+K = 768*sqrt(2)/2^15;
+
+% Amplitude for BPSK (\f$ 2^15 \times 1/\sqrt{2}\f$)
+BPSK = 23170;
+
+% BPSK
+for b = 0:1
+bpsk_table(b+1) = (1 - 2*b)*BPSK + 1j*(1-2*b)*BPSK;
+end
+
+table = round(K * [ 0; bpsk_table(:) ]);
+
+save mod_table.mat table
+
+table2 = zeros(1,length(table)*2);
+table2(1:2:end) = real(table);
+table2(2:2:end) = imag(table);
+
+fd = fopen("nr_mod_table.h","w");
+fprintf(fd,"#define MOD_TABLE_SIZE_SHORT %d\n", length(table)*2);
+fprintf(fd,"#define MOD_TABLE_BPSK_OFFSET %d\n", 1);
+fprintf(fd,"short nr_mod_table[MOD_TABLE_SIZE_SHORT] = {");
+fprintf(fd,"%d,",table2(1:end-1));
+fprintf(fd,"%d};\n",table2(end));
+fclose(fd);
+

openair1/PHY/NR_REFSIG/nr_mod_table.h

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#define MOD_TABLE_SIZE_SHORT 6
+#define MOD_TABLE_BPSK_OFFSET 1
+short nr_mod_table[MOD_TABLE_SIZE_SHORT] = {0,0,768,768,-768,-768};

openair1/PHY/NR_TRANSPORT/nr_pss.c

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include "../defs_NR.h"
+
+#define NR_PSS_DEBUG
+
+//short nr_mod_table[MOD_TABLE_SIZE_SHORT] = {0,0,768,768,-768,-768};
+
+int nr_generate_pss(  int16_t *d_pss,
+                      int32_t **txdataF,
+                      int16_t amp,
+                      int16_t ssb_start_subcarrier,
+                      uint8_t ssb_start_symbol,
+                      nfapi_config_request_t config,
+                      NR_DL_FRAME_PARMS *frame_parms)
+{
+  int i,m,k,l;
+  int16_t a, aa;
+  int16_t x[NR_PSS_LENGTH];
+  const int x_initial[7] = {0, 1, 1 , 0, 1, 1, 1};
+
+  uint8_t Nid2 = config.sch_config.physical_cell_id.value % 3;
+
+  /// Sequence generation
+  for (i=0; i < 7; i++)
+    x[i] = x_initial[i];
+
+  for (i=0; i < (NR_PSS_LENGTH - 7); i++) {
+    x[i+7] = (x[i + 4] + x[i]) %2;
+  }
+
+  for (i=0; i < NR_PSS_LENGTH; i++) {
+    m = (i + 43*Nid2)%(NR_PSS_LENGTH);
+    d_pss[i] = (1 - 2*x[m]) * 32767;
+  }
+
+  /// Resource mapping
+  a = (config.rf_config.tx_antenna_ports.value == 1) ? amp : (amp*ONE_OVER_SQRT2_Q15)>>15;
+
+  for (aa = 0; aa < config.rf_config.tx_antenna_ports.value; aa++)
+  {
+
+    // PSS occupies a predefined position (subcarriers 56-182, symbol 0) within the SSB block starting from
+    k = frame_parms->first_carrier_offset + ssb_start_subcarrier + 56; //and
+    l = ssb_start_symbol;
+
+    for (m = 0; m < NR_PSS_LENGTH; m++) {
+      ((int16_t*)txdataF[aa])[2*(l*frame_parms->ofdm_symbol_size + k)] = (a * d_pss[m]) >> 15;
+      //((int16_t*)txdataF[aa])[2*(l*frame_parms->ofdm_symbol_size + k) + 1] = (a * pss_mod[2*m + 1]) >> 15;
+      k+=1;
+
+      if (k >= frame_parms->ofdm_symbol_size) {
+        k++; //skip DC
+        k-=frame_parms->ofdm_symbol_size;
+      }
+    }
+  }
+
+  return (0);
+}

openair1/PHY/NR_TRANSPORT/nr_sss.c

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include "../defs_NR.h"
+
+extern short nr_mod_table[MOD_TABLE_SIZE_SHORT];
+
+#define NR_SSS_DEBUG
+
+int nr_generate_sss(  int16_t *d_sss,
+                      int32_t **txdataF,
+                      int16_t amp,
+                      int16_t ssb_start_subcarrier,
+                      uint8_t ssb_start_symbol,
+                      nfapi_config_request_t config,
+                      NR_DL_FRAME_PARMS *frame_parms)
+{
+  int i,m,k,l;
+  int m0, m1;
+  int Nid, Nid1, Nid2;
+  int16_t a, aa;
+  int16_t x0[NR_SSS_LENGTH], x1[NR_SSS_LENGTH];
+  const int x0_initial[7] = { 1, 0, 0, 0, 0, 0, 0 };
+  const int x1_initial[7] = { 1, 0, 0, 0, 0, 0, 0 };
+
+  /// Sequence generation
+  Nid = config.sch_config.physical_cell_id.value;
+  Nid2 = Nid % 3;
+  Nid1 = (Nid - Nid2)/3;
+
+  for ( i=0 ; i < 7 ; i++) {
+    x0[i] = x0_initial[i];
+    x1[i] = x1_initial[i];
+  }
+
+  for ( i=0 ; i < NR_SSS_LENGTH - 7 ; i++) {
+    x0[i+7] = (x0[i + 4] + x0[i]) % 2;
+    x1[i+7] = (x1[i + 1] + x1[i]) % 2;
+  }
+
+  m0 = 15*(Nid1/112) + (5*Nid2);
+  m1 = Nid1 % 112;
+
+  for (i = 0; i < NR_SSS_LENGTH ; i++) {
+    d_sss[i] = (1 - 2*x0[(i + m0) % NR_SSS_LENGTH] ) * (1 - 2*x1[(i + m1) % NR_SSS_LENGTH] ) * 32767;
+  }
+
+  /// Resource mapping
+  a = (config.rf_config.tx_antenna_ports.value == 1) ? amp : (amp*ONE_OVER_SQRT2_Q15)>>15;
+
+  for (aa = 0; aa < config.rf_config.tx_antenna_ports.value; aa++)
+  {
+
+    // SSS occupies a predefined position (subcarriers 56-182, symbol 2) within the SSB block starting from
+    k = frame_parms->first_carrier_offset + ssb_start_subcarrier + 56; //and
+    l = ssb_start_symbol + 2;
+
+    for (m = 0; m < NR_SSS_LENGTH; m++) {
+      ((int16_t*)txdataF[aa])[2*(l*frame_parms->ofdm_symbol_size + k)] = (a * d_sss[2*m]) >> 15;
+      //((int16_t*)txdataF[aa])[2*(l*frame_parms->ofdm_symbol_size + k) + 1] = (a * sss_mod[2*m + 1]) >> 15;
+      k+=1;
+
+      if (k >= frame_parms->ofdm_symbol_size) {
+        k++; //skip DC
+        k-=frame_parms->ofdm_symbol_size;
+      }
+    }
+  }
+
+  return (0);
+}

openair1/PHY/defs_common.h

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+/*! \file PHY/defs.h
+ \brief Top-level defines and structure definitions
+ \author R. Knopp, F. Kaltenberger
+ \date 2011
+ \version 0.1
+ \company Eurecom
+ \email: knopp@eurecom.fr,florian.kaltenberger@eurecom.fr
+ \note
+ \warning
+*/
+#ifndef __PHY_DEFS_COMMON__H__
+#define __PHY_DEFS_COMMON__H__
+
+#define MAX_NUM_RU_PER_eNB 64
+#define MAX_NUM_RU_PER_gNB 64
+
+#define NUMBER_OF_SUBBANDS_MAX 13
+#define NUMBER_OF_HARQ_PID_MAX 8
+
+#define MAX_FRAME_NUMBER 0x400
+
+
+#define NUMBER_OF_RN_MAX 3
+typedef enum {no_relay=1,unicast_relay_type1,unicast_relay_type2, multicast_relay} relaying_type_t;
+
+
+
+#define MCS_COUNT 28
+#define MCS_TABLE_LENGTH_MAX 64
+
+
+#define NUM_DCI_MAX 32
+
+#define NUMBER_OF_eNB_SECTORS_MAX 3
+
+#define NB_BANDS_MAX 8
+
+#define MAX_BANDS_PER_RRU 4
+
+
+#ifdef OCP_FRAMEWORK
+#include <enums.h>
+#else
+typedef enum {normal_txrx=0,rx_calib_ue=1,rx_calib_ue_med=2,rx_calib_ue_byp=3,debug_prach=4,no_L2_connect=5,calib_prach_tx=6,rx_dump_frame=7,loop_through_memory=8} runmode_t;
+
+/*! \brief Extension Type */
+typedef enum {
+  CYCLIC_PREFIX,
+  CYCLIC_SUFFIX,
+  ZEROS,
+  NONE
+} Extension_t;
+	
+enum transmission_access_mode {
+  NO_ACCESS=0,
+  POSTPONED_ACCESS,
+  CANCELED_ACCESS,
+  UNKNOWN_ACCESS,
+  SCHEDULED_ACCESS,
+  CBA_ACCESS};
+
+typedef enum  {
+  eNodeB_3GPP=0,   // classical eNodeB function
+  NGFI_RAU_IF5,    // RAU with NGFI IF5
+  NGFI_RAU_IF4p5,  // RAU with NFGI IF4p5
+  NGFI_RRU_IF5,    // NGFI_RRU (NGFI remote radio-unit,IF5)
+  NGFI_RRU_IF4p5,  // NGFI_RRU (NGFI remote radio-unit,IF4p5)
+  MBP_RRU_IF5      // Mobipass RRU
+} node_function_t;
+
+typedef enum {
+
+  synch_to_ext_device=0,  // synch to RF or Ethernet device
+  synch_to_other,          // synch to another source_(timer, other RU)
+  synch_to_mobipass_standalone  // special case for mobipass in standalone mode
+} node_timing_t;
+#endif
+
+typedef struct {
+  struct PHY_VARS_eNB_s *eNB;
+  int UE_id;
+  int harq_pid;
+  int llr8_flag;
+  int ret;
+} td_params;
+
+typedef struct {
+  struct PHY_VARS_eNB_s *eNB;
+  LTE_eNB_DLSCH_t *dlsch;
+  int G;
+  int harq_pid;
+} te_params;
+
+#endif

openair1/PHY/impl_defs_nr.h

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#ifndef __PHY_IMPLEMENTATION_DEFS_NR_H__
+#define __PHY_IMPLEMENTATION_DEFS_NR_H__
+
+
+#include "impl_defs_lte.h"
+
+
+typedef struct {
+  /// \brief Pointers (dynamic) to the received data in the time domain.
+  /// - first index: rx antenna [0..nb_antennas_rx[
+  /// - second index: ? [0..2*ofdm_symbol_size*frame_parms->symbols_per_tti[
+  int32_t **rxdata;
+  /// \brief Pointers (dynamic) to the received data in the frequency domain.
+  /// - first index: rx antenna [0..nb_antennas_rx[
+  /// - second index: ? [0..2*ofdm_symbol_size*frame_parms->symbols_per_tti[
+  int32_t **rxdataF;
+  /// \brief holds the transmit data in the frequency domain.
+  /// For IFFT_FPGA this points to the same memory as PHY_vars->rx_vars[a].RX_DMA_BUFFER. //?
+  /// - first index: eNB id [0..2] (hard coded)
+  /// - second index: tx antenna [0..14[ where 14 is the total supported antenna ports.
+  /// - third index: sample [0..]
+  int32_t **txdataF;
+} NR_gNB_COMMON;
+
+#endif

openair1/SCHED_NR/phy_procedures_nr_gNB.c

+/*
+ * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The OpenAirInterface Software Alliance licenses this file to You under
+ * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ * except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.openairinterface.org/?page_id=698
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *-------------------------------------------------------------------------------
+ * For more information about the OpenAirInterface (OAI) Software Alliance:
+ *      contact@openairinterface.org
+ */
+
+#include "PHY/defs_NR.h"
+#include "PHY/extern.h"
+#include "SCHED/defs.h"
+#include "SCHED/extern.h"
+#include "nfapi_interface.h"
+#include "fapi_l1.h"
+#include "UTIL/LOG/log.h"
+#include "UTIL/LOG/vcd_signal_dumper.h"
+
+#include "T.h"
+
+#include "assertions.h"
+#include "msc.h"
+
+#include <time.h>
+
+#if defined(ENABLE_ITTI)
+#   include "intertask_interface.h"
+#endif
+
+
+void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int subframe) {
+
+  
+}

targets/RT/USER/lte-softmodem.c

@@ -47,7 +47,7 @@
 
 #include "PHY/types.h"
 
-#include "PHY/defs.h"
+//#include "PHY/defs.h"
 #include "common/ran_context.h"
 #include "common/config/config_userapi.h"
 #include "common/utils/load_module_shlib.h"