Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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 UE
Commits
eb471dcb
Commit
eb471dcb
authored
Nov 21, 2020
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testing of RCC
parent
e7a9f093
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
openair1/SCHED/prach_procedures.c
openair1/SCHED/prach_procedures.c
+1
-1
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+2
-3
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ru.c
+8
-7
No files found.
openair1/SCHED/prach_procedures.c
View file @
eb471dcb
...
...
@@ -148,7 +148,7 @@ void prach_procedures(PHY_VARS_eNB *eNB,
}
else
{
if
((
eNB
->
prach_energy_counter
==
100
)
&&
(
max_preamble_energy
[
0
]
>
eNB
->
measurements
.
prach_I0
+
eNB
->
prach_DTX_threshold
))
{
LOG_
I
(
PHY
,
"[eNB %d/%d][RAPROC] Frame %d, subframe %d Initiating RA procedure with preamble %d, energy %d.%d dB, delay %d
\n
"
,
LOG_
D
(
PHY
,
"[eNB %d/%d][RAPROC] Frame %d, subframe %d Initiating RA procedure with preamble %d, energy %d.%d dB, delay %d
\n
"
,
eNB
->
Mod_id
,
eNB
->
CC_id
,
frame
,
...
...
targets/RT/USER/lte-enb.c
View file @
eb471dcb
...
...
@@ -461,10 +461,9 @@ void eNB_top(PHY_VARS_eNB *eNB,
L1_proc
->
subframe_rx
=
ru_proc
->
tti_rx
;
L1_proc
->
frame_tx
=
(
L1_proc
->
subframe_rx
>
(
9
-
sf_ahead
))
?
(
L1_proc
->
frame_rx
+
1
)
&
1023
:
L1_proc
->
frame_rx
;
L1_proc
->
subframe_tx
=
(
L1_proc
->
subframe_rx
+
sf_ahead
)
%
10
;
if
(
rxtx
(
eNB
,
L1_proc
,
string
)
<
0
)
LOG_E
(
PHY
,
"eNB %d CC_id %d failed during execution
\n
"
,
eNB
->
Mod_id
,
eNB
->
CC_id
);
LOG_E
(
PHY
,
"eNB %d CC_id %d failed during execution
\n
"
,
eNB
->
Mod_id
,
eNB
->
CC_id
);
ru_proc
->
timestamp_tx
=
L1_proc
->
timestamp_tx
;
ru_proc
->
tti_tx
=
L1_proc
->
subframe_tx
;
ru_proc
->
frame_tx
=
L1_proc
->
frame_tx
;
...
...
targets/RT/USER/lte-ru.c
View file @
eb471dcb
...
...
@@ -1138,9 +1138,10 @@ void wakeup_L1s(RU_t *ru) {
L1_proc_t
*
proc
=
&
eNB
->
proc
;
struct
timespec
t
;
LOG_D
(
PHY
,
"wakeup_L1s (num %d) for RU %d (%d.%d) ru->eNB_top:%p
\n
"
,
ru
->
num_eNB
,
ru
->
idx
,
ru
->
proc
.
frame_rx
,
ru
->
proc
.
tti_rx
,
ru
->
eNB_top
);
// call eNB function directly
char
string
[
20
];
LOG_I
(
PHY
,
string
,
"Incoming RU %d"
,
ru
->
idx
);
sprintf
(
string
,
"Incoming RU %d"
,
ru
->
idx
);
// call eNB function directly
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_WAKEUP_L1S_RU
+
ru
->
idx
,
ru
->
proc
.
frame_rx
);
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_WAKEUP_L1S_RU
+
ru
->
idx
,
ru
->
proc
.
tti_rx
);
AssertFatal
(
0
==
pthread_mutex_lock
(
&
proc
->
mutex_RU
),
""
);
...
...
@@ -1541,12 +1542,12 @@ static void *ru_thread_tx( void *param ) {
}
else
{
for
(
int
i
=
0
;
i
<
ru
->
nb_tx
;
i
++
)
{
if
(
proc
->
frame_tx
==
2
)
{
LOG_I
(
PHY
,
filename
,
"txdataF%d_frame%d_sf%d.m"
,
i
,
proc
->
frame_tx
,
proc
->
tti_tx
);
sprintf
(
filename
,
"txdataF%d_frame%d_sf%d.m"
,
i
,
proc
->
frame_tx
,
proc
->
tti_tx
);
LOG_M
(
filename
,
"txdataF_frame"
,
ru
->
common
.
txdataF_BF
[
i
],
fp
->
symbols_per_tti
*
fp
->
ofdm_symbol_size
,
1
,
1
);
}
if
(
proc
->
frame_tx
==
2
&&
proc
->
tti_tx
==
0
)
{
LOG_I
(
PHY
,
filename
,
"txdata%d_frame%d.m"
,
i
,
proc
->
frame_tx
);
sprintf
(
filename
,
"txdata%d_frame%d.m"
,
i
,
proc
->
frame_tx
);
LOG_M
(
filename
,
"txdata_frame"
,
ru
->
common
.
txdata
[
i
],
fp
->
samples_per_tti
*
10
,
1
,
1
);
}
}
...
...
@@ -1728,7 +1729,6 @@ static void *ru_thread( void *param ) {
// synchronization on input FH interface, acquire signals/data and block
if
(
ru
->
fh_south_in
)
ru
->
fh_south_in
(
ru
,
&
frame
,
&
subframe
);
else
AssertFatal
(
1
==
0
,
"No fronthaul interface at south port"
);
#ifdef PHY_TX_THREAD
if
(
first_phy_tx
==
0
)
{
...
...
@@ -1863,12 +1863,12 @@ static void *ru_thread( void *param ) {
}
else
{
for
(
int
i
=
0
;
i
<
ru
->
nb_tx
;
i
++
)
{
if
(
proc
->
frame_tx
==
2
)
{
LOG_I
(
PHY
,
filename
,
"txdataF%d_frame%d_sf%d.m"
,
i
,
proc
->
frame_tx
,
proc
->
tti_tx
);
sprintf
(
filename
,
"txdataF%d_frame%d_sf%d.m"
,
i
,
proc
->
frame_tx
,
proc
->
tti_tx
);
LOG_M
(
filename
,
"txdataF_frame"
,
ru
->
common
.
txdataF_BF
[
i
],
ru
->
frame_parms
->
symbols_per_tti
*
ru
->
frame_parms
->
ofdm_symbol_size
,
1
,
1
);
}
if
(
proc
->
frame_tx
==
2
&&
proc
->
tti_tx
==
0
)
{
LOG_I
(
PHY
,
filename
,
"txdata%d_frame%d.m"
,
i
,
proc
->
frame_tx
);
sprintf
(
filename
,
"txdata%d_frame%d.m"
,
i
,
proc
->
frame_tx
);
LOG_M
(
filename
,
"txdata_frame"
,
ru
->
common
.
txdata
[
i
],
ru
->
frame_parms
->
samples_per_tti
*
10
,
1
,
1
);
}
}
...
...
@@ -3032,6 +3032,7 @@ else {
RC
.
ru
[
j
]
->
if_south
=
REMOTE_IF4p5
;
RC
.
ru
[
j
]
->
function
=
NGFI_RAU_IF4p5
;
RC
.
ru
[
j
]
->
eth_params
.
transp_preference
=
ETH_UDP_IF4p5_MODE
;
RC
.
ru
[
j
]
->
has_ctrl_prt
=
1
;
}
else
if
(
strcmp
(
*
(
RUParamList
.
paramarray
[
j
][
RU_TRANSPORT_PREFERENCE_IDX
].
strptr
),
"raw_if4p5"
)
==
0
)
{
RC
.
ru
[
j
]
->
if_south
=
REMOTE_IF4p5
;
RC
.
ru
[
j
]
->
function
=
NGFI_RAU_IF4p5
;
...
...
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