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
spbro
OpenXG-RAN
Commits
7e93eef4
Commit
7e93eef4
authored
Jan 15, 2021
by
Thomas Schlichter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix unsigned/signed warning regarding nr_(i)dft
parent
691ad0bb
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
9 deletions
+9
-9
openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
+1
-1
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
+4
-4
openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
+2
-2
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+2
-2
No files found.
openair1/PHY/NR_TRANSPORT/nr_transport_proto.h
View file @
7e93eef4
...
@@ -212,7 +212,7 @@ void nr_ulsch_channel_compensation(int **rxdataF_ext,
...
@@ -212,7 +212,7 @@ void nr_ulsch_channel_compensation(int **rxdataF_ext,
\param z Pointer to input in frequnecy domain, and it is also the output in time domain
\param z Pointer to input in frequnecy domain, and it is also the output in time domain
\param Msc_PUSCH number of allocated data subcarriers
\param Msc_PUSCH number of allocated data subcarriers
*/
*/
void
nr_idft
(
u
int32_t
*
z
,
uint32_t
Msc_PUSCH
);
void
nr_idft
(
int32_t
*
z
,
uint32_t
Msc_PUSCH
);
/** \brief This function generates log-likelihood ratios (decoder input) for single-stream QPSK received waveforms.
/** \brief This function generates log-likelihood ratios (decoder input) for single-stream QPSK received waveforms.
@param rxdataF_comp Compensated channel output
@param rxdataF_comp Compensated channel output
...
...
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
View file @
7e93eef4
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
//#define DEBUG_RB_EXT
//#define DEBUG_RB_EXT
//#define DEBUG_CH_MAG
//#define DEBUG_CH_MAG
void
nr_idft
(
u
int32_t
*
z
,
uint32_t
Msc_PUSCH
)
void
nr_idft
(
int32_t
*
z
,
uint32_t
Msc_PUSCH
)
{
{
#if defined(__x86_64__) || defined(__i386__)
#if defined(__x86_64__) || defined(__i386__)
...
@@ -38,7 +38,7 @@ void nr_idft(uint32_t *z, uint32_t Msc_PUSCH)
...
@@ -38,7 +38,7 @@ void nr_idft(uint32_t *z, uint32_t Msc_PUSCH)
}
}
for
(
i
=
0
,
ip
=
0
;
i
<
Msc_PUSCH
;
i
++
,
ip
+=
4
)
{
for
(
i
=
0
,
ip
=
0
;
i
<
Msc_PUSCH
;
i
++
,
ip
+=
4
)
{
((
u
int32_t
*
)
idft_in0
)[
ip
+
0
]
=
z
[
i
];
((
int32_t
*
)
idft_in0
)[
ip
+
0
]
=
z
[
i
];
}
}
...
@@ -203,7 +203,7 @@ void nr_idft(uint32_t *z, uint32_t Msc_PUSCH)
...
@@ -203,7 +203,7 @@ void nr_idft(uint32_t *z, uint32_t Msc_PUSCH)
for
(
i
=
0
,
ip
=
0
;
i
<
Msc_PUSCH
;
i
++
,
ip
+=
4
)
{
for
(
i
=
0
,
ip
=
0
;
i
<
Msc_PUSCH
;
i
++
,
ip
+=
4
)
{
z
[
i
]
=
((
u
int32_t
*
)
idft_out0
)[
ip
];
z
[
i
]
=
((
int32_t
*
)
idft_out0
)[
ip
];
}
}
// conjugate output
// conjugate output
...
@@ -1232,7 +1232,7 @@ int nr_rx_pusch(PHY_VARS_gNB *gNB,
...
@@ -1232,7 +1232,7 @@ int nr_rx_pusch(PHY_VARS_gNB *gNB,
#endif
#endif
// perform IDFT operation on the compensated rxdata if transform precoding is enabled
// perform IDFT operation on the compensated rxdata if transform precoding is enabled
nr_idft
(
&
((
uint32_t
*
)
gNB
->
pusch_vars
[
ulsch_id
]
->
rxdataF_comp
[
0
])[
symbol
*
nb_re_pusch2
],
nb_re_pusch
);
nr_idft
(
&
gNB
->
pusch_vars
[
ulsch_id
]
->
rxdataF_comp
[
0
][
symbol
*
nb_re_pusch2
],
nb_re_pusch
);
LOG_D
(
PHY
,
"Transform precoding being done on data- symbol: %d, nb_re_pusch: %d
\n
"
,
symbol
,
nb_re_pusch
);
LOG_D
(
PHY
,
"Transform precoding being done on data- symbol: %d, nb_re_pusch: %d
\n
"
,
symbol
,
nb_re_pusch
);
}
}
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_transport_ue.h
View file @
7e93eef4
...
@@ -181,9 +181,9 @@ typedef struct {
...
@@ -181,9 +181,9 @@ typedef struct {
/// Scrambled "b"-sequences (for definition see 36-211 V8.6 2009-03, p.14)
/// Scrambled "b"-sequences (for definition see 36-211 V8.6 2009-03, p.14)
uint8_t
b_tilde
[
MAX_NUM_NR_CHANNEL_BITS
];
uint8_t
b_tilde
[
MAX_NUM_NR_CHANNEL_BITS
];
/// Modulated "d"-sequences (for definition see 36-211 V8.6 2009-03, p.14)
/// Modulated "d"-sequences (for definition see 36-211 V8.6 2009-03, p.14)
u
int32_t
d_mod
[
MAX_NUM_NR_RE
]
__attribute__
((
aligned
(
16
)));
int32_t
d_mod
[
MAX_NUM_NR_RE
]
__attribute__
((
aligned
(
16
)));
/// Transform-coded "y"-sequences (for definition see 38-211 V15.3.0 2018-09, subsection 6.3.1.4)
/// Transform-coded "y"-sequences (for definition see 38-211 V15.3.0 2018-09, subsection 6.3.1.4)
u
int32_t
y
[
MAX_NUM_NR_RE
]
__attribute__
((
aligned
(
16
)));
int32_t
y
[
MAX_NUM_NR_RE
]
__attribute__
((
aligned
(
16
)));
/*
/*
/// "q" sequences for CQI/PMI (for definition see 36-212 V8.6 2009-03, p.27)
/// "q" sequences for CQI/PMI (for definition see 36-212 V8.6 2009-03, p.27)
uint8_t q[MAX_CQI_PAYLOAD];
uint8_t q[MAX_CQI_PAYLOAD];
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
View file @
7e93eef4
...
@@ -286,7 +286,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
...
@@ -286,7 +286,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
}
}
#ifdef DEBUG_DFT_IDFT
#ifdef DEBUG_DFT_IDFT
u
int32_t
debug_symbols
[
MAX_NUM_NR_RE
]
__attribute__
((
aligned
(
16
)));
int32_t
debug_symbols
[
MAX_NUM_NR_RE
]
__attribute__
((
aligned
(
16
)));
int
offset
=
0
;
int
offset
=
0
;
printf
(
"NR_ULSCH_UE: available_bits: %d, mod_order: %d"
,
available_bits
,
mod_order
);
printf
(
"NR_ULSCH_UE: available_bits: %d, mod_order: %d"
,
available_bits
,
mod_order
);
...
@@ -303,7 +303,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
...
@@ -303,7 +303,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
}
}
LOG_M
(
"preDFT_all_symbols.m"
,
"UE_preDFT"
,
tx_layers
[
0
],
number_of_symbols
*
nb_re_pusch
,
1
,
1
);
LOG_M
(
"preDFT_all_symbols.m"
,
"UE_preDFT"
,
tx_layers
[
0
],
number_of_symbols
*
nb_re_pusch
,
1
,
1
);
LOG_M
(
"postDFT_all_symbols.m"
,
"UE_postDFT"
,
&
(
ulsch_ue
->
y
[
0
])
,
number_of_symbols
*
nb_re_pusch
,
1
,
1
);
LOG_M
(
"postDFT_all_symbols.m"
,
"UE_postDFT"
,
ulsch_ue
->
y
,
number_of_symbols
*
nb_re_pusch
,
1
,
1
);
LOG_M
(
"DEBUG_IDFT_SYMBOLS.m"
,
"UE_Debug_IDFT"
,
debug_symbols
,
number_of_symbols
*
nb_re_pusch
,
1
,
1
);
LOG_M
(
"DEBUG_IDFT_SYMBOLS.m"
,
"UE_Debug_IDFT"
,
debug_symbols
,
number_of_symbols
*
nb_re_pusch
,
1
,
1
);
LOG_M
(
"UE_DMRS_SEQ.m"
,
"UE_DMRS_SEQ"
,
dmrs_seq
,
nb_re_pusch
,
1
,
1
);
LOG_M
(
"UE_DMRS_SEQ.m"
,
"UE_DMRS_SEQ"
,
dmrs_seq
,
nb_re_pusch
,
1
,
1
);
#endif
#endif
...
...
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