Commit fb7f6500 authored by Florian Kaltenberger's avatar Florian Kaltenberger

fixing a few bugs

parent d68775cf
......@@ -691,7 +691,7 @@ void rx_rf(RU_t *ru,int *frame,int *slot) {
ru->nb_rx);
// we might also apply some low pass filter here
ts_cpu_us = ((double)rdtsc_oai())/cpuf/1000.0;
ts_rx_us = ((double)ts)/ru->openair0_cfg.rx_sample_rate/1e6;
ts_rx_us = ((double)ts)/(ru->openair0_cfg.sample_rate/1e6);
time_offset_us = ts_rx_us- ts_cpu_us;
LOG_D(PHY,"rx_rf(): setting time_offset_us %f (ts_rx_us %f, ts_cpu_us %f)\n",time_offset_us,ts_rx_us,ts_cpu_us);
}
......@@ -704,7 +704,7 @@ void rx_rf(RU_t *ru,int *frame,int *slot) {
//this is a DL slot, so we don't need to read from rfdevice. But in order to keep (approximate) timing we sleep until the time we would expect the slot
if (time_offset_us) {
ts_cpu_us = ((double)rdtsc_oai())/cpuf/1000.0;
ts_rx_us = ((double)proc->timestamp_rx)/ru->openair0_cfg.rx_sample_rate/1e6;
ts_rx_us = ((double)proc->timestamp_rx)/(ru->openair0_cfg.sample_rate/1e6);
LOG_D(PHY,"rx_rf(): sleeping for %f (ts_rx_us %f, ts_cpu_us %f)\n",ts_rx_us-(ts_cpu_us+time_offset_us),ts_rx_us,ts_cpu_us);
if (ts_cpu_us+time_offset_us<ts_rx_us)
usleep(ts_rx_us-(ts_cpu_us+time_offset_us));
......
......@@ -228,11 +228,7 @@ typedef struct {
uint32_t recplay_mode;
recplay_conf_t *recplay_conf;
//! number of samples per tti
unsigned int samples_per_tti;
//! the sample rate for receive.
double rx_sample_rate;
//! the sample rate for transmit.
double tx_sample_rate;
//unsigned int samples_per_tti;
//! check for threequarter sampling rate
int8_t threequarter_fs;
//! flag to indicate use of same antenna port for RX and TX (for TDD)
......
......@@ -237,15 +237,16 @@ RUs = (
max_pdschReferenceSignalPower = -27;
max_rxgain = 114;
eNB_instances = [0];
sdr_addrs = "addr=192.168.10.2,mgmt_addr=192.168.10.2";
#clock_src = "external";
sdr_addrs = "addr=192.168.10.2,second_addr=192.168.20.2";
clock_src = "external";
time_src = "external";
}
);
THREAD_STRUCT = (
{
#three config for level of parallelism "PARALLEL_SINGLE_THREAD", "PARALLEL_RU_L1_SPLIT", or "PARALLEL_RU_L1_TRX_SPLIT"
parallel_config = "PARALLEL_RU_L1_TRX_SPLIT";
parallel_config = "PARALLEL_SINGLE_THREAD";
#two option for worker "WORKER_DISABLE" or "WORKER_ENABLE"
worker_config = "WORKER_ENABLE";
}
......@@ -255,9 +256,9 @@ THREAD_STRUCT = (
{
global_log_level ="info";
global_log_verbosity ="medium";
hw_log_level ="info";
hw_log_level ="debug";
hw_log_verbosity ="medium";
phy_log_level ="info";
phy_log_level ="debug";
phy_log_verbosity ="medium";
mac_log_level ="info";
mac_log_verbosity ="high";
......
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