separation between files in openair1/PHY/LTE_TRANSPORT/

+ creation of 2 new files openair1/PHY/LTE_TRANSPORT/uci_NB_IoT.h openair2/COMMON/platform_types_NB_IoT.h

openair1/PHY/LTE_TRANSPORT/dlsch_coding_NB_IoT.c

@@ -15,16 +15,14 @@
 //#include "PHY/defs.h"
 #include "PHY/defs_nb_iot.h"
 #include "PHY/extern.h"
-#include "PHY/CODING/defs.h"
-#include "PHY/CODING/extern.h"
-#include "PHY/CODING/lte_interleaver_inline.h"
+#include "PHY/CODING/defs_nb_iot.h"
+//#include "PHY/CODING/extern.h"
+//#include "PHY/CODING/lte_interleaver_inline.h"
 #include "PHY/LTE_TRANSPORT/defs.h"
 #include "PHY/LTE_TRANSPORT/proto.h"
-#include "SCHED/defs.h"
-#include "defs.h"
-#include "UTIL/LOG/vcd_signal_dumper.h"
-
-#define is_not_pilot(pilots,first_pilot,re) (1)
+#include "SCHED/defs_nb_iot.h"
+#include "defs_nb_iot.h"
+//#include "UTIL/LOG/vcd_signal_dumper.h"
 
 #include "PHY/LTE_TRANSPORT/defs_NB_IoT.h" // newly added for NB_IoT
 

openair1/PHY/LTE_TRANSPORT/proto.h

@@ -61,16 +61,6 @@ void clean_eNb_dlsch(LTE_eNB_DLSCH_t *dlsch);
 LTE_eNB_DLSCH_t *new_eNB_dlsch(uint8_t Kmimo,uint8_t Mdlharq,uint32_t Nsoft,uint8_t N_RB_DL, uint8_t abstraction_flag, LTE_DL_FRAME_PARMS* frame_parms);
 
 
