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
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
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
OpenXG
OpenXG-RAN
Commits
a6aa5d83
Commit
a6aa5d83
authored
Feb 19, 2024
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct messages
parent
03d2b223
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
29 deletions
+56
-29
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
+54
-27
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+1
-1
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
+1
-1
No files found.
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
View file @
a6aa5d83
...
...
@@ -994,24 +994,37 @@ static uint8_t pack_ul_tti_request_pucch_pdu(nfapi_nr_pucch_pdu_t *pucch_pdu, ui
static
uint8_t
pack_ul_tti_request_pusch_pdu
(
nfapi_nr_pusch_pdu_t
*
pusch_pdu
,
uint8_t
**
ppWritePackedMsg
,
uint8_t
*
end
)
{
if
(
!
(
push16
(
pusch_pdu
->
pdu_bit_map
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
rnti
,
ppWritePackedMsg
,
end
)
&&
push32
(
pusch_pdu
->
handle
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
bwp_size
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
bwp_start
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
subcarrier_spacing
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
cyclic_prefix
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
target_code_rate
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
qam_mod_order
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
mcs_index
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
mcs_table
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
transform_precoding
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
data_scrambling_id
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
nrOfLayers
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
ul_dmrs_symb_pos
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
dmrs_config_type
,
ppWritePackedMsg
,
end
)
if
(
!
(
push16
(
pusch_pdu
->
pdu_bit_map
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
rnti
,
ppWritePackedMsg
,
end
)
&&
push32
(
pusch_pdu
->
handle
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
bwp_size
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
bwp_start
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
subcarrier_spacing
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
cyclic_prefix
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
target_code_rate
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
qam_mod_order
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
mcs_index
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
mcs_table
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
transform_precoding
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
data_scrambling_id
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
nrOfLayers
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
ul_dmrs_symb_pos
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
dmrs_config_type
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
ul_dmrs_scrambling_id
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
pusch_identity
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
scid
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
pusch_identity
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
scid
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
num_dmrs_cdm_grps_no_data
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
dmrs_ports
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
resource_alloc
,
ppWritePackedMsg
,
end
)
&&
pusharray8
(
pusch_pdu
->
rb_bitmap
,
36
,
36
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
rb_start
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
rb_size
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
vrb_to_prb_mapping
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
dmrs_ports
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
resource_alloc
,
ppWritePackedMsg
,
end
)
&&
pusharray8
(
pusch_pdu
->
rb_bitmap
,
36
,
36
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
rb_start
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
rb_size
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
vrb_to_prb_mapping
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
frequency_hopping
,
ppWritePackedMsg
,
end
)
&&
push16
(
pusch_pdu
->
tx_direct_current_location
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
uplink_frequency_shift_7p5khz
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
start_symbol_index
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
nr_of_symbols
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
start_symbol_index
,
ppWritePackedMsg
,
end
)
&&
push8
(
pusch_pdu
->
nr_of_symbols
,
ppWritePackedMsg
,
end
)
// TODO: ignoring beamforming tlv for now
))
{
return
0
;
...
...
@@ -4840,23 +4853,37 @@ static uint8_t unpack_ul_tti_request_pusch_pdu(void *tlv, uint8_t **ppReadPacked
{
nfapi_nr_pusch_pdu_t
*
pusch_pdu
=
(
nfapi_nr_pusch_pdu_t
*
)
tlv
;
if
(
!
(
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
pdu_bit_map
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
rnti
,
end
)
&&
pull32
(
ppReadPackedMsg
,
&
pusch_pdu
->
handle
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
bwp_size
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
bwp_start
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
subcarrier_spacing
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
cyclic_prefix
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
target_code_rate
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
qam_mod_order
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
mcs_index
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
mcs_table
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
transform_precoding
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
data_scrambling_id
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
nrOfLayers
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
ul_dmrs_symb_pos
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
dmrs_config_type
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
ul_dmrs_scrambling_id
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
scid
,
end
)
if
(
!
(
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
pdu_bit_map
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
rnti
,
end
)
&&
pull32
(
ppReadPackedMsg
,
&
pusch_pdu
->
handle
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
bwp_size
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
bwp_start
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
subcarrier_spacing
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
cyclic_prefix
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
target_code_rate
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
qam_mod_order
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
mcs_index
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
mcs_table
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
transform_precoding
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
data_scrambling_id
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
nrOfLayers
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
ul_dmrs_symb_pos
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
dmrs_config_type
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
ul_dmrs_scrambling_id
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
pusch_identity
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
scid
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
num_dmrs_cdm_grps_no_data
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
dmrs_ports
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
resource_alloc
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
resource_alloc
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
dmrs_ports
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
rb_start
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
rb_size
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
vrb_to_prb_mapping
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
frequency_hopping
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
dmrs_ports
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
resource_alloc
,
end
)
&&
pullarray8
(
ppReadPackedMsg
,
pusch_pdu
->
rb_bitmap
,
36
,
36
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
rb_start
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
rb_size
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
vrb_to_prb_mapping
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
frequency_hopping
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pusch_pdu
->
tx_direct_current_location
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
uplink_frequency_shift_7p5khz
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
start_symbol_index
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
nr_of_symbols
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
start_symbol_index
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pusch_pdu
->
nr_of_symbols
,
end
)
// TODO: ignoring beamforming tlv for now
))
return
0
;
...
...
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
a6aa5d83
...
...
@@ -508,7 +508,7 @@ void nr_fill_indication(PHY_VARS_gNB *gNB, int frame, int slot_rx, int ULSCH_id,
gNB
->
crc_pdu_list
[
num_crc
].
rnti
=
pusch_pdu
->
rnti
;
gNB
->
crc_pdu_list
[
num_crc
].
harq_id
=
harq_pid
;
gNB
->
crc_pdu_list
[
num_crc
].
tb_crc_status
=
crc_flag
;
gNB
->
crc_pdu_list
[
num_crc
].
num_cb
=
pusch_pdu
->
pusch_data
.
num_cb
;
gNB
->
crc_pdu_list
[
num_crc
].
num_cb
=
0
;
gNB
->
crc_pdu_list
[
num_crc
].
ul_cqi
=
cqi
;
gNB
->
crc_pdu_list
[
num_crc
].
timing_advance
=
timing_advance_update
;
// in terms of dBFS range -128 to 0 with 0.1 step
...
...
openair1/SCHED_NR_UE/fapi_nr_ue_l1.c
View file @
a6aa5d83
...
...
@@ -173,7 +173,7 @@ int8_t nr_ue_scheduled_response_stub(nr_scheduled_response_t *scheduled_response
crc_ind
->
crc_list
[
j
].
harq_id
=
pusch_config_pdu
->
pusch_data
.
harq_process_id
;
LOG_D
(
NR_MAC
,
"This is the harq pid %d for crc_list[%d]
\n
"
,
crc_ind
->
crc_list
[
j
].
harq_id
,
j
);
LOG_D
(
NR_MAC
,
"This is sched sfn/sl [%d %d] and crc sfn/sl [%d %d]
\n
"
,
frame
,
slot
,
crc_ind
->
sfn
,
crc_ind
->
slot
);
crc_ind
->
crc_list
[
j
].
num_cb
=
pusch_config_pdu
->
pusch_data
.
num_cb
;
crc_ind
->
crc_list
[
j
].
num_cb
=
0
;
crc_ind
->
crc_list
[
j
].
rnti
=
pusch_config_pdu
->
rnti
;
crc_ind
->
crc_list
[
j
].
tb_crc_status
=
0
;
crc_ind
->
crc_list
[
j
].
timing_advance
=
31
;
...
...
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