epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Merge branch 'master' into link

Browse Source 
* master: (226 commits)
  ioc/db: testdbGetFieldEqual() detect zero size
  Cleanup in asLib
  Allow whitespace before comments in AS config files
  Supress MS warning C4251
  Add a plan to std/filters/test/syncTest.c
  Fix dbUnitTest.c
  avoid void* +=
  Fix and test for macLib losing error status
  update notes
  libCom/test: ipAddrToAsciiTest skip cleanup unless valgrind is possible
  libCom/test: add ipAddrToAsciiTest to testHarness
  db/test: dbPutGetTest check dbGet() of long string field
  db: dbGet() ensure long string nil and actual string length
  db/test: dbPutGetTest check for dbGet() attribute crash
  db: fix dbGet() for attributes as long string
  db/test: dbPutGetTest add test for lp:1678494
  db: fix dbGet() of link fields as DBF_CHAR
  dbUnitTest: add testdbGetArrFieldEqual()
  db/test: add dbPutGetTest
  Update release notes as per Michael's review comment
  ...

Conflicts:
	src/ioc/db/dbLink.c
	src/ioc/db/test/Makefile
	src/std/dev/devSoSoftCallback.c
	src/std/rec/boRecord.c
	src/std/rec/dfanoutRecord.c
	src/std/rec/longinRecord.c
	src/std/rec/longoutRecord.c
