Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
openairinterface5G
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
oai
openairinterface5G
Commits
7f63a702
Commit
7f63a702
authored
8 months ago
by
Robert Schmidt
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/demote-logs-simpler-code-band' into integration_2024_w27
parents
4fb3cfaf
141577c8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!2839
Integration: `2024.w27`
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
common/utils/nr/nr_common.c
+3
-10
3 additions, 10 deletions
common/utils/nr/nr_common.c
with
3 additions
and
10 deletions
common/utils/nr/nr_common.c
+
3
−
10
View file @
7f63a702
...
@@ -644,16 +644,9 @@ int get_dmrs_port(int nl, uint16_t dmrs_ports)
...
@@ -644,16 +644,9 @@ int get_dmrs_port(int nl, uint16_t dmrs_ports)
frame_type_t
get_frame_type
(
uint16_t
current_band
,
uint8_t
scs_index
)
frame_type_t
get_frame_type
(
uint16_t
current_band
,
uint8_t
scs_index
)
{
{
frame_type_t
current_type
;
int32_t
delta_duplex
=
get_delta_duplex
(
current_band
,
scs_index
);
int32_t
delta_duplex
=
get_delta_duplex
(
current_band
,
scs_index
);
frame_type_t
current_type
=
delta_duplex
==
0
?
TDD
:
FDD
;
if
(
delta_duplex
==
0
)
LOG_D
(
NR_MAC
,
"NR band %d, duplex mode %s, duplex spacing = %d KHz
\n
"
,
current_band
,
duplex_mode
[
current_type
],
delta_duplex
);
current_type
=
TDD
;
else
current_type
=
FDD
;
LOG_I
(
NR_MAC
,
"NR band %d, duplex mode %s, duplex spacing = %d KHz
\n
"
,
current_band
,
duplex_mode
[
current_type
],
delta_duplex
);
return
current_type
;
return
current_type
;
}
}
...
@@ -664,7 +657,7 @@ int32_t get_delta_duplex(int nr_bandP, uint8_t scs_index)
...
@@ -664,7 +657,7 @@ int32_t get_delta_duplex(int nr_bandP, uint8_t scs_index)
int32_t
delta_duplex
=
(
nr_bandtable
[
nr_table_idx
].
ul_min
-
nr_bandtable
[
nr_table_idx
].
dl_min
);
int32_t
delta_duplex
=
(
nr_bandtable
[
nr_table_idx
].
ul_min
-
nr_bandtable
[
nr_table_idx
].
dl_min
);
LOG_
I
(
NR_MAC
,
"NR band duplex spacing is %d KHz (nr_bandtable[%d].band = %d)
\n
"
,
delta_duplex
,
nr_table_idx
,
nr_bandtable
[
nr_table_idx
].
band
);
LOG_
D
(
NR_MAC
,
"NR band duplex spacing is %d KHz (nr_bandtable[%d].band = %d)
\n
"
,
delta_duplex
,
nr_table_idx
,
nr_bandtable
[
nr_table_idx
].
band
);
return
delta_duplex
;
return
delta_duplex
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment