Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
sequencer-2-2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
epics-modules
sequencer-2-2
Commits
d7a2f970
Commit
d7a2f970
authored
14 years ago
by
ben.franksen
Browse files
Options
Downloads
Patches
Plain Diff
removed an unnecessary struct member (and an unused macro)
parent
51f76e48
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/seq/seqPvt.h
+0
-2
0 additions, 2 deletions
src/seq/seqPvt.h
src/seq/seq_task.c
+4
-3
4 additions, 3 deletions
src/seq/seq_task.c
with
4 additions
and
5 deletions
src/seq/seqPvt.h
+
0
−
2
View file @
d7a2f970
...
...
@@ -41,7 +41,6 @@
#define ssNum(ss) ((ss)-(ss)->sprog->ss)
#define chNum(ch) ((ch)-(ch)->sprog->chan)
#define metaIx(ch,ss) (((ch)->sprog->options&OPT_SAFE)?ssNum(ss):0)
#define metaPtr(ch,ss) (((ch)->sprog->options&OPT_SAFE)?((ch)->dbch->ssMetaData+ssNum(ss)):(&(ch)->dbch->metaData))
/* Generic iteration on lists */
...
...
@@ -136,7 +135,6 @@ struct state_set
int
currentState
;
/* current state index */
int
nextState
;
/* next state index */
int
prevState
;
/* previous state index */
int
transNum
;
/* highest prio trans. # triggered */
const
bitMask
*
mask
;
/* current event mask */
unsigned
numDelays
;
/* number of delays activated */
double
*
delay
;
/* queued delay values in secs (array) */
...
...
This diff is collapsed.
Click to expand it.
src/seq/seq_task.c
+
4
−
3
View file @
d7a2f970
...
...
@@ -255,7 +255,8 @@ static void ss_entry(void *arg)
*/
while
(
TRUE
)
{
boolean
ev_trig
;
boolean
ev_trig
;
int
transNum
=
0
;
/* highest prio trans. # triggered */
/* Set state to current state */
STATE
*
st
=
ss
->
states
+
ss
->
currentState
;
...
...
@@ -307,7 +308,7 @@ static void ss_entry(void *arg)
/* Check state change conditions */
ev_trig
=
st
->
eventFunc
(
ss
,
var
,
&
ss
->
transNum
,
&
ss
->
nextState
);
&
transNum
,
&
ss
->
nextState
);
/* Clear all event flags (old ef mode only) */
if
(
ev_trig
&&
!
(
sp
->
options
&
OPT_NEWEF
))
...
...
@@ -321,7 +322,7 @@ static void ss_entry(void *arg)
}
while
(
!
ev_trig
);
/* Execute the state change action */
st
->
actionFunc
(
ss
,
var
,
ss
->
transNum
,
&
ss
->
nextState
);
st
->
actionFunc
(
ss
,
var
,
transNum
,
&
ss
->
nextState
);
/* If changing state, do exit actions */
if
(
st
->
exitFunc
&&
(
ss
->
currentState
!=
ss
->
nextState
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment