replace CALLBACK -> epicsCallback

git grep -l -w CALLBACK -- src|xargs sed -i -e 's/\bCALLBACK\b/epicsCallback/g'

with exceptions in callback.h

src/ioc/as/asDbLib.h

@@ -16,7 +16,7 @@
 #include "shareLib.h"
 
 typedef struct {
-    CALLBACK	callback;
+    epicsCallback	callback;
     long	status;
 } ASDBCALLBACK;
 

src/ioc/db/callback.c

@@ -168,7 +168,7 @@ static void callbackTask(void *arg)
             epicsEventMustWait(mySet->semWakeUp);
 
         while ((ptr = epicsRingPointerPop(mySet->queue))) {
-            CALLBACK *pcallback = (CALLBACK *)ptr;
+            epicsCallback *pcallback = (epicsCallback *)ptr;
             if(!epicsRingPointerIsEmpty(mySet->queue))
                 epicsEventMustTrigger(mySet->semWakeUp);
             mySet->queueOverflow = FALSE;
@@ -268,7 +268,7 @@ void callbackInit(void)
 }
 
 /* This routine can be called from interrupt context */
-int callbackRequest(CALLBACK *pcallback)
+int callbackRequest(epicsCallback *pcallback)
 {
     int priority;
     int pushOK;
@@ -297,7 +297,7 @@ int callbackRequest(CALLBACK *pcallback)
     return 0;
 }
 
-static void ProcessCallback(CALLBACK *pcallback)
+static void ProcessCallback(epicsCallback *pcallback)
 {
     dbCommon *pRec;
 
@@ -308,14 +308,14 @@ static void ProcessCallback(CALLBACK *pcallback)
     dbScanUnlock(pRec);
 }
 
-void callbackSetProcess(CALLBACK *pcallback, int Priority, void *pRec)
+void callbackSetProcess(epicsCallback *pcallback, int Priority, void *pRec)
 {
     callbackSetCallback(ProcessCallback, pcallback);
     callbackSetPriority(Priority, pcallback);
     callbackSetUser(pRec, pcallback);
 }
 
-int  callbackRequestProcessCallback(CALLBACK *pcallback,
+int  callbackRequestProcessCallback(epicsCallback *pcallback,
     int Priority, void *pRec)
 {
     callbackSetProcess(pcallback, Priority, pRec);
@@ -324,11 +324,11 @@ int  callbackRequestProcessCallback(CALLBACK *pcallback,
 
 static void notify(void *pPrivate)
 {
-    CALLBACK *pcallback = (CALLBACK *)pPrivate;
+    epicsCallback *pcallback = (epicsCallback *)pPrivate;
     callbackRequest(pcallback);
 }
 
-void callbackRequestDelayed(CALLBACK *pcallback, double seconds)
+void callbackRequestDelayed(epicsCallback *pcallback, double seconds)
 {
     epicsTimerId timer = (epicsTimerId)pcallback->timer;
 
@@ -339,7 +339,7 @@ void callbackRequestDelayed(CALLBACK *pcallback, double seconds)
     epicsTimerStartDelay(timer, seconds);
 }
 
-void callbackCancelDelayed(CALLBACK *pcallback)
+void callbackCancelDelayed(epicsCallback *pcallback)
 {
     epicsTimerId timer = (epicsTimerId)pcallback->timer;
 
@@ -348,7 +348,7 @@ void callbackCancelDelayed(CALLBACK *pcallback)
     }
 }
 
-void callbackRequestProcessCallbackDelayed(CALLBACK *pcallback,
+void callbackRequestProcessCallbackDelayed(epicsCallback *pcallback,
     int Priority, void *pRec, double seconds)
 {
     callbackSetProcess(pcallback, Priority, pRec);

src/ioc/db/callback.h

@@ -55,21 +55,21 @@ typedef void    (*CALLBACKFUNC)(struct callbackPvt*);
 #define callbackSetUser(USER,PCALLBACK)\
 ( (PCALLBACK)->user = (void *)(USER) )
 #define callbackGetUser(USER,PCALLBACK)\
-( (USER) = (void *)((CALLBACK *)(PCALLBACK))->user )
+( (USER) = (void *)((epicsCallback *)(PCALLBACK))->user )
 
 epicsShareFunc void callbackInit(void);
 epicsShareFunc void callbackStop(void);
 epicsShareFunc void callbackCleanup(void);
-epicsShareFunc int callbackRequest(CALLBACK *pCallback);
+epicsShareFunc int callbackRequest(epicsCallback *pCallback);
 epicsShareFunc void callbackSetProcess(
-    CALLBACK *pcallback, int Priority, void *pRec);
+    epicsCallback *pcallback, int Priority, void *pRec);
 epicsShareFunc int callbackRequestProcessCallback(
-    CALLBACK *pCallback,int Priority, void *pRec);
+    epicsCallback *pCallback,int Priority, void *pRec);
 epicsShareFunc void callbackRequestDelayed(
-    CALLBACK *pCallback,double seconds);
-epicsShareFunc void callbackCancelDelayed(CALLBACK *pcallback);
+    epicsCallback *pCallback,double seconds);
+epicsShareFunc void callbackCancelDelayed(epicsCallback *pcallback);
 epicsShareFunc void callbackRequestProcessCallbackDelayed(
-    CALLBACK *pCallback, int Priority, void *pRec, double seconds);
+    epicsCallback *pCallback, int Priority, void *pRec, double seconds);
 epicsShareFunc int callbackSetQueueSize(int size);
 epicsShareFunc int callbackParallelThreads(int count, const char *prio);
 

