EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

stay at version 2.6

Browse Source
This commit is contained in:
zimoch
2013-09-20 09:52:43 +00:00
parent 2f39622a57
commit 5f6319ed3d
2 changed files with 13 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/StreamBusInterface.h
View File

@ -52,62 +52,42 @@ public:
protected: protected:
StreamBusInterface* businterface; StreamBusInterface* businterface;
bool busSupportsEvent() { bool busSupportsEvent() {
if (businterface) return businterface && businterface->supportsEvent();
return businterface->supportsEvent();
else return false;
} }
bool busSupportsAsyncRead() { bool busSupportsAsyncRead() {
if (businterface) return businterface && businterface->supportsAsyncRead();
return businterface->supportsAsyncRead();
else return false;
} }
bool busAcceptEvent(unsigned long mask, bool busAcceptEvent(unsigned long mask,
unsigned long replytimeout_ms) { unsigned long replytimeout_ms) {
if (businterface) return businterface && businterface->acceptEvent(mask, replytimeout_ms);
return businterface->acceptEvent(mask, replytimeout_ms);
else return false;
} }
void busRelease() { void busRelease() {
if (businterface) if (businterface) businterface->release();
businterface->release();
} }
bool busLockRequest(unsigned long timeout_ms) { bool busLockRequest(unsigned long timeout_ms) {
if (businterface) return businterface && businterface->lockRequest(timeout_ms);
return businterface->lockRequest(timeout_ms);
else return false;
} }
bool busUnlock() { bool busUnlock() {
if (businterface) return businterface && businterface->unlock();
return businterface->unlock();
else return false;
} }
bool busWriteRequest(const void* output, size_t size, bool busWriteRequest(const void* output, size_t size,
unsigned long timeout_ms) { unsigned long timeout_ms) {
if (businterface) return businterface && businterface->writeRequest(output, size, timeout_ms);
return businterface->writeRequest(output, size, timeout_ms);
else return false;
} }
bool busReadRequest(unsigned long replytimeout_ms, bool busReadRequest(unsigned long replytimeout_ms,
unsigned long readtimeout_ms, long expectedLength, unsigned long readtimeout_ms, long expectedLength,
bool async) { bool async) {
if (businterface) return businterface && businterface->readRequest(replytimeout_ms,
return businterface->readRequest(replytimeout_ms,
readtimeout_ms, expectedLength, async); readtimeout_ms, expectedLength, async);
else return false;
} }
void busFinish() { void busFinish() {
if (businterface) if (businterface) businterface->finish();
businterface->finish();
} }
bool busConnectRequest(unsigned long timeout_ms) { bool busConnectRequest(unsigned long timeout_ms) {
if (businterface) return businterface && businterface->connectRequest(timeout_ms);
return businterface->connectRequest(timeout_ms);
else return false;
} }
bool busDisconnect() { bool busDisconnect() {
if (businterface) return businterface && businterface->disconnectRequest();
return businterface->disconnectRequest();
else return false;
} }
}; };

4
src/devStream.h
View File

@ -22,8 +22,8 @@
#define devStream_h #define devStream_h
#define STREAM_MAJOR 2 #define STREAM_MAJOR 2
#define STREAM_MINOR 7 #define STREAM_MINOR 6
#define STREAM_PATCHLEVEL 0 #define STREAM_PATCHLEVEL 3
#if defined(__vxworks) || defined(vxWorks) #if defined(__vxworks) || defined(vxWorks)
#include <vxWorks.h> #include <vxWorks.h>