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
常顺宇
OpenXG-RAN
Commits
ebecb557
Commit
ebecb557
authored
Feb 13, 2018
by
wujing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add if-else case for first_rb=3 when TDD config1 20MHz in ULSCH_pre_processor
parent
c641f334
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
6 deletions
+16
-6
openair2/LAYER2/MAC/pre_processor.c
openair2/LAYER2/MAC/pre_processor.c
+16
-6
No files found.
openair2/LAYER2/MAC/pre_processor.c
View file @
ebecb557
...
@@ -2707,12 +2707,23 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP,
...
@@ -2707,12 +2707,23 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP,
// MCS and RB assgin
// MCS and RB assgin
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
for
(
CC_id
=
0
;
CC_id
<
MAX_NUM_CCs
;
CC_id
++
)
{
cc
=
&
RC
.
mac
[
module_idP
]
->
common_channels
[
CC_id
];
frame_parms
=
&
(
RC
.
eNB
[
module_idP
][
CC_id
]
->
frame_parms
);
frame_parms
=
&
(
RC
.
eNB
[
module_idP
][
CC_id
]
->
frame_parms
);
if
(
frame_parms
->
N_RB_UL
==
25
){
if
(
cc
->
tdd_Config
)
{
//TDD
first_rb
[
CC_id
]
=
1
;
if
(
frame_parms
->
N_RB_UL
==
25
)
{
}
else
{
first_rb
[
CC_id
]
=
1
;
first_rb
[
CC_id
]
=
2
;
}
else
if
(
frame_parms
->
N_RB_UL
==
50
)
{
}
first_rb
[
CC_id
]
=
2
;
}
else
{
first_rb
[
CC_id
]
=
3
;
}
}
else
{
//FDD
if
(
frame_parms
->
N_RB_UL
==
25
)
{
first_rb
[
CC_id
]
=
1
;
}
else
{
first_rb
[
CC_id
]
=
2
;
}
}
ue_num_temp
=
ulsch_ue_select
[
CC_id
].
ue_num
;
ue_num_temp
=
ulsch_ue_select
[
CC_id
].
ue_num
;
for
(
ulsch_ue_num
=
0
;
ulsch_ue_num
<
ulsch_ue_select
[
CC_id
].
ue_num
;
ulsch_ue_num
++
)
{
for
(
ulsch_ue_num
=
0
;
ulsch_ue_num
<
ulsch_ue_select
[
CC_id
].
ue_num
;
ulsch_ue_num
++
)
{
...
@@ -2731,7 +2742,6 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP,
...
@@ -2731,7 +2742,6 @@ void ulsch_scheduler_pre_processor(module_id_t module_idP,
}
}
rnti
=
UE_RNTI
(
CC_id
,
UE_id
);
rnti
=
UE_RNTI
(
CC_id
,
UE_id
);
cc
=
&
RC
.
mac
[
module_idP
]
->
common_channels
[
CC_id
];
if
(
cc
->
tdd_Config
)
{
if
(
cc
->
tdd_Config
)
{
if
(
frame_parms
->
N_RB_UL
==
25
)
{
if
(
frame_parms
->
N_RB_UL
==
25
)
{
if
(
first_rb
[
CC_id
]
>=
frame_parms
->
N_RB_UL
-
1
)
{
if
(
first_rb
[
CC_id
]
>=
frame_parms
->
N_RB_UL
-
1
)
{
...
...
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