added more structural changes

openair1/PHY/LTE_TRANSPORT/if4_tools.c

@@ -29,28 +29,19 @@
 
 /*! \file PHY/LTE_TRANSPORT/if4_tools.c
 * \brief 
-* \author Mauricio Gunther, Raymond Knopp, S. Sandeep Kumar
+* \author Mauricio Gunther, S. Sandeep Kumar, Raymond Knopp
 * \date 2016
 * \version 0.1
 * \company Eurecom
-* \email: knopp@eurecom.fr, ee13b1025@iith.ac.in
+* \email: knopp@eurecom.fr 
 * \note
 * \warning
 */
 
 #include "PHY/LTE_TRANSPORT/if4_tools.h"
 
-/*
+// Define how data blocks are stored and transferred
-typedef struct data_block_type {
 
-} data_block;
-*/
-
-/*
-void allocate_data_block(long *data_block ,int length){
-	data_block = malloc(length*sizeof(long));
-}
-*/
 
 void send_IF4(PHY_VARS_eNB *eNB, int subframe){
 	eNB_proc_t *proc = &eNB->proc;
@@ -58,57 +49,138 @@ void send_IF4(PHY_VARS_eNB *eNB, int subframe){
 	//int subframe=proc->subframe_tx;
 
 	LTE_DL_FRAME_PARMS *fp=&eNB->frame_parms;
-	int i,j;
 
+	uint32_t i,j;
 	float *data_block = malloc(length*sizeof(long));
 
+  // Generate IF4 packet (for now DL) with frame status information
+  dl_packet = gen_IF4_dl_packet( /* ADD INFO and data_block pointer */ );
 	
-	// find number of consecutive non zero in values in symbol
+	for(i=0; i<fp->symbols_per_tti; i++) {
-	// NrOfNonZeroValues
     
-	// how many values does the atan function output?
+    // Do compression of the two parts and generate data blocks
     
-	for(i = 0; i <= fp->symbols_per_tti; i++){
+    symbol = eNB->common_vars.txdataF[0][0 /*antenna number*/][subframe*fp->ofdm_symbol_size*(fp->symbols_per_tti)]
-		for(j = 0; j < NrOfNonZeroValues; j=j+2){  
+    data_block[j] = Atan(symbol[fp->ofmd_symbol_size - NrOfNonZeroValues + j -1])<<16 + Atan(symbol[fp->ofmd_symbol_size - NrOfNonZeroValues + j]);
+    data_block[j+NrOfNonZeroValues] = Atan(subframe[i][j+1])<<16 + Atan(subframe[i][j+2]);
     
-			symbol = eNB->common_vars.txdataF[0][0 /*antenna number*/][subframe*fp->ofdm_symbol_size*(fp->symbols_per_tti)]
+    // Set data blocks and update subframe no./other information to generated packet
     
-			data_block[j] = Atan(symbol[fp->ofmd_symbol_size - NrOfNonZeroValues + j -1])<<16 + Atan(symbol[fp->ofmd_symbol_size - NrOfNonZeroValues + j]);
-			data_block[j+NrOfNonZeroValues] = Atan(subframe[i][j+1])<<16 + Atan(subframe[i][j+2]);
-			// use memset?
-		}
     
-	}
+    // Write the packet(s) to the fronthaul
     
-/*
+  }
-memset(&eNB->common_vars.txdataF[0][aa][subframe*fp->ofdm_symbol_size*(fp->symbols_per_tti)],
-             0,fp->ofdm_symbol_size*(fp->symbols_per_tti)*sizeof(int32_t));
-    }
-  */  
   		    
 }
 
-void recv_IF4( ) {
+void recv_IF4( /* ADD INFO and data_block pointer */ ) {
+
+  // Read packet(s) from the fronthaul
+  
+  // Apply reverse processing - decompression
+  
+  // Generate and return the OFDM symbols (txdataF)
   
 }
 
-IF4_dl_packet gen_IF4_dl_packet(  ) {
+IF4_dl_packet gen_IF4_dl_packet( /* ADD INFO and data_block pointer */ ) {  
-  
   IF4_dl_packet dl_packet;
   
+  // Set destination and source address
+  
+  // Set Type and Sub-Type
+  dl_packet.type = ; //08_0A ? 
+  dl_packet.sub_type = 0x0020;
+
+  // Leave reserved as it is 
+  //dl_packet.rsvd = ;
+  
+  // Set frame status
+  dl_packet.frame_status.ant_num = ;
+  dl_packet.frame_status.ant_start = ;
+  dl_packet.frame_status.rf_num = ;
+  dl_packet.frame_status.sf_num = ;
+  dl_packet.frame_status.sym_num = ;
+  //dl_packet.frame_status.rsvd = ;
+    
+  // Set data blocks if sent
+  if (data_block != NULL) {
+    
+  } else {
+    
+  }
+  
+  // Set frame check sequence
+  dl_packet.fcs = ;
+  
   return dl_packet;
 }
 
-IF4_ul_packet gen_IF4_ul_packet(  ) {
+IF4_ul_packet gen_IF4_ul_packet( /* ADD INFO and data_block pointer */ ) {
-  
   IF4_ul_packet ul_packet;
 
+  // Set destination and source address
+  
+  // Set Type and Sub-Type
+  ul_packet.type = ; //08_0A ? 
+  ul_packet.sub_type = 0x0019;
+
+  // Leave reserved as it is 
+  //ul_packet.rsvd = ;
+  
+  // Set frame status
+  ul_packet.frame_status.ant_num = ;
+  ul_packet.frame_status.ant_start = ;
+  ul_packet.frame_status.rf_num = ;
+  ul_packet.frame_status.sf_num = ;
+  ul_packet.frame_status.sym_num = ;
+  //ul_packet.frame_status.rsvd = ;
+    
+  // Set antenna specific gain
+  ul_packet.gain0.exponent = ;
+  //ul_packet.gain0.rsvd = ;
+  
+  // Set data blocks if sent
+  if (data_block != NULL) {
+    
+  } else {
+    
+  }
+  
+  // Set frame check sequence
+  ul_packet.fcs = ;
+  
   return ul_packet;
 }
 
-IF4_prach_packet gen_IF4_prach_packet(  ) {
+IF4_prach_packet gen_IF4_prach_packet( /* ADD INFO and data_block pointer */ ) {
-  
   IF4_prach_packet prach_packet;
 
+  // Set destination and source address
+  
+  // Set Type and Sub-Type
+  prach_packet.type = ; //08_0A ? 
+  prach_packet.sub_type = 0x0021;
+
+  // Leave reserved as it is 
+  //prach_packet.rsvd = ;
+  
+  // Set LTE Prach configuration
+  //prach_packet.prach_conf.rsvd = ;
+  prach_packet.prach_conf.ant = ;
+  prach_packet.prach_conf.rf_num = ;
+  prach_packet.prach_conf.sf_num = ;
+  prach_packet.prach_conf.exponent = ;  
+      
+  // Set data blocks if sent
+  if (data_block != NULL) {
+    
+  } else {
+    
+  }
+  
+  // Set frame check sequence
+  prach_packet.fcs = ;
+  
   return prach_packet;
 } 

openair1/PHY/LTE_TRANSPORT/if4_tools.h

@@ -56,7 +56,7 @@ struct IF4_frame_status {
   uint32_t rsvd:2;    
 };
 
-/// IF4 Antenna Gain
+/// IF4 Antenna Gain (16 bits)
 struct IF4_gain {
   /// Reserved 
   uint32_t rsvd:10;
@@ -151,6 +151,8 @@ struct IF4_prach_packet {
   uint32_t fcs;
 };
 
+// Needs to be checked
+
 IF4_dl_packet gen_IF4_dl_packet();
 
 IF4_ul_packet gen_IF4_ul_packet();