Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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
OpenXG UE
Commits
5778b681
Commit
5778b681
authored
Oct 13, 2019
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
testing on caracal
parent
640fe207
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
6 deletions
+12
-6
openair1/PHY/NR_TRANSPORT/nr_dci.c
openair1/PHY/NR_TRANSPORT/nr_dci.c
+2
-2
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+5
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+3
-3
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/LAYER2/NR_MAC_gNB/main.c
+2
-0
No files found.
openair1/PHY/NR_TRANSPORT/nr_dci.c
View file @
5778b681
...
...
@@ -36,8 +36,8 @@
#include "PHY/MODULATION/nr_modulation.h"
//#define DEBUG_PDCCH_DMRS
#define DEBUG_DCI
#define DEBUG_CHANNEL_CODING
//
#define DEBUG_DCI
//
#define DEBUG_CHANNEL_CODING
uint16_t
nr_get_dci_size
(
nfapi_nr_dci_format_e
format
,
...
...
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
5778b681
...
...
@@ -210,6 +210,8 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
if
(
scc
!=
NULL
)
{
AssertFatal
(
scc
->
ssb_PositionsInBurst
->
present
==
NR_ServingCellConfigCommon__ssb_PositionsInBurst_PR_mediumBitmap
,
"SSB Bitmap is not 8-bits!
\n
"
);
LOG_I
(
MAC
,
"Configuring common parameters from NR ServingCellConfig
\n
"
);
config_common
(
Mod_idP
,
scc
);
LOG_E
(
MAC
,
"%s() %s:%d RC.nrmac[Mod_idP]->if_inst->NR_PHY_config_req:%p
\n
"
,
__FUNCTION__
,
__FILE__
,
__LINE__
,
RC
.
nrmac
[
Mod_idP
]
->
if_inst
->
NR_PHY_config_req
);
...
...
@@ -238,10 +240,12 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
if
(
add_ue
==
1
)
{
int
UE_id
=
add_new_nr_ue
(
Mod_idP
,
rnti
);
UE_list
->
secondaryCellGroup
[
UE_id
]
=
secondaryCellGroup
;
LOG_I
(
PHY
,
"Added new UE_id %d/%x with initial secondaryCellGroup
\n
"
,
UE_id
,
rnti
);
}
else
{
// secondaryCellGroup has been updated
int
UE_id
=
find_nr_UE_id
(
rnti
);
int
UE_id
=
find_nr_UE_id
(
Mod_idP
,
rnti
);
UE_list
->
secondaryCellGroup
[
UE_id
]
=
secondaryCellGroup
;
LOG_I
(
PHY
,
"Modified UE_id %d/%x with secondaryCellGroup
\n
"
,
UE_id
,
rnti
);
}
}
VCD_SIGNAL_DUMPER_DUMP_FUNCTION_BY_NAME
(
VCD_SIGNAL_DUMPER_FUNCTIONS_RRC_MAC_CONFIG
,
VCD_FUNCTION_OUT
);
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
View file @
5778b681
...
...
@@ -621,12 +621,12 @@ int add_new_nr_ue(module_id_t mod_idP,
int
UE_id
;
int
i
,
j
;
NR_UE_list_t
*
UE_list
=
&
RC
.
nrmac
[
mod_idP
]
->
UE_list
;
LOG_
D
(
MAC
,
"[gNB %d] Adding UE with rnti %x (next avail %d, num_UEs %d)
\n
"
,
LOG_
I
(
MAC
,
"[gNB %d] Adding UE with rnti %x (next avail %d, num_UEs %d)
\n
"
,
mod_idP
,
rntiP
,
UE_list
->
avail
,
UE_list
->
num_UEs
);
dump_ue_list
(
UE_list
,
0
);
dump_
nr_
ue_list
(
UE_list
,
0
);
for
(
i
=
0
;
i
<
MAX_MOBILES_PER_ENB
;
i
++
)
{
if
(
UE_list
->
active
[
i
]
==
TRUE
)
...
...
@@ -639,7 +639,7 @@ int add_new_nr_ue(module_id_t mod_idP,
memset
((
void
*
)
&
UE_list
->
UE_sched_ctrl
[
UE_id
],
0
,
sizeof
(
NR_UE_sched_ctrl_t
));
LOG_
D
(
MAC
,
"gNB %d] Add NR UE_id %d : rnti %x
\n
"
,
LOG_
I
(
MAC
,
"gNB %d] Add NR UE_id %d : rnti %x
\n
"
,
mod_idP
,
UE_id
,
rntiP
);
...
...
openair2/LAYER2/NR_MAC_gNB/main.c
View file @
5778b681
...
...
@@ -148,10 +148,12 @@ void mac_top_init_gNB(void)
for
(
list_el
=
0
;
list_el
<
MAX_MOBILES_PER_ENB
-
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
;
}
UE_list
->
next
[
list_el
]
=
-
1
;
UE_list
->
next_ul
[
list_el
]
=
-
1
;
UE_list
->
active
[
list_el
]
=
FALSE
;
}
}
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