Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
proview
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
Esteban Blanc
proview
Commits
0a68b8dc
Commit
0a68b8dc
authored
4 years ago
by
Marcus Nordenberg
Committed by
Esteban Blanc
4 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use enums for DelayAction for readability
(cherry picked from commit 97b12eb9da2c0aa27a183623e5ec06da44425a46)
parent
e84c5840
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
src/exe/rt_emon/src/rt_emon.c
src/exe/rt_emon/src/rt_emon.c
+2
-1
src/lib/rt/src/rt_csup.c
src/lib/rt/src/rt_csup.c
+2
-1
No files found.
src/exe/rt_emon/src/rt_emon.c
View file @
0a68b8dc
...
@@ -1351,7 +1351,8 @@ static void cSup_exec(sSupActive* sp)
...
@@ -1351,7 +1351,8 @@ static void cSup_exec(sSupActive* sp)
o
->
Acked
=
FALSE
;
o
->
Acked
=
FALSE
;
o
->
AlarmCheck
=
FALSE
;
o
->
AlarmCheck
=
FALSE
;
o
->
DelayNoted
=
TRUE
;
o
->
DelayNoted
=
TRUE
;
if
(
o
->
DelayAction
==
2
)
{
if
(
o
->
DelayAction
==
pwr_eSupDelayActionEnum_EmergencyBreak
)
{
int
prev_rwflag
=
l
.
iohp
->
IOReadWriteFlag
;
int
prev_rwflag
=
l
.
iohp
->
IOReadWriteFlag
;
l
.
iohp
->
IOReadWriteFlag
=
FALSE
;
l
.
iohp
->
IOReadWriteFlag
=
FALSE
;
l
.
nodep
->
EmergBreakTrue
=
TRUE
;
l
.
nodep
->
EmergBreakTrue
=
TRUE
;
...
...
This diff is collapsed.
Click to expand it.
src/lib/rt/src/rt_csup.c
View file @
0a68b8dc
...
@@ -149,7 +149,8 @@ int csup_Exec(pwr_tStatus* status, lst_sEntry* lh, pwr_tDeltaTime* next_start,
...
@@ -149,7 +149,8 @@ int csup_Exec(pwr_tStatus* status, lst_sEntry* lh, pwr_tDeltaTime* next_start,
o
->
CycleCount
++
;
o
->
CycleCount
++
;
}
else
{
}
else
{
/* Not owner, check stall delay */
/* Not owner, check stall delay */
if
(
o
->
DelayAction
==
2
)
{
if
(
o
->
DelayAction
==
pwr_eSupDelayActionEnum_EmergencyBreak
)
{
nextLimit
.
tv_nsec
=
o
->
NextLimit
.
tv_nsec
;
nextLimit
.
tv_nsec
=
o
->
NextLimit
.
tv_nsec
;
nextLimit
.
tv_sec
=
o
->
NextLimit
.
tv_sec
;
nextLimit
.
tv_sec
=
o
->
NextLimit
.
tv_sec
;
if
(
time_Dcomp
(
&
nextLimit
,
NULL
)
>
0
if
(
time_Dcomp
(
&
nextLimit
,
NULL
)
>
0
...
...
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