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

write out for txdataF_BF and txdata and minor fix for uhd load

Browse Source
This commit is contained in:
Wolfgang A. Mozart
2018-10-16 12:26:39 +02:00
parent 26418275e8
commit 006af69782
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+1 -1
View File
@@ -1039,7 +1039,7 @@ extern "C" {
if(device_adds.size() == 0) { if(device_adds.size() == 0) {
double usrp_master_clock = 184.32e6; double usrp_master_clock = 184.32e6;
std::string args = "type=x300, addr=192.168.30.2"; std::string args = "type=x300";
// workaround for an api problem, master clock has to be set with the constructor not via set_master_clock_rate // workaround for an api problem, master clock has to be set with the constructor not via set_master_clock_rate
args += boost::str(boost::format(",master_clock_rate=%f") % usrp_master_clock); args += boost::str(boost::format(",master_clock_rate=%f") % usrp_master_clock);
targets/RT/USER/nr-ru.c
+8 -4
View File
@@ -854,12 +854,16 @@ void tx_rf(RU_t *ru) {
// prepare tx buffer pointers // prepare tx buffer pointers
if(emulate_rf) if(emulate_rf)
{ {
if(proc->frame_tx < 2) for (i=0; i<ru->nb_tx; i++)
{ {
LOG_M("txdataF_frame.m","txdataF_frame",&ru->common.txdataF_BF[i],fp->samples_per_subframe_wCP, 1, 1); if(proc->frame_tx > 0 && proc->frame_tx < 2)
LOG_M("txdata_frame.m","txdata_frame",&ru->common.txdata[i],fp->samples_per_subframe, 1, 1); {
LOG_M("txdataF_frame.m","txdataF_frame",&ru->common.txdataF_BF[i][0],fp->samples_per_subframe_wCP, 1, 1);
LOG_M("txdata_frame.m","txdata_frame",&ru->common.txdata[i][(proc->subframe_tx*fp->samples_per_subframe)-sf_extension],fp->samples_per_subframe, 1, 1);
}
else if (proc->frame_tx >= 2) oai_exit = 1;
} }
else oai_exit = 1; txs = siglen+sf_extension;
} }
else else
{ {