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
OpenXG
OpenXG UE
Commits
48ffaf2d
Commit
48ffaf2d
authored
Mar 13, 2021
by
Michael Cook
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Assert NFAPI_CRC_IND_MAX_PDU
parent
70fec784
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
4 deletions
+14
-4
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+6
-2
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
+4
-1
openair1/SCHED/phy_procedures_lte_eNb.c
openair1/SCHED/phy_procedures_lte_eNb.c
+1
-0
openair2/PHY_INTERFACE/IF_Module.c
openair2/PHY_INTERFACE/IF_Module.c
+2
-0
targets/RT/USER/lte-ue.c
targets/RT/USER/lte-ue.c
+1
-1
No files found.
nfapi/oai_integration/nfapi_vnf.c
View file @
48ffaf2d
...
...
@@ -735,9 +735,12 @@ int phy_crc_indication(struct nfapi_vnf_p7_config *config, nfapi_crc_indication_
UL_RCC_INFO
.
crc_ind
[
index
]
=
*
ind
;
if
(
ind
->
crc_indication_body
.
number_of_crcs
>
0
)
UL_RCC_INFO
.
crc_ind
[
index
].
crc_indication_body
.
crc_pdu_list
=
malloc
(
sizeof
(
nfapi_crc_indication_pdu_t
)
*
ind
->
crc_indication_body
.
number_of_crcs
);
assert
(
ind
->
crc_indication_body
.
number_of_crcs
<=
NFAPI_CRC_IND_MAX_PDU
);
if
(
ind
->
crc_indication_body
.
number_of_crcs
>
0
)
{
UL_RCC_INFO
.
crc_ind
[
index
].
crc_indication_body
.
crc_pdu_list
=
malloc
(
sizeof
(
nfapi_crc_indication_pdu_t
)
*
NFAPI_CRC_IND_MAX_PDU
);
}
assert
(
ind
->
crc_indication_body
.
number_of_crcs
<=
NFAPI_CRC_IND_MAX_PDU
);
for
(
int
i
=
0
;
i
<
ind
->
crc_indication_body
.
number_of_crcs
;
i
++
)
{
memcpy
(
&
UL_RCC_INFO
.
crc_ind
[
index
].
crc_indication_body
.
crc_pdu_list
[
i
],
&
ind
->
crc_indication_body
.
crc_pdu_list
[
i
],
sizeof
(
ind
->
crc_indication_body
.
crc_pdu_list
[
0
]));
...
...
@@ -759,6 +762,7 @@ int phy_crc_indication(struct nfapi_vnf_p7_config *config, nfapi_crc_indication_
LOG_D
(
MAC
,
"%s() NFAPI SFN/SF:%d IND:number_of_crcs:%u UL_INFO:crcs:%d
\n
"
,
__FUNCTION__
,
NFAPI_SFNSF2DEC
(
ind
->
sfn_sf
),
ind
->
crc_indication_body
.
number_of_crcs
,
eNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
number_of_crcs
);
assert
(
ind
->
crc_indication_body
.
number_of_crcs
<=
NFAPI_CRC_IND_MAX_PDU
);
for
(
int
i
=
0
;
i
<
ind
->
crc_indication_body
.
number_of_crcs
;
i
++
)
{
memcpy
(
&
dest_ind
->
crc_indication_body
.
crc_pdu_list
[
i
],
&
ind
->
crc_indication_body
.
crc_pdu_list
[
i
],
sizeof
(
ind
->
crc_indication_body
.
crc_pdu_list
[
0
]));
LOG_D
(
MAC
,
"%s() NFAPI SFN/SF:%d CRC_IND:number_of_crcs:%u UL_INFO:crcs:%d PDU[%d] rnti:%04x UL_INFO:rnti:%04x
\n
"
,
...
...
nfapi/open-nFAPI/nfapi/src/nfapi_p7.c
View file @
48ffaf2d
...
...
@@ -2532,6 +2532,7 @@ static uint8_t pack_crc_indication_body_value(void* tlv, uint8_t **ppWritePacked
uint16_t
i
=
0
;
uint16_t
total_number_of_pdus
=
value
->
number_of_crcs
;
assert
(
total_number_of_pdus
<=
NFAPI_CRC_IND_MAX_PDU
);
for
(;
i
<
total_number_of_pdus
;
++
i
)
{
nfapi_crc_indication_pdu_t
*
pdu
=
&
(
value
->
crc_pdu_list
[
i
]);
...
...
@@ -6408,7 +6409,8 @@ static uint8_t unpack_crc_indication_body_value(void *tlv, uint8_t **ppReadPacke
if
(
value
->
number_of_crcs
>
0
)
{
value
->
crc_pdu_list
=
(
nfapi_crc_indication_pdu_t
*
)
nfapi_p7_allocate
(
sizeof
(
nfapi_crc_indication_pdu_t
)
*
value
->
number_of_crcs
,
config
);
assert
(
value
->
number_of_crcs
<=
NFAPI_CRC_IND_MAX_PDU
);
value
->
crc_pdu_list
=
(
nfapi_crc_indication_pdu_t
*
)
nfapi_p7_allocate
(
sizeof
(
nfapi_crc_indication_pdu_t
)
*
NFAPI_CRC_IND_MAX_PDU
,
config
);
if
(
value
->
crc_pdu_list
==
NULL
)
{
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"%s failed to allocate crc ind pdu list (count:%d)
\n
"
,
__FUNCTION__
,
value
->
number_of_crcs
);
...
...
@@ -6422,6 +6424,7 @@ static uint8_t unpack_crc_indication_body_value(void *tlv, uint8_t **ppReadPacke
uint8_t
i
=
0
;
assert
(
value
->
number_of_crcs
<=
NFAPI_CRC_IND_MAX_PDU
);
for
(
i
=
0
;
i
<
value
->
number_of_crcs
;
++
i
)
{
nfapi_crc_indication_pdu_t
*
pdu
=
&
(
value
->
crc_pdu_list
[
i
]);
...
...
openair1/SCHED/phy_procedures_lte_eNb.c
View file @
48ffaf2d
...
...
@@ -2088,6 +2088,7 @@ void fill_uci_harq_indication (int UEid, PHY_VARS_eNB *eNB, LTE_eNB_UCI *uci, in
void
fill_crc_indication
(
PHY_VARS_eNB
*
eNB
,
int
UE_id
,
int
frame
,
int
subframe
,
uint8_t
crc_flag
)
{
pthread_mutex_lock
(
&
eNB
->
UL_INFO_mutex
);
assert
(
eNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
number_of_crcs
<=
NFAPI_CRC_IND_MAX_PDU
);
nfapi_crc_indication_pdu_t
*
pdu
=
&
eNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
crc_pdu_list
[
eNB
->
UL_INFO
.
crc_ind
.
crc_indication_body
.
number_of_crcs
];
eNB
->
UL_INFO
.
crc_ind
.
sfn_sf
=
frame
<<
4
|
subframe
;
eNB
->
UL_INFO
.
crc_ind
.
header
.
message_id
=
NFAPI_CRC_INDICATION
;
...
...
openair2/PHY_INTERFACE/IF_Module.c
View file @
48ffaf2d
...
...
@@ -229,6 +229,7 @@ void handle_ulsch(UL_IND_t *UL_info) {
if
((
UL_RCC_INFO
.
rx_ind
[
k
].
rx_indication_body
.
number_of_pdus
>
0
)
&&
(
UL_RCC_INFO
.
crc_ind
[
k
].
crc_indication_body
.
number_of_crcs
>
0
))
{
assert
(
UL_RCC_INFO
.
rx_ind
[
k
].
rx_indication_body
.
number_of_pdus
<=
NFAPI_RX_IND_MAX_PDU
);
for
(
i
=
0
;
i
<
UL_RCC_INFO
.
rx_ind
[
k
].
rx_indication_body
.
number_of_pdus
;
i
++
)
{
assert
(
UL_RCC_INFO
.
crc_ind
[
k
].
crc_indication_body
.
number_of_crcs
<=
NFAPI_CRC_IND_MAX_PDU
);
for
(
j
=
0
;
j
<
UL_RCC_INFO
.
crc_ind
[
k
].
crc_indication_body
.
number_of_crcs
;
j
++
)
{
// find crc_indication j corresponding rx_indication i
LOG_D
(
PHY
,
"UL_info->crc_ind.crc_indication_body.crc_pdu_list[%d].rx_ue_information.rnti:%04x UL_info->rx_ind.rx_indication_body.rx_pdu_list[%d].rx_ue_information.rnti:%04x
\n
"
,
...
...
@@ -283,6 +284,7 @@ void handle_ulsch(UL_IND_t *UL_info) {
if
(
UL_info
->
rx_ind
.
rx_indication_body
.
number_of_pdus
>
0
&&
UL_info
->
crc_ind
.
crc_indication_body
.
number_of_crcs
>
0
)
{
assert
(
UL_info
->
rx_ind
.
rx_indication_body
.
number_of_pdus
<=
NFAPI_RX_IND_MAX_PDU
);
for
(
i
=
0
;
i
<
UL_info
->
rx_ind
.
rx_indication_body
.
number_of_pdus
;
i
++
)
{
assert
(
UL_info
->
crc_ind
.
crc_indication_body
.
number_of_crcs
<=
NFAPI_CRC_IND_MAX_PDU
);
for
(
j
=
0
;
j
<
UL_info
->
crc_ind
.
crc_indication_body
.
number_of_crcs
;
j
++
)
{
// find crc_indication j corresponding rx_indication i
LOG_D
(
PHY
,
"UL_info->crc_ind.crc_indication_body.crc_pdu_list[%d].rx_ue_information.rnti:%04x UL_info->rx_ind.rx_indication_body.rx_pdu_list[%d].rx_ue_information.rnti:%04x
\n
"
,
j
,
...
...
targets/RT/USER/lte-ue.c
View file @
48ffaf2d
...
...
@@ -1042,7 +1042,7 @@ static void *UE_phy_stub_standalone_pnf_task(void *arg)
UL_INFO
=
(
UL_IND_t
*
)
calloc
(
1
,
sizeof
(
UL_IND_t
));
UL_INFO
->
rx_ind
.
rx_indication_body
.
rx_pdu_list
=
calloc
(
NFAPI_RX_IND_MAX_PDU
,
sizeof
(
nfapi_rx_indication_pdu_t
));
UL_INFO
->
rx_ind
.
rx_indication_body
.
number_of_pdus
=
0
;
UL_INFO
->
crc_ind
.
crc_indication_body
.
crc_pdu_list
=
calloc
(
N
UMBER_OF_UE_MAX
,
sizeof
(
nfapi_crc_indication_pdu_t
));
UL_INFO
->
crc_ind
.
crc_indication_body
.
crc_pdu_list
=
calloc
(
N
FAPI_CRC_IND_MAX_PDU
,
sizeof
(
nfapi_crc_indication_pdu_t
));
UL_INFO
->
crc_ind
.
crc_indication_body
.
number_of_crcs
=
0
;
UL_INFO
->
harq_ind
.
harq_indication_body
.
harq_pdu_list
=
calloc
(
NUMBER_OF_UE_MAX
,
sizeof
(
nfapi_harq_indication_pdu_t
));
UL_INFO
->
harq_ind
.
harq_indication_body
.
number_of_harqs
=
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