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
lizhongxiao
OpenXG UE
Commits
142c697a
Commit
142c697a
authored
Jun 11, 2021
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removing unused fapi structures at UE
parent
33386247
Changes
6
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
25 additions
and
454 deletions
+25
-454
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
+0
-431
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
+3
-2
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
+1
-1
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
+10
-9
openair1/SIMULATION/NR_PHY/ulsim.c
openair1/SIMULATION/NR_PHY/ulsim.c
+6
-6
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
+5
-5
No files found.
nfapi/open-nFAPI/nfapi/public_inc/fapi_nr_ue_interface.h
View file @
142c697a
This diff is collapsed.
Click to expand it.
openair1/PHY/NR_ESTIMATION/nr_ul_channel_estimation.c
View file @
142c697a
...
...
@@ -129,8 +129,9 @@ int nr_pusch_channel_estimation(PHY_VARS_gNB *gNB,
//------------------generate DMRS------------------//
if
(
pusch_pdu
->
transform_precoding
==
transform_precoder_disabled
)
{
nr_pusch_dmrs_rx
(
gNB
,
Ns
,
gNB
->
nr_gold_pusch_dmrs
[
pusch_pdu
->
scid
][
Ns
][
symbol
],
&
pilot
[
0
],
1000
,
0
,
nb_rb_pusch
,
(
pusch_pdu
->
bwp_start
+
pusch_pdu
->
rb_start
)
*
NR_NB_SC_PER_RB
,
pusch_pdu
->
dmrs_config_type
);
if
(
pusch_pdu
->
transform_precoding
==
1
)
{
nr_pusch_dmrs_rx
(
gNB
,
Ns
,
gNB
->
nr_gold_pusch_dmrs
[
pusch_pdu
->
scid
][
Ns
][
symbol
],
&
pilot
[
0
],
1000
,
0
,
nb_rb_pusch
,
(
pusch_pdu
->
bwp_start
+
pusch_pdu
->
rb_start
)
*
NR_NB_SC_PER_RB
,
pusch_pdu
->
dmrs_config_type
);
}
else
{
// if transform precoding or SC-FDMA is enabled in Uplink
...
...
openair1/PHY/NR_TRANSPORT/nr_ulsch_demodulation.c
View file @
142c697a
...
...
@@ -1311,7 +1311,7 @@ int nr_rx_pusch(PHY_VARS_gNB *gNB,
stop_meas
(
&
gNB
->
ulsch_mrc_stats
);
if
(
rel15_ul
->
transform_precoding
==
transform_precoder_enabled
)
{
if
(
rel15_ul
->
transform_precoding
==
0
)
{
#ifdef __AVX2__
// For odd number of resource blocks need byte alignment to multiple of 8
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_ulsch_ue.c
View file @
142c697a
...
...
@@ -254,14 +254,15 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
uint8_t
u
=
0
,
v
=
0
;
int16_t
*
dmrs_seq
=
NULL
;
if
(
pusch_pdu
->
transform_precoding
==
transform_precoder_enabled
)
{
// enbaled
if
(
pusch_pdu
->
transform_precoding
==
0
)
{
uint32_t
nb_re_pusch
=
nb_rb
*
NR_NB_SC_PER_RB
;
uint32_t
y_offset
=
0
;
uint16_t
num_dmrs_res_per_symbol
=
nb_rb
*
(
NR_NB_SC_PER_RB
/
2
);
// Calculate index to dmrs seq array based on number of DMRS Subcarriers on this symbol
index
=
get_index_for_dmrs_lowpapr_seq
(
num_dmrs_res_per_symbol
);
index
=
get_index_for_dmrs_lowpapr_seq
(
num_dmrs_res_per_symbol
);
u
=
pusch_pdu
->
dfts_ofdm
.
low_papr_group_number
;
v
=
pusch_pdu
->
dfts_ofdm
.
low_papr_sequence_number
;
dmrs_seq
=
dmrs_lowpaprtype1_ul_ref_sig
[
u
][
v
][
index
];
...
...
@@ -299,7 +300,7 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
}
printf
(
"NR_ULSCH_UE: numSym: %d, num_dmrs_sym: %d"
,
number_of_symbols
,
number_dmrs_symbols
);
for
(
int
ll
=
0
;
ll
<
(
number_of_symbols
-
number_dmrs_symbols
);
ll
++
)
{
for
(
int
ll
=
0
;
ll
<
(
number_of_symbols
-
number_dmrs_symbols
);
ll
++
)
{
nr_idft
(
&
debug_symbols
[
offset
],
nb_re_pusch
);
...
...
@@ -355,8 +356,8 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
if
((
ul_dmrs_symb_pos
>>
l
)
&
0x01
)
{
is_dmrs_sym
=
1
;
if
(
pusch_pdu
->
transform_precoding
==
transform_precoder_disabled
){
// disabled
if
(
pusch_pdu
->
transform_precoding
==
1
){
if
(
dmrs_type
==
pusch_dmrs_type1
)
dmrs_idx
=
(
pusch_pdu
->
bwp_start
+
start_rb
)
*
6
;
...
...
@@ -373,9 +374,9 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
}
}
else
if
(
pusch_pdu
->
pdu_bit_map
&
PUSCH_PDU_BITMAP_PUSCH_PTRS
)
{
}
else
if
(
pusch_pdu
->
pdu_bit_map
&
PUSCH_PDU_BITMAP_PUSCH_PTRS
)
{
AssertFatal
(
pusch_pdu
->
transform_precoding
==
transform_precoder_disabled
,
"PTRS NOT SUPPORTED IF TRANSFORM PRECODING IS ENABLED
\n
"
);
AssertFatal
(
pusch_pdu
->
transform_precoding
==
1
,
"PTRS NOT SUPPORTED IF TRANSFORM PRECODING IS ENABLED
\n
"
);
if
(
is_ptrs_symbol
(
l
,
ulsch_ue
->
ptrs_symbols
))
{
is_ptrs_sym
=
1
;
...
...
@@ -406,8 +407,8 @@ void nr_ue_ulsch_procedures(PHY_VARS_NR_UE *UE,
}
if
(
is_dmrs
==
1
)
{
if
(
pusch_pdu
->
transform_precoding
==
transform_precoder_enabled
)
{
// if enabled
if
(
pusch_pdu
->
transform_precoding
==
0
)
{
((
int16_t
*
)
txdataF
[
ap
])[(
sample_offsetF
)
<<
1
]
=
(
Wt
[
l_prime
[
0
]]
*
Wf
[
k_prime
]
*
AMP
*
dmrs_seq
[
2
*
dmrs_idx
])
>>
15
;
((
int16_t
*
)
txdataF
[
ap
])[((
sample_offsetF
)
<<
1
)
+
1
]
=
(
Wt
[
l_prime
[
0
]]
*
Wf
[
k_prime
]
*
AMP
*
dmrs_seq
[(
2
*
dmrs_idx
)
+
1
])
>>
15
;
...
...
openair1/SIMULATION/NR_PHY/ulsim.c
View file @
142c697a
...
...
@@ -304,7 +304,7 @@ int main(int argc, char **argv)
uint16_t
ptrsSymbPerSlot
=
0
;
uint16_t
ptrsRePerSymb
=
0
;
uint8_t
transform_precoding
=
transform_precoder_disabled
;
// 0 - ENABLE, 1 - DISABLE
uint8_t
transform_precoding
=
1
;
// 0 - ENABLE, 1 - DISABLE
uint8_t
num_dmrs_cdm_grps_no_data
=
1
;
uint8_t
mcs_table
=
0
;
...
...
@@ -561,7 +561,7 @@ int main(int argc, char **argv)
case
'Z'
:
transform_precoding
=
transform_precoder_enabled
;
transform_precoding
=
0
;
num_dmrs_cdm_grps_no_data
=
2
;
mcs_table
=
3
;
...
...
@@ -835,7 +835,7 @@ int main(int argc, char **argv)
uint16_t
number_dmrs_symbols
=
get_dmrs_symbols_in_slot
(
l_prime_mask
,
nb_symb_sch
);
uint8_t
nb_re_dmrs
=
(
dmrs_config_type
==
pusch_dmrs_type1
)
?
6
:
4
;
if
(
transform_precoding
==
transform_precoder_enabled
)
{
if
(
transform_precoding
==
0
)
{
AssertFatal
(
enable_ptrs
==
0
,
"PTRS NOT SUPPORTED IF TRANSFORM PRECODING IS ENABLED
\n
"
);
...
...
@@ -1040,7 +1040,7 @@ int main(int argc, char **argv)
pusch_pdu
->
pusch_ptrs
.
ptrs_ports_list
=
(
nfapi_nr_ptrs_ports_t
*
)
malloc
(
2
*
sizeof
(
nfapi_nr_ptrs_ports_t
));
pusch_pdu
->
pusch_ptrs
.
ptrs_ports_list
[
0
].
ptrs_re_offset
=
0
;
if
(
transform_precoding
==
transform_precoder_enabled
)
{
if
(
transform_precoding
==
0
)
{
pusch_pdu
->
dfts_ofdm
.
low_papr_group_number
=
*
scc
->
physCellId
%
30
;
// U as defined in 38.211 section 6.4.1.1.1.2
pusch_pdu
->
dfts_ofdm
.
low_papr_sequence_number
=
0
;
// V as defined in 38.211 section 6.4.1.1.1.2
...
...
@@ -1100,7 +1100,7 @@ int main(int argc, char **argv)
ul_config
.
ul_config_list
[
0
].
pusch_config_pdu
.
transform_precoding
=
transform_precoding
;
if
(
transform_precoding
==
transform_precoder_enabled
)
{
if
(
transform_precoding
==
0
)
{
ul_config
.
ul_config_list
[
0
].
pusch_config_pdu
.
dfts_ofdm
.
low_papr_group_number
=
*
scc
->
physCellId
%
30
;
// U as defined in 38.211 section 6.4.1.1.1.2
ul_config
.
ul_config_list
[
0
].
pusch_config_pdu
.
dfts_ofdm
.
low_papr_sequence_number
=
0
;
// V as defined in 38.211 section 6.4.1.1.1.2
...
...
@@ -1205,7 +1205,7 @@ int main(int argc, char **argv)
}
if
(
n_trials
==
1
&&
round
==
0
)
{
if
(
n_trials
==
1
&&
round
==
0
)
{
#ifdef __AVX2__
int
off
=
((
nb_rb
&
1
)
==
1
)
?
4
:
0
;
#else
...
...
openair2/LAYER2/NR_MAC_UE/nr_ue_scheduler.c
View file @
142c697a
...
...
@@ -671,7 +671,7 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
/* TRANSFORM PRECODING ------------------------------------------------------------------------------------------*/
if
(
pusch_config_pdu
->
transform_precoding
==
transform_p
recoder_enabled
)
{
if
(
pusch_config_pdu
->
transform_precoding
==
NR_PUSCH_Config__transformP
recoder_enabled
)
{
pusch_config_pdu
->
num_dmrs_cdm_grps_no_data
=
2
;
...
...
@@ -722,7 +722,7 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
pusch_config_pdu
->
mcs_index
=
dci
->
mcs
;
/* MCS TABLE */
if
(
pusch_config_pdu
->
transform_precoding
==
transform_p
recoder_disabled
)
{
if
(
pusch_config_pdu
->
transform_precoding
==
NR_PUSCH_Config__transformP
recoder_disabled
)
{
pusch_config_pdu
->
mcs_table
=
get_pusch_mcs_table
(
pusch_Config
?
pusch_Config
->
mcs_Table
:
NULL
,
0
,
*
dci_format
,
rnti_type
,
target_ss
,
false
);
}
else
{
pusch_config_pdu
->
mcs_table
=
get_pusch_mcs_table
(
pusch_Config
?
pusch_Config
->
mcs_TableTransformPrecoder
:
NULL
,
1
,
*
dci_format
,
rnti_type
,
target_ss
,
false
);
...
...
@@ -752,9 +752,9 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
/* DMRS */
l_prime_mask
=
get_l_prime
(
pusch_config_pdu
->
nr_of_symbols
,
typeB
,
(
*
dci_format
==
NR_UL_DCI_FORMAT_0_1
)
?
pusch_dmrs_pos0
:
pusch_dmrs_pos2
,
pusch_len1
);
if
((
mac
->
ULbwp
[
0
]
&&
pusch_config_pdu
->
transform_precoding
==
transform_p
recoder_disabled
))
if
((
mac
->
ULbwp
[
0
]
&&
pusch_config_pdu
->
transform_precoding
==
NR_PUSCH_Config__transformP
recoder_disabled
))
pusch_config_pdu
->
num_dmrs_cdm_grps_no_data
=
1
;
else
if
(
*
dci_format
==
NR_UL_DCI_FORMAT_0_0
||
(
mac
->
ULbwp
[
0
]
&&
pusch_config_pdu
->
transform_precoding
==
transform_p
recoder_enabled
))
else
if
(
*
dci_format
==
NR_UL_DCI_FORMAT_0_0
||
(
mac
->
ULbwp
[
0
]
&&
pusch_config_pdu
->
transform_precoding
==
NR_PUSCH_Config__transformP
recoder_enabled
))
pusch_config_pdu
->
num_dmrs_cdm_grps_no_data
=
2
;
// Num PRB Overhead from PUSCH-ServingCellConfig
...
...
@@ -775,7 +775,7 @@ int nr_config_pusch_pdu(NR_UE_MAC_INST_t *mac,
mac
->
ULbwp
[
0
]
->
bwp_Dedicated
->
pusch_Config
->
choice
.
setup
&&
mac
->
ULbwp
[
0
]
->
bwp_Dedicated
->
pusch_Config
->
choice
.
setup
->
dmrs_UplinkForPUSCH_MappingTypeB
&&
mac
->
ULbwp
[
0
]
->
bwp_Dedicated
->
pusch_Config
->
choice
.
setup
->
dmrs_UplinkForPUSCH_MappingTypeB
->
choice
.
setup
->
phaseTrackingRS
)
{
if
(
pusch_config_pdu
->
transform_precoding
==
transform_p
recoder_disabled
)
{
if
(
pusch_config_pdu
->
transform_precoding
==
NR_PUSCH_Config__transformP
recoder_disabled
)
{
nfapi_nr_ue_ptrs_ports_t
ptrs_ports_list
;
pusch_config_pdu
->
pusch_ptrs
.
ptrs_ports_list
=
&
ptrs_ports_list
;
valid_ptrs_setup
=
set_ul_ptrs_values
(
mac
->
ULbwp
[
0
]
->
bwp_Dedicated
->
pusch_Config
->
choice
.
setup
->
dmrs_UplinkForPUSCH_MappingTypeB
->
choice
.
setup
->
phaseTrackingRS
->
choice
.
setup
,
...
...
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