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
lizhongxiao
OpenXG-RAN
Commits
5a5170ea
Commit
5a5170ea
authored
Oct 13, 2023
by
wf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
del comments
parent
a96d23ef
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
12 deletions
+2
-12
executables/nr-ru.c
executables/nr-ru.c
+2
-11
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
+0
-1
No files found.
executables/nr-ru.c
View file @
5a5170ea
...
...
@@ -659,9 +659,7 @@ void rx_rf(RU_t *ru,int *frame,int *slot) {
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_READ
,
0
);
proc
->
timestamp_rx
=
ts
-
ru
->
ts_offset
;
if
(((
*
frame
&
1
)
==
0
)
&&
(
*
slot
==
0
))
LOG_D
(
PHY
,
"rx rf: frame %d %d, stamprx %lu
\n
"
,
*
frame
,
*
slot
,
proc
->
timestamp_rx
);
//AssertFatal(rxs == fp->samples_per_subframe,
//AssertFatal(rxs == fp->samples_per_subframe,
//"rx_rf: Asked for %d samples, got %d from USRP\n",fp->samples_per_subframe,rxs);
if
(
rxs
!=
samples_per_slot
)
LOG_E
(
PHY
,
"rx_rf: Asked for %d samples, got %d from USRP
\n
"
,
samples_per_slot
,
rxs
);
...
...
@@ -669,7 +667,7 @@ void rx_rf(RU_t *ru,int *frame,int *slot) {
samples_per_slot_prev
=
fp
->
get_samples_per_slot
((
*
slot
-
1
)
%
fp
->
slots_per_frame
,
fp
);
if
(
proc
->
timestamp_rx
-
old_ts
!=
samples_per_slot_prev
)
{
LOG_
W
(
PHY
,
"rx_rf: rfdevice timing drift of %"
PRId64
" samples (ts_off %"
PRId64
")
\n
"
,
proc
->
timestamp_rx
-
old_ts
-
samples_per_slot_prev
,
ru
->
ts_offset
);
LOG_
D
(
PHY
,
"rx_rf: rfdevice timing drift of %"
PRId64
" samples (ts_off %"
PRId64
")
\n
"
,
proc
->
timestamp_rx
-
old_ts
-
samples_per_slot_prev
,
ru
->
ts_offset
);
ru
->
ts_offset
+=
(
proc
->
timestamp_rx
-
old_ts
-
samples_per_slot_prev
);
proc
->
timestamp_rx
=
ts
-
ru
->
ts_offset
;
}
...
...
@@ -820,13 +818,6 @@ void tx_rf(RU_t *ru,int frame,int slot, uint64_t timestamp) {
siglen
+
sf_extension
,
ru
->
nb_tx
,
flags
);
int
ene
=
signal_energy
(
txp
[
0
],
siglen
+
sf_extension
);
if
((
ene
>
1000
)
&&
(
slot
!=
0
))
{
short
*
p
=
(
short
*
)
txp
[
0
];
LOG_D
(
PHY
,
"[TXPATH] RU %d aa %d tx_rf, writing to TS %llu, %d.%d, unwrapped_frame %d, slot %d, flags %d, siglen+sf_extension %d, returned %d, E %f, %d,%d
\n
"
,
ru
->
idx
,
i
,
(
long
long
unsigned
int
)(
timestamp
+
ru
->
ts_offset
-
ru
->
openair0_cfg
.
tx_sample_advance
-
sf_extension
),
frame
,
slot
,
proc
->
frame_tx_unwrap
,
slot
,
flags
,
siglen
+
sf_extension
,
txs
,
10
*
log10
((
double
)
ene
),
p
[
0
],
p
[
1
]);
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE
,
0
);
//AssertFatal(txs == 0,"trx write function error %d\n", txs);
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler.c
View file @
5a5170ea
...
...
@@ -242,7 +242,6 @@ void gNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frame, sub_frame_
// This schedules the DCI for Downlink and PDSCH
start_meas
(
&
gNB
->
schedule_dlsch
);
if
(
slot
==
10
)
nr_schedule_ue_spec
(
module_idP
,
frame
,
slot
,
&
sched_info
->
DL_req
,
&
sched_info
->
TX_req
);
stop_meas
(
&
gNB
->
schedule_dlsch
);
...
...
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