Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
O
OpenXG UE
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 UE
Commits
1aaf9847
Commit
1aaf9847
authored
4 years ago
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
initial sync ok if SSB in the middle
parent
9f4ac56c
master
develop_arm_ue
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+3
-4
openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
+1
-1
openair1/PHY/NR_UE_TRANSPORT/sss_nr.c
openair1/PHY/NR_UE_TRANSPORT/sss_nr.c
+5
-4
No files found.
openair1/PHY/INIT/nr_parms.c
View file @
1aaf9847
...
...
@@ -320,7 +320,6 @@ int nr_init_frame_parms_ue(NR_DL_FRAME_PARMS *fp,
sco
=
config
->
ssb_table
.
ssb_subcarrier_offset
;
fp
->
ssb_start_subcarrier
=
(
12
*
config
->
ssb_table
.
ssb_offset_point_a
+
sco
);
set_Lmax
(
fp
);
fp
->
L_ssb
=
(((
uint64_t
)
config
->
ssb_table
.
ssb_mask_list
[
0
].
ssb_mask
)
<<
32
)
|
config
->
ssb_table
.
ssb_mask_list
[
1
].
ssb_mask
;
...
...
@@ -343,7 +342,7 @@ void nr_init_frame_parms_ue_sa(NR_DL_FRAME_PARMS *frame_parms, uint64_t downlink
frame_parms
->
dl_CarrierFreq
=
downlink_frequency
;
frame_parms
->
ul_CarrierFreq
=
downlink_frequency
+
delta_duplex
;
frame_parms
->
freq_range
=
(
frame_parms
->
dl_CarrierFreq
<
6e9
)
?
nr_FR1
:
nr_FR2
;
frame_parms
->
N_RB_UL
=
frame_parms
->
N_RB_
U
L
;
frame_parms
->
N_RB_UL
=
frame_parms
->
N_RB_
D
L
;
frame_parms
->
nr_band
=
get_band
(
downlink_frequency
,
delta_duplex
);
frame_parms
->
frame_type
=
get_frame_type
(
frame_parms
->
nr_band
,
frame_parms
->
numerology_index
);
...
...
@@ -365,8 +364,8 @@ void nr_init_frame_parms_ue_sa(NR_DL_FRAME_PARMS *frame_parms, uint64_t downlink
frame_parms
->
get_samples_slot_timestamp
=
&
get_samples_slot_timestamp
;
frame_parms
->
samples_per_frame
=
10
*
frame_parms
->
samples_per_subframe
;
exit
(
1
);
// setting initial ssb start subcarrier to have SSBs at BW center
frame_parms
->
ssb_start_subcarrier
=
((
frame_parms
->
N_RB_DL
>>
1
)
-
10
)
*
12
;
}
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/nr_initial_sync.c
View file @
1aaf9847
...
...
@@ -348,7 +348,7 @@ int nr_initial_sync(UE_nr_rxtx_proc_t *proc, PHY_VARS_NR_UE *ue, int n_frames)
}
}
else
{
ret
=
-
1
;
ret
=
-
1
;
}
/* Consider this is a false detection if the offset is > 1000 Hz
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/sss_nr.c
View file @
1aaf9847
...
...
@@ -318,7 +318,7 @@ int do_pss_sss_extract_nr(PHY_VARS_NR_UE *ue,
int32_t
pss_ext
[
NB_ANTENNAS_RX
][
LENGTH_PSS_NR
],
int32_t
sss_ext
[
NB_ANTENNAS_RX
][
LENGTH_SSS_NR
],
uint8_t
doPss
,
uint8_t
doSss
,
uint8_t
subframe
)
// add flag to indicate extracting only PSS, only SSS, or both
uint8_t
subframe
)
// add flag to indicate extracting only PSS, only SSS, or both
{
uint8_t
aarx
;
int32_t
*
pss_rxF
,
*
pss_rxF_ext
;
...
...
@@ -329,8 +329,8 @@ int do_pss_sss_extract_nr(PHY_VARS_NR_UE *ue,
for
(
aarx
=
0
;
aarx
<
frame_parms
->
nb_antennas_rx
;
aarx
++
)
{
pss_symbol
=
0
;
sss_symbol
=
SSS_SYMBOL_NB
-
PSS_SYMBOL_NB
;
pss_symbol
=
0
;
sss_symbol
=
SSS_SYMBOL_NB
-
PSS_SYMBOL_NB
;
rxdataF
=
ue
->
common_vars
.
common_vars_rx_data_per_thread
[
proc
->
thread_id
].
rxdataF
;
...
...
@@ -343,6 +343,7 @@ int do_pss_sss_extract_nr(PHY_VARS_NR_UE *ue,
sss_rxF_ext
=
&
sss_ext
[
aarx
][
0
];
unsigned
int
k
=
frame_parms
->
first_carrier_offset
+
frame_parms
->
ssb_start_subcarrier
+
56
;
if
(
k
>=
frame_parms
->
ofdm_symbol_size
)
k
-=
frame_parms
->
ofdm_symbol_size
;
for
(
int
i
=
0
;
i
<
LENGTH_PSS_NR
;
i
++
)
{
...
...
@@ -401,7 +402,7 @@ int pss_sss_extract_nr(PHY_VARS_NR_UE *phy_vars_ue,
UE_nr_rxtx_proc_t
*
proc
,
int32_t
pss_ext
[
NB_ANTENNAS_RX
][
LENGTH_PSS_NR
],
int32_t
sss_ext
[
NB_ANTENNAS_RX
][
LENGTH_SSS_NR
],
uint8_t
subframe
)
uint8_t
subframe
)
{
return
do_pss_sss_extract_nr
(
phy_vars_ue
,
proc
,
pss_ext
,
sss_ext
,
1
/* doPss */
,
1
/* doSss */
,
subframe
);
}
...
...
This diff is collapsed.
Click to expand it.
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