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
cdb3f2af
Commit
cdb3f2af
authored
Oct 11, 2018
by
magounak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
deleting logs
parent
262f2217
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
13 deletions
+12
-13
common/utils/T/T_defs.h
common/utils/T/T_defs.h
+1
-1
openair1/PHY/LTE_TRANSPORT/if4_tools.c
openair1/PHY/LTE_TRANSPORT/if4_tools.c
+1
-1
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ru.c
+10
-11
No files found.
common/utils/T/T_defs.h
View file @
cdb3f2af
...
...
@@ -44,7 +44,7 @@ typedef struct {
#define VCD_NUM_FUNCTIONS (218)
/* number of VCD variables (to be kept up to date! see in T_messages.txt) */
#define VCD_NUM_VARIABLES (13
2
)
/*(128)*/
#define VCD_NUM_VARIABLES (13
6
)
/*(128)*/
/* first VCD function (to be kept up to date! see in T_messages.txt) */
#define VCD_FIRST_FUNCTION ((uintptr_t)T_VCD_FUNCTION_RT_SLEEP)
...
...
openair1/PHY/LTE_TRANSPORT/if4_tools.c
View file @
cdb3f2af
...
...
@@ -215,7 +215,7 @@ void send_IF4p5(RU_t *ru, int frame, int subframe, uint16_t packet_type) {
}
else
if
(
packet_type
>=
IF4p5_PRACH
&&
packet_type
<=
IF4p5_PRACH
+
4
)
{
// FIX: hard coded prach samples length
if
(
frame
<
10
)
LOG_
I
(
PHY
,
"IF4p5_PRACH: frame %d, subframe %d,packet type %x
\n
"
,
frame
,
subframe
,
packet_type
);
if
(
frame
<
10
)
LOG_
D
(
PHY
,
"IF4p5_PRACH: frame %d, subframe %d,packet type %x
\n
"
,
frame
,
subframe
,
packet_type
);
db_fulllength
=
PRACH_NUM_SAMPLES
;
if
(
eth
->
flags
==
ETH_RAW_IF4p5_MODE
)
{
...
...
targets/RT/USER/lte-ru.c
View file @
cdb3f2af
...
...
@@ -154,8 +154,7 @@ static inline void fh_if5_south_out(RU_t *ru) {
// southbound IF4p5 fronthaul
static
inline
void
fh_if4p5_south_out
(
RU_t
*
ru
)
{
if
(
ru
==
RC
.
ru
[
0
])
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_TRX_TST
,
ru
->
proc
.
timestamp_tx
&
0xffffffff
);
<<<<<<<
HEAD
LOG_I
(
PHY
,
"Sending IF4p5 for frame %d subframe %d
\n
"
,
ru
->
proc
.
frame_tx
,
ru
->
proc
.
subframe_tx
);
LOG_D
(
PHY
,
"Sending IF4p5 for frame %d subframe %d
\n
"
,
ru
->
proc
.
frame_tx
,
ru
->
proc
.
subframe_tx
);
if
(
subframe_select
(
&
ru
->
frame_parms
,
ru
->
proc
.
subframe_tx
)
!=
SF_UL
)
{
send_IF4p5
(
ru
,
ru
->
proc
.
frame_tx
,
ru
->
proc
.
subframe_tx
,
IF4p5_PDLFFT
);
ru
->
south_out_cnt
++
;
...
...
@@ -219,7 +218,7 @@ void fh_if4p5_south_in(RU_t *ru,int *frame,int *subframe) {
symbol_mask_full
=
(
1
<<
fp
->
ul_symbols_in_S_subframe
)
-
1
;
else
symbol_mask_full
=
(
1
<<
fp
->
symbols_per_tti
)
-
1
;
LOG_
I
(
PHY
,
"fh_if4p5_south_in: RU %d, frame %d, subframe %d
\n
"
,
ru
->
idx
,
*
frame
,
*
subframe
);
LOG_
D
(
PHY
,
"fh_if4p5_south_in: RU %d, frame %d, subframe %d
\n
"
,
ru
->
idx
,
*
frame
,
*
subframe
);
AssertFatal
(
proc
->
symbol_mask
[
*
subframe
]
==
0
,
"rx_fh_if4p5: proc->symbol_mask[%d] = %x
\n
"
,
*
subframe
,
proc
->
symbol_mask
[
*
subframe
]);
do
{
recv_IF4p5
(
ru
,
&
f
,
&
sf
,
&
packet_type
,
&
symbol_number
);
...
...
@@ -362,7 +361,7 @@ void fh_if4p5_north_in(RU_t *ru,int *frame,int *subframe) {
symbol_number
=
0
;
symbol_mask
=
0
;
symbol_mask_full
=
(
1
<<
ru
->
frame_parms
.
symbols_per_tti
)
-
1
;
LOG_
I
(
PHY
,
"fh_if4p5_north_in: frame %d, subframe %d
\n
"
,
*
frame
,
*
subframe
);
LOG_
D
(
PHY
,
"fh_if4p5_north_in: frame %d, subframe %d
\n
"
,
*
frame
,
*
subframe
);
do
{
recv_IF4p5
(
ru
,
frame
,
subframe
,
&
packet_type
,
&
symbol_number
);
...
...
@@ -418,7 +417,7 @@ void fh_if4p5_north_asynch_in(RU_t *ru,int *frame,int *subframe) {
symbol_number
=
0
;
symbol_mask
=
0
;
symbol_mask_full
=
((
subframe_select
(
fp
,
*
subframe
)
==
SF_S
)
?
(
1
<<
fp
->
dl_symbols_in_S_subframe
)
:
(
1
<<
fp
->
symbols_per_tti
))
-
1
;
LOG_
I
(
PHY
,
"fh_if4p5_north_asynch_in: RU %d, frame %d, subframe %d
\n
"
,
ru
->
idx
,
*
frame
,
*
subframe
);
LOG_
D
(
PHY
,
"fh_if4p5_north_asynch_in: RU %d, frame %d, subframe %d
\n
"
,
ru
->
idx
,
*
frame
,
*
subframe
);
do
{
recv_IF4p5
(
ru
,
&
frame_tx
,
&
subframe_tx
,
&
packet_type
,
&
symbol_number
);
if
(
ru
->
cmd
==
STOP_RU
){
...
...
@@ -710,7 +709,7 @@ void tx_rf(RU_t *ru) {
lte_subframe_t
nextSF_type
=
subframe_select
(
fp
,(
proc
->
subframe_tx
+
1
)
%
10
);
int
sf_extension
=
0
;
LOG_
I
(
PHY
,
"south_out/tx_rf: frame %d, subframe %d
\n
"
,
proc
->
frame_tx
,
proc
->
subframe_tx
);
LOG_
D
(
PHY
,
"south_out/tx_rf: frame %d, subframe %d
\n
"
,
proc
->
frame_tx
,
proc
->
subframe_tx
);
if
((
SF_type
==
SF_DL
)
||
(
SF_type
==
SF_S
))
{
...
...
@@ -796,7 +795,7 @@ void tx_rf(RU_t *ru) {
ru
->
nb_tx
,
flags
);
LOG_
I
(
PHY
,
"[TXPATH] RU %d tx_rf, writing to TS %llu, frame %d, unwrapped_frame %d, subframe %d
\n
"
,
ru
->
idx
,
LOG_
D
(
PHY
,
"[TXPATH] RU %d tx_rf, writing to TS %llu, frame %d, unwrapped_frame %d, subframe %d
\n
"
,
ru
->
idx
,
(
long
long
unsigned
int
)
proc
->
timestamp_tx
,
proc
->
frame_tx
,
proc
->
frame_tx_unwrap
,
proc
->
subframe_tx
);
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_TRX_WRITE
,
0
);
...
...
@@ -1496,12 +1495,12 @@ static void* ru_thread_tx( void* param ) {
if
(
oai_exit
)
break
;
LOG_
I
(
PHY
,
"ru_thread_tx (ru %d): Waiting for TX processing
\n
"
,
ru
->
idx
);
LOG_
D
(
PHY
,
"ru_thread_tx (ru %d): Waiting for TX processing
\n
"
,
ru
->
idx
);
// wait until eNBs are finished subframe RX n and TX n+4
//printf("ru_thread_tx, ru_proc->cond_eNBs, ru_proc->instance_cnt_eNBs\n");
wait_on_condition
(
&
proc
->
mutex_eNBs
,
&
proc
->
cond_eNBs
,
&
proc
->
instance_cnt_eNBs
,
"ru_thread_tx"
);
//printf("Passed ru_thread_tx ru_proc->cond_eNBs\n");
LOG_
I
(
PHY
,
"ru_thread_tx (ru %d): Woken from condition
\n
"
,
ru
->
idx
);
LOG_
D
(
PHY
,
"ru_thread_tx (ru %d): Woken from condition
\n
"
,
ru
->
idx
);
if
(
oai_exit
)
break
;
// do TX front-end processing if needed (precoding and/or IDFTs)
...
...
@@ -1721,7 +1720,7 @@ static void* ru_thread( void* param ) {
ru
->
wait_cnt
--
;
LOG_
I
(
PHY
,
"RU thread %d, frame %d, subframe %d, wait_cnt %d
\n
"
,
ru
->
idx
,
frame
,
subframe
,
ru
->
wait_cnt
);
LOG_
D
(
PHY
,
"RU thread %d, frame %d, subframe %d, wait_cnt %d
\n
"
,
ru
->
idx
,
frame
,
subframe
,
ru
->
wait_cnt
);
if
(
ru
->
if_south
!=
LOCAL_RF
&&
ru
->
wait_cnt
<=
20
&&
subframe
==
5
&&
frame
!=
RC
.
ru
[
0
]
->
proc
.
frame_rx
&&
resynch_done
==
0
)
{
// Send RRU_frame adjust
...
...
@@ -1739,7 +1738,7 @@ static void* ru_thread( void* param ) {
}
else
{
LOG_
I
(
PHY
,
"RU thread %d, frame %d, subframe %d
\n
"
,
LOG_
D
(
PHY
,
"RU thread %d, frame %d, subframe %d
\n
"
,
ru
->
idx
,
frame
,
subframe
);
if
((
ru
->
do_prach
>
0
)
&&
(
is_prach_subframe
(
fp
,
proc
->
frame_rx
,
proc
->
subframe_rx
)
==
1
))
{
...
...
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