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
9b207834
Commit
9b207834
authored
Aug 22, 2022
by
laurent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
merge conflict fix
parent
5fcd8b6f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
5 deletions
+1
-5
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
+1
-5
No files found.
openair1/PHY/NR_UE_TRANSPORT/nr_dlsch_decoding.c
View file @
9b207834
...
...
@@ -591,13 +591,9 @@ uint32_t nr_dlsch_decoding(PHY_VARS_NR_UE *phy_vars_ue,
//////////////////////////////////////////////////////////////////////////////////////////
}
for
(
r
=
0
;
r
<
nbDecode
;
r
++
)
{
<<<<<<<
HEAD
notifiedFIFO_elt_t
*
req
=
pullTpool
(
&
nf
,
&
(
pool_dl
));
notifiedFIFO_elt_t
*
req
=
pullTpool
(
&
nf
,
&
get_nrUE_params
()
->
Tpool
);
if
(
req
==
NULL
)
break
;
// Tpool has been stopped
=======
notifiedFIFO_elt_t
*
req
=
pullTpool
(
&
nf
,
&
get_nrUE_params
()
->
Tpool
);
>>>>>>>
e9caae6f99
(
simplify
thread
pool
configuration
)
bool
last
=
false
;
if
(
r
==
nbDecode
-
1
)
last
=
true
;
...
...
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