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
Michael Black
OpenXG UE
Commits
dac766c5
Commit
dac766c5
authored
Jun 02, 2020
by
MaheshK1995
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Debugging
parent
32a05e4d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
42 additions
and
2 deletions
+42
-2
executables/nr-softmodem.c
executables/nr-softmodem.c
+3
-0
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+38
-1
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+1
-1
No files found.
executables/nr-softmodem.c
View file @
dac766c5
...
...
@@ -793,6 +793,9 @@ void init_pdcp(void) {
int
main
(
int
argc
,
char
**
argv
)
{
int
ru_id
,
CC_id
=
0
;
nfapi_mode
=
(
int
)
(
argv
[
argc
-
1
][
0
]
-
'0'
);
start_background_system
();
///static configuration for NR at the moment
...
...
nfapi/oai_integration/nfapi_vnf.c
View file @
dac766c5
...
...
@@ -231,9 +231,46 @@ void oai_enb_init(void) {
init_eNB_afterRU
();
}
void
oai_create_gnb
(
void
)
{
int
bodge_counter
=
0
;
PHY_VARS_gNB
*
gNB
=
RC
.
gNB
[
0
];
RC
.
nb_nr_CC
=
(
int
*
)
malloc
(
sizeof
(
int
));
// TODO: find a better function to place this in
printf
(
"[VNF] RC.gNB[0][0]. Mod_id:%d CC_id:%d nb_CC[0]:%d abstraction_flag:%d single_thread_flag:%d if_inst:%p
\n
"
,
gNB
->
Mod_id
,
gNB
->
CC_id
,
RC
.
nb_nr_CC
,
gNB
->
abstraction_flag
,
gNB
->
single_thread_flag
,
gNB
->
if_inst
);
gNB
->
Mod_id
=
bodge_counter
;
gNB
->
CC_id
=
bodge_counter
;
gNB
->
abstraction_flag
=
0
;
gNB
->
single_thread_flag
=
0
;
//single_thread_flag;
RC
.
nb_nr_CC
[
bodge_counter
]
=
1
;
if
(
gNB
->
if_inst
==
0
)
{
gNB
->
if_inst
=
NR_IF_Module_init
(
bodge_counter
);
}
// This will cause phy_config_request to be installed. That will result in RRC configuring the PHY
// that will result in gNB->configured being set to TRUE.
// See we need to wait for that to happen otherwise the NFAPI message exchanges won't contain the right parameter values
if
(
RC
.
gNB
[
0
]
->
if_inst
==
0
||
RC
.
gNB
[
0
]
->
if_inst
->
NR_PHY_config_req
==
0
||
RC
.
gNB
[
0
]
->
if_inst
->
NR_Schedule_response
==
0
)
{
printf
(
"RC.gNB[0][0]->if_inst->NR_PHY_config_req is not installed - install it
\n
"
);
install_nr_schedule_handlers
(
RC
.
gNB
[
0
]
->
if_inst
);
}
do
{
printf
(
"%s() Waiting for gNB to become configured (by RRC/PHY) - need to wait otherwise NFAPI messages won't contain correct values
\n
"
,
__FUNCTION__
);
usleep
(
50000
);
}
while
(
gNB
->
configured
!=
1
);
printf
(
"%s() gNB is now configured
\n
"
,
__FUNCTION__
);
}
int
pnf_connection_indication_cb
(
nfapi_vnf_config_t
*
config
,
int
p5_idx
)
{
printf
(
"[VNF] pnf connection indication idx:%d
\n
"
,
p5_idx
);
oai_create_
e
nb
();
oai_create_
g
nb
();
nfapi_pnf_param_request_t
req
;
memset
(
&
req
,
0
,
sizeof
(
req
));
req
.
header
.
message_id
=
NFAPI_PNF_PARAM_REQUEST
;
...
...
openair2/GNB_APP/gnb_config.c
View file @
dac766c5
...
...
@@ -495,7 +495,7 @@ void RCconfig_nr_macrlc() {
//sf_ahead = 2; // Cannot cope with 4 subframes between RX and TX - set it to 2
printf
(
"**************** vnf_port:%d
\n
"
,
RC
.
mac
[
j
]
->
eth_params_s
.
my_portc
);
printf
(
"**************** vnf_port:%d
\n
"
,
RC
.
nr
mac
[
j
]
->
eth_params_s
.
my_portc
);
configure_nfapi_vnf
(
RC
.
nrmac
[
j
]
->
eth_params_s
.
my_addr
,
RC
.
nrmac
[
j
]
->
eth_params_s
.
my_portc
);
printf
(
"**************** RETURNED FROM configure_nfapi_vnf() vnf_port:%d
\n
"
,
RC
.
nrmac
[
j
]
->
eth_params_s
.
my_portc
);
}
else
{
// other midhaul
...
...
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