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
lizhongxiao
OpenXG-RAN
Commits
2466f16e
Commit
2466f16e
authored
Oct 23, 2017
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adding flag for phy-test
parent
5487c709
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
23 deletions
+26
-23
openair2/LAYER2/MAC/defs.h
openair2/LAYER2/MAC/defs.h
+2
-0
openair2/LAYER2/MAC/eNB_scheduler.c
openair2/LAYER2/MAC/eNB_scheduler.c
+24
-23
No files found.
openair2/LAYER2/MAC/defs.h
View file @
2466f16e
...
@@ -1051,6 +1051,8 @@ typedef struct eNB_MAC_INST_s {
...
@@ -1051,6 +1051,8 @@ typedef struct eNB_MAC_INST_s {
COMMON_channels_t
common_channels
[
MAX_NUM_CCs
];
COMMON_channels_t
common_channels
[
MAX_NUM_CCs
];
/// current PDU index (BCH,MCH,DLSCH)
/// current PDU index (BCH,MCH,DLSCH)
uint16_t
pdu_index
[
MAX_NUM_CCs
];
uint16_t
pdu_index
[
MAX_NUM_CCs
];
/// flag to enable phy-test (disables the scheduler)
uint16_t
phy_test
;
/// NFAPI Config Request Structure
/// NFAPI Config Request Structure
nfapi_config_request_t
config
[
MAX_NUM_CCs
];
nfapi_config_request_t
config
[
MAX_NUM_CCs
];
...
...
openair2/LAYER2/MAC/eNB_scheduler.c
View file @
2466f16e
...
@@ -517,9 +517,9 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP, sub_frame
...
@@ -517,9 +517,9 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP, sub_frame
#endif
#endif
if
(
RC
.
mac
[
module_idP
]
->
phy_test
==
0
)
{
// This schedules MIB
// This schedules MIB
if
((
subframeP
==
0
)
&&
(
frameP
&
3
)
==
0
)
schedule_mib
(
module_idP
,
frameP
,
subframeP
);
if
((
subframeP
==
0
)
&&
(
frameP
&
3
)
==
0
)
schedule_mib
(
module_idP
,
frameP
,
subframeP
);
/*
// This schedules SI for legacy LTE and eMTC starting in subframeP
// This schedules SI for legacy LTE and eMTC starting in subframeP
schedule_SI
(
module_idP
,
frameP
,
subframeP
);
schedule_SI
(
module_idP
,
frameP
,
subframeP
);
// This schedules Random-Access for legacy LTE and eMTC starting in subframeP
// This schedules Random-Access for legacy LTE and eMTC starting in subframeP
...
@@ -534,12 +534,13 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP, sub_frame
...
@@ -534,12 +534,13 @@ void eNB_dlsch_ulsch_scheduler(module_id_t module_idP, frame_t frameP, sub_frame
schedule_SR
(
module_idP
,
frameP
,
subframeP
);
schedule_SR
(
module_idP
,
frameP
,
subframeP
);
// This schedules UCI_CSI in subframeP
// This schedules UCI_CSI in subframeP
schedule_CSI
(
module_idP
,
frameP
,
subframeP
);
schedule_CSI
(
module_idP
,
frameP
,
subframeP
);
*/
// This schedules DLSCH in subframeP
// This schedules DLSCH in subframeP
//schedule_ue_spec(module_idP,frameP,subframeP,mbsfn_status);
schedule_ue_spec
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
}
else
{
schedule_ue_spec_phy_test
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
schedule_ue_spec_phy_test
(
module_idP
,
frameP
,
subframeP
,
mbsfn_status
);
}
// Allocate CCEs for good after scheduling is done
// Allocate CCEs for good after scheduling is done
...
...
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