Skip to content
Snippets Groups Projects
Commit d7a2f970 authored by ben.franksen's avatar ben.franksen
Browse files

removed an unnecessary struct member (and an unused macro)

parent 51f76e48
No related branches found
No related tags found
No related merge requests found
......@@ -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) */
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment