path for NDLSCH procedure almost completed (missed coding, modulation and...

path for NDLSCH procedure almost completed (missed coding, modulation and scrambling functions). Code compile. 140 warnings

openair1/PHY/LTE_TRANSPORT/dci_tools_nb_iot.c

@@ -36,6 +36,7 @@
 #include "PHY/vars.h"
 #endif
 #include "assertions.h"
+//#include "dlsch_tbs_full.h"
 
 
 //#define DEBUG_HARQ
@@ -240,7 +241,14 @@ int NB_generate_eNB_dlsch_params_from_dci(PHY_VARS_eNB *eNB,
     if(ndlsch_harq->round == 0) //this should be set from initialization (init-lte)
     	ndlsch_harq->status = ACTIVE;
     ndlsch_harq->mcs = mcs;
-    ndlsch_harq->TBS = TBStable[get_I_TBS(ndlsch_harq->mcs)][ndlsch_harq->resource_assignment-1]; // this table should be rewritten for nb-iot
+
+    /*
+     * TS 36.213 ch 16.4.1.5
+     * ITBS is always set equivalent to IMCS for data
+     * ISF = ResAssign
+     */
+
+    ndlsch_harq->TBS = TBStable_NB_IoT[mcs][ResAssign]; // this table should be rewritten for nb-iot
     ndlsch_harq->frame = frame;
     ndlsch_harq->subframe = subframe;
 
@@ -301,7 +309,7 @@ int NB_generate_eNB_dlsch_params_from_dci(PHY_VARS_eNB *eNB,
         if(ndlsch_harq->round == 0){ //this should be set from initialization (init-lte)
         	ndlsch_harq->status = ACTIVE;
         	ndlsch_harq->mcs = mcs;
-        	ndlsch_harq->TBS = TBStable[get_I_TBS(ndlsch_harq->mcs)][ndlsch_harq->resource_assignment-1]; // this table should be rewritten for nb-iot
+        	ndlsch_harq->TBS = TBStable_NB_IoT[mcs][ResAssign]; // this table should be rewritten for nb-iot
         }
         ndlsch_harq->frame = frame;
         ndlsch_harq->subframe = subframe;

openair1/PHY/LTE_TRANSPORT/dlsch_tbs_full.h

@@ -19,6 +19,10 @@
  *      contact@openairinterface.org
  */
 
+
+#ifndef __DLSCH_TBS_FULL_H__
+#define __DLSCH_TBS_FULL_H__
+
 #define TBStable_rowCnt 27
 
 /** \brief "Transport block size table"
@@ -55,10 +59,10 @@ 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 
+// 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] ={
+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},
@@ -76,5 +80,10 @@ unsigned int TBStable_NB_IoT[14][8] ={
 };
 
 //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
+
+
 
-unsigned int TBStable_NB_IoT_SIB1[16] = {208,208,208,328,328,328,440,440,440,680,680,680};
\ No newline at end of file

openair1/PHY/LTE_TRANSPORT/extern.h

@@ -20,6 +20,11 @@
  */
 
 extern unsigned int dlsch_tbs25[27][25],TBStable[27][110],TBStable1C[32];
+
+//NB-Iot
+extern unsigned int TBStable_NB_IoT[14][8];
+
+
 extern unsigned short lte_cqi_eff1024[16];
 extern char lte_cqi_snr_dB[15];
 extern short conjugate[8],conjugate2[8];

openair1/SCHED/IF_Module_L1_primitives_nb_iot.c

@@ -40,6 +40,7 @@ void handle_nfapi_dlsch_pdu_NB(PHY_VARS_eNB *eNB,
         ndlsch->nrs_antenna_ports = rel13->nrs_antenna_ports_assumed_by_the_ue;
         ndlsch->scrambling_sequence_intialization = rel13->scrambling_sequence_initialization_cinit;
 
+        //managment of TBS size for SI??? (is written inside the SIB1-NB)
 
   }
   else