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
321f44ee
Commit
321f44ee
authored
Feb 11, 2024
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slot indication from PNF with additional +2
parent
c97ff740
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
15 deletions
+7
-15
executables/nr-gnb.c
executables/nr-gnb.c
+0
-12
nfapi/oai_integration/nfapi_pnf.c
nfapi/oai_integration/nfapi_pnf.c
+3
-1
nfapi/oai_integration/nfapi_vnf.c
nfapi/oai_integration/nfapi_vnf.c
+2
-1
nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
+1
-1
openair1/SCHED_NR/fapi_nr_l1.c
openair1/SCHED_NR/fapi_nr_l1.c
+1
-0
No files found.
executables/nr-gnb.c
View file @
321f44ee
...
...
@@ -218,18 +218,6 @@ static void rx_func(processingData_L1_t *info)
clock_gettime
(
CLOCK_MONOTONIC
,
&
info
->
gNB
->
rt_L1_profiling
.
start_L1_RX
[
rt_prof_idx
]);
start_meas
(
&
softmodem_stats_rxtx_sf
);
// *******************************************************************
if
(
NFAPI_MODE
==
NFAPI_MODE_PNF
)
{
// I am a PNF and I need to let nFAPI know that we have a (sub)frame tick
//LOG_D(PHY, "oai_nfapi_slot_ind(frame:%u, slot:%d) ********\n", frame_rx, slot_rx);
start_meas
(
&
nfapi_meas
);
handle_nr_slot_ind
(
frame_rx
,
slot_rx
);
stop_meas
(
&
nfapi_meas
);
}
// ****************************************
// RX processing
int
rx_slot_type
=
nr_slot_select
(
cfg
,
frame_rx
,
slot_rx
);
if
(
rx_slot_type
==
NR_UPLINK_SLOT
||
rx_slot_type
==
NR_MIXED_SLOT
)
{
...
...
nfapi/oai_integration/nfapi_pnf.c
View file @
321f44ee
...
...
@@ -2273,7 +2273,9 @@ void oai_subframe_ind(uint16_t sfn, uint16_t sf) {
void
handle_nr_slot_ind
(
uint16_t
sfn
,
uint16_t
slot
)
{
//send VNF slot indication, which is aligned with TX thread, so that it can call the scheduler
uint8_t
slot_ahead
=
6
;
// TODO ok?
//we give two additional slots which should be enough time for the VNF to
//answer
uint8_t
slot_ahead
=
2
;
uint32_t
sfn_slot_tx
=
sfnslot_add_slot
(
sfn
,
slot
,
slot_ahead
);
uint16_t
sfn_tx
=
NFAPI_SFNSLOT2SFN
(
sfn_slot_tx
);
uint8_t
slot_tx
=
NFAPI_SFNSLOT2SLOT
(
sfn_slot_tx
);
...
...
nfapi/oai_integration/nfapi_vnf.c
View file @
321f44ee
...
...
@@ -1221,8 +1221,9 @@ int phy_nr_slot_indication(nfapi_nr_slot_indication_scf_t *ind) {
uint32_t
vnf_sfn_slot
=
sfnslot_add_slot
(
ind
->
sfn
,
ind
->
slot
,
vnf_slot_ahead
);
uint16_t
vnf_sfn
=
NFAPI_SFNSLOT2SFN
(
vnf_sfn_slot
);
uint8_t
vnf_slot
=
NFAPI_SFNSLOT2SLOT
(
vnf_sfn_slot
);
LOG_
D
(
MAC
,
"VNF SFN/Slot %d.%d
\n
"
,
vnf_sfn
,
vnf_slot
);
LOG_
I
(
MAC
,
"VNF SFN/Slot %d.%d
\n
"
,
vnf_sfn
,
vnf_slot
);
// received slot indication
nfapi_nr_slot_indication_scf_t
*
nr_slot_ind
=
CALLOC
(
1
,
sizeof
(
*
nr_slot_ind
));
nr_slot_ind
->
header
=
ind
->
header
;
nr_slot_ind
->
sfn
=
vnf_sfn
;
...
...
nfapi/open-nFAPI/vnf/src/vnf_p7_interface.c
View file @
321f44ee
...
...
@@ -189,7 +189,7 @@ int nfapi_nr_vnf_p7_start(nfapi_vnf_p7_config_t* config)
gNB
->
UL_INFO
.
frame
,
gNB
->
UL_INFO
.
slot
,
prev_slot
);
if
(
setup_done
&&
prev_slot
!=
gNB
->
UL_INFO
.
slot
)
{
//Give the VNF sufficient time to setup before starting scheduling && prev_slot != gNB->UL_INFO.slot
//
Call the scheduler
//
Call into the scheduler (this is hardcoded and should be init properly!)
gNB
->
UL_INFO
.
module_id
=
gNB
->
Mod_id
;
gNB
->
UL_INFO
.
CC_id
=
gNB
->
CC_id
;
NFAPI_TRACE
(
NFAPI_TRACE_DEBUG
,
"Calling NR_UL_indication for gNB->UL_INFO.frame = %d and slot %d
\n
"
,
...
...
openair1/SCHED_NR/fapi_nr_l1.c
View file @
321f44ee
...
...
@@ -240,6 +240,7 @@ void nr_schedule_response(NR_Sched_Rsp_t *Sched_INFO)
if
(
NFAPI_MODE
==
NFAPI_MODE_VNF
)
{
// If VNF, oai_nfapi functions send respective p7 msgs to PNF for which nPDUs > 0
// order wrong!!
if
(
number_ul_tti_pdu
>
0
)
oai_nfapi_ul_tti_req
(
UL_tti_req
);
...
...
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