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
a06a2ef7
Commit
a06a2ef7
authored
Sep 22, 2020
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
moving find_SSB_and_RO_available to MAC
parent
79bf2b3f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
15 deletions
+16
-15
openair1/PHY/INIT/nr_init.c
openair1/PHY/INIT/nr_init.c
+0
-2
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+4
-1
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
+12
-12
No files found.
openair1/PHY/INIT/nr_init.c
View file @
a06a2ef7
...
@@ -505,8 +505,6 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config) {
...
@@ -505,8 +505,6 @@ void nr_phy_config_request(NR_PHY_Config_t *phy_config) {
// }
// }
RC
.
gNB
[
Mod_id
]
->
configured
=
1
;
RC
.
gNB
[
Mod_id
]
->
configured
=
1
;
find_SSB_and_RO_available
(
Mod_id
);
init_symbol_rotation
(
fp
,
fp
->
dl_CarrierFreq
);
init_symbol_rotation
(
fp
,
fp
->
dl_CarrierFreq
);
LOG_I
(
PHY
,
"gNB %d configured
\n
"
,
Mod_id
);
LOG_I
(
PHY
,
"gNB %d configured
\n
"
,
Mod_id
);
...
...
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
a06a2ef7
...
@@ -352,7 +352,10 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
...
@@ -352,7 +352,10 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
phycfg
.
cfg
->
ssb_table
.
ssb_subcarrier_offset
.
tl
.
tag
=
NFAPI_NR_CONFIG_SSB_SUBCARRIER_OFFSET_TAG
;
phycfg
.
cfg
->
ssb_table
.
ssb_subcarrier_offset
.
tl
.
tag
=
NFAPI_NR_CONFIG_SSB_SUBCARRIER_OFFSET_TAG
;
phycfg
.
cfg
->
num_tlv
++
;
phycfg
.
cfg
->
num_tlv
++
;
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
);
}
}
if
(
secondaryCellGroup
)
{
if
(
secondaryCellGroup
)
{
...
...
openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_RA.c
View file @
a06a2ef7
...
@@ -82,18 +82,18 @@ int16_t ssb_index_from_prach(module_id_t module_idP,
...
@@ -82,18 +82,18 @@ int16_t ssb_index_from_prach(module_id_t module_idP,
mu
=
scc
->
downlinkConfigCommon
->
frequencyInfoDL
->
scs_SpecificCarrierList
.
list
.
array
[
0
]
->
subcarrierSpacing
;
mu
=
scc
->
downlinkConfigCommon
->
frequencyInfoDL
->
scs_SpecificCarrierList
.
list
.
array
[
0
]
->
subcarrierSpacing
;
get_nr_prach_info_from_index
(
config_index
,
get_nr_prach_info_from_index
(
config_index
,
(
int
)
frameP
,
(
int
)
frameP
,
(
int
)
slotP
,
(
int
)
slotP
,
scc
->
downlinkConfigCommon
->
frequencyInfoDL
->
absoluteFrequencyPointA
,
scc
->
downlinkConfigCommon
->
frequencyInfoDL
->
absoluteFrequencyPointA
,
mu
,
mu
,
cc
->
frame_type
,
cc
->
frame_type
,
&
format
,
&
format
,
&
start_symbol
,
&
start_symbol
,
&
N_t_slot
,
&
N_t_slot
,
&
N_dur
,
&
N_dur
,
&
RA_sfn_index
,
&
RA_sfn_index
,
&
N_RA_slot
,
&
N_RA_slot
,
&
config_period
);
&
config_period
);
uint8_t
index
=
0
,
slot_index
=
0
;
uint8_t
index
=
0
,
slot_index
=
0
;
for
(
slot_index
=
0
;
slot_index
<
N_RA_slot
;
slot_index
++
)
{
for
(
slot_index
=
0
;
slot_index
<
N_RA_slot
;
slot_index
++
)
{
if
(
N_RA_slot
<=
1
)
{
//1 PRACH slot in a subframe
if
(
N_RA_slot
<=
1
)
{
//1 PRACH slot in a subframe
...
...
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