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
384c44b2
Commit
384c44b2
authored
Aug 25, 2014
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
git-svn-id:
http://svn.eurecom.fr/openair4G/trunk@5752
818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent
e1ca9678
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
7 deletions
+13
-7
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+9
-3
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+4
-4
No files found.
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
384c44b2
...
...
@@ -96,7 +96,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
int
result
;
#endif
DCI_PDU
*
DCI_pdu
[
MAX_NUM_CCs
];
int
CC_id
,
i
;
int
CC_id
,
i
,
next_i
;
UE_list_t
*
UE_list
=&
eNB_mac_inst
[
module_idP
].
UE_list
;
LOG_D
(
MAC
,
"[eNB %d] Frame %d, Subframe %d, entering MAC scheduler
\n
"
,
module_idP
,
frameP
,
subframeP
);
...
...
@@ -197,9 +197,15 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
}
#endif
// refresh UE list based on UEs dropped by PHY in previous subframe
for
(
i
=
UE_list
->
head
;
i
>
0
;
i
=
UE_list
->
next
[
i
])
if
(
mac_xface
->
get_eNB_UE_stats
(
module_idP
,
0
,
UE_RNTI
(
module_idP
,
i
))
==
NULL
)
i
=
UE_list
->
head
;
while
(
i
>=
0
)
{
next_i
=
UE_list
->
next
[
i
];
LOG_D
(
MAC
,
"UE %d : rnti %x, stats %p
\n
"
,
i
,
UE_RNTI
(
module_idP
,
i
),
mac_xface
->
get_eNB_UE_stats
(
module_idP
,
0
,
UE_RNTI
(
module_idP
,
i
)));
if
(
mac_xface
->
get_eNB_UE_stats
(
module_idP
,
0
,
UE_RNTI
(
module_idP
,
i
))
==
NULL
)
{
mac_remove_ue
(
module_idP
,
i
);
}
i
=
next_i
;
}
switch
(
subframeP
)
{
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
384c44b2
...
...
@@ -532,12 +532,12 @@ void schedule_ulsch_rnti(module_id_t module_idP,
UE_is_to_be_scheduled
(
module_idP
,
CC_id
,
UE_id
));
/* [SR] 01/07/13: Don't schedule UE if we cannot get harq pid */
#ifndef EXMIMO_IOT
if
((((
UE_is_to_be_scheduled
(
module_idP
,
CC_id
,
UE_id
)
>
0
))
||
(
round
>
0
)
||
((
frameP
%
10
)
==
0
))
&&
(
ret
==
0
))
//
#ifndef EXMIMO_IOT
//
if ((((UE_is_to_be_scheduled(module_idP,CC_id,UE_id)>0)) || (round>0) || ((frameP%10)==0)) && (ret == 0))
// if there is information on bsr of DCCH, DTCH or if there is UL_SR, or if there is a packet to retransmit, or we want to schedule a periodic feedback every 10 frames
#else
//
#else
if
(
round
==
0
)
#endif
//
#endif
{
LOG_D
(
MAC
,
"[eNB %d][PUSCH %d] Frame %d subframeP %d Scheduling UE %d round %d (SR %d)
\n
"
,
module_idP
,
harq_pid
,
frameP
,
subframeP
,
UE_id
,
round
,
...
...
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