-//NB-IoT version
-NB_IoT_eNB_NDLSCH_t *new_eNB_dlsch_NB_IoT(//unsigned char Kmimo,
-									      //unsigned char Mdlharq,
-									      uint32_t Nsoft,
-									      //unsigned char N_RB_DL,
-									      uint8_t abstraction_flag,
-									      NB_IoT_DL_FRAME_PARMS* frame_parms);
-
-
-
 /** \fn free_ue_dlsch(LTE_UE_DLSCH_t *dlsch)
     \brief This function frees memory allocated for a particular DLSCH at UE
     @param dlsch Pointer to DLSCH to be removed
@@ -95,8 +85,6 @@ void free_ue_ulsch(LTE_UE_ULSCH_t *ulsch);
 
 LTE_eNB_ULSCH_t *new_eNB_ulsch(uint8_t max_turbo_iterations,uint8_t N_RB_UL, uint8_t abstraction_flag);
 
-NB_IoT_eNB_NULSCH_t *new_eNB_ulsch_NB(uint8_t abstraction_flag);
-
 
 LTE_UE_ULSCH_t *new_ue_ulsch(unsigned char N_RB_UL, uint8_t abstraction_flag);
 

openair1/PHY/LTE_TRANSPORT/proto_nb_iot.h

@@ -149,7 +149,14 @@ unsigned int  ulsch_decoding_NB_IoT(PHY_VARS_eNB_NB_IoT *phy_vars_eNB,
                                     uint8_t Nbundled,
                                     uint8_t llr8_flag);
 
-
-
+//NB-IoT version
+NB_IoT_eNB_NDLSCH_t *new_eNB_dlsch_NB_IoT(//unsigned char Kmimo,
+                        //unsigned char Mdlharq,
+                        uint32_t Nsoft,
+                        //unsigned char N_RB_DL,
+                        uint8_t abstraction_flag,
+                        NB_IoT_DL_FRAME_PARMS* frame_parms);
+
+NB_IoT_eNB_NULSCH_t *new_eNB_ulsch_NB(uint8_t abstraction_flag);
 
 #endif

openair1/PHY/LTE_TRANSPORT/uci_NB_IoT.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.0  (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/types.h"
+
+
+
+typedef enum {
+  ue_selected_NB_IoT,
+  wideband_cqi_rank1_2A_NB_IoT, //wideband_cqi_rank1_2A,
+  wideband_cqi_rank2_2A_NB_IoT, //wideband_cqi_rank2_2A,
+  HLC_subband_cqi_nopmi_NB_IoT, //HLC_subband_cqi_nopmi,
+  HLC_subband_cqi_rank1_2A_NB_IoT, //HLC_subband_cqi_rank1_2A,
+  HLC_subband_cqi_rank2_2A_NB_IoT, //HLC_subband_cqi_rank2_2A,
+  HLC_subband_cqi_modes123_NB_IoT, //HLC_subband_cqi_modes123
+  HLC_subband_cqi_mcs_CBA_NB_IoT, // MCS and RNTI, for contention-based acces
+  unknown_cqi_NB_IoT//
+} UCI_format_NB_IoT_t;
+
+typedef struct __attribute__((packed))
+{
+  uint64_t padding:3;
+  uint64_t pmi:1;
+  uint64_t diffcqi2:26;
+  uint64_t cqi2:4;
+  uint64_t diffcqi1:26;
+  uint64_t cqi1:4;
+}
+HLC_subband_cqi_rank2_2A_20MHz_NB_IoT;
+
+#define MAX_CQI_PAYLOAD_NB_IoT (sizeof(HLC_subband_cqi_rank2_2A_20MHz_NB_IoT)*8*20)
+#define MAX_CQI_BITS_NB_IoT (sizeof(HLC_subband_cqi_rank2_2A_20MHz_NB_IoT)*8)
+#define MAX_CQI_BYTES_NB_IoT (sizeof(HLC_subband_cqi_rank2_2A_20MHz_NB_IoT))
+#define MAX_ACK_PAYLOAD_NB_IoT 18
+#define MAX_RI_PAYLOAD_NB_IoT 6
+/*
+// **********************************************1.5 MHz***************************************************************************
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:16;
+  uint32_t pmi:12;
+  uint32_t cqi1:4;
+}
+wideband_cqi_rank1_2A_1_5MHz ;
+#define sizeof_wideband_cqi_rank1_2A_1_5MHz 16
+
+typedef struct __attribute__((packed))
+{
+  uint16_t padding:2;
+  uint16_t pmi:6;
+  uint16_t cqi2:4;
+  uint16_t cqi1:4;
+}
+wideband_cqi_rank2_2A_1_5MHz ;
+#define sizeof_wideband_cqi_rank2_2A_1_5MHz 14
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:16;
+  uint32_t diffcqi1:12;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_nopmi_1_5MHz;
+#define sizeof_HLC_subband_cqi_nopmi_1_5MHz 16
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:14;
+  uint32_t pmi:2;
+  uint32_t diffcqi1:12;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_rank1_2A_1_5MHz;
+#define sizeof_HLC_subband_cqi_rank1_2A_1_5MHz 18
+
+typedef struct __attribute__((packed))
+{
+  uint64_t padding:31;
+  uint64_t pmi:1;
+  uint64_t diffcqi2:12;
+  uint64_t cqi2:4;
+  uint64_t diffcqi1:12;
+  uint64_t cqi1:4;
+}
+HLC_subband_cqi_rank2_2A_1_5MHz;
+#define sizeof_HLC_subband_cqi_rank2_2A_1_5MHz 33
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:16;
+  uint32_t diffcqi1:12;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_modes123_1_5MHz;
+#define sizeof_HLC_subband_cqi_modes123_1_5MHz 16
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:11;
+  uint32_t crnti:16;
+  uint32_t mcs:5;
+}
+HLC_subband_cqi_mcs_CBA_1_5MHz;
+#define sizeof_HLC_subband_cqi_mcs_CBA_1_5MHz 21
+
+
+// **********************************************5 MHz***************************************************************************
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:14;
+  uint32_t pmi:14;
+  uint32_t cqi1:4;
+}
+wideband_cqi_rank1_2A_5MHz ;
+#define sizeof_wideband_cqi_rank1_2A_5MHz 18
+
+typedef struct __attribute__((packed))
+{
+  uint16_t padding:1;
+  uint16_t pmi:7;
+  uint16_t cqi2:4;
+  uint16_t cqi1:4;
+}
+wideband_cqi_rank2_2A_5MHz ;
+#define sizeof_wideband_cqi_rank2_2A_5MHz 15
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:14;
+  uint32_t diffcqi1:14;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_nopmi_5MHz;
+#define sizeof_HLC_subband_cqi_nopmi_5MHz 18
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:12;
+  uint32_t pmi:2;
+  uint32_t diffcqi1:14;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_rank1_2A_5MHz;
+#define sizeof_HLC_subband_cqi_rank1_2A_5MHz 20
+
+typedef struct __attribute__((packed))
+{
+  uint64_t padding:27;
+  uint64_t pmi:1;
+  uint64_t diffcqi2:14;
+  uint64_t cqi2:4;
+  uint64_t diffcqi1:14;
+  uint64_t cqi1:4;
+}
+HLC_subband_cqi_rank2_2A_5MHz;
+#define sizeof_HLC_subband_cqi_rank2_2A_5MHz 37
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:14;
+  uint32_t diffcqi1:14;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_modes123_5MHz;
+#define sizeof_HLC_subband_cqi_modes123_5MHz 18
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:11;
+  uint32_t crnti:16;
+  uint32_t mcs:5;
+}
+HLC_subband_cqi_mcs_CBA_5MHz;
+#define sizeof_HLC_subband_cqi_mcs_CBA_5MHz 21
+
+// **********************************************10 MHz***************************************************************************
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:10;
+  uint32_t pmi:18;
+  uint32_t cqi1:4;
+}
+wideband_cqi_rank1_2A_10MHz ;
+#define sizeof_wideband_cqi_rank1_2A_10MHz 22
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:15;
+  uint32_t pmi:9;
+  uint32_t cqi2:4;
+  uint32_t cqi1:4;
+}
+wideband_cqi_rank2_2A_10MHz ;
+#define sizeof_wideband_cqi_rank2_2A_10MHz 17
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:10;
+  uint32_t diffcqi1:18;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_nopmi_10MHz;
+#define sizeof_HLC_subband_cqi_nopmi_10MHz 22
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:8;
+  uint32_t pmi:2;
+  uint32_t diffcqi1:18;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_rank1_2A_10MHz;
+#define sizeof_HLC_subband_cqi_rank1_2A_10MHz 24
+
+typedef struct __attribute__((packed))
+{
+  uint64_t padding:19;
+  uint64_t pmi:1;
+  uint64_t diffcqi2:18;
+  uint64_t cqi2:4;
+  uint64_t diffcqi1:18;
+  uint64_t cqi1:4;
+}
+HLC_subband_cqi_rank2_2A_10MHz;
+#define sizeof_HLC_subband_cqi_rank2_2A_10MHz 45
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:10;
+  uint32_t diffcqi1:18;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_modes123_10MHz;
+#define sizeof_HLC_subband_cqi_modes123_10MHz 22
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:11;
+  uint32_t crnti:16;
+  uint32_t mcs:5;
+}
+HLC_subband_cqi_mcs_CBA_10MHz;
+#define sizeof_HLC_subband_cqi_mcs_CBA_10MHz 21
+
+// **********************************************20 MHz***************************************************************************
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:2;
+  uint32_t pmi:26;
+  uint32_t cqi1:4;
+}
+wideband_cqi_rank1_2A_20MHz ;
+#define sizeof_wideband_cqi_rank1_2A_20MHz 20
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:11;
+  uint32_t pmi:13;
+  uint32_t cqi2:4;
+  uint32_t cqi1:4;
+}
+wideband_cqi_rank2_2A_20MHz ;
+#define sizeof_wideband_cqi_rank2_2A_20MHz 21
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:2;
+  uint32_t diffcqi1:26;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_nopmi_20MHz;
+#define sizeof_HLC_subband_cqi_nopmi_20MHz 30
+
+typedef struct __attribute__((packed))
+{
+  //  uint32_t padding:12;
+  uint32_t pmi:2;
+  uint32_t diffcqi1:26;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_rank1_2A_20MHz;
+#define sizeof_HLC_subband_cqi_rank1_2A_20MHz 32
+
+typedef struct __attribute__((packed))
+{
+  uint64_t padding:3;
+  uint64_t pmi:1;
+  uint64_t diffcqi2:26;
+  uint64_t cqi2:4;
+  uint64_t diffcqi1:26;
+  uint64_t cqi1:4;
+}
+HLC_subband_cqi_rank2_2A_20MHz;
+#define sizeof_HLC_subband_cqi_rank2_2A_20MHz 61
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:2;
+  uint32_t diffcqi1:26;
+  uint32_t cqi1:4;
+}
+HLC_subband_cqi_modes123_20MHz;
+#define sizeof_HLC_subband_cqi_modes123_20MHz 30
+
+typedef struct __attribute__((packed))
+{
+  uint32_t padding:11;
+  uint32_t crnti:16;
+  uint32_t mcs:5;
+}
+HLC_subband_cqi_mcs_CBA_20MHz;
+#define sizeof_HLC_subband_cqi_mcs_CBA_20MHz 21
+
+
+#define MAX_CQI_PAYLOAD (sizeof(HLC_subband_cqi_rank2_2A_20MHz)*8*20)
+#define MAX_CQI_BITS (sizeof(HLC_subband_cqi_rank2_2A_20MHz)*8)
+#define MAX_CQI_BYTES (sizeof(HLC_subband_cqi_rank2_2A_20MHz))
+#define MAX_ACK_PAYLOAD 18
+#define MAX_RI_PAYLOAD 6
+*/
\ No newline at end of file

