bug fixe for SIB23

openair1/PHY/LTE_TRANSPORT/dlsch_coding_NB_IoT.c

@@ -86,7 +86,8 @@ void ccode_encode_npdsch_NB_IoT (int32_t   numbits,
 int dlsch_encoding_NB_IoT(unsigned char      			*a,
 			              NB_IoT_DL_eNB_SIB_t 			*dlsch, //NB_IoT_eNB_NDLSCH_t
 			              uint8_t 			 	Nsf,       // number of subframes required for npdsch pdu transmission calculated from Isf (3GPP spec table)
-			              unsigned int 		 		G) 		    // G (number of available RE) is implicitly multiplied by 2 (since only QPSK modulation)
+			              unsigned int 		 		G,
+			              uint8_t option) 		    // G (number of available RE) is implicitly multiplied by 2 (since only QPSK modulation)
 {
 	uint32_t  crc = 1;
 	//unsigned char harq_pid = dlsch->current_harq_pid;  			// to check during implementation if harq_pid is required in the NB_IoT_eNB_DLSCH_t structure  in defs_NB_IoT.h
@@ -105,10 +106,19 @@ int dlsch_encoding_NB_IoT(unsigned char      			*a,
 
 	int32_t numbits = A+24;
 
-    for (int i=0; i<19; i++) 												
+if(option ==1)
+{  
+	for (int i=0; i<19; i++) 												
 	{	
 		npbch_a[i] = a[i];    
 	}
+} else {
+	for (int i=0; i<33; i++) 												
+	{	
+		npbch_a[i] = a[i];    
+	}
+}
+    
      
 	crc = crc24a_NB_IoT(npbch_a,A)>>8;
 	

openair1/PHY/LTE_TRANSPORT/proto_NB_IoT.h

@@ -257,7 +257,8 @@ int dlsch_modulation_NB_IoT(int32_t               **txdataF,
 int32_t dlsch_encoding_NB_IoT(unsigned char              *a,
                               NB_IoT_DL_eNB_SIB_t        *dlsch, // NB_IoT_eNB_NDLSCH_t
                               uint8_t                    Nsf,        // number of subframes required for npdsch pdu transmission calculated from Isf (3GPP spec table)
-                              unsigned int               G);         // G (number of available RE) is implicitly multiplied by 2 (since only QPSK modulation)
+                              unsigned int               G,
+                              uint8_t option);         // G (number of available RE) is implicitly multiplied by 2 (since only QPSK modulation)
  
 
 void rx_ulsch_NB_IoT(PHY_VARS_eNB_NB_IoT      *phy_vars_eNB,

openair1/SCHED/phy_procedures_lte_eNb_NB_IoT.c

@@ -320,7 +320,8 @@ void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
             dlsch_encoding_NB_IoT(sib1_pdu,
                                   sib1,
                                   8,                      ///// number_of_subframes_required
-                                  236);                   //////////// G*2
+                                  236,
+                                  1);                   //////////// G*2
         
         
             dlsch_sib_scrambling_NB_IoT(fp,                    // is called only in subframe 4
@@ -351,7 +352,8 @@ void common_signal_procedures_NB_IoT(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc)
             dlsch_encoding_NB_IoT(sib23_pdu,
                                   sib23,
                                   8,                      ///// number_of_subframes_required
-                                  236);                   //////////// G*2
+                                  236,
+                                  2);                   //////////// G*2
         
         
             dlsch_sib_scrambling_NB_IoT(fp,                    // is called only in subframe 4