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
260ee38f
Commit
260ee38f
authored
Mar 02, 2021
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Save slots to schedule as bitmap from config
parent
3799ab37
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
0 deletions
+27
-0
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+23
-0
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
+4
-0
No files found.
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
260ee38f
...
@@ -386,6 +386,29 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
...
@@ -386,6 +386,29 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
if
(
RC
.
nrmac
[
Mod_idP
]
->
if_inst
->
NR_PHY_config_req
)
RC
.
nrmac
[
Mod_idP
]
->
if_inst
->
NR_PHY_config_req
(
&
phycfg
);
if
(
RC
.
nrmac
[
Mod_idP
]
->
if_inst
->
NR_PHY_config_req
)
RC
.
nrmac
[
Mod_idP
]
->
if_inst
->
NR_PHY_config_req
(
&
phycfg
);
find_SSB_and_RO_available
(
Mod_idP
);
find_SSB_and_RO_available
(
Mod_idP
);
const
NR_TDD_UL_DL_Pattern_t
*
tdd
=
&
scc
->
tdd_UL_DL_ConfigurationCommon
->
pattern1
;
const
int
nr_mix_slots
=
tdd
->
nrofDownlinkSymbols
!=
0
||
tdd
->
nrofUplinkSymbols
!=
0
;
const
int
nr_slots_period
=
tdd
->
nrofDownlinkSlots
+
tdd
->
nrofUplinkSlots
+
nr_mix_slots
;
const
int
nr_dlmix_slots
=
tdd
->
nrofDownlinkSlots
+
(
tdd
->
nrofDownlinkSymbols
!=
0
);
const
int
nr_ulstart_slot
=
tdd
->
nrofDownlinkSlots
+
(
tdd
->
nrofUplinkSymbols
==
0
);
for
(
int
slot
=
0
;
slot
<
n
;
++
slot
)
{
RC
.
nrmac
[
Mod_idP
]
->
dlsch_slot_bitmap
[
slot
/
64
]
|=
((
slot
%
nr_slots_period
)
<
nr_dlmix_slots
)
<<
(
slot
%
64
);
RC
.
nrmac
[
Mod_idP
]
->
ulsch_slot_bitmap
[
slot
/
64
]
|=
((
slot
%
nr_slots_period
)
>=
nr_ulstart_slot
)
<<
(
slot
%
64
);
LOG_D
(
MAC
,
"slot %d DL %d UL %d
\n
"
,
slot
,
(
RC
.
nrmac
[
Mod_idP
]
->
dlsch_slot_bitmap
[
slot
/
64
]
&
(
1
<<
(
slot
%
64
)))
!=
0
,
(
RC
.
nrmac
[
Mod_idP
]
->
ulsch_slot_bitmap
[
slot
/
64
]
&
(
1
<<
(
slot
%
64
)))
!=
0
);
}
if
(
get_softmodem_params
()
->
phy_test
)
{
RC
.
nrmac
[
Mod_idP
]
->
pre_processor_dl
=
nr_preprocessor_phytest
;
RC
.
nrmac
[
Mod_idP
]
->
pre_processor_ul
=
nr_ul_preprocessor_phytest
;
}
else
{
RC
.
nrmac
[
Mod_idP
]
->
pre_processor_dl
=
nr_init_fr1_dlsch_preprocessor
(
Mod_idP
,
0
);
RC
.
nrmac
[
Mod_idP
]
->
pre_processor_ul
=
nr_init_fr1_ulsch_preprocessor
(
Mod_idP
,
0
);
}
}
}
if
(
secondaryCellGroup
)
{
if
(
secondaryCellGroup
)
{
...
...
openair2/LAYER2/NR_MAC_gNB/nr_mac_gNB.h
View file @
260ee38f
...
@@ -707,9 +707,13 @@ typedef struct gNB_MAC_INST_s {
...
@@ -707,9 +707,13 @@ typedef struct gNB_MAC_INST_s {
/// so we can have it for every slot as a function of the numerology
/// so we can have it for every slot as a function of the numerology
int
*
pucch_index_used
[
MAX_NUM_BWP
];
int
*
pucch_index_used
[
MAX_NUM_BWP
];
/// bitmap of DLSCH slots, can hold up to 160 slots
uint64_t
dlsch_slot_bitmap
[
3
];
/// Lookup for preferred time domain allocation for BWP, in DL, slots
/// Lookup for preferred time domain allocation for BWP, in DL, slots
/// dynamically allocated
/// dynamically allocated
int
*
preferred_dl_tda
[
MAX_NUM_BWP
];
int
*
preferred_dl_tda
[
MAX_NUM_BWP
];
/// bitmap of ULSCH slots, can hold up to 160 slots
uint64_t
ulsch_slot_bitmap
[
3
];
/// Lookup for preferred time domain allocation for UL BWP, dynamically
/// Lookup for preferred time domain allocation for UL BWP, dynamically
/// allocated. The index refers to the DL slot, and the indicated TDA's k2
/// allocated. The index refers to the DL slot, and the indicated TDA's k2
/// points to the right UL slot
/// points to the right UL slot
...
...
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