openair1/PHY/LTE_TRANSPORT/ulsch_decoding_NB_IoT.c

@@ -934,7 +934,7 @@ unsigned int  ulsch_decoding_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
 
   int16_t *ulsch_llr = eNB->pusch_vars[UE_id]->llr;
   NB_IoT_DL_FRAME_PARMS *frame_parms = &eNB->frame_parms;
-  LTE_eNB_ULSCH_t *ulsch = eNB->ulsch[UE_id];
+  NB_IoT_eNB_ULSCH_t *ulsch = eNB->ulsch[UE_id];
   uint8_t harq_pid;
   unsigned short nb_rb;
   unsigned int A;
@@ -964,7 +964,7 @@ unsigned int  ulsch_decoding_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
   int off;
 
   int subframe = proc->subframe_rx;
-  LTE_UL_eNB_HARQ_t *ulsch_harq;
+  NB_IoT_UL_eNB_HARQ_t *ulsch_harq;
 
 
 
@@ -974,7 +974,7 @@ unsigned int  ulsch_decoding_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
 
   // x1 is set in lte_gold_generic
   x2 = ((uint32_t)ulsch->rnti<<14) + ((uint32_t)subframe<<9) + frame_parms->Nid_cell; //this is c_init in 36.211 Sec 6.3.1
