diff --git a/src/ca/baseNMIU_IL.h b/src/ca/baseNMIU_IL.h deleted file mode 100644 index c63deddcd..000000000 --- a/src/ca/baseNMIU_IL.h +++ /dev/null @@ -1,31 +0,0 @@ - -/* - * $Id$ - * - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * - * - * Author Jeffrey O. Hill - * johill@lanl.gov - * 505 665 1831 - */ - -#ifndef baseNMIU_ILh -#define baseNMIU_ILh - -inline ca_uint32_t baseNMIU::getID () const -{ - return this->id; -} - -inline nciu & baseNMIU::channel () const -{ - return this->chan; -} - -#endif // baseNMIU diff --git a/src/ca/cacNotify.cpp b/src/ca/cacNotify.cpp new file mode 100644 index 000000000..697d6405e --- /dev/null +++ b/src/ca/cacNotify.cpp @@ -0,0 +1,25 @@ + +/* $Id$ + * + * L O S A L A M O S + * Los Alamos National Laboratory + * Los Alamos, New Mexico 87545 + * + * Copyright, 1986, The Regents of the University of California. + * + * Author: Jeff Hill + */ + +#include + +#include "iocinf.h" + +#define epicsExportSharedSymbols +#include "cacIO.h" +#undef epicsExportSharedSymbols + +cacNotify::~cacNotify () +{ +} + + diff --git a/src/ca/cac_IL.h b/src/ca/cac_IL.h deleted file mode 100644 index bdd29bcb4..000000000 --- a/src/ca/cac_IL.h +++ /dev/null @@ -1,75 +0,0 @@ - -/* - * $Id$ - * - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * - * - * Author Jeffrey O. Hill - * johill@lanl.gov - * 505 665 1831 - */ - -#ifndef cac_ILh -#define cac_ILh - -#include "recvProcessThread_IL.h" -#include "udpiiu_IL.h" - -inline int cac::vPrintf ( const char *pformat, va_list args ) -{ - if ( this ) { - return ( *this->pVPrintfFunc ) ( pformat, args ); - } - else { - return vfprintf ( stderr, pformat, args ); - } -} - -inline const char * cac::userNamePointer () const -{ - return this->pUserName; -} - -inline void cac::ipAddrToAsciiAsynchronousRequestInstall ( ipAddrToAsciiAsynchronous & request ) -{ - request.ioInitiate ( this->ipToAEngine ); -} - -inline unsigned cac::getInitializingThreadsPriority () const -{ - return this->initializingThreadsPriority; -} - -inline void cac::incrementOutstandingIO () -{ - this->ioCounter.increment (); -} - -inline void cac::decrementOutstandingIO () -{ - this->ioCounter.decrement (); -} - -inline void cac::decrementOutstandingIO ( unsigned sequenceNo ) -{ - this->ioCounter.decrement ( sequenceNo ); -} - -inline unsigned cac::sequenceNumberOfOutstandingIO () const -{ - return this->ioCounter.sequenceNumber (); -} - -inline epicsMutex & cac::mutexRef () -{ - return this->mutex; -} - -#endif // cac_ILh - diff --git a/src/ca/netWriteNotifyIO_IL.h b/src/ca/netWriteNotifyIO_IL.h deleted file mode 100644 index 239171643..000000000 --- a/src/ca/netWriteNotifyIO_IL.h +++ /dev/null @@ -1,42 +0,0 @@ - -/* - * $Id$ - * - * - * L O S A L A M O S - * Los Alamos National Laboratory - * Los Alamos, New Mexico 87545 - * - * Copyright, 1986, The Regents of the University of California. - * - * - * Author Jeffrey O. Hill - * johill@lanl.gov - * 505 665 1831 - */ - -inline netWriteNotifyIO * netWriteNotifyIO::factory ( - tsFreeList < class netWriteNotifyIO, 1024 > &freeList, - nciu &chan, cacNotify ¬ify ) -{ - return new ( freeList ) netWriteNotifyIO ( chan, notify ); -} - -inline void * netWriteNotifyIO::operator new ( size_t size, - tsFreeList < class netWriteNotifyIO, 1024 > &freeList ) -{ - return freeList.allocate ( size ); -} - -// NOTE: The constructor for netWriteNotifyIO::netWriteNotifyIO() currently does -// not throw an exception, but we should eventually have placement delete -// defined for class netWriteNotifyIO when compilers support this so that -// there is no possibility of a leak if there was an exception in -// a future version of netWriteNotifyIO::netWriteNotifyIO() -#if ! defined ( NO_PLACEMENT_DELETE ) -inline void netWriteNotifyIO::operator delete ( void *pCadaver, size_t size, - tsFreeList < class netWriteNotifyIO, 1024 > &freeList ) -{ - freeList.release ( pCadaver, size ); -} -#endif