maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the bugs came from r7709 in lte-softmodem with USRP interface

Browse Source 
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@7742 818b1a75-f10b-46b9-bf7c-635c3b92a50f
This commit is contained in:
navid
2015-07-24 17:33:18 +00:00
parent 5a04f9696c
commit 878eef4139
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/RT/USER/lte-softmodem.c
+20 -17
View File
@@ -1555,7 +1555,7 @@ static void* eNB_thread( void* arg )
void *txp[2]; // FIXME hard coded array size; indexed by lte_frame_parms.nb_antennas_tx void *txp[2]; // FIXME hard coded array size; indexed by lte_frame_parms.nb_antennas_tx
int hw_subframe = 0; // 0..NUM_ENB_THREADS-1 => 0..9 int hw_subframe = 0; // 0..NUM_ENB_THREADS-1 => 0..9
spp = openair0_cfg[0].samples_per_packet;
unsigned int rx_pos = 0; unsigned int rx_pos = 0;
unsigned int tx_pos = 0; //spp*tx_delay; unsigned int tx_pos = 0; //spp*tx_delay;
#endif #endif
@@ -1631,6 +1631,9 @@ static void* eNB_thread( void* arg )
int frame = 0; int frame = 0;
spp = openair0_cfg[0].samples_per_packet;
tx_pos=spp*openair0_cfg[0].tx_delay;
while (!oai_exit) { while (!oai_exit) {
start_meas( &softmodem_stats_mt ); start_meas( &softmodem_stats_mt );
@@ -1762,7 +1765,7 @@ static void* eNB_thread( void* arg )
openair0_timestamp timestamp; openair0_timestamp timestamp;
int i=0; int i=0;
// prepare rx buffer pointers // prepare rx buffer pointers
for (i=0; i<PHY_vars_eNB_g[0][0]->lte_frame_parms.nb_antennas_rx; i++){ for (i=0; i<PHY_vars_eNB_g[0][0]->lte_frame_parms.nb_antennas_rx; i++)
rxp[i] = (void*)&rxdata[i][rx_pos]; rxp[i] = (void*)&rxdata[i][rx_pos];
// check if nsymb_read == spp // check if nsymb_read == spp
// map antenna port i to the cc_id. Now use the 1:1 mapping // map antenna port i to the cc_id. Now use the 1:1 mapping
@@ -1770,8 +1773,8 @@ static void* eNB_thread( void* arg )
&timestamp, &timestamp,
rxp, rxp,
spp, spp,
i); PHY_vars_eNB_g[0][0]->lte_frame_parms.nb_antennas_rx);
}
stop_meas( &softmodem_stats_hw ); stop_meas( &softmodem_stats_hw );
clock_gettime( CLOCK_MONOTONIC, &trx_time1 ); clock_gettime( CLOCK_MONOTONIC, &trx_time1 );
@@ -1784,20 +1787,20 @@ static void* eNB_thread( void* arg )
// Transmit TX buffer based on timestamp from RX // Transmit TX buffer based on timestamp from RX
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1 );
// prepare tx buffer pointers
for (i=0; i<PHY_vars_eNB_g[0][0]->lte_frame_parms.nb_antennas_tx; i++)
txp[i] = (void*)&txdata[i][tx_pos];
//printf("tx_pos %d ts %d, ts_offset %d txp[i] %p, ap %d\n", tx_pos, timestamp, (timestamp+(tx_delay*spp)-tx_forward_nsamps),txp[i], i);
// if symb_written < spp ==> error
if (frame > 50) { if (frame > 50) {
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE, 1 ); openair0.trx_write_func(&openair0,
// prepare tx buffer pointers (timestamp+(openair0_cfg[card].tx_delay*spp)-openair0_cfg[card].tx_forward_nsamps),
for (i=0; i<PHY_vars_eNB_g[0][0]->lte_frame_parms.nb_antennas_tx; i++){ txp,
txp[i] = (void*)&rxdata[i][tx_pos]; spp,
//printf("tx_pos %d ts %d, ts_offset %d txp[i] %p, ap %d\n", tx_pos, timestamp, (timestamp+(tx_delay*spp)-tx_forward_nsamps),txp[i], i); PHY_vars_eNB_g[0][0]->lte_frame_parms.nb_antennas_tx,
// if symb_written < spp ==> error 1);
openair0.trx_write_func(&openair0,
(timestamp+(openair0_cfg[card].tx_delay*spp)-openair0_cfg[card].tx_forward_nsamps),
txp,
spp,
i,
1);
}
} }
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TS, timestamp&0xffffffff ); VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME( VCD_SIGNAL_DUMPER_VARIABLES_TRX_TS, timestamp&0xffffffff );