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
lizhongxiao
OpenXG-RAN
Commits
9f7b1590
Commit
9f7b1590
authored
Jul 18, 2023
by
rmagueta
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove duplicated function freq2time()
parent
39919152
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
79 deletions
+43
-79
CMakeLists.txt
CMakeLists.txt
+1
-0
common/utils/nr/nr_common.c
common/utils/nr/nr_common.c
+38
-0
common/utils/nr/nr_common.h
common/utils/nr/nr_common.h
+4
-0
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+0
-40
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
+0
-39
No files found.
CMakeLists.txt
View file @
9f7b1590
...
...
@@ -1112,6 +1112,7 @@ set(PHY_SRC_UE ${PHY_SRC_UE} ${OPENAIR1_DIR}/PHY/LTE_UE_TRANSPORT/dlsch_llr_comp
set
(
PHY_NR_UE_SRC
${
PHY_NR_UE_SRC
}
${
OPENAIR1_DIR
}
/PHY/LTE_UE_TRANSPORT/dlsch_llr_computation_avx2.c
)
add_library
(
PHY_COMMON
${
PHY_SRC_COMMON
}
)
target_link_libraries
(
PHY_COMMON PRIVATE shlib_loader
)
add_dependencies
(
PHY_COMMON dfts
)
target_link_libraries
(
PHY_COMMON PRIVATE asn1_lte_rrc_hdrs
)
...
...
common/utils/nr/nr_common.c
View file @
9f7b1590
...
...
@@ -763,3 +763,41 @@ void init_delay_table(uint16_t ofdm_symbol_size,
}
}
}
void
freq2time
(
uint16_t
ofdm_symbol_size
,
int16_t
*
freq_signal
,
int16_t
*
time_signal
)
{
switch
(
ofdm_symbol_size
)
{
case
128
:
idft
(
IDFT_128
,
freq_signal
,
time_signal
,
1
);
break
;
case
256
:
idft
(
IDFT_256
,
freq_signal
,
time_signal
,
1
);
break
;
case
512
:
idft
(
IDFT_512
,
freq_signal
,
time_signal
,
1
);
break
;
case
1024
:
idft
(
IDFT_1024
,
freq_signal
,
time_signal
,
1
);
break
;
case
1536
:
idft
(
IDFT_1536
,
freq_signal
,
time_signal
,
1
);
break
;
case
2048
:
idft
(
IDFT_2048
,
freq_signal
,
time_signal
,
1
);
break
;
case
4096
:
idft
(
IDFT_4096
,
freq_signal
,
time_signal
,
1
);
break
;
case
6144
:
idft
(
IDFT_6144
,
freq_signal
,
time_signal
,
1
);
break
;
case
8192
:
idft
(
IDFT_8192
,
freq_signal
,
time_signal
,
1
);
break
;
default:
AssertFatal
(
1
==
0
,
"Invalid ofdm_symbol_size %i
\n
"
,
ofdm_symbol_size
);
break
;
}
}
common/utils/nr/nr_common.h
View file @
9f7b1590
...
...
@@ -125,6 +125,10 @@ uint32_t get_ssb_offset_to_pointA(uint32_t absoluteFrequencySSB,
int
get_ssb_subcarrier_offset
(
uint32_t
absoluteFrequencySSB
,
uint32_t
absoluteFrequencyPointA
);
int
get_delay_idx
(
int
delay
,
int
max_delay_comp
);
void
freq2time
(
uint16_t
ofdm_symbol_size
,
int16_t
*
freq_signal
,
int16_t
*
time_signal
);
#define CEILIDIV(a,b) ((a+b-1)/b)
#define ROUNDIDIV(a,b) (((a<<1)+b)/(b<<1))
...
...
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
View file @
9f7b1590
...
...
@@ -42,46 +42,6 @@
#define NO_INTERP 1
#define dBc(x,y) (dB_fixed(((int32_t)(x))*(x) + ((int32_t)(y))*(y)))
static
void
freq2time
(
uint16_t
ofdm_symbol_size
,
int16_t
*
freq_signal
,
int16_t
*
time_signal
)
{
switch
(
ofdm_symbol_size
)
{
case
128
:
idft
(
IDFT_128
,
freq_signal
,
time_signal
,
1
);
break
;
case
256
:
idft
(
IDFT_256
,
freq_signal
,
time_signal
,
1
);
break
;
case
512
:
idft
(
IDFT_512
,
freq_signal
,
time_signal
,
1
);
break
;
case
1024
:
idft
(
IDFT_1024
,
freq_signal
,
time_signal
,
1
);
break
;
case
1536
:
idft
(
IDFT_1536
,
freq_signal
,
time_signal
,
1
);
break
;
case
2048
:
idft
(
IDFT_2048
,
freq_signal
,
time_signal
,
1
);
break
;
case
4096
:
idft
(
IDFT_4096
,
freq_signal
,
time_signal
,
1
);
break
;
case
6144
:
idft
(
IDFT_6144
,
freq_signal
,
time_signal
,
1
);
break
;
case
8192
:
idft
(
IDFT_8192
,
freq_signal
,
time_signal
,
1
);
break
;
default:
idft
(
IDFT_512
,
freq_signal
,
time_signal
,
1
);
break
;
}
}
__attribute__
((
always_inline
))
inline
c16_t
c32x16cumulVectVectWithSteps
(
c16_t
*
in1
,
int
*
offset1
,
const
int
step1
,
...
...
openair1/PHY/NR_UE_ESTIMATION/nr_dl_channel_estimation.c
View file @
9f7b1590
...
...
@@ -1303,45 +1303,6 @@ void nr_pdcch_channel_estimation(PHY_VARS_NR_UE *ue,
}
}
static
void
freq2time
(
uint16_t
ofdm_symbol_size
,
int16_t
*
freq_signal
,
int16_t
*
time_signal
)
{
switch
(
ofdm_symbol_size
)
{
case
128
:
idft
(
IDFT_128
,
freq_signal
,
time_signal
,
1
);
break
;
case
256
:
idft
(
IDFT_256
,
freq_signal
,
time_signal
,
1
);
break
;
case
512
:
idft
(
IDFT_512
,
freq_signal
,
time_signal
,
1
);
break
;
case
1024
:
idft
(
IDFT_1024
,
freq_signal
,
time_signal
,
1
);
break
;
case
1536
:
idft
(
IDFT_1536
,
freq_signal
,
time_signal
,
1
);
break
;
case
2048
:
idft
(
IDFT_2048
,
freq_signal
,
time_signal
,
1
);
break
;
case
4096
:
idft
(
IDFT_4096
,
freq_signal
,
time_signal
,
1
);
break
;
case
6144
:
idft
(
IDFT_6144
,
freq_signal
,
time_signal
,
1
);
break
;
case
8192
:
idft
(
IDFT_8192
,
freq_signal
,
time_signal
,
1
);
break
;
default:
AssertFatal
(
1
==
0
,
"Invalid ofdm_symbol_size %i
\n
"
,
ofdm_symbol_size
);
break
;
}
}
void
nr_est_delay_pdsch
(
const
NR_DL_FRAME_PARMS
*
frame_parms
,
const
c16_t
*
dl_ls_est
,
delay_t
*
delay
)
{
c16_t
dl_ch_estimates_time
[
frame_parms
->
ofdm_symbol_size
]
__attribute__
((
aligned
(
32
)));
...
...
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