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
cddba97c
Commit
cddba97c
authored
Feb 25, 2019
by
Louis Adrien Dufrene
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove CDRX related stuff
parent
ad511a4a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
22 deletions
+0
-22
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
+0
-7
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+0
-15
No files found.
openair2/LAYER2/MAC/eNB_scheduler_dlsch.c
View file @
cddba97c
...
@@ -1983,13 +1983,6 @@ schedule_ue_spec_br(module_id_t module_idP,
...
@@ -1983,13 +1983,6 @@ schedule_ue_spec_br(module_id_t module_idP,
continue
;
continue
;
}
}
/* CDRX LTE-M */
if
(
ue_sched_ctl
->
cdrx_configured
==
TRUE
)
{
if
((
ue_sched_ctl
->
bypass_cdrx
==
FALSE
)
&&
(
ue_sched_ctl
->
in_active_time
==
FALSE
))
{
continue
;
}
}
round_DL
=
ue_sched_ctl
->
round
[
CC_id
][
harq_pid
];
round_DL
=
ue_sched_ctl
->
round
[
CC_id
][
harq_pid
];
AssertFatal
(
UE_template
->
physicalConfigDedicated
!=
NULL
,
"UE_template->physicalConfigDedicated is null
\n
"
);
AssertFatal
(
UE_template
->
physicalConfigDedicated
!=
NULL
,
"UE_template->physicalConfigDedicated is null
\n
"
);
...
...
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
cddba97c
...
@@ -1987,14 +1987,6 @@ void schedule_ulsch_rnti_emtc(module_id_t module_idP,
...
@@ -1987,14 +1987,6 @@ void schedule_ulsch_rnti_emtc(module_id_t module_idP,
continue
;
continue
;
}
}
/* CDRX LTE-M */
UE_sched_ctrl
=
&
(
UE_list
->
UE_sched_ctrl
[
UE_id
]);
if
(
UE_sched_ctrl
->
cdrx_configured
==
TRUE
)
{
if
((
UE_sched_ctrl
->
bypass_cdrx
==
FALSE
)
&&
(
UE_sched_ctrl
->
in_active_time
==
FALSE
))
{
continue
;
}
}
/* Loop over all active UL CC_ids for this UE */
/* Loop over all active UL CC_ids for this UE */
for
(
n
=
0
;
n
<
UE_list
->
numactiveULCCs
[
UE_id
];
n
++
)
{
for
(
n
=
0
;
n
<
UE_list
->
numactiveULCCs
[
UE_id
];
n
++
)
{
/* This is the actual CC_id in the list */
/* This is the actual CC_id in the list */
...
@@ -2091,13 +2083,6 @@ void schedule_ulsch_rnti_emtc(module_id_t module_idP,
...
@@ -2091,13 +2083,6 @@ void schedule_ulsch_rnti_emtc(module_id_t module_idP,
/* New transmission */
/* New transmission */
if
(
round_UL
==
0
)
{
if
(
round_UL
==
0
)
{
/* CDRX LTE-M */
if
(
UE_sched_ctrl
->
cdrx_configured
==
TRUE
)
{
UE_sched_ctrl
->
drx_inactivity_timer
=
1
;
// reset drx inactivity timer when new transmission
VCD_SIGNAL_DUMPER_DUMP_VARIABLE_BY_NAME
(
VCD_SIGNAL_DUMPER_VARIABLES_DRX_INACTIVITY
,
(
unsigned
long
)
UE_sched_ctrl
->
drx_inactivity_timer
);
}
ndi
=
1
-
UE_template
->
oldNDI_UL
[
harq_pid
];
ndi
=
1
-
UE_template
->
oldNDI_UL
[
harq_pid
];
UE_template
->
oldNDI_UL
[
harq_pid
]
=
ndi
;
UE_template
->
oldNDI_UL
[
harq_pid
]
=
ndi
;
...
...
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