From 81506be64c4e8876ac46f0fc48ccba6ae855613a Mon Sep 17 00:00:00 2001
From: Sandeep Kumar <ee13b1025@iith.ac.in>
Date: Mon, 25 Jul 2016 17:40:46 +0200
Subject: [PATCH] if4 working
---
openair1/PHY/LTE_TRANSPORT/if4_tools.c | 4 ++--
openair1/PHY/LTE_TRANSPORT/prach.c | 21 +--------------------
targets/RT/USER/lte-enb.c | 2 +-
3 files changed, 4 insertions(+), 23 deletions(-)
diff --git a/openair1/PHY/LTE_TRANSPORT/if4_tools.c b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
index 572bcd73b7..d492af16a7 100644
--- a/openair1/PHY/LTE_TRANSPORT/if4_tools.c
+++ b/openair1/PHY/LTE_TRANSPORT/if4_tools.c
@@ -96,7 +96,7 @@ void send_IF4(PHY_VARS_eNB *eNB, int frame, int subframe, uint16_t packet_type,
} else if (packet_type == IF4_PULFFT) {
db_fulllength = 12*fp->N_RB_UL;
db_halflength = (db_fulllength)>>1;
- slotoffsetF = (subframe)*(fp->ofdm_symbol_size)*((fp->Ncp==1) ? 12 : 14) + 1;
+ slotoffsetF = 1;
blockoffsetF = slotoffsetF + fp->ofdm_symbol_size - db_halflength - 1;
IF4_header_t *ul_header = (IF4_header_t *)(tx_buffer + MAC_HEADER_SIZE_BYTES);
@@ -212,7 +212,7 @@ void recv_IF4(PHY_VARS_eNB *eNB, int *frame, int *subframe, uint16_t *packet_typ
} else if (*packet_type == IF4_PULFFT) {
*symbol_number = ((packet_header->frame_status)>>26)&0x000f;
- slotoffsetF = (*symbol_number)*(fp->ofdm_symbol_size) + (*subframe)*(fp->ofdm_symbol_size)*((fp->Ncp==1) ? 12 : 14) + 1;
+ slotoffsetF = (*symbol_number)*(fp->ofdm_symbol_size) + 1;
blockoffsetF = slotoffsetF + fp->ofdm_symbol_size - db_halflength - 1;
for (element_id=0; element_id<db_halflength; element_id++) {
diff --git a/openair1/PHY/LTE_TRANSPORT/prach.c b/openair1/PHY/LTE_TRANSPORT/prach.c
index 752aee11cd..471b572a56 100644
--- a/openair1/PHY/LTE_TRANSPORT/prach.c
+++ b/openair1/PHY/LTE_TRANSPORT/prach.c
@@ -1104,12 +1104,7 @@ void rx_prach(PHY_VARS_eNB *eNB,
for (aa=0; aa<nb_ant_rx; aa++) {
prach[aa] = (int16_t*)&eNB->common_vars.rxdata[0][aa][subframe*eNB->frame_parms.samples_per_tti-eNB->N_TA_offset];
}
-
- int energy = dB_fixed(signal_energy(prach[0], eNB->frame_parms.samples_per_tti));
- //if (energy >= 45) {
- // printf("prach subframe energy %d\n",energy);
- //}
-
+
// First compute physical root sequence
if (restricted_set == 0) {
if (Ncs_config>15) {
@@ -1290,13 +1285,6 @@ void rx_prach(PHY_VARS_eNB *eNB,
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 );
- energy = dB_fixed(signal_energy(&rxsigF[0][k], 839));
- if (energy >=45) {
- printf("<frame %d> prach freq-domain energy %d\n",eNB->proc.frame_rx, energy);
- //write_output("beforecomp.m","rxF",&rxsigF[0][k],839*2,1,0);
- //exit(1);
- }
-
return;
} else if (eNB->node_function == NGFI_RCC_IF4) {
k = (12*n_ra_prb) - 6*eNB->frame_parms.N_RB_UL;
@@ -1313,13 +1301,6 @@ void rx_prach(PHY_VARS_eNB *eNB,
memmove((&rxsigF[0][k]),
(&rxsigF[0][0]),
839*2*sizeof(int16_t));
-
- energy = dB_fixed(signal_energy(&rxsigF[0][k], 839));
- if (energy >=45) {
- printf("<frame %d> prach freq-domain energy %d\n",eNB->proc.frame_rx, energy);
- //write_output("aftercomp.m","rxF",&rxsigF[0][k],839*2,1,0);
- //exit(1);
- }
}
// in case of RCC and prach received rx_thread wakes up prach
diff --git a/targets/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c
index 427f69180f..6ed97c0f65 100644
--- a/targets/RT/USER/lte-enb.c
+++ b/targets/RT/USER/lte-enb.c
@@ -976,7 +976,7 @@ static void* eNB_thread_FH( void* param ) {
pthread_mutex_unlock(&sync_mutex);
- printf( "got sync (eNB_thread FH)\n" );
+ printf( "got sync (eNB_thread_FH)\n" );
#if defined(ENABLE_ITTI)
wait_system_ready ("Waiting for eNB application to be ready %s\r", &start_eNB);
--
GitLab