osiInterrupt is now epicsInterrupt
This commit is contained in:
+3
-3
@@ -20,7 +20,7 @@ of this distribution.
|
||||
#include "dbDefs.h"
|
||||
#include "epicsEvent.h"
|
||||
#include "epicsThread.h"
|
||||
#include "osiInterrupt.h"
|
||||
#include "epicsInterrupt.h"
|
||||
#include "osiTimer.h"
|
||||
#include "epicsRingPointer.h"
|
||||
#include "tsStamp.h"
|
||||
@@ -100,9 +100,9 @@ void epicsShareAPI callbackRequest(CALLBACK *pcallback)
|
||||
return;
|
||||
}
|
||||
if(ringOverflow[priority]) return;
|
||||
lockKey = interruptLock();
|
||||
lockKey = epicsInterruptLock();
|
||||
pushOK = epicsRingPointerPush(callbackQ[priority],(void *)pcallback);
|
||||
interruptUnlock(lockKey);
|
||||
epicsInterruptUnlock(lockKey);
|
||||
if(!pushOK) {
|
||||
epicsPrintf("callbackRequest ring buffer full\n");
|
||||
ringOverflow[priority] = TRUE;
|
||||
|
||||
+3
-3
@@ -54,7 +54,7 @@
|
||||
#include "taskwd.h"
|
||||
#include "epicsMutex.h"
|
||||
#include "epicsEvent.h"
|
||||
#include "osiInterrupt.h"
|
||||
#include "epicsInterrupt.h"
|
||||
#include "epicsThread.h"
|
||||
#include "tsStamp.h"
|
||||
#include "cantProceed.h"
|
||||
@@ -445,9 +445,9 @@ void epicsShareAPI scanOnce(void *precord)
|
||||
int lockKey;
|
||||
int pushOK;
|
||||
|
||||
lockKey = interruptLock();
|
||||
lockKey = epicsInterruptLock();
|
||||
pushOK = epicsRingPointerPush(onceQ,precord);
|
||||
interruptUnlock(lockKey);
|
||||
epicsInterruptUnlock(lockKey);
|
||||
if(!pushOK) {
|
||||
if(newOverflow)errMessage(0,"rngBufPut overflow in scanOnce");
|
||||
newOverflow = FALSE;
|
||||
|
||||
Reference in New Issue
Block a user