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
常顺宇
OpenXG-RAN
Commits
f35f1277
Commit
f35f1277
authored
Jun 25, 2018
by
WEI-TAI CHEN
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add the function RCconfig_nr_gtpu
parent
302aea2f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
53 additions
and
8 deletions
+53
-8
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+46
-1
openair2/GNB_APP/gnb_config.h
openair2/GNB_APP/gnb_config.h
+3
-3
targets/RT/USER/nr-softmodem.c
targets/RT/USER/nr-softmodem.c
+4
-4
No files found.
openair2/GNB_APP/gnb_config.c
View file @
f35f1277
...
...
@@ -62,7 +62,7 @@
extern
uint16_t
sf_ahead
;
void
RCconfig_
NR
_flexran
()
void
RCconfig_
nr
_flexran
()
{
uint16_t
i
;
uint16_t
num_gnbs
;
...
...
@@ -2573,6 +2573,51 @@ int RCconfig_NRRRC(MessageDef *msg_p, uint32_t i, gNB_RRC_INST *rrc) {
}
//End RCconfig_NRRRC function
int
RCconfig_nr_gtpu
(
void
)
{
int
num_gnbs
=
0
;
char
*
enb_interface_name_for_S1U
=
NULL
;
char
*
enb_ipv4_address_for_S1U
=
NULL
;
uint32_t
enb_port_for_S1U
=
0
;
char
*
address
=
NULL
;
char
*
cidr
=
NULL
;
char
gtpupath
[
MAX_OPTNAME_SIZE
*
2
+
8
];
paramdef_t
GNBSParams
[]
=
GNBSPARAMS_DESC
;
paramdef_t
GTPUParams
[]
=
GTPUPARAMS_DESC
;
LOG_I
(
GTPU
,
"Configuring GTPu
\n
"
);
/* get number of active eNodeBs */
config_get
(
GNBSParams
,
sizeof
(
GNBSParams
)
/
sizeof
(
paramdef_t
),
NULL
);
num_gnbs
=
GNBSParams
[
GNB_ACTIVE_GNBS_IDX
].
numelt
;
AssertFatal
(
num_gnbs
>
0
,
"Failed to parse config file no active gNodeBs in %s
\n
"
,
GNB_CONFIG_STRING_ACTIVE_GNBS
);
sprintf
(
gtpupath
,
"%s.[%i].%s"
,
GNB_CONFIG_STRING_GNB_LIST
,
0
,
GNB_CONFIG_STRING_NETWORK_INTERFACES_CONFIG
);
config_get
(
GTPUParams
,
sizeof
(
GTPUParams
)
/
sizeof
(
paramdef_t
),
gtpupath
);
cidr
=
enb_ipv4_address_for_S1U
;
address
=
strtok
(
cidr
,
"/"
);
if
(
address
)
{
IPV4_STR_ADDR_TO_INT_NWBO
(
address
,
RC
.
gtpv1u_data_g
->
enb_ip_address_for_S1u_S12_S4_up
,
"BAD IP ADDRESS FORMAT FOR eNB S1_U !
\n
"
);
LOG_I
(
GTPU
,
"Configuring GTPu address : %s -> %x
\n
"
,
address
,
RC
.
gtpv1u_data_g
->
enb_ip_address_for_S1u_S12_S4_up
);
}
RC
.
gtpv1u_data_g
->
enb_port_for_S1u_S12_S4_up
=
enb_port_for_S1U
;
return
0
;
}
int
RCconfig_NR_S1
(
MessageDef
*
msg_p
,
uint32_t
i
)
{
int
j
,
k
=
0
;
...
...
openair2/GNB_APP/gnb_config.h
View file @
f35f1277
...
...
@@ -92,17 +92,17 @@ typedef struct ru_config_s {
} ru_config_t;
*/
extern
void
RCconfig_RU
(
void
);
extern
void
RCconfig_
NR
_flexran
(
void
);
extern
void
RCconfig_
nr
_flexran
(
void
);
extern
void
RCconfig_NR_L1
(
void
);
extern
void
RCconfig_nr_macrlc
(
void
);
extern
int
RCconfig_gtpu
(
void
);
extern
int
RCconfig_
nr_
gtpu
(
void
);
extern
void
NRRCConfig
(
void
);
//void enb_config_display(void);
//void ru_config_display(void);
int
RCconfig_NRRRC
(
MessageDef
*
msg_p
,
uint32_t
i
,
gNB_RRC_INST
*
rrc
);
int
RCconfig_S1
(
MessageDef
*
msg_p
,
uint32_t
i
);
int
RCconfig_
NR_
S1
(
MessageDef
*
msg_p
,
uint32_t
i
);
#endif
/* GNB_CONFIG_H_ */
/** @} */
targets/RT/USER/nr-softmodem.c
View file @
f35f1277
...
...
@@ -551,7 +551,7 @@ static void get_options(void) {
NRRCConfig
();
NB_gNB_INST
=
RC
.
nb_nr_inst
;
NB_RU
=
RC
.
nb_RU
;
printf
(
"Configuration: nb_rrc_inst %d, nb_
L1_inst %d, nb_ru %d
\n
"
,
NB_gNB_INST
,
RC
.
nb
_L1_inst
,
NB_RU
);
printf
(
"Configuration: nb_rrc_inst %d, nb_
nr_L1_inst %d, nb_ru %d
\n
"
,
NB_gNB_INST
,
RC
.
nb_nr
_L1_inst
,
NB_RU
);
}
}
...
...
@@ -1045,7 +1045,7 @@ int main( int argc, char **argv )
#if defined(ENABLE_ITTI)
if
(
RC
.
nb_inst
>
0
)
{
if
(
RC
.
nb_
nr_
inst
>
0
)
{
// don't create if node doesn't connect to RRC/S1/GTP
if
(
create_gNB_tasks
(
1
)
<
0
)
{
...
...
@@ -1061,7 +1061,7 @@ int main( int argc, char **argv )
#endif
/* Start the agent. If it is turned off in the configuration, it won't start */
RCconfig_
NR
_flexran
();
RCconfig_
nr
_flexran
();
for
(
i
=
0
;
i
<
RC
.
nb_L1_inst
;
i
++
)
{
flexran_agent_start
(
i
);
}
...
...
@@ -1150,7 +1150,7 @@ int main( int argc, char **argv )
// start the main threads
number_of_cards
=
1
;
printf
(
"RC.nb_
L1_inst:%d
\n
"
,
RC
.
nb
_L1_inst
);
printf
(
"RC.nb_
nr_L1_inst:%d
\n
"
,
RC
.
nb_nr
_L1_inst
);
if
(
RC
.
nb_L1_inst
>
0
)
{
printf
(
"Initializing gNB threads single_thread_flag:%d wait_for_sync:%d
\n
"
,
single_thread_flag
,
wait_for_sync
);
init_gNB
(
single_thread_flag
,
wait_for_sync
);
...
...
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