Compare commits

..

3 Commits

Author SHA1 Message Date
eaba256c51 generate 3.14 dbd file 2008-01-16 10:28:09 +00:00
7eab96120f don't return DO_NOT_CONVERT (2) from initRecord 2008-01-15 15:05:55 +00:00
50f69a76f4 bugfix 2008-01-09 08:44:40 +00:00
14 changed files with 35 additions and 12 deletions

View File

@ -47,8 +47,18 @@ streamReferences:
echo "void* p$$i = ref_$${i}Converter;"; \
done >> $@
ifeq (${EPICS_BASETYPE},3.13)
stream.dbd:
@for r in $(RECORDTYPES); \
do echo "device($$r,INST_IO,dev$${r}Stream,\"stream\")"; \
done > $@
@echo "driver(stream)" >> $@
else
stream.dbd:
@for r in $(RECORDTYPES); \
do echo "device($$r,INST_IO,dev$${r}Stream,\"stream\")"; \
done > $@
@echo "driver(stream)" >> $@
@echo "variable(streamDebug, int)" >> $@
@echo "registrar(streamRegistrar)" >> $@
endif

View File

@ -194,6 +194,7 @@ replace(long remstart, long remlen, const void* ins, long inslen)
{
// optimize remove of bufferstart
offs += remlen;
len -= remlen;
return *this;
}
if (inslen < 0) inslen = 0;

View File

@ -280,7 +280,8 @@ static long initRecord (dbCommon *record)
record->name);
return ERROR;
}
return streamInitRecord (record, &aai->inp, readData, writeData);
return streamInitRecord (record, &aai->inp, readData, writeData) == ERROR ?
ERROR : OK;
}
struct {

View File

@ -280,7 +280,8 @@ static long initRecord (dbCommon *record)
record->name);
return ERROR;
}
return streamInitRecord (record, &aao->out, readData, writeData);
return streamInitRecord (record, &aao->out, readData, writeData) == ERROR ?
ERROR : OK;
}
struct {

View File

@ -74,7 +74,8 @@ static long initRecord (dbCommon *record)
{
aiRecord *ai = (aiRecord *) record;
return streamInitRecord (record, &ai->inp, readData, writeData);
return streamInitRecord (record, &ai->inp, readData, writeData) == ERROR ?
ERROR : OK;
}
struct {

View File

@ -90,7 +90,8 @@ static long initRecord (dbCommon *record)
{
biRecord *bi = (biRecord *) record;
return streamInitRecord (record, &bi->inp, readData, writeData);
return streamInitRecord (record, &bi->inp, readData, writeData) == ERROR ?
ERROR : OK;
}
struct {

View File

@ -68,7 +68,8 @@ static long initRecord (dbCommon *record)
{
calcoutRecord *co = (calcoutRecord *) record;
return streamInitRecord (record, &co->out, readData, writeData);
return streamInitRecord (record, &co->out, readData, writeData) == ERROR ?
ERROR : OK;
}
struct {

View File

@ -48,7 +48,8 @@ static long initRecord (dbCommon *record)
{
longinRecord *li = (longinRecord *) record;
return streamInitRecord (record, &li->inp, readData, writeData);
return streamInitRecord (record, &li->inp, readData, writeData) == ERROR ?
ERROR : OK;
}
struct {

View File

@ -49,7 +49,8 @@ static long initRecord (dbCommon *record)
{
longoutRecord *lo = (longoutRecord *) record;
return streamInitRecord (record, &lo->out, readData, writeData);
return streamInitRecord (record, &lo->out, readData, writeData) == ERROR ?
ERROR : OK;
}
struct {

View File

@ -66,7 +66,8 @@ static long initRecord (dbCommon *record)
mbbiDirectRecord *mbbiD = (mbbiDirectRecord *) record;
mbbiD->mask <<= mbbiD->shft;
return streamInitRecord (record, &mbbiD->inp, readData, writeData);
return streamInitRecord (record, &mbbiD->inp, readData, writeData) == ERROR ?
ERROR : OK;
}
struct {

View File

@ -114,7 +114,8 @@ static long initRecord (dbCommon *record)
mbbiRecord *mbbi = (mbbiRecord *) record;
mbbi->mask <<= mbbi->shft;
return streamInitRecord (record, &mbbi->inp, readData, writeData);
return streamInitRecord (record, &mbbi->inp, readData, writeData) == ERROR ?
ERROR : OK;
}
struct {

View File

@ -48,7 +48,8 @@ static long initRecord (dbCommon *record)
{
stringinRecord *si = (stringinRecord *) record;
return streamInitRecord (record, &si->inp, readData, writeData);
return streamInitRecord (record, &si->inp, readData, writeData) == ERROR ?
ERROR : OK;
}
struct {

View File

@ -48,7 +48,8 @@ static long initRecord (dbCommon *record)
{
stringoutRecord *so = (stringoutRecord *) record;
return streamInitRecord (record, &so->out, readData, writeData);
return streamInitRecord (record, &so->out, readData, writeData) == ERROR ?
ERROR : OK;
}
struct {

View File

@ -271,7 +271,8 @@ static long initRecord (dbCommon *record)
{
waveformRecord *wf = (waveformRecord *) record;
return streamInitRecord (record, &wf->inp, readData, writeData);
return streamInitRecord (record, &wf->inp, readData, writeData) == ERROR ?
ERROR : OK;
}
struct {