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
常顺宇
OpenXG-RAN
Commits
fd9f5d2d
Commit
fd9f5d2d
authored
Oct 14, 2020
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use function pointer to call pre-processor
parent
14f15d7e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
2 deletions
+19
-2
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
+3
-2
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+6
-0
openair2/LAYER2/NR_MAC_gNB/main.c
openair2/LAYER2/NR_MAC_gNB/main.c
+2
-0
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+8
-0
No files found.
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_dlsch.c
View file @
fd9f5d2d
...
@@ -626,10 +626,11 @@ void nr_schedule_ue_spec(module_id_t module_id,
...
@@ -626,10 +626,11 @@ void nr_schedule_ue_spec(module_id_t module_id,
frame_t
frame
,
frame_t
frame
,
sub_frame_t
slot
,
sub_frame_t
slot
,
int
num_slots_per_tdd
)
{
int
num_slots_per_tdd
)
{
gNB_MAC_INST
*
gNB_mac
=
RC
.
nrmac
[
module_id
];
/* PREPROCESSOR */
/* PREPROCESSOR */
nr_simple_dlsch_preprocessor
(
module_id
,
frame
,
slot
,
num_slots_per_tdd
);
gNB_mac
->
pre_processor_dl
(
module_id
,
frame
,
slot
,
num_slots_per_tdd
);
gNB_MAC_INST
*
gNB_mac
=
RC
.
nrmac
[
module_id
];
NR_UE_info_t
*
UE_info
=
&
gNB_mac
->
UE_info
;
NR_UE_info_t
*
UE_info
=
&
gNB_mac
->
UE_info
;
const
int
CC_id
=
0
;
const
int
CC_id
=
0
;
...
...
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
fd9f5d2d
...
@@ -80,6 +80,12 @@ void nr_schedule_ue_spec(module_id_t module_id,
...
@@ -80,6 +80,12 @@ void nr_schedule_ue_spec(module_id_t module_id,
sub_frame_t
slot
,
sub_frame_t
slot
,
int
num_slots_per_tdd
);
int
num_slots_per_tdd
);
/* \brief default preprocessor */
void
nr_simple_dlsch_preprocessor
(
module_id_t
module_id
,
frame_t
frame
,
sub_frame_t
slot
,
int
num_slots_per_tdd
);
void
schedule_nr_mib
(
module_id_t
module_idP
,
frame_t
frameP
,
sub_frame_t
subframeP
);
void
schedule_nr_mib
(
module_id_t
module_idP
,
frame_t
frameP
,
sub_frame_t
subframeP
);
/////// Random Access MAC-PHY interface functions and primitives ///////
/////// Random Access MAC-PHY interface functions and primitives ///////
...
...
openair2/LAYER2/NR_MAC_gNB/main.c
View file @
fd9f5d2d
...
@@ -82,6 +82,8 @@ void mac_top_init_gNB(void)
...
@@ -82,6 +82,8 @@ void mac_top_init_gNB(void)
RC
.
nrmac
[
i
]
->
ul_handle
=
0
;
RC
.
nrmac
[
i
]
->
ul_handle
=
0
;
RC
.
nrmac
[
i
]
->
pre_processor_dl
=
nr_simple_dlsch_preprocessor
;
}
//END for (i = 0; i < RC.nb_nr_macrlc_inst; i++)
}
//END for (i = 0; i < RC.nb_nr_macrlc_inst; i++)
AssertFatal
(
rlc_module_init
(
1
)
==
0
,
"Could not initialize RLC layer
\n
"
);
AssertFatal
(
rlc_module_init
(
1
)
==
0
,
"Could not initialize RLC layer
\n
"
);
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
fd9f5d2d
...
@@ -427,6 +427,11 @@ typedef struct {
...
@@ -427,6 +427,11 @@ typedef struct {
uint8_t
UE_beam_index
[
MAX_MOBILES_PER_GNB
];
uint8_t
UE_beam_index
[
MAX_MOBILES_PER_GNB
];
}
NR_UE_info_t
;
}
NR_UE_info_t
;
typedef
void
(
*
nr_pp_impl_dl
)(
module_id_t
mod_id
,
frame_t
frame
,
sub_frame_t
slot
,
int
num_slots_per_tdd
);
/*! \brief top level eNB MAC structure */
/*! \brief top level eNB MAC structure */
typedef
struct
gNB_MAC_INST_s
{
typedef
struct
gNB_MAC_INST_s
{
/// Ethernet parameters for northbound midhaul interface
/// Ethernet parameters for northbound midhaul interface
...
@@ -489,6 +494,9 @@ typedef struct gNB_MAC_INST_s {
...
@@ -489,6 +494,9 @@ typedef struct gNB_MAC_INST_s {
int
cce_list
[
MAX_NUM_BWP
][
MAX_NUM_CORESET
][
MAX_NUM_CCE
];
int
cce_list
[
MAX_NUM_BWP
][
MAX_NUM_CORESET
][
MAX_NUM_CCE
];
/// current slot
/// current slot
int
current_slot
;
int
current_slot
;
/// DL preprocessor for differentiated scheduling
nr_pp_impl_dl
pre_processor_dl
;
}
gNB_MAC_INST
;
}
gNB_MAC_INST
;
#endif
/*__LAYER2_NR_MAC_GNB_H__ */
#endif
/*__LAYER2_NR_MAC_GNB_H__ */
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