epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

changed init func to return void

Browse Source
This commit is contained in:
Jeff Hill
2000-03-22 16:58:02 +00:00
parent 800b45a28b
commit 1f748b515c
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/db/dbEvent.c
View File

@@ -101,7 +101,7 @@ struct event_user {
unsigned char pendexit; /* exit pend task */
unsigned char extra_labor; /* if set call extra labor func */
unsigned char flowCtrlMode; /* replace existing monitor */
int (*init_func)();
void (*init_func)();
threadId init_func_arg;
};
@@ -871,20 +871,14 @@ LOCAL int event_read (struct event_que *ev_que)
LOCAL void event_task (void *pParm)
{
struct event_user *evUser = (struct event_user *) pParm;
int status;
struct event_que *ev_que;
/* init hook */
if (evUser->init_func) {
status = (*evUser->init_func)(evUser->init_func_arg);
if (status!=DB_EVENT_OK) {
errlogPrintf("Unable to intialize the event system!\n");
semBinaryGive(evUser->ppendsem);
evUser->pendexit = TRUE;
}
(*evUser->init_func)(evUser->init_func_arg);
}
taskwdInsert(threadGetIdSelf(),NULL,NULL);
taskwdInsert ( threadGetIdSelf(), NULL, NULL );
do{
semBinaryMustTake(evUser->ppendsem);
@@ -950,7 +944,7 @@ LOCAL void event_task (void *pParm)
* DB_START_EVENTS()
*/
int epicsShareAPI db_start_events (
dbEventCtx ctx, char *taskname, int (*init_func)(threadId),
dbEventCtx ctx, char *taskname, void (*init_func)(threadId),
void *init_func_arg, int priority_offset)
{
struct event_user *evUser = (struct event_user *) ctx;

2
src/db/dbEvent.h
View File

@@ -46,7 +46,7 @@ typedef void OVRFFUNC (void *overflow_arg, unsigned count);
typedef void EXTRALABORFUNC (void *extralabor_arg);
epicsShareFunc dbEventCtx epicsShareAPI db_init_events (void);
epicsShareFunc int epicsShareAPI db_start_events (
dbEventCtx ctx, char *taskname, int (*init_func)(void *),
dbEventCtx ctx, char *taskname, void (*init_func)(void *),
void *init_func_arg, int priority_offset);
epicsShareFunc void epicsShareAPI db_close_events (dbEventCtx ctx);
epicsShareFunc void epicsShareAPI db_event_flow_ctrl_mode_on (dbEventCtx ctx);