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
Michael Black
OpenXG UE
Commits
1a4c9d74
Commit
1a4c9d74
authored
Aug 06, 2016
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfixing for single-thread and cleanup
parent
6d6546dd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
12 deletions
+19
-12
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+3
-2
targets/RT/USER/lte-enb.c
targets/RT/USER/lte-enb.c
+16
-10
No files found.
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
1a4c9d74
...
...
@@ -1104,7 +1104,8 @@ void phy_procedures_eNB_TX(PHY_VARS_eNB *eNB,
#if defined(SMBV)
// counts number of allocations in subframe
// there is at least one allocation for PDCCH
uint8_t
smbv_alloc_cnt
=
1
;
uint8_t
smbv_alloc_cnt
=
1
;
Exiting
eNB
thread
RXn_TXnp4
#endif
if
((
fp
->
frame_type
==
TDD
)
&&
(
subframe_select
(
fp
,
subframe
)
!=
SF_DL
))
return
;
...
...
@@ -2587,7 +2588,7 @@ void phy_procedures_eNB_common_RX(PHY_VARS_eNB *eNB){
LTE_DL_FRAME_PARMS
*
fp
=
&
eNB
->
frame_parms
;
const
int
subframe
=
proc
->
subframe_rx
;
const
int
frame
=
proc
->
frame_rx
;
int
offset
=
(
proc
==
&
eNB
->
proc
.
proc_rxtx
[
0
])
?
0
:
1
;
int
offset
=
(
eNB
->
single_thread_flag
==
1
)
?
0
:
(
subframe
&
1
)
;
if
((
fp
->
frame_type
==
TDD
)
&&
(
subframe_select
(
fp
,
subframe
)
!=
SF_UL
))
return
;
...
...
targets/RT/USER/lte-enb.c
View file @
1a4c9d74
...
...
@@ -464,7 +464,7 @@ void proc_tx_high0(PHY_VARS_eNB *eNB,
int
offset
=
proc
==
&
eNB
->
proc
.
proc_rxtx
[
0
]
?
0
:
1
;
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_ENB
+
offset
,
proc
->
frame_tx
);
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX0_ENB
+
offset
,
proc
->
subframe_
r
x
);
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX0_ENB
+
offset
,
proc
->
subframe_
t
x
);
phy_procedures_eNB_TX
(
eNB
,
proc
,
r_type
,
rn
);
...
...
@@ -526,7 +526,7 @@ void proc_tx_rru_if4p5(PHY_VARS_eNB *eNB,
int
offset
=
proc
==
&
eNB
->
proc
.
proc_rxtx
[
0
]
?
0
:
1
;
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_ENB
+
offset
,
proc
->
frame_tx
);
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX0_ENB
+
offset
,
proc
->
subframe_
r
x
);
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX0_ENB
+
offset
,
proc
->
subframe_
t
x
);
/// **** recv_IF4 of txdataF from RCC **** ///
symbol_number
=
0
;
...
...
@@ -546,7 +546,7 @@ void proc_tx_rru_if5(PHY_VARS_eNB *eNB,eNB_rxtx_proc_t *proc) {
int
offset
=
proc
==
&
eNB
->
proc
.
proc_rxtx
[
0
]
?
0
:
1
;
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_FRAME_NUMBER_TX0_ENB
+
offset
,
proc
->
frame_tx
);
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX0_ENB
+
offset
,
proc
->
subframe_
r
x
);
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_SUBFRAME_NUMBER_TX0_ENB
+
offset
,
proc
->
subframe_
t
x
);
/// **** recv_IF5 of txdata from BBU **** ///
recv_IF5
(
eNB
,
&
proc
->
timestamp_tx
,
proc
->
subframe_tx
,
IF5_RRH_GW_DL
);
}
...
...
@@ -1317,7 +1317,7 @@ static void* eNB_thread_single( void* param ) {
proc_rxtx
->
subframe_rx
=
proc
->
subframe_rx
;
proc_rxtx
->
frame_rx
=
proc
->
frame_rx
;
proc_rxtx
->
subframe_tx
=
(
proc
->
subframe_rx
+
4
)
%
10
;
proc_rxtx
->
frame_tx
=
(
proc
->
frame_rx
<
6
)
?
proc
->
frame_rx
:
(
proc
->
frame_rx
+
1
);
proc_rxtx
->
frame_tx
=
(
proc
->
sub
frame_rx
<
6
)
?
proc
->
frame_rx
:
(
proc
->
frame_rx
+
1
);
if
(
rxtx
(
eNB
,
proc_rxtx
,
"eNB_thread_single"
)
<
0
)
break
;
}
...
...
@@ -1391,12 +1391,18 @@ void init_eNB_proc(int inst) {
pthread_create
(
&
proc
->
pthread_asynch_rxtx
,
attr_asynch
,
eNB_thread_asynch_rxtx
,
&
eNB
->
proc
);
char
name
[
16
];
snprintf
(
name
,
sizeof
(
name
),
"RXTX0 %d"
,
i
);
pthread_setname_np
(
proc_rxtx
[
0
].
pthread_rxtx
,
name
);
snprintf
(
name
,
sizeof
(
name
),
"RXTX1 %d"
,
i
);
pthread_setname_np
(
proc_rxtx
[
1
].
pthread_rxtx
,
name
);
snprintf
(
name
,
sizeof
(
name
),
"FH %d"
,
i
);
pthread_setname_np
(
proc
->
pthread_FH
,
name
);
if
(
eNB
->
single_thread_flag
==
0
)
{
snprintf
(
name
,
sizeof
(
name
),
"RXTX0 %d"
,
i
);
pthread_setname_np
(
proc_rxtx
[
0
].
pthread_rxtx
,
name
);
snprintf
(
name
,
sizeof
(
name
),
"RXTX1 %d"
,
i
);
pthread_setname_np
(
proc_rxtx
[
1
].
pthread_rxtx
,
name
);
snprintf
(
name
,
sizeof
(
name
),
"FH %d"
,
i
);
pthread_setname_np
(
proc
->
pthread_FH
,
name
);
}
else
{
snprintf
(
name
,
sizeof
(
name
),
" %d"
,
i
);
pthread_setname_np
(
proc
->
pthread_single
,
name
);
}
}
/* setup PHY proc TX sync mechanism */
...
...
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