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
ao gleen
OpenXG-RAN
Commits
0a45909b
Commit
0a45909b
authored
May 26, 2020
by
Raymond Knopp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor changes
parent
539ff7bf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
3 deletions
+29
-3
openair1/PHY/TOOLS/oai_dfts.c
openair1/PHY/TOOLS/oai_dfts.c
+26
-0
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
+3
-3
No files found.
openair1/PHY/TOOLS/oai_dfts.c
View file @
0a45909b
...
@@ -10571,6 +10571,32 @@ int main(int argc, char**argv)
...
@@ -10571,6 +10571,32 @@ int main(int argc, char**argv)
LOG_M
(
"y24576.m"
,
"y24576"
,
y
,
24576
,
1
,
1
);
LOG_M
(
"y24576.m"
,
"y24576"
,
y
,
24576
,
1
,
1
);
LOG_M
(
"x24576.m"
,
"x24576"
,
x
,
24576
,
1
,
1
);
LOG_M
(
"x24576.m"
,
"x24576"
,
x
,
24576
,
1
,
1
);
memset
((
void
*
)
x
,
0
,
2
*
18432
*
sizeof
(
int32_t
));
for
(
i
=
2
;
i
<
(
2
*
14402
);
i
++
)
{
if
((
taus
()
&
1
)
==
0
)
((
int16_t
*
)
x
)[
i
]
=
364
;
else
((
int16_t
*
)
x
)[
i
]
=
-
364
;
}
for
(
i
=
2
*
(
36864
-
14400
);
i
<
(
36864
*
2
);
i
++
)
{
if
((
taus
()
&
1
)
==
0
)
((
int16_t
*
)
x
)[
i
]
=
364
;
else
((
int16_t
*
)
x
)[
i
]
=
-
364
;
}
reset_meas
(
&
ts
);
for
(
i
=
0
;
i
<
10000
;
i
++
)
{
start_meas
(
&
ts
);
idft36864
((
int16_t
*
)
x
,(
int16_t
*
)
y
,
1
);
stop_meas
(
&
ts
);
}
printf
(
"
\n\n
36864-point(%f cycles)
\n
"
,(
double
)
ts
.
diff
/
(
double
)
ts
.
trials
);
LOG_M
(
"y36864.m"
,
"y36864"
,
y
,
36864
,
1
,
1
);
LOG_M
(
"x36864.m"
,
"x36864"
,
x
,
36864
,
1
,
1
);
memset
((
void
*
)
x
,
0
,
49152
*
sizeof
(
int32_t
));
memset
((
void
*
)
x
,
0
,
49152
*
sizeof
(
int32_t
));
for
(
i
=
2
;
i
<
28402
;
i
++
)
{
for
(
i
=
2
;
i
<
28402
;
i
++
)
{
if
((
taus
()
&
1
)
==
0
)
if
((
taus
()
&
1
)
==
0
)
...
...
openair2/LAYER2/NR_MAC_COMMON/nr_mac_common.c
View file @
0a45909b
...
@@ -904,7 +904,7 @@ int get_nr_prach_info_from_index(uint8_t index,
...
@@ -904,7 +904,7 @@ int get_nr_prach_info_from_index(uint8_t index,
if ( (frame%x)==y || (frame%x)==y2 ) {
if ( (frame%x)==y || (frame%x)==y2 ) {
slot_60khz = slot >> (mu-2); // in table slots are numbered wrt 60kHz
slot_60khz = slot >> (mu-2); // in table slots are numbered wrt 60kHz
s_map = table_6_3_3_2_4_prachConfig_Index[index][5];
s_map = table_6_3_3_2_4_prachConfig_Index[index][5];
if ( (
s_map>>slot_60khz)&0x01
) {
if ( (
(s_map>>slot_60khz)&0x01)
) {
if (mu == 3) {
if (mu == 3) {
if ( (table_6_3_3_2_4_prachConfig_Index[index][7] == 1) && (slot%2 == 0) )
if ( (table_6_3_3_2_4_prachConfig_Index[index][7] == 1) && (slot%2 == 0) )
return 0; // no prach in even slots @ 120kHz for 1 prach per 60khz slot
return 0; // no prach in even slots @ 120kHz for 1 prach per 60khz slot
...
@@ -944,7 +944,7 @@ int get_nr_prach_info_from_index(uint8_t index,
...
@@ -944,7 +944,7 @@ int get_nr_prach_info_from_index(uint8_t index,
s_map = table_6_3_3_2_3_prachConfig_Index[index][4];
s_map = table_6_3_3_2_3_prachConfig_Index[index][4];
if ( (s_map>>subframe)&0x01 ) {
if ( (s_map>>subframe)&0x01 ) {
if (mu == 1) {
if (mu == 1) {
if ( (table_6_3_3_2_3_prachConfig_Index[index][6]
=
= 1) && (slot%2 == 0) )
if ( (table_6_3_3_2_3_prachConfig_Index[index][6]
<
= 1) && (slot%2 == 0) )
return 0; // no prach in even slots @ 30kHz for 1 prach per subframe
return 0; // no prach in even slots @ 30kHz for 1 prach per subframe
}
}
if (start_symbol != NULL && N_t_slot != NULL && N_dur != NULL && format != NULL){
if (start_symbol != NULL && N_t_slot != NULL && N_dur != NULL && format != NULL){
...
@@ -954,7 +954,7 @@ int get_nr_prach_info_from_index(uint8_t index,
...
@@ -954,7 +954,7 @@ int get_nr_prach_info_from_index(uint8_t index,
if (table_6_3_3_2_3_prachConfig_Index[index][1] != -1)
if (table_6_3_3_2_3_prachConfig_Index[index][1] != -1)
format2 = (uint8_t) table_6_3_3_2_3_prachConfig_Index[index][1];
format2 = (uint8_t) table_6_3_3_2_3_prachConfig_Index[index][1];
*format = ((uint8_t) table_6_3_3_2_3_prachConfig_Index[index][0]) | (format2<<8);
*format = ((uint8_t) table_6_3_3_2_3_prachConfig_Index[index][0]) | (format2<<8);
LOG_
D
(MAC,"Frame %d slot %d: Getting PRACH info from index %d absoluteFrequencyPointA %u mu %u frame_type %u start_symbol %u N_t_slot %u N_dur %u \n", frame,
LOG_
I
(MAC,"Frame %d slot %d: Getting PRACH info from index %d absoluteFrequencyPointA %u mu %u frame_type %u start_symbol %u N_t_slot %u N_dur %u \n", frame,
slot,
slot,
index,
index,
pointa,
pointa,
...
...
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