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
f2c778fc
Commit
f2c778fc
authored
Feb 05, 2019
by
Matthieu Kanj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug fix in values
parent
4a22bddc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
openair1/PHY/LTE_TRANSPORT/lte_Isc_NB_IoT.c
openair1/PHY/LTE_TRANSPORT/lte_Isc_NB_IoT.c
+7
-7
No files found.
openair1/PHY/LTE_TRANSPORT/lte_Isc_NB_IoT.c
View file @
f2c778fc
...
@@ -113,10 +113,10 @@ uint16_t get_UL_N_ru_NB_IoT(uint8_t I_mcs, uint8_t I_ru, uint8_t flag_msg3)
...
@@ -113,10 +113,10 @@ uint16_t get_UL_N_ru_NB_IoT(uint8_t I_mcs, uint8_t I_ru, uint8_t flag_msg3)
uint16_t
get_UL_sc_index_start_NB_IoT
(
uint8_t
subcarrier_spacing
,
uint16_t
I_sc
,
uint8_t
npush_format
)
uint16_t
get_UL_sc_index_start_NB_IoT
(
uint8_t
subcarrier_spacing
,
uint16_t
I_sc
,
uint8_t
npush_format
)
{
{
if
(
npush_format
==
1
)
if
(
npush_format
==
0
)
// format 1
{
{
if
(
subcarrier_spacing
==
0
)
////////// 15 KHz
if
(
subcarrier_spacing
==
1
)
////////// 15 KHz
{
{
if
(
0
<=
I_sc
&&
I_sc
<
12
)
if
(
0
<=
I_sc
&&
I_sc
<
12
)
...
@@ -149,7 +149,7 @@ uint16_t get_UL_sc_index_start_NB_IoT(uint8_t subcarrier_spacing, uint16_t I_sc,
...
@@ -149,7 +149,7 @@ uint16_t get_UL_sc_index_start_NB_IoT(uint8_t subcarrier_spacing, uint16_t I_sc,
}
else
{
/////////////////////////////////////// format 2
}
else
{
/////////////////////////////////////// format 2
if
(
subcarrier_spacing
==
0
)
////////// 15 KHz
if
(
subcarrier_spacing
==
1
)
////////// 15 KHz
{
{
return
(
tab_ack_15khz
[
I_sc
]);
return
(
tab_ack_15khz
[
I_sc
]);
...
@@ -167,9 +167,9 @@ uint16_t get_UL_sc_index_start_NB_IoT(uint8_t subcarrier_spacing, uint16_t I_sc,
...
@@ -167,9 +167,9 @@ uint16_t get_UL_sc_index_start_NB_IoT(uint8_t subcarrier_spacing, uint16_t I_sc,
uint8_t
get_numb_UL_sc_NB_IoT
(
uint8_t
subcarrier_spacing
,
uint8_t
I_sc
,
uint8_t
npush_format
)
uint8_t
get_numb_UL_sc_NB_IoT
(
uint8_t
subcarrier_spacing
,
uint8_t
I_sc
,
uint8_t
npush_format
)
{
{
if
(
npush_format
==
1
)
if
(
npush_format
==
0
)
// format 1
{
{
if
(
subcarrier_spacing
==
0
)
// 15 KHz
if
(
subcarrier_spacing
==
1
)
// 15 KHz
{
{
if
(
I_sc
>=
0
&&
I_sc
<
12
)
if
(
I_sc
>=
0
&&
I_sc
<
12
)
...
@@ -199,9 +199,9 @@ uint8_t get_UL_slots_per_RU_NB_IoT(uint8_t subcarrier_spacing, uint8_t subcarrie
...
@@ -199,9 +199,9 @@ uint8_t get_UL_slots_per_RU_NB_IoT(uint8_t subcarrier_spacing, uint8_t subcarrie
{
{
uint8_t
subcarrier_number
=
get_numb_UL_sc_NB_IoT
(
subcarrier_spacing
,
subcarrier_indcation
,
UL_format
);
uint8_t
subcarrier_number
=
get_numb_UL_sc_NB_IoT
(
subcarrier_spacing
,
subcarrier_indcation
,
UL_format
);
if
(
UL_format
==
1
)
// format 1
if
(
UL_format
==
0
)
// format 1
{
{
if
(
subcarrier_spacing
==
0
)
// 15 KHz
if
(
subcarrier_spacing
==
1
)
// 15 KHz
{
{
if
(
subcarrier_number
==
1
)
if
(
subcarrier_number
==
1
)
{
{
...
...
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