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
wangwenhui
OpenXG-RAN
Commits
5864cc08
Commit
5864cc08
authored
8 years ago
by
Xenofon Foukas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Integrated scheduler to overall FlexRAN agent functionality
parent
92ef1739
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
28 deletions
+28
-28
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+28
-28
No files found.
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
5864cc08
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
#define ENABLE_MAC_PAYLOAD_DEBUG
#define ENABLE_MAC_PAYLOAD_DEBUG
#define DEBUG_eNB_SCHEDULER 1
#define DEBUG_eNB_SCHEDULER 1
#d
efine ENABLE_ENB_AGENT_DL_SCHEDULER
//
efine ENABLE_ENB_AGENT_DL_SCHEDULER
//#define DISABLE_SF_TRIGGER
//#define DISABLE_SF_TRIGGER
//#define DISABLE_CONT_STATS
//#define DISABLE_CONT_STATS
...
@@ -387,7 +387,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -387,7 +387,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
(
mac_xface
->
frame_parms
->
tdd_config
==
6
))
{
(
mac_xface
->
frame_parms
->
tdd_config
==
6
))
{
//schedule_ulsch(module_idP,frameP,cooperation_flag,subframeP,4);//,calibration_flag);
//schedule_ulsch(module_idP,frameP,cooperation_flag,subframeP,4);//,calibration_flag);
}
}
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -418,14 +418,14 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -418,14 +418,14 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
case
0
:
case
0
:
case
1
:
case
1
:
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
7
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
7
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#endif
#endif
break
;
break
;
case
6
:
case
6
:
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
8
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
8
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#endif
#endif
break
;
break
;
...
@@ -435,7 +435,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -435,7 +435,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
}
}
}
else
{
//FDD
}
else
{
//FDD
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
1
,
5
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
1
,
5
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -465,7 +465,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -465,7 +465,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
// FDD, normal UL/DLSCH
// FDD, normal UL/DLSCH
if
(
mac_xface
->
frame_parms
->
frame_type
==
FDD
)
{
//FDD
if
(
mac_xface
->
frame_parms
->
frame_type
==
FDD
)
{
//FDD
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
2
,
6
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
2
,
6
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -501,7 +501,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -501,7 +501,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
// no break here!
// no break here!
case
5
:
case
5
:
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -529,7 +529,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -529,7 +529,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
}
else
{
//FDD
}
else
{
//FDD
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
3
,
7
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
3
,
7
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -572,7 +572,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -572,7 +572,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
// no break here!
// no break here!
case
5
:
case
5
:
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -601,7 +601,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -601,7 +601,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
if
(
mac_xface
->
frame_parms
->
frame_type
==
FDD
)
{
//FDD
if
(
mac_xface
->
frame_parms
->
frame_type
==
FDD
)
{
//FDD
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
4
,
8
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
4
,
8
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -637,7 +637,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -637,7 +637,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
if
(
mac_xface
->
frame_parms
->
frame_type
==
FDD
)
{
if
(
mac_xface
->
frame_parms
->
frame_type
==
FDD
)
{
schedule_RA
(
module_idP
,
frameP
,
subframeP
,
1
);
schedule_RA
(
module_idP
,
frameP
,
subframeP
,
1
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
5
,
9
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
5
,
9
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -660,11 +660,11 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -660,11 +660,11 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
}
else
if
((
mac_xface
->
frame_parms
->
tdd_config
==
0
)
||
// TDD Config 0
}
else
if
((
mac_xface
->
frame_parms
->
tdd_config
==
0
)
||
// TDD Config 0
(
mac_xface
->
frame_parms
->
tdd_config
==
6
))
{
// TDD Config 6
(
mac_xface
->
frame_parms
->
tdd_config
==
6
))
{
// TDD Config 6
//schedule_ulsch(module_idP,cooperation_flag,subframeP);
//schedule_ulsch(module_idP,cooperation_flag,subframeP);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#endif
#endif
}
else
{
}
else
{
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -701,7 +701,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -701,7 +701,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
case
1
:
case
1
:
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
2
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
2
);
// schedule_ue_spec(module_idP,frameP,subframeP,mbsfn_status);
// schedule_ue_spec(module_idP,frameP,subframeP,mbsfn_status);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#endif
#endif
break
;
break
;
...
@@ -709,14 +709,14 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -709,14 +709,14 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
case
6
:
case
6
:
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
3
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
3
);
// schedule_ue_spec(module_idP,frameP,subframeP,mbsfn_status);
// schedule_ue_spec(module_idP,frameP,subframeP,mbsfn_status);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#endif
#endif
break
;
break
;
case
5
:
case
5
:
schedule_RA
(
module_idP
,
frameP
,
subframeP
,
2
);
schedule_RA
(
module_idP
,
frameP
,
subframeP
,
2
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -740,7 +740,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -740,7 +740,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
case
3
:
case
3
:
case
4
:
case
4
:
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -767,7 +767,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -767,7 +767,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
}
}
}
else
{
//FDD
}
else
{
//FDD
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
6
,
0
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
6
,
0
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -800,7 +800,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -800,7 +800,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
case
3
:
case
3
:
case
4
:
case
4
:
schedule_RA
(
module_idP
,
frameP
,
subframeP
,
3
);
// 3 = Msg3 subframeP, not
schedule_RA
(
module_idP
,
frameP
,
subframeP
,
3
);
// 3 = Msg3 subframeP, not
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -823,7 +823,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -823,7 +823,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
break
;
break
;
case
5
:
case
5
:
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -850,7 +850,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -850,7 +850,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
}
}
}
else
{
//FDD
}
else
{
//FDD
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
7
,
1
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
7
,
1
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -888,7 +888,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -888,7 +888,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
// schedule_RA(module_idP,subframeP);
// schedule_RA(module_idP,subframeP);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
2
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
2
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -915,7 +915,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -915,7 +915,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
}
}
}
else
{
//FDD
}
else
{
//FDD
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
8
,
2
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
8
,
2
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -947,7 +947,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -947,7 +947,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
case
1
:
case
1
:
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
3
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
3
);
schedule_RA
(
module_idP
,
frameP
,
subframeP
,
7
);
// 7 = Msg3 subframeP, not
schedule_RA
(
module_idP
,
frameP
,
subframeP
,
7
);
// 7 = Msg3 subframeP, not
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -972,7 +972,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -972,7 +972,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
case
3
:
case
3
:
case
4
:
case
4
:
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
3
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
3
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -997,7 +997,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -997,7 +997,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
case
6
:
case
6
:
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
4
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
subframeP
,
4
);
//schedule_RA(module_idP,frameP,subframeP);
//schedule_RA(module_idP,frameP,subframeP);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -1022,7 +1022,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -1022,7 +1022,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
case
2
:
case
2
:
case
5
:
case
5
:
//schedule_RA(module_idP,frameP,subframeP);
//schedule_RA(module_idP,frameP,subframeP);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
@@ -1049,7 +1049,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
...
@@ -1049,7 +1049,7 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP,uint8_t cooperation_flag,
}
}
}
else
{
//FDD
}
else
{
//FDD
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
9
,
3
);
schedule_ulsch
(
module_idP
,
frameP
,
cooperation_flag
,
9
,
3
);
#ifndef
ENABLE_ENB_AGENT_DL_SCHEDULER
#ifndef
FLEXRAN_AGENT_SB_IF
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
fill_DLSCH_dci
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
#else
#else
...
...
This diff is collapsed.
Click to expand it.
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