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
wangjie
OpenXG-RAN
Commits
fc569650
Commit
fc569650
authored
Mar 07, 2016
by
Xenofon Foukas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed problem with sfn_sf recoding in remote scheduler
parent
26bdf501
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
openair2/LAYER2/MAC/eNB_agent_scheduler_dlsch_ue_remote.c
openair2/LAYER2/MAC/eNB_agent_scheduler_dlsch_ue_remote.c
+4
-4
openair2/LAYER2/MAC/eNB_agent_scheduler_dlsch_ue_remote.h
openair2/LAYER2/MAC/eNB_agent_scheduler_dlsch_ue_remote.h
+1
-1
No files found.
openair2/LAYER2/MAC/eNB_agent_scheduler_dlsch_ue_remote.c
View file @
fc569650
...
@@ -54,7 +54,7 @@ void schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subframe,
...
@@ -54,7 +54,7 @@ void schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subframe,
dl_mac_config_element_t
*
dl_config_elem
;
dl_mac_config_element_t
*
dl_config_elem
;
int
diff
;
int
diff
;
LOG_D
(
MAC
,
"Current frame and subframe %d, %d
\n
"
,
frame
,
subframe
);
LOG_D
(
MAC
,
"
[TEST]
Current frame and subframe %d, %d
\n
"
,
frame
,
subframe
);
// First we check to see if we have a scheduling decision for this sfn_sf already in our queue
// First we check to see if we have a scheduling decision for this sfn_sf already in our queue
while
(
queue_head
.
tqh_first
!=
NULL
)
{
while
(
queue_head
.
tqh_first
!=
NULL
)
{
dl_config_elem
=
queue_head
.
tqh_first
;
dl_config_elem
=
queue_head
.
tqh_first
;
...
@@ -107,12 +107,12 @@ void schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subframe,
...
@@ -107,12 +107,12 @@ void schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subframe,
enb_agent_mac_create_empty_dl_config
(
mod_id
,
dl_info
);
enb_agent_mac_create_empty_dl_config
(
mod_id
,
dl_info
);
}
}
int
get_sf_difference
(
mid_t
mod_id
,
uint
16
_t
sfn_sf
)
{
int
get_sf_difference
(
mid_t
mod_id
,
uint
32
_t
sfn_sf
)
{
int
diff_in_subframes
;
int
diff_in_subframes
;
uint16_t
current_frame
=
get_current_system_frame_num
(
mod_id
);
uint16_t
current_frame
=
get_current_system_frame_num
(
mod_id
);
uint16_t
current_subframe
=
get_current_subframe
(
mod_id
);
uint16_t
current_subframe
=
get_current_subframe
(
mod_id
);
uint
16
_t
current_sfn_sf
=
get_sfn_sf
(
mod_id
);
uint
32
_t
current_sfn_sf
=
get_sfn_sf
(
mod_id
);
if
(
sfn_sf
==
current_sfn_sf
)
{
if
(
sfn_sf
==
current_sfn_sf
)
{
return
0
;
return
0
;
...
@@ -124,7 +124,7 @@ int get_sf_difference(mid_t mod_id, uint16_t sfn_sf) {
...
@@ -124,7 +124,7 @@ int get_sf_difference(mid_t mod_id, uint16_t sfn_sf) {
uint16_t
sf_mask
=
((
1
<<
4
)
-
1
);
uint16_t
sf_mask
=
((
1
<<
4
)
-
1
);
uint16_t
subframe
=
(
sfn_sf
&
sf_mask
);
uint16_t
subframe
=
(
sfn_sf
&
sf_mask
);
LOG_D
(
MAC
,
"Target frame and subframe %d, %d
\n
"
,
frame
,
subframe
);
LOG_D
(
MAC
,
"
[TEST]
Target frame and subframe %d, %d
\n
"
,
frame
,
subframe
);
if
(
frame
==
current_frame
)
{
if
(
frame
==
current_frame
)
{
return
subframe
-
current_subframe
;
return
subframe
-
current_subframe
;
...
...
openair2/LAYER2/MAC/eNB_agent_scheduler_dlsch_ue_remote.h
View file @
fc569650
...
@@ -72,6 +72,6 @@ void schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subframe,
...
@@ -72,6 +72,6 @@ void schedule_ue_spec_remote(mid_t mod_id, uint32_t frame, uint32_t subframe,
// 0 for equal
// 0 for equal
// positive for future value
// positive for future value
// Based on
// Based on
int
get_sf_difference
(
mid_t
mod_id
,
uint
16
_t
sfn_sf
);
int
get_sf_difference
(
mid_t
mod_id
,
uint
32
_t
sfn_sf
);
#endif
#endif
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