From fc334db9d6e259bb147cb916d4f3dc998413ba7f Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Fri, 4 Jun 1993 12:14:12 +0000 Subject: [PATCH] Changed to work with vxWorks 5.1 and GCC 2.2.3. --- src/sequencer/seq_mac.c | 4 +++- src/sequencer/seq_main.c | 2 +- src/sequencer/seq_task.c | 8 +++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/sequencer/seq_mac.c b/src/sequencer/seq_mac.c index 3f6eb906d..59d112851 100644 --- a/src/sequencer/seq_mac.c +++ b/src/sequencer/seq_mac.c @@ -53,6 +53,7 @@ MACRO *pMac; seqMacEval(pInStr, pOutStr, maxChar, macTbl) char *pInStr; char *pOutStr; +int maxChar; MACRO *macTbl; { char *pMacVal, *pTmp; @@ -100,7 +101,8 @@ MACRO *macTbl; printf("OutStr=%s\n", pTmp); #endif } - *pOutStr == 0; + /* lrd - was: *pOutStr == 0; */ + *pOutStr = 0; } /* * seqMacValGet - given macro name, return pointer to its value. diff --git a/src/sequencer/seq_main.c b/src/sequencer/seq_main.c index cbd342844..15b039896 100644 --- a/src/sequencer/seq_main.c +++ b/src/sequencer/seq_main.c @@ -157,7 +157,7 @@ int stack_size; /* optional stack size (bytes) */ /* Spawn the initial sequencer task */ tid = taskSpawn(ptask_name, SPAWN_PRIORITY, SPAWN_OPTIONS, - stack_size, sequencer, pSP, stack_size, ptask_name); + stack_size, sequencer, (int)pSP, stack_size, (int)ptask_name,0,0,0,0,0,0,0); seq_log(pSP, "Spawning state program \"%s\", task name = \"%s\"\n", pSP->name, ptask_name); diff --git a/src/sequencer/seq_task.c b/src/sequencer/seq_task.c index d4b31c712..b94937be6 100644 --- a/src/sequencer/seq_task.c +++ b/src/sequencer/seq_task.c @@ -83,8 +83,10 @@ char *ptask_name; /* Parent task name */ SPAWN_PRIORITY+pSS->task_priority, /* priority */ SPAWN_OPTIONS, /* task options */ stack_size, /* stack size */ - ss_entry, /* entry point */ - pSP, pSS); /* pass 2 parameters */ + (int)ss_entry, /* entry point */ + (int)pSP, + (int)pSS, /* pass 2 parameters */ + 0,0,0,0,0,0,0,0); seq_log(pSP, "Spawning task %d: \"%s\"\n", task_id, task_name); } @@ -308,7 +310,7 @@ TCBX *pTcbX; /* ptr to TCB of task to be deleted */ #endif pSP = seqFindProg(tid); if (pSP == NULL) - return; /* not a state program task */ + return(0); /* not a state program task */ logMsg("Delete %s: pSP=%d=0x%x, tid=%d\n", pSP->name, pSP, pSP, tid);