diff --git a/src/ca/CASG.cpp b/src/ca/CASG.cpp index 75a42c74d..af3625a2d 100644 --- a/src/ca/CASG.cpp +++ b/src/ca/CASG.cpp @@ -30,7 +30,6 @@ #include "iocinf.h" #include "oldAccess.h" #include "autoPtrDestroy.h" -#include "oldChannelNotify_IL.h" tsFreeList < struct CASG, 128 > CASG::freeList; epicsMutex CASG::freeListMutex; diff --git a/src/ca/access.cpp b/src/ca/access.cpp index db8376a0f..2981f2b36 100644 --- a/src/ca/access.cpp +++ b/src/ca/access.cpp @@ -28,7 +28,6 @@ #include "cac_IL.h" #include "baseNMIU_IL.h" #include "autoPtrDestroy.h" -#include "oldChannelNotify_IL.h" epicsThreadPrivateId caClientContextId; diff --git a/src/ca/oldChannelNotify_IL.h b/src/ca/oldChannelNotify_IL.h deleted file mode 100644 index 8443a79a6..000000000 --- a/src/ca/oldChannelNotify_IL.h +++ /dev/null @@ -1,131 +0,0 @@ - -/* - * $Id$ - * - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, The Regents of the University of California. - * - * - * Author Jeffrey O. Hill - * johill@lanl.gov - * 505 665 1831 - */ - -#ifndef oldChannelNotifyILh -#define oldChannelNotifyILh - -inline bool oldChannelNotify::ioAttachOK () -{ - return &this->io ? true : false; -} - -inline void oldChannelNotify::destroy () -{ - delete this; -} - -inline const char *oldChannelNotify::pName () const -{ - return this->io.pName (); -} - -inline void oldChannelNotify::show ( unsigned level ) const -{ - this->io.show ( level ); -} - -inline void oldChannelNotify::initiateConnect () -{ - this->io.initiateConnect (); -} - -inline void oldChannelNotify::read ( unsigned type, unsigned long count, - cacDataNotify ¬ify, cacChannel::ioid *pId ) -{ - this->io.read ( type, count, notify, pId ); -} - -inline void oldChannelNotify::write ( unsigned type, - unsigned long count, const void *pValue ) -{ - this->io.write ( type, count, pValue ); -} - -inline void oldChannelNotify::write ( unsigned type, unsigned long count, - const void *pValue, cacNotify ¬ify, cacChannel::ioid *pId ) -{ - this->io.write ( type, count, pValue, notify, pId ); -} - -inline void oldChannelNotify::subscribe ( unsigned type, - unsigned long count, unsigned mask, cacDataNotify ¬ify, - cacChannel::ioid &idOut) -{ - this->io.subscribe ( type, count, mask, notify, &idOut ); -} - -inline void oldChannelNotify::ioCancel ( const cacChannel::ioid &id ) -{ - this->io.ioCancel ( id ); -} - -inline void oldChannelNotify::ioShow ( const cacChannel::ioid &id, unsigned level ) const -{ - this->io.ioShow ( id, level ); -} - -inline short oldChannelNotify::nativeType () const -{ - return this->io.nativeType (); -} - -inline unsigned long oldChannelNotify::nativeElementCount () const -{ - return this->io.nativeElementCount (); -} - -inline caAccessRights oldChannelNotify::accessRights () const -{ - return this->io.accessRights (); -} - -inline unsigned oldChannelNotify::searchAttempts () const -{ - return this->io.searchAttempts (); -} - -inline double oldChannelNotify::beaconPeriod () const -{ - return this->io.beaconPeriod (); -} - -inline bool oldChannelNotify::ca_v42_ok () const -{ - return this->io.ca_v42_ok (); -} - -inline bool oldChannelNotify::connected () const -{ - return this->io.connected (); -} - -inline bool oldChannelNotify::previouslyConnected () const -{ - return this->io.previouslyConnected (); -} - -inline void oldChannelNotify::hostName ( char *pBuf, unsigned bufLength ) const -{ - this->io.hostName ( pBuf, bufLength ); -} - -inline const char * oldChannelNotify::pHostName () const -{ - return this->io.pHostName (); -} - -#endif // ifndef oldChannelNotifyILh diff --git a/src/ca/oldSubscription.cpp b/src/ca/oldSubscription.cpp index 02e9eceda..b7d2656da 100644 --- a/src/ca/oldSubscription.cpp +++ b/src/ca/oldSubscription.cpp @@ -12,7 +12,6 @@ #include "iocinf.h" #include "oldAccess.h" -#include "oldChannelNotify_IL.h" tsFreeList < struct oldSubscription, 1024 > oldSubscription::freeList; epicsMutex oldSubscription::freeListMutex; diff --git a/src/ca/syncGroupNotify.cpp b/src/ca/syncGroupNotify.cpp index b18714f20..6d02bf8ed 100644 --- a/src/ca/syncGroupNotify.cpp +++ b/src/ca/syncGroupNotify.cpp @@ -30,7 +30,6 @@ #include "iocinf.h" #include "oldAccess.h" -#include "oldChannelNotify_IL.h" syncGroupNotify::syncGroupNotify ( CASG &sgIn, chid chanIn ) : chan ( chanIn ), sg ( sgIn ), diff --git a/src/ca/syncGroupReadNotify.cpp b/src/ca/syncGroupReadNotify.cpp index 9a404cb60..4dfb1d853 100644 --- a/src/ca/syncGroupReadNotify.cpp +++ b/src/ca/syncGroupReadNotify.cpp @@ -30,7 +30,6 @@ #include "iocinf.h" #include "oldAccess.h" -#include "oldChannelNotify_IL.h" syncGroupReadNotify::syncGroupReadNotify ( CASG &sgIn, chid pChan, unsigned type, unsigned long count, void *pValueIn ) : diff --git a/src/ca/syncGroupWriteNotify.cpp b/src/ca/syncGroupWriteNotify.cpp index 4eefa4db6..26d9c4a7c 100644 --- a/src/ca/syncGroupWriteNotify.cpp +++ b/src/ca/syncGroupWriteNotify.cpp @@ -30,7 +30,6 @@ #include "iocinf.h" #include "oldAccess.h" -#include "oldChannelNotify_IL.h" syncGroupWriteNotify::syncGroupWriteNotify ( CASG &sgIn, chid pChan, unsigned type, unsigned long count, const void *pValueIn ) :