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
lizhongxiao
OpenXG-RAN
Commits
6cc2d6fb
Commit
6cc2d6fb
authored
Feb 14, 2023
by
Swetank Srivastava
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
changes for debugging gNB setup
parent
d7d51b4f
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
113 additions
and
92 deletions
+113
-92
nfapi/open-nFAPI/common/public_inc/debug.h
nfapi/open-nFAPI/common/public_inc/debug.h
+1
-2
nfapi/open-nFAPI/pnf/src/pnf_p7.c
nfapi/open-nFAPI/pnf/src/pnf_p7.c
+89
-84
nfapi/open-nFAPI/vnf/src/vnf_p7.c
nfapi/open-nFAPI/vnf/src/vnf_p7.c
+6
-5
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
+16
-0
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
+1
-1
No files found.
nfapi/open-nFAPI/common/public_inc/debug.h
View file @
6cc2d6fb
...
...
@@ -38,7 +38,6 @@ void nfapi_trace(nfapi_trace_level_t, char const *caller, const char *format, ..
nfapi_trace_level_t
nfapi_trace_level
(
void
);
#define NFAPI_TRACE(LEVEL, FORMAT, ...) do { \
if (nfapi_trace_level() >= (LEVEL)) \
nfapi_trace(LEVEL, __func__, FORMAT, ##__VA_ARGS__); \
} while (0)
nfapi/open-nFAPI/pnf/src/pnf_p7.c
View file @
6cc2d6fb
...
...
@@ -1621,6 +1621,7 @@ void pnf_handle_dl_tti_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7)
struct
timespec
t
;
clock_gettime
(
CLOCK_MONOTONIC
,
&
t
);
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"swetank: fxn:%s sfn:%d slot:%d
\n
"
,
__FUNCTION__
,
req
->
SFN
,
req
->
Slot
);
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"%s() %ld.%09ld POPULATE DL_TTI_REQ current tx sfn/slot:%d.%d p7 msg sfn/slot: %d.%d buffer_index:%d
\n
"
,
__FUNCTION__
,
t
.
tv_sec
,
t
.
tv_nsec
,
pnf_p7
->
sfn
,
pnf_p7
->
slot
,
req
->
SFN
,
req
->
Slot
,
buffer_index
);
...
...
@@ -1782,6 +1783,7 @@ void pnf_handle_ul_tti_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7)
if
(
is_nr_p7_request_in_window
(
req
->
SFN
,
req
->
Slot
,
"ul_tti_request"
,
pnf_p7
))
{
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"swetank: fxn:%s sfn:%d slot:%d
\n
"
,
__FUNCTION__
,
req
->
SFN
,
req
->
Slot
);
uint32_t
sfn_slot_dec
=
NFAPI_SFNSLOT2DEC
(
req
->
SFN
,
req
->
Slot
);
uint8_t
buffer_index
=
(
sfn_slot_dec
%
20
);
...
...
@@ -1930,6 +1932,7 @@ void pnf_handle_ul_dci_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7)
if
(
is_nr_p7_request_in_window
(
req
->
SFN
,
req
->
Slot
,
"ul_dci_request"
,
pnf_p7
))
{
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"swetank: fxn:%s sfn:%d slot:%d
\n
"
,
__FUNCTION__
,
req
->
SFN
,
req
->
Slot
);
uint32_t
sfn_slot_dec
=
NFAPI_SFNSLOT2DEC
(
req
->
SFN
,
req
->
Slot
);
uint8_t
buffer_index
=
sfn_slot_dec
%
20
;
...
...
@@ -2069,6 +2072,7 @@ void pnf_handle_tx_data_request(void* pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7
if
(
is_nr_p7_request_in_window
(
req
->
SFN
,
req
->
Slot
,
"tx_request"
,
pnf_p7
))
{
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"swetank: fxn:%s sfn:%d slot:%d
\n
"
,
__FUNCTION__
,
req
->
SFN
,
req
->
Slot
);
uint32_t
sfn_slot_dec
=
NFAPI_SFNSLOT2DEC
(
req
->
SFN
,
req
->
Slot
);
uint8_t
buffer_index
=
sfn_slot_dec
%
20
;
...
...
@@ -2505,6 +2509,7 @@ void pnf_nr_handle_dl_node_sync(void *pRecvMsg, int recvMsgLen, pnf_p7_t* pnf_p7
return
;
}
if
(
pthread_mutex_lock
(
&
(
pnf_p7
->
mutex
))
!=
0
)
{
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"failed to lock mutex
\n
"
);
...
...
nfapi/open-nFAPI/vnf/src/vnf_p7.c
View file @
6cc2d6fb
...
...
@@ -1511,7 +1511,7 @@ void vnf_handle_nr_slot_indication(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf
}
else
{
NFAPI_TRACE
(
NFAPI_TRACE_DEBUG
,
"%s: Handling NR SLOT Indication
\n
"
,
__FUNCTION__
);
NFAPI_TRACE
(
NFAPI_TRACE_DEBUG
,
"%s: Handling NR SLOT Indication
sfn:%d slot:%d
\n
"
,
__FUNCTION__
,
ind
.
sfn
,
ind
.
slot
);
if
(
vnf_p7
->
_public
.
nr_slot_indication
)
{
(
vnf_p7
->
_public
.
nr_slot_indication
)(
&
ind
);
...
...
@@ -1537,7 +1537,7 @@ void vnf_handle_nr_rx_data_indication(void *pRecvMsg, int recvMsgLen, vnf_p7_t*
}
else
{
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"%s: Handling RX Indication
\n
"
,
__FUNCTION__
);
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"%s: Handling RX Indication
sfn:%d slot:%d
\n
"
,
__FUNCTION__
,
ind
.
sfn
,
ind
.
slot
);
if
(
vnf_p7
->
_public
.
nr_rx_data_indication
)
{
(
vnf_p7
->
_public
.
nr_rx_data_indication
)(
&
ind
);
...
...
@@ -1563,7 +1563,7 @@ void vnf_handle_nr_crc_indication(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_
}
else
{
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"%s: Handling CRC Indication
\n
"
,
__FUNCTION__
);
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"%s: Handling CRC Indication
sfn:%d slot:%d
\n
"
,
__FUNCTION__
,
ind
.
sfn
,
ind
.
slot
);
if
(
vnf_p7
->
_public
.
nr_crc_indication
)
{
(
vnf_p7
->
_public
.
nr_crc_indication
)(
&
ind
);
...
...
@@ -1589,6 +1589,7 @@ void vnf_handle_nr_srs_indication(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_
}
else
{
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"%s: Handling SRS Indication sfn:%d slot:%d
\n
"
,
__FUNCTION__
,
ind
.
sfn
,
ind
.
slot
);
if
(
vnf_p7
->
_public
.
nr_srs_indication
)
{
(
vnf_p7
->
_public
.
nr_srs_indication
)(
&
ind
);
...
...
@@ -1614,7 +1615,7 @@ void vnf_handle_nr_uci_indication(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf_
}
else
{
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"%s: Handling UCI Indication
\n
"
,
__FUNCTION__
);
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"%s: Handling UCI Indication
sfn:%d slot:%d
\n
"
,
__FUNCTION__
,
ind
.
sfn
,
ind
.
slot
);
if
(
vnf_p7
->
_public
.
nr_uci_indication
)
{
(
vnf_p7
->
_public
.
nr_uci_indication
)(
&
ind
);
...
...
@@ -1640,7 +1641,7 @@ void vnf_handle_nr_rach_indication(void *pRecvMsg, int recvMsgLen, vnf_p7_t* vnf
}
else
{
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"%s: Handling RACH Indication
\n
"
,
__FUNCTION__
);
NFAPI_TRACE
(
NFAPI_TRACE_INFO
,
"%s: Handling RACH Indication
sfn:%d slot:%d
\n
"
,
__FUNCTION__
,
ind
.
sfn
,
ind
.
slot
);
if
(
vnf_p7
->
_public
.
nr_rach_indication
)
{
(
vnf_p7
->
_public
.
nr_rach_indication
)(
&
ind
);
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_uci.c
View file @
6cc2d6fb
...
...
@@ -168,6 +168,14 @@ void nr_schedule_pucch(gNB_MAC_INST *nrmac,
NR_sched_pucch_t
*
curr_pucch
=
&
UE
->
UE_sched_ctrl
.
sched_pucch
[
pucch_index
];
if
(
!
curr_pucch
->
active
)
continue
;
LOG_A
(
NR_MAC
,
"swetank: fxn:%s frameP:%d curr_pucch->frame:%d slotP:%d curr_pucch->ul_slot:%d
\n
"
,
__FUNCTION__
,
frameP
,
curr_pucch
->
frame
,
slotP
,
curr_pucch
->
ul_slot
);
DevAssert
(
frameP
==
curr_pucch
->
frame
&&
slotP
==
curr_pucch
->
ul_slot
);
const
uint16_t
O_ack
=
curr_pucch
->
dai_c
;
...
...
@@ -1245,6 +1253,14 @@ void nr_sr_reporting(gNB_MAC_INST *nrmac, frame_t SFN, sub_frame_t slot)
else
if
(
curr_pucch
->
active
)
{
AssertFatal
(
1
==
0
,
"This shouldn't happen! curr_pucch frame.slot %d.%d not matching with SR function frame.slot %d.%d
\n
"
,
curr_pucch
->
frame
,
curr_pucch
->
ul_slot
,
SFN
,
slot
);
LOG_A
(
NR_MAC
,
"swetank: fxn:%d frameP:%d curr_pucch->frame:%d slotP:%d curr_pucch->ul_slot:%d
\n
"
,
__FUNCTION__
,
SFN
,
curr_pucch
->
frame
,
slot
,
curr_pucch
->
ul_slot
);
continue
;
}
else
{
...
...
openair2/LAYER2/nr_pdcp/nr_pdcp_oai_api.c
View file @
6cc2d6fb
...
...
@@ -1366,7 +1366,7 @@ static bool pdcp_data_req_srb(protocol_ctxt_t *ctxt_pP,
nr_pdcp_pkt_info_t
pdcp_pkt
;
memset
(
&
pdcp_pkt
,
0
,
sizeof
(
pdcp_pkt
));
pdcp_pkt
.
direction
=
1
;
//PDCP_NR_DIRECTION_DOWNLINK
pdcp_pkt
.
ueid
=
ue
->
rntiMaybeUEid
;
//
pdcp_pkt.ueid = ue->rntiMaybeUEid;
pdcp_pkt
.
bearerType
=
8
;
//TODO
pdcp_pkt
.
bearerId
=
rb_id
-
1
;
pdcp_pkt
.
plane
=
(
rb_id
==
1
)
?
4
:
1
;
...
...
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