Compare commits

...

6 Commits

Author SHA1 Message Date
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
79a17788f2 application developper's guide link updated 2012-09-13 13:00:06 +00:00
9f0a2d2fb6 record reference manual link updated 2012-09-13 12:23:10 +00:00
66f6ce9bd2 version release 2012-09-13 11:47:28 +00:00
6 changed files with 14 additions and 11 deletions

View File

@ -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>

View File

@ -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);

View File

@ -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;

View File

@ -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()());

View File

@ -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>

View File

@ -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