Compare commits
4 Commits
Release-2-
...
stream_2_6
Author | SHA1 | Date | |
---|---|---|---|
d0b8d3f585 | |||
97652917c9 | |||
c171a62f93 | |||
c7c28e7fa2 |
@ -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);
|
||||||
|
@ -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;
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
@ -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()());
|
||||||
|
@ -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
|
||||||
|
|
||||||
|
@ -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
|
||||||
|
Reference in New Issue
Block a user