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
277dc11e
Commit
277dc11e
authored
Jul 28, 2020
by
yaojie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix cppcheck warning
parent
72c11e64
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
30 additions
and
11 deletions
+30
-11
common/utils/ocp_itti/intertask_interface.cpp
common/utils/ocp_itti/intertask_interface.cpp
+1
-1
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+2
-2
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+2
-2
openair1/SCHED_UE/phy_procedures_lte_ue.c
openair1/SCHED_UE/phy_procedures_lte_ue.c
+2
-2
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
+2
-2
openair2/RRC/LTE/MESSAGES/asn1_msg.c
openair2/RRC/LTE/MESSAGES/asn1_msg.c
+2
-0
openair2/X2AP/x2ap_eNB_handler.c
openair2/X2AP/x2ap_eNB_handler.c
+17
-0
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+2
-2
No files found.
common/utils/ocp_itti/intertask_interface.cpp
View file @
277dc11e
...
...
@@ -69,7 +69,7 @@ task_list_t tasks[TASK_MAX];
if
(
leP
!=
NULL
)
{
free
(
leP
);
LOG_D
(
TMR
,
"intertask_interface free_mem_block is called, after free leP is %p
\n
"
,
leP
);
leP
=
NULL
;
//prevent double free
//
leP = NULL; //prevent double free
}
else
{
LOG_I
(
TMR
,
"intertask_interface free_mem_block is called, but before free leP is NULL
\n
"
);
}
...
...
openair1/PHY/INIT/nr_parms.c
View file @
277dc11e
...
...
@@ -257,7 +257,7 @@ int nr_init_frame_parms(nfapi_nr_config_request_scf_t* cfg,
fp
->
N_RB_UL
=
cfg
->
carrier_config
.
ul_grid_size
[
cfg
->
ssb_config
.
scs_common
.
value
].
value
;
int
Ncp
=
NFAPI_CP_NORMAL
;
int
mu
=
cfg
!=
NULL
?
cfg
->
ssb_config
.
scs_common
.
value
:
0
;
int
mu
=
cfg
->
ssb_config
.
scs_common
.
value
;
#if DISABLE_LOG_X
printf
(
"Initializing frame parms for mu %d, N_RB %d, Ncp %d
\n
"
,
mu
,
fp
->
N_RB_DL
,
Ncp
);
...
...
@@ -305,7 +305,7 @@ int nr_init_frame_parms(nfapi_nr_config_request_scf_t* cfg,
}
fp
->
N_ssb
=
0
;
int
num_tx_ant
=
(
cfg
==
NULL
)
?
fp
->
Lmax
:
cfg
->
carrier_config
.
num_tx_ant
.
value
;
int
num_tx_ant
=
cfg
->
carrier_config
.
num_tx_ant
.
value
;
for
(
int
p
=
0
;
p
<
num_tx_ant
;
p
++
)
fp
->
N_ssb
+=
((
fp
->
L_ssb
>>
p
)
&
0x01
);
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
277dc11e
...
...
@@ -3721,8 +3721,8 @@ void *UE_thread_slot1_dl_processing(void *arg) {
CPU_SET
(
threads
.
slot1_proc_one
,
&
cpuset
);
if
(
(
proc
->
sub_frame_start
+
1
)
%
RX_NB_TH
==
1
&&
threads
.
slot1_proc_two
!=
-
1
)
CPU_SET
(
threads
.
slot1_proc_two
,
&
cpuset
);
if
(
(
proc
->
sub_frame_start
+
1
)
%
RX_NB_TH
==
2
&&
threads
.
slot1_proc_three
!=
-
1
)
CPU_SET
(
threads
.
slot1_proc_three
,
&
cpuset
);
//if ( (proc->sub_frame_start+1)%RX_NB_TH == 2 && threads.slot1_proc_three != -1 ) //(proc->sub_frame_start+1)%RX_NB_TH is always less than 2.
//
CPU_SET(threads.slot1_proc_three, &cpuset);
init_thread
(
900000
,
1000000
,
FIFO_PRIORITY
-
1
,
&
cpuset
,
threadname
);
...
...
openair1/SCHED_UE/phy_procedures_lte_ue.c
View file @
277dc11e
...
...
@@ -3682,8 +3682,8 @@ void *UE_thread_slot1_dl_processing(void *arg) {
if
(
(
proc
->
sub_frame_start
+
1
)
%
RX_NB_TH
==
1
&&
threads
.
slot1_proc_two
!=
-
1
)
CPU_SET
(
threads
.
slot1_proc_two
,
&
cpuset
);
if
(
(
proc
->
sub_frame_start
+
1
)
%
RX_NB_TH
==
2
&&
threads
.
slot1_proc_three
!=
-
1
)
CPU_SET
(
threads
.
slot1_proc_three
,
&
cpuset
);
//if ( (proc->sub_frame_start+1)%RX_NB_TH == 2 && threads.slot1_proc_three != -1 ) //(proc->sub_frame_start+1)%RX_NB_TH it is always less than 2.
//
CPU_SET(threads.slot1_proc_three, &cpuset);
init_thread
(
900000
,
1000000
,
FIFO_PRIORITY
-
1
,
&
cpuset
,
threadname
);
...
...
openair2/LAYER2/MAC/eNB_scheduler_primitives.c
View file @
277dc11e
...
...
@@ -2241,7 +2241,7 @@ get_numnarrowbands(long dl_Bandwidth)
//------------------------------------------------------------------------------
{
int
nb_tab
[
6
]
=
{
1
,
2
,
4
,
8
,
12
,
16
};
if
(
dl_Bandwidth
>=
7
&&
dl_Bandwidth
<
0
)
{
if
(
dl_Bandwidth
>=
7
||
dl_Bandwidth
<
0
)
{
LOG_E
(
MAC
,
"dl_Bandwidth not in [0..6]
\n
"
);
return
(
-
1
);
}
...
...
@@ -2254,7 +2254,7 @@ get_numnarrowbandbits(long dl_Bandwidth)
//------------------------------------------------------------------------------
{
int
nbbits_tab
[
6
]
=
{
0
,
1
,
2
,
3
,
4
,
4
};
if
(
dl_Bandwidth
>=
7
&&
dl_Bandwidth
<
0
)
{
if
(
dl_Bandwidth
>=
7
||
dl_Bandwidth
<
0
)
{
LOG_E
(
MAC
,
"dl_Bandwidth not in [0..6]
\n
"
);
return
(
-
1
);
}
...
...
openair2/RRC/LTE/MESSAGES/asn1_msg.c
View file @
277dc11e
...
...
@@ -217,6 +217,8 @@ uint8_t do_MIB_FeMBMS(rrc_eNB_carrier_data_t *carrier, uint32_t N_RB_DL, uint32_
default:
LOG_E
(
RRC
,
"Unknown dl_Bandwidth %d
\n
"
,
N_RB_DL
);
free
(
spare
);
spare
=
NULL
;
return
(
-
1
);
}
...
...
openair2/X2AP/x2ap_eNB_handler.c
View file @
277dc11e
...
...
@@ -1794,6 +1794,11 @@ int x2ap_gNB_handle_ENDC_sGNB_addition_request (instance_t instance,
X2AP_FIND_PROTOCOLIE_BY_ID
(
X2AP_SgNBAdditionRequest_IEs_t
,
ie
,
x2SgNBAdditionRequest
,
X2AP_ProtocolIE_ID_id_NRUESecurityCapabilities
,
true
);
if
(
ie
==
NULL
)
{
X2AP_ERROR
(
"%s %d: ie is a NULL pointer
\n
"
,
__FILE__
,
__LINE__
);
return
-
1
;
}
X2AP_ENDC_SGNB_ADDITION_REQ
(
msg
).
security_capabilities
.
encryption_algorithms
=
BIT_STRING_to_uint16
(
&
ie
->
value
.
choice
.
NRUESecurityCapabilities
.
nRencryptionAlgorithms
);
...
...
@@ -1804,6 +1809,10 @@ int x2ap_gNB_handle_ENDC_sGNB_addition_request (instance_t instance,
X2AP_FIND_PROTOCOLIE_BY_ID
(
X2AP_SgNBAdditionRequest_IEs_t
,
ie
,
x2SgNBAdditionRequest
,
X2AP_ProtocolIE_ID_id_SgNBSecurityKey
,
true
);
if
(
ie
==
NULL
)
{
X2AP_ERROR
(
"%s %d: ie is a NULL pointer
\n
"
,
__FILE__
,
__LINE__
);
return
-
1
;
}
if
((
ie
->
value
.
choice
.
SgNBSecurityKey
.
buf
)
&&
(
ie
->
value
.
choice
.
SgNBSecurityKey
.
size
==
32
))
{
memcpy
(
X2AP_ENDC_SGNB_ADDITION_REQ
(
msg
).
kgnb
,
ie
->
value
.
choice
.
SgNBSecurityKey
.
buf
,
32
);
...
...
@@ -1823,6 +1832,10 @@ int x2ap_gNB_handle_ENDC_sGNB_addition_request (instance_t instance,
X2AP_FIND_PROTOCOLIE_BY_ID
(
X2AP_SgNBAdditionRequest_IEs_t
,
ie
,
x2SgNBAdditionRequest
,
X2AP_ProtocolIE_ID_id_E_RABs_ToBeAdded_SgNBAddReqList
,
true
);
if
(
ie
==
NULL
)
{
X2AP_ERROR
(
"%s %d: ie is a NULL pointer
\n
"
,
__FILE__
,
__LINE__
);
return
-
1
;
}
if
(
ie
->
value
.
choice
.
E_RABs_ToBeAdded_SgNBAddReqList
.
list
.
count
>
0
)
{
...
...
@@ -1871,6 +1884,10 @@ LOG_I(RRC,"x2u tunnel: index %d target sgw ip %d.%d.%d.%d length %d gtp teid %u\
X2AP_FIND_PROTOCOLIE_BY_ID
(
X2AP_SgNBAdditionRequest_IEs_t
,
ie
,
x2SgNBAdditionRequest
,
X2AP_ProtocolIE_ID_id_MeNBtoSgNBContainer
,
true
);
if
(
ie
==
NULL
)
{
X2AP_ERROR
(
"%s %d: ie is a NULL pointer
\n
"
,
__FILE__
,
__LINE__
);
return
-
1
;
}
if
(
ie
->
value
.
choice
.
MeNBtoSgNBContainer
.
size
>
8192
)
{
printf
(
"%s:%d: fatal: buffer too big
\n
"
,
__FILE__
,
__LINE__
);
abort
();
}
...
...
targets/RT/USER/lte-ue.c
View file @
277dc11e
...
...
@@ -825,8 +825,8 @@ static void *UE_thread_rxn_txnp4(void *arg)
if
(
(
proc
->
sub_frame_start
+
1
)
%
RX_NB_TH
==
1
&&
threads
.
two
!=
-
1
)
CPU_SET
(
threads
.
two
,
&
cpuset
);
if
(
(
proc
->
sub_frame_start
+
1
)
%
RX_NB_TH
==
2
&&
threads
.
three
!=
-
1
)
CPU_SET
(
threads
.
three
,
&
cpuset
);
//
if ( (proc->sub_frame_start+1)%RX_NB_TH == 2 && threads.three != -1 )
//
CPU_SET(threads.three, &cpuset);
//CPU_SET(threads.three, &cpuset);
init_thread
(
900000
,
1000000
,
FIFO_PRIORITY
-
1
,
&
cpuset
,
...
...
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