Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openairinterface5G
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mingxuan Li
openairinterface5G
Commits
7379717d
Commit
7379717d
authored
3 years ago
by
Xue Song
Browse files
Options
Downloads
Patches
Plain Diff
Remove duplicate code
In the UE executable, delete the initialization of NR.nrrrc and check the NULL of NR.nrrrc
parent
28ca9cfc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
executables/nr-softmodem.c
+0
-25
0 additions, 25 deletions
executables/nr-softmodem.c
executables/nr-uesoftmodem.c
+0
-4
0 additions, 4 deletions
executables/nr-uesoftmodem.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+1
-1
1 addition, 1 deletion
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
with
1 addition
and
30 deletions
executables/nr-softmodem.c
+
0
−
25
View file @
7379717d
...
@@ -377,31 +377,6 @@ int create_gNB_tasks(uint32_t gnb_nb) {
...
@@ -377,31 +377,6 @@ int create_gNB_tasks(uint32_t gnb_nb) {
}
}
}
}
if
(
AMF_MODE_ENABLED
&&
(
get_softmodem_params
()
->
phy_test
==
0
&&
get_softmodem_params
()
->
do_ra
==
1
)){
if
(
gnb_nb
>
0
)
{
if
(
NGAP_CONF_MODE
){
if
(
itti_create_task
(
TASK_NGAP
,
ngap_gNB_task
,
NULL
)
<
0
)
{
LOG_E
(
NGAP
,
"Create task for NGAP failed
\n
"
);
return
-
1
;
}
}
else
{
LOG_E
(
NGAP
,
"Ngap task not created
\n
"
);
}
if
(
!
emulate_rf
){
if
(
itti_create_task
(
TASK_UDP
,
udp_eNB_task
,
NULL
)
<
0
)
{
LOG_E
(
UDP_
,
"Create task for UDP failed
\n
"
);
return
-
1
;
}
}
if
(
itti_create_task
(
TASK_GTPV1_U
,
&
nr_gtpv1u_gNB_task
,
NULL
)
<
0
)
{
LOG_E
(
GTPU
,
"Create task for GTPV1U failed
\n
"
);
return
-
1
;
}
}
}
if
(
gnb_nb
>
0
)
{
if
(
gnb_nb
>
0
)
{
if
(
itti_create_task
(
TASK_GNB_APP
,
gNB_app_task
,
NULL
)
<
0
)
{
if
(
itti_create_task
(
TASK_GNB_APP
,
gNB_app_task
,
NULL
)
<
0
)
{
LOG_E
(
GNB_APP
,
"Create task for gNB APP failed
\n
"
);
LOG_E
(
GNB_APP
,
"Create task for gNB APP failed
\n
"
);
...
...
This diff is collapsed.
Click to expand it.
executables/nr-uesoftmodem.c
+
0
−
4
View file @
7379717d
...
@@ -452,10 +452,6 @@ int main( int argc, char **argv ) {
...
@@ -452,10 +452,6 @@ int main( int argc, char **argv ) {
#endif
#endif
LOG_I
(
HW
,
"Version: %s
\n
"
,
PACKAGE_VERSION
);
LOG_I
(
HW
,
"Version: %s
\n
"
,
PACKAGE_VERSION
);
RC
.
nrrrc
=
(
gNB_RRC_INST
**
)
malloc
(
1
*
sizeof
(
gNB_RRC_INST
*
));
RC
.
nrrrc
[
0
]
=
(
gNB_RRC_INST
*
)
malloc
(
sizeof
(
gNB_RRC_INST
));
RC
.
nrrrc
[
0
]
->
node_type
=
ngran_gNB
;
init_NR_UE
(
1
,
rrc_config_path
);
init_NR_UE
(
1
,
rrc_config_path
);
if
(
IS_SOFTMODEM_NOS1
||
get_softmodem_params
()
->
sa
)
if
(
IS_SOFTMODEM_NOS1
||
get_softmodem_params
()
->
sa
)
init_pdcp
();
init_pdcp
();
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+
1
−
1
View file @
7379717d
...
@@ -607,7 +607,7 @@ srb_found:
...
@@ -607,7 +607,7 @@ srb_found:
LOG_D
(
PDCP
,
"%s(): (srb %d) calling rlc_data_req size %d
\n
"
,
__func__
,
srb_id
,
size
);
LOG_D
(
PDCP
,
"%s(): (srb %d) calling rlc_data_req size %d
\n
"
,
__func__
,
srb_id
,
size
);
//for (i = 0; i < size; i++) printf(" %2.2x", (unsigned char)memblock->data[i]);
//for (i = 0; i < size; i++) printf(" %2.2x", (unsigned char)memblock->data[i]);
//printf("\n");
//printf("\n");
if
(
!
NODE_IS_CU
(
RC
.
nrrrc
[
0
]
->
node_type
))
{
if
((
RC
.
nrrrc
==
NULL
)
||
(
!
NODE_IS_CU
(
RC
.
nrrrc
[
0
]
->
node_type
))
)
{
ctxt
.
module_id
=
0
;
ctxt
.
module_id
=
0
;
ctxt
.
enb_flag
=
1
;
ctxt
.
enb_flag
=
1
;
ctxt
.
instance
=
0
;
ctxt
.
instance
=
0
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment