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
alex037yang
OpenXG-RAN
Commits
a3049674
Commit
a3049674
authored
Mar 26, 2019
by
Francesco Mani
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
warning fixed in get_band
parent
d5d5c61a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
openair1/PHY/INIT/nr_parms.c
openair1/PHY/INIT/nr_parms.c
+5
-5
openair1/PHY/INIT/phy_init.h
openair1/PHY/INIT/phy_init.h
+1
-1
openair1/SIMULATION/NR_PHY/dlsim.c
openair1/SIMULATION/NR_PHY/dlsim.c
+1
-1
No files found.
openair1/PHY/INIT/nr_parms.c
View file @
a3049674
...
@@ -337,13 +337,14 @@ nr_bandentry_t nr_bandtable[] = {
...
@@ -337,13 +337,14 @@ nr_bandentry_t nr_bandtable[] = {
{
86
,
1710000
,
1785000
,
000
,
000
,
20
,
342000
}
{
86
,
1710000
,
1785000
,
000
,
000
,
20
,
342000
}
};
};
int
get_band
(
uint32_t
downlink_frequency
,
uint8_t
*
current_band
,
int32_t
*
current_offset
,
lte_frame_type_t
*
current_type
)
{
void
get_band
(
uint32_t
downlink_frequency
,
uint8_t
*
current_band
,
int32_t
*
current_offset
,
lte_frame_type_t
*
current_type
)
{
int
ind
;
int
ind
;
int64_t
dl_freq_khz
=
downlink_frequency
/
1000
;
int64_t
dl_freq_khz
=
downlink_frequency
/
1000
;
for
(
ind
=
0
;
for
(
ind
=
0
;
ind
<
sizeof
(
nr_bandtable
)
/
sizeof
(
nr_bandtable
[
0
]);
ind
<
sizeof
(
nr_bandtable
)
/
sizeof
(
nr_bandtable
[
0
]);
ind
++
)
{
ind
++
)
{
*
current_band
=
nr_bandtable
[
ind
].
band
;
*
current_band
=
nr_bandtable
[
ind
].
band
;
LOG_I
(
PHY
,
"Scanning band %d, dl_min %"
PRIu32
", ul_min %"
PRIu32
"
\n
"
,
ind
,
nr_bandtable
[
ind
].
dl_min
,
nr_bandtable
[
ind
].
ul_min
);
LOG_I
(
PHY
,
"Scanning band %d, dl_min %"
PRIu32
", ul_min %"
PRIu32
"
\n
"
,
ind
,
nr_bandtable
[
ind
].
dl_min
,
nr_bandtable
[
ind
].
ul_min
);
...
@@ -360,9 +361,8 @@ int get_band(uint32_t downlink_frequency, uint8_t *current_band, int32_t *cu
...
@@ -360,9 +361,8 @@ int get_band(uint32_t downlink_frequency, uint8_t *current_band, int32_t *cu
}
}
}
}
if
(
ind
==
sizeof
(
nr_bandtable
)
/
sizeof
(
nr_bandtable
[
0
]))
{
AssertFatal
(
ind
!=
(
sizeof
(
nr_bandtable
)
/
sizeof
(
nr_bandtable
[
0
])),
LOG_E
(
PHY
,
"Can't find EUTRA band for frequency %d
\n
"
,
downlink_frequency
);
"Can't find EUTRA band for frequency %d
\n
"
,
downlink_frequency
);
return
(
-
1
);
}
}
}
openair1/PHY/INIT/phy_init.h
View file @
a3049674
...
@@ -391,7 +391,7 @@ void init_nr_transport(PHY_VARS_gNB *gNB);
...
@@ -391,7 +391,7 @@ void init_nr_transport(PHY_VARS_gNB *gNB);
void
init_dfts
(
void
);
void
init_dfts
(
void
);
int
get_band
(
uint32_t
downlink_frequency
,
uint8_t
*
current_band
,
int32_t
*
current_offset
,
lte_frame_type_t
*
current_type
);
void
get_band
(
uint32_t
downlink_frequency
,
uint8_t
*
current_band
,
int32_t
*
current_offset
,
lte_frame_type_t
*
current_type
);
/** @} */
/** @} */
...
...
openair1/SIMULATION/NR_PHY/dlsim.c
View file @
a3049674
...
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
...
@@ -154,7 +154,7 @@ int main(int argc, char **argv)
int
pbch_tx_ant
;
int
pbch_tx_ant
;
int
N_RB_DL
=
273
,
mu
=
1
;
int
N_RB_DL
=
273
,
mu
=
1
;
uint64_t
ssb_pattern
=
0
;
uint64_t
ssb_pattern
=
0
x01
;
unsigned
char
frame_type
=
0
;
unsigned
char
frame_type
=
0
;
unsigned
char
pbch_phase
=
0
;
unsigned
char
pbch_phase
=
0
;
...
...
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