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
c719b3f0
Commit
c719b3f0
authored
May 01, 2024
by
francescomani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
adding new nr bands to the tables
parent
d977ac8f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
81 additions
and
12 deletions
+81
-12
common/utils/nr/nr_common.c
common/utils/nr/nr_common.c
+5
-1
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+55
-11
openair2/GNB_APP/gnb_config.c
openair2/GNB_APP/gnb_config.c
+21
-0
No files found.
common/utils/nr/nr_common.c
View file @
c719b3f0
...
@@ -118,10 +118,12 @@ const nr_bandentry_t nr_bandtable[] = {
...
@@ -118,10 +118,12 @@ const nr_bandentry_t nr_bandtable[] = {
{
5
,
824000
,
849000
,
869000
,
894000
,
20
,
173800
,
100
},
{
5
,
824000
,
849000
,
869000
,
894000
,
20
,
173800
,
100
},
{
7
,
2500000
,
2570000
,
2620000
,
2690000
,
20
,
524000
,
100
},
{
7
,
2500000
,
2570000
,
2620000
,
2690000
,
20
,
524000
,
100
},
{
8
,
880000
,
915000
,
925000
,
960000
,
20
,
185000
,
100
},
{
8
,
880000
,
915000
,
925000
,
960000
,
20
,
185000
,
100
},
{
12
,
698000
,
716000
,
729000
,
746000
,
20
,
145800
,
100
},
{
12
,
699000
,
716000
,
729000
,
746000
,
20
,
145800
,
100
},
{
13
,
777000
,
787000
,
746000
,
756000
,
20
,
149200
,
100
},
{
14
,
788000
,
798000
,
758000
,
768000
,
20
,
151600
,
100
},
{
14
,
788000
,
798000
,
758000
,
768000
,
20
,
151600
,
100
},
{
18
,
815000
,
830000
,
860000
,
875000
,
20
,
172000
,
100
},
{
18
,
815000
,
830000
,
860000
,
875000
,
20
,
172000
,
100
},
{
20
,
832000
,
862000
,
791000
,
821000
,
20
,
158200
,
100
},
{
20
,
832000
,
862000
,
791000
,
821000
,
20
,
158200
,
100
},
{
24
,
1627500
,
1656500
,
1526000
,
1536000
,
20
,
305000
,
100
},
{
25
,
1850000
,
1915000
,
1930000
,
1995000
,
20
,
386000
,
100
},
{
25
,
1850000
,
1915000
,
1930000
,
1995000
,
20
,
386000
,
100
},
{
26
,
814000
,
849000
,
859000
,
894000
,
20
,
171800
,
100
},
{
26
,
814000
,
849000
,
859000
,
894000
,
20
,
171800
,
100
},
{
28
,
703000
,
758000
,
758000
,
813000
,
20
,
151600
,
100
},
{
28
,
703000
,
758000
,
758000
,
813000
,
20
,
151600
,
100
},
...
@@ -141,6 +143,7 @@ const nr_bandentry_t nr_bandtable[] = {
...
@@ -141,6 +143,7 @@ const nr_bandentry_t nr_bandtable[] = {
{
53
,
2483500
,
2495000
,
2483500
,
2495000
,
20
,
496700
,
100
},
{
53
,
2483500
,
2495000
,
2483500
,
2495000
,
20
,
496700
,
100
},
{
65
,
1920000
,
2010000
,
2110000
,
2200000
,
20
,
422000
,
100
},
{
65
,
1920000
,
2010000
,
2110000
,
2200000
,
20
,
422000
,
100
},
{
66
,
1710000
,
1780000
,
2110000
,
2200000
,
20
,
422000
,
100
},
{
66
,
1710000
,
1780000
,
2110000
,
2200000
,
20
,
422000
,
100
},
{
67
,
000
,
000
,
738000
,
758000
,
20
,
147600
,
100
},
{
70
,
1695000
,
1710000
,
1995000
,
2020000
,
20
,
399000
,
100
},
{
70
,
1695000
,
1710000
,
1995000
,
2020000
,
20
,
399000
,
100
},
{
71
,
663000
,
698000
,
617000
,
652000
,
20
,
123400
,
100
},
{
71
,
663000
,
698000
,
617000
,
652000
,
20
,
123400
,
100
},
{
74
,
1427000
,
1470000
,
1475000
,
1518000
,
20
,
295000
,
100
},
{
74
,
1427000
,
1470000
,
1475000
,
1518000
,
20
,
295000
,
100
},
...
@@ -157,6 +160,7 @@ const nr_bandentry_t nr_bandtable[] = {
...
@@ -157,6 +160,7 @@ const nr_bandentry_t nr_bandtable[] = {
{
82
,
832000
,
862000
,
000
,
000
,
20
,
166400
,
100
},
{
82
,
832000
,
862000
,
000
,
000
,
20
,
166400
,
100
},
{
83
,
703000
,
748000
,
000
,
000
,
20
,
140600
,
100
},
{
83
,
703000
,
748000
,
000
,
000
,
20
,
140600
,
100
},
{
84
,
1920000
,
1980000
,
000
,
000
,
20
,
384000
,
100
},
{
84
,
1920000
,
1980000
,
000
,
000
,
20
,
384000
,
100
},
{
85
,
698000
,
716000
,
728000
,
746000
,
20
,
145600
,
100
},
{
86
,
1710000
,
1785000
,
000
,
000
,
20
,
342000
,
100
},
{
86
,
1710000
,
1785000
,
000
,
000
,
20
,
342000
,
100
},
{
89
,
824000
,
849000
,
000
,
000
,
20
,
342000
,
100
},
{
89
,
824000
,
849000
,
000
,
000
,
20
,
342000
,
100
},
{
90
,
2496000
,
2690000
,
2496000
,
2690000
,
3
,
499200
,
15
},
{
90
,
2496000
,
2690000
,
2496000
,
2690000
,
3
,
499200
,
15
},
...
...
openair1/PHY/INIT/nr_parms.c
View file @
c719b3f0
...
@@ -29,17 +29,61 @@ static const uint32_t nr_subcarrier_spacing[MAX_NUM_SUBCARRIER_SPACING] = {15e3,
...
@@ -29,17 +29,61 @@ static const uint32_t nr_subcarrier_spacing[MAX_NUM_SUBCARRIER_SPACING] = {15e3,
static
const
uint16_t
nr_slots_per_subframe
[
MAX_NUM_SUBCARRIER_SPACING
]
=
{
1
,
2
,
4
,
8
,
16
};
static
const
uint16_t
nr_slots_per_subframe
[
MAX_NUM_SUBCARRIER_SPACING
]
=
{
1
,
2
,
4
,
8
,
16
};
// Table 5.4.3.3-1 38-101
// Table 5.4.3.3-1 38-101
static
const
int
nr_ssb_table
[
48
][
3
]
=
{
static
const
int
nr_ssb_table
[
54
][
3
]
=
{
{
1
,
15
,
nr_ssb_type_A
},
{
2
,
15
,
nr_ssb_type_A
},
{
3
,
15
,
nr_ssb_type_A
},
{
5
,
15
,
nr_ssb_type_A
},
{
5
,
30
,
nr_ssb_type_B
},
{
1
,
15
,
nr_ssb_type_A
},
{
7
,
15
,
nr_ssb_type_A
},
{
8
,
15
,
nr_ssb_type_A
},
{
12
,
15
,
nr_ssb_type_A
},
{
14
,
15
,
nr_ssb_type_A
},
{
18
,
15
,
nr_ssb_type_A
},
{
2
,
15
,
nr_ssb_type_A
},
{
20
,
15
,
nr_ssb_type_A
},
{
25
,
15
,
nr_ssb_type_A
},
{
26
,
15
,
nr_ssb_type_A
},
{
28
,
15
,
nr_ssb_type_A
},
{
29
,
15
,
nr_ssb_type_A
},
{
3
,
15
,
nr_ssb_type_A
},
{
30
,
15
,
nr_ssb_type_A
},
{
34
,
15
,
nr_ssb_type_A
},
{
34
,
30
,
nr_ssb_type_C
},
{
38
,
15
,
nr_ssb_type_A
},
{
38
,
30
,
nr_ssb_type_C
},
{
5
,
15
,
nr_ssb_type_A
},
{
39
,
15
,
nr_ssb_type_A
},
{
39
,
30
,
nr_ssb_type_C
},
{
40
,
30
,
nr_ssb_type_C
},
{
41
,
15
,
nr_ssb_type_A
},
{
41
,
30
,
nr_ssb_type_C
},
{
5
,
30
,
nr_ssb_type_B
},
{
46
,
30
,
nr_ssb_type_C
},
{
48
,
30
,
nr_ssb_type_C
},
{
50
,
30
,
nr_ssb_type_C
},
{
51
,
15
,
nr_ssb_type_A
},
{
53
,
15
,
nr_ssb_type_A
},
{
7
,
15
,
nr_ssb_type_A
},
{
65
,
15
,
nr_ssb_type_A
},
{
66
,
15
,
nr_ssb_type_A
},
{
66
,
30
,
nr_ssb_type_B
},
{
70
,
15
,
nr_ssb_type_A
},
{
71
,
15
,
nr_ssb_type_A
},
{
8
,
15
,
nr_ssb_type_A
},
{
74
,
15
,
nr_ssb_type_A
},
{
75
,
15
,
nr_ssb_type_A
},
{
76
,
15
,
nr_ssb_type_A
},
{
77
,
30
,
nr_ssb_type_C
},
{
78
,
30
,
nr_ssb_type_C
},
{
12
,
15
,
nr_ssb_type_A
},
{
79
,
30
,
nr_ssb_type_C
},
{
90
,
15
,
nr_ssb_type_A
},
{
90
,
30
,
nr_ssb_type_C
},
{
91
,
15
,
nr_ssb_type_A
},
{
92
,
15
,
nr_ssb_type_A
},
{
13
,
15
,
nr_ssb_type_A
},
{
93
,
15
,
nr_ssb_type_A
},
{
94
,
15
,
nr_ssb_type_A
},
{
96
,
30
,
nr_ssb_type_C
}};
{
14
,
15
,
nr_ssb_type_A
},
{
18
,
15
,
nr_ssb_type_A
},
{
20
,
15
,
nr_ssb_type_A
},
{
24
,
15
,
nr_ssb_type_A
},
{
24
,
30
,
nr_ssb_type_B
},
{
25
,
15
,
nr_ssb_type_A
},
{
26
,
15
,
nr_ssb_type_A
},
{
28
,
15
,
nr_ssb_type_A
},
{
29
,
15
,
nr_ssb_type_A
},
{
30
,
15
,
nr_ssb_type_A
},
{
34
,
15
,
nr_ssb_type_A
},
{
34
,
30
,
nr_ssb_type_C
},
{
38
,
15
,
nr_ssb_type_A
},
{
38
,
30
,
nr_ssb_type_C
},
{
39
,
15
,
nr_ssb_type_A
},
{
39
,
30
,
nr_ssb_type_C
},
{
40
,
30
,
nr_ssb_type_C
},
{
41
,
15
,
nr_ssb_type_A
},
{
41
,
30
,
nr_ssb_type_C
},
{
46
,
30
,
nr_ssb_type_C
},
{
48
,
30
,
nr_ssb_type_C
},
{
50
,
30
,
nr_ssb_type_C
},
{
51
,
15
,
nr_ssb_type_A
},
{
53
,
15
,
nr_ssb_type_A
},
{
53
,
30
,
nr_ssb_type_C
},
{
65
,
15
,
nr_ssb_type_A
},
{
66
,
15
,
nr_ssb_type_A
},
{
66
,
30
,
nr_ssb_type_B
},
{
67
,
15
,
nr_ssb_type_A
},
{
70
,
15
,
nr_ssb_type_A
},
{
71
,
15
,
nr_ssb_type_A
},
{
74
,
15
,
nr_ssb_type_A
},
{
75
,
15
,
nr_ssb_type_A
},
{
76
,
15
,
nr_ssb_type_A
},
{
77
,
30
,
nr_ssb_type_C
},
{
78
,
30
,
nr_ssb_type_C
},
{
79
,
30
,
nr_ssb_type_C
},
{
85
,
15
,
nr_ssb_type_A
},
{
90
,
15
,
nr_ssb_type_A
},
{
90
,
30
,
nr_ssb_type_C
},
{
91
,
15
,
nr_ssb_type_A
},
{
92
,
15
,
nr_ssb_type_A
},
{
93
,
15
,
nr_ssb_type_A
},
{
94
,
15
,
nr_ssb_type_A
},
{
96
,
30
,
nr_ssb_type_C
}};
void
set_Lmax
(
NR_DL_FRAME_PARMS
*
fp
)
{
void
set_Lmax
(
NR_DL_FRAME_PARMS
*
fp
)
{
if
(
get_softmodem_params
()
->
sl_mode
==
2
)
{
if
(
get_softmodem_params
()
->
sl_mode
==
2
)
{
...
...
openair2/GNB_APP/gnb_config.c
View file @
c719b3f0
...
@@ -108,20 +108,35 @@ const sync_raster_t sync_raster[] = {
...
@@ -108,20 +108,35 @@ const sync_raster_t sync_raster[] = {
{
7
,
0
,
6554
,
1
,
6718
},
{
7
,
0
,
6554
,
1
,
6718
},
{
8
,
0
,
2318
,
1
,
2395
},
{
8
,
0
,
2318
,
1
,
2395
},
{
12
,
0
,
1828
,
1
,
1858
},
{
12
,
0
,
1828
,
1
,
1858
},
{
13
,
0
,
1871
,
1
,
1885
},
{
14
,
0
,
1901
,
1
,
1915
},
{
18
,
0
,
2156
,
1
,
2182
},
{
20
,
0
,
1982
,
1
,
2047
},
{
20
,
0
,
1982
,
1
,
2047
},
{
24
,
0
,
3818
,
1
,
3892
},
{
24
,
1
,
3824
,
1
,
3886
},
{
25
,
0
,
4829
,
1
,
4981
},
{
25
,
0
,
4829
,
1
,
4981
},
{
26
,
0
,
2153
,
1
,
2230
},
{
28
,
0
,
1901
,
1
,
2002
},
{
28
,
0
,
1901
,
1
,
2002
},
{
29
,
0
,
1798
,
1
,
1813
},
{
30
,
0
,
5879
,
1
,
5893
},
{
34
,
0
,
5030
,
1
,
5056
},
{
34
,
0
,
5030
,
1
,
5056
},
{
34
,
1
,
5036
,
1
,
5050
},
{
38
,
0
,
6431
,
1
,
6544
},
{
38
,
0
,
6431
,
1
,
6544
},
{
38
,
1
,
6437
,
1
,
6538
},
{
39
,
0
,
4706
,
1
,
4795
},
{
39
,
0
,
4706
,
1
,
4795
},
{
39
,
1
,
4712
,
1
,
4789
},
{
40
,
1
,
5762
,
1
,
5989
},
{
40
,
1
,
5762
,
1
,
5989
},
{
41
,
0
,
6246
,
3
,
6717
},
{
41
,
0
,
6246
,
3
,
6717
},
{
41
,
1
,
6252
,
3
,
6714
},
{
41
,
1
,
6252
,
3
,
6714
},
{
48
,
1
,
7884
,
1
,
7982
},
{
48
,
1
,
7884
,
1
,
7982
},
{
50
,
0
,
3584
,
1
,
3787
},
{
50
,
0
,
3584
,
1
,
3787
},
{
51
,
0
,
3572
,
1
,
3574
},
{
51
,
0
,
3572
,
1
,
3574
},
{
53
,
0
,
6215
,
1
,
6232
},
{
53
,
1
,
6221
,
1
,
6226
},
{
65
,
0
,
5279
,
1
,
5494
},
{
66
,
0
,
5279
,
1
,
5494
},
{
66
,
0
,
5279
,
1
,
5494
},
{
66
,
1
,
5285
,
1
,
5488
},
{
66
,
1
,
5285
,
1
,
5488
},
{
67
,
0
,
1850
,
1
,
1888
},
{
70
,
0
,
4993
,
1
,
5044
},
{
70
,
0
,
4993
,
1
,
5044
},
{
71
,
0
,
1547
,
1
,
1624
},
{
71
,
0
,
1547
,
1
,
1624
},
{
74
,
0
,
3692
,
1
,
3790
},
{
74
,
0
,
3692
,
1
,
3790
},
...
@@ -130,6 +145,12 @@ const sync_raster_t sync_raster[] = {
...
@@ -130,6 +145,12 @@ const sync_raster_t sync_raster[] = {
{
77
,
1
,
7711
,
1
,
8329
},
{
77
,
1
,
7711
,
1
,
8329
},
{
78
,
1
,
7711
,
1
,
8051
},
{
78
,
1
,
7711
,
1
,
8051
},
{
79
,
1
,
8480
,
16
,
8880
},
{
79
,
1
,
8480
,
16
,
8880
},
{
85
,
0
,
1826
,
1
,
1858
},
{
90
,
1
,
6252
,
1
,
6714
},
{
91
,
0
,
3572
,
1
,
3574
},
{
92
,
0
,
3584
,
1
,
3787
},
{
93
,
0
,
3572
,
1
,
3574
},
{
94
,
0
,
3584
,
1
,
3587
},
{
257
,
3
,
22388
,
1
,
22558
},
{
257
,
3
,
22388
,
1
,
22558
},
{
257
,
4
,
22390
,
2
,
22556
},
{
257
,
4
,
22390
,
2
,
22556
},
{
258
,
3
,
22257
,
1
,
22443
},
{
258
,
3
,
22257
,
1
,
22443
},
...
...
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