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
canghaiwuhen
OpenXG-RAN
Commits
855d7ed3
Commit
855d7ed3
authored
Oct 31, 2019
by
Haruki NAOI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: getm for TDD configuration 1.
parent
6915af07
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+8
-4
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+2
-2
No files found.
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
855d7ed3
...
...
@@ -1262,10 +1262,14 @@ getm_mac(COMMON_channels_t * cc,unsigned char subframe)
else
{
switch
(
cc
->
tdd_Config
->
subframeAssignment
)
{
case
1
:
if
(
subframe
==
1
)
{
return
(
1
);
}
else
if
(
subframe
==
6
)
{
return
(
1
);
// To be updated
if
(
subframe
==
0
)
{
return
(
0
);
}
else
if
(
subframe
==
4
)
{
return
(
0
);
}
else
if
(
subframe
==
5
)
{
return
(
0
);
}
else
if
(
subframe
==
9
)
{
return
(
0
);
// To be updated
}
else
{
LOG_E
(
MAC
,
"getm_mac illegl subframe %d
\n
"
,
subframe
);
return
(
0
);
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
855d7ed3
...
...
@@ -200,10 +200,10 @@ rx_sdu(const module_id_t enb_mod_idP,
UE_id
,
current_rnti
);
//
if (ul_cqi > 200) { // too high energy pattern
if
(
ul_cqi
>
200
)
{
// too high energy pattern
UE_scheduling_control
->
pusch_snr
[
CC_idP
]
=
ul_cqi
;
LOG_W
(
MAC
,
"[MAC] Too high energy pattern
\n
"
);
//
}
}
if
(
UE_scheduling_control
->
round_UL
[
CC_idP
][
harq_pid
]
==
3
)
{
UE_scheduling_control
->
ul_scheduled
&=
(
~
(
1
<<
harq_pid
));
...
...
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