creation of two new files openair1/PHY/types_NB_IoT.h...

creation of two new files openair1/PHY/types_NB_IoT.h openair1/PHY/LTE_TRANSPORT/dlsch_tbs_full_NB_IoT.h

openair1/PHY/LTE_TRANSPORT/dci_tools_nb_iot.c

@@ -38,7 +38,7 @@
 #endif
 #include "assertions.h"
 //#include "dlsch_tbs_full.h"
-
+#include "PHY/LTE_TRANSPORT/dlsch_tbs_full_NB_IoT.h"
 
 //#define DEBUG_HARQ
 

openair1/PHY/LTE_TRANSPORT/dlsch_tbs_full.h

@@ -59,29 +59,7 @@ unsigned int TBStable[TBStable_rowCnt][110] = {{16,32,56,88,120,152,176,208,224,
 
 unsigned int TBStable1C[32] = {40, 56, 72, 120, 136, 144, 176, 208, 224, 256, 280, 296, 328, 336, 392, 488, 552, 600, 632, 696, 776, 840, 904, 1000, 1064, 1128, 1224, 1288, 1384, 1480, 1608, 1736};
 
-// NB-IoT------------------
 
-// TBS table for the case not containing SIB1-NB, Table 16.4.1.5.1-1 in TS 36.213 v14.2 
-unsigned int TBStable_NB_IoT[14][8] ={ //[ITBS][ISF]
-  {16,32,56,88,120.152,208,256},
-  {24,56,88,144,176,208,256,344},
-  {32,72,144,176,208,256,328,424},
-  {40,104,176,208,256,328,440,568},
-  {56,120,208,256,328,408,552,680},
-  {72,144,244,328,424,504,680,872},
-  {88,176,256,392,504,600,808,1032},
-  {104,224,328,472,584,680,968,1224},
-  {120,256,392,536,680,808,1096,1352},
-  {136,296,456,616,776,936,1256,1544},
-  {144,328,504,680,872,1032,1384,1736},
-  {176,376,584,776,1000,1192,1608,2024},
-  {208,440,680,904,1128,1352,1800,2280},
-  {224,488,744,1128,1256,1544,2024,2536}
-};
-
-//TBS table for the case containing S1B1-NB, Table 16.4.1.5.2-1 in TS 36.213 v14.2 (Itbs = 12 ~ 15 is reserved field
-//mapping ITBS to SIB1-NB
-unsigned int TBStable_NB_IoT_SIB1[16] = {208,208,208,328,328,328,440,440,440,680,680,680};
 
 #endif
 

openair1/PHY/LTE_TRANSPORT/dlsch_tbs_full_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
+ */
+
+
+#ifndef __DLSCH_TBS_FULL_NB_IOT_H__
+#define __DLSCH_TBS_FULL_NB_IOT_H__
+
+/** \brief "Transport block size table"
+ *  (Table 7.1.7.2.1-1 in 3GPP TS 36.213 V8.6.0)
+ */
+
+
+// NB-IoT------------------
+
+// TBS table for the case not containing SIB1-NB, Table 16.4.1.5.1-1 in TS 36.213 v14.2 
+unsigned int TBStable_NB_IoT[14][8] ={ //[ITBS][ISF]
+  {16,32,56,88,120.152,208,256},
+  {24,56,88,144,176,208,256,344},
+  {32,72,144,176,208,256,328,424},
+  {40,104,176,208,256,328,440,568},
+  {56,120,208,256,328,408,552,680},
+  {72,144,244,328,424,504,680,872},
+  {88,176,256,392,504,600,808,1032},
+  {104,224,328,472,584,680,968,1224},
+  {120,256,392,536,680,808,1096,1352},
+  {136,296,456,616,776,936,1256,1544},
+  {144,328,504,680,872,1032,1384,1736},
+  {176,376,584,776,1000,1192,1608,2024},
+  {208,440,680,904,1128,1352,1800,2280},
+  {224,488,744,1128,1256,1544,2024,2536}
+};
+
+//TBS table for the case containing S1B1-NB, Table 16.4.1.5.2-1 in TS 36.213 v14.2 (Itbs = 12 ~ 15 is reserved field
+//mapping ITBS to SIB1-NB
+unsigned int TBStable_NB_IoT_SIB1[16] = {208,208,208,328,328,328,440,440,440,680,680,680};
+
+#endif
\ No newline at end of file

openair1/PHY/LTE_TRANSPORT/proto_nb_iot.h

@@ -159,6 +159,14 @@ NB_IoT_eNB_NDLSCH_t *new_eNB_dlsch_NB_IoT(//unsigned char Kmimo,
 
 NB_IoT_eNB_NULSCH_t *new_eNB_ulsch_NB(uint8_t abstraction_flag);
 
+//5555
+/*void rx_ulsch_NB_IoT(PHY_VARS_eNB *phy_vars_eNB,
+                     eNB_rxtx_proc_t *proc,
+                     uint8_t eNB_id,  // this is the effective sector id
+                     uint8_t UE_id,
+                     LTE_eNB_ULSCH_t **ulsch,
+                     uint8_t cooperation_flag);
+*/
 /** \fn dlsch_encoding(PHY_VARS_eNB *eNB,
     uint8_t *input_buffer,
     LTE_DL_FRAME_PARMS *frame_parms,

openair1/PHY/LTE_TRANSPORT/uci_NB_IoT.h

@@ -19,7 +19,7 @@
  *      contact@openairinterface.org
  */
 
-#include "PHY/types.h"
+#include "PHY/types_NB_IoT.h"
 
 
 

openair1/PHY/impl_defs_lte_nb_iot.h

@@ -33,7 +33,7 @@
 #ifndef __PHY_IMPL_DEFS_NB_IOT__H__
 #define __PHY_IMPL_DEFS_NB_IOT__H__
 
-#include "types.h"
+#include "types_NB_IoT.h"
 //#include "defs.h"
 
 typedef enum {TDD_NB_IoT=1,FDD_NB_IoT=0} NB_IoT_frame_type_t;

openair1/PHY/types_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
+ */
+
+#ifndef __openair_TYPES_NB_IOT_H__
+#define __openair_TYPES_NB_IOT_H__
+
+#ifdef USER_MODE
+#include <stdint.h>
+#else
+#include <linux/types.h>
+#endif
+
+
+#endif /*__openair_TYPES_NB_IOT_H__ */

openair1/PHY/vars_NB_IoT.h

@@ -22,7 +22,7 @@
 #ifndef __PHY_VARS_NB_IOT_H__
 #define __PHY_VARS_NB_IOT_H__
 
-#include "PHY/types.h"
+#include "PHY/types_NB_IoT.h"
 #include "PHY/defs_nb_iot.h"
 
 /*

openair1/SCHED/phy_procedures_lte_eNb_nb_iot.c

@@ -1227,7 +1227,7 @@ void phy_procedures_eNB_TX_NB_IoT(PHY_VARS_eNB_NB_IoT *eNB,
 
       for(UE_id = 0 ; UE_id < NUMBER_OF_UE_MAX_NB_IoT; UE_id++)
       {
-    	  if(eNB->npdcch[(uint8_t)UE_id] != NULL && eNB->npdcch[(uint8_t)UE_id]->rnti == dci_pdu->dci_alloc->rnti && (eNB->ndlsch_SIB1->harq_process->status != ACTIVE || subframe != 4))
+    	  if(eNB->npdcch[(uint8_t)UE_id] != NULL && eNB->npdcch[(uint8_t)UE_id]->rnti == dci_pdu->dci_alloc->rnti && (eNB->ndlsch_SIB1->harq_process->status != ACTIVE_NB_IoT || subframe != 4))
     	  {
       	  	if(frame%2 == 0)//condition on NSSS (subframe 9 not available)
       	  	  {