eNB_proc_t -> eNB_rxtx_proc_t in if4_tools.c, addition on parameter of functions

openair1/PHY/LTE_TRANSPORT/if4_tools.c

@@ -45,9 +45,8 @@
 #include "PHY/TOOLS/ALAW/alaw_lut.h"
 
 // --- Careful to handle buffer memory --- RAW/UDP modes --- PRACH variables and data
-void send_IF4(PHY_VARS_eNB *eNB, uint16_t packet_type) {
+void send_IF4(PHY_VARS_eNB *eNB, eNB_rxtx_proc_t *proc, uint16_t packet_type) {
   LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
-  eNB_proc_t *proc = &eNB->proc;
   int32_t **txdataF = eNB->common_vars.txdataF[0];
   int32_t **rxdataF = eNB->common_vars.rxdataF[0];
   int16_t *prachF = eNB->prach_vars.prachF;  
@@ -169,9 +168,8 @@ void send_IF4(PHY_VARS_eNB *eNB, uint16_t packet_type) {
   return;  		    
 }
 
-void recv_IF4(PHY_VARS_eNB *eNB, uint16_t *packet_type, uint32_t *symbol_number) {
+void recv_IF4(PHY_VARS_eNB *eNB, eNB_rxtx_proc_t *proc, uint16_t *packet_type, uint32_t *symbol_number) {
   LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
-  eNB_proc_t *proc = &eNB->proc;
   int32_t **txdataF = eNB->common_vars.txdataF[0];
   int32_t **rxdataF = eNB->common_vars.rxdataF[0];
 
@@ -251,7 +249,7 @@ void recv_IF4(PHY_VARS_eNB *eNB, uint16_t *packet_type, uint32_t *symbol_number)
   return;   
 }
 
-void gen_IF4_dl_header(IF4_dl_header_t *dl_packet, eNB_proc_t *proc) {      
+void gen_IF4_dl_header(IF4_dl_header_t *dl_packet, eNB_rxtx_proc_t *proc) {      
   // Set Type and Sub-Type
   dl_packet->type = IF4_PACKET_TYPE; 
   dl_packet->sub_type = IF4_PDLFFT;
@@ -271,7 +269,7 @@ void gen_IF4_dl_header(IF4_dl_header_t *dl_packet, eNB_proc_t *proc) {
 
 }
 
-void gen_IF4_ul_header(IF4_ul_header_t *ul_packet, eNB_proc_t *proc) {  
+void gen_IF4_ul_header(IF4_ul_header_t *ul_packet, eNB_rxtx_proc_t *proc) {  
   // Set Type and Sub-Type
   ul_packet->type = IF4_PACKET_TYPE; 
   ul_packet->sub_type = IF4_PULFFT;

openair1/PHY/LTE_TRANSPORT/if4_tools.h

@@ -175,12 +175,12 @@ struct IF4_prach_header {
 typedef struct IF4_prach_header IF4_prach_header_t;
 #define sizeof_IF4_prach_header_t 12
 
-void gen_IF4_dl_header(IF4_dl_header_t*, eNB_proc_t*);
+void gen_IF4_dl_header(IF4_dl_header_t*, eNB_rxtx_proc_t*);
 
-void gen_IF4_ul_header(IF4_ul_header_t*, eNB_proc_t*);
+void gen_IF4_ul_header(IF4_ul_header_t*, eNB_rxtx_proc_t*);
 
 void gen_IF4_prach_header(IF4_prach_header_t*, eNB_proc_t*);
 
-void send_IF4(PHY_VARS_eNB*, uint16_t);
+void send_IF4(PHY_VARS_eNB*, eNB_rxtx_proc_t*, uint16_t);
 
-void recv_IF4(PHY_VARS_eNB*, uint16_t*, uint32_t*);
+void recv_IF4(PHY_VARS_eNB*, eNB_rxtx_proc_t*, uint16_t*, uint32_t*);

targets/RT/USER/lte-enb.c

@@ -1245,8 +1245,6 @@ int setup_eNB_buffers(PHY_VARS_eNB **phy_vars_eNB, openair0_config_t *openair0_c
       memset(txdata[i],0, openair0_cfg[rf_map[CC_id].card].samples_per_frame*sizeof(int32_t));
       printf("txdata[%d] @ %p\n", i, phy_vars_eNB[CC_id]->common_vars.txdata[0][i]);
     }
-
-
   }
 
   return(0);