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
a8140027
Commit
a8140027
authored
Feb 20, 2024
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Correct message (single pull8 -> pull16)
parent
aca9dfb8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
54 additions
and
27 deletions
+54
-27
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
+54
-27
No files found.
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
View file @
a8140027
...
@@ -960,22 +960,35 @@ static uint8_t pack_ul_tti_request_prach_pdu(nfapi_nr_prach_pdu_t *prach_pdu, ui
...
@@ -960,22 +960,35 @@ static uint8_t pack_ul_tti_request_prach_pdu(nfapi_nr_prach_pdu_t *prach_pdu, ui
static uint8_t pack_ul_tti_request_pucch_pdu(nfapi_nr_pucch_pdu_t *pucch_pdu, uint8_t **ppWritePackedMsg, uint8_t *end)
static uint8_t pack_ul_tti_request_pucch_pdu(nfapi_nr_pucch_pdu_t *pucch_pdu, uint8_t **ppWritePackedMsg, uint8_t *end)
{
{
if
(
!
(
push16
(
pucch_pdu
->
rnti
,
ppWritePackedMsg
,
end
)
&&
push32
(
pucch_pdu
->
handle
,
ppWritePackedMsg
,
end
)
if (!(push16(pucch_pdu->rnti, ppWritePackedMsg, end)
&&
push16
(
pucch_pdu
->
bwp_size
,
ppWritePackedMsg
,
end
)
&&
push16
(
pucch_pdu
->
bwp_start
,
ppWritePackedMsg
,
end
)
&& push32(pucch_pdu->handle, ppWritePackedMsg, end)
&&
push8
(
pucch_pdu
->
subcarrier_spacing
,
ppWritePackedMsg
,
end
)
&&
push8
(
pucch_pdu
->
cyclic_prefix
,
ppWritePackedMsg
,
end
)
&& push16(pucch_pdu->bwp_size, ppWritePackedMsg, end)
&&
push8
(
pucch_pdu
->
format_type
,
ppWritePackedMsg
,
end
)
&&
push8
(
pucch_pdu
->
multi_slot_tx_indicator
,
ppWritePackedMsg
,
end
)
&& push16(pucch_pdu->bwp_start, ppWritePackedMsg, end)
&&
push8
(
pucch_pdu
->
pi_2bpsk
,
ppWritePackedMsg
,
end
)
&&
push16
(
pucch_pdu
->
prb_start
,
ppWritePackedMsg
,
end
)
&& push8(pucch_pdu->subcarrier_spacing, ppWritePackedMsg, end)
&&
push16
(
pucch_pdu
->
prb_size
,
ppWritePackedMsg
,
end
)
&&
push8
(
pucch_pdu
->
start_symbol_index
,
ppWritePackedMsg
,
end
)
&& push8(pucch_pdu->cyclic_prefix, ppWritePackedMsg, end)
&&
push8
(
pucch_pdu
->
nr_of_symbols
,
ppWritePackedMsg
,
end
)
&&
push8
(
pucch_pdu
->
freq_hop_flag
,
ppWritePackedMsg
,
end
)
&& push8(pucch_pdu->format_type, ppWritePackedMsg, end)
&&
push16
(
pucch_pdu
->
second_hop_prb
,
ppWritePackedMsg
,
end
)
&&
push8
(
pucch_pdu
->
group_hop_flag
,
ppWritePackedMsg
,
end
)
&& push8(pucch_pdu->multi_slot_tx_indicator, ppWritePackedMsg, end)
&&
push8
(
pucch_pdu
->
sequence_hop_flag
,
ppWritePackedMsg
,
end
)
&&
push16
(
pucch_pdu
->
hopping_id
,
ppWritePackedMsg
,
end
)
&& push8(pucch_pdu->pi_2bpsk, ppWritePackedMsg, end)
&& push16(pucch_pdu->prb_start, ppWritePackedMsg, end)
&& push16(pucch_pdu->prb_size, ppWritePackedMsg, end)
&& push8(pucch_pdu->start_symbol_index, ppWritePackedMsg, end)
&& push8(pucch_pdu->nr_of_symbols, ppWritePackedMsg, end)
&& push8(pucch_pdu->freq_hop_flag, ppWritePackedMsg, end)
&& push16(pucch_pdu->second_hop_prb, ppWritePackedMsg, end)
&& push8(pucch_pdu->group_hop_flag, ppWritePackedMsg, end)
&& push8(pucch_pdu->sequence_hop_flag, ppWritePackedMsg, end)
&& push16(pucch_pdu->hopping_id, ppWritePackedMsg, end)
&& push16(pucch_pdu->initial_cyclic_shift, ppWritePackedMsg, end)
&& push16(pucch_pdu->initial_cyclic_shift, ppWritePackedMsg, end)
&& push16(pucch_pdu->data_scrambling_id, ppWritePackedMsg, end)
&& push16(pucch_pdu->data_scrambling_id, ppWritePackedMsg, end)
&&
push8
(
pucch_pdu
->
time_domain_occ_idx
,
ppWritePackedMsg
,
end
)
&&
push8
(
pucch_pdu
->
pre_dft_occ_idx
,
ppWritePackedMsg
,
end
)
&& push8(pucch_pdu->time_domain_occ_idx, ppWritePackedMsg, end)
&&
push8
(
pucch_pdu
->
pre_dft_occ_len
,
ppWritePackedMsg
,
end
)
&&
push8
(
pucch_pdu
->
add_dmrs_flag
,
ppWritePackedMsg
,
end
)
&& push8(pucch_pdu->pre_dft_occ_idx, ppWritePackedMsg, end)
&& push8(pucch_pdu->pre_dft_occ_len, ppWritePackedMsg, end)
&& push8(pucch_pdu->add_dmrs_flag, ppWritePackedMsg, end)
&& push16(pucch_pdu->dmrs_scrambling_id, ppWritePackedMsg, end)
&& push16(pucch_pdu->dmrs_scrambling_id, ppWritePackedMsg, end)
&&
push8
(
pucch_pdu
->
dmrs_cyclic_shift
,
ppWritePackedMsg
,
end
)
&&
push8
(
pucch_pdu
->
sr_flag
,
ppWritePackedMsg
,
end
)
&& push8(pucch_pdu->dmrs_cyclic_shift, ppWritePackedMsg, end)
&&
push16
(
pucch_pdu
->
bit_len_harq
,
ppWritePackedMsg
,
end
)
&&
push16
(
pucch_pdu
->
bit_len_csi_part1
,
ppWritePackedMsg
,
end
)
&& push8(pucch_pdu->sr_flag, ppWritePackedMsg, end)
&& push8(pucch_pdu->bit_len_harq, ppWritePackedMsg, end)
&& push16(pucch_pdu->bit_len_csi_part1, ppWritePackedMsg, end)
&& push16(pucch_pdu->bit_len_csi_part2, ppWritePackedMsg, end)
&& push16(pucch_pdu->bit_len_csi_part2, ppWritePackedMsg, end)
// Pack RX Beamforming PDU
// Pack RX Beamforming PDU
&& push16(pucch_pdu->beamforming.num_prgs, ppWritePackedMsg, end)
&& push16(pucch_pdu->beamforming.num_prgs, ppWritePackedMsg, end)
...
@@ -4798,23 +4811,37 @@ static uint8_t unpack_ul_tti_request_pucch_pdu(void *tlv, uint8_t **ppReadPacked
...
@@ -4798,23 +4811,37 @@ static uint8_t unpack_ul_tti_request_pucch_pdu(void *tlv, uint8_t **ppReadPacked
nfapi_nr_pucch_pdu_t *pucch_pdu = (nfapi_nr_pucch_pdu_t *)tlv;
nfapi_nr_pucch_pdu_t *pucch_pdu = (nfapi_nr_pucch_pdu_t *)tlv;
uint16_t dummy16 = 0;
uint16_t dummy16 = 0;
uint8_t dummy8 = 0;
uint8_t dummy8 = 0;
return
(
pull16
(
ppReadPackedMsg
,
&
pucch_pdu
->
rnti
,
end
)
&&
pull32
(
ppReadPackedMsg
,
&
pucch_pdu
->
handle
,
end
)
return (pull16(ppReadPackedMsg, &pucch_pdu->rnti, end)
&&
pull16
(
ppReadPackedMsg
,
&
pucch_pdu
->
bwp_size
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pucch_pdu
->
bwp_start
,
end
)
&& pull32(ppReadPackedMsg, &pucch_pdu->handle, end)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
subcarrier_spacing
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
cyclic_prefix
,
end
)
&& pull16(ppReadPackedMsg, &pucch_pdu->bwp_size, end)
&& pull16(ppReadPackedMsg, &pucch_pdu->bwp_start, end)
&& pull8(ppReadPackedMsg, &pucch_pdu->subcarrier_spacing, end)
&& pull8(ppReadPackedMsg, &pucch_pdu->cyclic_prefix, end)
&& pull8(ppReadPackedMsg, &pucch_pdu->format_type, end)
&& pull8(ppReadPackedMsg, &pucch_pdu->format_type, end)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
multi_slot_tx_indicator
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
pi_2bpsk
,
end
)
&& pull8(ppReadPackedMsg, &pucch_pdu->multi_slot_tx_indicator, end)
&&
pull16
(
ppReadPackedMsg
,
&
pucch_pdu
->
prb_start
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pucch_pdu
->
prb_size
,
end
)
&& pull8(ppReadPackedMsg, &pucch_pdu->pi_2bpsk, end)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
start_symbol_index
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
nr_of_symbols
,
end
)
&& pull16(ppReadPackedMsg, &pucch_pdu->prb_start, end)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
freq_hop_flag
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pucch_pdu
->
second_hop_prb
,
end
)
&& pull16(ppReadPackedMsg, &pucch_pdu->prb_size, end)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
group_hop_flag
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
sequence_hop_flag
,
end
)
&& pull8(ppReadPackedMsg, &pucch_pdu->start_symbol_index, end)
&&
pull16
(
ppReadPackedMsg
,
&
pucch_pdu
->
hopping_id
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pucch_pdu
->
initial_cyclic_shift
,
end
)
&& pull8(ppReadPackedMsg, &pucch_pdu->nr_of_symbols, end)
&& pull8(ppReadPackedMsg, &pucch_pdu->freq_hop_flag, end)
&& pull16(ppReadPackedMsg, &pucch_pdu->second_hop_prb, end)
&& pull8(ppReadPackedMsg, &pucch_pdu->group_hop_flag, end)
&& pull8(ppReadPackedMsg, &pucch_pdu->sequence_hop_flag, end)
&& pull16(ppReadPackedMsg, &pucch_pdu->hopping_id, end)
&& pull16(ppReadPackedMsg, &pucch_pdu->initial_cyclic_shift, end)
&& pull16(ppReadPackedMsg, &pucch_pdu->data_scrambling_id, end)
&& pull16(ppReadPackedMsg, &pucch_pdu->data_scrambling_id, end)
&& pull8(ppReadPackedMsg, &pucch_pdu->time_domain_occ_idx, end)
&& pull8(ppReadPackedMsg, &pucch_pdu->time_domain_occ_idx, end)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
pre_dft_occ_idx
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
pre_dft_occ_len
,
end
)
&& pull8(ppReadPackedMsg, &pucch_pdu->pre_dft_occ_idx, end)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
add_dmrs_flag
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pucch_pdu
->
dmrs_scrambling_id
,
end
)
&& pull8(ppReadPackedMsg, &pucch_pdu->pre_dft_occ_len, end)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
dmrs_cyclic_shift
,
end
)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
sr_flag
,
end
)
&& pull8(ppReadPackedMsg, &pucch_pdu->add_dmrs_flag, end)
&&
pull8
(
ppReadPackedMsg
,
&
pucch_pdu
->
bit_len_harq
,
end
)
&&
pull16
(
ppReadPackedMsg
,
&
pucch_pdu
->
bit_len_csi_part1
,
end
)
&& pull16(ppReadPackedMsg, &pucch_pdu->dmrs_scrambling_id, end)
&&
pull16
(
ppReadPackedMsg
,
&
pucch_pdu
->
bit_len_csi_part2
,
end
)
&&
&& pull8(ppReadPackedMsg, &pucch_pdu->dmrs_cyclic_shift, end)
&& pull8(ppReadPackedMsg, &pucch_pdu->sr_flag, end)
&& pull8(ppReadPackedMsg, &pucch_pdu->bit_len_harq, end)
&& pull16(ppReadPackedMsg, &pucch_pdu->bit_len_csi_part1, end)
&& pull16(ppReadPackedMsg, &pucch_pdu->bit_len_csi_part2, end)
&&
// TODO: ignoring beamforming tlv for now
// TODO: ignoring beamforming tlv for now
pull16(ppReadPackedMsg, &dummy16, end) && pull16(ppReadPackedMsg, &dummy16, end) && pull8(ppReadPackedMsg, &dummy8, end));
pull16(ppReadPackedMsg, &dummy16, end) && pull16(ppReadPackedMsg, &dummy16, end) && pull8(ppReadPackedMsg, &dummy8, end));
}
}
...
...
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