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
3c4ac034
Commit
3c4ac034
authored
Feb 17, 2020
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small fixes
parent
456d1f9d
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
23 additions
and
22 deletions
+23
-22
openair1/PHY/INIT/nr_init_ru.c
openair1/PHY/INIT/nr_init_ru.c
+1
-0
openair2/LAYER2/NR_MAC_gNB/config.c
openair2/LAYER2/NR_MAC_gNB/config.c
+2
-2
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf
+4
-4
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf
+4
-4
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
+4
-4
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
+4
-4
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
.../GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
+4
-4
No files found.
openair1/PHY/INIT/nr_init_ru.c
View file @
3c4ac034
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
#include "phy_init.h"
#include "phy_init.h"
#include "SCHED/sched_common.h"
#include "SCHED/sched_common.h"
#include "PHY/phy_extern.h"
#include "PHY/phy_extern.h"
#include "PHY/NR_TRANSPORT/nr_transport.h"
#include "SIMULATION/TOOLS/sim.h"
#include "SIMULATION/TOOLS/sim.h"
/*#include "RadioResourceConfigCommonSIB.h"
/*#include "RadioResourceConfigCommonSIB.h"
#include "RadioResourceConfigDedicated.h"
#include "RadioResourceConfigDedicated.h"
...
...
openair2/LAYER2/NR_MAC_gNB/config.c
View file @
3c4ac034
...
@@ -213,10 +213,10 @@ void config_common(int Mod_idP, int pdsch_AntennaPorts, NR_ServingCellConfigComm
...
@@ -213,10 +213,10 @@ void config_common(int Mod_idP, int pdsch_AntennaPorts, NR_ServingCellConfigComm
//cfg->prach_config.num_prach_fd_occasions_list[i].num_unused_root_sequences.value = ???
//cfg->prach_config.num_prach_fd_occasions_list[i].num_unused_root_sequences.value = ???
}
}
cfg
->
prach_config
.
ssb_per_rach
.
value
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
->
present
;
cfg
->
prach_config
.
ssb_per_rach
.
value
=
scc
->
uplinkConfigCommon
->
initialUplinkBWP
->
rach_ConfigCommon
->
choice
.
setup
->
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
->
present
-
1
;
cfg
->
prach_config
.
ssb_per_rach
.
tl
.
tag
=
NFAPI_NR_CONFIG_SSB_PER_RACH_TAG
;
cfg
->
prach_config
.
ssb_per_rach
.
tl
.
tag
=
NFAPI_NR_CONFIG_SSB_PER_RACH_TAG
;
cfg
->
num_tlv
++
;
cfg
->
num_tlv
++
;
// SSB Table Configuration
// SSB Table Configuration
int
scs_scaling
=
1
<<
(
cfg
->
ssb_config
.
scs_common
.
value
);
int
scs_scaling
=
1
<<
(
cfg
->
ssb_config
.
scs_common
.
value
);
if
(
scc
->
downlinkConfigCommon
->
frequencyInfoDL
->
absoluteFrequencyPointA
<
600000
)
if
(
scc
->
downlinkConfigCommon
->
frequencyInfoDL
->
absoluteFrequencyPointA
<
600000
)
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.32PRB.usrpx300.conf
View file @
3c4ac034
...
@@ -105,8 +105,8 @@ gNBs =
...
@@ -105,8 +105,8 @@ gNBs =
#1,2,4,8,10,20,40,80
#1,2,4,8,10,20,40,80
ra_ResponseWindow
=
4
;
ra_ResponseWindow
=
4
;
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#
0=oneeighth,1=onefourth,2=half,3=one,4=two,5=four,6=eight,7
=sixteen
#
1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8
=sixteen
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
=
3
;
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
=
4
;
#oneHalf (0..15) 4,8,12,16,...60,64
#oneHalf (0..15) 4,8,12,16,...60,64
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
15
;
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
15
;
#ra_ContentionResolutionTimer
#ra_ContentionResolutionTimer
...
@@ -114,8 +114,8 @@ gNBs =
...
@@ -114,8 +114,8 @@ gNBs =
ra_ContentionResolutionTimer
=
7
;
ra_ContentionResolutionTimer
=
7
;
rsrp_ThresholdSSB
=
19
;
rsrp_ThresholdSSB
=
19
;
#prach-RootSequenceIndex_PR
#prach-RootSequenceIndex_PR
#
0 = 839, 1
= 139
#
1 = 839, 2
= 139
prach_RootSequenceIndex_PR
=
1
;
prach_RootSequenceIndex_PR
=
2
;
prach_RootSequenceIndex
=
1
;
prach_RootSequenceIndex
=
1
;
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
#
#
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band257.tm1.66PRB.usrpn300.conf
View file @
3c4ac034
...
@@ -105,8 +105,8 @@ gNBs =
...
@@ -105,8 +105,8 @@ gNBs =
#1,2,4,8,10,20,40,80
#1,2,4,8,10,20,40,80
ra_ResponseWindow
=
4
;
ra_ResponseWindow
=
4
;
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#
0=oneeighth,1=onefourth,2=half,3=one,4=two,5=four,6=eight,7
=sixteen
#
1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8
=sixteen
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
=
3
;
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
=
4
;
#oneHalf (0..15) 4,8,12,16,...60,64
#oneHalf (0..15) 4,8,12,16,...60,64
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
15
;
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
15
;
#ra_ContentionResolutionTimer
#ra_ContentionResolutionTimer
...
@@ -114,8 +114,8 @@ gNBs =
...
@@ -114,8 +114,8 @@ gNBs =
ra_ContentionResolutionTimer
=
7
;
ra_ContentionResolutionTimer
=
7
;
rsrp_ThresholdSSB
=
19
;
rsrp_ThresholdSSB
=
19
;
#prach-RootSequenceIndex_PR
#prach-RootSequenceIndex_PR
#
0 = 839, 1
= 139
#
1 = 839, 2
= 139
prach_RootSequenceIndex_PR
=
1
;
prach_RootSequenceIndex_PR
=
2
;
prach_RootSequenceIndex
=
1
;
prach_RootSequenceIndex
=
1
;
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
#
#
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpn300.conf
View file @
3c4ac034
...
@@ -105,8 +105,8 @@ gNBs =
...
@@ -105,8 +105,8 @@ gNBs =
#1,2,4,8,10,20,40,80
#1,2,4,8,10,20,40,80
ra_ResponseWindow
=
4
;
ra_ResponseWindow
=
4
;
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#
0=oneeighth,1=onefourth,2=half,3=one,4=two,5=four,6=eight,7
=sixteen
#
1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8
=sixteen
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
=
3
;
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
=
4
;
#oneHalf (0..15) 4,8,12,16,...60,64
#oneHalf (0..15) 4,8,12,16,...60,64
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
15
;
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
15
;
#ra_ContentionResolutionTimer
#ra_ContentionResolutionTimer
...
@@ -114,8 +114,8 @@ gNBs =
...
@@ -114,8 +114,8 @@ gNBs =
ra_ContentionResolutionTimer
=
7
;
ra_ContentionResolutionTimer
=
7
;
rsrp_ThresholdSSB
=
19
;
rsrp_ThresholdSSB
=
19
;
#prach-RootSequenceIndex_PR
#prach-RootSequenceIndex_PR
#
0 = 839, 1
= 139
#
1 = 839, 2
= 139
prach_RootSequenceIndex_PR
=
1
;
prach_RootSequenceIndex_PR
=
2
;
prach_RootSequenceIndex
=
1
;
prach_RootSequenceIndex
=
1
;
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
#
#
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.217PRB.usrpx300.conf
View file @
3c4ac034
...
@@ -105,8 +105,8 @@ gNBs =
...
@@ -105,8 +105,8 @@ gNBs =
#1,2,4,8,10,20,40,80
#1,2,4,8,10,20,40,80
ra_ResponseWindow
=
4
;
ra_ResponseWindow
=
4
;
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#
0=oneeighth,1=onefourth,2=half,3=one,4=two,5=four,6=eight,7
=sixteen
#
1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8
=sixteen
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
=
3
;
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
=
4
;
#oneHalf (0..15) 4,8,12,16,...60,64
#oneHalf (0..15) 4,8,12,16,...60,64
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
15
;
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
15
;
#ra_ContentionResolutionTimer
#ra_ContentionResolutionTimer
...
@@ -114,8 +114,8 @@ gNBs =
...
@@ -114,8 +114,8 @@ gNBs =
ra_ContentionResolutionTimer
=
7
;
ra_ContentionResolutionTimer
=
7
;
rsrp_ThresholdSSB
=
19
;
rsrp_ThresholdSSB
=
19
;
#prach-RootSequenceIndex_PR
#prach-RootSequenceIndex_PR
#
0 = 839, 1
= 139
#
1 = 839, 2
= 139
prach_RootSequenceIndex_PR
=
1
;
prach_RootSequenceIndex_PR
=
2
;
prach_RootSequenceIndex
=
1
;
prach_RootSequenceIndex
=
1
;
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
#
#
...
...
targets/PROJECTS/GENERIC-LTE-EPC/CONF/gnb.band78.tm1.273PRB.usrpn300.conf
View file @
3c4ac034
...
@@ -105,8 +105,8 @@ gNBs =
...
@@ -105,8 +105,8 @@ gNBs =
#1,2,4,8,10,20,40,80
#1,2,4,8,10,20,40,80
ra_ResponseWindow
=
4
;
ra_ResponseWindow
=
4
;
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
#
0=oneeighth,1=onefourth,2=half,3=one,4=two,5=four,6=eight,7
=sixteen
#
1=oneeighth,2=onefourth,3=half,4=one,5=two,6=four,7=eight,8
=sixteen
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
=
3
;
ssb_perRACH_OccasionAndCB_PreamblesPerSSB_PR
=
4
;
#oneHalf (0..15) 4,8,12,16,...60,64
#oneHalf (0..15) 4,8,12,16,...60,64
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
15
;
ssb_perRACH_OccasionAndCB_PreamblesPerSSB
=
15
;
#ra_ContentionResolutionTimer
#ra_ContentionResolutionTimer
...
@@ -114,8 +114,8 @@ gNBs =
...
@@ -114,8 +114,8 @@ gNBs =
ra_ContentionResolutionTimer
=
7
;
ra_ContentionResolutionTimer
=
7
;
rsrp_ThresholdSSB
=
19
;
rsrp_ThresholdSSB
=
19
;
#prach-RootSequenceIndex_PR
#prach-RootSequenceIndex_PR
#
0 = 839, 1
= 139
#
1 = 839, 2
= 139
prach_RootSequenceIndex_PR
=
1
;
prach_RootSequenceIndex_PR
=
2
;
prach_RootSequenceIndex
=
1
;
prach_RootSequenceIndex
=
1
;
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
# SCS for msg1, can only be 15 for 30 kHz < 6 GHz, takes precendence over the one derived from prach-ConfigIndex
#
#
...
...
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