Merging mac branch to RRC branch for IF-Module implementation(still not...

Merging mac branch to RRC branch for IF-Module implementation(still not completed). Solve some bugs. Now move to mac branch for continue implementation

Merging mac branch to RRC branch for IF-Module implementation(still not...
Merging mac branch to RRC branch for IF-Module implementation(still not completed). Solve some bugs. Now move to mac branch for continue implementation
15e4e6a4 · Michele Paffetti · 03c04bdc · 59dd9352 · 15e4e6a4 · 15e4e6a4
Commit 15e4e6a4 authored Jun 08, 2017 by Michele Paffetti
67 changed files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,8 +2,6 @@ job1:
  script:
    - date
    - pwd
-    - echo $OAI_USER
-    - echo $OAI_PASS
    - echo $OAI_TEST_CASE_GROUP
    - echo $MACHINELIST
    - echo $MACHINELISTGENERIC

--- a/README.txt
+++ b/README.txt
@@ -39,3 +39,7 @@ v0.3 -> Last stable commit on develop branch before the merge of feature-131-new
 v0.4 -> Merge of feature-131-new-license. It closes issue#131 and changes the license to OAI Public License V1.0
 v0.5 -> Merge of enhancement-10-harmony-lts. It includes fixes for Ubuntu 16.04 support
 v0.5.1 -> Merge of bugfix-137-uplink-fixes. It includes stablity fixes for eNB
+v0.5.2 -> Last version with old code for oaisim (abstraction mode works)
+v0.6 -> RRH functionality, UE greatly improved, better TDD support,
+        a lot of bugs fixed. WARNING: oaisim in PHY abstraction mode does not
+        work, you need to use v0.5.2 for that.
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -236,6 +236,9 @@ add_boolean_option(XFORMS              False "This adds the possibility to see t
 add_boolean_option(PRINT_STATS         False "This adds the possibility to see the status")
 add_boolean_option(T_TRACER            False "Activate the T tracer, a debugging/monitoring framework" )
 add_boolean_option(UE_AUTOTEST_TRACE   False "Activate UE autotest specific logs")
+add_boolean_option(UE_DEBUG_TRACE      False "Activate UE debug trace")
+add_boolean_option(UE_TIMING_TRACE     False "Activate UE timing trace")
+add_boolean_option(DISABLE_LOG_X       False "Deactivate all LOG_* macros")

 add_boolean_option(DEBUG_CONSOLE False "makes debugging easier, disables stdout/stderr buffering")

@@ -984,6 +987,7 @@ set(PHY_SRC
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_decoding.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dlsch_scrambling.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools.c
+  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/dci_tools_nb_iot.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/uci_tools.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/lte_mcs.c
  ${OPENAIR1_DIR}/PHY/LTE_TRANSPORT/pbch.c
@@ -1645,9 +1649,25 @@ else()
 endif()

 # Atlas is required by some packages, but not found in pkg-config
-if(EXISTS "/usr/include/atlas/cblas.h")
+# So, here are some hacks here. Hope this gets fixed in future!
+if(EXISTS "/usr/include/atlas/cblas.h" OR EXISTS "/usr/include/cblas.h")
  include_directories("/usr/include/atlas")
-  list(APPEND ATLAS_LIBRARIES cblas atlas lapack)
+  LINK_DIRECTORIES("/usr/lib64")
+  LINK_DIRECTORIES("/usr/lib64/atlas") #Added because atlas libraries in CentOS 7 are here!
+  
+  if(EXISTS "/usr/lib64/libblas.so" OR EXISTS "/usr/lib/libblas.so") #Case for CentOS7
+     list(APPEND ATLAS_LIBRARIES blas)
+  else() # Case for Ubuntu
+     list(APPEND ATLAS_LIBRARIES cblas)
+  endif()
+
+  if(EXISTS "/usr/lib/atlas/libtatlas.so" OR EXISTS "/usr/lib64/atlas/libtatlas.so") #Case for CentOS7
+     list(APPEND ATLAS_LIBRARIES tatlas)
+  else()
+     list(APPEND ATLAS_LIBRARIES atlas) #Case for Ubuntu
+  endif()
+
+  list(APPEND ATLAS_LIBRARIES lapack)
 else()
  message("No Blas/Atlas libs found, some targets will fail")
 endif()

--- a/cmake_targets/autotests/testsuite_ue_noS1_TCL.xml
+++ b/cmake_targets/autotests/testsuite_ue_noS1_TCL.xml
--- a/cmake_targets/autotests/v2/actions/alu_hss.bash
+++ b/cmake_targets/autotests/v2/actions/alu_hss.bash
 sudo rmmod nasmesh || true
 sudo rmmod ue_ip || true
 sudo /opt/ltebox/tools/stop_ltebox || true
+sudo killall -9 hss_sim || true
 sudo /opt/hss_sim0609/starthss_real
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -61,9 +61,12 @@ BUILD_DOXYGEN=0
 T_TRACER="False"
 DISABLE_HARDWARE_DEPENDENCY="False"
 CMAKE_BUILD_TYPE=""
+CMAKE_CMD="$CMAKE"
 UE_AUTOTEST_TRACE="False"
+UE_DEBUG_TRACE="False"
+UE_TIMING_TRACE="False"
+DISABLE_LOG_X="False"
 BUILD_ECLIPSE=0
-CMAKE_CMD='cmake'
 trap handle_ctrl_c INT

 function print_help() {
@@ -147,6 +150,12 @@ Options
   Disable HW dependency during installation
 --ue-autotest-trace
    Enable specific traces for UE autotest framework
+--ue-trace
+    Enable traces for UE debugging
+--ue-timing
+    Enable traces for timing
+--disable-log
+   Disable all LOG_* macros
 --build-eclipse
   Build eclipse project files. Paths are auto corrected by fixprj.sh
 Usage (first build):
@@ -316,6 +325,18 @@ function main() {
            UE_AUTOTEST_TRACE="True"
            echo_info "Enabling autotest specific trace for UE"
            shift 1;;
+        --ue-trace)
+            UE_DEBUG_TRACE="True"
+            echo_info "Enabling UE trace for debug"
+            shift 1;;
+        --ue-timing)
+            UE_TIMING_TRACE="True"
+            echo_info "Enabling UE timing trace"
+            shift 1;;
+        --disable-log)
+            DISABLE_LOG_X="True"
+            echo_info "Disabling all LOG_* traces"
+            shift 1;;
        --uhd-images-dir)
            UHD_IMAGES_DIR=$2
            echo_info "Downloading UHD images in the indicated location"
@@ -504,6 +525,9 @@ function main() {
    echo "set (CPU_AFFINITY \"${CPU_AFFINITY_FLAG_USER}\" )"      >>$cmake_file
    echo "set ( T_TRACER $T_TRACER )"              >>  $cmake_file
    echo "set (UE_AUTOTEST_TRACE $UE_AUTOTEST_TRACE)"        >>  $cmake_file
+    echo "set (UE_DEBUG_TRACE $UE_DEBUG_TRACE)"        >>  $cmake_file
+    echo "set (UE_TIMING_TRACE $UE_TIMING_TRACE)"        >>  $cmake_file
+    echo "set (DISABLE_LOG_X $DISABLE_LOG_X)"        >>  $cmake_file
    if [ "$UE" = 1 -a "$NOS1" = "0" ] ; then
     echo_info "Compiling UE S1 build : enabling Linux and NETLINK"
     echo "set (LINUX True )"              >>  $cmake_file

--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
--- a/openair1/PHY/CODING/ccoding_byte_NB_IoT.c
+++ b/openair1/PHY/CODING/ccoding_byte_NB_IoT.c
+/***********************************************************************
+
+**********************************************************************/
+/*! \file PHY/LTE_CODING/ccoding_byte_NB_IoT.c
+* \Fucntions for CRC attachment and tail-biting convolutional coding for NPBCH channel,	 TS 36-212, V13.4.0 2017-02
+* \author M. KANJ
+* \date 2017
+* \version 0.0
+* \company bcom
+* \email: matthieu.kanj@b-com.com
+* \note
+* \warning
+*/
+
+#include "defs.h"
+
+#include "defs_NB_IoT.h"
+
+unsigned char  ccodelte_table_NB_IoT[128];      // for transmitter
+//unsigned char  ccodelte_table_rev[128];  // for receiver
+
+/*************************************************************************
+  Encodes for an arbitrary convolutional code of rate 1/3
+  with a constraint length of 7 bits.
+  The inputs are bit packed in octets (from MSB to LSB).
+  An optional 8-bit CRC (3GPP) can be added.
+  Trellis tail-biting is included here
+*************************************************************************/
+void ccode_encode_NB_IoT (int32_t numbits,
+						  uint8_t add_crc,
+						  uint8_t *inPtr,
+						  uint8_t *outPtr,
+						  uint16_t rnti)
+{
+  uint32_t  state;
+  uint8_t  c, out, first_bit;
+  int8_t shiftbit=0;
+  uint16_t c16;
+  uint16_t next_last_byte=0;
+  uint32_t crc=0;
+
+  /* The input bit is shifted in position 8 of the state.
+     Shiftbit will take values between 1 and 8 */
+  state = 0;
+
+  if (add_crc == 2) {
+    crc = crc16(inPtr,numbits);     // crc is 2 bytes
+    // scramble with RNTI
+    crc ^= (((uint32_t)rnti)<<16);  // XOR with crc
+    first_bit = 2;
+    c = (uint8_t)((crc>>16)&0xff);
+  } else {
+    next_last_byte = numbits>>3;
+    first_bit      = (numbits-6)&7;
+    c = inPtr[next_last_byte-1];
+  }
+
+  // Perform Tail-biting
+  // get bits from last byte of input (or crc)
+  
+  for (shiftbit = 0 ; shiftbit <(8-first_bit) ; shiftbit++) {
+    if ((c&(1<<(7-first_bit-shiftbit))) != 0)
+      state |= (1<<shiftbit);
+  }
+
+  state = state & 0x3f;   // true initial state of Tail-biting CCode
+  state<<=1;              // because of loop structure in CCode
+
+  while (numbits > 0) {											// Tail-biting is applied to input bits , input 34 bits , output 102 bits
+
+    c = *inPtr++;
+
+    for (shiftbit = 7; (shiftbit>=0) && (numbits>0); shiftbit--,numbits--) {
+      state >>= 1;
+
+      if ((c&(1<<shiftbit)) != 0) {
+        state |= 64;
+      }
+
+      out = ccodelte_table_NB_IoT[state];
+
+      *outPtr++ = out  & 1;
+      *outPtr++ = (out>>1)&1;
+      *outPtr++ = (out>>2)&1;
+
+    }
+
+  }
+  
+  // now code 16-bit CRC for DCI 						// Tail-biting is applied to CRC bits , input 16 bits , output 48 bits
+  if (add_crc == 2) {
+
+    c16 = (uint16_t)(crc>>16);
+	
+    for (shiftbit = 15; (shiftbit>=0); shiftbit--) {
+      state >>= 1;
+
+      if ((c16&(1<<shiftbit)) != 0) {
+        state |= 64;
+      }
+
+      out = ccodelte_table_NB_IoT[state];
+
+      *outPtr++ = out  & 1;
+      *outPtr++ = (out>>1)&1;
+      *outPtr++ = (out>>2)&1;  
+
+    }
+  }
+}
+/*************************************************************************
+
+  Functions to initialize the code tables
+
+*************************************************************************/
+/* Basic code table initialization for constraint length 7 */
+
+/* Input in MSB, followed by state in 6 LSBs */
+void ccodelte_init_NB_IoT(void)
+{
+  unsigned int  i, j, k, sum;
+
+  for (i = 0; i < 128; i++) {
+    ccodelte_table_NB_IoT[i] = 0;
+
+    /* Compute 3 output bits */
+    for (j = 0; j < 3; j++) {
+      sum = 0;
+
+      for (k = 0; k < 7; k++)
+        if ((i & glte[j]) & (1 << k))
+          sum++;
+
+      /* Write the sum modulo 2 in bit j */
+      ccodelte_table_NB_IoT[i] |= (sum & 1) << j;
+    }
+  }
+}
+
--- a/openair1/PHY/CODING/lte_rate_matching_NB_IoT.c
+++ b/openair1/PHY/CODING/lte_rate_matching_NB_IoT.c
+/***********************************************************************
+
+**********************************************************************/
+/*! \file PHY/LTE_CODING/lte_rate_matching_NB_IoT.c
+* \Procedures for rate matching/interleaving for NB-IoT (turbo-coded transport channels) (TX/RX),	 TS 36-212, V13.4.0 2017-02
+* \author M. KANJ
+* \date 2017
+* \version 0.0
+* \company bcom
+* \email: matthieu.kanj@b-com.com
+* \note
+* \warning
+*/
+
+#ifdef MAIN
+#include <stdio.h>
+#include <stdlib.h>
+#endif
+#include "PHY/defs.h"
+#include "assertions.h"
+
+#include "PHY/defs_NB_IoT.h"
+
+static uint32_t bitrev_cc[32] = {1,17,9,25,5,21,13,29,3,19,11,27,7,23,15,31,0,16,8,24,4,20,12,28,2,18,10,26,6,22,14,30};
+
+uint32_t sub_block_interleaving_cc_NB_IoT(uint32_t D, uint8_t *d,uint8_t *w)
+{
+  uint32_t RCC = (D>>5), ND, ND3;   // D = 50 ,  
+  uint32_t row,col,Kpi,index;
+  uint32_t index3,k;
+
+  if ((D&0x1f) > 0)
+    RCC++;
+
+  Kpi = (RCC<<5); 					// Kpi = 32
+  ND = Kpi - D;
+  ND3 = ND*3;   					// ND3 = ND*3 = 18 *3 = 54
+  k=0;
+
+  for (col=0; col<32; col++) {
+
+    index = bitrev_cc[col];
+    index3 = 3*index;
+
+    for (row=0; row<RCC; row++) {
+      w[k]          =   d[(int32_t)index3-(int32_t)ND3];
+      w[Kpi+k]      =   d[(int32_t)index3-(int32_t)ND3+1];
+      w[(Kpi<<1)+k] =   d[(int32_t)index3-(int32_t)ND3+2];
+
+      index3+=96;
+      index+=32;
+      k++;
+    }
+  }
+  return(RCC);
+}
+
+
+uint32_t lte_rate_matching_cc_NB_IoT(uint32_t RCC,      // RRC = 2
+				     uint16_t E,        // E = 1600
+				     uint8_t *w,	// length
+				     uint8_t *e)	// length 1600
+{
+  uint32_t ind=0,k;
+
+  uint16_t Kw = 3*(RCC<<5);   				  // 3*64 = 192
+
+  for (k=0; k<E; k++) {
+
+    while(w[ind] == LTE_NULL) {
+
+      ind++;
+
+      if (ind==Kw)
+        ind=0;
+    }
+
+    e[k] = w[ind];
+    ind++;
+
+    if (ind==Kw)
+      ind=0;
+  }
+
+  return(E);
+}
--- a/openair1/PHY/INIT/defs_nb_iot.h
+++ b/openair1/PHY/INIT/defs_nb_iot.h
--- a/openair1/PHY/INIT/lte_init_nb_iot.c
+++ b/openair1/PHY/INIT/lte_init_nb_iot.c
--- a/openair1/PHY/INIT/lte_parms.c
+++ b/openair1/PHY/INIT/lte_parms.c
@@ -44,7 +44,11 @@ int init_frame_parms(LTE_DL_FRAME_PARMS *frame_parms,uint8_t osf)

  uint8_t log2_osf;

+#if DISABLE_LOG_X
+  printf("Initializing frame parms for N_RB_DL %d, Ncp %d, osf %d\n",frame_parms->N_RB_DL,frame_parms->Ncp,osf);
+#else
  LOG_I(PHY,"Initializing frame parms for N_RB_DL %d, Ncp %d, osf %d\n",frame_parms->N_RB_DL,frame_parms->Ncp,osf);
+#endif

  if (frame_parms->Ncp==EXTENDED) {
    frame_parms->nb_prefix_samples0=512;

--- a/openair1/PHY/LTE_REFSIG/defs_NB_IoT.h
+++ b/openair1/PHY/LTE_REFSIG/defs_NB_IoT.h
+/*******************************************************************************
+
+ *******************************************************************************/
+/*! \file PHY/LTE_REFSIG/defs_NB_IoT.c
+* \function called by lte_dl_cell_spec_NB_IoT.c ,	 TS 36-211, V13.4.0 2017-02
+* \author M. KANJ
+* \date 2017
+* \version 0.0
+* \company bcom
+* \email: matthieu.kanj@b-com.com
+* \note
+* \warning
+*/
+
+/* Definitions for NB_IoT Reference signals */
+
+#ifndef __LTE_REFSIG_DEFS_NB_IOT__H__
+#define __LTE_REFSIG_DEFS_NB_IOT__H__
+#include "PHY/defs.h"
+#include "PHY/defs_NB_IoT.h"
+
+/** @ingroup _PHY_REF_SIG
+ * @{
+*/
+/*!\brief This function generates the LTE Gold sequence (36-211, Sec 7.2), specifically for DL reference signals.
+@param frame_parms LTE DL Frame parameters
+@param lte_gold_table pointer to table where sequences are stored
+@param Nid_cell Cell Id for NB_IoT (to compute sequences for local and adjacent cells) */
+
+void lte_gold_NB_IoT(LTE_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_table[20][2][14],uint16_t Nid_cell);
+
+/*! \brief This function generates the Narrowband reference signal (NRS) sequence (36-211, Sec 6.10.1.1)
+@param phy_vars_eNB Pointer to eNB variables
+@param output Output vector for OFDM symbol (Frequency Domain)
+@param amp Q15 amplitude
+@param Ns Slot number (0..19)
+@param l symbol (0,1) - Note 1 means 3!
+@param p antenna index
+@param RB_IoT_ID the ID of the RB dedicated for NB_IoT
+*/
+int lte_dl_cell_spec_NB_IoT(PHY_VARS_eNB *phy_vars_eNB,
+                     int32_t *output,
+                     short amp,
+                     unsigned char Ns,
+                     unsigned char l,
+                     unsigned char p
+					 unsigned short RB_IoT_ID); 
+					 
+#endif
--- a/openair1/PHY/LTE_REFSIG/first_synchro_NB_IoT.m
+++ b/openair1/PHY/LTE_REFSIG/first_synchro_NB_IoT.m
+function [ theta_estim, estim_CFO ] = Fc_first_synchro( observation, L_frame, L_sub_frame, FFT_size, L_symbol, N_subframe_observation, L_CP, SNR, type_first_estim )
+% This function performs the estimation of the beginning of symbols as well
+% as the estimation of CFO. It allows for a coarse synchronization 
+
+gamma = zeros(1,L_frame);
+epsilon = zeros(1,L_frame); 
+
+for n = 1 : 1 : length(gamma)
+     
+    gamma(n) = sum(observation(n:n+L_CP-1).*conj(observation(n+FFT_size:n+FFT_size+L_CP-1)));
+    epsilon(n) = sum(abs(observation(n:n+L_CP-1)).^2 + abs(observation(n+FFT_size:n+FFT_size+L_CP-1)).^2);
+end
+
+rho = 10^(SNR/20)/(10^(SNR/20)+1);
+theta = 2*abs(gamma)-rho*(epsilon); 
+
+% Estimation of the symbol start and the corresponding CFO
+
+theta_reshape = reshape(theta,L_symbol,N_subframe_observation*L_sub_frame); 
+% gamma_reshape = reshape(gamma,L_symbol,N_subframe_observation*L_sub_frame); % useful for estimation of CFO
+[~,index_max] = max(theta_reshape); % where theta is max symbol by symbol
+
+switch type_first_estim
+    case 1
+        %estimation by mean
+        theta_estim = sum(index_max)/length(index_max); % estimation by mean
+        estim_CFO = -1/(2*pi)*atan(imag(gamma(round(theta_estim)))/real(gamma(round(theta_estim)))); 
+    case 2
+        %estimation by majority
+        counter_index = zeros(1,L_symbol);  
+        for k = 1 : 1 : length(index_max)
+    
+        counter_index(index_max(k)) = counter_index(index_max(k)) + 1; % add the number of index_max
+    
+        end
+
+        [~,theta_estim] = max(counter_index); % get the max of index max -> theta estim
+%         index_index_max = find(index_max == theta_estim); 
+%         estim_CFO = -1/(2*pi)*atan(imag(gamma(round(theta_estim)))/real(gamma(round(theta_estim))));
+        estim_CFO_vec = -1/(2*pi)*atan(imag(gamma(round(theta_estim:L_symbol:end)))./real(gamma(round(theta_estim:L_symbol:end))));
+%         estim_CFO_vec2 = -1/(2*pi)*atan(imag(gamma_reshape(theta_estim,index_max(index_index_max)))./real(gamma_reshape(theta_estim,index_max(index_index_max))));
+        estim_CFO = sum(estim_CFO_vec)/length(estim_CFO_vec); 
+%         estim_CFO_2 = sum(estim_CFO_vec2)/length(estim_CFO_vec2); 
+    otherwise
+        print('error: type of estimation not defined')
+end
+
--- a/openair1/PHY/LTE_REFSIG/lte_dl_cell_spec_NB_IoT.c
+++ b/openair1/PHY/LTE_REFSIG/lte_dl_cell_spec_NB_IoT.c
+/***********************************************************************
+
+**********************************************************************/
+/*! \file PHY/LTE_REFSIG/lte_dl_cell_spec_NB_IoT.c
+* \function called by pilots_NB_IoT.c ,	 TS 36-211, V13.4.0 2017-02
+* \author M. KANJ
+* \date 2017
+* \version 0.0
+* \company bcom
+* \email: matthieu.kanj@b-com.com
+* \note
+* \warning
+*/
+
+#ifdef USER_MODE
+#include <stdio.h>
+#include <stdlib.h>
+#endif
+
+#include "defs.h"
+#include "PHY/defs.h"
+
+#include "defs_NB_IoT.h"
+#include "PHY/defs_NB_IoT.h"
+
+int lte_dl_cell_spec_NB_IoT(PHY_VARS_eNB *phy_vars_eNB,
+                     int32_t *output,
+                     short amp,
+                     unsigned char Ns,
+                     unsigned char l,
+                     unsigned char p,
+					 unsigned short RB_IoT_ID) 			// the ID of the RB dedicated for NB_IoT
+{
+  unsigned char nu,mprime,mprime_dword,mprime_qpsk_symb,m;
+  unsigned short k,a;
+  unsigned short NB_IoT_start,bandwidth_even_odd;
+  int32_t qpsk[4];
+
+  a = (amp*ONE_OVER_SQRT2_Q15)>>15;
+  ((short *)&qpsk[0])[0] = a;
+  ((short *)&qpsk[0])[1] = a;
+  ((short *)&qpsk[1])[0] = -a;
+  ((short *)&qpsk[1])[1] = a;
+  ((short *)&qpsk[2])[0] = a;
+  ((short *)&qpsk[2])[1] = -a;
+  ((short *)&qpsk[3])[0] = -a;
+  ((short *)&qpsk[3])[1] = -a;
+
+  if ((p==0) && (l==0) )
+    nu = 0;
+  else if ((p==0) && (l>0))
+    nu = 3;
+  else if ((p==1) && (l==0))
+    nu = 3;
+  else if ((p==1) && (l>0))
+    nu = 0;
+  else {
+    printf("lte_dl_cell_spec: p %d, l %d -> ERROR\n",p,l);
+    return(-1);
+  }
+
+  // testing if the total number of RBs is even or odd 
+  bandwidth_even_odd = frame_parms->N_RB_DL % 2;    // 0 even, 1 odd
+  
+  mprime = 0; 										// mprime = 0,1 for NB_IoT //  for LTE , maximum number of resources blocks (110) - the total number of RB in the selected bandwidth (.... 15 , 25 , 50, 100)
+  k = (nu + phy_vars_eNB->lte_frame_parms.nushift)%6;
+
+  if(RB_IoT_ID < (phy_vars_eNB->lte_frame_parms.N_RB_DL/2))
+  {
+		NB_IoT_start = phy_vars_eNB->lte_frame_parms.ofdm_symbol_size - 12*(phy_vars_eNB->lte_frame_parms.N_RB_DL/2) - (bandwidth_even_odd*6) + 12*(RB_IoT_ID%(ceil(phy_vars_eNB->lte_frame_parms.N_RB_DL/(float)2)));
+  } else {
+		NB_IoT_start = (bandwidth_even_odd*6) + 12*(RB_IoT_ID%(ceil(phy_vars_eNB->lte_frame_parms.N_RB_DL/(float)2)));
+  }
+   
+  k+=NB_IoT_start;
+   
+  DevAssert( Ns < 20 );
+  DevAssert( l < 2 );
+
+  for (m=0; m<2; m++) {
+    output[k] = qpsk[(phy_vars_eNB->lte_gold_table_NB_IoT[Ns][l][0]) & 3];
+    k+=6;
+  }
+
+  return(0);
+}
+
--- a/openair1/PHY/LTE_REFSIG/lte_gold_NB_IoT.c
+++ b/openair1/PHY/LTE_REFSIG/lte_gold_NB_IoT.c
+/***********************************************************************
+
+**********************************************************************/
+/*! \file PHY/LTE_REFSIG/lte_gold_NB_IoT.c
+* \function called by lte_dl_cell_spec_NB_IoT.c ,	 TS 36-211, V13.4.0 2017-02
+* \author M. KANJ
+* \date 2017
+* \version 0.0
+* \company bcom
+* \email: matthieu.kanj@b-com.com
+* \note
+* \warning
+*/
+
+#include "defs.h"
+#include "defs_NB_IoT.h"
+
+void lte_gold_NB_IoT(LTE_DL_FRAME_PARMS *frame_parms,uint32_t lte_gold_table_NB_IoT[20][2][14],uint16_t Nid_cell)  //  Nid_cell = Nid_cell_NB_IoT
+{
+  unsigned char ns,l,Ncp=1;
+  unsigned int n,x1,x2;
+
+  for (ns=0; ns<20; ns++) {
+
+    for (l=0; l<2; l++) {
+
+      x2 = Ncp +
+           (Nid_cell<<1) +
+		   (((1+(Nid_cell<<1))*(1 + (l+5) + (7*(1+ns))))<<10); //cinit
+     
+      x1 = 1+ (1<<31);
+      x2 = x2 ^ ((x2 ^ (x2>>1) ^ (x2>>2) ^ (x2>>3))<<31);
+
+      // skip first 50 double words (1600 bits)
+      for (n=1; n<50; n++) {
+        x1 = (x1>>1) ^ (x1>>4);
+        x1 = x1 ^ (x1<<31) ^ (x1<<28);
+        x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
+        x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
+      }
+
+      for (n=0; n<14; n++) {
+        x1 = (x1>>1) ^ (x1>>4);
+        x1 = x1 ^ (x1<<31) ^ (x1<<28);
+        x2 = (x2>>1) ^ (x2>>2) ^ (x2>>3) ^ (x2>>4);
+        x2 = x2 ^ (x2<<31) ^ (x2<<30) ^ (x2<<29) ^ (x2<<28);
+        lte_gold_table_NB_IoT[ns][l][n] = x1^x2;
+      }
+
+    }
+
+  }
+}
+
+
+// \brief gold sequenquence generator
+//\param x1
+//\param x2 this should be set to c_init if reset=1
+//\param reset resets the generator
+//\return 32 bits of the gold sequence
+
+unsigned int lte_gold_generic_NB_IoT(unsigned int *x1, unsigned int *x2, unsigned char reset)
+{
+  int n;
+  if (reset) {
+    *x1 = 1+ (1<<31);
+    *x2=*x2 ^ ((*x2 ^ (*x2>>1) ^ (*x2>>2) ^ (*x2>>3))<<31);
+
+    for (n=1; n<50; n++) {
+      *x1 = (*x1>>1) ^ (*x1>>4);
+      *x1 = *x1 ^ (*x1<<31) ^ (*x1<<28);
+      *x2 = (*x2>>1) ^ (*x2>>2) ^ (*x2>>3) ^ (*x2>>4);
+      *x2 = *x2 ^ (*x2<<31) ^ (*x2<<30) ^ (*x2<<29) ^ (*x2<<28);
+    }
+  }
+
+  *x1 = (*x1>>1) ^ (*x1>>4);
+  *x1 = *x1 ^ (*x1<<31) ^ (*x1<<28);
+  *x2 = (*x2>>1) ^ (*x2>>2) ^ (*x2>>3) ^ (*x2>>4);
+  *x2 = *x2 ^ (*x2<<31) ^ (*x2<<30) ^ (*x2<<29) ^ (*x2<<28);
+  return(*x1^*x2);
+}
+
+
--- a/openair1/PHY/LTE_REFSIG/main_synchro_NPSS_NB_IoT.m
+++ b/openair1/PHY/LTE_REFSIG/main_synchro_NPSS_NB_IoT.m
+clear all 
+close all 
+
+% description: test synchro using CP for time-freq. synchro
+% and ZC sequence for beginning of the radio frame estimation
+% date : 09/03/2017
+% author : Vincent Savaux, b<>com, Rennes, France
+% email: vincent.savaux@b-com.com
+
+% Parameters
+
+u = 5; % root of ZC sequence 
+size_RB = 12; % number of sub-carrier per RB 
+N_ZC = size_RB-1; 
+L_sub_frame = 14; 
+j = 1i; 
+CFO = 0.1; % normalized CFO 
+N_frames = 4; % at least 3 
+N_sub_frame = 10*N_frames; % how many simulated sub_frame you want 
+FFT_size = 128; 
+N_zeros = (FFT_size-size_RB)/2; % Number of zero subcarriers in upper and lower frequencies 
+L_CP = round(4.6875/(66.7)*FFT_size); % Number of samples of the CP 
+L_symbol = (FFT_size + L_CP); 
+L_frame = (FFT_size + L_CP)*L_sub_frame*10; 
+L_signal = (FFT_size + L_CP)*L_sub_frame*N_sub_frame; 
+normalized_time = 0 : 1 : L_signal-1; 
+SNR_start = 0; % in dB 
+SNR_end = 30; % in dB 
+N_subframe_observation = 10; % length of observation for syncronization 
+N_loop = 1000; % number of runs, for good statistics 
+type_first_estim = 2; % 1 -> estimation by mean, 2-> estimation by majority 
+
+matrix_error_theta_1 = zeros(N_loop,SNR_end-SNR_start+1); 
+matrix_error_theta_2 = zeros(N_loop,SNR_end-SNR_start+1);  
+matrix_error_angle_1 = zeros(N_loop,SNR_end-SNR_start+1); 
+matrix_error_angle_2 = zeros(N_loop,SNR_end-SNR_start+1); 
+matrix_error_angle_3 = zeros(N_loop,SNR_end-SNR_start+1); 
+matrix_error_BOF = zeros(N_loop,SNR_end-SNR_start+1); 
+
+for SNR = SNR_start : 2 : SNR_end
+for loop = 1 : N_loop     
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Creation of the signal
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% ZC sequence in frequency domain
+
+vec_n = 0:N_ZC-1; 
+f_ZC_sequence = exp(-j*pi*u*vec_n.*(vec_n+1)/N_ZC); 
+f_NPSS_symbol = [f_ZC_sequence.';0]; % one NPSS symbol 
+f_NPSS_frame = [zeros(size_RB,3),kron(ones(1,L_sub_frame-3),f_NPSS_symbol)]; 
+
+% OFDM sub_frame in frequency domain -> modulation : QPSK
+%random QPSK elements: 
+f_OFDM_frames = (2*randi([0,1],size_RB,L_sub_frame*N_sub_frame)-1) + j*(2*randi([0,1],size_RB,L_sub_frame*N_sub_frame)-1); 
+
+%replace the k*6th subframes by f_NPSS_frame:
+f_LTE_frames = f_OFDM_frames; 
+for k = 0 : N_frames-1
+   
+    N_index = k*10*L_sub_frame + 85; 
+    f_LTE_frames(:,N_index:N_index+13) = f_NPSS_frame; 
+    
+end
+
+% IFFT: get frames in time domain (Parralel representation)
+
+f_zero_carriers = zeros(N_zeros,L_sub_frame*N_sub_frame); 
+f_ups_LTE_frames = [f_zero_carriers;f_LTE_frames;f_zero_carriers]; % add zero carriers up and down the symbols
+t_P_LTE_frames = ifft(f_ups_LTE_frames,FFT_size); 
+
+% Add CP (Parralel representation) 
+
+t_P_LTE_frames_CP = [t_P_LTE_frames(end-L_CP+1:end,:);t_P_LTE_frames]; 
+
+% Parralel to series conversion 
+
+t_S_LTE_frames = reshape(t_P_LTE_frames_CP,1,[]); 
+
+% Add a channel frequency offset (CFO)
+
+t_S_received_frames = t_S_LTE_frames.*exp(j*2*pi*CFO*normalized_time/FFT_size); 
+
+% Add noise 
+
+P_signal = sum(abs(t_S_received_frames).^2)/length(t_S_received_frames); 
+P_noise = P_signal*10^(-SNR/20); 
+
+init_noise = randn(size(t_S_received_frames));
+normalized_noise = init_noise/sqrt(sum(abs(init_noise).^2)/length(init_noise));
+noise = sqrt(P_noise)*normalized_noise;
+
+t_S_noisy_frames = t_S_received_frames + noise;
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Time and frequency synchronization
+% The principle is based on the croos-correlation between the received
+% sequence and the transmitted SC sequence. 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% Get an observation, the duration of which is one frame length. The
+% beginning of the stored samples is at 1 frame +- 0.5 frame
+
+index_start = L_frame + randi([-L_frame/2,L_frame/2],1);
+observation = t_S_noisy_frames(index_start:index_start+1.5*L_frame-1);
+f_oversampl_NPSS_symbol = [f_zero_carriers(:,1);f_NPSS_symbol;f_zero_carriers(:,1)];
+t_NPPS_unit = ifft(f_oversampl_NPSS_symbol,FFT_size); 
+t_NPPS_correl = [t_NPPS_unit(end-L_CP+1:end);t_NPPS_unit]; 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Estimation of start of the symbols and the CFO 
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+
+[ theta_estim, estim_CFO ] = first_synchro( observation, L_frame, L_sub_frame, FFT_size, L_symbol, N_subframe_observation, L_CP, SNR, type_first_estim ); 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Time and frequency synchronization
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+
+new_index_start = index_start + theta_estim - 1; 
+new_vec_time = new_index_start-1 : 1 : new_index_start+1.5*L_frame-2; 
+new_observation = t_S_noisy_frames(new_index_start:new_index_start+1.5*L_frame-1).*exp(-j*2*pi*estim_CFO*new_vec_time/FFT_size); 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Second synchronization: beginning of frame (BOF)
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+
+[ BOF ] = second_synchro( new_observation, f_NPSS_symbol , L_frame, L_symbol, FFT_size, L_CP, N_zeros ); 
+
+
+exact_index = L_symbol - rem(index_start,L_symbol) + 2; 
+[error_theta_1,ind_error1] = min([abs(exact_index - theta_estim-L_symbol), abs(exact_index - theta_estim),abs(exact_index - theta_estim+L_symbol)]); 
+% [error_theta_2,ind_error2] = min([abs(exact_index - theta_estim_2-137), abs(exact_index - theta_estim_2),abs(exact_index - theta_estim_2+137)]); 
+
+error_CFO_1 = CFO - estim_CFO; 
+% error_CFO_2 = CFO - estim_CFO_1; 
+% error_CFO_3 = CFO - estim_CFO_2; 
+
+vec_exact_index = 85 : 140 : N_frames*140;  
+estim_BOF = ceil((index_start-1)/L_symbol) + BOF ; 
+error_BOF = min(abs(estim_BOF-vec_exact_index)); 
+
+matrix_error_theta_1(loop,SNR-SNR_start+1) = error_theta_1; 
+% matrix_error_theta_2(loop,SNR-SNR_start+1) = error_theta_2;  
+matrix_error_angle_1(loop,SNR-SNR_start+1) = error_CFO_1; 
+% matrix_error_angle_2(loop,SNR-SNR_start+1) = error_CFO_2; 
+% matrix_error_angle_3(loop,SNR-SNR_start+1) = error_CFO_3;
+matrix_error_BOF(loop,SNR-SNR_start+1) = error_BOF;
+
+end
+end
+plot(SNR_start:2:SNR_end,sqrt(sum(abs(matrix_error_theta_1(:,1:2:SNR_end+1)).^2)/N_loop))
+hold
+% plot(SNR_start:2:SNR_end,sqrt(sum(abs(matrix_error_theta_2(:,1:2:SNR_end+1)).^2)/N_loop))
+figure
+plot(SNR_start:2:SNR_end,sqrt(sum(abs(matrix_error_angle_1(:,1:2:SNR_end+1)).^2)/N_loop))
+hold
+% plot(SNR_start:SNR_end,sum(abs(matrix_error_angle_2(:,1:31)))/N_loop)
+% plot(SNR_start:SNR_end,sum(abs(matrix_error_angle_3(:,1:31)))/N_loop)
+% plot(SNR_start:2:SNR_end,sqrt(sum(abs(matrix_error_angle_2(:,1:2:SNR_end+1)).^2)/N_loop),'s')
+% plot(SNR_start:2:SNR_end,sqrt(sum(abs(matrix_error_angle_3(:,1:2:SNR_end+1)).^2)/N_loop),'d')
+figure 
+plot(SNR_start:2:SNR_end,sqrt(sum(abs(matrix_error_BOF(:,1:2:SNR_end+1)).^2)/N_loop))
+hold
+save
+
--- a/openair1/PHY/LTE_REFSIG/primary_synch_NB_IoT.h
+++ b/openair1/PHY/LTE_REFSIG/primary_synch_NB_IoT.h
+/***********************************************************************
+
+**********************************************************************/
+/*! \file PHY/LTE_REFSIG/primary_synch_NB_IoT.c
+* \Narrowband Primary Synchronisation Signal(NPSS) for NB-IoT,  TS 36-212, V13.4.0 2017-02
+* \author M. KANJ
+* \date 2017
+* \version 0.0
+* \company bcom
+* \email: matthieu.kanj@b-com.com
+* \note
+* \warning
+*/
+
+// 12x11= 132 RE ( x 2= 264 since Re,Img).
+// For the In-band case: the RE dedicated to LTE pilots are supposed to overwrite 16 REs of the NPSS signal.
+
+short primary_synch_NB_IoT[264] = {32767,0,-31440,-9232,-21458,-24764,-4664,32433,-31440,9231,13611,29805,-31440,9231,-4664,32433,-21458,-24764,-31440,-9232,32767,-1,0,0,32767,0,-31440,-9232,-21458,-24764,-4664,32433,-31440,9231,13611,29805,-31440,9231,-4664,32433,-21458,-24764,-31440,-9232,32767,-1,0,0,32767,0,-31440,-9232,-21458,-24764,-4664,32433,-31440,9231,13611,29805,-31440,9231,-4664,32433,-21458,-24764,-31440,-9232,32767,-1,0,0,32767,0,-31440,-9232,-21458,-24764,-4664,32433,-31440,9231,13611,29805,-31440,9231,-4664,32433,-21458,-24764,-31440,-9232,32767,-1,0,0,-32767,0,31439,9231,21457,24763,4663,-32434,31439,-9232,-13612,-29806,31439,-9232,4663,-32434,21457,24763,31439,9231,-32767,0,0,0,-32767,0,31439,9231,21457,24763,4663,-32434,31439,-9232,-13612,-29806,31439,-9232,4663,-32434,21457,24763,31439,9231,-32767,0,0,0,32767,0,-31440,-9232,-21458,-24764,-4664,32433,-31440,9231,13611,29805,-31440,9231,-4664,32433,-21458,-24764,-31440,-9232,32767,-1,0,0,32767,0,-31440,-9232,-21458,-24764,-4664,32433,-31440,9231,13611,29805,-31440,9231,-4664,32433,-21458,-24764,-31440,-9232,32767,-1,0,0,32767,0,-31440,-9232,-21458,-24764,-4664,32433,-31440,9231,13611,29805,-31440,9231,-4664,32433,-21458,-24764,-31440,-9232,32767,-1,0,0,-32767,0,31439,9231,21457,24763,4663,-32434,31439,-9232,-13612,-29806,31439,-9232,4663,-32434,21457,24763,31439,9231,-32767,0,0,0,32767,0,-31440,-9232,-21458,-24764,-4664,32433,-31440,9231,13611,29805,-31440,9231,-4664,32433,-21458,-24764,-31440,-9232,32767,-1,0,0};
--- a/openair1/PHY/LTE_REFSIG/second_synchro_NB_IoT.m
+++ b/openair1/PHY/LTE_REFSIG/second_synchro_NB_IoT.m
+function [ BOF ] = Fc_second_synchro( new_observation, f_NPSS_symbol , L_frame, L_symbol, FFT_size, L_CP , N_zeros )
+%UNTITLED2 Summary of this function goes here
+%   Detailed explanation goes here
+%     new_obs_reshape = reshape(new_observation(1:L_frame), L_symbol, []); 
+    new_obs_reshape = reshape(new_observation, L_symbol, []); 
+    t_new_obs_CP_remov = new_obs_reshape(L_CP+1:end,:); 
+    f_new_symbols = fft(t_new_obs_CP_remov,FFT_size); 
+    
+    for n = 1 : length(f_new_symbols(1,:))
+        corr(:,n) = xcorr(f_new_symbols(N_zeros+1:N_zeros+12,n),f_NPSS_symbol); 
+        mean = sum(abs(corr(:,n))); 
+        mm(n) = sum((abs(corr(:,n))-mean).^2);
+    end
+    
+    for k = 1 : length(mm) - 13
+       min_var(k) = sum(mm(k:k+13));  
+    end
+    [~,BOF] = min(min_var);
+end
+
--- a/openair1/PHY/LTE_TRANSPORT/dci.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci.c
@@ -1754,8 +1754,8 @@ int32_t rx_pdcch(PHY_VARS_UE *ue,
      avgs = cmax(avgs,avgP[(aarx<<1)+aatx]);

  log2_maxh = (log2_approx(avgs)/2) + 5;  //+frame_parms->nb_antennas_rx;
-#ifdef DEBUG_PHY
-  LOG_I(PHY,"subframe %d: pdcch log2_maxh = %d (%d,%d)\n",subframe,log2_maxh,avgP[0],avgs);
+#ifdef UE_DEBUG_TRACE
+  LOG_D(PHY,"subframe %d: pdcch log2_maxh = %d (%d,%d)\n",subframe,log2_maxh,avgP[0],avgs);
 #endif

 #if T_TRACER
@@ -2653,7 +2653,8 @@ int get_nCCE_offset_l1(int *CCE_table,
      search_space_free = 1;

      for (l=0; l<L; l++) {
-        if (CCE_table[(((Yk+m)%(nCCE/L))*L) + l] == 1) {
+        int cce = (((Yk+m)%(nCCE/L))*L) + l;
+        if (cce >= nCCE || CCE_table[cce] == 1) {
          search_space_free = 0;
          break;
        }

--- a/openair1/PHY/LTE_TRANSPORT/dci_nb_iot.h
+++ b/openair1/PHY/LTE_TRANSPORT/dci_nb_iot.h
@@ -35,7 +35,7 @@
 #include <stdint.h>
 #endif

-typedef enum DCI_format_NB
+typedef enum 
 {
  DCIFormatN0 = 0,
  DCIFormatN1,
@@ -43,7 +43,7 @@ typedef enum DCI_format_NB
  DCIFormatN1_RAR,
  DCIFormatN2_Ind,
  DCIFormatN2_Pag,
-}e_DCI_format_NB;
+}DCI_format_NB_t;

 ///  DCI Format Type 0 (180 kHz, 23 bits)
 struct DCIFormatN0{
@@ -68,7 +68,6 @@ struct DCIFormatN0{
 };

 typedef struct DCIFormatN0 DCIFormatN0_t;
-#define sizeof_DDCIFormatN0_t 23

 ///  DCI Format Type N1 for User data
 struct DCIFormatN1{
@@ -94,7 +93,6 @@ struct DCIFormatN1{


 typedef struct DCIFormatN1 DCIFormatN1_t;
-#define sizeof_DCIFormatN1_t 23

 ///  DCI Format Type N1 for initial RA
 struct DCIFormatN1_RA{
@@ -111,7 +109,6 @@ struct DCIFormatN1_RA{
 };

 typedef struct DCIFormatN1_RA DCIFormatN1_RA_t;
-#define sizeof_DCIFormatN1_RA_t 23

 ///  DCI Format Type N1 for RAR
 struct DCIFormatN1_RAR{
@@ -134,7 +131,6 @@ struct DCIFormatN1_RAR{
 };

 typedef struct DCIFormatN1_RAR DCIFormatN1_RAR_t;
-#define sizeof_DCIFormatN1_RAR_t 23

 //  DCI Format Type N2 for direct indication, 15 bits
 struct DCIFormatN2_Ind{
@@ -147,7 +143,6 @@ struct DCIFormatN2_Ind{
 };

 typedef struct DCIFormatN2_Ind DCIFormatN2_Ind_t;
-#define sizeof_DCIFormatN2_Ind_t 15

 //  DCI Format Type N2 for Paging, 15 bits
 struct DCIFormatN2_Pag{
@@ -164,9 +159,8 @@ struct DCIFormatN2_Pag{
 };

 typedef struct DCIFormatN2_Pag DCIFormatN2_Pag_t;
-#define sizeof_DCIFormatN2_Pag_t 15

- typedef union DCI_CONTENT {
+typedef union DCI_CONTENT {
 // 
 DCIFormatN0_t DCIN0;
 //
@@ -180,4 +174,106 @@ typedef struct DCIFormatN2_Pag DCIFormatN2_Pag_t;
 //
 DCIFormatN2_Pag_t DCIN2_Pag;

- }DCI_CONTENT;
\ No newline at end of file
+ }DCI_CONTENT;
+
+ /*Structure for packing*/
+
+ struct DCIN0{
+  /// DCI subframe repetition Number, 2 bits
+  uint8_t DCIRep:2;
+  /// New Data Indicator, 1 bits
+  uint8_t ndi:1;
+  /// Repetition Number, 3 bits
+  uint8_t RepNum:3;
+  /// Redundancy version for HARQ (only use 0 and 2), 1 bits
+  uint8_t rv:1;
+  /// Modulation and Coding Scheme, 4 bits
+  uint8_t mcs:4;
+  /// Scheduling Delay, 2 bits
+  uint8_t Scheddly:2;
+  /// Resourse Assignment (RU Assignment), 3 bits
+  uint8_t ResAssign:3;
+  /// Subcarrier indication, 6 bits
+  uint8_t scind:6;
+  /// type = 0 => DCI Format N0, type = 1 => DCI Format N1, 1 bits
+  uint8_t type:1;
+ } __attribute__ ((__packed__));
+
+ typedef struct DCIN0 DCIN0_t;
+#define sizeof_DCIN0_t 23
+
+struct DCIN1_RAR{
+  // Reserved 5 bits like payload
+  uint8_t Reserved:5;
+  // DCI subframe repetition Number, 2 bits
+  uint8_t DCIRep:2;
+  // Repetition Number, 4 bits
+  uint8_t RepNum:4;
+  // Modulation and Coding Scheme, 4 bits
+  uint8_t mcs:4;
+  // Resourse Assignment (RU Assignment), 3 bits
+  uint8_t ResAssign:3;
+  // Scheduling Delay, 3 bits
+  uint8_t Scheddly:3;
+  //NPDCCH order indicator (set to 0),1 bits
+  uint8_t orderIndicator:1;
+  /// type = 0 => DCI Format N0, type = 1 => DCI Format N1, 1 bits
+  uint8_t type:1;
+ } __attribute__ ((__packed__));
+
+ typedef struct DCIN1_RAR DCIN1_RAR_t;
+#define sizeof_DCIN1_RAR_t 23
+
+struct DCIN1{
+  // DCI subframe repetition Number, 2 bits
+  uint8_t DCIRep:2;
+  // HARQ-ACK resource,4 bits
+  uint8_t HARQackRes:4; 
+  // New Data Indicator,1 bits
+  uint8_t ndi:1;
+  // Repetition Number, 4 bits
+  uint8_t RepNum:4;
+  // Modulation and Coding Scheme, 4 bits
+  uint8_t mcs:4;
+  // Resourse Assignment (RU Assignment), 3 bits
+  uint8_t ResAssign:3;
+  // Scheduling Delay, 3 bits
+  uint8_t Scheddly:3;
+  //NPDCCH order indicator (set to 0),1 bits
+  uint8_t orderIndicator:1;
+  /// type = 0 => DCI Format N0, type = 1 => DCI Format N1, 1 bits
+  uint8_t type:1;
+ } __attribute__ ((__packed__));
+
+ typedef struct DCIN1 DCIN1_t;
+#define sizeof_DCIN1_t 23
+
+//  DCI Format Type N2 for direct indication, 15 bits
+struct DCIN2_Ind{
+  // Reserved information bits, 6 bits
+  uint8_t resInfoBits:6;
+  //Direct indication information, 8 bits
+  uint8_t directIndInf:8;
+  //Flag for paging(1)/direct indication(0), set to 0,1 bits
+  uint8_t type:1;
+} __attribute__ ((__packed__));;
+
+typedef struct DCIN2_Ind DCIN2_Ind_t;
+#define sizeof_DCIN2_Ind_t 15
+
+//  DCI Format Type N2 for Paging, 15 bits
+struct DCIN2_Pag{
+  // Reserved 3 bits
+  uint8_t DCIRep:3;
+  // Repetition Number, 4 bits
+  uint8_t RepNum:4;
+  // Modulation and Coding Scheme, 4 bits
+  uint8_t mcs:4;
+  // Resourse Assignment (RU Assignment), 3 bits
+  uint8_t ResAssign:3;
+  //Flag for paging(1)/direct indication(0), set to 1,1 bits
+  uint8_t type:1;
+} __attribute__ ((__packed__));;
+
+typedef struct DCIN2_Pag DCIN2_Pag_t;
+#define sizeof_DCIN2_Pag_t 15
\ No newline at end of file
--- a/openair1/PHY/LTE_TRANSPORT/dci_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci_tools.c
@@ -6386,22 +6386,21 @@ int generate_ue_dlsch_params_from_dci(int frame,
    }


-#ifdef DEBUG_DCI
+#ifdef UE_DEBUG_TRACE

    if (dlsch[0] && (dlsch[0]->rnti != 0xffff)) {
-      printf("dci_format:%d Abssubframe: %d.%d \n",dci_format,frame%1024,subframe);
-      printf("PDSCH dlsch0 UE: rnti     %x\n",dlsch[0]->rnti);
-      printf("PDSCH dlsch0 UE: NBRB     %d\n",dlsch0_harq->nb_rb);
-      printf("PDSCH dlsch0 UE: rballoc  %x\n",dlsch0_harq->rb_alloc_even[0]);
-      printf("PDSCH dlsch0 UE: harq_pid %d\n",harq_pid);
-      //printf("PDSCH dlsch0 UE: tpc      %d\n",TPC);
-      printf("PDSCH dlsch0 UE: g        %d\n",dlsch[0]->g_pucch);
-      printf("PDSCH dlsch0 UE: round    %d\n",dlsch0_harq->round);
-      printf("PDSCH dlsch0 UE: DCINdi   %d\n",dlsch0_harq->DCINdi);
-      printf("PDSCH dlsch0 UE: rvidx    %d\n",dlsch0_harq->rvidx);
-      printf("PDSCH dlsch0 UE: TBS      %d\n",dlsch0_harq->TBS);
-      printf("PDSCH dlsch0 UE: mcs      %d\n",dlsch0_harq->mcs);
-      printf("PDSCH dlsch0 UE: pwr_off  %d\n",dlsch0_harq->dl_power_off);
+        LOG_I(PHY,"dci_format:%d Abssubframe: %d.%d \n",dci_format,frame%1024,subframe);
+        LOG_D(PHY,"PDSCH dlsch0 UE: rnti     %x\n",dlsch[0]->rnti);
+        LOG_D(PHY,"PDSCH dlsch0 UE: NBRB     %d\n",dlsch0_harq->nb_rb);
+        LOG_D(PHY,"PDSCH dlsch0 UE: rballoc  %x\n",dlsch0_harq->rb_alloc_even[0]);
+        LOG_D(PHY,"PDSCH dlsch0 UE: harq_pid %d\n",harq_pid);
+        LOG_D(PHY,"PDSCH dlsch0 UE: g        %d\n",dlsch[0]->g_pucch);
+        LOG_D(PHY,"PDSCH dlsch0 UE: round    %d\n",dlsch0_harq->round);
+        LOG_D(PHY,"PDSCH dlsch0 UE: DCINdi   %d\n",dlsch0_harq->DCINdi);
+        LOG_D(PHY,"PDSCH dlsch0 UE: rvidx    %d\n",dlsch0_harq->rvidx);
+        LOG_D(PHY,"PDSCH dlsch0 UE: TBS      %d\n",dlsch0_harq->TBS);
+        LOG_D(PHY,"PDSCH dlsch0 UE: mcs      %d\n",dlsch0_harq->mcs);
+        LOG_D(PHY,"PDSCH dlsch0 UE: pwr_off  %d\n",dlsch0_harq->dl_power_off);
    }
 #endif

@@ -8031,7 +8030,7 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,
      if (ulsch->bundling)
        ulsch->harq_processes[harq_pid]->O_ACK = (dai == 3)? 0 : 1;
      else
-        ulsch->harq_processes[harq_pid]->O_ACK = (dai+1)&3;
+        ulsch->harq_processes[harq_pid]->O_ACK = (dai >= 2)? 2 : (dai+1)&3; //(dai+1)&3;

      //      ulsch->harq_processes[harq_pid]->V_UL_DAI = dai+1;
    }
@@ -8099,28 +8098,28 @@ int generate_ue_ulsch_params_from_dci(void *dci_pdu,

  // ulsch->n_DMRS2 = ((DCI0_5MHz_TDD_1_6_t *)dci_pdu)->cshift;

-#ifdef DEBUG_DCI
-
-    printf("Format 0 DCI : ulsch (ue): AbsSubframe %d.%d\n",proc->frame_rx%1024,subframe);
-    printf("Format 0 DCI : ulsch (ue): NBRB        %d\n",ulsch->harq_processes[harq_pid]->nb_rb);
-    printf("Format 0 DCI :ulsch (ue): first_rb    %d\n",ulsch->harq_processes[harq_pid]->first_rb);
-    printf("Format 0 DCI :ulsch (ue): rballoc     %d\n",rballoc);
-    printf("Format 0 DCI :ulsch (ue): harq_pid    %d\n",harq_pid);
-    printf("Format 0 DCI :ulsch (ue): first_tx       %d\n",ulsch->harq_processes[harq_pid]->first_tx);
-    printf("Format 0 DCI :ulsch (ue): DCINdi       %d\n",ulsch->harq_processes[harq_pid]->DCINdi);
-    printf("Format 0 DCI :ulsch (ue): round       %d\n",ulsch->harq_processes[harq_pid]->round);
-    //printf("Format 0 DCI :ulsch (ue): TBS         %d\n",ulsch->harq_processes[harq_pid]->TBS);
-    printf("Format 0 DCI :ulsch (ue): mcs         %d\n",ulsch->harq_processes[harq_pid]->mcs);
-    //printf("Format 0 DCI :ulsch (ue): O           %d\n",ulsch->O);
-    //printf("Format 0 DCI :ulsch (ue): cqiReq      %d\n",cqi_req);
+#ifdef UE_DEBUG_TRACE
+
+    LOG_I(PHY,"Format 0 DCI : ulsch (ue): AbsSubframe %d.%d\n",proc->frame_rx%1024,subframe);
+    LOG_D(PHY,"Format 0 DCI : ulsch (ue): NBRB        %d\n",ulsch->harq_processes[harq_pid]->nb_rb);
+    LOG_D(PHY,"Format 0 DCI :ulsch (ue): first_rb    %d\n",ulsch->harq_processes[harq_pid]->first_rb);
+    LOG_D(PHY,"Format 0 DCI :ulsch (ue): rballoc     %d\n",rballoc);
+    LOG_D(PHY,"Format 0 DCI :ulsch (ue): harq_pid    %d\n",harq_pid);
+    LOG_D(PHY,"Format 0 DCI :ulsch (ue): first_tx       %d\n",ulsch->harq_processes[harq_pid]->first_tx);
+    LOG_D(PHY,"Format 0 DCI :ulsch (ue): DCINdi       %d\n",ulsch->harq_processes[harq_pid]->DCINdi);
+    LOG_D(PHY,"Format 0 DCI :ulsch (ue): round       %d\n",ulsch->harq_processes[harq_pid]->round);
+    //LOG_I(PHY,"Format 0 DCI :ulsch (ue): TBS         %d\n",ulsch->harq_processes[harq_pid]->TBS);
+    LOG_D(PHY,"Format 0 DCI :ulsch (ue): mcs         %d\n",ulsch->harq_processes[harq_pid]->mcs);
+    //LOG_I(PHY,"Format 0 DCI :ulsch (ue): O           %d\n",ulsch->O);
+    //LOG_I(PHY,"Format 0 DCI :ulsch (ue): cqiReq      %d\n",cqi_req);
    //if (frame_parms->frame_type == TDD)
-    //  printf("Format 0 DCI :ulsch (ue): O_ACK/DAI   %d/%d\n",ulsch->harq_processes[harq_pid]->O_ACK,dai);
+    //  LOG_I(PHY,"Format 0 DCI :ulsch (ue): O_ACK/DAI   %d/%d\n",ulsch->harq_processes[harq_pid]->O_ACK,dai);
    //else
-    //  printf("Format 0 DCI :ulsch (ue): O_ACK       %d\n",ulsch->harq_processes[harq_pid]->O_ACK);
+    //  LOG_I(PHY,"Format 0 DCI :ulsch (ue): O_ACK       %d\n",ulsch->harq_processes[harq_pid]->O_ACK);

-    printf("Format 0 DCI :ulsch (ue): Nsymb_pusch   %d\n",ulsch->Nsymb_pusch);
-    printf("Format 0 DCI :ulsch (ue): cshift        %d\n",ulsch->harq_processes[harq_pid]->n_DMRS2);
-    printf("Format 0 DCI :ulsch (ue): phich status  %d\n",ulsch->harq_processes[harq_pid]->status);
+    LOG_D(PHY,"Format 0 DCI :ulsch (ue): Nsymb_pusch   %d\n",ulsch->Nsymb_pusch);
+    LOG_D(PHY,"Format 0 DCI :ulsch (ue): cshift        %d\n",ulsch->harq_processes[harq_pid]->n_DMRS2);
+    LOG_D(PHY,"Format 0 DCI :ulsch (ue): phich status  %d\n",ulsch->harq_processes[harq_pid]->status);
 #else
    UNUSED_VARIABLE(dai);
 #endif

--- a/openair1/PHY/LTE_TRANSPORT/dci_tools_nb_iot.c
+++ b/openair1/PHY/LTE_TRANSPORT/dci_tools_nb_iot.c
--- a/openair1/PHY/LTE_TRANSPORT/defs_nb_iot.h
+++ b/openair1/PHY/LTE_TRANSPORT/defs_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
+ */
+
+/*! \file PHY/LTE_TRANSPORT/defs.h
+* \brief data structures for PDSCH/DLSCH/PUSCH/ULSCH physical and transport channel descriptors (TX/RX)
+* \author R. Knopp
+* \date 2011
+* \version 0.1
+* \company Eurecom
+* \email: raymond.knopp@eurecom.fr, florian.kaltenberger@eurecom.fr, oscar.tonelli@yahoo.it
+* \note
+* \warning
+*/
+#ifndef __LTE_TRANSPORT_DEFS_NB_IOT__H__
+#define __LTE_TRANSPORT_DEFS_NB_IOT__H__
+#include "PHY/defs.h"
+#include "dci_nb_iot.h"
+#ifndef STANDALONE_COMPILE
+#include "UTIL/LISTS/list.h"
+#endif
+
+
+typedef struct {
+  /// Length of DCI in bits
+  uint8_t dci_length;
+  /// Aggregation level only 0,1 in NB-IoT
+  uint8_t L;
+  /// Position of first CCE of the dci
+  int firstCCE;
+  /// flag to indicate that this is a RA response
+  boolean_t ra_flag;
+  /// rnti
+  rnti_t rnti;
+  /// Format
+  DCI_format_NB_t format;
+  /// DCI pdu
+  uint8_t dci_pdu[8];
+} DCI_ALLOC_NB_t;
+
+typedef struct {
+  //delete the count for the DCI numbers,NUM_DCI_MAX should set to 1 
+  uint32_t num_npdcch_symbols;
+  uint8_t Num_dci;
+  DCI_ALLOC_NB_t dci_alloc[2] ;
+} DCI_PDU_NB;
+
+/**@}*/
+#endif
--- a/openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_decoding.c
@@ -167,10 +167,11 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
                         uint8_t llr8_flag)
 {

-
+#if UE_TIMING_TRACE
  time_stats_t *dlsch_rate_unmatching_stats=&phy_vars_ue->dlsch_rate_unmatching_stats;
  time_stats_t *dlsch_turbo_decoding_stats=&phy_vars_ue->dlsch_turbo_decoding_stats;
  time_stats_t *dlsch_deinterleaving_stats=&phy_vars_ue->dlsch_deinterleaving_stats;
+#endif
  uint32_t A,E;
  uint32_t G;
  uint32_t ret,offset;
@@ -372,7 +373,9 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
    printf("f1 %d, f2 %d, F %d\n",f1f2mat_old[2*iind],f1f2mat_old[1+(2*iind)],(r==0) ? harq_process->F : 0);
 #endif

+#if UE_TIMING_TRACE
    start_meas(dlsch_rate_unmatching_stats);
+#endif
    memset(&dummy_w[r][0],0,3*(6144+64)*sizeof(short));
    harq_process->RTC[r] = generate_dummy_w(4+(Kr_bytes*8),
                                            (uint8_t*) &dummy_w[r][0],
@@ -406,12 +409,17 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
                                   harq_process->Nl,
                                   r,
                                   &E)==-1) {
+#if UE_TIMING_TRACE
      stop_meas(dlsch_rate_unmatching_stats);
+#endif
      LOG_E(PHY,"dlsch_decoding.c: Problem in rate_matching\n");
      return(dlsch->max_turbo_iterations);
    } else
+    {
+#if UE_TIMING_TRACE
      stop_meas(dlsch_rate_unmatching_stats);
-
+#endif
+    }
    r_offset += E;

    /*
@@ -419,13 +427,16 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
     harq_process->d[r],
     harq_process->w);
    */
+#if UE_TIMING_TRACE
    start_meas(dlsch_deinterleaving_stats);
+#endif
    sub_block_deinterleaving_turbo(4+Kr,
                                   &harq_process->d[r][96],

                                   harq_process->w[r]);
+#if UE_TIMING_TRACE
    stop_meas(dlsch_deinterleaving_stats);
-
+#endif
 #ifdef DEBUG_DLSCH_DECODING
    /*
    if (r==0) {
@@ -470,8 +481,9 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
    		AssertFatal (Kr >= 256, "turbo algo issue Kr=%d cb_cnt=%d C=%d nbRB=%d TBSInput=%d TBSHarq=%d TBSplus24=%d mcs=%d Qm=%d RIV=%d round=%d\n",
    				Kr,r,harq_process->C,harq_process->nb_rb,A,harq_process->TBS,harq_process->B,harq_process->mcs,harq_process->Qm,harq_process->rvidx,harq_process->round);
    	}
-
-      start_meas(dlsch_turbo_decoding_stats);
+#if UE_TIMING_TRACE
+        start_meas(dlsch_turbo_decoding_stats);
+#endif
      LOG_D(PHY,"AbsSubframe %d.%d Start turbo segment %d/%d \n",frame%1024,subframe,r,harq_process->C-1);
      ret = tc
            (&harq_process->d[r][96],
@@ -490,14 +502,17 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
             &phy_vars_ue->dlsch_tc_intl1_stats,
             &phy_vars_ue->dlsch_tc_intl2_stats); //(is_crnti==0)?harq_pid:harq_pid+1);

-
+#if UE_TIMING_TRACE
      stop_meas(dlsch_turbo_decoding_stats);
+#endif
    }
 #else
    if ((harq_process->C == 1) ||
 	((r==harq_process->C-1) && (skipped_last==0))) { // last segment with odd number of segments

-      start_meas(dlsch_turbo_decoding_stats);
+#if UE_TIMING_TRACE
+        start_meas(dlsch_turbo_decoding_stats);
+#endif
      ret = tc
            (&harq_process->d[r][96],
             harq_process->c[r],
@@ -514,7 +529,9 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
             &phy_vars_ue->dlsch_tc_ext_stats,
             &phy_vars_ue->dlsch_tc_intl1_stats,
             &phy_vars_ue->dlsch_tc_intl2_stats); //(is_crnti==0)?harq_pid:harq_pid+1);
+ #if UE_TIMING_TRACE
      stop_meas(dlsch_turbo_decoding_stats);
+#endif
      //      printf("single decode, exit\n");
      //      exit(-1);
    }
@@ -531,7 +548,9 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
 #ifdef DEBUG_DLSCH_DECODING
 	  printf("single decoding segment %d (%p)\n",r-1,&harq_process->d[r-1][96]);
 #endif
+#if UE_TIMING_TRACE
 	  start_meas(dlsch_turbo_decoding_stats);
+#endif
 #ifdef DEBUG_DLSCH_DECODING
 	  printf("double decoding segments %d,%d (%p,%p)\n",r-1,r,&harq_process->d[r-1][96],&harq_process->d[r][96]);
 #endif
@@ -572,10 +591,14 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
             &phy_vars_ue->dlsch_tc_intl2_stats); //(is_crnti==0)?harq_pid:harq_pid+1);

 	     exit(-1);*/
-	  stop_meas(dlsch_turbo_decoding_stats);
+#if UE_TIMING_TRACE
+      stop_meas(dlsch_turbo_decoding_stats);
+#endif
 	}
 	else { // Kr_last != Kr
+#if UE_TIMING_TRACE
 	  start_meas(dlsch_turbo_decoding_stats);
+#endif
 	  ret = tc
            (&harq_process->d[r-1][96],
             harq_process->c[r-1],
@@ -592,9 +615,12 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
             &phy_vars_ue->dlsch_tc_ext_stats,
             &phy_vars_ue->dlsch_tc_intl1_stats,
             &phy_vars_ue->dlsch_tc_intl2_stats); //(is_crnti==0)?harq_pid:harq_pid+1);
-	  stop_meas(dlsch_turbo_decoding_stats);
+#if UE_TIMING_TRACE
+      stop_meas(dlsch_turbo_decoding_stats);

 	  start_meas(dlsch_turbo_decoding_stats);
+#endif
+
 	  ret = tc
            (&harq_process->d[r][96],
             harq_process->c[r],
@@ -611,6 +637,9 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
             &phy_vars_ue->dlsch_tc_ext_stats,
             &phy_vars_ue->dlsch_tc_intl1_stats,
             &phy_vars_ue->dlsch_tc_intl2_stats); //(is_crnti==0)?harq_pid:harq_pid+1);
+
+#if UE_TIMING_TRACE
+
 	  stop_meas(dlsch_turbo_decoding_stats);

 	  /*printf("Segmentation: C %d r %d, dlsch_rate_unmatching_stats %5.3f dlsch_deinterleaving_stats %5.3f  dlsch_turbo_decoding_stats %5.3f \n",
@@ -619,7 +648,7 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
              dlsch_rate_unmatching_stats->p_time/(cpuf*1000.0),
              dlsch_deinterleaving_stats->p_time/(cpuf*1000.0),
              dlsch_turbo_decoding_stats->p_time/(cpuf*1000.0));*/
-
+#endif
 	}
      }
    }
@@ -641,9 +670,10 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,
  frame_rx_prev = frame_rx_prev%1024;

  if (err_flag == 1) {
-    //LOG_I(PHY,"[UE %d] DLSCH: Setting NAK for SFN/SF %d/%d (pid %d, status %d, round %d, TBS %d, mcs %d) Kr %d r %d harq_process->round %d\n",
-    //    phy_vars_ue->Mod_id, frame, subframe, harq_pid,harq_process->status, harq_process->round,harq_process->TBS,harq_process->mcs,Kr,r,harq_process->round);
-
+#if UE_DEBUG_TRACE
+    LOG_I(PHY,"[UE %d] DLSCH: Setting NAK for SFN/SF %d/%d (pid %d, status %d, round %d, TBS %d, mcs %d) Kr %d r %d harq_process->round %d\n",
+        phy_vars_ue->Mod_id, frame, subframe, harq_pid,harq_process->status, harq_process->round,harq_process->TBS,harq_process->mcs,Kr,r,harq_process->round);
+#endif
    dlsch->harq_ack[subframe].ack = 0;
    dlsch->harq_ack[subframe].harq_id = harq_pid;
    dlsch->harq_ack[subframe].send_harq_status = 1;
@@ -664,9 +694,10 @@ uint32_t  dlsch_decoding(PHY_VARS_UE *phy_vars_ue,

    return((1+dlsch->max_turbo_iterations));
  } else {
-
-      //LOG_I(PHY,"[UE %d] DLSCH: Setting ACK for subframe %d TBS %d harq_process->mcs %d harq_process->nb_rb %d\n",
-                   //phy_vars_ue->Mod_id,subframe,harq_process->TBS,harq_process->mcs,harq_process->nb_rb);
+#if UE_DEBUG_TRACE
+      LOG_I(PHY,"[UE %d] DLSCH: Setting ACK for subframe %d TBS %d mcs %d nb_rb %d\n",
+           phy_vars_ue->Mod_id,subframe,harq_process->TBS,harq_process->mcs,harq_process->nb_rb);
+#endif

    harq_process->status = SCH_IDLE;
    harq_process->round  = 0;

--- a/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/dlsch_demodulation.c
@@ -465,13 +465,13 @@ int rx_pdsch(PHY_VARS_UE *ue,
                              avg,
                              symbol,
                              nb_rb);
-#ifdef DEBUG_PHY
-    LOG_I(PHY,"[DLSCH] AbsSubframe %d.%d log2_maxh = %d [log2_maxh0 %d log2_maxh1 %d] (%d,%d)\n",
+#ifdef UE_DEBUG_TRACE
+    LOG_D(PHY,"[DLSCH] AbsSubframe %d.%d log2_maxh = %d [log2_maxh0 %d log2_maxh1 %d] (%d,%d)\n",
            frame%1024,subframe, pdsch_vars[eNB_id]->log2_maxh,
                                                 pdsch_vars[eNB_id]->log2_maxh0,
                                                 pdsch_vars[eNB_id]->log2_maxh1,
                                                 avg[0],avgs);
-    LOG_D(PHY,"[DLSCH] mimo_mode = %d\n", dlsch0_harq->mimo_mode);
+    //LOG_D(PHY,"[DLSCH] mimo_mode = %d\n", dlsch0_harq->mimo_mode);
 #endif
  }


--- a/openair1/PHY/LTE_TRANSPORT/drs_modulation.c
+++ b/openair1/PHY/LTE_TRANSPORT/drs_modulation.c
@@ -87,7 +87,7 @@ int generate_drs_pusch(PHY_VARS_UE *ue,
  if (Msc_idx_ptr)
    Msc_RS_idx = Msc_idx_ptr - dftsizes;
  else {
-    printf("generate_drs_pusch: index for Msc_RS=%d not found\n",Msc_RS);
+    LOG_I(PHY,"generate_drs_pusch: index for Msc_RS=%d not found\n",Msc_RS);
    return(-1);
  }


--- a/openair1/PHY/LTE_TRANSPORT/initial_sync.c
+++ b/openair1/PHY/LTE_TRANSPORT/initial_sync.c
@@ -466,13 +466,21 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode)
  if( (abs(ue->common_vars.freq_offset) > 150) && (ret == 0) )
  {
 	  ret=-1;
-	  LOG_E(HW,"Ignore MIB with high freq offset [%d Hz] estimation \n",ue->common_vars.freq_offset);
+#if DISABLE_LOG_X
+	  printf("Ignore MIB with high freq offset [%d Hz] estimation \n",ue->common_vars.freq_offset);
+#else
+	  LOG_E(HW, "Ignore MIB with high freq offset [%d Hz] estimation \n",ue->common_vars.freq_offset);
+#endif
  }

  if (ret==0) {  // PBCH found so indicate sync to higher layers and configure frame parameters

    //#ifdef DEBUG_INITIAL_SYNCH
-    LOG_I(PHY,"[UE%d] In synch, rx_offset %d samples\n",ue->Mod_id, ue->rx_offset);
+#if DISABLE_LOG_X
+    printf("[UE%d] In synch, rx_offset %d samples\n",ue->Mod_id, ue->rx_offset);
+#else
+    LOG_I(PHY, "[UE%d] In synch, rx_offset %d samples\n",ue->Mod_id, ue->rx_offset);
+#endif
    //#endif

    if (ue->UE_scan_carrier == 0) {
@@ -503,7 +511,29 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode)

    }

-    LOG_I(PHY,"[UE %d] Frame %d RRC Measurements => rssi %3.1f dBm (dig %3.1f dB, gain %d), N0 %d dBm,  rsrp %3.1f dBm/RE, rsrq %3.1f dB\n",ue->Mod_id,
+#if DISABLE_LOG_X
+    printf("[UE %d] Frame %d RRC Measurements => rssi %3.1f dBm (dig %3.1f dB, gain %d), N0 %d dBm,  rsrp %3.1f dBm/RE, rsrq %3.1f dB\n",ue->Mod_id,
+	  ue->proc.proc_rxtx[0].frame_rx,
+	  10*log10(ue->measurements.rssi)-ue->rx_total_gain_dB,
+	  10*log10(ue->measurements.rssi),
+	  ue->rx_total_gain_dB,
+	  ue->measurements.n0_power_tot_dBm,
+	  10*log10(ue->measurements.rsrp[0])-ue->rx_total_gain_dB,
+	  (10*log10(ue->measurements.rsrq[0])));
+
+
+    printf("[UE %d] Frame %d MIB Information => %s, %s, NidCell %d, N_RB_DL %d, PHICH DURATION %d, PHICH RESOURCE %s, TX_ANT %d\n",
+	  ue->Mod_id,
+	  ue->proc.proc_rxtx[0].frame_rx,
+	  duplex_string[ue->frame_parms.frame_type],
+	  prefix_string[ue->frame_parms.Ncp],
+	  ue->frame_parms.Nid_cell,
+	  ue->frame_parms.N_RB_DL,
+	  ue->frame_parms.phich_config_common.phich_duration,
+	  phich_string[ue->frame_parms.phich_config_common.phich_resource],
+	  ue->frame_parms.nb_antenna_ports_eNB);
+#else
+    LOG_I(PHY, "[UE %d] Frame %d RRC Measurements => rssi %3.1f dBm (dig %3.1f dB, gain %d), N0 %d dBm,  rsrp %3.1f dBm/RE, rsrq %3.1f dB\n",ue->Mod_id,
 	  ue->proc.proc_rxtx[0].frame_rx,
 	  10*log10(ue->measurements.rssi)-ue->rx_total_gain_dB,
 	  10*log10(ue->measurements.rssi),
@@ -513,7 +543,7 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode)
 	  (10*log10(ue->measurements.rsrq[0])));
    
    
-    LOG_I(PHY,"[UE %d] Frame %d MIB Information => %s, %s, NidCell %d, N_RB_DL %d, PHICH DURATION %d, PHICH RESOURCE %s, TX_ANT %d\n",
+    LOG_I(PHY, "[UE %d] Frame %d MIB Information => %s, %s, NidCell %d, N_RB_DL %d, PHICH DURATION %d, PHICH RESOURCE %s, TX_ANT %d\n",
 	  ue->Mod_id,
 	  ue->proc.proc_rxtx[0].frame_rx,
 	  duplex_string[ue->frame_parms.frame_type],
@@ -523,13 +553,22 @@ int initial_sync(PHY_VARS_UE *ue, runmode_t mode)
 	  ue->frame_parms.phich_config_common.phich_duration,
 	  phich_string[ue->frame_parms.phich_config_common.phich_resource],
 	  ue->frame_parms.nb_antenna_ports_eNB);
+#endif

 #if defined(OAI_USRP) || defined(EXMIMO) || defined(OAI_BLADERF) || defined(OAI_LMSSDR)
-    LOG_I(PHY,"[UE %d] Frame %d Measured Carrier Frequency %.0f Hz (offset %d Hz)\n",
+#  if DISABLE_LOG_X
+    printf("[UE %d] Frame %d Measured Carrier Frequency %.0f Hz (offset %d Hz)\n",
+	  ue->Mod_id,
+	  ue->proc.proc_rxtx[0].frame_rx,
+	  openair0_cfg[0].rx_freq[0]-ue->common_vars.freq_offset,
+	  ue->common_vars.freq_offset);
+#  else
+    LOG_I(PHY, "[UE %d] Frame %d Measured Carrier Frequency %.0f Hz (offset %d Hz)\n",
 	  ue->Mod_id,
 	  ue->proc.proc_rxtx[0].frame_rx,
 	  openair0_cfg[0].rx_freq[0]-ue->common_vars.freq_offset,
 	  ue->common_vars.freq_offset);
+#  endif
 #endif
  } else {
 #ifdef DEBUG_INITIAL_SYNC

--- a/openair1/PHY/LTE_TRANSPORT/npbch_NB_IoT.c
+++ b/openair1/PHY/LTE_TRANSPORT/npbch_NB_IoT.c
+/***********************************************************************
+
+**********************************************************************/
+/*! \file PHY/LTE_TRANSPORT/npbch_NB_IoT.c
+* \Fucntions for the generation of broadcast channel (NPBCH) for NB_IoT,	 TS 36-212, V13.4.0 2017-02
+* \author M. KANJ
+* \date 2017
+* \version 0.0
+* \company bcom
+* \email: matthieu.kanj@b-com.com
+* \note
+* \warning
+*/
+
+#include "PHY/defs.h"
+#include "PHY/CODING/extern.h"
+#include "PHY/CODING/lte_interleaver_inline.h"
+#include "defs.h"
+#include "extern.h"
+#include "PHY/extern.h"
+#include "PHY/sse_intrin.h"
+
+#ifdef PHY_ABSTRACTION
+#include "SIMULATION/TOOLS/defs.h"
+#endif
+
+#ifdef OPENAIR2
+#include "PHY_INTERFACE/defs.h"
+#endif
+
+#define NPBCH_A 34                             // 34 for NB-IoT and 24 for LTE
+
+int allocate_npbch_REs_in_RB(LTE_DL_FRAME_PARMS *frame_parms,
+                            int32_t **txdataF,
+                            uint32_t *jj,
+                            uint32_t symbol_offset,
+                            uint8_t *x0,
+                            uint8_t pilots,
+                            int16_t amp,
+							unsigned short id_offset,
+                            uint32_t *re_allocated)  //  not used variable ??!!
+{
+  MIMO_mode_t mimo_mode = (frame_parms->mode1_flag==1)?SISO:ALAMOUTI;
+  uint32_t tti_offset,aa;
+  uint8_t re, diff_re;
+  int16_t gain_lin_QPSK;
+  uint8_t first_re,last_re;
+  int32_t tmp_sample1,tmp_sample2;
+  gain_lin_QPSK = (int16_t)((amp*ONE_OVER_SQRT2_Q15)>>15);
+  first_re=0;
+  last_re=12;
+
+  for (re=first_re; re<last_re; re++) {      		// re varies between 0 and 12 sub-carriers
+
+    tti_offset = symbol_offset + re;				// symbol_offset = 512 * L ,  re_offset = 512 - 3*12  , re
+	
+	if (pilots != 1 || re%3 != id_offset)  			// if re is not a pilot
+	{
+													//	diff_re = re%3 - id_offset;  
+      if (mimo_mode == SISO) {  								//SISO mapping
+        *re_allocated = *re_allocated + 1;						// variable incremented but never used
+			for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
+					((int16_t*)&txdataF[aa][tti_offset])[0] += (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK; //I //b_i
+			}
+			*jj = *jj + 1;
+			for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
+				((int16_t*)&txdataF[aa][tti_offset])[1] += (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK; //Q //b_{i+1}
+			}
+			*jj = *jj + 1;	
+      } else if (mimo_mode == ALAMOUTI) {
+			*re_allocated = *re_allocated + 1;
+
+			((int16_t*)&tmp_sample1)[0] = (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK;
+			*jj=*jj+1;
+			((int16_t*)&tmp_sample1)[1] = (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK;
+			*jj=*jj+1;
+
+			// second antenna position n -> -x1*
+
+			((int16_t*)&tmp_sample2)[0] = (x0[*jj]==1) ? (gain_lin_QPSK) : -gain_lin_QPSK;
+			*jj=*jj+1;
+			((int16_t*)&tmp_sample2)[1] = (x0[*jj]==1) ? (-gain_lin_QPSK) : gain_lin_QPSK;
+			*jj=*jj+1;
+
+			// normalization for 2 tx antennas
+			((int16_t*)&txdataF[0][tti_offset])[0] += (int16_t)((((int16_t*)&tmp_sample1)[0]*ONE_OVER_SQRT2_Q15)>>15);
+			((int16_t*)&txdataF[0][tti_offset])[1] += (int16_t)((((int16_t*)&tmp_sample1)[1]*ONE_OVER_SQRT2_Q15)>>15);
+			((int16_t*)&txdataF[1][tti_offset])[0] += (int16_t)((((int16_t*)&tmp_sample2)[0]*ONE_OVER_SQRT2_Q15)>>15);
+			((int16_t*)&txdataF[1][tti_offset])[1] += (int16_t)((((int16_t*)&tmp_sample2)[1]*ONE_OVER_SQRT2_Q15)>>15);
+
+			// fill in the rest of the ALAMOUTI precoding
+			if ( pilots != 1 || (re+1)%3 != id_offset) {
+				((int16_t *)&txdataF[0][tti_offset+1])[0] += -((int16_t *)&txdataF[1][tti_offset])[0]; //x1
+				((int16_t *)&txdataF[0][tti_offset+1])[1] += ((int16_t *)&txdataF[1][tti_offset])[1];
+				((int16_t *)&txdataF[1][tti_offset+1])[0] += ((int16_t *)&txdataF[0][tti_offset])[0];  //x0*
+				((int16_t *)&txdataF[1][tti_offset+1])[1] += -((int16_t *)&txdataF[0][tti_offset])[1];
+			} else {
+				((int16_t *)&txdataF[0][tti_offset+2])[0] += -((int16_t *)&txdataF[1][tti_offset])[0]; //x1
+				((int16_t *)&txdataF[0][tti_offset+2])[1] += ((int16_t *)&txdataF[1][tti_offset])[1];
+				((int16_t *)&txdataF[1][tti_offset+2])[0] += ((int16_t *)&txdataF[0][tti_offset])[0];  //x0*
+				((int16_t *)&txdataF[1][tti_offset+2])[1] += -((int16_t *)&txdataF[0][tti_offset])[1];
+		
+				re++;														// skip pilots
+				*re_allocated = *re_allocated + 1;
+			}
+			re++;  															// adjacent carriers are taken care of by precoding
+			*re_allocated = *re_allocated + 1;   							// incremented variable but never used
+		}
+    }
+  }
+
+  return(0);
+}
+/**********************************************************
+**********************************************************/
+int generate_npbch(NB_IoT_eNB_NPBCH *eNB_npbch,
+                  int32_t **txdataF,
+                  int amp,
+                  LTE_DL_FRAME_PARMS *frame_parms,
+                  uint8_t *npbch_pdu,
+                  uint8_t frame_mod64
+				  unsigned short NB_IoT_RB_ID)
+{
+  int i, l;
+  uint32_t npbch_D,npbch_E;
+  uint8_t npbch_a[5];   							// 34/8 =4.25 => 4 bytes and 2 bits
+  uint8_t RCC;
+  unsigned short bandwidth_even_odd;
+  unsigned short NB_IoT_start, RB_IoT_ID;
+  uint32_t nsymb = 14;
+  uint32_t pilots;
+  uint32_t second_pilot = 4;
+  uint32_t jj=0;
+  uint32_t re_allocated=0;
+  uint32_t rb, symbol_offset;
+  uint16_t amask=0;
+  npbch_D  = 16+NPBCH_A;
+  npbch_E  = 1600; 									
+									
+	if (frame_mod64==0) {
+		bzero(npbch_a,5);      									// initializing input data stream , filling with zeros
+		bzero(eNB_npbch->npbch_e,pbch_E);						// filling with "0" the table pbch_e[1600]
+		memset(eNB_npbch->npbch_d,LTE_NULL,96);					// filling with "2" the first 96 elements of table pbch_d[216]
+		
+		for (i=0; i<5; i++) 									// set input bits stream
+		{	
+			if (i !=4 )
+			{
+				npbch_a[5-i-1] = npbch_pdu[i];            		// ????????/*****?? in LTE 24 bits with 3 bytes, but in NB_IoT 34 bits will require 4 bytes+2 bits !! to verify
+			} else {
+				npbch_a[5-i-1]= npbch_pdu[i] & 0x03;
+			}
+		}
+	
+		if (frame_parms->mode1_flag == 1)						// setting CRC mask depending on the number of used eNB antennas 
+			amask = 0x0000;
+		else {
+			switch (frame_parms->nb_antennas_tx_eNB) {			// *****???? better replacing nb_antennas_tx_eNB by nb_antennas_tx_eNB_NB_IoT
+				case 1:
+					amask = 0x0000;
+				break;
+				case 2:
+					amask = 0xffff;
+				break;
+			}
+		}
+		
+		ccode_encode_NB_IoT(NPBCH_A,2,npbch_a,eNB_npbch->npbch_d+96,amask);						// step 1 CRC Attachment
+		RCC = sub_block_interleaving_cc_NB_IoT(npbch_D,eNB_npbch->npbch_d+96,eNB_npbch->npbch_w);   	// step 2 Channel Coding
+		lte_rate_matching_cc_NB_IoT(RCC,npbch_E,eNB_npbch->npbch_w,eNB_npbch->npbch_e);				// step 3 Rate Matching
+		npbch_scrambling(frame_parms,															// step 4 Scrambling
+						eNB_npbch->npbch_e,
+						npbch_E);
+
+	}
+	// testing if the total number of RBs is even or odd 
+		bandwidth_even_odd = frame_parms->N_RB_DL % 2; 	 	// 0 even, 1 odd
+		RB_IoT_ID = NB_IoT_RB_ID;
+	// step  5, 6, 7   									 	// modulation and mapping (slot 1, symbols 0..3)
+	for (l=3; l<14; l++) { 								 	// loop on OFDM symbols
+			
+		if((l>=4 && l<=8) || (l>=11 && l<=13))
+		{
+			pilots =1;
+		} else {
+			pilots=0;
+		}
+		
+		id_offset = frame_parms->Nid_cell % 3;    		// Cell_ID_NB_IoT % 3
+		
+		if(RB_IoT_ID < (frame_parms->N_RB_DL/2))
+		{
+			NB_IoT_start = frame_parms->ofdm_symbol_size - 12*(frame_parms->N_RB_DL/2) - (bandwidth_even_odd*6) + 12*(RB_IoT_ID%(ceil(frame_parms->N_RB_DL/(float)2)));
+		} else {
+			NB_IoT_start = (bandwidth_even_odd*6) + 12*(RB_IoT_ID%(ceil(frame_parms->N_RB_DL/(float)2)));
+		}
+		
+		symbol_offset = frame_parms->ofdm_symbol_size*l + NB_IoT_start;  						// symbol_offset = 512 * L + NB_IOT_RB start
+		
+		allocate_npbch_REs_in_RB(frame_parms,
+								txdataF,
+								&jj,
+								symbol_offset,
+								&eNB_npbch->npbch_e[(frame_mod64/8)*(npbch_E>>3)],
+								pilots,
+								amp,
+								id_offset,
+								&re_allocated);
+			
+	
+	}
+return(0);
+}
+/**********************************************************
+**********************************************************/
+void npbch_scrambling(LTE_DL_FRAME_PARMS *frame_parms,
+                     uint8_t *npbch_e,
+                     uint32_t length)  // 1600
+{
+  int i;
+  uint8_t reset;
+  uint32_t x1, x2, s=0;
+  reset = 1;
+  x2 = frame_parms->Nid_cell;
+  for (i=0; i<length; i++) {
+    if ((i&0x1f)==0) {
+      s = lte_gold_generic_NB_IoT(&x1, &x2, reset);
+      reset = 0;
+    }
+    npbch_e[i] = (npbch_e[i]&1) ^ ((s>>(i&0x1f))&1);
+  }
+}
--- a/openair1/PHY/LTE_TRANSPORT/npss_NB_IoT.c
+++ b/openair1/PHY/LTE_TRANSPORT/npss_NB_IoT.c
+/***********************************************************************
+
+**********************************************************************/
+/*! \file PHY/LTE_TRANSPORT/npss_NB_IoT.c
+* \Generation of Narrowband Primary Synchronisation Signal(NPSS) for NB-IoT,	 TS 36-212, V13.4.0 2017-02
+* \author M. KANJ
+* \date 2017
+* \version 0.0
+* \company bcom
+* \email: matthieu.kanj@b-com.com
+* \note
+* \warning
+*/
+
+#include "PHY/defs.h"
+#include "PHY/extern.h"
+
+int generate_npss_NB_IoT(int32_t **txdataF,
+						short amp,
+						LTE_DL_FRAME_PARMS *frame_parms,
+						unsigned short symbol_offset,				// symbol_offset should equal to 3 for NB-IoT 
+						unsigned short slot_offset,
+						unsigned short RB_IoT_ID)					// new attribute (values are between 0.. Max_RB_number-1), it does not exist for LTE
+{
+   unsigned short c,aa,a,s;
+   unsigned short slot_id;
+   short *primary_sync;
+   unsigned short NB_IoT_start; 			// Index of the first RE in the RB dedicated for NB-IoT
+   unsigned short bandwidth_even_odd;
+
+   slot_id = slot_offset;  							// The id(0..19) of the slot including the NPSS signal // For NB-IoT, slod_id should be 10 (SF5)
+   primary_sync = primary_synch_NB_IoT;     		// primary_synch_NB_IoT[264] of primary_synch_NB_IoT.h
+
+   // Signal amplitude
+   a = (frame_parms->nb_antennas_tx == 1) ? amp: (amp*ONE_OVER_SQRT2_Q15)>>15;
+
+   // Testing if the total number of RBs is even or odd (i.e. Identification of the bandwidth: 1.4, 3, 5, 10, ... MHz)
+   bandwidth_even_odd = frame_parms->N_RB_DL % 2;  		// 0 for even, 1 for odd
+
+   for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
+	
+		if(RB_IoT_ID < (frame_parms->N_RB_DL/2))
+		{
+			NB_IoT_start = frame_parms->ofdm_symbol_size - 12*(frame_parms->N_RB_DL/2) - (bandwidth_even_odd*6) + 12*(RB_IoT_ID%(ceil(frame_parms->N_RB_DL/(float)2)));
+		} else {
+			NB_IoT_start = (bandwidth_even_odd*6) + 12*(RB_IoT_ID%(ceil(frame_parms->N_RB_DL/(float)2)));
+		}
+		// For the In-band or Stand-alone case the REs of NPSS signal have the same positions
+		for (s=0; s<11; s++ )   				// loop on OFDM symbols
+		{	
+			for (c=0; c<12; c++) {   			// loop on NB-IoT carriers
+			
+				((short*)txdataF[aa])[2*( (slot_id*7*frame_parms->ofdm_symbol_size) + ((symbol_offset+s)*frame_parms->ofdm_symbol_size) + NB_IoT_start + c )] =
+			
+										(a * primary_sync[2*c + (2*12*s)]) >> 15;
+										
+				((short*)txdataF[aa])[2*( (slot_id*7*frame_parms->ofdm_symbol_size) + ((symbol_offset+s)*frame_parms->ofdm_symbol_size) + NB_IoT_start + c )+1] =
+			
+										(a * primary_sync[2*c + (2*12*s) + 1]) >> 15;
+			}
+		}
+	}
+
+  return(0);
+}
+
+/* (for LTE)
+int generate_pss_emul(PHY_VARS_eNB *phy_vars_eNb,uint8_t sect_id)
+{
+
+  msg("[PHY] EMUL eNB generate_pss_emul eNB %d, sect_id %d\n",phy_vars_eNb->Mod_id,sect_id);
+  eNB_transport_info[phy_vars_eNb->Mod_id][phy_vars_eNb->CC_id].cntl.pss=sect_id;
+  return(0);
+}
+*/
--- a/openair1/PHY/LTE_TRANSPORT/nsss_NB_IoT.c
+++ b/openair1/PHY/LTE_TRANSPORT/nsss_NB_IoT.c
+/***********************************************************************
+
+**********************************************************************/
+/*! \file PHY/LTE_TRANSPORT/nsss_NB_IoT.c
+* \Generation of Narrowband Secondary Synchronisation Signal(NSSS) for NB-IoT,	 TS 36-212, V13.4.0 2017-02
+* \author M. KANJ
+* \date 2017
+* \version 0.0
+* \company bcom
+* \email: matthieu.kanj@b-com.com
+* \note
+* \warning
+*/
+
+
+#include "PHY/defs.h"
+#include "defs.h"
+#include "PHY/extern.h"
+
+int generate_sss_NB_IoT(int32_t **txdataF,
+						int16_t amp,
+						LTE_DL_FRAME_PARMS *frame_parms, 
+						uint16_t symbol_offset, 				// symbol_offset = 3 for NB-IoT 
+						uint16_t slot_offset, 
+						unsigned short frame_number, 			// new attribute (Get value from higher layer), it does not exist for LTE
+						unsigned short RB_IoT_ID)				// new attribute (values are between 0.. Max_RB_number-1), it does not exist for LTE
+{
+	uint8_t aa,Nid_NB_IoT,Nid2,f,q,s,c,u;
+	int16_t *d;
+	uint8_t Nid2;
+	uint16_t n_f;
+	unsigned short a;
+	uint16_t slot_id;  						// slot_id = 17 in NB_IoT
+	unsigned short bandwidth_even_odd;
+	unsigned short NB_IoT_start;
+  
+	n_f = frame_number;
+	Nid_NB_IoT = frame_parms->Nid_cell;     // supposing Cell_Id of LTE = Cell_Id of NB-IoT  // if different , NB_IOT_DL_FRAME_PARMS should be includes as attribute
+  
+	f = (n_f/2) % 4;   						// f = 0, 1, 2, 3
+	q = Nid_NB_IoT/126; 					// q = 0, 1, 2, 3
+	u = (Nid_NB_IoT % 126); 
+  
+	Nid2 = q*4 + f; 						// Nid2 = 0..15
+  
+	switch (Nid2) {
+	case 0:
+		d = d0f0;
+		break;
+	case 1:
+		d = d0f1;
+		break;
+	case 2:
+		d = d0f2;
+		break;
+	case 3:
+		d = d0f3;
+		break;
+	case 4:
+		d = d1f0;
+		break;
+	case 5:
+		d = d1f1;
+		break;
+	case 6:
+		d = d1f2;
+		break;
+	case 7:
+		d = d1f3;
+		break;
+	case 8:
+		d = d2f0;
+		break;
+	case 9:
+		d = d2f1;
+		break;
+	case 10:
+		d = d2f2;
+		break;
+	case 11:
+		d = d2f3;
+	case 12:
+		d = d3f0;
+		break;
+	case 13:
+		d = d3f1;
+		break;
+	case 14:
+		d = d3f2;
+		break;
+	case 15:
+		d = d3f3;
+		break;
+
+	default:
+		msg("[NSSS] ERROR\n");
+		return(-1);
+	}
+
+	slot_id = slot_offset;
+   
+	//  Signal amplitude
+	a = (frame_parms->nb_antennas_tx == 1) ? amp: (amp*ONE_OVER_SQRT2_Q15)>>15;
+   
+	// Testing if the total number of RBs is even or odd (i.e. Identification of the bandwidth: 1.4, 3, 5, 10, ... MHz)
+	bandwidth_even_odd = frame_parms->N_RB_DL % 2;  		// 0 even, 1 odd
+
+	for (aa=0; aa<frame_parms->nb_antennas_tx; aa++) {
+
+		if(RB_IoT_ID < (frame_parms->N_RB_DL/2))
+		{
+			NB_IoT_start = frame_parms->ofdm_symbol_size - 12*(frame_parms->N_RB_DL/2) - (bandwidth_even_odd*6) + 12*(RB_IoT_ID%(ceil(frame_parms->N_RB_DL/(float)2)));
+		} else {
+			NB_IoT_start = (bandwidth_even_odd*6) + 12*(RB_IoT_ID%(ceil(frame_parms->N_RB_DL/(float)2)));
+		}
+		// For the In-band or Stand-alone case the REs of NPSS signal have the same positions
+		for (s=0; s<11; s++ ) 								// loop on OFDM symbols
+		{		
+			for (c=0; c<12; c++) {							// loop on NB-IoT carriers
+			
+				((short*)txdataF[aa])[2*( (slot_id*7*frame_parms->ofdm_symbol_size) + ((symbol_offset+s)*frame_parms->ofdm_symbol_size) + NB_IoT_start + c )] =
+			
+										(a * d[(2*u*132) + (2*c) + (2*s*12) ]) >> 15;
+										
+				((short*)txdataF[aa])[2*( (slot_id*7*frame_parms->ofdm_symbol_size) + ((symbol_offset+s)*frame_parms->ofdm_symbol_size) + NB_IoT_start + c )+1] =
+			
+										(a * d[(2*u*132) + (2*c) + (2*s*12) + 1]) >> 15;
+
+			}
+		}
+	}
+  return(0);
+}
+
+
--- a/openair1/PHY/LTE_TRANSPORT/nsss_NB_IoT.h
+++ b/openair1/PHY/LTE_TRANSPORT/nsss_NB_IoT.h
--- a/openair1/PHY/LTE_TRANSPORT/nsss_gen_NB_IoT.m
+++ b/openair1/PHY/LTE_TRANSPORT/nsss_gen_NB_IoT.m
+clear all
+% nsss_gen / matlab
+% Copyright 2016 b<>com. All rights reserved.
+
+% description: generation of NSSS subframe
+% Reference: 3GPP TS36.211 release 13
+% author: Vincent Savaux, b<>com, Rennes, France
+% email: vincent.savaux@b-com.com
+
+% Input : \
+% Output : matrix NSSS_frame
+% Parameters
+% frame_number = 100;
+% cellID = 200;
+% % % Mapping results to estimated u-3
+
+
+SNR_start = -10; 
+SNR_end = 2; 
+vec_SNR = SNR_start : 2 : SNR_end; 
+N_loop = 40; 
+Proba_fail = zeros(1,length(vec_SNR)); 
+
+mat_bn = zeros(4,128); % mat_bn contains the 4 possible Hadamard sequences defined in the standard
+mat_bn(1,:) = ones(1,128);
+mat_bn(2,:) = [1  -1  -1  1  -1  1  1  -1  -1  1  1  -1  1  -1  -1  1  ...
+    -1  1  1  -1  1  -1  -1  1  1  -1  -1  1  -1  1  1  -1  1  -1  -1  ...
+    1  -1  1  1  -1  -1  1  1  -1  1  -1  -1  1  -1  1  1  -1  1  -1  ...
+    -1  1  1  -1  -1  1  -1  1  1  -1  1  -1  -1  1  -1  1  1  -1  -1  ...
+    1  1  -1  1  -1  -1  1  -1  1  1  -1  1  -1  -1  1  1  -1  -1  1  ...
+    -1  1  1  -1  1  -1  -1  1  -1  1  1  -1  -1  1  1  -1  1  -1  -1  ...
+    1  -1  1  1  -1  1  -1  -1  1  1  -1  -1  1  -1  1  1  -1];
+mat_bn(3,:) = [1  -1  -1  1  -1  1  1  -1  -1  1  1  -1  1  -1  -1  1  ... 
+    -1  1  1  -1  1  -1  -1  1  1  -1  -1  1  -1  1  1  -1  -1  1  1  ...
+    -1  1  -1  -1  1  1  -1  -1  1  -1  1  1  -1  1  -1  -1  1  -1  1  ...
+    1  -1  -1  1  1  -1  1  -1  -1  1  1  -1  -1  1  -1  1  1  -1  -1  ...
+    1  1  -1  1  -1  -1  1  -1  1  1  -1  1  -1  -1  1  1  -1  -1  1  ...
+    -1  1  1  -1  -1  1  1  -1  1  -1  -1  1  1  -1  -1  1  -1  1  1  ...
+    -1  1  -1  -1  1  -1  1  1  -1  -1  1  1  -1  1  -1  -1  1];
+mat_bn(4,:) = [1  -1  -1  1  -1  1  1  -1  -1  1  1  -1  1  -1  -1  1  ...
+    -1  1  1  -1  1  -1  -1  1  1  -1  -1  1  -1  1  1  -1  -1  1  1  ...
+    -1  1  -1  -1  1  1  -1  -1  1  -1  1  1  -1  1  -1  -1  1  -1  1  ...
+    1  -1  -1  1  1  -1  1  -1  -1  1  -1  1  1  -1  1  -1  -1  1  1  ...
+    -1  -1  1  -1  1  1  -1  1  -1  -1  1  -1  1  1  -1  -1  1  1  -1  ...
+    1  -1  -1  1  1  -1  -1  1  -1  1  1  -1  -1  1  1  -1  1  -1  -1  ...
+    1  -1  1  1  -1  1  -1  -1  1  1  -1  -1  1  -1  1  1  -1];
+mat_bn = [mat_bn,mat_bn(:,1:4)]; % see the definition of m in stadard
+
+mat_theta_f = zeros(4,132); % mat_bn contains the 4 possible phase sequences defined in the standard
+mat_theta_f(1,:) = ones(1,132); 
+mat_theta_f(2,:) = repmat([1,-j,-1,j],1,33);  
+mat_theta_f(3,:) = repmat([1,-1],1,66); 
+mat_theta_f(4,:) = repmat([1,j,-1,-j],1,33); 
+
+mat_16_theta = round(kron(mat_theta_f,ones(4,1))); % mat_bn contains the 4x4=16 possible pseudo-random sequences
+mat_16_bn = repmat(mat_bn,4,1); 
+mat_16 = mat_16_theta.*mat_16_bn;
+corresponding_values = zeros(16,2); % first column for q, second for theta_f
+corresponding_values(:,1) = repmat([0;1;2;3],4,1); % mapping column to q 
+corresponding_values(:,2) = kron([0;1;2;3],ones(4,1)); % mapping column to theta_f
+
+for k = 1 : length(vec_SNR) % loop on the SNR
+    N_fail = 0; 
+for loop = 1 : N_loop    
+SNR = vec_SNR(k); 
+frame_number = 2*randi([0,3],1);
+cellID = randi([0,503],1);    
+    
+% function NSSS_subframe = nsss_gen(frame_number,cellID)
+theta_f = 33/132*mod(frame_number/2,4); % as defined in stadard
+u = mod(cellID,126) + 3; % root of ZC sequence, defined in standard
+q = floor(cellID/126);
+size_RB = 12; % number of sub-carrier per RB
+N_ZC = 131; 
+L_sub_frame = 14; % number of OFDM symbols per subframe
+j = 1i; 
+vec_n = 0:N_ZC; 
+vec_n1 = mod(vec_n,131); 
+vec_bq = mat_bn(q+1,:); 
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Creation of the signal
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+% ZC sequence in frequency domain
+
+ZC_sequence = exp(-j*pi*u*vec_n1.*(vec_n1+1)/N_ZC); 
+had_sequence = exp(-j*2*pi*theta_f*vec_n);
+vec_bq_had = vec_bq.*had_sequence; 
+P_noise = 10^(-SNR/10); % SNR in dB to noise power
+noise = sqrt(P_noise/2)*randn(1,132)+sqrt(P_noise/2)*j*randn(1,132); 
+vec_d = vec_bq.*had_sequence.*ZC_sequence + noise; 
+mat_NSSS = flipud(reshape(vec_d,size_RB,L_sub_frame-3));
+NSSS_subframe = [zeros(size_RB,3),mat_NSSS]; 
+
+% end
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Exhaustive cell ID research
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% 
+
+sequence_r = repmat(vec_d,16,1).*conj(mat_16); % this remove the phase component
+vec_u = 3 : 128; 
+mat_u = repmat(vec_u.',1,length(vec_n1));  
+mat_n1 = repmat(vec_n1,126,1); 
+sequence_ZC = exp(-j*pi*mat_u.*mat_n1.*(mat_n1+1)/N_ZC); 
+
+matrix_max_correl = zeros(126,16); % this will be filled by the maximum of correlation value 
+for s_ = 1 : 16 
+    seq_ref = sequence_r(s_,:); 
+    for u_ = 1 : 126  
+       correl = xcorr(seq_ref,sequence_ZC(u_,:)); 
+       [val_max,ind_max] = max(abs(correl)); 
+       matrix_max_correl(u_,s_) = val_max; 
+    end
+end
+
+max_correl = max(max(matrix_max_correl));  % get the max of all correlation values 
+index_max = find(matrix_max_correl==max_correl); 
+estim_u_ = mod(index_max,126)-1;
+index_column = (index_max-mod(index_max,126))/126+1; 
+estim_q_ = corresponding_values(index_column); 
+estim_cell_ID = q*126 + estim_u_; 
+
+if cellID ~= estim_cell_ID
+    N_fail = N_fail + 1; 
+end
+
+end
+Proba_fail(k) = N_fail/N_loop; 
+end
+
+plot(vec_SNR,Proba_fail)
--- a/openair1/PHY/LTE_TRANSPORT/phich.c
+++ b/openair1/PHY/LTE_TRANSPORT/phich.c
@@ -1098,6 +1098,8 @@ void rx_phich(PHY_VARS_UE *ue,
  uint8_t NSF_PHICH = 4;
  uint8_t pusch_subframe;

+  int8_t delta_PUSCH_acc[4] = {-1,0,1,3};
+
  // check if we're expecting a PHICH in this subframe
  LOG_D(PHY,"[UE  %d][PUSCH %d] Frame %d subframe %d PHICH RX\n",ue->Mod_id,harq_pid,proc->frame_rx,subframe);

@@ -1379,7 +1381,7 @@ void rx_phich(PHY_VARS_UE *ue,

  if (HI16>0) {   //NACK
    if (ue->ulsch_Msg3_active[eNB_id] == 1) {
-      LOG_D(PHY,"[UE  %d][PUSCH %d][RAPROC] Frame %d subframe %d Msg3 PHICH, received NAK (%d) nseq %d, ngroup %d\n",
+      LOG_I(PHY,"[UE  %d][PUSCH %d][RAPROC] Frame %d subframe %d Msg3 PHICH, received NAK (%d) nseq %d, ngroup %d\n",
            ue->Mod_id,harq_pid,
            proc->frame_rx,
            subframe,
@@ -1387,6 +1389,14 @@ void rx_phich(PHY_VARS_UE *ue,
            nseq_PHICH,
            ngroup_PHICH);

+      ulsch->f_pusch += delta_PUSCH_acc[ulsch->harq_processes[harq_pid]->TPC];
+
+      LOG_I(PHY,"[PUSCH %d] AbsSubframe %d.%d: f_pusch (ACC) %d, adjusting by %d (TPC %d)\n",
+                 harq_pid,proc->frame_rx,subframe,ulsch->f_pusch,
+                    delta_PUSCH_acc[ulsch->harq_processes[harq_pid]->TPC],
+                    ulsch->harq_processes[harq_pid]->TPC);
+
+
      ulsch->harq_processes[harq_pid]->subframe_scheduling_flag = 1;
      //      ulsch->harq_processes[harq_pid]->Ndi = 0;
      ulsch->harq_processes[harq_pid]->round++;
@@ -1399,8 +1409,8 @@ void rx_phich(PHY_VARS_UE *ue,
        ue->ulsch_Msg3_active[eNB_id] = 0;
      }
    } else {
-      //#ifdef DEBUG_PHICH
-      LOG_D(PHY,"[UE  %d][PUSCH %d] Frame %d subframe %d PHICH, received NAK (%d) nseq %d, ngroup %d round %d (Mlimit %d)\n",
+#ifdef UE_DEBUG_TRACE
+      LOG_I(PHY,"[UE  %d][PUSCH %d] Frame %d subframe %d PHICH, received NAK (%d) nseq %d, ngroup %d round %d (Mlimit %d)\n",
            ue->Mod_id,harq_pid,
            proc->frame_rx%1024,
            subframe,
@@ -1409,7 +1419,7 @@ void rx_phich(PHY_VARS_UE *ue,
            ngroup_PHICH,
            ulsch->harq_processes[harq_pid]->round,
            ulsch->Mlimit);
-      //#endif
+#endif

      //      ulsch->harq_processes[harq_pid]->Ndi = 0;
      ulsch->harq_processes[harq_pid]->round++;
@@ -1448,20 +1458,20 @@ void rx_phich(PHY_VARS_UE *ue,

  } else {  //ACK
    if (ue->ulsch_Msg3_active[eNB_id] == 1) {
-      LOG_D(PHY,"[UE  %d][PUSCH %d][RAPROC] Frame %d subframe %d Msg3 PHICH, received ACK (%d) nseq %d, ngroup %d\n\n",
+      LOG_I(PHY,"[UE  %d][PUSCH %d][RAPROC] Frame %d subframe %d Msg3 PHICH, received ACK (%d) nseq %d, ngroup %d\n\n",
            ue->Mod_id,harq_pid,
            proc->frame_rx,
            subframe,
            HI16,
            nseq_PHICH,ngroup_PHICH);
    } else {
-      //#ifdef PHICH_DEBUG
-      LOG_D(PHY,"[UE  %d][PUSCH %d] Frame %d subframe %d PHICH, received ACK (%d) nseq %d, ngroup %d\n\n",
+#ifdef UE_DEBUG_TRACE
+      LOG_I(PHY,"[UE  %d][PUSCH %d] Frame %d subframe %d PHICH, received ACK (%d) nseq %d, ngroup %d\n\n",
            ue->Mod_id,harq_pid,
            proc->frame_rx%1024,
            subframe, HI16,
            nseq_PHICH,ngroup_PHICH);
-      //#endif
+#endif
    }

   // LOG_I(PHY,"[HARQ-UL harqId: %d] subframe_scheduling_flag = %d \n",harq_pid, ulsch->harq_processes[harq_pid]->subframe_scheduling_flag);

--- a/openair1/PHY/LTE_TRANSPORT/pilots_NB_IoT.c
+++ b/openair1/PHY/LTE_TRANSPORT/pilots_NB_IoT.c
+/***********************************************************************
+
+**********************************************************************/
+/*! \file PHY/LTE_TRANSPORT/pilots_NB_IoT.c
+* \Generation of Reference signal (RS) for NB-IoT,	 TS 36-211, V13.4.0 2017-02
+* \author M. KANJ
+* \date 2017
+* \version 0.0
+* \company bcom
+* \email: matthieu.kanj@b-com.com
+* \note
+* \warning
+*/
+
+#include "PHY/defs.h"
+
+void generate_pilots_NB_IoT(PHY_VARS_eNB *phy_vars_eNB,
+                     int32_t **txdataF,
+                     int16_t amp,
+                     uint16_t Ntti, 					// Ntti = 10
+					 unsigned short RB_IoT_ID,			// RB reserved for NB-IoT
+					 unsigned short With_NSSS;) 		// With_NSSS = 1; if the frame include a sub-Frame with NSSS signal
+{
+
+  LTE_DL_FRAME_PARMS *frame_parms = &phy_vars_eNB->lte_frame_parms;
+
+  uint32_t tti,tti_offset,slot_offset,Nsymb,samples_per_symbol;
+  uint8_t first_pilot,second_pilot;
+  Nsymb = 14;
+  first_pilot = 5;      // first pilot position
+  second_pilot = 6;		// second pilot position
+  
+  for (tti=0; tti<Ntti; tti++) { 										// loop on sub-frames    
+
+    tti_offset = tti*frame_parms->ofdm_symbol_size*Nsymb; 				// begins with 0
+    samples_per_symbol = frame_parms->ofdm_symbol_size;  				// ex. 512
+    slot_offset = (tti*2)%20; 											// 0, 2, 4, ....... 18 
+	
+	if((slot_offset != 10) && ((With_NSSS*slot_offset) != 18)) {   		//  condition to avoid NPSS and NSSS signals
+	
+		//Generate Pilots for slot 0 and 1
+		
+			//antenna 0 symbol 5 slot 0
+		lte_dl_cell_spec_NB_IoT(phy_vars_eNB,&txdataF[0][tti_offset + (first_pilot*samples_per_symbol)], 			// tti_offset 512 x 32 bits
+                     amp,
+					 RB_IoT_ID,
+                     slot_offset,
+                     0,
+                     0);
+					 
+			//antenna 0 symbol 6 slot 0
+		lte_dl_cell_spec_NB_IoT(phy_vars_eNB,&txdataF[0][tti_offset + (second_pilot*samples_per_symbol)],
+                     amp,
+					 RB_IoT_ID,
+                     slot_offset,
+                     1,
+                     0);
+
+			//antenna 0 symbol 5 slot 1
+		lte_dl_cell_spec_NB_IoT(phy_vars_eNB,&txdataF[0][tti_offset + (7*samples_per_symbol) + (first_pilot*samples_per_symbol)],
+                     amp,
+					 RB_IoT_ID,
+                     1+slot_offset,
+                     0,
+                     0);
+
+			//antenna 0 symbol 6 slot 1
+		lte_dl_cell_spec_NB_IoT(phy_vars_eNB,&txdataF[0][tti_offset + (7*samples_per_symbol) + (second_pilot*samples_per_symbol)],
+                     amp,
+					 RB_IoT_ID,
+                     1+slot_offset,
+                     1,
+                     0);
+
+		if (frame_parms->nb_antennas_tx > 1) {  																// Pilots generation with two antennas
+
+				// antenna 1 symbol 5 slot 0
+			lte_dl_cell_spec_NB_IoT(phy_vars_eNB,&txdataF[1][tti_offset + (first_pilot*samples_per_symbol)],
+                         amp,
+						 RB_IoT_ID,
+                         slot_offset,
+                         0,
+                         1);
+
+				// antenna 1 symbol 6 slot 0
+			lte_dl_cell_spec_NB_IoT(phy_vars_eNB,&txdataF[1][tti_offset + (second_pilot*samples_per_symbol)],
+                         amp,
+						 RB_IoT_ID,
+                         slot_offset,
+                         1,
+                         1);
+
+				//antenna 1 symbol 5 slot 1
+			lte_dl_cell_spec_NB_IoT(phy_vars_eNB,&txdataF[1][tti_offset + (7*samples_per_symbol) + (first_pilot*samples_per_symbol)],
+                         amp,
+						 RB_IoT_ID,
+                         1+slot_offset,
+                         0,
+                         1);
+
+				// antenna 1 symbol 6 slot 1
+			lte_dl_cell_spec_NB_IoT(phy_vars_eNB,&txdataF[1][tti_offset + (7*samples_per_symbol) + (second_pilot*samples_per_symbol)],
+                         amp,
+						 RB_IoT_ID,
+                         1+slot_offset,
+                         1,
+                         1);
+		}
+	}
+  }
+}
+
--- a/openair1/PHY/LTE_TRANSPORT/proto_nb_iot.h
+++ b/openair1/PHY/LTE_TRANSPORT/proto_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
+ */
+
+/*! \file PHY/LTE_TRANSPORT/proto.h
+ * \brief Function prototypes for PHY physical/transport channel processing and generation V8.6 2009-03
+ * \author R. Knopp, F. Kaltenberger
+ * \date 2011
+ * \version 0.1
+ * \company Eurecom
+ * \email: knopp@eurecom.fr
+ * \note
+ * \warning
+ */
+#ifndef __LTE_TRANSPORT_PROTO_NB_IOT__H__
+#define __LTE_TRANSPORT_PROTO_NB_IOT__H__
+#include "PHY/defs_nb_iot.h"
+#include <math.h>
+
+// Functions below implement 36-211 and 36-212
+
+/*Function to pack the DCI*/
+void NB_add_dci(DCI_PDU_NB *DCI_pdu,void *pdu,rnti_t rnti,unsigned char dci_size_bytes,unsigned char aggregation,unsigned char dci_size_bits,unsigned char dci_fmt);
+
+/*Use the UL DCI Information to configure PHY and also Packed*/
+int NB_generate_eNB_ulsch_params_from_dci(PHY_VARS_eNB_NB *eNB,
+                                       eNB_rxtx_proc_NB_t *proc,
+                                       DCI_CONTENT *DCI_Content,
+                                       uint16_t rnti,
+                                       DCI_format_NB_t dci_format,
+                                       uint8_t UE_id,
+                                       uint8_t aggregation,
+                                       uint8_t Num_dci
+                                      );
+/*Use the DL DCI Information to configure PHY and also Packed*/
+int NB_generate_eNB_dlsch_params_from_dci(int frame,
+                                       uint8_t subframe,
+                                       DCI_CONTENT *DCI_Content,
+                                       uint16_t rnti,
+                                       DCI_format_NB_t dci_format,
+                                       LTE_eNB_DLSCH_t **dlsch,
+                                       NB_DL_FRAME_PARMS *frame_parms,
+                                       uint8_t aggregation,
+                                       uint8_t Num_dci
+                                       );
+#endif
--- a/openair1/PHY/MODULATION/slot_fep.c
+++ b/openair1/PHY/MODULATION/slot_fep.c
@@ -129,11 +129,15 @@ int slot_fep(PHY_VARS_UE *ue,
        dft((int16_t *)tmp_dft_in,
            (int16_t *)&common_vars->common_vars_rx_data_per_thread[(Ns>>1)&0x1].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],1);
      } else { // use dft input from RX buffer directly
-        start_meas(&ue->rx_dft_stats);
+#if UE_TIMING_TRACE
+          start_meas(&ue->rx_dft_stats);
+#endif

        dft((int16_t *)&common_vars->rxdata[aa][(rx_offset) % frame_length_samples],
            (int16_t *)&common_vars->common_vars_rx_data_per_thread[(Ns>>1)&0x1].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],1);
+#if UE_TIMING_TRACE
        stop_meas(&ue->rx_dft_stats);
+#endif

      }
    } else {
@@ -150,8 +154,9 @@ int slot_fep(PHY_VARS_UE *ue,
        memcpy((void *)&common_vars->rxdata[aa][frame_length_samples],
               (void *)&common_vars->rxdata[aa][0],
               frame_parms->ofdm_symbol_size*sizeof(int));
-
+#if UE_TIMING_TRACE
      start_meas(&ue->rx_dft_stats);
+#endif

      if ((rx_offset&7)!=0) {  // if input to dft is not 128-bit aligned, issue for size 6 and 15 PRBs
        memcpy((void *)tmp_dft_in,
@@ -164,8 +169,9 @@ int slot_fep(PHY_VARS_UE *ue,
        dft((int16_t *)&common_vars->rxdata[aa][(rx_offset) % frame_length_samples],
            (int16_t *)&common_vars->common_vars_rx_data_per_thread[(Ns>>1)&0x1].rxdataF[aa][frame_parms->ofdm_symbol_size*symbol],1);
      }
-
+#if UE_TIMING_TRACE
      stop_meas(&ue->rx_dft_stats);
+#endif


    }
@@ -183,13 +189,17 @@ int slot_fep(PHY_VARS_UE *ue,
 #ifdef DEBUG_FEP
        printf("Channel estimation eNB %d, aatx %d, slot %d, symbol %d\n",eNB_id,aa,Ns,l);
 #endif
+#if UE_TIMING_TRACE
        start_meas(&ue->dlsch_channel_estimation_stats);
+#endif
        lte_dl_channel_estimation(ue,eNB_id,0,
                                  Ns,
                                  aa,
                                  l,
                                  symbol);
+#if UE_TIMING_TRACE
        stop_meas(&ue->dlsch_channel_estimation_stats);
+#endif

        for (i=0; i<ue->measurements.n_adj_cells; i++) {
          lte_dl_channel_estimation(ue,eNB_id,i+1,
@@ -208,13 +218,17 @@ int slot_fep(PHY_VARS_UE *ue,
 #endif

      if (l==(4-frame_parms->Ncp)) {
-        start_meas(&ue->dlsch_freq_offset_estimation_stats);
+#if UE_TIMING_TRACE
+          start_meas(&ue->dlsch_freq_offset_estimation_stats);
+#endif
        lte_est_freq_offset(common_vars->common_vars_rx_data_per_thread[(Ns>>1)&0x1].dl_ch_estimates[0],
                            frame_parms,
                            l,
                            &common_vars->freq_offset,
 			    reset_freq_est);
+#if UE_TIMING_TRACE
        stop_meas(&ue->dlsch_freq_offset_estimation_stats);
+#endif

      }
    }

--- a/openair1/PHY/MODULATION/slot_fep_mbsfn.c
+++ b/openair1/PHY/MODULATION/slot_fep_mbsfn.c
@@ -111,13 +111,17 @@ int slot_fep_mbsfn(PHY_VARS_UE *ue,
  for (aa=0; aa<frame_parms->nb_antennas_rx; aa++) {
    memset(&common_vars->common_vars_rx_data_per_thread[subframe&0x1].rxdataF[aa][frame_parms->ofdm_symbol_size*l],0,frame_parms->ofdm_symbol_size*sizeof(int));
    if (l==0) {
-      start_meas(&ue->rx_dft_stats);
+#if UE_TIMING_TRACE
+        start_meas(&ue->rx_dft_stats);
+#endif
      dft((int16_t *)&common_vars->rxdata[aa][(sample_offset +
          nb_prefix_samples0 +
          subframe_offset -
          SOFFSET) % frame_length_samples],
          (int16_t *)&common_vars->common_vars_rx_data_per_thread[subframe&0x1].rxdataF[aa][frame_parms->ofdm_symbol_size*l],1);
+#if UE_TIMING_TRACE
      stop_meas(&ue->rx_dft_stats);
+#endif
    } else {
      if ((sample_offset +
           (frame_parms->ofdm_symbol_size+nb_prefix_samples0+nb_prefix_samples) +
@@ -128,14 +132,18 @@ int slot_fep_mbsfn(PHY_VARS_UE *ue,
               (short *)&common_vars->rxdata[aa][0],
               frame_parms->ofdm_symbol_size*sizeof(int));

+#if UE_TIMING_TRACE
      start_meas(&ue->rx_dft_stats);
+#endif
      dft((int16_t *)&common_vars->rxdata[aa][(sample_offset +
          (frame_parms->ofdm_symbol_size+nb_prefix_samples0+nb_prefix_samples) +
          (frame_parms->ofdm_symbol_size+nb_prefix_samples)*(l-1) +
          subframe_offset-
          SOFFSET) % frame_length_samples],
          (int16_t *)&common_vars->common_vars_rx_data_per_thread[subframe&0x1].rxdataF[aa][frame_parms->ofdm_symbol_size*l],1);
+#if UE_TIMING_TRACE
      stop_meas(&ue->rx_dft_stats);
+#endif
    }
  }


--- a/openair1/PHY/defs.h
+++ b/openair1/PHY/defs.h
@@ -129,6 +129,7 @@ static inline void* malloc16_clear( size_t size )
 #ifdef OPENAIR_LTE

 #include "PHY/LTE_TRANSPORT/defs.h"
+#include "PHY/LTE_TRANSPORT/defs_nb_iot.h"
 #include <pthread.h>

 #include "targets/ARCH/COMMON/common_lib.h"
@@ -564,6 +565,9 @@ typedef struct PHY_VARS_eNB_s {
  // Pointers for active physicalConfigDedicated to be applied in current subframe
  struct PhysicalConfigDedicated *physicalConfigDedicated[NUMBER_OF_UE_MAX];

+  //Pointers for actve physicalConfigDedicated for NB-IoT to be applied in current subframe
+  struct PhysicalConfigDedicated_NB_r13 *phy_config_dedicated_NB[NUMBER_OF_UE_MAX];
+

  uint32_t rb_mask_ul[4];


--- a/openair1/PHY/defs_nb_iot.h
+++ b/openair1/PHY/defs_nb_iot.h
--- a/openair1/PHY/impl_defs_lte_nb_iot.h
+++ b/openair1/PHY/impl_defs_lte_nb_iot.h
@@ -30,7 +30,8 @@
 * \warning
 */

-
+#ifndef __PHY_IMPL_DEFS_NB_IOT__H__
+#define __PHY_IMPL_DEFS_NB_IOT__H__

 #include "types.h"
 //#include "defs.h"
@@ -47,27 +48,31 @@


 /// NPRACH-ParametersList-NB-r13 from 36.331 RRC spec
-typedef struct {
+typedef struct NPRACH_Parameters_NB{
  /// the period time for nprach
-  uint8_t nprach_Periodicity;
+  uint16_t nprach_Periodicity;
  /// for the start time for the NPRACH resource from 40ms-2560ms
-  uint8_t nprach_StartTime;	
+  uint16_t nprach_StartTime;
  /// for the subcarrier of set to the NPRACH preamble from n0 - n34
-  uint8_t nprach_SubcarrierOffset;
+  uint16_t nprach_SubcarrierOffset;
+  ///number of subcarriers in a NPRACH resource allowed values (n12,n24,n36,n48)
+  uint16_t nprach_NumSubcarriers;
  /// where is the region that in NPRACH resource to indicate if this UE support MSG3 for multi-tone or not. from 0 - 1
-  uint8_t nprach_SubcarrierMSG3_RangeStart;
+  uint16_t nprach_SubcarrierMSG3_RangeStart;
  /// The max preamble transmission attempt for the CE level from 1 - 128
-  uint8_t maxNumPreambleAttemptCE;
+  uint16_t maxNumPreambleAttemptCE;
+  /// Number of NPRACH repetitions per attempt for each NPRACH resource
+  uint16_t numRepetitionsPerPreambleAttempt;
  /// The number of the repetition for DCI use in RAR/MSG3/MSG4 from 1 - 2048
-  uint8_t npdcch_NumRepetitions_RA;
+  uint16_t npdcch_NumRepetitions_RA;
  /// Starting subframe for NPDCCH Common searching space for (RAR/MSG3/MSG4)
-  uint8_t npdcch_StartSF_CSS_RA;
+  uint16_t npdcch_StartSF_CSS_RA;
  /// Fractional period offset of starting subframe for NPDCCH common search space
-  uint8_t npdcch_Offset_RA;
+  uint16_t npdcch_Offset_RA;
 } nprach_parameters_NB_t;

 typedef struct{
-  A_SEQUENCE_OF(struct NPRACH_Parameters_NB) list;
+  A_SEQUENCE_OF(nprach_parameters_NB_t) list;
 }NPRACH_List_NB_t;

 typedef long RSRP_Range_t;
@@ -80,7 +85,7 @@ typedef struct {
 /// NPRACH_ConfigSIB-NB from 36.331 RRC spec
 typedef struct {
  /// nprach_CP_Length_r13, for the CP length(unit us) only 66.7 and 266.7 is implemented
-  uint8_t nprach_CP_Length;
+  uint16_t nprach_CP_Length;
  /// The criterion for UEs to select a NPRACH resource. Up to 2 RSRP threshold values can be signalled.  \vr{[1..2]}
  struct rsrp_ThresholdsNPrachInfoList *rsrp_ThresholdsPrachInfoList;
  /// NPRACH Parameters List
@@ -90,20 +95,20 @@ typedef struct {
 /// NPDSCH-ConfigCommon from 36.331 RRC spec
 typedef struct {
  ///see TS 36.213 (16.2). \vr{[-60..50]}\n Provides the downlink reference-signal EPRE. The actual value in dBm.
-  int8_t nrs_Power;
+  uint16_t nrs_Power;
 } NPDSCH_CONFIG_COMMON;

 typedef struct{
  /// The base sequence of DMRS sequence in a cell for 3 tones transmission; see TS 36.211 [21, 10.1.4.1.2]. If absent, it is given by NB-IoT CellID mod 12. Value 12 is not used.
-  uint8_t threeTone_BaseSequence;
+  uint16_t threeTone_BaseSequence;
  /// Define 3 cyclic shifts for the 3-tone case, see TS 36.211 [21, 10.1.4.1.2].
-  uint8_t threeTone_CyclicShift;
+  uint16_t threeTone_CyclicShift;
  /// The base sequence of DMRS sequence in a cell for 6 tones transmission; see TS 36.211 [21, 10.1.4.1.2]. If absent, it is given by NB-IoT CellID mod 14. Value 14 is not used.
-  uint8_t sixTone_BaseSequence;
+  uint16_t sixTone_BaseSequence;
  /// Define 4 cyclic shifts for the 6-tone case, see TS 36.211 [21, 10.1.4.1.2].
-  uint8_t sixTone_CyclicShift;
+  uint16_t sixTone_CyclicShift;
  /// The base sequence of DMRS sequence in a cell for 12 tones transmission; see TS 36.211 [21, 10.1.4.1.2]. If absent, it is given by NB-IoT CellID mod 30. Value 30 is not used.
-  uint8_t twelveTone_BaseSequence;
+  uint16_t twelveTone_BaseSequence;

 }DMRS_CONFIG_t;

@@ -141,9 +146,9 @@ typedef struct{

 /* DL-GapConfig-NB-r13 */
 typedef struct {
-	uint8_t	 dl_GapThreshold;
-	uint8_t	 dl_GapPeriodicity;
-	uint8_t	 dl_GapDurationCoeff;
+	uint16_t	 dl_GapThreshold;
+	uint16_t	 dl_GapPeriodicity;
+	uint16_t	 dl_GapDurationCoeff;
 } DL_GapConfig_NB;

 typedef struct {
@@ -216,7 +221,18 @@ typedef struct {
  int                 eutra_band;
  uint32_t            dl_CarrierFreq;
  uint32_t            ul_CarrierFreq;
-  uint8_t             CE;// CE level to determine the NPRACH Configuration
+  // CE level to determine the NPRACH Configuration (one CE for each NPRACH config.)
+  uint8_t             CE;

 } NB_DL_FRAME_PARMS;

+#define NPBCH_A 34 
+
+typedef struct {
+  uint8_t npbch_d[96+(3*(16+NPBCH_A))];
+  uint8_t npbch_w[3*3*(16+NPBCH_A)];
+  uint8_t npbch_e[1600];
+} NB_IoT_eNB_NPBCH;
+
+
+#endif
--- a/openair1/PHY/vars.h
+++ b/openair1/PHY/vars.h
--- a/openair1/SCHED/phy_procedures_lte_common.c
+++ b/openair1/SCHED/phy_procedures_lte_common.c
--- a/openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c
--- a/openair1/SCHED/phy_procedures_lte_ue.c
+++ b/openair1/SCHED/phy_procedures_lte_ue.c
--- a/openair1/SCHED/pusch_pc.c
+++ b/openair1/SCHED/pusch_pc.c
--- a/openair2/LAYER2/MAC/IF_Module_nb_iot.c
+++ b/openair2/LAYER2/MAC/IF_Module_nb_iot.c
--- a/openair2/LAYER2/MAC/defs_nb_iot.h
+++ b/openair2/LAYER2/MAC/defs_nb_iot.h
--- a/openair2/LAYER2/MAC/eNB_scheduler_RA_nb_iot.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_RA_nb_iot.c
--- a/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
--- a/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+++ b/openair2/LAYER2/MAC/eNB_scheduler_primitives.c
--- a/openair2/LAYER2/MAC/ue_procedures.c
+++ b/openair2/LAYER2/MAC/ue_procedures.c
--- a/openair2/PHY_INTERFACE/IF_Module_nb_iot.h
+++ b/openair2/PHY_INTERFACE/IF_Module_nb_iot.h
--- a/openair2/RRC/LITE/L2_interface_nb_iot.c
+++ b/openair2/RRC/LITE/L2_interface_nb_iot.c
--- a/openair2/UTIL/LOG/log.h
+++ b/openair2/UTIL/LOG/log.h
--- a/record.txt
+++ b/record.txt
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.generic.oaisim.local_no_mme.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.generic.oaisim.local_no_mme.conf
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.generic.oaisim.local_no_mme.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.generic.oaisim.local_no_mme.conf
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band40.tm1.TDD3SS5.100PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band40.tm1.TDD3SS5.100PRB.usrpb210.conf
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band40.tm1.TDD3SS5.25PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band40.tm1.TDD3SS5.25PRB.usrpb210.conf
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band40.tm1.TDD3SS5.50PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band40.tm1.TDD3SS5.50PRB.usrpb210.conf
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.flexran.oaisim.local_no_mme.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.flexran.oaisim.local_no_mme.conf
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_mme.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_mme.conf
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_no_mme.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.generic.oaisim.local_no_mme.conf
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.generic.oaisim.local_mme.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.generic.oaisim.local_mme.conf
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.generic.oaisim.local_no_mme.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.generic.oaisim.local_no_mme.conf
--- a/targets/RT/USER/lte-ue.c
+++ b/targets/RT/USER/lte-ue.c