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
wangjie
OpenXG-RAN
Commits
2a9356e6
Commit
2a9356e6
authored
May 15, 2020
by
heshanyun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge from vran cbrs, to fix issue about DL pdu NULL and Signal 11 of PNF
parent
b40aeead
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
0 deletions
+6
-0
nfapi/oai_integration/nfapi_pnf.c
nfapi/oai_integration/nfapi_pnf.c
+6
-0
No files found.
nfapi/oai_integration/nfapi_pnf.c
View file @
2a9356e6
...
@@ -773,6 +773,8 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request
...
@@ -773,6 +773,8 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request
if
(
tx_request_pdu
[
sfn
][
sf
][
pdu_index
]
!=
NULL
)
{
if
(
tx_request_pdu
[
sfn
][
sf
][
pdu_index
]
!=
NULL
)
{
//NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() PDU:%d BCH: pdu_index:%u pdu_length:%d sdu_length:%d BCH_SDU:%x,%x,%x\n", __FUNCTION__, i, pdu_index, bch_pdu->bch_pdu_rel8.length, tx_request_pdu[sfn][sf][pdu_index]->segments[0].segment_length, sdu[0], sdu[1], sdu[2]);
//NFAPI_TRACE(NFAPI_TRACE_INFO, "%s() PDU:%d BCH: pdu_index:%u pdu_length:%d sdu_length:%d BCH_SDU:%x,%x,%x\n", __FUNCTION__, i, pdu_index, bch_pdu->bch_pdu_rel8.length, tx_request_pdu[sfn][sf][pdu_index]->segments[0].segment_length, sdu[0], sdu[1], sdu[2]);
handle_nfapi_bch_pdu
(
eNB
,
proc
,
&
dl_config_pdu_list
[
i
],
tx_request_pdu
[
sfn
][
sf
][
pdu_index
]
->
segments
[
0
].
segment_data
);
handle_nfapi_bch_pdu
(
eNB
,
proc
,
&
dl_config_pdu_list
[
i
],
tx_request_pdu
[
sfn
][
sf
][
pdu_index
]
->
segments
[
0
].
segment_data
);
tx_request_pdu
[
sfn
][
sf
][
pdu_index
]
=
NULL
;
eNB
->
pbch_configured
=
1
;
eNB
->
pbch_configured
=
1
;
}
else
{
}
else
{
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"%s() BCH NULL TX PDU SFN/SF:%d PDU_INDEX:%d
\n
"
,
__FUNCTION__
,
NFAPI_SFNSF2DEC
(
req
->
sfn_sf
),
pdu_index
);
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"%s() BCH NULL TX PDU SFN/SF:%d PDU_INDEX:%d
\n
"
,
__FUNCTION__
,
NFAPI_SFNSF2DEC
(
req
->
sfn_sf
),
pdu_index
);
...
@@ -780,6 +782,9 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request
...
@@ -780,6 +782,9 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request
}
else
if
(
dl_config_pdu_list
[
i
].
pdu_type
==
NFAPI_DL_CONFIG_DLSCH_PDU_TYPE
)
{
}
else
if
(
dl_config_pdu_list
[
i
].
pdu_type
==
NFAPI_DL_CONFIG_DLSCH_PDU_TYPE
)
{
nfapi_dl_config_dlsch_pdu
*
dlsch_pdu
=
&
dl_config_pdu_list
[
i
].
dlsch_pdu
;
nfapi_dl_config_dlsch_pdu
*
dlsch_pdu
=
&
dl_config_pdu_list
[
i
].
dlsch_pdu
;
nfapi_dl_config_dlsch_pdu_rel8_t
*
rel8_pdu
=
&
dlsch_pdu
->
dlsch_pdu_rel8
;
nfapi_dl_config_dlsch_pdu_rel8_t
*
rel8_pdu
=
&
dlsch_pdu
->
dlsch_pdu_rel8
;
if
(
rel8_pdu
->
pdu_index
<
0
)
{
handle_nfapi_dlsch_pdu
(
eNB
,
sfn
,
sf
,
&
eNB
->
proc
.
L1_proc
,
&
dl_config_pdu_list
[
i
],
rel8_pdu
->
transport_blocks
-
1
,
NULL
);
}
else
{
nfapi_tx_request_pdu_t
*
tx_pdu
=
tx_request_pdu
[
sfn
][
sf
][
rel8_pdu
->
pdu_index
];
nfapi_tx_request_pdu_t
*
tx_pdu
=
tx_request_pdu
[
sfn
][
sf
][
rel8_pdu
->
pdu_index
];
if
(
tx_pdu
!=
NULL
)
{
if
(
tx_pdu
!=
NULL
)
{
...
@@ -803,6 +808,7 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request
...
@@ -803,6 +808,7 @@ int pnf_phy_dl_config_req(nfapi_pnf_p7_config_t *pnf_p7, nfapi_dl_config_request
}
else
{
}
else
{
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"%s() DLSCH NULL TX PDU SFN/SF:%d PDU_INDEX:%d
\n
"
,
__FUNCTION__
,
NFAPI_SFNSF2DEC
(
req
->
sfn_sf
),
rel8_pdu
->
pdu_index
);
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"%s() DLSCH NULL TX PDU SFN/SF:%d PDU_INDEX:%d
\n
"
,
__FUNCTION__
,
NFAPI_SFNSF2DEC
(
req
->
sfn_sf
),
rel8_pdu
->
pdu_index
);
}
}
}
}
else
{
}
else
{
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"%s() UNKNOWN:%d
\n
"
,
__FUNCTION__
,
dl_config_pdu_list
[
i
].
pdu_type
);
NFAPI_TRACE
(
NFAPI_TRACE_ERROR
,
"%s() UNKNOWN:%d
\n
"
,
__FUNCTION__
,
dl_config_pdu_list
[
i
].
pdu_type
);
}
}
...
...
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