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
d4f9c55e
Commit
d4f9c55e
authored
Jun 14, 2018
by
Haruki NAOI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: build fails when executing build with option "--mu"
parent
ab2897a0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
4 deletions
+7
-4
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
+5
-1
targets/RT/USER/lte-ru.c
targets/RT/USER/lte-ru.c
+2
-3
No files found.
openair2/LAYER2/MAC/eNB_scheduler_fairRR.c
View file @
d4f9c55e
...
@@ -127,7 +127,11 @@ void pre_scd_nb_rbs_required( module_id_t module_idP,
...
@@ -127,7 +127,11 @@ void pre_scd_nb_rbs_required( module_id_t module_idP,
for
(
lc_id
=
DCCH
;
lc_id
<=
DTCH
;
lc_id
++
)
{
for
(
lc_id
=
DCCH
;
lc_id
<=
DTCH
;
lc_id
++
)
{
rlc_status
=
rlc_status
=
mac_rlc_status_ind
(
module_idP
,
rnti
,
module_idP
,
frameP
,
subframeP
,
mac_rlc_status_ind
(
module_idP
,
rnti
,
module_idP
,
frameP
,
subframeP
,
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
lc_id
,
0
);
ENB_FLAG_YES
,
MBMS_FLAG_NO
,
lc_id
,
0
#ifdef Rel14
,
0
,
0
#endif
);
UE_template
.
dl_buffer_total
+=
rlc_status
.
bytes_in_buffer
;
//storing the total dlsch buffer
UE_template
.
dl_buffer_total
+=
rlc_status
.
bytes_in_buffer
;
//storing the total dlsch buffer
}
}
// end of store dlsch buffer
// end of store dlsch buffer
...
...
targets/RT/USER/lte-ru.c
View file @
d4f9c55e
...
@@ -1948,8 +1948,7 @@ void* pre_scd_thread( void* param ){
...
@@ -1948,8 +1948,7 @@ void* pre_scd_thread( void* param ){
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
rrc_rx_tx
(
&
ctxt
,
0
,
// eNB index, unused in eNB
rrc_rx_tx
(
&
ctxt
,
CC_id
);
CC_id
);
min_rb_unit
[
CC_id
]
=
get_min_rb_unit
(
Mod_id
,
CC_id
);
min_rb_unit
[
CC_id
]
=
get_min_rb_unit
(
Mod_id
,
CC_id
);
}
}
...
@@ -2004,7 +2003,7 @@ static void* eNB_thread_phy_tx( void* param ) {
...
@@ -2004,7 +2003,7 @@ static void* eNB_thread_phy_tx( void* param ) {
if
(
ru
->
num_eNB
==
1
){
if
(
ru
->
num_eNB
==
1
){
proc_rxtx
.
subframe_tx
=
proc
->
subframe_phy_tx
;
proc_rxtx
.
subframe_tx
=
proc
->
subframe_phy_tx
;
proc_rxtx
.
frame_tx
=
proc
->
frame_phy_tx
;
proc_rxtx
.
frame_tx
=
proc
->
frame_phy_tx
;
phy_procedures_eNB_TX
(
eNB_list
[
0
],
&
proc_rxtx
,
no_relay
,
NULL
,
1
);
phy_procedures_eNB_TX
(
eNB_list
[
0
],
&
proc_rxtx
,
1
);
phy_tx_txdataF_end
=
1
;
phy_tx_txdataF_end
=
1
;
if
(
pthread_mutex_lock
(
&
ru
->
proc
.
mutex_rf_tx
)
!=
0
){
if
(
pthread_mutex_lock
(
&
ru
->
proc
.
mutex_rf_tx
)
!=
0
){
LOG_E
(
PHY
,
"[RU] ERROR pthread_mutex_lock for rf tx thread (IC %d)
\n
"
,
ru
->
proc
.
instance_cnt_rf_tx
);
LOG_E
(
PHY
,
"[RU] ERROR pthread_mutex_lock for rf tx thread (IC %d)
\n
"
,
ru
->
proc
.
instance_cnt_rf_tx
);
...
...
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