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
wangjie
OpenXG-RAN
Commits
c948fefe
Commit
c948fefe
authored
Sep 28, 2020
by
masayuki.harada
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert some changes to avoid setup failure.
parent
67b91fec
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
47 deletions
+13
-47
executables/nr-ru.c
executables/nr-ru.c
+1
-1
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+1
-23
openair2/GNB_APP/gnb_paramdef.h
openair2/GNB_APP/gnb_paramdef.h
+1
-23
openair3/NGAP/ngap_gNB.c
openair3/NGAP/ngap_gNB.c
+10
-0
No files found.
executables/nr-ru.c
View file @
c948fefe
...
@@ -1796,7 +1796,7 @@ void init_RU_proc(RU_t *ru) {
...
@@ -1796,7 +1796,7 @@ void init_RU_proc(RU_t *ru) {
pthread_cond_init
(
&
proc
->
cond_asynch_rxtx
,
NULL
);
pthread_cond_init
(
&
proc
->
cond_asynch_rxtx
,
NULL
);
pthread_cond_init
(
&
proc
->
cond_synch
,
NULL
);
pthread_cond_init
(
&
proc
->
cond_synch
,
NULL
);
pthread_cond_init
(
&
proc
->
cond_gNBs
,
NULL
);
pthread_cond_init
(
&
proc
->
cond_gNBs
,
NULL
);
//
threadCreate( &proc->pthread_FH, ru_thread, (void *)ru, "thread_FH", -1, OAI_PRIORITY_RT_MAX );
threadCreate
(
&
proc
->
pthread_FH
,
ru_thread
,
(
void
*
)
ru
,
"thread_FH"
,
-
1
,
OAI_PRIORITY_RT_MAX
);
if
(
get_thread_parallel_conf
()
==
PARALLEL_RU_L1_SPLIT
||
get_thread_parallel_conf
()
==
PARALLEL_RU_L1_TRX_SPLIT
)
if
(
get_thread_parallel_conf
()
==
PARALLEL_RU_L1_SPLIT
||
get_thread_parallel_conf
()
==
PARALLEL_RU_L1_TRX_SPLIT
)
threadCreate
(
&
proc
->
pthread_FH1
,
ru_thread_tx
,
(
void
*
)
ru
,
"thread_FH1"
,
-
1
,
OAI_PRIORITY_RT
);
threadCreate
(
&
proc
->
pthread_FH1
,
ru_thread_tx
,
(
void
*
)
ru
,
"thread_FH1"
,
-
1
,
OAI_PRIORITY_RT
);
...
...
openair2/GNB_APP/gnb_config.c
View file @
c948fefe
...
@@ -789,16 +789,11 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) {
...
@@ -789,16 +789,11 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) {
if
(
strcmp
(
GNBSParams
[
GNB_ACTIVE_GNBS_IDX
].
strlistptr
[
j
],
*
(
GNBParamList
.
paramarray
[
k
][
GNB_GNB_NAME_IDX
].
strptr
))
==
0
)
{
if
(
strcmp
(
GNBSParams
[
GNB_ACTIVE_GNBS_IDX
].
strlistptr
[
j
],
*
(
GNBParamList
.
paramarray
[
k
][
GNB_GNB_NAME_IDX
].
strptr
))
==
0
)
{
paramdef_t
PLMNParams
[]
=
GNBPLMNPARAMS_DESC
;
paramdef_t
PLMNParams
[]
=
GNBPLMNPARAMS_DESC
;
paramlist_def_t
PLMNParamList
=
{
GNB_CONFIG_STRING_PLMN_LIST
,
NULL
,
0
};
paramlist_def_t
PLMNParamList
=
{
GNB_CONFIG_STRING_PLMN_LIST
,
NULL
,
0
};
paramdef_t
SNSSAIParams
[]
=
GNBSNSSAIPARAMS_DESC
;
paramlist_def_t
SNSSAIParamList
=
{
GNB_CONFIG_STRING_SNSSAI_LIST
,
NULL
,
0
};
/* map parameter checking array instances to parameter definition array instances */
/* map parameter checking array instances to parameter definition array instances */
checkedparam_t
config_check_PLMNParams
[]
=
PLMNPARAMS_CHECK
;
checkedparam_t
config_check_PLMNParams
[]
=
PLMNPARAMS_CHECK
;
checkedparam_t
config_check_SNSSAIParams
[]
=
SNSSAIPARAMS_CHECK
;
for
(
int
I
=
0
;
I
<
sizeof
(
PLMNParams
)
/
sizeof
(
paramdef_t
);
++
I
)
for
(
int
I
=
0
;
I
<
sizeof
(
PLMNParams
)
/
sizeof
(
paramdef_t
);
++
I
)
PLMNParams
[
I
].
chkPptr
=
&
(
config_check_PLMNParams
[
I
]);
PLMNParams
[
I
].
chkPptr
=
&
(
config_check_PLMNParams
[
I
]);
for
(
int
J
=
0
;
J
<
sizeof
(
SNSSAIParams
)
/
sizeof
(
paramdef_t
);
++
J
)
SNSSAIParams
[
J
].
chkPptr
=
&
(
config_check_SNSSAIParams
[
J
]);
paramdef_t
NGParams
[]
=
GNBNGPARAMS_DESC
;
paramdef_t
NGParams
[]
=
GNBNGPARAMS_DESC
;
paramlist_def_t
NGParamList
=
{
GNB_CONFIG_STRING_AMF_IP_ADDRESS
,
NULL
,
0
};
paramlist_def_t
NGParamList
=
{
GNB_CONFIG_STRING_AMF_IP_ADDRESS
,
NULL
,
0
};
...
@@ -840,9 +835,6 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) {
...
@@ -840,9 +835,6 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) {
NGAP_REGISTER_GNB_REQ
(
msg_p
).
num_plmn
=
PLMNParamList
.
numelt
;
NGAP_REGISTER_GNB_REQ
(
msg_p
).
num_plmn
=
PLMNParamList
.
numelt
;
for
(
int
l
=
0
;
l
<
PLMNParamList
.
numelt
;
++
l
)
{
for
(
int
l
=
0
;
l
<
PLMNParamList
.
numelt
;
++
l
)
{
char
snssaistr
[
MAX_OPTNAME_SIZE
*
2
+
8
];
sprintf
(
snssaistr
,
"%s.[%i].%s.[%i]"
,
GNB_CONFIG_STRING_GNB_LIST
,
k
,
GNB_CONFIG_STRING_PLMN_LIST
,
l
);
config_getlist
(
&
SNSSAIParamList
,
SNSSAIParams
,
sizeof
(
SNSSAIParams
)
/
sizeof
(
paramdef_t
),
snssaistr
);
NGAP_REGISTER_GNB_REQ
(
msg_p
).
mcc
[
l
]
=
*
PLMNParamList
.
paramarray
[
l
][
GNB_MOBILE_COUNTRY_CODE_IDX
].
uptr
;
NGAP_REGISTER_GNB_REQ
(
msg_p
).
mcc
[
l
]
=
*
PLMNParamList
.
paramarray
[
l
][
GNB_MOBILE_COUNTRY_CODE_IDX
].
uptr
;
NGAP_REGISTER_GNB_REQ
(
msg_p
).
mnc
[
l
]
=
*
PLMNParamList
.
paramarray
[
l
][
GNB_MOBILE_NETWORK_CODE_IDX
].
uptr
;
NGAP_REGISTER_GNB_REQ
(
msg_p
).
mnc
[
l
]
=
*
PLMNParamList
.
paramarray
[
l
][
GNB_MOBILE_NETWORK_CODE_IDX
].
uptr
;
...
@@ -852,20 +844,6 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) {
...
@@ -852,20 +844,6 @@ int RCconfig_NR_NG(MessageDef *msg_p, uint32_t i) {
(
NGAP_REGISTER_GNB_REQ
(
msg_p
).
mnc_digit_length
[
l
]
==
3
),
(
NGAP_REGISTER_GNB_REQ
(
msg_p
).
mnc_digit_length
[
l
]
==
3
),
"BAD MNC DIGIT LENGTH %d"
,
"BAD MNC DIGIT LENGTH %d"
,
NGAP_REGISTER_GNB_REQ
(
msg_p
).
mnc_digit_length
[
l
]);
NGAP_REGISTER_GNB_REQ
(
msg_p
).
mnc_digit_length
[
l
]);
NGAP_REGISTER_GNB_REQ
(
msg_p
).
num_nssai
[
l
]
=
SNSSAIParamList
.
numelt
;
for
(
int
s
=
0
;
s
<
SNSSAIParamList
.
numelt
;
++
s
)
{
NGAP_REGISTER_GNB_REQ
(
msg_p
).
s_nssai
[
l
][
s
].
sST
=
*
SNSSAIParamList
.
paramarray
[
s
][
GNB_SLICE_SERIVE_TYPE_IDX
].
uptr
;
NGAP_REGISTER_GNB_REQ
(
msg_p
).
s_nssai
[
l
][
s
].
sD_flag
=
0
;
if
(
*
SNSSAIParamList
.
paramarray
[
s
][
GNB_SLICE_DIFFERENTIATOR_IDX
].
uptr
!=
0
)
{
NGAP_REGISTER_GNB_REQ
(
msg_p
).
s_nssai
[
l
][
s
].
sD_flag
=
1
;
NGAP_REGISTER_GNB_REQ
(
msg_p
).
s_nssai
[
l
][
s
].
sD
[
0
]
=
(
*
SNSSAIParamList
.
paramarray
[
s
][
GNB_SLICE_DIFFERENTIATOR_IDX
].
uptr
&
0xFF0000
)
>>
16
;
NGAP_REGISTER_GNB_REQ
(
msg_p
).
s_nssai
[
l
][
s
].
sD
[
1
]
=
(
*
SNSSAIParamList
.
paramarray
[
s
][
GNB_SLICE_DIFFERENTIATOR_IDX
].
uptr
&
0x00FF00
)
>>
8
;
NGAP_REGISTER_GNB_REQ
(
msg_p
).
s_nssai
[
l
][
s
].
sD
[
2
]
=
(
*
SNSSAIParamList
.
paramarray
[
s
][
GNB_SLICE_DIFFERENTIATOR_IDX
].
uptr
&
0x0000FF
);
}
}
}
}
sprintf
(
aprefix
,
"%s.[%i]"
,
GNB_CONFIG_STRING_GNB_LIST
,
k
);
sprintf
(
aprefix
,
"%s.[%i]"
,
GNB_CONFIG_STRING_GNB_LIST
,
k
);
config_getlist
(
&
NGParamList
,
NGParams
,
sizeof
(
NGParams
)
/
sizeof
(
paramdef_t
),
aprefix
);
config_getlist
(
&
NGParamList
,
NGParams
,
sizeof
(
NGParams
)
/
sizeof
(
paramdef_t
),
aprefix
);
...
...
openair2/GNB_APP/gnb_paramdef.h
View file @
c948fefe
...
@@ -236,32 +236,10 @@ typedef struct ccparams_nr_x2 {
...
@@ -236,32 +236,10 @@ typedef struct ccparams_nr_x2 {
}
}
/* SNSSAI ID configuration */
#define GNB_CONFIG_STRING_SNSSAI_LIST "snssaiList"
#define GNB_CONFIG_STRING_SLICE_SERIVE_TYPE "sst"
#define GNB_CONFIG_STRING_SLICE_DIFFERENTIATOR "sd"
#define GNB_SLICE_SERIVE_TYPE_IDX 0
/* MME configuration parameters section name */
#define GNB_SLICE_DIFFERENTIATOR_IDX 1
#define GNBSNSSAIPARAMS_DESC { \
/* optname helpstr paramflags XXXptr def val type numelt */
\
{GNB_CONFIG_STRING_SLICE_SERIVE_TYPE, "slice serive type", 0, uptr:NULL, defuintval:1, TYPE_UINT, 0}, \
{GNB_CONFIG_STRING_SLICE_DIFFERENTIATOR, "slice differentiator", 0, uptr:NULL, defuintval:0, TYPE_UINT, 0}, \
}
#define SLICE_SERIVE_TYPE_OKRANGES {1,2,3,4}
#define SNSSAIPARAMS_CHECK { \
{ .s1 = { config_check_intval, SLICE_SERIVE_TYPE_OKRANGES, 4 } }, \
{ .s5 = { NULL } }, \
}
/* AMF configuration parameters section name */
#define GNB_CONFIG_STRING_AMF_IP_ADDRESS "amf_ip_address"
#define GNB_CONFIG_STRING_AMF_IP_ADDRESS "amf_ip_address"
/* SRB1 configuration parameters names */
/* SRB1 configuration parameters names */
...
...
openair3/NGAP/ngap_gNB.c
View file @
c948fefe
...
@@ -212,6 +212,16 @@ void ngap_gNB_handle_register_gNB(instance_t instance, ngap_register_gnb_req_t *
...
@@ -212,6 +212,16 @@ void ngap_gNB_handle_register_gNB(instance_t instance, ngap_register_gnb_req_t *
memcpy
(
new_instance
->
s_nssai
,
ngap_register_gNB
->
s_nssai
,
sizeof
(
ngap_register_gNB
->
s_nssai
));
memcpy
(
new_instance
->
s_nssai
,
ngap_register_gNB
->
s_nssai
,
sizeof
(
ngap_register_gNB
->
s_nssai
));
// config add? TBD
if
(
1
)
{
new_instance
->
num_nssai
[
0
]
=
1
;
new_instance
->
s_nssai
[
0
][
0
].
sST
=
1
;
new_instance
->
s_nssai
[
0
][
0
].
sD_flag
=
1
;
new_instance
->
s_nssai
[
0
][
0
].
sD
[
0
]
=
1
;
new_instance
->
s_nssai
[
0
][
0
].
sD
[
1
]
=
2
;
new_instance
->
s_nssai
[
0
][
0
].
sD
[
2
]
=
3
;
}
/* Add the new instance to the list of gNB (meaningfull in virtual mode) */
/* Add the new instance to the list of gNB (meaningfull in virtual mode) */
ngap_gNB_insert_new_instance
(
new_instance
);
ngap_gNB_insert_new_instance
(
new_instance
);
NGAP_INFO
(
"Registered new gNB[%d] and %s gNB id %u
\n
"
,
NGAP_INFO
(
"Registered new gNB[%d] and %s gNB id %u
\n
"
,
...
...
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