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
Michael Black
OpenXG-RAN
Commits
4e024e1f
Commit
4e024e1f
authored
Sep 20, 2022
by
Thomas Schlichter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove unnecessary (void*) casts from files nr_dlsch_demodulation.c and nr_ulsch_ue.c
parent
f8de6232
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
15 deletions
+15
-15
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
+6
-6
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+9
-9
No files found.
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_demodulation.c
View file @
4e024e1f
...
...
@@ -1643,16 +1643,16 @@ void nr_dlsch_extract_rbs(int **rxdataF,
if
(
pilots
==
0
)
{
//data symbol only
if
(
aatx
==
0
)
{
if
(
start_re
+
nb_rb_pdsch
*
NR_NB_SC_PER_RB
<=
frame_parms
->
ofdm_symbol_size
)
{
memcpy
(
(
void
*
)
rxF_ext
,
(
void
*
)
&
rxF
[
start_re
],
nb_rb_pdsch
*
NR_NB_SC_PER_RB
*
sizeof
(
int32_t
));
memcpy
(
rxF_ext
,
&
rxF
[
start_re
],
nb_rb_pdsch
*
NR_NB_SC_PER_RB
*
sizeof
(
int32_t
));
}
else
{
int
neg_length
=
frame_parms
->
ofdm_symbol_size
-
start_re
;
int
pos_length
=
nb_rb_pdsch
*
NR_NB_SC_PER_RB
-
neg_length
;
memcpy
(
(
void
*
)
rxF_ext
,
(
void
*
)
&
rxF
[
start_re
],
neg_length
*
sizeof
(
int32_t
));
memcpy
(
(
void
*
)
&
rxF_ext
[
neg_length
],
(
void
*
)
rxF
,
pos_length
*
sizeof
(
int32_t
));
memcpy
(
rxF_ext
,
&
rxF
[
start_re
],
neg_length
*
sizeof
(
int32_t
));
memcpy
(
&
rxF_ext
[
neg_length
],
rxF
,
pos_length
*
sizeof
(
int32_t
));
}
}
memcpy
(
(
void
*
)
dl_ch0_ext
,
(
void
*
)
dl_ch0
,
nb_rb_pdsch
*
NR_NB_SC_PER_RB
*
sizeof
(
int32_t
));
memcpy
(
dl_ch0_ext
,
dl_ch0
,
nb_rb_pdsch
*
NR_NB_SC_PER_RB
*
sizeof
(
int32_t
));
}
else
if
(
config_type
==
NFAPI_NR_DMRS_TYPE1
){
if
(
n_dmrs_cdm_groups
==
1
)
{
//data is multiplexed
...
...
@@ -2353,9 +2353,9 @@ static void nr_dlsch_layer_demapping(int16_t **llr_cw,
switch
(
Nl
)
{
case
1
:
if
(
codeword_TB1
==
-
1
)
memcpy
(
(
void
*
)
llr_cw
[
0
],
(
void
*
)
llr_layers
[
0
],
(
length
)
*
sizeof
(
int16_t
));
memcpy
(
llr_cw
[
0
],
llr_layers
[
0
],
(
length
)
*
sizeof
(
int16_t
));
else
if
(
codeword_TB0
==
-
1
)
memcpy
(
(
void
*
)
llr_cw
[
1
],
(
void
*
)
llr_layers
[
0
],
(
length
)
*
sizeof
(
int16_t
));
memcpy
(
llr_cw
[
1
],
llr_layers
[
0
],
(
length
)
*
sizeof
(
int16_t
));
break
;
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
View file @
4e024e1f
...
...
@@ -497,28 +497,28 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
if
(
pmi
==
0
)
{
//unitary Precoding
if
(
k
+
NR_NB_SC_PER_RB
<=
frame_parms
->
ofdm_symbol_size
)
{
// RB does not cross DC
if
(
ap
<
pusch_pdu
->
nrOfLayers
)
memcpy
(
(
void
*
)
&
txdataF
[
ap
][
l
*
frame_parms
->
ofdm_symbol_size
+
k
],
(
void
*
)
&
tx_precoding
[
ap
][
2
*
(
l
*
frame_parms
->
ofdm_symbol_size
+
k
)],
memcpy
(
&
txdataF
[
ap
][
l
*
frame_parms
->
ofdm_symbol_size
+
k
],
&
tx_precoding
[
ap
][
2
*
(
l
*
frame_parms
->
ofdm_symbol_size
+
k
)],
NR_NB_SC_PER_RB
*
sizeof
(
int32_t
));
else
memset
(
(
void
*
)
&
txdataF
[
ap
][
l
*
frame_parms
->
ofdm_symbol_size
+
k
],
memset
(
&
txdataF
[
ap
][
l
*
frame_parms
->
ofdm_symbol_size
+
k
],
0
,
NR_NB_SC_PER_RB
*
sizeof
(
int32_t
));
}
else
{
// RB does cross DC
int
neg_length
=
frame_parms
->
ofdm_symbol_size
-
k
;
int
pos_length
=
NR_NB_SC_PER_RB
-
neg_length
;
if
(
ap
<
pusch_pdu
->
nrOfLayers
)
{
memcpy
(
(
void
*
)
&
txdataF
[
ap
][
l
*
frame_parms
->
ofdm_symbol_size
+
k
],
(
void
*
)
&
tx_precoding
[
ap
][
2
*
(
l
*
frame_parms
->
ofdm_symbol_size
+
k
)],
memcpy
(
&
txdataF
[
ap
][
l
*
frame_parms
->
ofdm_symbol_size
+
k
],
&
tx_precoding
[
ap
][
2
*
(
l
*
frame_parms
->
ofdm_symbol_size
+
k
)],
neg_length
*
sizeof
(
int32_t
));
memcpy
(
(
void
*
)
&
txdataF
[
ap
][
l
*
frame_parms
->
ofdm_symbol_size
],
(
void
*
)
&
tx_precoding
[
ap
][
2
*
(
l
*
frame_parms
->
ofdm_symbol_size
)],
memcpy
(
&
txdataF
[
ap
][
l
*
frame_parms
->
ofdm_symbol_size
],
&
tx_precoding
[
ap
][
2
*
(
l
*
frame_parms
->
ofdm_symbol_size
)],
pos_length
*
sizeof
(
int32_t
));
}
else
{
memset
(
(
void
*
)
&
txdataF
[
ap
][
l
*
frame_parms
->
ofdm_symbol_size
+
k
],
memset
(
&
txdataF
[
ap
][
l
*
frame_parms
->
ofdm_symbol_size
+
k
],
0
,
neg_length
*
sizeof
(
int32_t
));
memset
(
(
void
*
)
&
txdataF
[
ap
][
l
*
frame_parms
->
ofdm_symbol_size
],
memset
(
&
txdataF
[
ap
][
l
*
frame_parms
->
ofdm_symbol_size
],
0
,
pos_length
*
sizeof
(
int32_t
));
}
...
...
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