diff --git a/openair1/PHY/LTE_TRANSPORT/if4_tools.c b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
index bbfea66b31c401313e014f220fd43a091a274c12..38641941f80b807c2c66f4d8ad95b1ce70470e4e 100644
--- a/openair1/PHY/LTE_TRANSPORT/if4_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
@@ -48,13 +48,13 @@
// --- Careful to handle buffer memory --- RAW/UDP modes --- PRACH variables and data
-void send_IF4(PHY_VARS_eNB *eNB, int frame, int subframe, uint16_t packet_type) {
+void send_IF4(PHY_VARS_eNB *eNB, int frame, int subframe, uint16_t packet_type, int k) {
LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
int32_t **txdataF = eNB->common_vars.txdataF[0];
int32_t **rxdataF = eNB->common_vars.rxdataF[0];
- int16_t *prachF = eNB->prach_vars.prachF;
+ int16_t **rxsigF = eNB->prach_vars.rxsigF;
- uint16_t symbol_id, element_id;
+ uint16_t symbol_id=0, element_id=0;
uint16_t db_fulllength, db_halflength;
int slotoffsetF=0, blockoffsetF=0;
@@ -139,8 +139,7 @@ void send_IF4(PHY_VARS_eNB *eNB, int frame, int subframe, uint16_t packet_type)
}
} else if (packet_type == IF4_PRACH) {
// FIX: hard coded prach samples length
- db_fulllength = 839;
- slotoffsetF = (subframe)*(fp->ofdm_symbol_size)*((fp->Ncp==1) ? 12 : 14) + 1;
+ db_fulllength = 839*2;
tx_buffer = malloc(MAC_HEADER_SIZE_BYTES + sizeof_IF4_prach_header_t + db_fulllength*sizeof(int16_t));
IF4_prach_header_t *prach_header = (IF4_prach_header_t *)(tx_buffer + MAC_HEADER_SIZE_BYTES);
@@ -148,11 +147,14 @@ void send_IF4(PHY_VARS_eNB *eNB, int frame, int subframe, uint16_t packet_type)
gen_IF4_prach_header(prach_header, frame, subframe);
- // Do compression and generate data blocks
- for (element_id=0; element_id<db_fulllength; element_id++) {
- data_block[element_id] = lin2alaw[ (prachF[blockoffsetF+element_id] & 0xffff) + 32768 ];
- data_block[element_id] |= lin2alaw[ (prachF[blockoffsetF+element_id]>>16) + 32768 ]<<8;
- }
+ // Generate uncompressed data blocks
+ memcpy(data_block, (rxsigF[0]+k), db_fulllength*sizeof(int16_t));
+
+ //for (element_id=0; element_id<db_fulllength; element_id++) {
+ // data_block[element_id] = rxsigF[0][prachoffsetF];
+ // data_block[element_id] |= rxsigF[0][prachoffsetF+1]<<16;
+ // prachoffsetF += 2;
+ //}
// Write the packet to the fronthaul
if ((eNB->ifdevice.trx_write_func(&eNB->ifdevice,
@@ -176,16 +178,16 @@ void recv_IF4(PHY_VARS_eNB *eNB, int frame, int subframe, uint16_t *packet_type,
LTE_DL_FRAME_PARMS *fp = &eNB->frame_parms;
int32_t **txdataF = eNB->common_vars.txdataF[0];
int32_t **rxdataF = eNB->common_vars.rxdataF[0];
- int16_t *prachF = eNB->prach_vars.prachF;
+ int16_t **rxsigF = eNB->prach_vars.rxsigF;
uint16_t element_id;
uint16_t db_fulllength, db_halflength;
int slotoffsetF, blockoffsetF;
if (expected_packet == IF4_PDLFFT) {
- db_fulllength = = (12*fp->N_RB_DL);
+ db_fulllength = (12*fp->N_RB_DL);
} else {
- db_fulllength = = (12*fp->N_RB_UL);
+ db_fulllength = (12*fp->N_RB_UL);
}
db_halflength = db_fulllength>>1;
diff --git a/openair1/PHY/LTE_TRANSPORT/if4_tools.h b/openair1/PHY/LTE_TRANSPORT/if4_tools.h
index 46396d303468c9329e413c4ef804c2232fe42e08..4828daeddb8235667a9e6cbea6b06671cec6b6fd 100644
--- a/openair1/PHY/LTE_TRANSPORT/if4_tools.h
+++ b/openair1/PHY/LTE_TRANSPORT/if4_tools.h
@@ -182,6 +182,6 @@ void gen_IF4_ul_header(IF4_ul_header_t*, int, int);
void gen_IF4_prach_header(IF4_prach_header_t*, int, int);
-void send_IF4(PHY_VARS_eNB*, int, int, uint16_t);
+void send_IF4(PHY_VARS_eNB*, int, int, uint16_t, int);
-void recv_IF4(PHY_VARS_eNB*, int, int, uint16_t*, uint32_t*);
+void recv_IF4(PHY_VARS_eNB*, int, int, uint16_t*, uint32_t*, uint16_t);
diff --git a/openair1/PHY/LTE_TRANSPORT/prach.c b/openair1/PHY/LTE_TRANSPORT/prach.c
index 23ea2cae53972f19027663d3dd64b55863cf1380..4634be7321aed7821d63124a68729c40abcc20b8 100644
--- a/openair1/PHY/LTE_TRANSPORT/prach.c
+++ b/openair1/PHY/LTE_TRANSPORT/prach.c
@@ -41,6 +41,7 @@
#include "PHY/defs.h"
#include "PHY/extern.h"
//#include "prach.h"
+#include "PHY/LTE_TRANSPORT/if4_tools.h"
#include "SCHED/defs.h"
#include "SCHED/extern.h"
#include "UTIL/LOG/vcd_signal_dumper.h"
@@ -1269,18 +1270,25 @@ void rx_prach(PHY_VARS_eNB *eNB,
}
if (eNB->node_function == NGFI_RRU_IF4) {
- /// **** send_IF4 of prachF to RCC **** ///
+ k = (12*n_ra_prb) - 6*eNB->frame_parms.N_RB_UL;
+
+ if (k<0) {
+ k+=(eNB->frame_parms.ofdm_symbol_size);
+ }
+
+ k*=12;
+ k+=13;
+ k*=2;
+
+ /// **** send_IF4 of rxsigF to RCC **** ///
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 1 );
- //send_IF4(eNB, frame, subframe, IF4_PRACH);
+ send_IF4(eNB, eNB->proc.frame_rx, eNB->proc.subframe_rx, IF4_PRACH, k);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 0 );
return;
}
// in case of RCC and prach received rx_thread wakes up prach
- //else if (eNB->node_function == NGFI_RCC_IF4) {
- // wait for prachF from RRU and continue with PRACH processing
- //}
// here onwards is for eNodeB_3GPP or NGFI_RCC_IF4
diff --git a/openair1/SCHED/phy_procedures_lte_eNb.c b/openair1/SCHED/phy_procedures_lte_eNb.c
index cb033eb9046a363d05ee8f49e5b5122b0539a031..654619fee6e4bdbb6a64d6daeaf25ab9378f48ba 100755
--- a/openair1/SCHED/phy_procedures_lte_eNb.c
+++ b/openair1/SCHED/phy_procedures_lte_eNb.c
@@ -2605,7 +2605,7 @@ void phy_procedures_eNB_common_RX(PHY_VARS_eNB *eNB,const uint8_t abstraction_fl
/// **** send_IF4 of rxdataF to RCC (no prach now) **** ///
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 1 );
- send_IF4(eNB, frame, subframe, IF4_PULFFT);
+ send_IF4(eNB, frame, subframe, IF4_PULFFT, 0);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 0 );
}
diff --git a/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h b/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
index 5b95e5eecaafd73caff4a24b2cf6252c81548fec..12878badd1bc93b9cb20063d84b0b7f1f5548d09 100644
--- a/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
+++ b/targets/ARCH/ETHERNET/USERSPACE/LIB/if_defs.h
@@ -56,7 +56,7 @@
// Packet sizes for IF4 interface format
#define DATA_BLOCK_SIZE_BYTES(scaled_nblocks) (sizeof(int16_t)*scaled_nblocks)
-#define PRACH_BLOCK_SIZE_BYTES (sizeof(int16_t)*839) // FIX hard coded prach size
+#define PRACH_BLOCK_SIZE_BYTES (sizeof(int16_t)*839*2) // FIX hard coded prach size (uncompressed)
#define RAW_IF4_PDLFFT_SIZE_BYTES(nblocks) (MAC_HEADER_SIZE_BYTES + sizeof_IF4_dl_header_t + DATA_BLOCK_SIZE_BYTES(nblocks))
#define RAW_IF4_PULFFT_SIZE_BYTES(nblocks) (MAC_HEADER_SIZE_BYTES + sizeof_IF4_ul_header_t + DATA_BLOCK_SIZE_BYTES(nblocks))
diff --git a/targets/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c
index 08390d1f6ba8ca267a1be28260867e09b4e515ba..b30ed5b3905cd936021590ef79ae88f7580f0460 100644
--- a/targets/RT/USER/lte-enb.c
+++ b/targets/RT/USER/lte-enb.c
@@ -534,7 +534,7 @@ static void* eNB_thread_rxtx( void* param ) {
/// **** send_IF4 of txdataF to RRU **** ///
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 1 );
- send_IF4(PHY_vars_eNB_g[0][proc->CC_id], proc->frame_tx, proc->subframe_tx, IF4_PDLFFT);
+ send_IF4(PHY_vars_eNB_g[0][proc->CC_id], proc->frame_tx, proc->subframe_tx, IF4_PDLFFT, 0);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_SEND_IF4, 0 );
}