-  ulsch_harq = ulsch->harq_processes[harq_pid];
+  ulsch_harq = ulsch->harq_process;
 
   if (harq_pid==255) {
     LOG_E(PHY, "FATAL ERROR: illegal harq_pid, returning\n");
@@ -1657,7 +1657,7 @@ unsigned int  ulsch_decoding_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
     if (extract_cqi_crc_NB_IoT(o_flip,ulsch_harq->Or1) == (crc8(o_flip,ulsch_harq->Or1)>>24))
       ulsch_harq->cqi_crc_status = 1;
 
-    if (ulsch->harq_processes[harq_pid]->Or1<=32) {
+    if (ulsch->harq_process->Or1<=32) {
       ulsch_harq->o[3] = o_flip[0] ;
       ulsch_harq->o[2] = o_flip[1] ;
       ulsch_harq->o[1] = o_flip[2] ;

openair1/PHY/defs_nb_iot.h

@@ -99,41 +99,41 @@ static inline void* malloc16_clear( size_t size )
 */
 
 
-#define PAGE_MASK 0xfffff000
-#define virt_to_phys(x) (x)
+// #define PAGE_MASK 0xfffff000
+// #define virt_to_phys(x) (x)
 
-#define openair_sched_exit() exit(-1)
+// #define openair_sched_exit() exit(-1)
 
 
-#define max(a,b)  ((a)>(b) ? (a) : (b))
-#define min(a,b)  ((a)<(b) ? (a) : (b))
+// #define max(a,b)  ((a)>(b) ? (a) : (b))
+// #define min(a,b)  ((a)<(b) ? (a) : (b))
 
 
-#define bzero(s,n) (memset((s),0,(n)))
+// #define bzero(s,n) (memset((s),0,(n)))
 
-#define cmax(a,b)  ((a>b) ? (a) : (b))
-#define cmin(a,b)  ((a<b) ? (a) : (b))
+// #define cmax(a,b)  ((a>b) ? (a) : (b))
+// #define cmin(a,b)  ((a<b) ? (a) : (b))
 
-#define cmax3(a,b,c) ((cmax(a,b)>c) ? (cmax(a,b)) : (c))
+// #define cmax3(a,b,c) ((cmax(a,b)>c) ? (cmax(a,b)) : (c))
 
-/// suppress compiler warning for unused arguments
-#define UNUSED(x) (void)x;
+// /// suppress compiler warning for unused arguments
+// #define UNUSED(x) (void)x;
 
 
 #include "impl_defs_top_NB_IoT.h"
 #include "impl_defs_top.h"
 #include "impl_defs_lte.h"
-#include "impl_defs_lte_nb_iot.h"
+#include "PHY/impl_defs_lte_nb_iot.h"
 
 #include "PHY/TOOLS/time_meas.h"
 #include "PHY/CODING/defs.h"
 #include "PHY/CODING/defs_nb_iot.h"
 #include "PHY/TOOLS/defs.h"
 #include "platform_types.h"
-
+///#include "openair1/PHY/LTE_TRANSPORT/defs_nb_iot.h"
 #ifdef OPENAIR_LTE
 
-#include "PHY/LTE_TRANSPORT/defs.h"
+//#include "PHY/LTE_TRANSPORT/defs.h"
 #include "PHY/LTE_TRANSPORT/defs_nb_iot.h"
 #include <pthread.h>
 
@@ -179,7 +179,7 @@ typedef struct UE_SCAN_INFO_s {
   /// 10 frequency offsets (kHz) corresponding to best amplitudes, with respect do minimum DL frequency in the band
   int32_t freq_offset_Hz[3][10];
 } UE_SCAN_INFO_t;
-
+*/
 /// Top-level PHY Data Structure for RN
 typedef struct {
   /// Module ID indicator for this instance
@@ -190,10 +190,55 @@ typedef struct {
   // cuurently only used to store and forward the PMCH
   uint8_t mch_avtive[10];
   uint8_t sync_area[10]; // num SF
-  LTE_UE_DLSCH_t   *dlsch_rn_MCH[10];
+  NB_IoT_UE_DLSCH_t   *dlsch_rn_MCH[10];
+
+} PHY_VARS_RN_NB_IoT;
+
+#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;
+
+// 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
+//   eNodeB_3GPP_BBU, // eNodeB with NGFI IF5
+//   NGFI_RCC_IF4p5,  // NGFI_RCC (NGFI radio cloud center)
+//   NGFI_RAU_IF4p5,
+//   NGFI_RRU_IF5,    // NGFI_RRU (NGFI remote radio-unit,IF5)
+//   NGFI_RRU_IF4p5   // NGFI_RRU (NGFI remote radio-unit,IF4p5)
+// } eNB_func_NB_IoT_t;
+
+typedef enum {
+  synch_to_ext_device_NB_IoT=0,  // synch to RF or Ethernet device
+  synch_to_other_NB_IoT          // synch to another source (timer, other CC_id)
+} eNB_timing_NB_IoT_t;
+#endif
+
+
+typedef struct {
+  struct PHY_VARS_eNB_NB_IoT_s *eNB;
+  NB_IoT_eNB_NDLSCH_t *dlsch;
+  int G;
+} te_params_NB_IoT;
+
+
+typedef struct {
+  struct PHY_VARS_eNB_NB_IoT_s *eNB;
+  int UE_id;
+  int harq_pid;
+  int llr8_flag;
+  int ret;
+} td_params_NB_IoT;
+
 
-} PHY_VARS_RN;
-*/
 /// Context data structure for RX/TX portion of subframe processing
 typedef struct {
   /// Component Carrier index
@@ -366,13 +411,13 @@ typedef struct eNB_proc_NB_IoT_t_s {
   /// mutex for asynch RX/TX thread
   pthread_mutex_t mutex_asynch_rxtx;
   /// parameters for turbo-decoding worker thread
-  td_params tdp;
+  td_params_NB_IoT tdp;
   /// parameters for turbo-encoding worker thread
-  te_params tep;
+  te_params_NB_IoT tep;
   /// number of slave threads
   int                  num_slaves;
   /// array of pointers to slaves
-  struct eNB_proc_t_s           **slave_proc;
+  struct eNB_proc_NB_IoT_t_s           **slave_proc;
   /// set of scheduling variables RXn-TXnp4 threads
   // newly added for NB_IoT
   eNB_rxtx_proc_NB_IoT_t proc_rxtx[2];
@@ -450,9 +495,9 @@ typedef struct PHY_VARS_eNB_NB_IoT_s {
   /// Module ID indicator for this instance
   module_id_t          Mod_id;
   uint8_t              CC_id;
-  eNB_proc_t           proc;
-  eNB_func_t           node_function;
-  eNB_timing_t         node_timing;
+  eNB_proc_NB_IoT_t           proc;
+  //eNB_func_NB_IoT_t           node_function;
+  eNB_timing_NB_IoT_t         node_timing;
   eth_params_t         *eth_params;
   int                  single_thread_flag;
   openair0_rf_map      rf_map;
@@ -469,7 +514,7 @@ typedef struct PHY_VARS_eNB_NB_IoT_s {
   int                  (*td)(struct PHY_VARS_eNB_NB_IoT_s *eNB,int UE_id,int harq_pid,int llr8_flag);
   int                  (*te)(struct PHY_VARS_eNB_NB_IoT_s *,uint8_t *,uint8_t,LTE_eNB_DLSCH_t *,int,uint8_t,time_stats_t *,time_stats_t *,time_stats_t *);
   void                 (*proc_uespec_rx)(struct PHY_VARS_eNB_NB_IoT_s *eNB,eNB_rxtx_proc_NB_IoT_t *proc,const relaying_type_t r_type);
-  void                 (*proc_tx)(struct PHY_VARS_eNB_NB_IoT_s *eNB,eNB_rxtx_proc_NB_IoT_t *proc,relaying_type_t r_type,PHY_VARS_RN *rn);
+  void                 (*proc_tx)(struct PHY_VARS_eNB_NB_IoT_s *eNB,eNB_rxtx_proc_NB_IoT_t *proc,relaying_type_t r_type,PHY_VARS_RN_NB_IoT *rn);
   void                 (*tx_fh)(struct PHY_VARS_eNB_NB_IoT_s *eNB,eNB_rxtx_proc_NB_IoT_t *proc);
   void                 (*rx_fh)(struct PHY_VARS_eNB_NB_IoT_s *eNB,int *frame, int *subframe);
   int                  (*start_rf)(struct PHY_VARS_eNB_NB_IoT_s *eNB);
@@ -478,18 +523,18 @@ typedef struct PHY_VARS_eNB_NB_IoT_s {
   uint8_t              local_flag;
   uint32_t             rx_total_gain_dB;
   NB_IoT_DL_FRAME_PARMS   frame_parms;
-  PHY_MEASUREMENTS_eNB measurements[NUMBER_OF_eNB_SECTORS_MAX_NB_IoT]; /// Measurement variables
-  LTE_eNB_COMMON       common_vars;
-  LTE_eNB_SRS          srs_vars[NUMBER_OF_UE_MAX_NB_IoT];
-  LTE_eNB_PBCH         pbch;
-  LTE_eNB_PUSCH       *pusch_vars[NUMBER_OF_UE_MAX_NB_IoT];
-  LTE_eNB_PRACH        prach_vars;
-  LTE_eNB_DLSCH_t     *dlsch[NUMBER_OF_UE_MAX_NB_IoT][2];   // Nusers times two spatial streams
-  LTE_eNB_ULSCH_t     *ulsch[NUMBER_OF_UE_MAX_NB_IoT+1];      // Nusers + number of RA (the ulsch[0] contains RAR)
-  LTE_eNB_DLSCH_t     *dlsch_SI,*dlsch_ra;
-  LTE_eNB_DLSCH_t     *dlsch_MCH;
-  LTE_eNB_UE_stats     UE_stats[NUMBER_OF_UE_MAX_NB_IoT];
-  LTE_eNB_UE_stats    *UE_stats_ptr[NUMBER_OF_UE_MAX_NB_IoT];
+  PHY_MEASUREMENTS_eNB_NB_IoT measurements[NUMBER_OF_eNB_SECTORS_MAX_NB_IoT]; /// Measurement variables
+  NB_IoT_eNB_COMMON       common_vars;
+  NB_IoT_eNB_SRS          srs_vars[NUMBER_OF_UE_MAX_NB_IoT];
+  NB_IoT_eNB_PBCH         pbch;
+  NB_IoT_eNB_PUSCH       *pusch_vars[NUMBER_OF_UE_MAX_NB_IoT];
+  NB_IoT_eNB_PRACH        prach_vars;
+  //LTE_eNB_DLSCH_t     *dlsch[NUMBER_OF_UE_MAX_NB_IoT][2];   // Nusers times two spatial streams
+  NB_IoT_eNB_ULSCH_t     *ulsch[NUMBER_OF_UE_MAX_NB_IoT+1];      // Nusers + number of RA (the ulsch[0] contains RAR)
+  //LTE_eNB_DLSCH_t     *dlsch_SI,*dlsch_ra;
+  //LTE_eNB_DLSCH_t     *dlsch_MCH;
+  NB_IoT_eNB_UE_stats     UE_stats[NUMBER_OF_UE_MAX_NB_IoT];
+  //LTE_eNB_UE_stats    *UE_stats_ptr[NUMBER_OF_UE_MAX_NB_IoT];
 
 
   /// cell-specific reference symbols
@@ -1069,10 +1114,10 @@ static inline int release_thread(pthread_mutex_t *mutex,int *instance_cnt,char *
 
 */
 
-#include "PHY/INIT/defs.h"
-#include "PHY/LTE_REFSIG/defs.h"
-#include "PHY/MODULATION/defs.h"
-#include "PHY/LTE_TRANSPORT/proto.h"
+#include "PHY/INIT/defs_nb_iot.h"
+#include "PHY/LTE_REFSIG/defs_NB_IoT.h"
+//#include "PHY/MODULATION/defs.h"
+//#include "PHY/LTE_TRANSPORT/proto.h"
 #include "PHY/LTE_TRANSPORT/proto_nb_iot.h"
 #include "PHY/LTE_ESTIMATION/defs.h"
 

openair1/PHY/impl_defs_top_NB_IoT.h

@@ -33,6 +33,8 @@
 #ifndef __PHY_IMPLEMENTATION_DEFS_NB_IOT_H__
 #define __PHY_IMPLEMENTATION_DEFS_NB_IOT_H__
 
+
+#include "openairinterface5g_limits.h"
 /** @defgroup _ref_implementation_ OpenAirInterface LTE Implementation
  * @{
 
@@ -381,7 +383,7 @@ typedef struct {
   // short          dlsch_errors;
 
 } PHY_MEASUREMENTS;
-
+*/
 typedef struct {
   //unsigned int   rx_power[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX];     //! estimated received signal power (linear)
   //unsigned short rx_power_dB[NUMBER_OF_CONNECTED_eNB_MAX][NB_ANTENNAS_RX];  //! estimated received signal power (dB)
@@ -408,33 +410,33 @@ typedef struct {
   short n0_subband_power_tot_dBm[100];
   // eNB measurements (per user)
   //! estimated received spatial signal power (linear)
-  unsigned int   rx_spatial_power[NUMBER_OF_UE_MAX][2][2];
+  unsigned int   rx_spatial_power[NUMBER_OF_UE_MAX_NB_IoT][2][2];
   //! estimated received spatial signal power (dB)
-  unsigned short rx_spatial_power_dB[NUMBER_OF_UE_MAX][2][2];
+  unsigned short rx_spatial_power_dB[NUMBER_OF_UE_MAX_NB_IoT][2][2];
   //! estimated rssi (dBm)
-  short          rx_rssi_dBm[NUMBER_OF_UE_MAX];
+  short          rx_rssi_dBm[NUMBER_OF_UE_MAX_NB_IoT];
   //! estimated correlation (wideband linear) between spatial channels (computed in dlsch_demodulation)
-  int            rx_correlation[NUMBER_OF_UE_MAX][2];
+  int            rx_correlation[NUMBER_OF_UE_MAX_NB_IoT][2];
   //! estimated correlation (wideband dB) between spatial channels (computed in dlsch_demodulation)
-  int            rx_correlation_dB[NUMBER_OF_UE_MAX][2];
+  int            rx_correlation_dB[NUMBER_OF_UE_MAX_NB_IoT][2];
 
   /// Wideband CQI (= SINR)
-  int            wideband_cqi[NUMBER_OF_UE_MAX][NB_ANTENNAS_RX];
+  int            wideband_cqi[NUMBER_OF_UE_MAX_NB_IoT][NB_ANTENNAS_RX];
   /// Wideband CQI in dB (= SINR dB)
-  int            wideband_cqi_dB[NUMBER_OF_UE_MAX][NB_ANTENNAS_RX];
+  int            wideband_cqi_dB[NUMBER_OF_UE_MAX_NB_IoT][NB_ANTENNAS_RX];
   /// Wideband CQI (sum of all RX antennas, in dB)
-  char           wideband_cqi_tot[NUMBER_OF_UE_MAX];
+  char           wideband_cqi_tot[NUMBER_OF_UE_MAX_NB_IoT];
   /// Subband CQI per RX antenna and RB (= SINR)
-  int            subband_cqi[NUMBER_OF_UE_MAX][NB_ANTENNAS_RX][100];
+  int            subband_cqi[NUMBER_OF_UE_MAX_NB_IoT][NB_ANTENNAS_RX][100];
   /// Total Subband CQI and RB (= SINR)
-  int            subband_cqi_tot[NUMBER_OF_UE_MAX][100];
+  int            subband_cqi_tot[NUMBER_OF_UE_MAX_NB_IoT][100];
   /// Subband CQI in dB and RB (= SINR dB)
-  int            subband_cqi_dB[NUMBER_OF_UE_MAX][NB_ANTENNAS_RX][100];
+  int            subband_cqi_dB[NUMBER_OF_UE_MAX_NB_IoT][NB_ANTENNAS_RX][100];
   /// Total Subband CQI and RB
-  int            subband_cqi_tot_dB[NUMBER_OF_UE_MAX][100];
-
-} PHY_MEASUREMENTS_eNB;
+  int            subband_cqi_tot_dB[NUMBER_OF_UE_MAX_NB_IoT][100];
 
+} PHY_MEASUREMENTS_eNB_NB_IoT;
+/*
 #define MCS_COUNT 28
 #define MCS_TABLE_LENGTH_MAX 64
 */

openair1/SCHED/pusch_pc_NB_IoT.c

@@ -48,16 +48,16 @@ int16_t get_hundred_times_delta_IF_eNB_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,uint8_t U
   DevAssert( UE_id < NUMBER_OF_UE_MAX_NB_IoT+1 );
   DevAssert( harq_pid < 8 );
 
-  Nre = eNB->ulsch[UE_id]->harq_processes[harq_pid]->Nsymb_initial *
-        eNB->ulsch[UE_id]->harq_processes[harq_pid]->nb_rb*12;
+  Nre = eNB->nulsch[UE_id]->harq_process->Nsymb_initial *
+        eNB->nulsch[UE_id]->harq_process->nb_rb*12;
 
   sumKr = 0;
 
-  for (r=0; r<eNB->ulsch[UE_id]->harq_processes[harq_pid]->C; r++) {
-    if (r<eNB->ulsch[UE_id]->harq_processes[harq_pid]->Cminus)
-      Kr = eNB->ulsch[UE_id]->harq_processes[harq_pid]->Kminus;
+  for (r=0; r<eNB->nulsch[UE_id]->harq_process->C; r++) {
+    if (r<eNB->nulsch[UE_id]->harq_process->Cminus)
+      Kr = eNB->nulsch[UE_id]->harq_process->Kminus;
     else
-      Kr = eNB->ulsch[UE_id]->harq_processes[harq_pid]->Kplus;
+      Kr = eNB->nulsch[UE_id]->harq_process->Kplus;
 
     sumKr += Kr;
   }
@@ -79,7 +79,7 @@ int16_t get_hundred_times_delta_IF_eNB_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,uint8_t U
   if (eNB->ul_power_control_dedicated[UE_id].deltaMCS_Enabled == 1) {
     // This is the formula from Section 5.1.1.1 in 36.213 10*log10(deltaIF_PUSCH = (2^(MPR*Ks)-1)*beta_offset_pusch)
     if (bw_factor == 1) {
-      uint8_t nb_rb = eNB->ulsch[UE_id]->harq_processes[harq_pid]->nb_rb;
+      uint8_t nb_rb = eNB->nulsch[UE_id]->harq_process->nb_rb;
       return(hundred_times_delta_TF_NB_IoT[MPR_x100/6]+10*dB_fixed_times10((beta_offset_pusch)>>3)) + hundred_times_log10_NPRB_NB_IoT[nb_rb-1];
     } else
       return(hundred_times_delta_TF_NB_IoT[MPR_x100/6]+10*dB_fixed_times10((beta_offset_pusch)>>3));