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
367a6715
Commit
367a6715
authored
Mar 14, 2020
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add UE to UE list in add_new_nr_ue(), fixes
parent
29ccc58e
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
11 deletions
+18
-11
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+15
-2
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/LAYER2/NR_MAC_gNB/main.c
+3
-8
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+0
-1
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
367a6715
...
...
@@ -971,6 +971,19 @@ dump_nr_ue_list(NR_UE_list_t *listP,
return
;
}
void
add_nr_ue_list
(
NR_UE_list_t
*
listP
,
int
UE_id
)
{
if
(
listP
->
head
==
-
1
)
{
listP
->
head
=
UE_id
;
listP
->
next
[
UE_id
]
=
-
1
;
}
else
{
int
i
=
listP
->
head
;
while
(
listP
->
next
[
i
]
>=
0
)
i
=
listP
->
next
[
i
];
listP
->
next
[
i
]
=
UE_id
;
listP
->
next
[
UE_id
]
=
-
1
;
}
}
int
find_nr_UE_id
(
module_id_t
mod_idP
,
rnti_t
rntiP
)
//------------------------------------------------------------------------------
{
...
...
@@ -993,10 +1006,9 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP){
int
UE_id
;
int
i
;
NR_UE_list_t
*
UE_list
=
&
RC
.
nrmac
[
mod_idP
]
->
UE_list
;
LOG_I
(
MAC
,
"[gNB %d] Adding UE with rnti %x (n
ext avail %d, n
um_UEs %d)
\n
"
,
LOG_I
(
MAC
,
"[gNB %d] Adding UE with rnti %x (num_UEs %d)
\n
"
,
mod_idP
,
rntiP
,
UE_list
->
avail
,
UE_list
->
num_UEs
);
dump_nr_ue_list
(
UE_list
,
0
);
...
...
@@ -1008,6 +1020,7 @@ int add_new_nr_ue(module_id_t mod_idP, rnti_t rntiP){
UE_list
->
num_UEs
++
;
UE_list
->
active
[
UE_id
]
=
TRUE
;
UE_list
->
rnti
[
UE_id
]
=
rntiP
;
add_nr_ue_list
(
UE_list
,
UE_id
);
memset
((
void
*
)
&
UE_list
->
UE_sched_ctrl
[
UE_id
],
0
,
sizeof
(
NR_UE_sched_ctrl_t
));
...
...
openair2/LAYER2/NR_MAC_gNB/main.c
View file @
367a6715
...
...
@@ -107,18 +107,13 @@ void mac_top_init_gNB(void)
UE_list
->
num_UEs
=
0
;
UE_list
->
head
=
-
1
;
UE_list
->
head_ul
=
-
1
;
UE_list
->
avail
=
0
;
for
(
list_el
=
0
;
list_el
<
MAX_MOBILES_PER_GNB
-
1
;
list_el
++
)
{
UE_list
->
next
[
list_el
]
=
list_el
+
1
;
UE_list
->
next_ul
[
list_el
]
=
list_el
+
1
;
UE_list
->
active
[
list_el
]
=
FALSE
;
}
for
(
list_el
=
0
;
list_el
<
MAX_MOBILES_PER_GNB
;
list_el
++
)
{
UE_list
->
next
[
list_el
]
=
-
1
;
UE_list
->
next_ul
[
list_el
]
=
-
1
;
UE_list
->
active
[
list_el
]
=
FALSE
;
}
}
srand48
(
0
);
}
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
367a6715
...
...
@@ -117,7 +117,6 @@ typedef struct {
int
head
;
int
next_ul
[
MAX_MOBILES_PER_GNB
];
int
head_ul
;
int
avail
;
int
num_UEs
;
boolean_t
active
[
MAX_MOBILES_PER_GNB
];
rnti_t
rnti
[
MAX_MOBILES_PER_GNB
];
...
...
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