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
canghaiwuhen
OpenXG-RAN
Commits
5c0a817f
Commit
5c0a817f
authored
Feb 10, 2020
by
Sakthivel Velumani
Browse files
Options
Browse Files
Download
Plain Diff
FR1 works fine in rfsimulator
Initial sync not happening fot FR2
parents
be09a9b0
e1647ac6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
6 deletions
+10
-6
executables/nr-gnb.c
executables/nr-gnb.c
+2
-0
executables/nr-ru.c
executables/nr-ru.c
+1
-0
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
+7
-6
No files found.
executables/nr-gnb.c
View file @
5c0a817f
...
@@ -104,6 +104,7 @@ extern openair0_config_t openair0_cfg[MAX_CARDS];
...
@@ -104,6 +104,7 @@ extern openair0_config_t openair0_cfg[MAX_CARDS];
extern
int
transmission_mode
;
extern
int
transmission_mode
;
uint16_t
sf_ahead
=
3
;
uint16_t
sf_ahead
=
3
;
uint16_t
sl_ahead
;
//pthread_t main_gNB_thread;
//pthread_t main_gNB_thread;
time_stats_t
softmodem_stats_mt
;
// main thread
time_stats_t
softmodem_stats_mt
;
// main thread
...
@@ -398,6 +399,7 @@ void gNB_top(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, char *string, struct
...
@@ -398,6 +399,7 @@ void gNB_top(PHY_VARS_gNB *gNB, int frame_rx, int slot_rx, char *string, struct
RU_proc_t
*
ru_proc
=&
ru
->
proc
;
RU_proc_t
*
ru_proc
=&
ru
->
proc
;
proc
->
frame_rx
=
frame_rx
;
proc
->
frame_rx
=
frame_rx
;
proc
->
slot_rx
=
slot_rx
;
proc
->
slot_rx
=
slot_rx
;
sl_ahead
=
sf_ahead
*
fp
->
slots_per_subframe
;
if
(
!
oai_exit
)
{
if
(
!
oai_exit
)
{
T
(
T_ENB_MASTER_TICK
,
T_INT
(
0
),
T_INT
(
proc
->
frame_rx
),
T_INT
(
proc
->
slot_rx
));
T
(
T_ENB_MASTER_TICK
,
T_INT
(
0
),
T_INT
(
proc
->
frame_rx
),
T_INT
(
proc
->
slot_rx
));
...
...
executables/nr-ru.c
View file @
5c0a817f
...
@@ -132,6 +132,7 @@ int attach_rru(RU_t *ru);
...
@@ -132,6 +132,7 @@ int attach_rru(RU_t *ru);
int
connect_rau
(
RU_t
*
ru
);
int
connect_rau
(
RU_t
*
ru
);
extern
uint16_t
sf_ahead
;
extern
uint16_t
sf_ahead
;
extern
uint16_t
sl_ahead
;
extern
int
emulate_rf
;
extern
int
emulate_rf
;
extern
int
numerology
;
extern
int
numerology
;
...
...
openair2/NR_PHY_INTERFACE/NR_IF_Module.c
View file @
5c0a817f
...
@@ -51,6 +51,7 @@ extern int oai_nfapi_sr_indication(nfapi_sr_indication_t *ind);
...
@@ -51,6 +51,7 @@ extern int oai_nfapi_sr_indication(nfapi_sr_indication_t *ind);
extern
int
oai_nfapi_rx_ind
(
nfapi_rx_indication_t
*
ind
);
extern
int
oai_nfapi_rx_ind
(
nfapi_rx_indication_t
*
ind
);
extern
uint8_t
nfapi_mode
;
extern
uint8_t
nfapi_mode
;
extern
uint16_t
sf_ahead
;
extern
uint16_t
sf_ahead
;
extern
uint16_t
sl_ahead
;
void
handle_nr_rach
(
NR_UL_IND_t
*
UL_info
)
{
void
handle_nr_rach
(
NR_UL_IND_t
*
UL_info
)
{
if
(
UL_info
->
rach_ind
.
rach_indication_body
.
number_of_preambles
>
0
)
{
if
(
UL_info
->
rach_ind
.
rach_indication_body
.
number_of_preambles
>
0
)
{
...
@@ -261,22 +262,22 @@ void NR_UL_indication(NR_UL_IND_t *UL_info) {
...
@@ -261,22 +262,22 @@ void NR_UL_indication(NR_UL_IND_t *UL_info) {
if
(
ifi
->
CC_mask
==
((
1
<<
MAX_NUM_CCs
)
-
1
))
{
if
(
ifi
->
CC_mask
==
((
1
<<
MAX_NUM_CCs
)
-
1
))
{
/*
/*
eNB_dlsch_ulsch_scheduler(module_id,
eNB_dlsch_ulsch_scheduler(module_id,
(UL_info->frame+((UL_info->slot>(9-s
f
_ahead))?1:0)) % 1024,
(UL_info->frame+((UL_info->slot>(9-s
l
_ahead))?1:0)) % 1024,
(UL_info->slot+s
f
_ahead)%10);
(UL_info->slot+s
l
_ahead)%10);
*/
*/
nfapi_nr_config_request_scf_t
*
cfg
=
&
mac
->
config
[
CC_id
];
nfapi_nr_config_request_scf_t
*
cfg
=
&
mac
->
config
[
CC_id
];
int
spf
=
get_spf
(
cfg
);
int
spf
=
get_spf
(
cfg
);
gNB_dlsch_ulsch_scheduler
(
module_id
,
gNB_dlsch_ulsch_scheduler
(
module_id
,
UL_info
->
frame
,
UL_info
->
frame
,
UL_info
->
slot
,
UL_info
->
slot
,
(
UL_info
->
frame
+
((
UL_info
->
slot
>
(
spf
-
1
-
s
f
_ahead
))
?
1
:
0
))
%
1024
,
(
UL_info
->
frame
+
((
UL_info
->
slot
>
(
spf
-
1
-
s
l
_ahead
))
?
1
:
0
))
%
1024
,
(
UL_info
->
slot
+
s
f
_ahead
)
%
spf
);
(
UL_info
->
slot
+
s
l
_ahead
)
%
spf
);
ifi
->
CC_mask
=
0
;
ifi
->
CC_mask
=
0
;
sched_info
->
module_id
=
module_id
;
sched_info
->
module_id
=
module_id
;
sched_info
->
CC_id
=
CC_id
;
sched_info
->
CC_id
=
CC_id
;
sched_info
->
frame
=
(
UL_info
->
frame
+
((
UL_info
->
slot
>
(
spf
-
1
-
s
f
_ahead
))
?
1
:
0
))
%
1024
;
sched_info
->
frame
=
(
UL_info
->
frame
+
((
UL_info
->
slot
>
(
spf
-
1
-
s
l
_ahead
))
?
1
:
0
))
%
1024
;
sched_info
->
slot
=
(
UL_info
->
slot
+
s
f
_ahead
)
%
spf
;
sched_info
->
slot
=
(
UL_info
->
slot
+
s
l
_ahead
)
%
spf
;
sched_info
->
DL_req
=
&
mac
->
DL_req
[
CC_id
];
sched_info
->
DL_req
=
&
mac
->
DL_req
[
CC_id
];
sched_info
->
UL_dci_req
=
&
mac
->
UL_dci_req
[
CC_id
];
sched_info
->
UL_dci_req
=
&
mac
->
UL_dci_req
[
CC_id
];
...
...
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