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
alex037yang
OpenXG-RAN
Commits
f552fd73
Commit
f552fd73
authored
Feb 25, 2019
by
Louis Adrien Dufrene
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'eMTC-testing' into eMTC-testing-orange
parents
1e374fdf
87f415d2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
+2
-2
No files found.
openair2/LAYER2/MAC/eNB_scheduler_ulsch.c
View file @
f552fd73
...
...
@@ -686,7 +686,7 @@ rx_sdu(const module_id_t enb_mod_idP,
rx_lengths
[
i
],
payload_ptr
-
sduP
);
if
((
UE_id
=
add_new_ue
(
enb_mod_idP
,
CC_idP
,
mac
->
common_channels
[
CC_idP
].
ra
->
rnti
,
harq_pid
if
((
UE_id
=
add_new_ue
(
enb_mod_idP
,
CC_idP
,
ra
->
rnti
,
harq_pid
#if (LTE_RRC_VERSION >= MAKE_VERSION(14, 0, 0))
,
mac
->
common_channels
[
CC_idP
].
ra
->
rach_resource_type
#endif
...
...
@@ -1916,7 +1916,7 @@ schedule_ulsch_rnti(module_id_t module_idP,
void
schedule_ulsch_rnti_emtc
(
module_id_t
module_idP
,
frame_t
frameP
,
sub_frame_t
subframeP
,
int
sched_subframeP
,
unsigned
char
sched_subframeP
,
int
*
emtc_active
)
//-----------------------------------------------------------------------------
{
...
...
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