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
wangwenhui
OpenXG-RAN
Commits
efb7bd84
Commit
efb7bd84
authored
Jun 18, 2020
by
Raphael Defosseux
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CPPCHECK: fixes
Signed-off-by:
Raphael Defosseux
<
raphael.defosseux@eurecom.fr
>
parent
2eb799c3
Changes
11
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
16 additions
and
11 deletions
+16
-11
ci-scripts/cppcheck_suppressions.list
ci-scripts/cppcheck_suppressions.list
+1
-0
common/config/libconfig/config_libconfig.c
common/config/libconfig/config_libconfig.c
+1
-1
openair1/PHY/NR_TRANSPORT/nr_prach.c
openair1/PHY/NR_TRANSPORT/nr_prach.c
+0
-3
openair1/PHY/NR_TRANSPORT/pucch_rx.c
openair1/PHY/NR_TRANSPORT/pucch_rx.c
+1
-1
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+4
-1
openair1/PHY/TOOLS/nr_phy_scope.c
openair1/PHY/TOOLS/nr_phy_scope.c
+3
-0
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+2
-1
openair1/SIMULATION/NR_PHY/nr_dummy_functions_prach.c
openair1/SIMULATION/NR_PHY/nr_dummy_functions_prach.c
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
+1
-1
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+1
-1
No files found.
ci-scripts/cppcheck_suppressions.list
View file @
efb7bd84
...
...
@@ -37,6 +37,7 @@ memleak:openair2/UTIL/OMG/omg_hashtable.c
// _emm_as_encode function creates the encoded buffer
//
memleak:openair3/NAS/UE/EMM/SAP/emm_as.c
memleak:openair1/PHY/INIT/nr_init_ue.c
//-----------------------------------------------------------------------------
//*****************************************************************************
// section for files not used in oai exec's included in CI.
...
...
common/config/libconfig/config_libconfig.c
View file @
efb7bd84
...
...
@@ -180,7 +180,7 @@ int config_libconfig_get(paramdef_t *cfgoptions,int numoptions, char *prefix ) {
printf_params
(
"[LIBCONFIG] %s: %llu
\n
"
,
cfgpath
,(
long
long
unsigned
)(
*
(
cfgoptions
[
i
].
u64ptr
))
);
}
else
{
*
(
cfgoptions
[
i
].
i64ptr
)
=
llu
;
printf_params
(
"[LIBCONFIG] %s: %ll
u
\n
"
,
cfgpath
,(
long
long
)(
*
(
cfgoptions
[
i
].
i64ptr
))
);
printf_params
(
"[LIBCONFIG] %s: %ll
d
\n
"
,
cfgpath
,(
long
long
)(
*
(
cfgoptions
[
i
].
i64ptr
))
);
}
}
else
{
defval
=
config_setdefault_int64
(
&
(
cfgoptions
[
i
]),
prefix
);
...
...
openair1/PHY/NR_TRANSPORT/nr_prach.c
View file @
efb7bd84
...
...
@@ -563,9 +563,6 @@ void rx_nr_prach(PHY_VARS_gNB *gNB,
int16_t
prach_ifft_tmp
[
2048
*
2
]
__attribute__
((
aligned
(
32
)));
int32_t
*
prach_ifft
=
(
int32_t
*
)
NULL
;
AssertFatal
(
gNB
!=
NULL
,
"gNB is null
\n
"
);
fp
=
&
gNB
->
frame_parms
;
nb_rx
=
gNB
->
gNB_config
.
carrier_config
.
num_rx_ant
.
value
;
...
...
openair1/PHY/NR_TRANSPORT/pucch_rx.c
View file @
efb7bd84
...
...
@@ -1456,7 +1456,7 @@ void nr_decode_pucch2(PHY_VARS_gNB *gNB,
// non-coherent LLR computation on groups of 4 REs (half-PRBs)
int32_t
corr_re
,
corr_im
,
corr_tmp
;
__m128i
corr16
,
llr_num
,
llr_den
;
uint64_t
corr
;
uint64_t
corr
=
0
;
for
(
int
half_prb
=
0
;
half_prb
<
(
2
*
pucch_pdu
->
prb_size
);
half_prb
++
)
{
llr_num
=
_mm_set1_epi16
(
0
);
llr_den
=
_mm_set1_epi16
(
0
);
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
View file @
efb7bd84
...
...
@@ -211,7 +211,7 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
dlsch1_harq
=
dlsch
[
1
]
->
harq_processes
[
codeword_TB1
];
#ifdef DEBUG_HARQ
printf
(
"[DEMOD] I am assuming only TB1 is active, it is in cw %d
\n
"
,
dlsch
0
_harq
->
codeword
);
printf
(
"[DEMOD] I am assuming only TB1 is active, it is in cw %d
\n
"
,
dlsch
1
_harq
->
codeword
);
#endif
AssertFatal
(
1
==
0
,
"[UE][FATAL] DLSCH: TB0 not active and TB1 active case is not supported %d
\n
"
);
...
...
@@ -230,6 +230,9 @@ int nr_rx_pdsch(PHY_VARS_NR_UE *ue,
}
if
(
dlsch0_harq
=
NULL
)
AssertFatal
(
1
==
0
,
"Done
\n
"
);
dlsch0_harq
->
Qm
=
nr_get_Qm_dl
(
dlsch
[
0
]
->
harq_processes
[
harq_pid
]
->
mcs
,
dlsch
[
0
]
->
harq_processes
[
harq_pid
]
->
mcs_table
);
dlsch0_harq
->
R
=
nr_get_code_rate_dl
(
dlsch
[
0
]
->
harq_processes
[
harq_pid
]
->
mcs
,
dlsch
[
0
]
->
harq_processes
[
harq_pid
]
->
mcs_table
);
...
...
openair1/PHY/TOOLS/nr_phy_scope.c
View file @
efb7bd84
...
...
@@ -286,6 +286,8 @@ static void puschIQ (FL_OBJECT *graph, PHY_VARS_gNB *phy_vars_gnb, RU_t *phy_var
fl_set_xyplot_data
(
graph
,
I
,
Q
,
sz
,
""
,
""
,
""
);
// PUSCH I/Q of MF Output
// Code to fixed, disabled for cppcheck
#if 0
if (NULL) {
int32_t *pucch1ab_comp = (int32_t *) NULL; //phy_vars_gnb->pucch1ab_stats[UE_id];
int32_t *pucch1_comp = (int32_t *) NULL; //phy_vars_gnb->pucch1_stats[UE_id];
...
...
@@ -307,6 +309,7 @@ static void puschIQ (FL_OBJECT *graph, PHY_VARS_gNB *phy_vars_gnb, RU_t *phy_var
fl_set_xyplot_xbounds(graph,-5000,5000);
fl_set_xyplot_ybounds(graph,0,80);
}
#endif
}
static
void
pucchEnergy
(
FL_OBJECT
*
graph
,
PHY_VARS_gNB
*
phy_vars_gnb
,
RU_t
*
phy_vars_ru
,
int
UE_id
)
{
...
...
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
efb7bd84
...
...
@@ -4111,12 +4111,13 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
LOG_D
(
PHY
,
"[UE %d] Frame %d, nr_tti_rx %d: found %d DCIs
\n
"
,
ue
->
Mod_id
,
frame_rx
,
nr_tti_rx
,
dci_cnt
);
NR_UE_DLSCH_t
*
dlsch
;
NR_UE_DLSCH_t
*
dlsch
=
NULL
;
if
(
ue
->
dlsch
[
ue
->
current_thread_id
[
nr_tti_rx
]][
eNB_id
][
0
]
->
active
==
1
){
dlsch
=
ue
->
dlsch
[
ue
->
current_thread_id
[
nr_tti_rx
]][
eNB_id
][
0
];
}
else
if
(
ue
->
dlsch_ra
[
0
]
->
active
==
1
){
dlsch
=
ue
->
dlsch_ra
[
0
];
}
AssertFatal
(
dlsch
!=
NULL
,
"Unsupported mode
\n
"
);
uint8_t
harq_pid
=
dlsch
->
current_harq_pid
;
NR_DL_UE_HARQ_t
*
dlsch0_harq
=
dlsch
->
harq_processes
[
harq_pid
];
uint16_t
nb_symb_sch
=
dlsch0_harq
->
nb_symbols
;
...
...
openair1/SIMULATION/NR_PHY/nr_dummy_functions_prach.c
View file @
efb7bd84
...
...
@@ -91,7 +91,7 @@ void nr_get_prach_resources(module_id_t mod_id,
NR_RACH_ConfigCommon_t
*
nr_rach_ConfigCommon
;
// NR_BeamFailureRecoveryConfig_t *beam_failure_recovery_config = &mac->RA_BeamFailureRecoveryConfig; // todo
int
messagePowerOffsetGroupB
,
messageSizeGroupA
,
PLThreshold
,
sizeOfRA_PreamblesGroupA
,
numberOfRA_Preambles
,
i
,
deltaPreamble_Msg3
;
int
messagePowerOffsetGroupB
=
0
,
messageSizeGroupA
,
PLThreshold
,
sizeOfRA_PreamblesGroupA
,
numberOfRA_Preambles
,
i
,
deltaPreamble_Msg3
=
0
;
uint8_t
noGroupB
=
0
,
s_id
,
f_id
,
ul_carrier_id
,
msg1_FDM
,
prach_ConfigIndex
,
SFN_nbr
,
Msg3_size
;
// NR_RSRP_Range_t rsrp_ThresholdSSB; // todo
...
...
openair2/LAYER2/NR_MAC_UE/nr_ra_procedures.c
View file @
efb7bd84
...
...
@@ -88,7 +88,7 @@ void nr_get_prach_resources(module_id_t mod_id,
// NR_BeamFailureRecoveryConfig_t *beam_failure_recovery_config = &mac->RA_BeamFailureRecoveryConfig; // todo
int
messagePowerOffsetGroupB
,
messageSizeGroupA
,
PLThreshold
,
sizeOfRA_PreamblesGroupA
,
numberOfRA_Preambles
,
i
,
deltaPreamble_Msg3
;
int
messagePowerOffsetGroupB
=
0
,
messageSizeGroupA
,
PLThreshold
,
sizeOfRA_PreamblesGroupA
,
numberOfRA_Preambles
,
i
,
deltaPreamble_Msg3
=
0
;
uint8_t
noGroupB
=
0
,
s_id
,
f_id
,
ul_carrier_id
,
prach_ConfigIndex
,
SFN_nbr
,
Msg3_size
;
AssertFatal
(
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
!=
NULL
,
"[UE %d] FATAL nr_rach_ConfigCommon is NULL !!!
\n
"
,
mod_id
);
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_procedures.c
View file @
efb7bd84
...
...
@@ -934,7 +934,7 @@ void nr_ue_msg2_scheduler(module_id_t mod_id,
// and if the slot is not among the PDCCH monitored ones (38.213 10.1)
while
((
*
msg2_slot
>
slot_limit
)
||
((
*
msg2_frame
*
nr_slots_per_frame
[
mu
]
+
*
msg2_slot
-
monitoring_offset
)
%
monitoring_slot_period
!=
0
))
{
if
((
*
msg2_slot
%
tdd_period_slot
)
>
0
)
*
msg2_slot
--
;
(
*
msg2_slot
)
--
;
else
AssertFatal
(
1
==
0
,
"No available DL slot to schedule reception of msg2 has been found"
);
}
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
efb7bd84
...
...
@@ -225,7 +225,7 @@ void nr_schedule_msg2(uint16_t rach_frame, uint16_t rach_slot,
// and if the slot is not among the PDCCH monitored ones (38.213 10.1)
while
((
*
msg2_slot
>
slot_limit
)
||
((
*
msg2_frame
*
nr_slots_per_frame
[
mu
]
+*
msg2_slot
-
monitoring_offset
)
%
monitoring_slot_period
!=
0
))
{
if
((
*
msg2_slot
%
tdd_period_slot
)
>
0
)
*
msg2_slot
--
;
(
*
msg2_slot
)
--
;
else
AssertFatal
(
1
==
0
,
"No available DL slot to schedule msg2 has been found"
);
}
...
...
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