From 0a449a4654405400b419f0443801cf16ff01868e Mon Sep 17 00:00:00 2001
From: "benjamin.franksen" <benjamin.franksen@helmholtz-berlin.de>
Date: Tue, 24 Sep 2013 18:33:27 +0000
Subject: [PATCH] renamed function typedefs
---
src/seq/seqCom.h | 24 +++++++++++-------------
src/seq/seqPvt.h | 6 +++---
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/src/seq/seqCom.h b/src/seq/seqCom.h
index cd041d64..50881795 100644
--- a/src/seq/seqCom.h
+++ b/src/seq/seqCom.h
@@ -95,12 +95,10 @@ typedef unsigned VAR_ID; /* identifier for a pv */
typedef int seqBool;
/* Prototypes for functions generated by snc */
-typedef void ACTION_FUNC(SS_ID ssId, SEQ_VARS *const var, int transNum, int *nextState);
-typedef seqBool EVENT_FUNC(SS_ID ssId, SEQ_VARS *const var, int *transNum, int *nextState);
-typedef void ENTRY_FUNC(SS_ID ssId, SEQ_VARS *const var);
-typedef void EXIT_FUNC(SS_ID ssId, SEQ_VARS *const var);
-typedef void INIT_FUNC(SEQ_VARS *const var);
-typedef void PROG_FUNC(PROG_ID progId, SEQ_VARS *const vars);
+typedef void SEQ_TRANS_FUNC(SS_ID ssId, SEQ_VARS *const var, int transNum, int *nextState);
+typedef seqBool SEQ_EVENT_FUNC(SS_ID ssId, SEQ_VARS *const var, int *transNum, int *nextState);
+typedef void SEQ_SS_FUNC(SS_ID ssId, SEQ_VARS *const var);
+typedef void SEQ_PROG_FUNC(PROG_ID progId, SEQ_VARS *const vars);
typedef const struct seqChan seqChan;
typedef const struct seqState seqState;
@@ -126,10 +124,10 @@ struct seqChan
struct seqState
{
const char *stateName; /* state name */
- ACTION_FUNC *actionFunc; /* action routine for this state */
- EVENT_FUNC *eventFunc; /* event routine for this state */
- ENTRY_FUNC *entryFunc; /* statements performed on entry to state */
- EXIT_FUNC *exitFunc; /* statements performed on exit from state */
+ SEQ_TRANS_FUNC *actionFunc; /* action routine for this state */
+ SEQ_EVENT_FUNC *eventFunc; /* event routine for this state */
+ SEQ_SS_FUNC *entryFunc; /* statements performed on entry to state */
+ SEQ_SS_FUNC *exitFunc; /* statements performed on exit from state */
const seqMask *eventMask; /* event mask for this state */
seqMask options; /* state option mask */
};
@@ -155,9 +153,9 @@ struct seqProgram
const char *params; /* program paramters */
unsigned numEvFlags; /* number of event flags */
seqMask options; /* program option mask */
- PROG_FUNC *initFunc; /* init function */
- ENTRY_FUNC *entryFunc; /* entry function */
- EXIT_FUNC *exitFunc; /* exit function */
+ SEQ_PROG_FUNC *initFunc; /* init function */
+ SEQ_SS_FUNC *entryFunc; /* entry function */
+ SEQ_SS_FUNC *exitFunc; /* exit function */
unsigned numQueues; /* number of syncQ queues */
};
diff --git a/src/seq/seqPvt.h b/src/seq/seqPvt.h
index 8696b22f..ab3ff6db 100644
--- a/src/seq/seqPvt.h
+++ b/src/seq/seqPvt.h
@@ -179,9 +179,9 @@ struct program_instance
MACRO *macros; /* ptr to macro table */
char *params; /* program parameters */
unsigned options; /* options (bit-encoded) */
- PROG_FUNC *initFunc; /* init function */
- ENTRY_FUNC *entryFunc; /* entry function */
- EXIT_FUNC *exitFunc; /* exit function */
+ SEQ_PROG_FUNC *initFunc; /* init function */
+ SEQ_SS_FUNC *entryFunc; /* entry function */
+ SEQ_SS_FUNC *exitFunc; /* exit function */
unsigned numEvFlags; /* number of event flags */
/* dynamic program data (assigned at runtime) */
--
GitLab