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
canghaiwuhen
OpenXG-RAN
Commits
b06c7af3
Commit
b06c7af3
authored
Nov 17, 2020
by
Thomas Schlichter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
NR UE: fix tti issues introduced by merge with develop
parent
e059eeab
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
13 deletions
+7
-13
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
+2
-2
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pbch_test.c
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pbch_test.c
+2
-2
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c
+2
-2
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.h
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.h
+0
-6
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c
+1
-1
No files found.
openair1/SCHED_NR_UE/phy_procedures_nr_ue.c
View file @
b06c7af3
...
...
@@ -256,7 +256,7 @@ void nr_ue_measurement_procedures(uint16_t l, // symbol index of each slot [0
0,
nr_slot_rx);
*/
//(nr_slot_rx*frame_parms->samples_per_
tti+ue->rx_offset)%(frame_parms->samples_per_tti*LTE_NUMBER_OF_SUBFRAMES_PER_FRAME)
//(nr_slot_rx*frame_parms->samples_per_
slot+ue->rx_offset) % frame_parms->samples_per_frame
#if T_TRACER
if
(
slot
==
0
)
...
...
@@ -1768,7 +1768,7 @@ int phy_procedures_nrUE_RX(PHY_VARS_NR_UE *ue,
}
}
if
((
frame_rx
%
64
==
0
)
&&
(
nr_
tti
_rx
==
0
))
{
if
((
frame_rx
%
64
==
0
)
&&
(
nr_
slot
_rx
==
0
))
{
printf
(
"============================================
\n
"
);
LOG_I
(
PHY
,
"Harq round stats for Downlink: %d/%d/%d/%d DLSCH errors: %d
\n
"
,
ue
->
dl_stats
[
0
],
ue
->
dl_stats
[
1
],
ue
->
dl_stats
[
2
],
ue
->
dl_stats
[
3
],
ue
->
dl_stats
[
4
]);
printf
(
"============================================
\n
"
);
...
...
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pbch_test.c
View file @
b06c7af3
...
...
@@ -245,7 +245,7 @@ void set_sequence_sss(PHY_VARS_NR_UE *PHY_vars_UE, int offset, int slot_offset)
void
insert_sequence_sss
(
PHY_VARS_NR_UE
*
PHY_vars_UE
,
int
offset
)
{
NR_DL_FRAME_PARMS
*
frame_parms
=
&
(
PHY_vars_UE
->
frame_parms
);
int
samples_for_half_frame
=
(
LTE_NUMBER_OF_SUBFRAMES_PER_FRAME
*
frame_parms
->
samples_per_tti
)
>>
1
;
int
samples_for_half_frame
=
frame_parms
->
samples_per_frame
/
2
;
set_sequence_sss
(
PHY_vars_UE
,
offset
,
0
);
...
...
@@ -328,7 +328,7 @@ int test_synchro_pss_sss(PHY_VARS_NR_UE *PHY_vars_UE, int position_symbol, int s
int
sync_pos2
=
synchro_position
-
frame_parms
->
nb_prefix_samples
;
int
sync_pos_slot
=
(
frame_parms
->
samples_per_
tti
>>
1
)
-
frame_parms
->
ofdm_symbol_size
-
frame_parms
->
nb_prefix_samples
;
int
sync_pos_slot
=
(
frame_parms
->
samples_per_
slot
>>
1
)
-
frame_parms
->
ofdm_symbol_size
-
frame_parms
->
nb_prefix_samples
;
if
(
sync_pos2
>=
sync_pos_slot
)
PHY_vars_UE
->
rx_offset
=
sync_pos2
-
sync_pos_slot
;
...
...
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.c
View file @
b06c7af3
...
...
@@ -300,7 +300,7 @@ typedef enum {
void
set_random_rx_buffer
(
PHY_VARS_NR_UE
*
PHY_vars_UE
,
int
amp
)
{
NR_DL_FRAME_PARMS
*
frame_parms
=
&
(
PHY_vars_UE
->
frame_parms
);
int
samples_for_frame
=
(
LTE_NUMBER_OF_SUBFRAMES_PER_FRAME
*
frame_parms
->
samples_per_tti
)
;
int
samples_for_frame
=
frame_parms
->
samples_per_frame
;
int16_t
random
;
int16_t
*
data_p
;
random_data_format_t
data_format
=
SINUSOIDAL_DATA
;
...
...
@@ -394,7 +394,7 @@ void set_random_rx_buffer(PHY_VARS_NR_UE *PHY_vars_UE, int amp) {
int
set_pss_in_rx_buffer_from_external_buffer
(
PHY_VARS_NR_UE
*
PHY_vars_UE
,
short
*
input_buffer
)
{
NR_DL_FRAME_PARMS
*
frame_parms
=
&
(
PHY_vars_UE
->
frame_parms
);
int
samples_for_frame
=
LTE_NUMBER_OF_SUBFRAMES_PER_FRAME
*
frame_parms
->
samples_per_sub
frame
;
/* both i and q */
int
samples_for_frame
=
frame_parms
->
samples_per_
frame
;
/* both i and q */
for
(
int
aa
=
0
;
aa
<
PHY_vars_UE
->
frame_parms
.
nb_antennas_rx
;
aa
++
)
{
for
(
int
i
=
0
;
i
<
samples_for_frame
;
i
++
)
{
...
...
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pss_util_test.h
View file @
b06c7af3
...
...
@@ -69,12 +69,6 @@ typedef struct {
int
number_of_fail
;
}
test_t
;
typedef
struct
{
uint16_t
ofdm_symbol_size
;
uint32_t
samples_per_tti
;
uint32_t
samples_per_subframe
;
}
save_frame_parms_t
;
/*************** GLOBAL VARIABLES***********************************/
EXTERN
PHY_VARS_eNB
*
PHY_vars_eNB
;
...
...
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c
View file @
b06c7af3
...
...
@@ -372,7 +372,7 @@ int test_srs(PHY_VARS_NR_UE *PHY_vars_UE)
/* start test of sounding reference signals */
default_srs_configuration
(
frame_parms
);
txptr
=
calloc
(
frame_parms
->
samples_per_
tti
,
sizeof
(
int32_t
));
txptr
=
calloc
(
frame_parms
->
samples_per_
slot
,
sizeof
(
int32_t
));
if
(
txptr
==
NULL
)
{
printf
(
"Error test_srs: memory allocation problem txptr
\n
"
);
assert
(
0
);
...
...
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