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
6e33fcfe
Commit
6e33fcfe
authored
6 years ago
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SSB periodicity at gNB from config file
parent
8950a779
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
35 additions
and
7 deletions
+35
-7
openair1/SCHED_NR/phy_procedures_nr_gNB.c
openair1/SCHED_NR/phy_procedures_nr_gNB.c
+1
-1
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+27
-0
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
+2
-1
openair2/RRC/NR/rrc_gNB.c
openair2/RRC/NR/rrc_gNB.c
+1
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
...RIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
+1
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
+1
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
+1
-1
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
+1
-1
No files found.
openair1/SCHED_NR/phy_procedures_nr_gNB.c
View file @
6e33fcfe
...
@@ -91,7 +91,7 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int slot) {
...
@@ -91,7 +91,7 @@ void nr_common_signal_procedures (PHY_VARS_gNB *gNB,int frame, int slot) {
uint8_t
*
pbch_pdu
=&
gNB
->
pbch_pdu
[
0
];
uint8_t
*
pbch_pdu
=&
gNB
->
pbch_pdu
[
0
];
uint8_t
ssb_index
,
n_hf
;
uint8_t
ssb_index
,
n_hf
;
int
ssb_start_symbol
,
rel_slot
;
int
ssb_start_symbol
,
rel_slot
;
printf
(
"Frame %d
\n
"
,
frame
);
n_hf
=
cfg
->
sch_config
.
half_frame_index
.
value
;
n_hf
=
cfg
->
sch_config
.
half_frame_index
.
value
;
// if SSB periodicity is 5ms, they are transmitted in both half frames
// if SSB periodicity is 5ms, they are transmitted in both half frames
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
6e33fcfe
...
@@ -187,6 +187,7 @@ void config_common(int Mod_idP,
...
@@ -187,6 +187,7 @@ void config_common(int Mod_idP,
int
cellid
,
int
cellid
,
int
nr_bandP
,
int
nr_bandP
,
uint64_t
ssb_pattern
,
uint64_t
ssb_pattern
,
uint16_t
ssb_periodicity
,
uint64_t
dl_CarrierFreqP
,
uint64_t
dl_CarrierFreqP
,
uint32_t
dl_BandwidthP
uint32_t
dl_BandwidthP
){
){
...
@@ -242,6 +243,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
...
@@ -242,6 +243,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
int
p_gNB
,
int
p_gNB
,
int
nr_bandP
,
int
nr_bandP
,
uint64_t
ssb_pattern
,
uint64_t
ssb_pattern
,
uint16_t
ssb_enum_periodicity
,
uint64_t
dl_CarrierFreqP
,
uint64_t
dl_CarrierFreqP
,
int
dl_BandwidthP
,
int
dl_BandwidthP
,
NR_BCCH_BCH_Message_t
*
mib
,
NR_BCCH_BCH_Message_t
*
mib
,
...
@@ -249,6 +251,30 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
...
@@ -249,6 +251,30 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
){
){
uint16_t
ssb_periodicity
;
switch
(
ssb_enum_periodicity
)
{
case
0
:
ssb_periodicity
=
5
;
break
;
case
1
:
ssb_periodicity
=
10
;
break
;
case
2
:
ssb_periodicity
=
20
;
break
;
case
3
:
ssb_periodicity
=
40
;
break
;
case
4
:
ssb_periodicity
=
80
;
break
;
case
5
:
ssb_periodicity
=
160
;
break
;
}
if
(
mib
!=
NULL
){
if
(
mib
!=
NULL
){
config_nr_mib
(
Mod_idP
,
config_nr_mib
(
Mod_idP
,
CC_idP
,
CC_idP
,
...
@@ -273,6 +299,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
...
@@ -273,6 +299,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
cellid
,
cellid
,
nr_bandP
,
nr_bandP
,
ssb_pattern
,
ssb_pattern
,
ssb_periodicity
,
dl_CarrierFreqP
,
dl_CarrierFreqP
,
dl_BandwidthP
dl_BandwidthP
);
);
...
...
This diff is collapsed.
Click to expand it.
openair2/LAYER2/NR_MAC_gNB/mac_proto.h
View file @
6e33fcfe
...
@@ -42,6 +42,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
...
@@ -42,6 +42,7 @@ int rrc_mac_config_req_gNB(module_id_t Mod_idP,
int
p_gNB
,
int
p_gNB
,
int
nr_bandP
,
int
nr_bandP
,
uint64_t
ssb_pattern
,
uint64_t
ssb_pattern
,
uint16_t
ssb_periodicity
,
uint64_t
dl_CarrierFreqP
,
uint64_t
dl_CarrierFreqP
,
int
dl_BandwidthP
,
int
dl_BandwidthP
,
NR_BCCH_BCH_Message_t
*
mib
,
NR_BCCH_BCH_Message_t
*
mib
,
...
...
This diff is collapsed.
Click to expand it.
openair2/RRC/NR/rrc_gNB.c
View file @
6e33fcfe
...
@@ -261,12 +261,12 @@ static void init_NR_SI(const protocol_ctxt_t* const ctxt_pP,
...
@@ -261,12 +261,12 @@ static void init_NR_SI(const protocol_ctxt_t* const ctxt_pP,
LOG_I
(
NR_RRC
,
"Done init_NR_SI
\n
"
);
LOG_I
(
NR_RRC
,
"Done init_NR_SI
\n
"
);
rrc_mac_config_req_gNB
(
ctxt_pP
->
module_id
,
rrc_mac_config_req_gNB
(
ctxt_pP
->
module_id
,
CC_id
,
CC_id
,
RC
.
nrrrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
physCellId
,
RC
.
nrrrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
physCellId
,
RC
.
nrrrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
p_gNB
,
RC
.
nrrrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
p_gNB
,
configuration
->
nr_band
[
CC_id
],
configuration
->
nr_band
[
CC_id
],
configuration
->
ServingCellConfigCommon_ssb_periodicityServingCell
[
CC_id
],
configuration
->
ServingCellConfigCommon_ssb_PositionsInBurst_PR
[
CC_id
],
configuration
->
ServingCellConfigCommon_ssb_PositionsInBurst_PR
[
CC_id
],
RC
.
nrrrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
dl_CarrierFreq
,
RC
.
nrrrc
[
ctxt_pP
->
module_id
]
->
carrier
[
CC_id
].
dl_CarrierFreq
,
configuration
->
N_RB_DL
[
CC_id
],
configuration
->
N_RB_DL
[
CC_id
],
...
...
This diff is collapsed.
Click to expand it.
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band22.tm1.106PRB.adrv9371zc706.conf
View file @
6e33fcfe
...
@@ -71,7 +71,7 @@ gNBs =
...
@@ -71,7 +71,7 @@ gNBs =
UL_timeAlignmentTimerCommon
=
"infinity"
;
UL_timeAlignmentTimerCommon
=
"infinity"
;
ServingCellConfigCommon_n_TimingAdvanceOffset
=
"n0"
ServingCellConfigCommon_n_TimingAdvanceOffset
=
"n0"
ServingCellConfigCommon_ssb_PositionsInBurst_PR
=
0
x01
;
ServingCellConfigCommon_ssb_PositionsInBurst_PR
=
0
x01
;
ServingCellConfigCommon_ssb_periodicityServingCell
=
1
0
;
ServingCellConfigCommon_ssb_periodicityServingCell
=
2
0
;
ServingCellConfigCommon_dmrs_TypeA_Position
=
2
;
ServingCellConfigCommon_dmrs_TypeA_Position
=
2
;
NIA_SubcarrierSpacing
=
"kHz15"
;
NIA_SubcarrierSpacing
=
"kHz15"
;
ServingCellConfigCommon_ss_PBCH_BlockPower
= -
60
;
ServingCellConfigCommon_ss_PBCH_BlockPower
= -
60
;
...
...
This diff is collapsed.
Click to expand it.
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpn300.conf
View file @
6e33fcfe
...
@@ -71,7 +71,7 @@ gNBs =
...
@@ -71,7 +71,7 @@ gNBs =
UL_timeAlignmentTimerCommon
=
"infinity"
;
UL_timeAlignmentTimerCommon
=
"infinity"
;
ServingCellConfigCommon_n_TimingAdvanceOffset
=
"n0"
ServingCellConfigCommon_n_TimingAdvanceOffset
=
"n0"
ServingCellConfigCommon_ssb_PositionsInBurst_PR
=
0
x01
;
ServingCellConfigCommon_ssb_PositionsInBurst_PR
=
0
x01
;
ServingCellConfigCommon_ssb_periodicityServingCell
=
1
0
;
ServingCellConfigCommon_ssb_periodicityServingCell
=
2
0
;
ServingCellConfigCommon_dmrs_TypeA_Position
=
2
;
ServingCellConfigCommon_dmrs_TypeA_Position
=
2
;
NIA_SubcarrierSpacing
=
"kHz15"
;
NIA_SubcarrierSpacing
=
"kHz15"
;
ServingCellConfigCommon_ss_PBCH_BlockPower
= -
60
;
ServingCellConfigCommon_ss_PBCH_BlockPower
= -
60
;
...
...
This diff is collapsed.
Click to expand it.
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.106PRB.usrpx300.conf
View file @
6e33fcfe
...
@@ -71,7 +71,7 @@ gNBs =
...
@@ -71,7 +71,7 @@ gNBs =
UL_timeAlignmentTimerCommon
=
"infinity"
;
UL_timeAlignmentTimerCommon
=
"infinity"
;
ServingCellConfigCommon_n_TimingAdvanceOffset
=
"n0"
ServingCellConfigCommon_n_TimingAdvanceOffset
=
"n0"
ServingCellConfigCommon_ssb_PositionsInBurst_PR
=
0
x01
;
ServingCellConfigCommon_ssb_PositionsInBurst_PR
=
0
x01
;
ServingCellConfigCommon_ssb_periodicityServingCell
=
1
0
;
ServingCellConfigCommon_ssb_periodicityServingCell
=
2
0
;
ServingCellConfigCommon_dmrs_TypeA_Position
=
2
;
ServingCellConfigCommon_dmrs_TypeA_Position
=
2
;
NIA_SubcarrierSpacing
=
"kHz15"
;
NIA_SubcarrierSpacing
=
"kHz15"
;
ServingCellConfigCommon_ss_PBCH_BlockPower
= -
60
;
ServingCellConfigCommon_ss_PBCH_BlockPower
= -
60
;
...
...
This diff is collapsed.
Click to expand it.
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
View file @
6e33fcfe
...
@@ -71,7 +71,7 @@ gNBs =
...
@@ -71,7 +71,7 @@ gNBs =
UL_timeAlignmentTimerCommon
=
"infinity"
;
UL_timeAlignmentTimerCommon
=
"infinity"
;
ServingCellConfigCommon_n_TimingAdvanceOffset
=
"n0"
ServingCellConfigCommon_n_TimingAdvanceOffset
=
"n0"
ServingCellConfigCommon_ssb_PositionsInBurst_PR
=
0
x01
;
ServingCellConfigCommon_ssb_PositionsInBurst_PR
=
0
x01
;
ServingCellConfigCommon_ssb_periodicityServingCell
=
1
0
;
ServingCellConfigCommon_ssb_periodicityServingCell
=
2
0
;
ServingCellConfigCommon_dmrs_TypeA_Position
=
2
;
ServingCellConfigCommon_dmrs_TypeA_Position
=
2
;
NIA_SubcarrierSpacing
=
"kHz15"
;
NIA_SubcarrierSpacing
=
"kHz15"
;
ServingCellConfigCommon_ss_PBCH_BlockPower
= -
60
;
ServingCellConfigCommon_ss_PBCH_BlockPower
= -
60
;
...
...
This diff is collapsed.
Click to expand it.
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