src/ioc/db/dbNotify.c

@@ -70,7 +70,7 @@ typedef struct notifyPvt {
     ELLNODE      node;   /*For free list*/
     long         magic;
     short        state;
-    CALLBACK     callback;
+    epicsCallback     callback;
     ELLLIST      waitList; /*list of records for current processNotify*/
     short        cancelWait;
     short        userCallbackWait;
@@ -93,7 +93,7 @@ static void notifyCleanup(processNotify *ppn);
 static void restartCheck(processNotifyRecord *ppnr);
 static void callDone(dbCommon *precord,processNotify *ppn);
 static void processNotifyCommon(processNotify *ppn,dbCommon *precord);
-static void notifyCallback(CALLBACK *pcallback);
+static void notifyCallback(epicsCallback *pcallback);
 
 #define ellSafeAdd(list,listnode) \
 { \
@@ -265,7 +265,7 @@ static void processNotifyCommon(processNotify *ppn,dbCommon *precord)
     callDone(precord, ppn);
 }
 
-static void notifyCallback(CALLBACK *pcallback)
+static void notifyCallback(epicsCallback *pcallback)
 {
     processNotify *ppn = NULL;
     dbCommon  *precord;

src/ioc/db/dbScan.c

@@ -109,7 +109,7 @@ static char *priorityName[NUM_CALLBACK_PRIORITIES] = {
 /* EVENT */
 
 typedef struct event_list {
-    CALLBACK            callback[NUM_CALLBACK_PRIORITIES];
+    epicsCallback            callback[NUM_CALLBACK_PRIORITIES];
     scan_list           scan_list[NUM_CALLBACK_PRIORITIES];
     struct event_list   *next;
     char                eventname[1]; /* actually arbitrary size */
@@ -120,7 +120,7 @@ static epicsMutexId event_lock;
 /* IO_EVENT*/
 
 typedef struct io_scan_list {
-    CALLBACK callback;
+    epicsCallback callback;
     scan_list scan_list;
 } io_scan_list;
 
@@ -141,9 +141,9 @@ static void periodicTask(void *arg);
 static void initPeriodic(void);
 static void deletePeriodic(void);
 static void spawnPeriodic(int ind);
-static void eventCallback(CALLBACK *pcallback);
+static void eventCallback(epicsCallback *pcallback);
 static void ioscanInit(void);
-static void ioscanCallback(CALLBACK *pcallback);
+static void ioscanCallback(epicsCallback *pcallback);
 static void ioscanDestroy(void);
 static void printList(scan_list *psl, char *message);
 static void scanList(scan_list *psl);
@@ -448,7 +448,7 @@ int scanpiol(void)                  /* print pioscan_list */
     return 0;
 }
 
-static void eventCallback(CALLBACK *pcallback)
+static void eventCallback(epicsCallback *pcallback)
 {
     scan_list *psl;
 
@@ -863,7 +863,7 @@ static void spawnPeriodic(int ind)
     epicsEventWait(startStopEvent);
 }
 
-static void ioscanCallback(CALLBACK *pcallback)
+static void ioscanCallback(epicsCallback *pcallback)
 {
     ioscan_head *piosh = (ioscan_head *) pcallback->user;
     int prio = pcallback->priority;

src/ioc/db/test/callbackParallelTest.c

@@ -44,8 +44,8 @@
 #define TEST_DELAY(i) ((i / NUM_CALLBACK_PRIORITIES) * DELAY_QUANTUM)
 
 typedef struct myPvt {
-    CALLBACK cb1;
-    CALLBACK cb2;
+    epicsCallback cb1;
+    epicsCallback cb2;
     epicsTimeStamp pass1Time;
     epicsTimeStamp pass2Time;
     double delay;
@@ -55,7 +55,7 @@ typedef struct myPvt {
 
 epicsEventId finished;
 
-static void myCallback(CALLBACK *pCallback)
+static void myCallback(epicsCallback *pCallback)
 {
     myPvt *pmyPvt;
 
@@ -74,7 +74,7 @@ static void myCallback(CALLBACK *pCallback)
     }
 }
 
-static void finalCallback(CALLBACK *pCallback)
+static void finalCallback(epicsCallback *pCallback)
 {
     myCallback(pCallback);
     epicsEventSignal(finished);

src/ioc/db/test/callbackTest.c

@@ -44,8 +44,8 @@
 #define TEST_DELAY(i) ((i / NUM_CALLBACK_PRIORITIES) * DELAY_QUANTUM)
 
 typedef struct myPvt {
-    CALLBACK cb1;
-    CALLBACK cb2;
+    epicsCallback cb1;
+    epicsCallback cb2;
     epicsTimeStamp pass1Time;
     epicsTimeStamp pass2Time;
     double delay;
@@ -56,7 +56,7 @@ typedef struct myPvt {
 epicsEventId finished;
 
 
-static void myCallback(CALLBACK *pCallback)
+static void myCallback(epicsCallback *pCallback)
 {
     myPvt *pmyPvt;
 
@@ -75,7 +75,7 @@ static void myCallback(CALLBACK *pCallback)
     }
 }
 
-static void finalCallback(CALLBACK *pCallback)
+static void finalCallback(epicsCallback *pCallback)
 {
     myCallback(pCallback);
     epicsEventSignal(finished);

src/libCom/taskwd/taskwd.c

@@ -367,7 +367,7 @@ epicsShareFunc void taskwdShow(int level)
         mCount, tCount, fCount);
     if (level) {
         printf("%16.16s %9s %12s %12s %12s\n",
-            "THREAD NAME", "STATE", "EPICS TID", "CALLBACK", "USR ARG");
+            "THREAD NAME", "STATE", "EPICS TID", "epicsCallback", "USR ARG");
         pt = (struct tNode *)ellFirst(&tList);
         while (pt != NULL) {
             epicsThreadGetName(pt->tid, tName, sizeof(tName));

src/std/dev/asSubRecordFunctions.c

@@ -34,7 +34,7 @@
 /* The following is provided for access security*/
 /*It allows a CA client to force access security initialization*/
 
-static void myCallback(CALLBACK *pcallback)
+static void myCallback(epicsCallback *pcallback)
 {
     ASDBCALLBACK	*pasdbcallback = (ASDBCALLBACK *)pcallback;
     subRecord	*precord;

src/std/dev/devAiSoftCallback.c

@@ -36,7 +36,7 @@
 
 typedef struct devPvt {
     processNotify pn;
-    CALLBACK callback;
+    epicsCallback callback;
     long options;
     int status;
     int smooth;

src/std/dev/devBiSoftCallback.c

@@ -35,7 +35,7 @@
 
 typedef struct devPvt {
     processNotify pn;
-    CALLBACK callback;
+    epicsCallback callback;
     long options;
     int status;
     struct {

src/std/dev/devLiSoftCallback.c

@@ -35,7 +35,7 @@
 
 typedef struct devPvt {
     processNotify pn;
-    CALLBACK callback;
+    epicsCallback callback;
     long options;
     int status;
     struct {

src/std/dev/devMbbiDirectSoftCallback.c

@@ -35,7 +35,7 @@
 
 typedef struct devPvt {
     processNotify pn;
-    CALLBACK callback;
+    epicsCallback callback;
     long options;
     int status;
     struct {

src/std/dev/devMbbiSoftCallback.c

@@ -35,7 +35,7 @@
 
 typedef struct devPvt {
     processNotify pn;
-    CALLBACK callback;
+    epicsCallback callback;
     long options;
     int status;
     struct {

src/std/dev/devSiSoftCallback.c

@@ -37,7 +37,7 @@
 typedef struct devPvt {
     DBADDR dbaddr;
     processNotify pn;
-    CALLBACK callback;
+    epicsCallback callback;
     long options;
     int status;
     struct {

src/std/rec/boRecord.c

@@ -98,7 +98,7 @@ struct bodset { /* binary output dset */
 
 /* control block for callback*/
 typedef struct myCallback {
-        CALLBACK        callback;
+        epicsCallback        callback;
         struct dbCommon *precord;
 }myCallback;
 
@@ -106,7 +106,7 @@ static void checkAlarms(boRecord *);
 static void monitor(boRecord *);
 static long writeValue(boRecord *);
 
-static void myCallbackFunc(CALLBACK *arg)
+static void myCallbackFunc(epicsCallback *arg)
 {
     myCallback *pcallback;
     boRecord *prec;

src/std/rec/calcoutRecord.c

@@ -116,8 +116,8 @@ typedef struct calcoutDSET {
 #define CA_LINKS_NOT_OK 2
 
 typedef struct rpvtStruct {
-    CALLBACK doOutCb;
-    CALLBACK checkLinkCb;
+    epicsCallback doOutCb;
+    epicsCallback checkLinkCb;
     short    cbScheduled;
     short    caLinkStat; /* NO_CA_LINKS, CA_LINKS_ALL_OK, CA_LINKS_NOT_OK */
 } rpvtStruct;
@@ -127,7 +127,7 @@ static void monitor(calcoutRecord *prec);
 static int fetch_values(calcoutRecord *prec);
 static void execOutput(calcoutRecord *prec);
 static void checkLinks(calcoutRecord *prec);
-static void checkLinksCallback(CALLBACK *arg);
+static void checkLinksCallback(epicsCallback *arg);
 static long writeValue(calcoutRecord *prec);
 
 int    calcoutRecDebug;
@@ -673,7 +673,7 @@ static int fetch_values(calcoutRecord *prec)
         return(status);
 }
 
-static void checkLinksCallback(CALLBACK *arg)
+static void checkLinksCallback(epicsCallback *arg)
 {
 
     calcoutRecord *prec;
@@ -731,7 +731,7 @@ static void checkLinks(calcoutRecord *prec)
         prpvt->caLinkStat = NO_CA_LINKS;
 
     if (!prpvt->cbScheduled && caLinkNc) {
-        /* Schedule another CALLBACK */
+        /* Schedule another epicsCallback */
         prpvt->cbScheduled = 1;
         callbackRequestDelayed(&prpvt->checkLinkCb, .5);
     }

src/std/rec/histogramRecord.c

@@ -100,7 +100,7 @@ struct histogramdset { /* histogram input dset */
 
 /* control block for callback*/
 typedef struct myCallback {
-    CALLBACK callback;
+    epicsCallback callback;
     histogramRecord *prec;
 } myCallback;
 
@@ -110,7 +110,7 @@ static void monitor(histogramRecord *);
 static long readValue(histogramRecord *);
 
 
-static void wdogCallback(CALLBACK *arg)
+static void wdogCallback(epicsCallback *arg)
 {
     myCallback *pcallback;
     histogramRecord *prec;

src/std/rec/seqRecord.c

@@ -31,7 +31,7 @@
 
 static void processNextLink(seqRecord *prec);
 static long asyncFinish(seqRecord *prec);
-static void processCallback(CALLBACK *arg);
+static void processCallback(epicsCallback *arg);
 
 /* Create RSET - Record Support Entry Table*/
 #define report NULL
@@ -94,7 +94,7 @@ typedef struct linkGrp {
 
 /* The list of link-groups for processing */
 typedef struct seqRecPvt {
-    CALLBACK callback;
+    epicsCallback callback;
     seqRecord *prec;
     linkGrp *grps[NUM_LINKS + 1];   /* List of link-groups */
     int index;                      /* Where we are now */
@@ -241,7 +241,7 @@ static long asyncFinish(seqRecord *prec)
 }
 
 
-static void processCallback(CALLBACK *arg)
+static void processCallback(epicsCallback *arg)
 {
     seqRecPvt *pcb;
     seqRecord *prec;