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
75917612
Commit
75917612
authored
6 years ago
by
Florian Kaltenberger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removing assertion from dci handling (could come from wrongly detected DCI)
parent
c8eb68d5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
17 deletions
+25
-17
openair1/PHY/LTE_TRANSPORT/dci_tools_common.c
openair1/PHY/LTE_TRANSPORT/dci_tools_common.c
+25
-17
No files found.
openair1/PHY/LTE_TRANSPORT/dci_tools_common.c
View file @
75917612
...
@@ -357,28 +357,36 @@ void conv_rballoc(uint8_t ra_header,uint32_t rb_alloc,uint32_t N_RB_DL,uint32_t
...
@@ -357,28 +357,36 @@ void conv_rballoc(uint8_t ra_header,uint32_t rb_alloc,uint32_t N_RB_DL,uint32_t
break
;
break
;
case
50
:
case
50
:
AssertFatal
(
ra_header
==
0
,
"resource type 1 not supported for N_RB_DL=50
\n
"
);
if
(
ra_header
==
0
)
{
for
(
i
=
16
;
i
>
0
;
i
--
)
{
for
(
i
=
16
;
i
>
0
;
i
--
)
{
if
((
rb_alloc
&
(
1
<<
i
))
!=
0
)
if
((
rb_alloc
&
(
1
<<
i
))
!=
0
)
rb_alloc2
[(
3
*
(
16
-
i
))
>>
5
]
|=
(
7
<<
((
3
*
(
16
-
i
))
%
32
));
rb_alloc2
[(
3
*
(
16
-
i
))
>>
5
]
|=
(
7
<<
((
3
*
(
16
-
i
))
%
32
));
}
// bit mask across
if
((
rb_alloc2
[
0
]
>>
31
)
==
1
)
rb_alloc2
[
1
]
|=
1
;
if
((
rb_alloc
&
1
)
!=
0
)
rb_alloc2
[
1
]
|=
(
3
<<
16
);
}
else
{
LOG_W
(
PHY
,
"resource type 1 not supported for N_RB_DL=50
\n
"
);
}
}
// bit mask across
if
((
rb_alloc2
[
0
]
>>
31
)
==
1
)
rb_alloc2
[
1
]
|=
1
;
if
((
rb_alloc
&
1
)
!=
0
)
rb_alloc2
[
1
]
|=
(
3
<<
16
);
break
;
break
;
case
100
:
case
100
:
AssertFatal
(
ra_header
==
0
,
"resource type 1 not supported for N_RB_DL=100
\n
"
);
if
(
ra_header
==
0
)
{
for
(
i
=
0
;
i
<
25
;
i
++
)
{
for
(
i
=
0
;
i
<
25
;
i
++
)
{
if
((
rb_alloc
&
(
1
<<
(
24
-
i
)))
!=
0
)
if
((
rb_alloc
&
(
1
<<
(
24
-
i
)))
!=
0
)
rb_alloc2
[(
4
*
i
)
>>
5
]
|=
(
0xf
<<
((
4
*
i
)
%
32
));
rb_alloc2
[(
4
*
i
)
>>
5
]
|=
(
0xf
<<
((
4
*
i
)
%
32
));
// printf("rb_alloc2[%d] (type 0) %x (%d)\n",(4*i)>>5,rb_alloc2[(4*i)>>5],rb_alloc&(1<<i));
// printf("rb_alloc2[%d] (type 0) %x (%d)\n",(4*i)>>5,rb_alloc2[(4*i)>>5],rb_alloc&(1<<i));
}
}
else
{
LOG_W
(
PHY
,
"resource type 1 not supported for N_RB_DL=100
\n
"
);
}
}
break
;
break
;
...
...
This diff is collapsed.
Click to expand it.
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