Compare commits
6 Commits
stream_2_5
...
stream_2_6
Author | SHA1 | Date | |
---|---|---|---|
97652917c9 | |||
c171a62f93 | |||
c7c28e7fa2 | |||
79a17788f2 | |||
9f0a2d2fb6 | |||
66f6ce9bd2 |
@ -88,11 +88,11 @@ many process variables distributed over many records.
|
||||
|
||||
<h2>Recommended Readings</h2>
|
||||
<p>
|
||||
<a href="http://www.aps.anl.gov/epics/base/R3-14/8-docs/AppDevGuide.pdf"
|
||||
target="ex">IOC Application Developer's Guide (PDF)</a>
|
||||
<a href="http://www.aps.anl.gov/epics/base/R3-14/12-docs/AppDevGuide"
|
||||
target="ex">IOC Application Developer's Guide</a>
|
||||
</p>
|
||||
<p>
|
||||
<a href="http://www.aps.anl.gov/asd/controls/epics/EpicsDocumentation/AppDevManuals/RecordRef/Recordref-1.html"
|
||||
<a href="https://wiki-ext.aps.anl.gov/epics/index.php/RRM_3-14"
|
||||
target="ex">EPICS Record Reference Manual</a>
|
||||
</p>
|
||||
|
||||
|
@ -618,9 +618,12 @@ writeHandler()
|
||||
asynStatus status;
|
||||
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
|
||||
// thus do not use pasynOctet->flush()
|
||||
pasynUser->timeout = 0;
|
||||
do {
|
||||
char buffer [256];
|
||||
size_t received = sizeof(buffer);
|
||||
|
@ -66,7 +66,7 @@ find(Client* client, const char* busname, int addr, const char* param)
|
||||
{
|
||||
StreamBusInterfaceRegistrarBase* r;
|
||||
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);
|
||||
if (bus) return bus;
|
||||
|
@ -1037,7 +1037,7 @@ compileNumber(unsigned long& number, const char*& source, unsigned long max)
|
||||
"Garbage after numeric value: %s\n", buffer());
|
||||
return false;
|
||||
}
|
||||
if (n < 0 || n > max)
|
||||
if (n > max)
|
||||
{
|
||||
debug("StreamProtocolParser::Protocol::compileNumber: %s\n",
|
||||
buffer.expand()());
|
||||
|
@ -22,8 +22,8 @@
|
||||
#define devStream_h
|
||||
|
||||
#define STREAM_MAJOR 2
|
||||
#define STREAM_MINOR 5
|
||||
#define STREAM_PATCHLEVEL 12
|
||||
#define STREAM_MINOR 6
|
||||
#define STREAM_PATCHLEVEL 0
|
||||
|
||||
#if defined(__vxworks) || defined(vxWorks)
|
||||
#include <vxWorks.h>
|
||||
|
@ -31,8 +31,8 @@ PROD_LIBS = stream
|
||||
ifdef ASYN
|
||||
# edit asynRegistrars.dbd if necessary
|
||||
streamApp_DBD += asynRegistrars.dbd
|
||||
# add asyn.dbd if you want to have asyn Record and asyn device supports
|
||||
# streamApp_DBD += asyn.dbd
|
||||
# add asynRecord.dbd if you like
|
||||
streamApp_DBD += asynRecord.dbd
|
||||
PROD_LIBS += asyn
|
||||
endif
|
||||
|
||||
@ -66,7 +66,7 @@ CPPFLAGS += -DDEBUGFILE=StreamDebug.log
|
||||
|
||||
include $(TOP)/configure/RULES
|
||||
|
||||
ifeq ($(EPICS_REVISION),14)
|
||||
ifeq ($(BASE_3_14), YES)
|
||||
clean:: myclean
|
||||
else
|
||||
clean: myclean
|
||||
|
Reference in New Issue
Block a user