Skip to content

O
OpenXG-RAN
Commit d717319e authored by omhani's avatar omhani
Browse files
Options

mobile can see eNB, still receiver has issues

parent 048c74be
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 29 deletions
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
View file @ d717319e
...@@ -555,8 +555,8 @@ static int trx_usrp_issue_stream_cmd(openair0_device *device, openair0_timestamp ...@@ -555,8 +555,8 @@ static int trx_usrp_issue_stream_cmd(openair0_device *device, openair0_timestamp
uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE); uhd::stream_cmd_t stream_cmd(uhd::stream_cmd_t::STREAM_MODE_NUM_SAMPS_AND_DONE);
stream_cmd.num_samps = nsamps; stream_cmd.num_samps = nsamps;
stream_cmd.stream_now = false; stream_cmd.stream_now = true;
stream_cmd.time_spec = uhd::time_spec_t::from_ticks(ptimestamp,s->sample_rate); //stream_cmd.time_spec = uhd::time_spec_t::from_ticks(ptimestamp,s->sample_rate);
s->rx_stream->issue_stream_cmd(stream_cmd); s->rx_stream->issue_stream_cmd(stream_cmd);
......
targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band38.tm1.50PRB.usrpb210.conf
View file @ d717319e
...@@ -27,14 +27,14 @@ eNBs = ...@@ -27,14 +27,14 @@ eNBs =
node_timing = "synch_to_ext_device"; node_timing = "synch_to_ext_device";
node_synch_ref = 0; node_synch_ref = 0;
frame_type = "TDD"; frame_type = "TDD";
tdd_config = 3; tdd_config = 1;
tdd_config_s = 0; tdd_config_s = 0;
prefix_type = "NORMAL"; prefix_type = "NORMAL";
eutra_band = 38; eutra_band = 38;
downlink_frequency = 2600000000L; downlink_frequency = 2600000000L;
uplink_frequency_offset = 0; uplink_frequency_offset = 0;
Nid_cell = 0; Nid_cell = 0;
N_RB_DL = 50; N_RB_DL = 25;
Nid_cell_mbsfn = 0; Nid_cell_mbsfn = 0;
nb_antenna_ports = 1; nb_antenna_ports = 1;
nb_antennas_tx = 1; nb_antennas_tx = 1;
...@@ -117,7 +117,7 @@ eNBs = ...@@ -117,7 +117,7 @@ eNBs =
rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000"; rxPool_ResourceConfig_subframeBitmap_choice_bs_buf = "00000000000000000000";
rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5; rxPool_ResourceConfig_subframeBitmap_choice_bs_size = 5;
rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0; rxPool_ResourceConfig_subframeBitmap_choice_bs_bits_unused = 0;
/* rxPool_dataHoppingConfig_hoppingParameter = 0; /* rxPool_dataHoppingConfig_hoppingParameter = 0;
rxPool_dataHoppingConfig_numSubbands = "ns1"; rxPool_dataHoppingConfig_numSubbands = "ns1";
rxPool_dataHoppingConfig_rbOffset = 0; rxPool_dataHoppingConfig_rbOffset = 0;
rxPool_commTxResourceUC-ReqAllowed = "TRUE"; rxPool_commTxResourceUC-ReqAllowed = "TRUE";
...@@ -172,7 +172,7 @@ eNBs = ...@@ -172,7 +172,7 @@ eNBs =
////////// MME parameters: ////////// MME parameters:
mme_ip_address = ( { ipv4 = "10.64.93.19"; mme_ip_address = ( { ipv4 = "192.168.12.148";
ipv6 = "192:168:30::17"; ipv6 = "192:168:30::17";
active = "yes"; active = "yes";
preference = "ipv4"; preference = "ipv4";
...@@ -188,10 +188,10 @@ eNBs = ...@@ -188,10 +188,10 @@ eNBs =
NETWORK_INTERFACES : NETWORK_INTERFACES :
{ {
ENB_INTERFACE_NAME_FOR_S1_MME = "eno1"; ENB_INTERFACE_NAME_FOR_S1_MME = "enp3s0";
ENB_IPV4_ADDRESS_FOR_S1_MME = "10.64.45.62/23"; ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.12.217";
ENB_INTERFACE_NAME_FOR_S1U = "eno1"; ENB_INTERFACE_NAME_FOR_S1U = "enp3s0";
ENB_IPV4_ADDRESS_FOR_S1U = "10.64.45.62/23"; ENB_IPV4_ADDRESS_FOR_S1U = "192.168.12.217";
ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_PORT_FOR_S1U = 2152; # Spec 2152
ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24"; ENB_IPV4_ADDRESS_FOR_X2C = "192.168.12.111/24";
...@@ -252,8 +252,8 @@ RUs = ( ...@@ -252,8 +252,8 @@ RUs = (
local_rf = "yes" local_rf = "yes"
nb_tx = 1 nb_tx = 1
nb_rx = 1 nb_rx = 1
att_tx = 0 att_tx = -20
att_rx = 0; att_rx = -5;
bands = [7]; bands = [7];
max_pdschReferenceSignalPower = -27; max_pdschReferenceSignalPower = -27;
max_rxgain = 125; max_rxgain = 125;
......
targets/RT/USER/lte-ru.c
View file @ d717319e
...@@ -128,7 +128,7 @@ extern uint16_t sf_ahead; ...@@ -128,7 +128,7 @@ extern uint16_t sf_ahead;
extern uint8_t dlsch_ue_select_tbl_in_use; extern uint8_t dlsch_ue_select_tbl_in_use;
void init_ru_vnf(void); void init_ru_vnf(void);
#endif #endif
openair0_timestamp old_timestamp;
/*************************************************************/ /*************************************************************/
/* Functions to attach and configure RRU */ /* Functions to attach and configure RRU */
...@@ -651,10 +651,10 @@ void rx_rf(RU_t *ru, ...@@ -651,10 +651,10 @@ void rx_rf(RU_t *ru,
for (i=0; i<ru->nb_rx; i++) for (i=0; i<ru->nb_rx; i++)
rxp[i] = (void *)&ru->common.rxdata[i][*subframe*fp->samples_per_tti]; rxp[i] = (void *)&ru->common.rxdata[i][*subframe*fp->samples_per_tti];
old_ts = proc->timestamp_rx;
if (fp->frame_type == FDD) { if (fp->frame_type == FDD) {
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 1 ); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 1 );
old_ts = proc->timestamp_rx;
if(get_softmodem_params()->emulate_rf) { if(get_softmodem_params()->emulate_rf) {
wait_on_condition(&proc->mutex_emulateRF,&proc->cond_emulateRF,&proc->instance_cnt_emulateRF,"emulatedRF_thread"); wait_on_condition(&proc->mutex_emulateRF,&proc->cond_emulateRF,&proc->instance_cnt_emulateRF,"emulatedRF_thread");
...@@ -772,12 +772,13 @@ void rx_rf(RU_t *ru, ...@@ -772,12 +772,13 @@ void rx_rf(RU_t *ru,
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 1 ); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 1 );
//when the USRP starts, it initializes the timestamp to 0. We wait 1 frames until we program the first rx. //when the USRP starts, it initializes the timestamp to 0. We wait 1 frames until we program the first rx.
if (proc->first_rx==1) { if (proc->first_rx==1) {
proc->timestamp_rx = fp->samples_per_subframe*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME; proc->timestamp_rx = fp->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME;
proc->first_rx = 0; proc->first_rx = 0;
} }
else { else {
//we always advance the timestamp by samples_per_slot, even if we have not read the (full) slot. This is to keep the timestamp updated even when there is no RX. //we always advance the timestamp by samples_per_slot, even if we have not read the (full) slot. This is to keep the timestamp updated even when there is no RX.
proc->timestamp_rx += fp->samples_per_subframe; if(SF_type == SF_DL || SF_type == SF_UL)
proc->timestamp_rx += fp->samples_per_subframe;
} }
int siglen; int siglen;
...@@ -787,7 +788,7 @@ void rx_rf(RU_t *ru, ...@@ -787,7 +788,7 @@ void rx_rf(RU_t *ru,
int subframe_ul_count = 0; int subframe_ul_count = 0;
siglen = (fp->nb_prefix_samples + fp->ofdm_symbol_size) * fp->ul_symbols_in_S_subframe; siglen = (fp->nb_prefix_samples + fp->ofdm_symbol_size) * fp->ul_symbols_in_S_subframe;
proc->timestamp_rx += fp->samples_per_subframe - siglen; proc->timestamp_rx += fp->samples_per_tti - siglen;
for (int subframe_number = *subframe+1; subframe_number < LTE_NUMBER_OF_SUBFRAMES_PER_FRAME; subframe_number++) { for (int subframe_number = *subframe+1; subframe_number < LTE_NUMBER_OF_SUBFRAMES_PER_FRAME; subframe_number++) {
SubFrame_type = subframe_select(fp,subframe_number%10); SubFrame_type = subframe_select(fp,subframe_number%10);
...@@ -797,13 +798,13 @@ void rx_rf(RU_t *ru, ...@@ -797,13 +798,13 @@ void rx_rf(RU_t *ru,
} }
ru->rfdevice.trx_issue_stream_cmd(&ru->rfdevice, ru->rfdevice.trx_issue_stream_cmd(&ru->rfdevice,
proc->timestamp_rx, proc->timestamp_rx,
siglen + subframe_ul_count*fp->samples_per_subframe); siglen + subframe_ul_count*fp->samples_per_tti);
proc->timestamp_rx += siglen;
} else { } else {
siglen = fp->samples_per_subframe; siglen = fp->samples_per_subframe;
} }
LOG_I(PHY,"Reading %d samples for subframe %d at timestamp %ld\n",siglen,*subframe,proc->timestamp_rx); LOG_D(PHY,"Reading %d samples for subframe %d at timestamp %ld\n",siglen,*subframe,proc->timestamp_rx);
if(emulate_rf) { if(emulate_rf) {
wait_on_condition(&proc->mutex_emulateRF,&proc->cond_emulateRF,&proc->instance_cnt_emulateRF,"emulatedRF_thread"); wait_on_condition(&proc->mutex_emulateRF,&proc->cond_emulateRF,&proc->instance_cnt_emulateRF,"emulatedRF_thread");
...@@ -821,7 +822,6 @@ void rx_rf(RU_t *ru, ...@@ -821,7 +822,6 @@ void rx_rf(RU_t *ru,
ru->south_in_cnt++; ru->south_in_cnt++;
LOG_D(PHY,"south_in_cnt %d\n",ru->south_in_cnt); LOG_D(PHY,"south_in_cnt %d\n",ru->south_in_cnt);
LOG_I(PHY,"ts_offset %lu, ts %lu ,timestamp_rx %lu\n",ru->ts_offset,ts,proc->timestamp_rx);
if (ru->cmd==RU_FRAME_RESYNCH) { if (ru->cmd==RU_FRAME_RESYNCH) {
LOG_I(PHY,"Applying frame resynch %d => %d\n",*frame,ru->cmdval); LOG_I(PHY,"Applying frame resynch %d => %d\n",*frame,ru->cmdval);
...@@ -833,13 +833,16 @@ void rx_rf(RU_t *ru, ...@@ -833,13 +833,16 @@ void rx_rf(RU_t *ru,
ru->cmd=EMPTY; ru->cmd=EMPTY;
resynch=1; resynch=1;
} }
proc->timestamp_rx = ts-ru->ts_offset;
if (rxs != siglen) LOG_E(PHY, "rx_rf: Asked for %d samples, got %d from USRP\n",siglen,rxs); if (rxs != siglen) LOG_E(PHY, "rx_rf: Asked for %d samples, got %d from USRP\n",siglen,rxs);
} }
proc->frame_rx = *frame;
proc->tti_rx = *subframe;
//proc->frame_rx = (proc->timestamp_rx / (fp->samples_per_tti*10))&1023;
//proc->tti_rx = (proc->timestamp_rx / fp->samples_per_tti)%10;
if (ru->fh_north_asynch_in == NULL) { if (ru->fh_north_asynch_in == NULL) {
#ifdef PHY_TX_THREAD #ifdef PHY_TX_THREAD
...@@ -852,14 +855,14 @@ void rx_rf(RU_t *ru, ...@@ -852,14 +855,14 @@ void rx_rf(RU_t *ru,
proc->frame_tx = (proc->tti_rx>(9-sf_ahead)) ? (proc->frame_rx+1)&1023 : proc->frame_rx; proc->frame_tx = (proc->tti_rx>(9-sf_ahead)) ? (proc->frame_rx+1)&1023 : proc->frame_rx;
#endif #endif
LOG_I(PHY,"RU %d/%d TS %llu (off %d), frame %d, subframe %d\n", LOG_D(PHY,"RU %d/%d TS %llu (off %d), frame %d, subframe %d\n",
ru->idx, ru->idx,
0, 0,
(unsigned long long int)proc->timestamp_rx, (unsigned long long int)proc->timestamp_rx,
(int)ru->ts_offset, (int)ru->ts_offset,
proc->frame_rx, proc->frame_rx,
proc->tti_rx); proc->tti_rx);
LOG_I(PHY,"south_in/rx_rf: RU %d/%d TS %llu (off %d), frame %d, subframe %d\n", LOG_D(PHY,"south_in/rx_rf: RU %d/%d TS %llu (off %d), frame %d, subframe %d\n",
ru->idx, ru->idx,
0, 0,
(unsigned long long int)proc->timestamp_rx, (unsigned long long int)proc->timestamp_rx,
...@@ -879,14 +882,30 @@ void rx_rf(RU_t *ru, ...@@ -879,14 +882,30 @@ void rx_rf(RU_t *ru,
} }
} }
proc->frame_rx = *frame; //*frame = proc->frame_rx;
proc->tti_rx = *subframe; //*subframe = proc->tti_rx;
/*if (proc->first_rx == 0) {
if (proc->tti_rx != *subframe) {
LOG_E(PHY,"Received Timestamp (%llu) doesn't correspond to the time we think it is (proc->tti_rx %d, subframe %d)\n",(long long unsigned int)proc->timestamp_rx,proc->tti_rx,*subframe);
exit_fun("Exiting");
}
if (proc->frame_rx != *frame) {
LOG_E(PHY,"Received Timestamp (%llu) doesn't correspond to the time we think it is (proc->frame_rx %d frame %d)\n",(long long unsigned int)proc->timestamp_rx,proc->frame_rx,*frame);
exit_fun("Exiting");
}
} else {
proc->first_rx = 0;
printf("first rx 0");
*frame = proc->frame_rx;
*subframe = proc->tti_rx;
}*/
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 0 ); VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME( VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ, 0 );
// synchronize first reception to frame 0 subframe 0 // synchronize first reception to frame 0 subframe 0
LOG_I(PHY,"RU %d/%d TS %llu (off %d), frame %d, subframe %d.%d / \n", LOG_D(PHY,"RU %d/%d TS %llu (off %d), frame %d, subframe %d.%d / \n",
ru->idx, ru->idx,
0, 0,
(unsigned long long int)proc->timestamp_rx, (unsigned long long int)proc->timestamp_rx,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment