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
littleBu
OpenXG-RAN
Commits
55717204
Commit
55717204
authored
4 years ago
by
Thomas Schlichter
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleanup: remove TTI related parameters from NR_DL_FRAME_PARMS
parent
122e18d0
Branches unavailable
2025.w08
2025.w07
2025.w06
2025.w05
2025.w04
2025.w03
2025.w02
2024.w51
2024.w50
2024.w49
2024.w48
2024.w47
2024.w46
2024.w45
2024.w44
2024.w43
2024.w42
2024.w41
2024.w40
2024.w39
2024.w38
2024.w36
2024.w35
2024.w34
2024.w33
2024.w32
2024.w31
2024.w30
2024.w29
2024.w28
2024.w27
2024.w26
2024.w25
2024.w24
2024.w23
2024.w22
2024.w21
2024.w18
2024.w17
2024.w16
2024.w15
2024.w14
2024.w13
2024.w12
2024.w11
2024.w10
2024.w09
2024.w08
2024.w06
2024.w05
2024.w04
2024.w03
2024.w02
2024.w01
2023.w51
2023.w50
2023.w49
2023.w48
2023.w47
2023.w45
2023.w43
2023.w42
2023.w41
2023.w40
2023.w39
2023.w38
2023.w37
2023.w36
2023.w34
2023.w33
2023.w32
2023.w31
2023.w30
2023.w29
2023.w28
2023.w27
2023.w26
2023.w25
2023.w24
2023.w23
2023.w22
2023.w21
2023.w20
2023.w19
2023.w18
2023.w18b
2023.w16
2023.w15
2023.w14
2023.w13
2023.w12
2023.w11
2023.w11b
2023.w10
2023.w10b
2023.w09
2023.w08
2023.w08b
2023.w07
2023.w06
2023.w05
2023.w03
2023.w02
2022.42
2022.41
2022.w51
2022.w50
2022.w49
2022.w48
2022.w47
2022.w46
2022.w45
2022.w43
2022.w42
2022.w42b
2022.w41
2022.w40
2022.w39
2022.w38
2022.w37
2022.w37b
2022.w36
2022.w35
2022.w33
2022.w32
2022.w31
2022.w31b
2022.w30
2022.w29
2022.w26
2022.w25
2022.w24
2022.w24b
2022.w23
2022.w22
2022.w21
2022.w20
2022.w19
2022.w18
2022.w17
2022.w15
2022.w15b
2022.w14a
2022.w13
2022.w13b
2022.w13a
2022.w12
2022.w10
2022.w09
2022.w09b
2022.w08
2022.w08b
2022.w07
2022.w07b
2022.w06
2022.w06a
2022.w05
2022.w05b
2022.w03_hotfix
2022.w03_b
2022.w02
2022.w01
2021.wk46
2021.wk14_a
2021.wk13_d
2021.wk13_c
2021.w51_c
2021.w51_a
2021.w50_a
2021.w49_b
2021.w49_a
2021.w48
2021.w47
2021.w46
2021.w46-powder
2021.w45
2021.w45_b
2021.w44
2021.w43
2021.w42
2021.w37
2021.w36
2021.w35
2021.w34
2021.w33
2021.w32
2021.w31
2021.w30
2021.w29
2021.w28
2021.w27
2021.w26
2021.w25
2021.w24
2021.w23
2021.w22
2021.w20
2021.w19
2021.w18_b
2021.w18_a
2021.w17_b
2021.w16
2021.w15
2021.w14
2021.w13_a
2021.w12
2021.w11
2021.w10
2021.w09
2021.w08
2021.w06
2021.w05
2021.w04
2021.w02
2020.w51_2
2020.w51
2020.w50
2020.w49
2020.w48_2
2020.w48
2020.w47
2020.w46_2
2020.w46
v2.2.0
v2.1.0
v2.0.0
setparam
flexran-eol
benetel_gnb_rel_2.0
benetel_gnb_rel_1.0
benetel_enb_rel_2.0
benetel_enb_rel_1.0
ARC_1.3
No related merge requests found
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
48 additions
and
71 deletions
+48
-71
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+0
-2
openair1/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
openair1/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
+3
-3
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+2
-18
openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
+0
-4
openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
+2
-2
openair1/PHY/defs_nr_common.h
openair1/PHY/defs_nr_common.h
+0
-7
openair1/PHY/thread_NR_UE.h
openair1/PHY/thread_NR_UE.h
+2
-2
openair1/SCHED_NR/phy_frame_config_nr.c
openair1/SCHED_NR/phy_frame_config_nr.c
+1
-1
openair1/SCHED_NR_UE/harq_nr.c
openair1/SCHED_NR_UE/harq_nr.c
+3
-3
openair1/SCHED_NR_UE/pucch_power_control_ue_nr.c
openair1/SCHED_NR_UE/pucch_power_control_ue_nr.c
+1
-1
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+3
-3
openair1/SIMULATION/NR_PHY/prachsim.c
openair1/SIMULATION/NR_PHY/prachsim.c
+1
-1
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/frame_config_test.c
...1/SIMULATION/NR_UE_PHY/unit_tests/src/frame_config_test.c
+7
-6
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c
...air1/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c
+18
-14
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c
+5
-4
No files found.
openair1/PHY/INIT/nr_parms.c
View file @
55717204
...
@@ -84,8 +84,6 @@ int nr_get_ssb_start_symbol(NR_DL_FRAME_PARMS *fp)
...
@@ -84,8 +84,6 @@ int nr_get_ssb_start_symbol(NR_DL_FRAME_PARMS *fp)
void
set_scs_parameters
(
NR_DL_FRAME_PARMS
*
fp
,
int
mu
,
uint16_t
bw
)
void
set_scs_parameters
(
NR_DL_FRAME_PARMS
*
fp
,
int
mu
,
uint16_t
bw
)
{
{
fp
->
ttis_per_subframe
=
1
;
switch
(
mu
)
{
switch
(
mu
)
{
case
NR_MU_0
:
//15kHz scs
case
NR_MU_0
:
//15kHz scs
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/dci_tools_nr.c
View file @
55717204
...
@@ -59,7 +59,7 @@
...
@@ -59,7 +59,7 @@
uint8_t
nr_subframe2harq_pid
(
NR_DL_FRAME_PARMS
*
frame_parms
,
uint32_t
frame
,
uint8_t
nr_tti_rx
)
{
uint8_t
nr_subframe2harq_pid
(
NR_DL_FRAME_PARMS
*
frame_parms
,
uint32_t
frame
,
uint8_t
slot
)
{
/*
/*
#ifdef DEBUG_DCI
#ifdef DEBUG_DCI
if (frame_parms->frame_type == TDD)
if (frame_parms->frame_type == TDD)
...
@@ -69,11 +69,11 @@ uint8_t nr_subframe2harq_pid(NR_DL_FRAME_PARMS *frame_parms,uint32_t frame,uint8
...
@@ -69,11 +69,11 @@ uint8_t nr_subframe2harq_pid(NR_DL_FRAME_PARMS *frame_parms,uint32_t frame,uint8
#endif
#endif
*/
*/
uint8_t
ret
=
255
;
uint8_t
ret
=
255
;
uint8_t
subframe
=
nr_tti_rx
>>
((
int
)(
log2
(
frame_parms
->
ttis_per_subframe
)))
;
uint8_t
subframe
=
slot
/
frame_parms
->
slots_per_subframe
;
AssertFatal
(
1
==
0
,
"Not ready for this ...
\n
"
);
AssertFatal
(
1
==
0
,
"Not ready for this ...
\n
"
);
if
(
frame_parms
->
frame_type
==
FDD
)
{
if
(
frame_parms
->
frame_type
==
FDD
)
{
ret
=
(((
frame
<<
1
)
+
nr_tti_rx
)
&
7
);
ret
=
(((
frame
<<
1
)
+
slot
)
&
7
);
}
else
{
}
else
{
}
}
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
View file @
55717204
...
@@ -296,7 +296,7 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
...
@@ -296,7 +296,7 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
return
(
dlsch
->
max_ldpc_iterations
+
1
);
return
(
dlsch
->
max_ldpc_iterations
+
1
);
}
}
/*if (nr_tti_rx> (
10*frame_parms->tti
s_per_subframe-1)) {
/*if (nr_tti_rx> (
frame_parms->slot
s_per_subframe-1)) {
printf("dlsch_decoding.c: Illegal subframe index %d\n",nr_tti_rx);
printf("dlsch_decoding.c: Illegal subframe index %d\n",nr_tti_rx);
return(dlsch->max_ldpc_iterations + 1);
return(dlsch->max_ldpc_iterations + 1);
}*/
}*/
...
@@ -649,14 +649,6 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
...
@@ -649,14 +649,6 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
}
}
}
}
int32_t
frame_rx_prev
=
frame
;
int32_t
tti_rx_prev
=
nr_tti_rx
-
1
;
if
(
tti_rx_prev
<
0
)
{
frame_rx_prev
--
;
tti_rx_prev
+=
10
*
frame_parms
->
ttis_per_subframe
;
}
frame_rx_prev
=
frame_rx_prev
%
1024
;
if
(
err_flag
==
1
)
{
if
(
err_flag
==
1
)
{
//#if UE_DEBUG_TRACE
//#if UE_DEBUG_TRACE
LOG_D
(
PHY
,
"[UE %d] DLSCH: Setting NAK for SFN/SF %d/%d (pid %d, status %d, round %d, TBS %d, mcs %d) Kr %d r %d harq_process->round %d
\n
"
,
LOG_D
(
PHY
,
"[UE %d] DLSCH: Setting NAK for SFN/SF %d/%d (pid %d, status %d, round %d, TBS %d, mcs %d) Kr %d r %d harq_process->round %d
\n
"
,
...
@@ -843,7 +835,7 @@ uint32_t nr_dlsch_decoding_mthread(PHY_VARS_NR_UE *phy_vars_ue,
...
@@ -843,7 +835,7 @@ uint32_t nr_dlsch_decoding_mthread(PHY_VARS_NR_UE *phy_vars_ue,
return
(
dlsch
->
max_ldpc_iterations
);
return
(
dlsch
->
max_ldpc_iterations
);
}
}
/* if (nr_tti_rx> (
10*frame_parms->tti
s_per_subframe-1)) {
/* if (nr_tti_rx> (
frame_parms->slot
s_per_subframe-1)) {
printf("dlsch_decoding.c: Illegal subframe index %d\n",nr_tti_rx);
printf("dlsch_decoding.c: Illegal subframe index %d\n",nr_tti_rx);
return(dlsch->max_ldpc_iterations);
return(dlsch->max_ldpc_iterations);
}
}
...
@@ -1246,14 +1238,6 @@ uint32_t nr_dlsch_decoding_mthread(PHY_VARS_NR_UE *phy_vars_ue,
...
@@ -1246,14 +1238,6 @@ uint32_t nr_dlsch_decoding_mthread(PHY_VARS_NR_UE *phy_vars_ue,
}
}
//} //loop r
//} //loop r
int32_t
frame_rx_prev
=
frame
;
int32_t
tti_rx_prev
=
nr_tti_rx
-
1
;
if
(
tti_rx_prev
<
0
)
{
frame_rx_prev
--
;
tti_rx_prev
+=
10
*
frame_parms
->
ttis_per_subframe
;
}
frame_rx_prev
=
frame_rx_prev
%
1024
;
if
(
err_flag
==
1
)
{
if
(
err_flag
==
1
)
{
#if UE_DEBUG_TRACE
#if UE_DEBUG_TRACE
LOG_D
(
PHY
,
"[UE %d] DLSCH: Setting NAK for SFN/SF %d/%d (pid %d, status %d, round %d, TBS %d, mcs %d) Kr %d r %d harq_process->round %d
\n
"
,
LOG_D
(
PHY
,
"[UE %d] DLSCH: Setting NAK for SFN/SF %d/%d (pid %d, status %d, round %d, TBS %d, mcs %d) Kr %d r %d harq_process->round %d
\n
"
,
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/pss_nr.c
View file @
55717204
...
@@ -560,7 +560,6 @@ void set_frame_context_pss_nr(NR_DL_FRAME_PARMS *frame_parms_ue, int rate_change
...
@@ -560,7 +560,6 @@ void set_frame_context_pss_nr(NR_DL_FRAME_PARMS *frame_parms_ue, int rate_change
{
{
/* set new value according to rate_change */
/* set new value according to rate_change */
frame_parms_ue
->
ofdm_symbol_size
=
(
frame_parms_ue
->
ofdm_symbol_size
/
rate_change
);
frame_parms_ue
->
ofdm_symbol_size
=
(
frame_parms_ue
->
ofdm_symbol_size
/
rate_change
);
frame_parms_ue
->
samples_per_tti
=
(
frame_parms_ue
->
samples_per_tti
/
rate_change
);
frame_parms_ue
->
samples_per_subframe
=
(
frame_parms_ue
->
samples_per_subframe
/
rate_change
);
frame_parms_ue
->
samples_per_subframe
=
(
frame_parms_ue
->
samples_per_subframe
/
rate_change
);
free_context_pss_nr
();
free_context_pss_nr
();
...
@@ -588,7 +587,6 @@ void set_frame_context_pss_nr(NR_DL_FRAME_PARMS *frame_parms_ue, int rate_change
...
@@ -588,7 +587,6 @@ void set_frame_context_pss_nr(NR_DL_FRAME_PARMS *frame_parms_ue, int rate_change
void
restore_frame_context_pss_nr
(
NR_DL_FRAME_PARMS
*
frame_parms_ue
,
int
rate_change
)
void
restore_frame_context_pss_nr
(
NR_DL_FRAME_PARMS
*
frame_parms_ue
,
int
rate_change
)
{
{
frame_parms_ue
->
ofdm_symbol_size
=
frame_parms_ue
->
ofdm_symbol_size
*
rate_change
;
frame_parms_ue
->
ofdm_symbol_size
=
frame_parms_ue
->
ofdm_symbol_size
*
rate_change
;
frame_parms_ue
->
samples_per_tti
=
frame_parms_ue
->
samples_per_tti
*
rate_change
;
frame_parms_ue
->
samples_per_subframe
=
frame_parms_ue
->
samples_per_subframe
*
rate_change
;
frame_parms_ue
->
samples_per_subframe
=
frame_parms_ue
->
samples_per_subframe
*
rate_change
;
free_context_pss_nr
();
free_context_pss_nr
();
...
@@ -620,8 +618,6 @@ void decimation_synchro_nr(PHY_VARS_NR_UE *PHY_vars_UE, int rate_change, int **r
...
@@ -620,8 +618,6 @@ void decimation_synchro_nr(PHY_VARS_NR_UE *PHY_vars_UE, int rate_change, int **r
NR_DL_FRAME_PARMS
*
frame_parms
=
&
(
PHY_vars_UE
->
frame_parms
);
NR_DL_FRAME_PARMS
*
frame_parms
=
&
(
PHY_vars_UE
->
frame_parms
);
int
samples_for_frame
=
2
*
frame_parms
->
samples_per_frame
;
int
samples_for_frame
=
2
*
frame_parms
->
samples_per_frame
;
AssertFatal
(
frame_parms
->
samples_per_tti
>
3839
,
"Illegal samples_per_tti %d
\n
"
,
frame_parms
->
samples_per_tti
);
#if TEST_SYNCHRO_TIMING_PSS
#if TEST_SYNCHRO_TIMING_PSS
opp_enabled
=
1
;
opp_enabled
=
1
;
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_UE_TRANSPORT/srs_modulation_nr.c
View file @
55717204
...
@@ -278,7 +278,7 @@ int32_t generate_srs_nr(SRS_ResourceSet_t *p_srs_resource_set,
...
@@ -278,7 +278,7 @@ int32_t generate_srs_nr(SRS_ResourceSet_t *p_srs_resource_set,
n_SRS
=
l
/
R
;
n_SRS
=
l
/
R
;
}
}
else
{
else
{
int8_t
N_slot_frame
=
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
*
frame_parms
->
ttis_per_sub
frame
;
int8_t
N_slot_frame
=
frame_parms
->
slots_per_
frame
;
n_SRS
=
((
N_slot_frame
*
frame_number
+
slot_number
-
T_offset
)
/
T_SRS
)
*
(
N_symb_SRS
/
R
)
+
(
l
/
R
);
n_SRS
=
((
N_slot_frame
*
frame_number
+
slot_number
-
T_offset
)
/
T_SRS
)
*
(
N_symb_SRS
/
R
)
+
(
l
/
R
);
}
}
...
@@ -399,7 +399,7 @@ int is_srs_period_nr(SRS_Resource_t *p_SRS_Resource, NR_DL_FRAME_PARMS *frame_pa
...
@@ -399,7 +399,7 @@ int is_srs_period_nr(SRS_Resource_t *p_SRS_Resource, NR_DL_FRAME_PARMS *frame_pa
return
(
-
1
);
return
(
-
1
);
}
}
int16_t
N_slot_frame
=
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
*
frame_parms
->
ttis_per_sub
frame
;
int16_t
N_slot_frame
=
frame_parms
->
slots_per_
frame
;
if
((
N_slot_frame
*
frame_tx
+
slot_tx
-
T_offset
)
%
T_SRS
==
0
)
{
if
((
N_slot_frame
*
frame_tx
+
slot_tx
-
T_offset
)
%
T_SRS
==
0
)
{
return
(
0
);
return
(
0
);
}
}
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/defs_nr_common.h
View file @
55717204
...
@@ -301,8 +301,6 @@ struct NR_DL_FRAME_PARMS {
...
@@ -301,8 +301,6 @@ struct NR_DL_FRAME_PARMS {
uint32_t
samples_per_slot0
;
uint32_t
samples_per_slot0
;
/// Number of samples in other slots of the subframe
/// Number of samples in other slots of the subframe
uint32_t
samples_per_slotN0
;
uint32_t
samples_per_slotN0
;
/// Number of OFDM/SC-FDMA symbols in one subframe (to be modified to account for potential different in UL/DL)
uint16_t
symbols_per_tti
;
/// Number of samples in a radio frame
/// Number of samples in a radio frame
uint32_t
samples_per_frame
;
uint32_t
samples_per_frame
;
/// Number of samples in a subframe without CP
/// Number of samples in a subframe without CP
...
@@ -311,13 +309,8 @@ struct NR_DL_FRAME_PARMS {
...
@@ -311,13 +309,8 @@ struct NR_DL_FRAME_PARMS {
uint32_t
samples_per_slot_wCP
;
uint32_t
samples_per_slot_wCP
;
/// Number of samples in a radio frame without CP
/// Number of samples in a radio frame without CP
uint32_t
samples_per_frame_wCP
;
uint32_t
samples_per_frame_wCP
;
/// Number of samples in a tti (same as subrame in LTE, slot in NR)
uint32_t
samples_per_tti
;
/// NR numerology index [0..5] as specified in 38.211 Section 4 (mu). 0=15khZ SCS, 1=30khZ, 2=60kHz, etc
/// NR numerology index [0..5] as specified in 38.211 Section 4 (mu). 0=15khZ SCS, 1=30khZ, 2=60kHz, etc
uint8_t
numerology_index
;
uint8_t
numerology_index
;
/// NR number of ttis per subframe deduced from numerology (cf 38.211): 1, 2, 4, 8(not supported),16(not supported),32(not supported)
uint8_t
ttis_per_subframe
;
//#endif
/// Number of Physical transmit antennas in node
/// Number of Physical transmit antennas in node
uint8_t
nb_antennas_tx
;
uint8_t
nb_antennas_tx
;
/// Number of Receive antennas in node
/// Number of Receive antennas in node
...
...
This diff is collapsed.
Click to expand it.
openair1/PHY/thread_NR_UE.h
View file @
55717204
...
@@ -11,9 +11,9 @@ typedef struct {
...
@@ -11,9 +11,9 @@ typedef struct {
/// timestamp transmitted to HW
/// timestamp transmitted to HW
openair0_timestamp
timestamp_tx
;
openair0_timestamp
timestamp_tx
;
//#ifdef UE_NR_PHY_DEMO
//#ifdef UE_NR_PHY_DEMO
/// NR TTI index within subframe_tx [0 ..
tti
s_per_subframe - 1] to act upon for transmission
/// NR TTI index within subframe_tx [0 ..
slot
s_per_subframe - 1] to act upon for transmission
int
nr_tti_tx
;
int
nr_tti_tx
;
/// NR TTI index within subframe_rx [0 ..
tti
s_per_subframe - 1] to act upon for reception
/// NR TTI index within subframe_rx [0 ..
slot
s_per_subframe - 1] to act upon for reception
int
nr_tti_rx
;
int
nr_tti_rx
;
/// NR slot index within frame_tx [0 .. slots_per_frame - 1] to act upon for transmission
/// NR slot index within frame_tx [0 .. slots_per_frame - 1] to act upon for transmission
int
nr_slot_tx
;
int
nr_slot_tx
;
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED_NR/phy_frame_config_nr.c
View file @
55717204
...
@@ -252,7 +252,7 @@ int set_tdd_configuration_dedicated_nr(NR_DL_FRAME_PARMS *frame_parms) {
...
@@ -252,7 +252,7 @@ int set_tdd_configuration_dedicated_nr(NR_DL_FRAME_PARMS *frame_parms) {
while
(
p_current_TDD_UL_DL_SlotConfig
!=
NULL
)
{
while
(
p_current_TDD_UL_DL_SlotConfig
!=
NULL
)
{
int
slot_index
=
p_current_TDD_UL_DL_SlotConfig
->
slotIndex
;
int
slot_index
=
p_current_TDD_UL_DL_SlotConfig
->
slotIndex
;
if
(
slot_index
<
TDD_CONFIG_NB_FRAMES
*
(
frame_parms
->
ttis_per_subframe
*
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
)
)
{
if
(
slot_index
<
TDD_CONFIG_NB_FRAMES
*
frame_parms
->
slots_per_frame
)
{
if
(
p_current_TDD_UL_DL_SlotConfig
->
nrofDownlinkSymbols
!=
0
)
{
if
(
p_current_TDD_UL_DL_SlotConfig
->
nrofDownlinkSymbols
!=
0
)
{
if
(
p_current_TDD_UL_DL_SlotConfig
->
nrofDownlinkSymbols
==
NR_TDD_SET_ALL_SYMBOLS
)
{
if
(
p_current_TDD_UL_DL_SlotConfig
->
nrofDownlinkSymbols
==
NR_TDD_SET_ALL_SYMBOLS
)
{
if
(
p_current_TDD_UL_DL_SlotConfig
->
nrofUplinkSymbols
==
0
)
{
if
(
p_current_TDD_UL_DL_SlotConfig
->
nrofUplinkSymbols
==
0
)
{
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED_NR_UE/harq_nr.c
View file @
55717204
...
@@ -114,7 +114,7 @@
...
@@ -114,7 +114,7 @@
*********************************************************************/
*********************************************************************/
void
get_dci_info_for_harq
(
PHY_VARS_NR_UE
*
ue
,
NR_DCI_INFO_EXTRACTED_t
*
nr_dci_info_extracted
,
void
get_dci_info_for_harq
(
PHY_VARS_NR_UE
*
ue
,
NR_DCI_INFO_EXTRACTED_t
*
nr_dci_info_extracted
,
NR_UE_DLSCH_t
**
dlsch
,
NR_UE_ULSCH_t
*
ulsch
,
uint8_t
nr_tti_rx
,
uint8_t
tx_offset
)
NR_UE_DLSCH_t
**
dlsch
,
NR_UE_ULSCH_t
*
ulsch
,
uint8_t
slot
,
uint8_t
tx_offset
)
{
{
if
(
nr_dci_info_extracted
->
identifier_dci_formats
==
DL_DCI
)
{
if
(
nr_dci_info_extracted
->
identifier_dci_formats
==
DL_DCI
)
{
...
@@ -124,14 +124,14 @@ void get_dci_info_for_harq(PHY_VARS_NR_UE *ue, NR_DCI_INFO_EXTRACTED_t *nr_dci_i
...
@@ -124,14 +124,14 @@ void get_dci_info_for_harq(PHY_VARS_NR_UE *ue, NR_DCI_INFO_EXTRACTED_t *nr_dci_i
dl_harq
->
harq_ack
.
vDAI_DL
=
nr_dci_info_extracted
->
dai
+
1
;
dl_harq
->
harq_ack
.
vDAI_DL
=
nr_dci_info_extracted
->
dai
+
1
;
dl_harq
->
harq_ack
.
pucch_resource_indicator
=
nr_dci_info_extracted
->
pucch_resource_ind
;
dl_harq
->
harq_ack
.
pucch_resource_indicator
=
nr_dci_info_extracted
->
pucch_resource_ind
;
dl_harq
->
harq_ack
.
slot_for_feedback_ack
=
(
nr_tti_rx
+
nr_dci_info_extracted
->
pdsch_to_harq_feedback_time_ind
)
%
ue
->
frame_parms
.
tti
s_per_subframe
;
dl_harq
->
harq_ack
.
slot_for_feedback_ack
=
(
slot
+
nr_dci_info_extracted
->
pdsch_to_harq_feedback_time_ind
)
%
ue
->
frame_parms
.
slot
s_per_subframe
;
dl_harq
->
harq_ack
.
harq_id
=
nr_dci_info_extracted
->
harq_process_number
;
dl_harq
->
harq_ack
.
harq_id
=
nr_dci_info_extracted
->
harq_process_number
;
dl_harq
->
harq_ack
.
rx_status
=
downlink_harq_process
(
dl_harq
,
dlsch
[
0
]
->
current_harq_pid
,
nr_dci_info_extracted
->
ndi
,
dlsch
[
0
]
->
rnti_type
);
dl_harq
->
harq_ack
.
rx_status
=
downlink_harq_process
(
dl_harq
,
dlsch
[
0
]
->
current_harq_pid
,
nr_dci_info_extracted
->
ndi
,
dlsch
[
0
]
->
rnti_type
);
}
}
else
if
(
nr_dci_info_extracted
->
identifier_dci_formats
==
UL_DCI
)
{
else
if
(
nr_dci_info_extracted
->
identifier_dci_formats
==
UL_DCI
)
{
/* store harq id for which pusch should be transmitted at rx_slot + tx_offset */
/* store harq id for which pusch should be transmitted at rx_slot + tx_offset */
set_tx_harq_id
(
ulsch
,
nr_dci_info_extracted
->
harq_process_number
,
(
nr_tti_rx
+
tx_offset
)
%
ue
->
frame_parms
.
tti
s_per_subframe
);
set_tx_harq_id
(
ulsch
,
nr_dci_info_extracted
->
harq_process_number
,
(
slot
+
tx_offset
)
%
ue
->
frame_parms
.
slot
s_per_subframe
);
ulsch
->
harq_processes
[
nr_dci_info_extracted
->
harq_process_number
]
->
tx_status
=
uplink_harq_process
(
ulsch
,
nr_dci_info_extracted
->
harq_process_number
,
nr_dci_info_extracted
->
ndi
,
ulsch
->
rnti_type
);
ulsch
->
harq_processes
[
nr_dci_info_extracted
->
harq_process_number
]
->
tx_status
=
uplink_harq_process
(
ulsch
,
nr_dci_info_extracted
->
harq_process_number
,
nr_dci_info_extracted
->
ndi
,
ulsch
->
rnti_type
);
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED_NR_UE/pucch_power_control_ue_nr.c
View file @
55717204
...
@@ -169,7 +169,7 @@ int16_t get_pucch_tx_power_ue(PHY_VARS_NR_UE *ue,
...
@@ -169,7 +169,7 @@ int16_t get_pucch_tx_power_ue(PHY_VARS_NR_UE *ue,
//int K_PUCCH = 0;
//int K_PUCCH = 0;
if
(
O_ACK
!=
0
)
{
if
(
O_ACK
!=
0
)
{
/* it assumes that PDCCH is in the first symbol of receive slot FFS TDDO NR */
/* it assumes that PDCCH is in the first symbol of receive slot FFS TDDO NR */
//int slots_gap = (proc->nr_tti_tx > proc->nr_tti_rx ? (proc->nr_tti_tx - proc->nr_tti_rx - 1) : ((proc->nr_tti_tx + ue->frame_parms.
tti
s_per_subframe) - proc->nr_tti_rx - 1));
//int slots_gap = (proc->nr_tti_tx > proc->nr_tti_rx ? (proc->nr_tti_tx - proc->nr_tti_rx - 1) : ((proc->nr_tti_tx + ue->frame_parms.
slot
s_per_subframe) - proc->nr_tti_rx - 1));
//K_PUCCH = (slots_gap * (ue->frame_parms.symbols_per_tti)) - 1;
//K_PUCCH = (slots_gap * (ue->frame_parms.symbols_per_tti)) - 1;
}
}
else
{
else
{
...
...
This diff is collapsed.
Click to expand it.
openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
View file @
55717204
...
@@ -238,7 +238,7 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
...
@@ -238,7 +238,7 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
/* update current context */
/* update current context */
int
subframe_number
=
(
proc
->
nr_tti_rx
)
/
(
ue
->
frame_parms
.
slots_per_subframe
);
//ttis_per_subframe)
;
int
subframe_number
=
proc
->
nr_slot_rx
/
ue
->
frame_parms
.
slots_per_subframe
;
nb_pucch_format_4_in_subframes
[
subframe_number
]
=
0
;
/* reset pucch format 4 counter at current rx position */
nb_pucch_format_4_in_subframes
[
subframe_number
]
=
0
;
/* reset pucch format 4 counter at current rx position */
int
dl_harq_pid
=
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
current_harq_pid
;
int
dl_harq_pid
=
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
current_harq_pid
;
...
@@ -490,7 +490,7 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
...
@@ -490,7 +490,7 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
//}
//}
nb_symbols
=
nb_symbols_excluding_dmrs
[
nb_symbols_total
-
4
][
index_additional_dmrs
][
index_hopping
];
nb_symbols
=
nb_symbols_excluding_dmrs
[
nb_symbols_total
-
4
][
index_additional_dmrs
][
index_hopping
];
nb_of_prbs
=
1
;
nb_of_prbs
=
1
;
subframe_number
=
nr_tti_tx
/
(
ue
->
frame_parms
.
slots_per_subframe
);
//ttis_per_subframe)
;
subframe_number
=
nr_tti_tx
/
ue
->
frame_parms
.
slots_per_subframe
;
nb_pucch_format_4_in_subframes
[
subframe_number
]
++
;
/* increment number of transmit pucch 4 in current subframe */
nb_pucch_format_4_in_subframes
[
subframe_number
]
++
;
/* increment number of transmit pucch 4 in current subframe */
NR_TST_PHY_PRINTF
(
"PUCCH Number of pucch format 4 in subframe %d is %d
\n
"
,
subframe_number
,
nb_pucch_format_4_in_subframes
[
subframe_number
]);
NR_TST_PHY_PRINTF
(
"PUCCH Number of pucch format 4 in subframe %d is %d
\n
"
,
subframe_number
,
nb_pucch_format_4_in_subframes
[
subframe_number
]);
N_sc_ctrl_RB
=
N_SC_RB
/
(
nb_pucch_format_4_in_subframes
[
subframe_number
]);
N_sc_ctrl_RB
=
N_SC_RB
/
(
nb_pucch_format_4_in_subframes
[
subframe_number
]);
...
@@ -1277,7 +1277,7 @@ int trigger_periodic_scheduling_request(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_n
...
@@ -1277,7 +1277,7 @@ int trigger_periodic_scheduling_request(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_n
return
(
1
);
/* period is slot */
return
(
1
);
/* period is slot */
}
}
int16_t
N_slot_frame
=
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
*
ue
->
frame_parms
.
slots_per_subframe
;
//ttis_per_sub
frame;
int16_t
N_slot_frame
=
ue
->
frame_parms
.
slots_per_
frame
;
if
(((
proc
->
frame_tx
*
N_slot_frame
)
+
proc
->
nr_tti_tx
-
SR_offset
)
%
SR_periodicity
==
0
)
{
if
(((
proc
->
frame_tx
*
N_slot_frame
)
+
proc
->
nr_tti_tx
-
SR_offset
)
%
SR_periodicity
==
0
)
{
return
(
1
);
return
(
1
);
}
}
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_PHY/prachsim.c
View file @
55717204
...
@@ -705,7 +705,7 @@ int main(int argc, char **argv){
...
@@ -705,7 +705,7 @@ int main(int argc, char **argv){
// printf("Sigma2 %f (sigma2_dB %f)\n",sigma2,sigma2_dB);
// printf("Sigma2 %f (sigma2_dB %f)\n",sigma2,sigma2_dB);
if
(
awgn_flag
==
0
)
{
if
(
awgn_flag
==
0
)
{
multipath_tv_channel
(
UE2gNB
,
s_re
,
s_im
,
r_re
,
r_im
,
frame_parms
->
samples_per_
tti
<<
1
,
0
);
multipath_tv_channel
(
UE2gNB
,
s_re
,
s_im
,
r_re
,
r_im
,
frame_parms
->
samples_per_
frame
,
0
);
}
}
if
(
n_frames
==
1
)
{
if
(
n_frames
==
1
)
{
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/frame_config_test.c
View file @
55717204
...
@@ -51,16 +51,16 @@
...
@@ -51,16 +51,16 @@
void
display_frame_configuration
(
NR_DL_FRAME_PARMS
*
frame_parms
)
{
void
display_frame_configuration
(
NR_DL_FRAME_PARMS
*
frame_parms
)
{
printf
(
"
\n
Tdd configuration tti %d downlink %d uplink %d period %d
\n
"
,
frame_parms
->
tti
s_per_subframe
,
frame_parms
->
p_tdd_UL_DL_Configuration
->
nrofDownlinkSlots
,
printf
(
"
\n
Tdd configuration tti %d downlink %d uplink %d period %d
\n
"
,
frame_parms
->
slot
s_per_subframe
,
frame_parms
->
p_tdd_UL_DL_Configuration
->
nrofDownlinkSlots
,
frame_parms
->
p_tdd_UL_DL_Configuration
->
nrofUplinkSlots
,
frame_parms
->
p_tdd_UL_DL_Configuration
->
dl_UL_TransmissionPeriodicity
);
frame_parms
->
p_tdd_UL_DL_Configuration
->
nrofUplinkSlots
,
frame_parms
->
p_tdd_UL_DL_Configuration
->
dl_UL_TransmissionPeriodicity
);
int
k
=
(
TDD_CONFIG_NB_FRAMES
*
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
)
-
1
;
//19;
int
k
=
(
TDD_CONFIG_NB_FRAMES
*
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
)
-
1
;
//19;
int
tti
=
0
;
int
tti
=
0
;
for
(
int
j
=
0
;
j
<
TDD_CONFIG_NB_FRAMES
*
frame_parms
->
ttis_per_subframe
*
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
;
j
++
)
{
for
(
int
j
=
0
;
j
<
TDD_CONFIG_NB_FRAMES
*
frame_parms
->
slots_per_frame
;
j
++
)
{
int
frame
=
0
;
int
frame
=
0
;
if
(
j
!=
0
)
{
if
(
j
!=
0
)
{
frame
=
(
frame_parms
->
ttis_per_subframe
*
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
)
/
j
;
frame
=
j
/
frame_parms
->
slots_per_frame
;
tti
=
(
j
)
%
(
frame_parms
->
ttis_per_subframe
*
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
)
;
tti
=
j
%
frame_parms
->
slots_per_frame
;
}
}
else
{
else
{
frame
=
0
;
frame
=
0
;
...
@@ -99,9 +99,10 @@ void display_frame_configuration(NR_DL_FRAME_PARMS *frame_parms) {
...
@@ -99,9 +99,10 @@ void display_frame_configuration(NR_DL_FRAME_PARMS *frame_parms) {
*
*
*********************************************************************/
*********************************************************************/
void
set_tti_test
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int
tti
s_per_subframe
)
void
set_tti_test
(
NR_DL_FRAME_PARMS
*
frame_parms
,
int
slot
s_per_subframe
)
{
{
frame_parms
->
ttis_per_subframe
=
ttis_per_subframe
;
frame_parms
->
slots_per_subframe
=
slots_per_subframe
;
frame_parms
->
slots_per_frame
=
slots_per_subframe
*
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
;
}
}
/*******************************************************************
/*******************************************************************
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/pucch_uci_test.c
View file @
55717204
...
@@ -182,7 +182,7 @@ int test_pucch_basic_error(PHY_VARS_NR_UE *ue, int gNB_id, UE_nr_rxtx_proc_t *pr
...
@@ -182,7 +182,7 @@ int test_pucch_basic_error(PHY_VARS_NR_UE *ue, int gNB_id, UE_nr_rxtx_proc_t *pr
/* set a tx slot with no ack */
/* set a tx slot with no ack */
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
TST_DL_HARQ_PID_FIRST
].
harq_ack
;
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
TST_DL_HARQ_PID_FIRST
].
harq_ack
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
tti
_tx
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
slot
_tx
;
printf
(
"
\n
=> Test : Error due to acknownlegment not set
\n
"
);
printf
(
"
\n
=> Test : Error due to acknownlegment not set
\n
"
);
...
@@ -300,7 +300,7 @@ int test_pucch_common_config_single_transport_block(PHY_VARS_NR_UE *ue, int gNB_
...
@@ -300,7 +300,7 @@ int test_pucch_common_config_single_transport_block(PHY_VARS_NR_UE *ue, int gNB_
harq_status
->
send_harq_status
=
1
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
vDAI_DL
=
2
;
harq_status
->
vDAI_DL
=
2
;
harq_status
->
ack
=
DL_ACK
;
harq_status
->
ack
=
DL_ACK
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
tti
_tx
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
slot
_tx
;
printf
(
"
\n
=> Test : PUCCH format from common config in dedicated mode: two positive downlink ACKnowledgments
\n
"
);
printf
(
"
\n
=> Test : PUCCH format from common config in dedicated mode: two positive downlink ACKnowledgments
\n
"
);
...
@@ -567,7 +567,7 @@ int test_pucch_dedicated_single_transport_block(PHY_VARS_NR_UE *ue, int gNB_id,
...
@@ -567,7 +567,7 @@ int test_pucch_dedicated_single_transport_block(PHY_VARS_NR_UE *ue, int gNB_id,
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
TST_DL_HARQ_PID_FIRST
].
harq_ack
;
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
TST_DL_HARQ_PID_FIRST
].
harq_ack
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
tti
_tx
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
slot
_tx
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
vDAI_DL
=
1
;
harq_status
->
vDAI_DL
=
1
;
harq_status
->
ack
=
DL_ACK
;
harq_status
->
ack
=
DL_ACK
;
...
@@ -586,7 +586,7 @@ int test_pucch_dedicated_single_transport_block(PHY_VARS_NR_UE *ue, int gNB_id,
...
@@ -586,7 +586,7 @@ int test_pucch_dedicated_single_transport_block(PHY_VARS_NR_UE *ue, int gNB_id,
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
dl_harq_pid
[
i
]].
harq_ack
;
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
dl_harq_pid
[
i
]].
harq_ack
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
tti
_tx
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
slot
_tx
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
vDAI_DL
=
i
+
1
;
harq_status
->
vDAI_DL
=
i
+
1
;
harq_status
->
ack
=
DL_ACK
;
harq_status
->
ack
=
DL_ACK
;
...
@@ -620,7 +620,7 @@ int test_pucch_dedicated_single_transport_block(PHY_VARS_NR_UE *ue, int gNB_id,
...
@@ -620,7 +620,7 @@ int test_pucch_dedicated_single_transport_block(PHY_VARS_NR_UE *ue, int gNB_id,
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
dl_harq_pid
[
i
]].
harq_ack
;
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
dl_harq_pid
[
i
]].
harq_ack
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
tti
_tx
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
slot
_tx
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
vDAI_DL
=
i
+
1
;
harq_status
->
vDAI_DL
=
i
+
1
;
harq_status
->
ack
=
DL_ACK
;
harq_status
->
ack
=
DL_ACK
;
...
@@ -684,7 +684,7 @@ int test_pucch_dedicated_two_transport_blocks(PHY_VARS_NR_UE *ue, int gNB_id, UE
...
@@ -684,7 +684,7 @@ int test_pucch_dedicated_two_transport_blocks(PHY_VARS_NR_UE *ue, int gNB_id, UE
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
code_word
]
->
harq_processes
[
dl_harq_pid
[
i
]].
harq_ack
;
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
code_word
]
->
harq_processes
[
dl_harq_pid
[
i
]].
harq_ack
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
tti
_tx
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
slot
_tx
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
vDAI_DL
=
i
+
1
;
harq_status
->
vDAI_DL
=
i
+
1
;
harq_status
->
ack
=
DL_ACK
;
harq_status
->
ack
=
DL_ACK
;
...
@@ -727,7 +727,7 @@ int test_pucch_dedicated_two_transport_blocks(PHY_VARS_NR_UE *ue, int gNB_id, UE
...
@@ -727,7 +727,7 @@ int test_pucch_dedicated_two_transport_blocks(PHY_VARS_NR_UE *ue, int gNB_id, UE
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
code_word
]
->
harq_processes
[
dl_harq_pid
[
i
]].
harq_ack
;
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
code_word
]
->
harq_processes
[
dl_harq_pid
[
i
]].
harq_ack
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
tti
_tx
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
slot
_tx
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
vDAI_DL
=
i
+
1
;
harq_status
->
vDAI_DL
=
i
+
1
;
harq_status
->
ack
=
DL_ACK
;
harq_status
->
ack
=
DL_ACK
;
...
@@ -761,7 +761,7 @@ int test_pucch_dedicated_two_transport_blocks(PHY_VARS_NR_UE *ue, int gNB_id, UE
...
@@ -761,7 +761,7 @@ int test_pucch_dedicated_two_transport_blocks(PHY_VARS_NR_UE *ue, int gNB_id, UE
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
code_word
]
->
harq_processes
[
dl_harq_pid
[
i
]].
harq_ack
;
NR_UE_HARQ_STATUS_t
*
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
code_word
]
->
harq_processes
[
dl_harq_pid
[
i
]].
harq_ack
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
tti
_tx
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
slot
_tx
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
vDAI_DL
=
i
+
1
;
harq_status
->
vDAI_DL
=
i
+
1
;
harq_status
->
ack
=
DL_ACK
;
harq_status
->
ack
=
DL_ACK
;
...
@@ -980,7 +980,7 @@ int test_sr_ack_dedicated(PHY_VARS_NR_UE *ue, int gNB_id, UE_nr_rxtx_proc_t *pro
...
@@ -980,7 +980,7 @@ int test_sr_ack_dedicated(PHY_VARS_NR_UE *ue, int gNB_id, UE_nr_rxtx_proc_t *pro
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
TST_DL_HARQ_PID_FIRST
].
harq_ack
;
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
TST_DL_HARQ_PID_FIRST
].
harq_ack
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
tti
_tx
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
slot
_tx
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
vDAI_DL
=
1
;
harq_status
->
vDAI_DL
=
1
;
harq_status
->
ack
=
DL_ACK
;
harq_status
->
ack
=
DL_ACK
;
...
@@ -1019,7 +1019,7 @@ int test_sr_ack_dedicated(PHY_VARS_NR_UE *ue, int gNB_id, UE_nr_rxtx_proc_t *pro
...
@@ -1019,7 +1019,7 @@ int test_sr_ack_dedicated(PHY_VARS_NR_UE *ue, int gNB_id, UE_nr_rxtx_proc_t *pro
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
TST_DL_HARQ_PID_SECOND
].
harq_ack
;
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
TST_DL_HARQ_PID_SECOND
].
harq_ack
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
tti
_tx
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
slot
_tx
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
vDAI_DL
=
2
;
harq_status
->
vDAI_DL
=
2
;
harq_status
->
ack
=
DL_ACK
;
harq_status
->
ack
=
DL_ACK
;
...
@@ -1094,7 +1094,7 @@ int test_csi_dedicated(PHY_VARS_NR_UE *ue, int gNB_id, UE_nr_rxtx_proc_t *proc)
...
@@ -1094,7 +1094,7 @@ int test_csi_dedicated(PHY_VARS_NR_UE *ue, int gNB_id, UE_nr_rxtx_proc_t *proc)
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
TST_DL_HARQ_PID_FIRST
].
harq_ack
;
harq_status
=
&
ue
->
dlsch
[
ue
->
current_thread_id
[
proc
->
nr_tti_rx
]][
gNB_id
][
0
]
->
harq_processes
[
TST_DL_HARQ_PID_FIRST
].
harq_ack
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
tti
_tx
;
harq_status
->
slot_for_feedback_ack
=
proc
->
nr_
slot
_tx
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
send_harq_status
=
1
;
harq_status
->
vDAI_DL
=
1
;
harq_status
->
vDAI_DL
=
1
;
harq_status
->
ack
=
DL_ACK
;
harq_status
->
ack
=
DL_ACK
;
...
@@ -1168,9 +1168,13 @@ int test_pucch(PHY_VARS_NR_UE *ue)
...
@@ -1168,9 +1168,13 @@ int test_pucch(PHY_VARS_NR_UE *ue)
assert
(
0
);
assert
(
0
);
}
}
proc
->
frame_tx
=
0
;
proc
->
frame_rx
=
0
;
proc
->
nr_tti_rx
=
0
;
proc
->
nr_slot_rx
=
0
;
proc
->
nr_tti_tx
=
(
proc
->
nr_tti_rx
+
NR_UE_CAPABILITY_SLOT_RX_TO_TX
)
%
(
ue
->
frame_parms
.
ttis_per_subframe
*
LTE_NUMBER_OF_SUBFRAMES_PER_FRAME
);
proc
->
nr_tti_rx
=
0
;
proc
->
frame_tx
=
proc
->
frame_rx
+
(
proc
->
nr_slot_rx
+
NR_UE_CAPABILITY_SLOT_RX_TO_TX
)
/
ue
->
frame_parms
.
slots_per_frame
;
proc
->
nr_slot_tx
=
(
proc
->
nr_slot_rx
+
NR_UE_CAPABILITY_SLOT_RX_TO_TX
)
%
ue
->
frame_parms
.
slots_per_frame
;
proc
->
nr_tti_tx
=
proc
->
nr_slot_tx
%
ue
->
frame_parms
.
slots_per_subframe
;
init_pucch_power_configuration
(
ue
,
gNB_id
);
init_pucch_power_configuration
(
ue
,
gNB_id
);
...
...
This diff is collapsed.
Click to expand it.
openair1/SIMULATION/NR_UE_PHY/unit_tests/src/srs_test.c
View file @
55717204
...
@@ -223,12 +223,13 @@ int test_srs_periodicity(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc)
...
@@ -223,12 +223,13 @@ int test_srs_periodicity(PHY_VARS_NR_UE *ue, UE_nr_rxtx_proc_t *proc)
}
}
printf
(
"srs period %d offset %d
\n
"
,
srs_current_period
,
p_srs_resource
->
SRS_Offset
);
printf
(
"srs period %d offset %d
\n
"
,
srs_current_period
,
p_srs_resource
->
SRS_Offset
);
int
duration
=
(
10
*
srs_current_period
)
/
(
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
*
frame_parms
->
ttis_per_subframe
)
;
int
duration
=
(
10
*
srs_current_period
)
/
frame_parms
->
slots_per_frame
;
for
(
int
frame_tx
=
0
;
frame_tx
<
duration
;
frame_tx
++
)
{
for
(
int
frame_tx
=
0
;
frame_tx
<
duration
;
frame_tx
++
)
{
for
(
int
slot_tx
=
0
;
slot_tx
<
(
NR_NUMBER_OF_SUBFRAMES_PER_FRAME
*
frame_parms
->
ttis_per_subframe
);
slot_tx
++
)
{
for
(
int
slot_tx
=
0
;
slot_tx
<
frame_parms
->
slots_per_frame
;
slot_tx
++
)
{
proc
->
frame_tx
=
frame_tx
;
proc
->
frame_tx
=
frame_tx
;
proc
->
nr_tti_tx
=
slot_tx
;
proc
->
nr_slot_tx
=
slot_tx
;
proc
->
nr_tti_tx
=
slot_tx
%
frame_parms
->
slots_per_subframe
;
if
(
ue_srs_procedure_nr
(
ue
,
proc
,
0
)
==
0
)
{
if
(
ue_srs_procedure_nr
(
ue
,
proc
,
0
)
==
0
)
{
printf
(
"test_srs_periodicity srs at frame %d slot %d
\n
"
,
frame_tx
,
slot_tx
);
printf
(
"test_srs_periodicity srs at frame %d slot %d
\n
"
,
frame_tx
,
slot_tx
);
}
}
...
...
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