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
Michael Black
OpenXG-RAN
Commits
51c0a545
Commit
51c0a545
authored
Mar 08, 2023
by
Robert Schmidt
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/NR_gNB_suppress_init_logs' into integration_2023_w10
parents
6d97394f
44906a23
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
8 deletions
+8
-8
openair1/PHY/INIT/nr_init.c
openair1/PHY/INIT/nr_init.c
+4
-4
openair1/PHY/MODULATION/nr_modulation.c
openair1/PHY/MODULATION/nr_modulation.c
+3
-3
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
+1
-1
No files found.
openair1/PHY/INIT/nr_init.c
View file @
51c0a545
...
@@ -993,7 +993,7 @@ void init_DLSCH_struct(PHY_VARS_gNB *gNB, processingData_L1tx_t *msg) {
...
@@ -993,7 +993,7 @@ void init_DLSCH_struct(PHY_VARS_gNB *gNB, processingData_L1tx_t *msg) {
int
num_cw
=
NR_MAX_NB_LAYERS
>
4
?
2
:
1
;
int
num_cw
=
NR_MAX_NB_LAYERS
>
4
?
2
:
1
;
for
(
int
i
=
0
;
i
<
NUMBER_OF_NR_DLSCH_MAX
;
i
++
)
{
for
(
int
i
=
0
;
i
<
NUMBER_OF_NR_DLSCH_MAX
;
i
++
)
{
LOG_
I
(
PHY
,
"Allocating Transport Channel Buffers for DLSCH %d/%d
\n
"
,
i
,
NUMBER_OF_NR_DLSCH_MAX
);
LOG_
D
(
PHY
,
"Allocating Transport Channel Buffers for DLSCH %d/%d
\n
"
,
i
,
NUMBER_OF_NR_DLSCH_MAX
);
for
(
int
j
=
0
;
j
<
num_cw
;
j
++
)
{
for
(
int
j
=
0
;
j
<
num_cw
;
j
++
)
{
msg
->
dlsch
[
i
][
j
]
=
new_gNB_dlsch
(
fp
,
grid_size
);
msg
->
dlsch
[
i
][
j
]
=
new_gNB_dlsch
(
fp
,
grid_size
);
AssertFatal
(
msg
->
dlsch
[
i
][
j
]
!=
NULL
,
"Can't initialize dlsch %d
\n
"
,
i
);
AssertFatal
(
msg
->
dlsch
[
i
][
j
]
!=
NULL
,
"Can't initialize dlsch %d
\n
"
,
i
);
...
@@ -1048,21 +1048,21 @@ void init_nr_transport(PHY_VARS_gNB *gNB)
...
@@ -1048,21 +1048,21 @@ void init_nr_transport(PHY_VARS_gNB *gNB)
gNB
->
pucch
=
(
NR_gNB_PUCCH_t
**
)
malloc16
(
gNB
->
max_nb_pucch
*
sizeof
(
NR_gNB_PUCCH_t
*
));
gNB
->
pucch
=
(
NR_gNB_PUCCH_t
**
)
malloc16
(
gNB
->
max_nb_pucch
*
sizeof
(
NR_gNB_PUCCH_t
*
));
for
(
int
i
=
0
;
i
<
gNB
->
max_nb_pucch
;
i
++
)
{
for
(
int
i
=
0
;
i
<
gNB
->
max_nb_pucch
;
i
++
)
{
LOG_
I
(
PHY
,
"Allocating Transport Channel Buffers for PUCCH %d/%d
\n
"
,
i
,
gNB
->
max_nb_pucch
);
LOG_
D
(
PHY
,
"Allocating Transport Channel Buffers for PUCCH %d/%d
\n
"
,
i
,
gNB
->
max_nb_pucch
);
gNB
->
pucch
[
i
]
=
new_gNB_pucch
();
gNB
->
pucch
[
i
]
=
new_gNB_pucch
();
AssertFatal
(
gNB
->
pucch
[
i
]
!=
NULL
,
"Can't initialize pucch %d
\n
"
,
i
);
AssertFatal
(
gNB
->
pucch
[
i
]
!=
NULL
,
"Can't initialize pucch %d
\n
"
,
i
);
}
}
gNB
->
srs
=
(
NR_gNB_SRS_t
**
)
malloc16
(
gNB
->
max_nb_srs
*
sizeof
(
NR_gNB_SRS_t
*
));
gNB
->
srs
=
(
NR_gNB_SRS_t
**
)
malloc16
(
gNB
->
max_nb_srs
*
sizeof
(
NR_gNB_SRS_t
*
));
for
(
int
i
=
0
;
i
<
gNB
->
max_nb_srs
;
i
++
)
{
for
(
int
i
=
0
;
i
<
gNB
->
max_nb_srs
;
i
++
)
{
LOG_
I
(
PHY
,
"Allocating Transport Channel Buffers for SRS %d/%d
\n
"
,
i
,
gNB
->
max_nb_srs
);
LOG_
D
(
PHY
,
"Allocating Transport Channel Buffers for SRS %d/%d
\n
"
,
i
,
gNB
->
max_nb_srs
);
gNB
->
srs
[
i
]
=
new_gNB_srs
();
gNB
->
srs
[
i
]
=
new_gNB_srs
();
AssertFatal
(
gNB
->
srs
[
i
]
!=
NULL
,
"Can't initialize srs %d
\n
"
,
i
);
AssertFatal
(
gNB
->
srs
[
i
]
!=
NULL
,
"Can't initialize srs %d
\n
"
,
i
);
}
}
for
(
int
i
=
0
;
i
<
NUMBER_OF_NR_ULSCH_MAX
;
i
++
)
{
for
(
int
i
=
0
;
i
<
NUMBER_OF_NR_ULSCH_MAX
;
i
++
)
{
LOG_
I
(
PHY
,
"Allocating Transport Channel Buffers for ULSCH %d/%d
\n
"
,
i
,
NUMBER_OF_NR_ULSCH_MAX
);
LOG_
D
(
PHY
,
"Allocating Transport Channel Buffers for ULSCH %d/%d
\n
"
,
i
,
NUMBER_OF_NR_ULSCH_MAX
);
gNB
->
ulsch
[
i
]
=
new_gNB_ulsch
(
gNB
->
max_ldpc_iterations
,
fp
->
N_RB_UL
);
gNB
->
ulsch
[
i
]
=
new_gNB_ulsch
(
gNB
->
max_ldpc_iterations
,
fp
->
N_RB_UL
);
...
...
openair1/PHY/MODULATION/nr_modulation.c
View file @
51c0a545
...
@@ -618,7 +618,7 @@ void init_symbol_rotation(NR_DL_FRAME_PARMS *fp) {
...
@@ -618,7 +618,7 @@ void init_symbol_rotation(NR_DL_FRAME_PARMS *fp) {
for
(
uint8_t
ll
=
0
;
ll
<
2
;
ll
++
){
for
(
uint8_t
ll
=
0
;
ll
<
2
;
ll
++
){
double
f0
=
f
[
ll
];
double
f0
=
f
[
ll
];
LOG_
I
(
PHY
,
"Doing symbol rotation calculation for gNB TX/RX, f0 %f Hz, Nsymb %d
\n
"
,
f0
,
nsymb
);
LOG_
D
(
PHY
,
"Doing symbol rotation calculation for gNB TX/RX, f0 %f Hz, Nsymb %d
\n
"
,
f0
,
nsymb
);
c16_t
*
symbol_rotation
=
fp
->
symbol_rotation
[
ll
];
c16_t
*
symbol_rotation
=
fp
->
symbol_rotation
[
ll
];
double
tl
=
0
.
0
;
double
tl
=
0
.
0
;
...
@@ -641,7 +641,7 @@ void init_symbol_rotation(NR_DL_FRAME_PARMS *fp) {
...
@@ -641,7 +641,7 @@ void init_symbol_rotation(NR_DL_FRAME_PARMS *fp) {
symbol_rotation
[
l
].
r
=
(
int16_t
)
floor
(
exp_re
*
32767
);
symbol_rotation
[
l
].
r
=
(
int16_t
)
floor
(
exp_re
*
32767
);
symbol_rotation
[
l
].
i
=
(
int16_t
)
floor
(
exp_im
*
32767
);
symbol_rotation
[
l
].
i
=
(
int16_t
)
floor
(
exp_im
*
32767
);
LOG_
I
(
PHY
,
"Symbol rotation %d/%d => tl %f (%d,%d) (%f)
\n
"
,
LOG_
D
(
PHY
,
"Symbol rotation %d/%d => tl %f (%d,%d) (%f)
\n
"
,
l
,
l
,
nsymb
,
nsymb
,
tl
,
tl
,
...
@@ -666,7 +666,7 @@ void init_timeshift_rotation(NR_DL_FRAME_PARMS *fp)
...
@@ -666,7 +666,7 @@ void init_timeshift_rotation(NR_DL_FRAME_PARMS *fp)
fp
->
timeshift_symbol_rotation
[
i
].
i
=
(
int16_t
)
round
(
exp_im
*
32767
);
fp
->
timeshift_symbol_rotation
[
i
].
i
=
(
int16_t
)
round
(
exp_im
*
32767
);
if
(
i
<
10
)
if
(
i
<
10
)
LOG_
I
(
PHY
,
"Timeshift symbol rotation %d => (%d,%d) %f
\n
"
,
i
,
LOG_
D
(
PHY
,
"Timeshift symbol rotation %d => (%d,%d) %f
\n
"
,
i
,
fp
->
timeshift_symbol_rotation
[
i
].
r
,
fp
->
timeshift_symbol_rotation
[
i
].
r
,
fp
->
timeshift_symbol_rotation
[
i
].
i
,
fp
->
timeshift_symbol_rotation
[
i
].
i
,
poff
);
poff
);
...
...
openair1/PHY/NR_TRANSPORT/nr_dlsch_coding.c
View file @
51c0a545
...
@@ -108,7 +108,7 @@ NR_gNB_DLSCH_t *new_gNB_dlsch(NR_DL_FRAME_PARMS *frame_parms,
...
@@ -108,7 +108,7 @@ NR_gNB_DLSCH_t *new_gNB_dlsch(NR_DL_FRAME_PARMS *frame_parms,
a_segments
=
a_segments
/
273
+
1
;
a_segments
=
a_segments
/
273
+
1
;
}
}
LOG_
I
(
PHY
,
"Allocating %d segments (MAX %d, N_PRB %d)
\n
"
,
a_segments
,
MAX_NUM_NR_DLSCH_SEGMENTS_PER_LAYER
,
N_RB
);
LOG_
D
(
PHY
,
"Allocating %d segments (MAX %d, N_PRB %d)
\n
"
,
a_segments
,
MAX_NUM_NR_DLSCH_SEGMENTS_PER_LAYER
,
N_RB
);
uint32_t
dlsch_bytes
=
a_segments
*
1056
;
// allocated bytes per segment
uint32_t
dlsch_bytes
=
a_segments
*
1056
;
// allocated bytes per segment
NR_gNB_DLSCH_t
*
dlsch
=
malloc16
(
sizeof
(
NR_gNB_DLSCH_t
));
NR_gNB_DLSCH_t
*
dlsch
=
malloc16
(
sizeof
(
NR_gNB_DLSCH_t
));
AssertFatal
(
dlsch
,
"cannot allocate dlsch
\n
"
);
AssertFatal
(
dlsch
,
"cannot allocate dlsch
\n
"
);
...
...
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