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
7f00dbc5
Commit
7f00dbc5
authored
Mar 30, 2020
by
cig
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Const prachfmt in nr_mac_common
parent
2b3446ed
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
2 deletions
+4
-2
openair1/PHY/NR_TRANSPORT/nr_prach.c
openair1/PHY/NR_TRANSPORT/nr_prach.c
+1
-1
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
+1
-1
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+2
-0
No files found.
openair1/PHY/NR_TRANSPORT/nr_prach.c
View file @
7f00dbc5
...
@@ -38,6 +38,7 @@ extern uint16_t prach_root_sequence_map_0_3[838];
...
@@ -38,6 +38,7 @@ extern uint16_t prach_root_sequence_map_0_3[838];
extern
uint16_t
prach_root_sequence_map_abc
[
138
];
extern
uint16_t
prach_root_sequence_map_abc
[
138
];
extern
uint16_t
nr_du
[
838
];
extern
uint16_t
nr_du
[
838
];
extern
int16_t
nr_ru
[
2
*
839
];
extern
int16_t
nr_ru
[
2
*
839
];
extern
const
char
*
prachfmt
[
9
];
void
init_prach_list
(
PHY_VARS_gNB
*
gNB
)
{
void
init_prach_list
(
PHY_VARS_gNB
*
gNB
)
{
...
@@ -137,7 +138,6 @@ void free_nr_ru_prach_entry(RU_t *ru,
...
@@ -137,7 +138,6 @@ void free_nr_ru_prach_entry(RU_t *ru,
}
}
const
char
*
prachfmt
[]
=
{
"A1"
,
"A2"
,
"A3"
,
"B1"
,
"B2"
,
"B3"
,
"B4"
,
"C0"
,
"C2"
};
void
rx_nr_prach_ru
(
RU_t
*
ru
,
void
rx_nr_prach_ru
(
RU_t
*
ru
,
int
prachFormat
,
int
prachFormat
,
...
...
openair1/PHY/NR_UE_TRANSPORT/nr_prach.c
View file @
7f00dbc5
...
@@ -58,7 +58,7 @@ extern int64_t table_6_3_3_2_3_prachConfig_Index [256][9];
...
@@ -58,7 +58,7 @@ extern int64_t table_6_3_3_2_3_prachConfig_Index [256][9];
extern
int64_t
table_6_3_3_2_4_prachConfig_Index
[
256
][
10
];
extern
int64_t
table_6_3_3_2_4_prachConfig_Index
[
256
][
10
];
extern
uint16_t
nr_du
[
838
];
extern
uint16_t
nr_du
[
838
];
extern
int16_t
nr_ru
[
2
*
839
];
extern
int16_t
nr_ru
[
2
*
839
];
const
char
*
prachfmt
[]
=
{
"A1"
,
"A2"
,
"A3"
,
"B1"
,
"B2"
,
"B3"
,
"B4"
,
"C0"
,
"C2"
}
;
extern
const
char
*
prachfmt
[
9
]
;
// Note:
// Note:
// - prach_fmt_id is an ID used to map to the corresponding PRACH format value in prachfmt
// - prach_fmt_id is an ID used to map to the corresponding PRACH format value in prachfmt
...
...
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @
7f00dbc5
...
@@ -45,6 +45,8 @@ uint16_t NCS_restricted_TypeB_delta_f_RA_5[14] = {36,57,60,63,65,68,71,77,81,8
...
@@ -45,6 +45,8 @@ uint16_t NCS_restricted_TypeB_delta_f_RA_5[14] = {36,57,60,63,65,68,71,77,81,8
// Table 6.3.3.1-7 (38.211) NCS for preamble formats with delta_f_RA = 15 * 2mu KHz where mu = {0,1,2,3}
// Table 6.3.3.1-7 (38.211) NCS for preamble formats with delta_f_RA = 15 * 2mu KHz where mu = {0,1,2,3}
uint16_t
NCS_unrestricted_delta_f_RA_15
[
16
]
=
{
0
,
2
,
4
,
6
,
8
,
10
,
12
,
13
,
15
,
17
,
19
,
23
,
27
,
34
,
46
,
69
};
uint16_t
NCS_unrestricted_delta_f_RA_15
[
16
]
=
{
0
,
2
,
4
,
6
,
8
,
10
,
12
,
13
,
15
,
17
,
19
,
23
,
27
,
34
,
46
,
69
};
const
char
*
prachfmt
[]
=
{
"A1"
,
"A2"
,
"A3"
,
"B1"
,
"B2"
,
"B3"
,
"B4"
,
"C0"
,
"C2"
};
uint16_t
get_NCS
(
uint8_t
index
,
uint16_t
format0
,
uint8_t
restricted_set_config
)
{
uint16_t
get_NCS
(
uint8_t
index
,
uint16_t
format0
,
uint8_t
restricted_set_config
)
{
if
(
format0
<
3
)
{
if
(
format0
<
3
)
{
...
...
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