Compare commits

..

4 Commits

Author SHA1 Message Date
d0b8d3f585 problems with 3.13 solved 2012-11-20 10:51:40 +00:00
97652917c9 Can't poll GPIB. 2012-11-08 09:27:21 +00:00
c171a62f93 Fixes for 3.15 2012-11-08 09:26:57 +00:00
c7c28e7fa2 compiler warning removed 2012-10-08 12:32:44 +00:00
6 changed files with 11 additions and 8 deletions

View File

@ -618,9 +618,12 @@ writeHandler()
asynStatus status; asynStatus status;
size_t written = 0; size_t written = 0;
pasynUser->timeout = 0;
if (pasynGpib)
pasynOctet->flush(pvtOctet, pasynUser);
else
// discard any early input, but forward it to potential async records // discard any early input, but forward it to potential async records
// thus do not use pasynOctet->flush() // thus do not use pasynOctet->flush()
pasynUser->timeout = 0;
do { do {
char buffer [256]; char buffer [256];
size_t received = sizeof(buffer); size_t received = sizeof(buffer);

View File

@ -66,7 +66,7 @@ find(Client* client, const char* busname, int addr, const char* param)
{ {
StreamBusInterfaceRegistrarBase* r; StreamBusInterfaceRegistrarBase* r;
StreamBusInterface* bus; StreamBusInterface* bus;
for (r = r->first; r; r = r->next) for (r = StreamBusInterfaceRegistrarBase::first; r; r = r->next)
{ {
bus = r->find(client, busname, addr, param); bus = r->find(client, busname, addr, param);
if (bus) return bus; if (bus) return bus;

View File

@ -31,6 +31,7 @@
extern "C" { extern "C" {
#endif #endif
#define epicsAlarmGLOBAL
#include <ctype.h> #include <ctype.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>
@ -39,7 +40,6 @@ extern "C" {
#include <recSup.h> #include <recSup.h>
#include <recGbl.h> #include <recGbl.h>
#include <devLib.h> #include <devLib.h>
#define epicsAlarmGLOBAL
#include <alarm.h> #include <alarm.h>
#include <callback.h> #include <callback.h>

View File

@ -1037,7 +1037,7 @@ compileNumber(unsigned long& number, const char*& source, unsigned long max)
"Garbage after numeric value: %s\n", buffer()); "Garbage after numeric value: %s\n", buffer());
return false; return false;
} }
if (n < 0 || n > max) if (n > max)
{ {
debug("StreamProtocolParser::Protocol::compileNumber: %s\n", debug("StreamProtocolParser::Protocol::compileNumber: %s\n",
buffer.expand()()); buffer.expand()());

View File

@ -41,7 +41,7 @@
#define INIT_RUN (!interruptAccept) #define INIT_RUN (!interruptAccept)
#include <epicsVersion.h> #include <epicsVersion.h>
#ifdef BASE_RELEASE #ifdef BASE_VERSION
#define EPICS_3_13 #define EPICS_3_13
#endif #endif

View File

@ -31,8 +31,8 @@ PROD_LIBS = stream
ifdef ASYN ifdef ASYN
# edit asynRegistrars.dbd if necessary # edit asynRegistrars.dbd if necessary
streamApp_DBD += asynRegistrars.dbd streamApp_DBD += asynRegistrars.dbd
# add asyn.dbd if you want to have asyn Record and asyn device supports # add asynRecord.dbd if you like
# streamApp_DBD += asyn.dbd streamApp_DBD += asynRecord.dbd
PROD_LIBS += asyn PROD_LIBS += asyn
endif endif
@ -66,7 +66,7 @@ CPPFLAGS += -DDEBUGFILE=StreamDebug.log
include $(TOP)/configure/RULES include $(TOP)/configure/RULES
ifeq ($(EPICS_REVISION),14) ifeq ($(BASE_3_14), YES)
clean:: myclean clean:: myclean
else else
clean: myclean clean: myclean