Compare commits

...

2 Commits
2.8.7 ... 2.8.8

2 changed files with 4 additions and 10 deletions

View File

@ -11,12 +11,8 @@ DOCUDIR = docs
PCRE=1 PCRE=1
ASYN=1 ASYN=1
ifdef EPICSVERSION -include ../src/CONFIG_STREAM
ifndef RECORDTYPES -include src/CONFIG_STREAM
include src/CONFIG_STREAM
export RECORDTYPES BUSSES FORMATS
endif
endif
SOURCES += $(RECORDTYPES:%=src/dev%Stream.c) SOURCES += $(RECORDTYPES:%=src/dev%Stream.c)
SOURCES += $(FORMATS:%=src/%Converter.cc) SOURCES += $(FORMATS:%=src/%Converter.cc)

View File

@ -919,14 +919,12 @@ evalIn()
busUnlock(); busUnlock();
flags &= ~BusOwner; flags &= ~BusOwner;
} }
busReadRequest(pollPeriod, readTimeout, return busReadRequest(pollPeriod, readTimeout,
expectedInput, true); expectedInput, true);
return true;
} }
busReadRequest(replyTimeout, readTimeout, return busReadRequest(replyTimeout, readTimeout,
expectedInput, false); expectedInput, false);
// continue with readCallback() in another thread // continue with readCallback() in another thread
return true;
} }
ssize_t StreamCore:: ssize_t StreamCore::