This commit is contained in:
Michael Davidsaver
2017-04-21 17:20:12 -04:00
parent 54e94a1e12 6c062981fb
commit 066984e11d
917 changed files with 5634 additions and 6246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/std/dev/Makefile
+1
View File
@@ -66,6 +66,7 @@ dbRecStd_SRCS += devSoSoftCallback.c
dbRecStd_SRCS += devTimestamp.c
dbRecStd_SRCS += devStdio.c
dbRecStd_SRCS += devEnviron.c
dbRecStd_SRCS += asSubRecordFunctions.c
src/std/dev/asSubRecordFunctions.c
+2 -2
View File
@@ -38,10 +38,10 @@ static void myCallback(CALLBACK *pcallback)
{
ASDBCALLBACK *pasdbcallback = (ASDBCALLBACK *)pcallback;
subRecord *precord;
struct rset *prset;
rset *prset;
callbackGetUser(precord,pcallback);
prset=(struct rset *)(precord->rset);
prset=(rset *)(precord->rset);
precord->val = 0.0;
if(pasdbcallback->status) {
recGblSetSevr(precord,READ_ALARM,precord->brsv);
src/std/dev/devAaiSoft.c
+1 -1
View File
@@ -7,7 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
/*
* devAaiSoft.c - Device Support Routines for soft Waveform Records
*
* Original Author: Bob Dalesio
src/std/dev/devAaoSoft.c
+1 -1
View File
@@ -7,7 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
/*
* devAaoSoft.c - Device Support Routines for soft Waveform Records
*
* Original Author: Bob Dalesio
src/std/dev/devAiSoft.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Original Authors: Bob Dalesio and Marty Kraimer
* Date: 3/6/91
*/
src/std/dev/devAiSoftRaw.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Original Authors: Bob Dalesio and Marty Kraimer
* Date: 6-1-90
*/
src/std/dev/devAoSoft.c
-1
View File
@@ -8,7 +8,6 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* devAoSoft.c */
/* base/src/dev $Revision-Id$ */
/* Device Support Routines for soft Analog Output Records*/
/*
src/std/dev/devAoSoftRaw.c
-1
View File
@@ -8,7 +8,6 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* devAoSoftRaw.c */
/* base/src/dev $Revision-Id$ */
/* Device Support Routines for soft raw Analog Output Records*/
/*
src/std/dev/devBiSoft.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Original Authors: Bob Dalesio and Marty Kraimer
* Date: 6-1-90
*/
src/std/dev/devBiSoftRaw.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Original Authors: Bob Dalesio and Marty Kraimer
* Date: 6-1-90
*/
src/std/dev/devBoSoft.c
-2
View File
@@ -7,8 +7,6 @@
* and higher are distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* devBoSoft.c */
/* base/src/dev $Revision-Id$ */
/* devBoSoft.c - Device Support Routines for Soft Binary Output*/
/*
src/std/dev/devBoSoftRaw.c
-2
View File
@@ -7,8 +7,6 @@
* and higher are distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* devBoSoftRaw.c */
/* base/src/dev $Revision-Id$ */
/* devBoSoftRaw.c - Device Support Routines for SoftRaw Binary Output*/
/*
src/std/dev/devEnviron.c
+128
View File
@@ -0,0 +1,128 @@
/*************************************************************************\
* Copyright (c) 2016 UChicago Argonne LLC, as Operator of Argonne
* National Laboratory.
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* devEnviron.c */
#include <stdlib.h>
#include <string.h>
#include "alarm.h"
#include "dbCommon.h"
#include "devSup.h"
#include "errlog.h"
#include "recGbl.h"
#include "recSup.h"
#include "lsiRecord.h"
#include "stringinRecord.h"
#include "epicsExport.h"
/* lsi device support */
static long add_lsi(dbCommon *pcommon) {
lsiRecord *prec = (lsiRecord *) pcommon;
if (prec->inp.type != INST_IO)
return S_dev_badInpType;
return 0;
}
static long del_lsi(dbCommon *pcommon) {
return 0;
}
static struct dsxt dsxtLsiEnviron = {
add_lsi, del_lsi
};
static long init_lsi(int pass)
{
if (pass == 0)
devExtend(&dsxtLsiEnviron);
return 0;
}
static long read_lsi(lsiRecord *prec)
{
const char *val = getenv(prec->inp.value.instio.string);
if (val) {
strncpy(prec->val, val, prec->sizv);
prec->val[prec->sizv - 1] = 0;
prec->len = strlen(prec->val);
prec->udf = FALSE;
}
else {
prec->val[0] = 0;
prec->len = 1;
prec->udf = TRUE;
recGblSetSevr(prec, UDF_ALARM, prec->udfs);
}
return 0;
}
lsidset devLsiEnviron = {
5, NULL, init_lsi, NULL, NULL, read_lsi
};
epicsExportAddress(dset, devLsiEnviron);
/* stringin device support */
static long add_stringin(dbCommon *pcommon) {
stringinRecord *prec = (stringinRecord *) pcommon;
if (prec->inp.type != INST_IO)
return S_dev_badInpType;
return 0;
}
static long del_stringin(dbCommon *pcommon) {
return 0;
}
static struct dsxt dsxtSiEnviron = {
add_stringin, del_stringin
};
static long init_stringin(int pass)
{
if (pass == 0)
devExtend(&dsxtSiEnviron);
return 0;
}
static long read_stringin(stringinRecord *prec)
{
const char *val = getenv(prec->inp.value.instio.string);
if (val) {
strncpy(prec->val, val, MAX_STRING_SIZE);
prec->val[MAX_STRING_SIZE - 1] = 0;
prec->udf = FALSE;
}
else {
prec->val[0] = 0;
prec->udf = TRUE;
recGblSetSevr(prec, UDF_ALARM, prec->udfs);
}
return 0;
}
static struct {
dset common;
DEVSUPFUN read;
} devSiEnviron = {
{5, NULL, init_stringin, NULL, NULL}, read_stringin
};
epicsExportAddress(dset, devSiEnviron);
src/std/dev/devEventSoft.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Author: Janet Anderson
* Date: 04-21-91
*/
src/std/dev/devGeneralTime.c
-1
View File
@@ -3,7 +3,6 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$ */
/*
* Original Author: Sheng Peng, ORNL / SNS Project
* Date: 07/2004
src/std/dev/devHistogramSoft.c
-1
View File
@@ -8,7 +8,6 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* devHistogramSoft.c */
/* base/src/dev $Revision-Id$ */
/*
* Author: Janet Anderson
* Date: 07/02/91
src/std/dev/devLiSoft.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Author: Janet Anderson
* Date: 09-23-91
*/
src/std/dev/devLoSoft.c
-1
View File
@@ -8,7 +8,6 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* devLoSoft.c */
/* base/src/dev $Revision-Id$ */
/*
* Author: Janet Anderson
* Date: 09-23-91
src/std/dev/devLsoSoftCallback.c
-1
View File
@@ -4,7 +4,6 @@
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$ */
/*
* Author: Andrew Johnson
* Date: 30 Nov 2012
src/std/dev/devMbbiDirectSoft.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Original Authors: Bob Dalesio and Matthew Needes
* Date: 10-08-93
*/
src/std/dev/devMbbiDirectSoftRaw.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Original Authors: Bob Dalesio and Matthew Needes
* Date: 10-08-93
*/
src/std/dev/devMbbiSoft.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Original Authors: Bob Dalesio and Marty Kraimer
* Date: 6-1-90
*/
src/std/dev/devMbbiSoftRaw.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Original Authors: Bob Dalesio and Marty Kraimer
* Date: 6-1-90
*/
src/std/dev/devMbboSoft.c
-1
View File
@@ -8,7 +8,6 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* devMbboSoft.c */
/* base/src/dev $Revision-Id$ */
/*
* Original Author: Bob Dalesio
* Current Author: Marty Kraimer
src/std/dev/devPrintfSoft.c
-1
View File
@@ -4,7 +4,6 @@
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$ */
/*
* Author: Andrew Johnson
* Date: 28 Sept 2012
src/std/dev/devPrintfSoftCallback.c
-1
View File
@@ -4,7 +4,6 @@
* EPICS BASE is distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$ */
/*
* Author: Andrew Johnson
* Date: 28 Sept 2012
src/std/dev/devSASoft.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Author: Carl Lionberger
* Date: 9-2-93
*/
src/std/dev/devSiSoft.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Author: Janet Anderson
* Date: 04-21-91
*/
src/std/dev/devSoSoft.c
-1
View File
@@ -7,7 +7,6 @@
* and higher are distributed subject to a Software License Agreement found
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$ */
/*
* Author: Janet Anderson
* Date: 21APR1991
src/std/dev/devSoft.dbd
+5
View File
@@ -1,3 +1,5 @@
# devSoft.dbd
device(aai,CONSTANT,devAaiSoft,"Soft Channel")
device(aao,CONSTANT,devAaoSoft,"Soft Channel")
device(ai,CONSTANT,devAiSoft,"Soft Channel")
@@ -58,5 +60,8 @@ device(lso,INST_IO,devLsoStdio,"stdio")
device(printf,INST_IO,devPrintfStdio,"stdio")
device(stringout,INST_IO,devSoStdio,"stdio")
device(lsi,INST_IO,devLsiEnviron,"getenv")
device(stringin,INST_IO,devSiEnviron,"getenv")
device(bi, INST_IO, devBiDbState, "Db State")
device(bo, INST_IO, devBoDbState, "Db State")
src/std/dev/devStdio.c
-2
View File
@@ -5,8 +5,6 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$ */
#include <stdio.h>
#include <string.h>
src/std/dev/devTimestamp.c
-1
View File
@@ -5,7 +5,6 @@
* in the file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$ */
/*
* Device support for EPICS time stamps
*
src/std/dev/devWfSoft.c
+1 -2
View File
@@ -7,8 +7,7 @@
* in file LICENSE that is included with this distribution.
\*************************************************************************/
/* $Revision-Id$
*
/*
* Original Authors: Bob Dalesio and Marty Kraimer
* Date: 6-1-90
*/