Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
oai
openairinterface5G
Commits
69bfbd13
Commit
69bfbd13
authored
Aug 25, 2014
by
knopp
Browse files
git-svn-id:
http://svn.eurecom.fr/openair4G/trunk@5752
818b1a75-f10b-46b9-bf7c-635c3b92a50f
parent
048ab767
Changes
2
Hide whitespace changes
Inline
Side-by-side
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
69bfbd13
...
...
@@ -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 @
69bfbd13
...
...
@@ -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
Supports
Markdown
0%
Try again
or
attach a new 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