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
7af14dd7
Commit
7af14dd7
authored
Aug 12, 2020
by
kn.raju
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added Debug logs for RACH issue with ssb id other than 0
parent
81f7ef4d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
3 deletions
+10
-3
openair1/PHY/NR_TRANSPORT/nr_prach.c
openair1/PHY/NR_TRANSPORT/nr_prach.c
+9
-2
openair2/RRC/NR/rrc_gNB_reconfig.c
openair2/RRC/NR/rrc_gNB_reconfig.c
+1
-1
No files found.
openair1/PHY/NR_TRANSPORT/nr_prach.c
View file @
7af14dd7
...
@@ -184,8 +184,10 @@ void rx_nr_prach_ru(RU_t *ru,
...
@@ -184,8 +184,10 @@ void rx_nr_prach_ru(RU_t *ru,
for
(
int
aa
=
0
;
aa
<
ru
->
nb_rx
;
aa
++
){
for
(
int
aa
=
0
;
aa
<
ru
->
nb_rx
;
aa
++
){
if
(
prach_sequence_length
==
0
)
slot2
=
(
slot
/
fp
->
slots_per_subframe
)
*
fp
->
slots_per_subframe
;
if
(
prach_sequence_length
==
0
)
slot2
=
(
slot
/
fp
->
slots_per_subframe
)
*
fp
->
slots_per_subframe
;
prach
[
aa
]
=
(
int16_t
*
)
&
ru
->
common
.
rxdata
[
aa
][(
slot2
*
fp
->
get_samples_per_slot
(
slot
,
fp
))
-
ru
->
N_TA_offset
];
prach
[
aa
]
=
(
int16_t
*
)
&
ru
->
common
.
rxdata
[
aa
][(
slot2
*
fp
->
get_samples_per_slot
(
slot
,
fp
))
-
ru
->
N_TA_offset
];
LOG_I
(
PHY
,
"GES printing received signal %d
\n
"
,
*
prach
[
aa
]);
}
}
int
dftlen
=
0
;
int
dftlen
=
0
;
int
mu
=
fp
->
numerology_index
;
int
mu
=
fp
->
numerology_index
;
int
Ncp
=
0
;
int
Ncp
=
0
;
...
@@ -287,6 +289,9 @@ void rx_nr_prach_ru(RU_t *ru,
...
@@ -287,6 +289,9 @@ void rx_nr_prach_ru(RU_t *ru,
k
*=
K
;
k
*=
K
;
k
+=
kbar
;
k
+=
kbar
;
LOG_I
(
PHY
,
"GES printing frequency domain k value %d fp->N_RB_UL %d n_ra_prb %d kbar %d
\n
"
,
k
,
fp
->
N_RB_UL
,
n_ra_prb
,
kbar
);
int
reps
=
1
;
int
reps
=
1
;
for
(
int
aa
=
0
;
aa
<
ru
->
nb_rx
;
aa
++
)
{
for
(
int
aa
=
0
;
aa
<
ru
->
nb_rx
;
aa
++
)
{
...
@@ -355,6 +360,7 @@ void rx_nr_prach_ru(RU_t *ru,
...
@@ -355,6 +360,7 @@ void rx_nr_prach_ru(RU_t *ru,
}
else
{
// threequarter sampling
}
else
{
// threequarter sampling
// 40 MHz @ 46.08 Ms/s
// 40 MHz @ 46.08 Ms/s
prach2
=
prach
[
aa
]
+
(
3
*
Ncp
);
// 46.08 is 1.5 * 30.72, times 2 for I/Q
prach2
=
prach
[
aa
]
+
(
3
*
Ncp
);
// 46.08 is 1.5 * 30.72, times 2 for I/Q
LOG_I
(
PHY
,
"GES printing prach2 %p prach[aa] %p Ncp %d
\n
"
,
prach2
,
prach
[
aa
],
Ncp
);
if
(
prach_sequence_length
==
0
)
{
if
(
prach_sequence_length
==
0
)
{
AssertFatal
(
fp
->
N_RB_UL
<=
107
,
"cannot do 108..136 PRBs with 3/4 sampling
\n
"
);
AssertFatal
(
fp
->
N_RB_UL
<=
107
,
"cannot do 108..136 PRBs with 3/4 sampling
\n
"
);
if
(
prachFormat
==
0
||
prachFormat
==
1
||
prachFormat
==
2
)
{
if
(
prachFormat
==
0
||
prachFormat
==
1
||
prachFormat
==
2
)
{
...
@@ -524,7 +530,7 @@ void rx_nr_prach_ru(RU_t *ru,
...
@@ -524,7 +530,7 @@ void rx_nr_prach_ru(RU_t *ru,
}
}
//Coherent combining of PRACH repetitions (assumes channel does not change, to be revisted for "long" PRACH)
//Coherent combining of PRACH repetitions (assumes channel does not change, to be revisted for "long" PRACH)
LOG_I
(
PHY
,
"Doing PRACH combining of %d reptitions N_ZC %d
\n
"
,
reps
,
N_ZC
);
LOG_I
(
PHY
,
"Doing PRACH combining of %d reptitions N_ZC %d
,mu %d prachFormat %d prach2 %p content %d
\n
"
,
reps
,
N_ZC
,
mu
,
prachFormat
,
prach2
,
*
prach2
);
int16_t
rxsigF_tmp
[
N_ZC
<<
1
];
int16_t
rxsigF_tmp
[
N_ZC
<<
1
];
// if (k+N_ZC > dftlen) { // PRACH signal is split around DC
// if (k+N_ZC > dftlen) { // PRACH signal is split around DC
int16_t
*
rxsigF2
=
rxsigF
[
aa
];
int16_t
*
rxsigF2
=
rxsigF
[
aa
];
...
@@ -534,6 +540,7 @@ void rx_nr_prach_ru(RU_t *ru,
...
@@ -534,6 +540,7 @@ void rx_nr_prach_ru(RU_t *ru,
if
(
k2
==
(
dftlen
<<
1
))
k2
=
0
;
if
(
k2
==
(
dftlen
<<
1
))
k2
=
0
;
rxsigF_tmp
[
j
]
=
rxsigF2
[
k2
];
rxsigF_tmp
[
j
]
=
rxsigF2
[
k2
];
for
(
int
i
=
1
;
i
<
reps
;
i
++
)
rxsigF_tmp
[
j
]
+=
rxsigF2
[
k2
+
(
i
*
dftlen
<<
1
)];
for
(
int
i
=
1
;
i
<
reps
;
i
++
)
rxsigF_tmp
[
j
]
+=
rxsigF2
[
k2
+
(
i
*
dftlen
<<
1
)];
LOG_I
(
PHY
,
"GES printing %d rxsigF_tmp[j] %d
\n
"
,
j
,
rxsigF_tmp
[
j
]);
}
}
memcpy
((
void
*
)
rxsigF2
,(
void
*
)
rxsigF_tmp
,
N_ZC
<<
2
);
memcpy
((
void
*
)
rxsigF2
,(
void
*
)
rxsigF_tmp
,
N_ZC
<<
2
);
LOG_I
(
PHY
,
"GES printing rxsigF2 %d
\n
"
,
*
rxsigF2
);
LOG_I
(
PHY
,
"GES printing rxsigF2 %d
\n
"
,
*
rxsigF2
);
...
...
openair2/RRC/NR/rrc_gNB_reconfig.c
View file @
7af14dd7
...
@@ -157,7 +157,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
...
@@ -157,7 +157,7 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
secondaryCellGroup
->
spCellConfig
->
reconfigurationWithSync
->
rach_ConfigDedicated
->
choice
.
uplink
->
cfra
->
resources
.
choice
.
ssb
=
calloc
(
1
,
sizeof
(
struct
NR_CFRA__resources__ssb
));
secondaryCellGroup
->
spCellConfig
->
reconfigurationWithSync
->
rach_ConfigDedicated
->
choice
.
uplink
->
cfra
->
resources
.
choice
.
ssb
=
calloc
(
1
,
sizeof
(
struct
NR_CFRA__resources__ssb
));
secondaryCellGroup
->
spCellConfig
->
reconfigurationWithSync
->
rach_ConfigDedicated
->
choice
.
uplink
->
cfra
->
resources
.
choice
.
ssb
->
ra_ssb_OccasionMaskIndex
=
0
;
secondaryCellGroup
->
spCellConfig
->
reconfigurationWithSync
->
rach_ConfigDedicated
->
choice
.
uplink
->
cfra
->
resources
.
choice
.
ssb
->
ra_ssb_OccasionMaskIndex
=
0
;
struct
NR_CFRA_SSB_Resource
*
ssbElem
[
8
];
struct
NR_CFRA_SSB_Resource
*
ssbElem
[
8
];
for
(
int
i
=
0
;
i
<
1
;
i
++
)
{
for
(
int
i
=
0
;
i
<
8
;
i
++
)
{
ssbElem
[
i
]
=
calloc
(
1
,
sizeof
(
struct
NR_CFRA_SSB_Resource
));
ssbElem
[
i
]
=
calloc
(
1
,
sizeof
(
struct
NR_CFRA_SSB_Resource
));
ssbElem
[
i
]
->
ssb
=
i
;
ssbElem
[
i
]
->
ssb
=
i
;
ssbElem
[
i
]
->
ra_PreambleIndex
=
63
;
ssbElem
[
i
]
->
ra_PreambleIndex
=
63
;
...
...
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