Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG-RAN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
canghaiwuhen
OpenXG-RAN
Commits
fb7f6500
Commit
fb7f6500
authored
Apr 16, 2020
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixing a few bugs
parent
d68775cf
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
12 deletions
+9
-12
executables/nr-ru.c
executables/nr-ru.c
+2
-2
targets/ARCH/COMMON/common_lib.h
targets/ARCH/COMMON/common_lib.h
+1
-5
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
+6
-5
No files found.
executables/nr-ru.c
View file @
fb7f6500
...
...
@@ -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
));
...
...
targets/ARCH/COMMON/common_lib.h
View file @
fb7f6500
...
...
@@ -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)
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
View file @
fb7f6500
...
...
@@ -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"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment