diff --git a/src/Makefile b/src/Makefile index 3d5978b07..c4491223c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -31,7 +31,6 @@ DIRS += rsrv DIRS += rec DIRS += dev DIRS += misc -DIRS += iocsh DIRS += vxWorks DIRS += softIoc DIRS += gdd diff --git a/src/as/Makefile b/src/as/Makefile index e50dd2f62..3a09b3b34 100644 --- a/src/as/Makefile +++ b/src/as/Makefile @@ -1,5 +1,5 @@ #************************************************************************* -# Copyright (c) 2006 UChicago Argonne LLC, as Operator of Argonne +# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. @@ -13,12 +13,14 @@ INC += asLib.h INC += asDbLib.h INC += asCa.h INC += asTrapWrite.h +INC += asIocRegister.h LIB_SRCS += asLib.c LIB_SRCS += asTrapWrite.c asIoc_SRCS += asDbLib.c asIoc_SRCS += asCa.c +asIoc_SRCS += asIocRegister.c LIBRARY_HOST = asHost LIBRARY_IOC = asIoc diff --git a/src/iocsh/asTestRegister.c b/src/as/asIocRegister.c similarity index 90% rename from src/iocsh/asTestRegister.c rename to src/as/asIocRegister.c index 500e059c0..8846765a8 100644 --- a/src/iocsh/asTestRegister.c +++ b/src/as/asIocRegister.c @@ -1,29 +1,18 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* asTestRegister.c */ -/* Author: Marty Kraimer Date: 02MAY2000 */ -#include -#include -#include -#include -#include - -#include "epicsStdio.h" -#include "ellLib.h" +#include "iocsh.h" +#define epicsExportSharedSymbols #include "asLib.h" #include "asDbLib.h" #include "asCa.h" -#define epicsExportSharedSymbols -#include "iocsh.h" -#include "asTestRegister.h" +#include "asIocRegister.h" /* asSetFilename */ static const iocshArg asSetFilenameArg0 = { "ascf",iocshArgString}; @@ -123,7 +112,7 @@ static void asDumpHashCallFunc(const iocshArgBuf *args) asDumpHash(); } -void epicsShareAPI asTestRegister(void) +void epicsShareAPI asIocRegister(void) { iocshRegister(&asSetFilenameFuncDef,asSetFilenameCallFunc); iocshRegister(&asSetSubstitutionsFuncDef,asSetSubstitutionsCallFunc); diff --git a/src/iocsh/asTestRegister.h b/src/as/asIocRegister.h similarity index 54% rename from src/iocsh/asTestRegister.h rename to src/as/asIocRegister.h index 236b03762..50d44a5ac 100644 --- a/src/iocsh/asTestRegister.h +++ b/src/as/asIocRegister.h @@ -1,17 +1,14 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* asTestRegister.h */ -/* Author: Marty Kraimer Date: 02MAY2000 */ -#ifndef INCasTestRegisterH -#define INCasTestRegisterH +#ifndef INC_asIocRegister_H +#define INC_asIocRegister_H #include "shareLib.h" @@ -19,10 +16,10 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI asTestRegister(void); +epicsShareFunc void epicsShareAPI asIocRegister(void); #ifdef __cplusplus } #endif -#endif /*INCasTestRegisterH*/ +#endif /* INC_asIocRegister_H */ diff --git a/src/db/Makefile b/src/db/Makefile index d136136bc..3c0f407ec 100644 --- a/src/db/Makefile +++ b/src/db/Makefile @@ -1,10 +1,9 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* TOP=../.. @@ -30,6 +29,7 @@ INC += db_test.h INC += db_field_log.h INC += initHooks.h INC += recGbl.h +INC += dbIocRegister.h # The following go away what old database access goes away INC += db_access_routines.h INC += db_convert.h @@ -51,29 +51,30 @@ INC += dbCommon.h DBD+= dbCommon.dbd DBD+= menuGlobal.dbd -LIBSRCS += dbLock.c -LIBSRCS += dbAccess.c -LIBSRCS += dbBkpt.c -LIBSRCS += dbConvert.c -LIBSRCS += dbFastLinkConv.c -LIBSRCS += dbNotify.c -LIBSRCS += dbScan.c -LIBSRCS += dbEvent.c -LIBSRCS += dbTest.c -LIBSRCS += db_access.c -LIBSRCS += db_test.c -LIBSRCS += recGbl.c -LIBSRCS += callback.c -LIBSRCS += dbCa.c -LIBSRCS += dbCaTest.c -LIBSRCS += initHooks.c -LIBSRCS += cvtBpt.c -LIBSRCS += dbContext.cpp -LIBSRCS += dbChannelIO.cpp -LIBSRCS += dbSubscriptionIO.cpp -LIBSRCS += dbPutNotifyBlocker.cpp -LIBSRCS += dbContextReadNotifyCache.cpp -LIBSRCS += templateInstances.cpp +LIB_SRCS += dbLock.c +LIB_SRCS += dbAccess.c +LIB_SRCS += dbBkpt.c +LIB_SRCS += dbConvert.c +LIB_SRCS += dbFastLinkConv.c +LIB_SRCS += dbNotify.c +LIB_SRCS += dbScan.c +LIB_SRCS += dbEvent.c +LIB_SRCS += dbTest.c +LIB_SRCS += db_access.c +LIB_SRCS += db_test.c +LIB_SRCS += recGbl.c +LIB_SRCS += callback.c +LIB_SRCS += dbCa.c +LIB_SRCS += dbCaTest.c +LIB_SRCS += initHooks.c +LIB_SRCS += cvtBpt.c +LIB_SRCS += dbContext.cpp +LIB_SRCS += dbChannelIO.cpp +LIB_SRCS += dbSubscriptionIO.cpp +LIB_SRCS += dbPutNotifyBlocker.cpp +LIB_SRCS += dbContextReadNotifyCache.cpp +LIB_SRCS += templateInstances.cpp +LIB_SRCS += dbIocRegister.c LIBRARY_IOC = dbIoc dbIoc_LIBS = dbStaticIoc ca Com @@ -83,7 +84,7 @@ dbIoc_RCS_WIN32 = dbIoc.rc # For R3.13 compatibility only ifeq ($(strip $(COMPAT_313)),YES) OBJLIB_vxWorks=dbIoc -OBJLIB_SRCS = $(LIBSRCS) +OBJLIB_SRCS = $(LIB_SRCS) endif include $(TOP)/configure/RULES diff --git a/src/iocsh/dbTestRegister.c b/src/db/dbIocRegister.c similarity index 59% rename from src/iocsh/dbTestRegister.c rename to src/db/dbIocRegister.c index d80ca9c65..eea5735f5 100644 --- a/src/iocsh/dbTestRegister.c +++ b/src/db/dbIocRegister.c @@ -1,31 +1,113 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* dbTestRegister.c */ -/* Author: Marty Kraimer Date: 26APR2000 */ -#include -#include -#include -#include -#include +#include "iocsh.h" -#include "epicsStdio.h" +#define epicsExportSharedSymbols +#include "dbBkpt.h" +#include "dbAccess.h" +#include "dbCaTest.h" +#include "dbEvent.h" #include "dbTest.h" #include "db_test.h" #include "dbLock.h" #include "dbScan.h" -#include "ellLib.h" #include "dbNotify.h" -#define epicsExportSharedSymbols -#include "iocsh.h" -#include "dbTestRegister.h" +#include "callback.h" +#include "dbIocRegister.h" + +/* dbLoadDatabase */ +static const iocshArg dbLoadDatabaseArg0 = { "file name",iocshArgString}; +static const iocshArg dbLoadDatabaseArg1 = { "path",iocshArgString}; +static const iocshArg dbLoadDatabaseArg2 = { "substitutions",iocshArgString}; +static const iocshArg * const dbLoadDatabaseArgs[3] = +{ + &dbLoadDatabaseArg0,&dbLoadDatabaseArg1,&dbLoadDatabaseArg2 +}; +static const iocshFuncDef dbLoadDatabaseFuncDef = + {"dbLoadDatabase",3,dbLoadDatabaseArgs}; +static void dbLoadDatabaseCallFunc(const iocshArgBuf *args) +{ + dbLoadDatabase(args[0].sval,args[1].sval,args[2].sval); +} + +/* dbLoadRecords */ +static const iocshArg dbLoadRecordsArg0 = { "file name",iocshArgString}; +static const iocshArg dbLoadRecordsArg1 = { "substitutions",iocshArgString}; +static const iocshArg * const dbLoadRecordsArgs[2] = {&dbLoadRecordsArg0,&dbLoadRecordsArg1}; +static const iocshFuncDef dbLoadRecordsFuncDef = {"dbLoadRecords",2,dbLoadRecordsArgs}; +static void dbLoadRecordsCallFunc(const iocshArgBuf *args) +{ + dbLoadRecords(args[0].sval,args[1].sval); +} + +/* dbb */ +static const iocshArg dbbArg0 = { "record name",iocshArgString}; +static const iocshArg * const dbbArgs[1] = {&dbbArg0}; +static const iocshFuncDef dbbFuncDef = {"dbb",1,dbbArgs}; +static void dbbCallFunc(const iocshArgBuf *args) { dbb(args[0].sval);} + +/* dbd */ +static const iocshArg dbdArg0 = { "record name",iocshArgString}; +static const iocshArg * const dbdArgs[1] = {&dbdArg0}; +static const iocshFuncDef dbdFuncDef = {"dbd",1,dbdArgs}; +static void dbdCallFunc(const iocshArgBuf *args) { dbd(args[0].sval);} + +/* dbc */ +static const iocshArg dbcArg0 = { "record name",iocshArgString}; +static const iocshArg * const dbcArgs[1] = {&dbcArg0}; +static const iocshFuncDef dbcFuncDef = {"dbc",1,dbcArgs}; +static void dbcCallFunc(const iocshArgBuf *args) { dbc(args[0].sval);} + +/* dbs */ +static const iocshArg dbsArg0 = { "record name",iocshArgString}; +static const iocshArg * const dbsArgs[1] = {&dbsArg0}; +static const iocshFuncDef dbsFuncDef = {"dbs",1,dbsArgs}; +static void dbsCallFunc(const iocshArgBuf *args) { dbs(args[0].sval);} + +/* dbstat */ +static const iocshFuncDef dbstatFuncDef = {"dbstat",0}; +static void dbstatCallFunc(const iocshArgBuf *args) { dbstat();} + +/* dbp */ +static const iocshArg dbpArg0 = { "record name",iocshArgString}; +static const iocshArg dbpArg1 = { "interest level",iocshArgInt}; +static const iocshArg * const dbpArgs[2] = {&dbpArg0,&dbpArg1}; +static const iocshFuncDef dbpFuncDef = {"dbp",2,dbpArgs}; +static void dbpCallFunc(const iocshArgBuf *args) +{ dbp(args[0].sval,args[1].ival);} + +/* dbap */ +static const iocshArg dbapArg0 = { "record name",iocshArgString}; +static const iocshArg * const dbapArgs[1] = {&dbapArg0}; +static const iocshFuncDef dbapFuncDef = {"dbap",1,dbapArgs}; +static void dbapCallFunc(const iocshArgBuf *args) { dbap(args[0].sval);} + +/* dbcar */ +static const iocshArg dbcarArg0 = { "record name",iocshArgString}; +static const iocshArg dbcarArg1 = { "level",iocshArgInt}; +static const iocshArg * const dbcarArgs[2] = {&dbcarArg0,&dbcarArg1}; +static const iocshFuncDef dbcarFuncDef = {"dbcar",2,dbcarArgs}; +static void dbcarCallFunc(const iocshArgBuf *args) +{ + dbcar(args[0].sval,args[1].ival); +} + +/* dbel */ +static const iocshArg dbelArg0 = { "record name",iocshArgString}; +static const iocshArg dbelArg1 = { "level",iocshArgInt}; +static const iocshArg * const dbelArgs[2] = {&dbelArg0,&dbelArg1}; +static const iocshFuncDef dbelFuncDef = {"dbel",2,dbelArgs}; +static void dbelCallFunc(const iocshArgBuf *args) +{ + dbel(args[0].sval, args[1].ival); +} /* dba */ static const iocshArg dbaArg0 = { "record name",iocshArgString}; @@ -155,6 +237,17 @@ static const iocshFuncDef dbLockShowLockedFuncDef = static void dbLockShowLockedCallFunc(const iocshArgBuf *args) { dbLockShowLocked(args[0].ival);} +/* scanOnceSetQueueSize */ +static const iocshArg scanOnceSetQueueSizeArg0 = { "size",iocshArgInt}; +static const iocshArg * const scanOnceSetQueueSizeArgs[1] = + {&scanOnceSetQueueSizeArg0}; +static const iocshFuncDef scanOnceSetQueueSizeFuncDef = + {"scanOnceSetQueueSize",1,scanOnceSetQueueSizeArgs}; +static void scanOnceSetQueueSizeCallFunc(const iocshArgBuf *args) +{ + scanOnceSetQueueSize(args[0].ival); +} + /* scanppl */ static const iocshArg scanpplArg0 = { "rate",iocshArgDouble}; static const iocshArg * const scanpplArgs[1] = {&scanpplArg0}; @@ -173,8 +266,34 @@ static void scanpelCallFunc(const iocshArgBuf *args) static const iocshFuncDef scanpiolFuncDef = {"scanpiol",0}; static void scanpiolCallFunc(const iocshArgBuf *args) { scanpiol();} -void epicsShareAPI dbTestRegister(void) +/* callbackSetQueueSize */ +static const iocshArg callbackSetQueueSizeArg0 = { "bufsize",iocshArgInt}; +static const iocshArg * const callbackSetQueueSizeArgs[1] = + {&callbackSetQueueSizeArg0}; +static const iocshFuncDef callbackSetQueueSizeFuncDef = + {"callbackSetQueueSize",1,callbackSetQueueSizeArgs}; +static void callbackSetQueueSizeCallFunc(const iocshArgBuf *args) { + callbackSetQueueSize(args[0].ival); +} + + +void epicsShareAPI dbIocRegister(void) +{ + iocshRegister(&dbbFuncDef,dbbCallFunc); + iocshRegister(&dbdFuncDef,dbdCallFunc); + iocshRegister(&dbcFuncDef,dbcCallFunc); + iocshRegister(&dbsFuncDef,dbsCallFunc); + iocshRegister(&dbstatFuncDef,dbstatCallFunc); + iocshRegister(&dbpFuncDef,dbpCallFunc); + iocshRegister(&dbapFuncDef,dbapCallFunc); + + iocshRegister(&dbcarFuncDef,dbcarCallFunc); + iocshRegister(&dbelFuncDef,dbelCallFunc); + + iocshRegister(&dbLoadDatabaseFuncDef,dbLoadDatabaseCallFunc); + iocshRegister(&dbLoadRecordsFuncDef,dbLoadRecordsCallFunc); + iocshRegister(&dbaFuncDef,dbaCallFunc); iocshRegister(&dblFuncDef,dblCallFunc); iocshRegister(&dbnrFuncDef,dbnrCallFunc); @@ -193,7 +312,11 @@ void epicsShareAPI dbTestRegister(void) iocshRegister(&tpnFuncDef,tpnCallFunc); iocshRegister(&dblsrFuncDef,dblsrCallFunc); iocshRegister(&dbLockShowLockedFuncDef,dbLockShowLockedCallFunc); + + iocshRegister(&scanOnceSetQueueSizeFuncDef,scanOnceSetQueueSizeCallFunc); iocshRegister(&scanpplFuncDef,scanpplCallFunc); iocshRegister(&scanpelFuncDef,scanpelCallFunc); iocshRegister(&scanpiolFuncDef,scanpiolCallFunc); + + iocshRegister(&callbackSetQueueSizeFuncDef,callbackSetQueueSizeCallFunc); } diff --git a/src/iocsh/dbBkptRegister.h b/src/db/dbIocRegister.h similarity index 54% rename from src/iocsh/dbBkptRegister.h rename to src/db/dbIocRegister.h index 0be4135d4..31e72227a 100644 --- a/src/iocsh/dbBkptRegister.h +++ b/src/db/dbIocRegister.h @@ -1,17 +1,14 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* dbBkptRegister.h */ -/* Author: Marty Kraimer Date: 27APR2000 */ -#ifndef INCdbBkptRegisterH -#define INCdbBkptRegisterH +#ifndef INC_dbIocRegister_H +#define INC_dbIocRegister_H #include "shareLib.h" @@ -19,10 +16,10 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI dbBkptRegister(void); +epicsShareFunc void epicsShareAPI dbIocRegister(void); #ifdef __cplusplus } #endif -#endif /*INCdbBkptRegisterH*/ +#endif /* INC_dbIocRegister_H */ diff --git a/src/dbStatic/Makefile b/src/dbStatic/Makefile index 4151d41b7..735e4179b 100644 --- a/src/dbStatic/Makefile +++ b/src/dbStatic/Makefile @@ -1,10 +1,9 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* TOP=../.. @@ -23,12 +22,15 @@ INC += guigroup.h INC += devSup.h INC += drvSup.h INC += recSup.h +INC += dbStaticIocRegister.h LIBSRCS += dbStaticLib.c LIBSRCS += dbYacc.c LIBSRCS += dbPvdLib.c + dbStaticHost_SRCS += dbStaticNoRun.c dbStaticIoc_SRCS += dbStaticRun.c +dbStaticIoc_SRCS += dbStaticIocRegister.c LIBRARY_HOST += dbStaticHost LIBRARY_IOC += dbStaticIoc @@ -46,8 +48,8 @@ dbStaticHost_RCS_WIN32 = dbStaticHost.rc dbStaticIoc_RCS_WIN32 = dbStaticIoc.rc PROD_LIBS := dbStaticHost Com -#dbStaticHost_DIR=. PROD_HOST = dbReadTest dbExpand dbToMenuH dbToRecordtypeH + dbReadTest_SRCS = dbReadTest.c dbExpand_SRCS = dbExpand.c dbToMenuH_SRCS = dbToMenuH.c diff --git a/src/dbStatic/dbStaticIocRegister.c b/src/dbStatic/dbStaticIocRegister.c new file mode 100644 index 000000000..b77b0d29c --- /dev/null +++ b/src/dbStatic/dbStaticIocRegister.c @@ -0,0 +1,170 @@ +/*************************************************************************\ +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne +* National Laboratory. +* Copyright (c) 2002 The Regents of the University of California, as +* Operator of Los Alamos National Laboratory. +* EPICS BASE is distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. +\*************************************************************************/ + +#include "iocsh.h" + +#define epicsExportSharedSymbols +#include "dbStaticLib.h" +#include "dbStaticPvt.h" +#include "dbStaticIocRegister.h" + +/* common arguments */ + +static const iocshArg argPdbbase = { "pdbbase", iocshArgPdbbase}; +static const iocshArg argRecType = { "recordTypeName", iocshArgString}; + + +/* dbDumpPath */ +static const iocshArg * const dbDumpPathArgs[] = {&argPdbbase}; +static const iocshFuncDef dbDumpPathFuncDef = {"dbDumpPath",1,dbDumpPathArgs}; +static void dbDumpPathCallFunc(const iocshArgBuf *args) +{ + dbDumpPath(*iocshPpdbbase); +} + +/* dbDumpRecord */ +static const iocshArg dbDumpRecordArg2 = { "interest level",iocshArgInt}; +static const iocshArg * const dbDumpRecordArgs[] = + {&argPdbbase, &argRecType, &dbDumpRecordArg2}; +static const iocshFuncDef dbDumpRecordFuncDef = + {"dbDumpRecord",3,dbDumpRecordArgs}; +static void dbDumpRecordCallFunc(const iocshArgBuf *args) +{ + dbDumpRecord(*iocshPpdbbase,args[1].sval,args[2].ival); +} + +/* dbDumpMenu */ +static const iocshArg dbDumpMenuArg1 = { "menuName",iocshArgString}; +static const iocshArg * const dbDumpMenuArgs[] = { + &argPdbbase, &dbDumpMenuArg1}; +static const iocshFuncDef dbDumpMenuFuncDef = {"dbDumpMenu",2,dbDumpMenuArgs}; +static void dbDumpMenuCallFunc(const iocshArgBuf *args) +{ + dbDumpMenu(*iocshPpdbbase,args[1].sval); +} + +/* dbDumpRecordType */ +static const iocshArg * const dbDumpRecordTypeArgs[] = + {&argPdbbase, &argRecType}; +static const iocshFuncDef dbDumpRecordTypeFuncDef = + {"dbDumpRecordType",2,dbDumpRecordTypeArgs}; +static void dbDumpRecordTypeCallFunc(const iocshArgBuf *args) +{ + dbDumpRecordType(*iocshPpdbbase,args[1].sval); +} + +/* dbDumpField */ +static const iocshArg dbDumpFieldArg2 = { "fieldName",iocshArgString}; +static const iocshArg * const dbDumpFieldArgs[] = + {&argPdbbase, &argRecType,&dbDumpFieldArg2}; +static const iocshFuncDef dbDumpFieldFuncDef = {"dbDumpField",3,dbDumpFieldArgs}; +static void dbDumpFieldCallFunc(const iocshArgBuf *args) +{ + dbDumpField(*iocshPpdbbase,args[1].sval,args[2].sval); +} + +/* dbDumpDevice */ +static const iocshArg * const dbDumpDeviceArgs[] = { + &argPdbbase, &argRecType}; +static const iocshFuncDef dbDumpDeviceFuncDef = {"dbDumpDevice",2,dbDumpDeviceArgs}; +static void dbDumpDeviceCallFunc(const iocshArgBuf *args) +{ + dbDumpDevice(*iocshPpdbbase,args[1].sval); +} + +/* dbDumpDriver */ +static const iocshArg * const dbDumpDriverArgs[] = { &argPdbbase}; +static const iocshFuncDef dbDumpDriverFuncDef = {"dbDumpDriver",1,dbDumpDriverArgs}; +static void dbDumpDriverCallFunc(const iocshArgBuf *args) +{ + dbDumpDriver(*iocshPpdbbase); +} + +/* dbDumpRegistrar */ +static const iocshArg * const dbDumpRegistrarArgs[] = { &argPdbbase}; +static const iocshFuncDef dbDumpRegistrarFuncDef = {"dbDumpRegistrar",1,dbDumpRegistrarArgs}; +static void dbDumpRegistrarCallFunc(const iocshArgBuf *args) +{ + dbDumpRegistrar(*iocshPpdbbase); +} + +/* dbDumpFunction */ +static const iocshArg * const dbDumpFunctionArgs[] = { &argPdbbase}; +static const iocshFuncDef dbDumpFunctionFuncDef = {"dbDumpFunction",1,dbDumpFunctionArgs}; +static void dbDumpFunctionCallFunc(const iocshArgBuf *args) +{ + dbDumpFunction(*iocshPpdbbase); +} + +/* dbDumpVariable */ +static const iocshArg * const dbDumpVariableArgs[] = { &argPdbbase}; +static const iocshFuncDef dbDumpVariableFuncDef = {"dbDumpVariable",1,dbDumpVariableArgs}; +static void dbDumpVariableCallFunc(const iocshArgBuf *args) +{ + dbDumpVariable(*iocshPpdbbase); +} + +/* dbDumpBreaktable */ +static const iocshArg dbDumpBreaktableArg1 = { "tableName",iocshArgString}; +static const iocshArg * const dbDumpBreaktableArgs[] = + {&argPdbbase,&dbDumpBreaktableArg1}; +static const iocshFuncDef dbDumpBreaktableFuncDef = + {"dbDumpBreaktable",2,dbDumpBreaktableArgs}; +static void dbDumpBreaktableCallFunc(const iocshArgBuf *args) +{ + dbDumpBreaktable(*iocshPpdbbase,args[1].sval); +} + +/* dbPvdDump */ +static const iocshArg dbPvdDumpArg1 = { "verbose",iocshArgInt}; +static const iocshArg * const dbPvdDumpArgs[] = { + &argPdbbase,&dbPvdDumpArg1}; +static const iocshFuncDef dbPvdDumpFuncDef = {"dbPvdDump",2,dbPvdDumpArgs}; +static void dbPvdDumpCallFunc(const iocshArgBuf *args) +{ + dbPvdDump(*iocshPpdbbase,args[1].ival); +} + +/* dbPvdTableSize */ +static const iocshArg dbPvdTableSizeArg0 = { "size",iocshArgInt}; +static const iocshArg * const dbPvdTableSizeArgs[1] = + {&dbPvdTableSizeArg0}; +static const iocshFuncDef dbPvdTableSizeFuncDef = + {"dbPvdTableSize",1,dbPvdTableSizeArgs}; +static void dbPvdTableSizeCallFunc(const iocshArgBuf *args) +{ + dbPvdTableSize(args[0].ival); +} + +/* dbReportDeviceConfig */ +static const iocshArg * const dbReportDeviceConfigArgs[] = {&argPdbbase}; +static const iocshFuncDef dbReportDeviceConfigFuncDef = { + "dbReportDeviceConfig",1,dbReportDeviceConfigArgs}; +static void dbReportDeviceConfigCallFunc(const iocshArgBuf *args) +{ + dbReportDeviceConfig(*iocshPpdbbase,stdout); +} + +void epicsShareAPI dbStaticIocRegister(void) +{ + iocshRegister(&dbDumpPathFuncDef, dbDumpPathCallFunc); + iocshRegister(&dbDumpRecordFuncDef, dbDumpRecordCallFunc); + iocshRegister(&dbDumpMenuFuncDef, dbDumpMenuCallFunc); + iocshRegister(&dbDumpRecordTypeFuncDef, dbDumpRecordTypeCallFunc); + iocshRegister(&dbDumpFieldFuncDef, dbDumpFieldCallFunc); + iocshRegister(&dbDumpDeviceFuncDef, dbDumpDeviceCallFunc); + iocshRegister(&dbDumpDriverFuncDef, dbDumpDriverCallFunc); + iocshRegister(&dbDumpRegistrarFuncDef,dbDumpRegistrarCallFunc); + iocshRegister(&dbDumpFunctionFuncDef, dbDumpFunctionCallFunc); + iocshRegister(&dbDumpVariableFuncDef, dbDumpVariableCallFunc); + iocshRegister(&dbDumpBreaktableFuncDef, dbDumpBreaktableCallFunc); + iocshRegister(&dbPvdDumpFuncDef, dbPvdDumpCallFunc); + iocshRegister(&dbPvdTableSizeFuncDef,dbPvdTableSizeCallFunc); + iocshRegister(&dbReportDeviceConfigFuncDef, dbReportDeviceConfigCallFunc); +} diff --git a/src/dbStatic/dbStaticIocRegister.h b/src/dbStatic/dbStaticIocRegister.h new file mode 100644 index 000000000..762f2b123 --- /dev/null +++ b/src/dbStatic/dbStaticIocRegister.h @@ -0,0 +1,25 @@ +/*************************************************************************\ +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne +* National Laboratory. +* Copyright (c) 2002 The Regents of the University of California, as +* Operator of Los Alamos National Laboratory. +* EPICS BASE is distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. +\*************************************************************************/ + +#ifndef INC_dbStaticIocRegister_H +#define INC_dbStaticIocRegister_H + +#include "shareLib.h" + +#ifdef __cplusplus +extern "C" { +#endif + +epicsShareFunc void epicsShareAPI dbStaticIocRegister(void); + +#ifdef __cplusplus +} +#endif + +#endif /* INC_dbStaticIocRegister_H */ diff --git a/src/dbtools/Makefile b/src/dbtools/Makefile index f2cbc08c7..633ca6699 100644 --- a/src/dbtools/Makefile +++ b/src/dbtools/Makefile @@ -11,16 +11,15 @@ TOP=../.. include $(TOP)/configure/CONFIG -#YACCOPT := -l -#LEXOPT := -L - INC += dbLoadTemplate.h +INC += dbtoolsIocRegister.h -LIBSRCS += dbLoadTemplate.c +LIB_SRCS += dbLoadTemplate.c +LIB_SRCS += dbtoolsIocRegister.c LIBRARY_IOC = dbtoolsIoc -dbtoolsIoc_LIBS = dbIoc Com +dbtoolsIoc_LIBS = dbIoc dbStaticIoc Com dbtoolsIoc_RCS_WIN32 = dbtoolsIoc.rc diff --git a/src/dbtools/dbtoolsIocRegister.c b/src/dbtools/dbtoolsIocRegister.c new file mode 100644 index 000000000..9fbe1096b --- /dev/null +++ b/src/dbtools/dbtoolsIocRegister.c @@ -0,0 +1,29 @@ +/*************************************************************************\ +* Copyright (c) 2007 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. +\*************************************************************************/ + +#include "iocsh.h" + +#define epicsExportSharedSymbols +#include "dbtoolsIocRegister.h" +#include "dbLoadTemplate.h" + + +/* dbLoadTemplate */ +static const iocshArg dbLoadTemplateArg0 = { "file name",iocshArgString}; +static const iocshArg * const dbLoadTemplateArgs[1] = {&dbLoadTemplateArg0}; +static const iocshFuncDef dbLoadTemplateFuncDef = + {"dbLoadTemplate",1,dbLoadTemplateArgs}; +static void dbLoadTemplateCallFunc(const iocshArgBuf *args) +{ + dbLoadTemplate(args[0].sval); +} + + +void epicsShareAPI dbtoolsIocRegister(void) +{ + iocshRegister(&dbLoadTemplateFuncDef,dbLoadTemplateCallFunc); +} diff --git a/src/dbtools/dbtoolsIocRegister.h b/src/dbtools/dbtoolsIocRegister.h new file mode 100644 index 000000000..880f42d0f --- /dev/null +++ b/src/dbtools/dbtoolsIocRegister.h @@ -0,0 +1,23 @@ +/*************************************************************************\ +* Copyright (c) 2007 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. +\*************************************************************************/ + +#ifndef INC_dbtoolsIocRegister_H +#define INC_dbtoolsIocRegister_H + +#include "shareLib.h" + +#ifdef __cplusplus +extern "C" { +#endif + +epicsShareFunc void epicsShareAPI dbtoolsIocRegister(void); + +#ifdef __cplusplus +} +#endif + +#endif /* INC_dbtoolsIocRegister_H */ diff --git a/src/iocsh/Makefile b/src/iocsh/Makefile deleted file mode 100644 index 34401c71c..000000000 --- a/src/iocsh/Makefile +++ /dev/null @@ -1,68 +0,0 @@ -#************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne -# National Laboratory. -# Copyright (c) 2002 The Regents of the University of California, as -# Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found -# in file LICENSE that is included with this distribution. -#************************************************************************* -TOP=../.. -include $(TOP)/configure/CONFIG - -# includes to install from this sub-project -# - -INC += iocsh.h -INC += osiRegister.h -INC += iocUtilRegister.h -INC += dbStaticRegister.h -INC += dbTestRegister.h -INC += dbBkptRegister.h -INC += dbCaTestRegister.h -INC += caTestRegister.h -INC += dbAccessRegister.h -INC += iocshRegisterCommon.h -INC += asTestRegister.h -INC += envRegister.h -INC += iocCoreLimitsRegister.h -INC += registryCommon.h -INC += registryRegister.h - - -LIB_SRCS += iocsh.cpp -LIB_SRCS += systemCommandRegister.c - -iocsh_SRCS += osiRegister.c -iocsh_SRCS += dbStaticRegister.c -iocsh_SRCS += dbTestRegister.c -iocsh_SRCS += dbBkptRegister.c -iocsh_SRCS += dbCaTestRegister.c -iocsh_SRCS += caTestRegister.c -iocsh_SRCS += dbAccessRegister.c -iocsh_SRCS += iocshRegisterCommon.c -iocsh_SRCS += asTestRegister.c -iocsh_SRCS += envRegister.c -iocsh_SRCS += iocUtil.c -iocsh_SRCS += iocCoreLimitsRegister.c -iocsh_SRCS += registryCommon.c -iocsh_SRCS += registryRegister.c - -LIBRARY_IOC = iocsh - -iocsh_LIBS = miscIoc rsrvIoc dbtoolsIoc asIoc dbIoc registryIoc dbStaticIoc Com -iocsh_RCS_WIN32 = iocsh.rc - -LIBRARY_HOST = iocshHost - -iocshHost_LIBS = registryIoc Com -iocshHost_RCS_WIN32 = iocshHost.rc - -# For R3.13 compatibility only -ifeq ($(strip $(COMPAT_313)),YES) -OBJLIB_vxWorks=iocsh -OBJLIB_SRCS = $(LIB_SRCS) $(iocsh_SRCS) -endif - -include $(TOP)/configure/RULES - diff --git a/src/iocsh/caTestRegister.c b/src/iocsh/caTestRegister.c deleted file mode 100644 index 0b3a21bf3..000000000 --- a/src/iocsh/caTestRegister.c +++ /dev/null @@ -1,50 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* caTestRegister.c */ -/* Author: Marty Kraimer Date: 01MAY2000 */ - -#include -#include -#include -#include -#include - -#include "epicsStdio.h" -#include "rsrv.h" -#include "dbEvent.h" -#define epicsExportSharedSymbols -#include "iocsh.h" -#include "caTestRegister.h" - -/* casr */ -static const iocshArg casrArg0 = { "level",iocshArgInt}; -static const iocshArg * const casrArgs[1] = {&casrArg0}; -static const iocshFuncDef casrFuncDef = {"casr",1,casrArgs}; -static void casrCallFunc(const iocshArgBuf *args) -{ - casr(args[0].ival); -} - -/* dbel */ -static const iocshArg dbelArg0 = { "record name",iocshArgString}; -static const iocshArg dbelArg1 = { "level",iocshArgInt}; -static const iocshArg * const dbelArgs[2] = {&dbelArg0,&dbelArg1}; -static const iocshFuncDef dbelFuncDef = {"dbel",2,dbelArgs}; -static void dbelCallFunc(const iocshArgBuf *args) -{ - dbel(args[0].sval, args[1].ival); -} - - -void epicsShareAPI caTestRegister(void) -{ - iocshRegister(&casrFuncDef,casrCallFunc); - iocshRegister(&dbelFuncDef,dbelCallFunc); -} diff --git a/src/iocsh/caTestRegister.h b/src/iocsh/caTestRegister.h deleted file mode 100644 index 487b51c4a..000000000 --- a/src/iocsh/caTestRegister.h +++ /dev/null @@ -1,28 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* caTestRegister.h */ -/* Author: Marty Kraimer Date: 27APR2000 */ - -#ifndef INCcaTestRegisterH -#define INCcaTestRegisterH - -#include "shareLib.h" - -#ifdef __cplusplus -extern "C" { -#endif - -epicsShareFunc void epicsShareAPI caTestRegister(void); - -#ifdef __cplusplus -} -#endif - -#endif /*INCcaTestRegisterH*/ diff --git a/src/iocsh/dbAccessRegister.c b/src/iocsh/dbAccessRegister.c deleted file mode 100644 index 599303691..000000000 --- a/src/iocsh/dbAccessRegister.c +++ /dev/null @@ -1,78 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* dbAccessRegister.c */ -/* Author: Marty Kraimer Date: 26APR2000 */ - -#include -#include -#include -#include -#include - -#include "epicsStdio.h" -#include "dbAccess.h" -#include "iocInit.h" -#include "dbLoadTemplate.h" -#define epicsExportSharedSymbols -#include "iocsh.h" -#include "registryRecordType.h" -#include "dbAccessRegister.h" -#include "iocsh.h" - -/* dbLoadDatabase */ -static const iocshArg dbLoadDatabaseArg0 = { "file name",iocshArgString}; -static const iocshArg dbLoadDatabaseArg1 = { "path",iocshArgString}; -static const iocshArg dbLoadDatabaseArg2 = { "substitutions",iocshArgString}; -static const iocshArg * const dbLoadDatabaseArgs[3] = -{ - &dbLoadDatabaseArg0,&dbLoadDatabaseArg1,&dbLoadDatabaseArg2 -}; -static const iocshFuncDef dbLoadDatabaseFuncDef = - {"dbLoadDatabase",3,dbLoadDatabaseArgs}; -static void dbLoadDatabaseCallFunc(const iocshArgBuf *args) -{ - dbLoadDatabase(args[0].sval,args[1].sval,args[2].sval); -} - -/* dbLoadRecords */ -static const iocshArg dbLoadRecordsArg0 = { "file name",iocshArgString}; -static const iocshArg dbLoadRecordsArg1 = { "substitutions",iocshArgString}; -static const iocshArg * const dbLoadRecordsArgs[2] = {&dbLoadRecordsArg0,&dbLoadRecordsArg1}; -static const iocshFuncDef dbLoadRecordsFuncDef = {"dbLoadRecords",2,dbLoadRecordsArgs}; -static void dbLoadRecordsCallFunc(const iocshArgBuf *args) -{ - dbLoadRecords(args[0].sval,args[1].sval); -} - -/* dbLoadTemplate */ -static const iocshArg dbLoadTemplateArg0 = { "file name",iocshArgString}; -static const iocshArg * const dbLoadTemplateArgs[1] = {&dbLoadTemplateArg0}; -static const iocshFuncDef dbLoadTemplateFuncDef = - {"dbLoadTemplate",1,dbLoadTemplateArgs}; -static void dbLoadTemplateCallFunc(const iocshArgBuf *args) -{ - dbLoadTemplate(args[0].sval); -} - -/* iocInit */ -static const iocshFuncDef iocInitFuncDef = - {"iocInit",0,0}; -static void iocInitCallFunc(const iocshArgBuf *args) -{ - iocInit(); -} - -void epicsShareAPI dbAccessRegister(void) -{ - iocshRegister(&dbLoadDatabaseFuncDef,dbLoadDatabaseCallFunc); - iocshRegister(&dbLoadRecordsFuncDef,dbLoadRecordsCallFunc); - iocshRegister(&dbLoadTemplateFuncDef,dbLoadTemplateCallFunc); - iocshRegister(&iocInitFuncDef,iocInitCallFunc); -} diff --git a/src/iocsh/dbAccessRegister.h b/src/iocsh/dbAccessRegister.h deleted file mode 100644 index 0d20def68..000000000 --- a/src/iocsh/dbAccessRegister.h +++ /dev/null @@ -1,28 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* dbAccessRegister.h */ -/* Author: Marty Kraimer Date: 27APR2000 */ - -#ifndef INCdbAccessRegisterH -#define INCdbAccessRegisterH - -#include "shareLib.h" - -#ifdef __cplusplus -extern "C" { -#endif - -epicsShareFunc void epicsShareAPI dbAccessRegister(void); - -#ifdef __cplusplus -} -#endif - -#endif /*INCdbAccessRegisterH*/ diff --git a/src/iocsh/dbBkptRegister.c b/src/iocsh/dbBkptRegister.c deleted file mode 100644 index 40b8019b9..000000000 --- a/src/iocsh/dbBkptRegister.c +++ /dev/null @@ -1,82 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* dbBkptRegister.c */ -/* Author: Marty Kraimer Date: 02MAY2000 */ - -#include -#include -#include -#include -#include - -#include "epicsStdio.h" -#include "ellLib.h" -#include "errlog.h" -#include "alarm.h" -#include "dbBase.h" -#include "dbFldTypes.h" -#include "link.h" -#include "dbCommon.h" -#include "dbBkpt.h" -#define epicsExportSharedSymbols -#include "iocsh.h" -#include "dbBkptRegister.h" - -/* dbb */ -static const iocshArg dbbArg0 = { "record name",iocshArgString}; -static const iocshArg * const dbbArgs[1] = {&dbbArg0}; -static const iocshFuncDef dbbFuncDef = {"dbb",1,dbbArgs}; -static void dbbCallFunc(const iocshArgBuf *args) { dbb(args[0].sval);} - -/* dbd */ -static const iocshArg dbdArg0 = { "record name",iocshArgString}; -static const iocshArg * const dbdArgs[1] = {&dbdArg0}; -static const iocshFuncDef dbdFuncDef = {"dbd",1,dbdArgs}; -static void dbdCallFunc(const iocshArgBuf *args) { dbd(args[0].sval);} - -/* dbc */ -static const iocshArg dbcArg0 = { "record name",iocshArgString}; -static const iocshArg * const dbcArgs[1] = {&dbcArg0}; -static const iocshFuncDef dbcFuncDef = {"dbc",1,dbcArgs}; -static void dbcCallFunc(const iocshArgBuf *args) { dbc(args[0].sval);} - -/* dbs */ -static const iocshArg dbsArg0 = { "record name",iocshArgString}; -static const iocshArg * const dbsArgs[1] = {&dbsArg0}; -static const iocshFuncDef dbsFuncDef = {"dbs",1,dbsArgs}; -static void dbsCallFunc(const iocshArgBuf *args) { dbs(args[0].sval);} - -static const iocshFuncDef dbstatFuncDef = {"dbstat",0}; -static void dbstatCallFunc(const iocshArgBuf *args) { dbstat();} - -/* dbp */ -static const iocshArg dbpArg0 = { "record name",iocshArgString}; -static const iocshArg dbpArg1 = { "interest level",iocshArgInt}; -static const iocshArg * const dbpArgs[2] = {&dbpArg0,&dbpArg1}; -static const iocshFuncDef dbpFuncDef = {"dbp",2,dbpArgs}; -static void dbpCallFunc(const iocshArgBuf *args) -{ dbp(args[0].sval,args[1].ival);} - -/* dbap */ -static const iocshArg dbapArg0 = { "record name",iocshArgString}; -static const iocshArg * const dbapArgs[1] = {&dbapArg0}; -static const iocshFuncDef dbapFuncDef = {"dbap",1,dbapArgs}; -static void dbapCallFunc(const iocshArgBuf *args) { dbap(args[0].sval);} - -void epicsShareAPI dbBkptRegister(void) -{ - iocshRegister(&dbbFuncDef,dbbCallFunc); - iocshRegister(&dbdFuncDef,dbdCallFunc); - iocshRegister(&dbcFuncDef,dbcCallFunc); - iocshRegister(&dbsFuncDef,dbsCallFunc); - iocshRegister(&dbstatFuncDef,dbstatCallFunc); - iocshRegister(&dbpFuncDef,dbpCallFunc); - iocshRegister(&dbapFuncDef,dbapCallFunc); -} diff --git a/src/iocsh/dbCaTestRegister.c b/src/iocsh/dbCaTestRegister.c deleted file mode 100644 index 9ccbbd1c8..000000000 --- a/src/iocsh/dbCaTestRegister.c +++ /dev/null @@ -1,39 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* dbCaTestRegister.c */ -/* Author: Marty Kraimer Date: 01MAY2000 */ - -#include -#include -#include -#include -#include - -#include "epicsStdio.h" -#include "dbCaTest.h" -#define epicsExportSharedSymbols -#include "iocsh.h" -#include "dbCaTestRegister.h" - -/* dbcar */ -static const iocshArg dbcarArg0 = { "record name",iocshArgString}; -static const iocshArg dbcarArg1 = { "level",iocshArgInt}; -static const iocshArg * const dbcarArgs[2] = {&dbcarArg0,&dbcarArg1}; -static const iocshFuncDef dbcarFuncDef = {"dbcar",2,dbcarArgs}; -static void dbcarCallFunc(const iocshArgBuf *args) -{ - dbcar(args[0].sval,args[1].ival); -} - - -void epicsShareAPI dbCaTestRegister(void) -{ - iocshRegister(&dbcarFuncDef,dbcarCallFunc); -} diff --git a/src/iocsh/dbCaTestRegister.h b/src/iocsh/dbCaTestRegister.h deleted file mode 100644 index 3fb53c2b2..000000000 --- a/src/iocsh/dbCaTestRegister.h +++ /dev/null @@ -1,28 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* dbCaTestRegister.h */ -/* Author: Marty Kraimer Date: 27APR2000 */ - -#ifndef INCdbCaTestRegisterH -#define INCdbCaTestRegisterH - -#include "shareLib.h" - -#ifdef __cplusplus -extern "C" { -#endif - -epicsShareFunc void epicsShareAPI dbCaTestRegister(void); - -#ifdef __cplusplus -} -#endif - -#endif /*INCdbCaTestRegisterH*/ diff --git a/src/iocsh/dbStaticRegister.c b/src/iocsh/dbStaticRegister.c deleted file mode 100644 index 42c7792e4..000000000 --- a/src/iocsh/dbStaticRegister.c +++ /dev/null @@ -1,181 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* dbStaticRegister.c */ -/* Author: Marty Kraimer Date: 02MAY2000 */ - -#include -#include -#include -#include -#include - -#include "dbAccess.h" -#include "dbStaticLib.h" -#include "epicsStdio.h" -#define epicsExportSharedSymbols -#include "registryRecordType.h" -#include "iocsh.h" -#include "dbStaticRegister.h" - -/* dbDumpPath */ -static const iocshArg dbDumpPathArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg * const dbDumpPathArgs[] = {&dbDumpPathArg0}; -static const iocshFuncDef dbDumpPathFuncDef = {"dbDumpPath",1,dbDumpPathArgs}; -static void dbDumpPathCallFunc(const iocshArgBuf *args) -{ - dbDumpPath(pdbbase); -} - -/* dbDumpRecord */ -static const iocshArg dbDumpRecordArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg dbDumpRecordArg1 = { "recordTypeName",iocshArgString}; -static const iocshArg dbDumpRecordArg2 = { "interest level",iocshArgInt}; -static const iocshArg * const dbDumpRecordArgs[] = - {&dbDumpRecordArg0,&dbDumpRecordArg1,&dbDumpRecordArg2}; -static const iocshFuncDef dbDumpRecordFuncDef = - {"dbDumpRecord",3,dbDumpRecordArgs}; -static void dbDumpRecordCallFunc(const iocshArgBuf *args) -{ - dbDumpRecord(pdbbase,args[1].sval,args[2].ival); -} - -/* dbDumpMenu */ -static const iocshArg dbDumpMenuArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg dbDumpMenuArg1 = { "menuName",iocshArgString}; -static const iocshArg * const dbDumpMenuArgs[] = { - &dbDumpMenuArg0,&dbDumpMenuArg1}; -static const iocshFuncDef dbDumpMenuFuncDef = {"dbDumpMenu",2,dbDumpMenuArgs}; -static void dbDumpMenuCallFunc(const iocshArgBuf *args) -{ - dbDumpMenu(pdbbase,args[1].sval); -} - -/* dbDumpRecordType */ -static const iocshArg dbDumpRecordTypeArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg dbDumpRecordTypeArg1 = { "recordTypeName",iocshArgString}; -static const iocshArg * const dbDumpRecordTypeArgs[] = - {&dbDumpRecordTypeArg0,&dbDumpRecordTypeArg1}; -static const iocshFuncDef dbDumpRecordTypeFuncDef = - {"dbDumpRecordType",2,dbDumpRecordTypeArgs}; -static void dbDumpRecordTypeCallFunc(const iocshArgBuf *args) -{ - dbDumpRecordType(pdbbase,args[1].sval); -} - -/* dbDumpField */ -static const iocshArg dbDumpFieldArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg dbDumpFieldArg1 = { "recordTypeName",iocshArgString}; -static const iocshArg dbDumpFieldArg2 = { "fieldName",iocshArgString}; -static const iocshArg * const dbDumpFieldArgs[] = - {&dbDumpFieldArg0,&dbDumpFieldArg1,&dbDumpFieldArg2}; -static const iocshFuncDef dbDumpFieldFuncDef = {"dbDumpField",3,dbDumpFieldArgs}; -static void dbDumpFieldCallFunc(const iocshArgBuf *args) -{ - dbDumpField(pdbbase,args[1].sval,args[2].sval); -} - -/* dbDumpDevice */ -static const iocshArg dbDumpDeviceArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg dbDumpDeviceArg1 = { "recordTypeName",iocshArgString}; -static const iocshArg * const dbDumpDeviceArgs[] = { - &dbDumpDeviceArg0,&dbDumpDeviceArg1}; - -static const iocshFuncDef dbDumpDeviceFuncDef = {"dbDumpDevice",2,dbDumpDeviceArgs}; -static void dbDumpDeviceCallFunc(const iocshArgBuf *args) -{ - dbDumpDevice(pdbbase,args[1].sval); -} - -/* dbDumpDriver */ -static const iocshArg dbDumpDriverArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg * const dbDumpDriverArgs[] = { &dbDumpDriverArg0}; -static const iocshFuncDef dbDumpDriverFuncDef = {"dbDumpDriver",1,dbDumpDriverArgs}; -static void dbDumpDriverCallFunc(const iocshArgBuf *args) -{ - dbDumpDriver(pdbbase); -} - -/* dbDumpRegistrar */ -static const iocshArg dbDumpRegistrarArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg * const dbDumpRegistrarArgs[] = { &dbDumpRegistrarArg0}; -static const iocshFuncDef dbDumpRegistrarFuncDef = {"dbDumpRegistrar",1,dbDumpRegistrarArgs}; -static void dbDumpRegistrarCallFunc(const iocshArgBuf *args) -{ - dbDumpRegistrar(pdbbase); -} - -/* dbDumpFunction */ -static const iocshArg dbDumpFunctionArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg * const dbDumpFunctionArgs[] = { &dbDumpFunctionArg0}; -static const iocshFuncDef dbDumpFunctionFuncDef = {"dbDumpFunction",1,dbDumpFunctionArgs}; -static void dbDumpFunctionCallFunc(const iocshArgBuf *args) -{ - dbDumpFunction(pdbbase); -} - -/* dbDumpVariable */ -static const iocshArg dbDumpVariableArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg * const dbDumpVariableArgs[] = { &dbDumpVariableArg0}; -static const iocshFuncDef dbDumpVariableFuncDef = {"dbDumpVariable",1,dbDumpVariableArgs}; -static void dbDumpVariableCallFunc(const iocshArgBuf *args) -{ - dbDumpVariable(pdbbase); -} - -/* dbDumpBreaktable */ -static const iocshArg dbDumpBreaktableArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg dbDumpBreaktableArg1 = { "tableName",iocshArgString}; -static const iocshArg * const dbDumpBreaktableArgs[] = - {&dbDumpBreaktableArg0,&dbDumpBreaktableArg1}; -static const iocshFuncDef dbDumpBreaktableFuncDef = - {"dbDumpBreaktable",2,dbDumpBreaktableArgs}; -static void dbDumpBreaktableCallFunc(const iocshArgBuf *args) -{ - dbDumpBreaktable(pdbbase,args[1].sval); -} - -/* dbPvdDump */ -static const iocshArg dbPvdDumpArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg dbPvdDumpArg1 = { "verbose",iocshArgInt}; -static const iocshArg * const dbPvdDumpArgs[] = { - &dbPvdDumpArg0,&dbPvdDumpArg1}; -static const iocshFuncDef dbPvdDumpFuncDef = {"dbPvdDump",2,dbPvdDumpArgs}; -static void dbPvdDumpCallFunc(const iocshArgBuf *args) -{ - dbPvdDump(pdbbase,args[1].ival); -} - -/* dbReportDeviceConfig */ -static const iocshArg dbReportDeviceConfigArg0 = { "pdbbase",iocshArgPdbbase}; -static const iocshArg * const dbReportDeviceConfigArgs[] = { - &dbReportDeviceConfigArg0}; -static const iocshFuncDef dbReportDeviceConfigFuncDef = { - "dbReportDeviceConfig",1,dbReportDeviceConfigArgs}; -static void dbReportDeviceConfigCallFunc(const iocshArgBuf *args) -{ - dbReportDeviceConfig(pdbbase,stdout); -} - -void epicsShareAPI dbStaticRegister(void) -{ - iocshRegister(&dbDumpPathFuncDef,dbDumpPathCallFunc); - iocshRegister(&dbDumpRecordFuncDef,dbDumpRecordCallFunc); - iocshRegister(&dbDumpMenuFuncDef,dbDumpMenuCallFunc); - iocshRegister(&dbDumpRecordTypeFuncDef,dbDumpRecordTypeCallFunc); - iocshRegister(&dbDumpFieldFuncDef,dbDumpFieldCallFunc); - iocshRegister(&dbDumpDeviceFuncDef,dbDumpDeviceCallFunc); - iocshRegister(&dbDumpDriverFuncDef,dbDumpDriverCallFunc); - iocshRegister(&dbDumpRegistrarFuncDef,dbDumpRegistrarCallFunc); - iocshRegister(&dbDumpFunctionFuncDef,dbDumpFunctionCallFunc); - iocshRegister(&dbDumpVariableFuncDef,dbDumpVariableCallFunc); - iocshRegister(&dbDumpBreaktableFuncDef,dbDumpBreaktableCallFunc); - iocshRegister(&dbPvdDumpFuncDef,dbPvdDumpCallFunc); - iocshRegister(&dbReportDeviceConfigFuncDef,dbReportDeviceConfigCallFunc); -} diff --git a/src/iocsh/dbStaticRegister.h b/src/iocsh/dbStaticRegister.h deleted file mode 100644 index 21a1ec6c4..000000000 --- a/src/iocsh/dbStaticRegister.h +++ /dev/null @@ -1,28 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* dbStaticRegister.h */ -/* Author: Marty Kraimer Date: 02MAY2000 */ - -#ifndef INCdbStaticRegisterH -#define INCdbStaticRegisterH - -#include "shareLib.h" - -#ifdef __cplusplus -extern "C" { -#endif - -epicsShareFunc void epicsShareAPI dbStaticRegister(void); - -#ifdef __cplusplus -} -#endif - -#endif /*INCdbStaticRegisterH*/ diff --git a/src/iocsh/envRegister.c b/src/iocsh/envRegister.c deleted file mode 100644 index 21abaa43d..000000000 --- a/src/iocsh/envRegister.c +++ /dev/null @@ -1,32 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* envRegister.c */ -/* Author: Marty Kraimer Date: 19MAY2000 */ - -#include -#include -#include -#include -#include - -#include "epicsStdio.h" -#include "envDefs.h" -#define epicsExportSharedSymbols -#include "iocsh.h" -#include "envRegister.h" - -/* epicsPrtEnvParams */ -static const iocshFuncDef epicsPrtEnvParamsFuncDef = {"epicsPrtEnvParams",0,0}; -static void epicsPrtEnvParamsCallFunc(const iocshArgBuf *args) { epicsPrtEnvParams();} - -void epicsShareAPI envRegister(void) -{ - iocshRegister(&epicsPrtEnvParamsFuncDef,epicsPrtEnvParamsCallFunc); -} diff --git a/src/iocsh/iocCoreLimitsRegister.c b/src/iocsh/iocCoreLimitsRegister.c deleted file mode 100644 index e8b8b6317..000000000 --- a/src/iocsh/iocCoreLimitsRegister.c +++ /dev/null @@ -1,91 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* iocCoreLimitsRegister.c */ -/* Author: Marty Kraimer Date: 12DEC2002 */ - -#include -#include -#include -#include -#include - -#include "epicsStdio.h" -#include "callback.h" -#include "dbStaticLib.h" -#include "dbStaticPvt.h" -#include "dbScan.h" -#include "errlog.h" -#define epicsExportSharedSymbols -#include "iocsh.h" -#include "iocCoreLimitsRegister.h" - -/* callbackSetQueueSize */ -static const iocshArg callbackSetQueueSizeArg0 = { "bufsize",iocshArgInt}; -static const iocshArg * const callbackSetQueueSizeArgs[1] = - {&callbackSetQueueSizeArg0}; -static const iocshFuncDef callbackSetQueueSizeFuncDef = - {"callbackSetQueueSize",1,callbackSetQueueSizeArgs}; -static void callbackSetQueueSizeCallFunc(const iocshArgBuf *args) -{ - callbackSetQueueSize(args[0].ival); -} - -/* dbPvdTableSize */ -static const iocshArg dbPvdTableSizeArg0 = { "size",iocshArgInt}; -static const iocshArg * const dbPvdTableSizeArgs[1] = - {&dbPvdTableSizeArg0}; -static const iocshFuncDef dbPvdTableSizeFuncDef = - {"dbPvdTableSize",1,dbPvdTableSizeArgs}; -static void dbPvdTableSizeCallFunc(const iocshArgBuf *args) -{ - dbPvdTableSize(args[0].ival); -} - -/* scanOnceSetQueueSize */ -static const iocshArg scanOnceSetQueueSizeArg0 = { "size",iocshArgInt}; -static const iocshArg * const scanOnceSetQueueSizeArgs[1] = - {&scanOnceSetQueueSizeArg0}; -static const iocshFuncDef scanOnceSetQueueSizeFuncDef = - {"scanOnceSetQueueSize",1,scanOnceSetQueueSizeArgs}; -static void scanOnceSetQueueSizeCallFunc(const iocshArgBuf *args) -{ - scanOnceSetQueueSize(args[0].ival); -} - -/* errlogInit */ -static const iocshArg errlogInitArg0 = { "bufsize",iocshArgInt}; -static const iocshArg * const errlogInitArgs[1] = {&errlogInitArg0}; -static const iocshFuncDef errlogInitFuncDef = - {"errlogInit",1,errlogInitArgs}; -static void errlogInitCallFunc(const iocshArgBuf *args) -{ - errlogInit(args[0].ival); -} - -/* errlogInit2 */ -static const iocshArg errlogInit2Arg0 = { "bufSize",iocshArgInt}; -static const iocshArg errlogInit2Arg1 = { "maxMsgSize",iocshArgInt}; -static const iocshArg * const errlogInit2Args[] = - {&errlogInit2Arg0, &errlogInit2Arg1}; -static const iocshFuncDef errlogInit2FuncDef = - {"errlogInit2", 2, errlogInit2Args}; -static void errlogInit2CallFunc(const iocshArgBuf *args) -{ - errlogInit2(args[0].ival, args[1].ival); -} - -void epicsShareAPI iocCoreLimitsRegister(void) -{ - iocshRegister(&callbackSetQueueSizeFuncDef,callbackSetQueueSizeCallFunc); - iocshRegister(&dbPvdTableSizeFuncDef,dbPvdTableSizeCallFunc); - iocshRegister(&scanOnceSetQueueSizeFuncDef,scanOnceSetQueueSizeCallFunc); - iocshRegister(&errlogInitFuncDef,errlogInitCallFunc); - iocshRegister(&errlogInit2FuncDef,errlogInit2CallFunc); -} diff --git a/src/iocsh/iocCoreLimitsRegister.h b/src/iocsh/iocCoreLimitsRegister.h deleted file mode 100644 index ae8f0792b..000000000 --- a/src/iocsh/iocCoreLimitsRegister.h +++ /dev/null @@ -1,28 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* iocCoreLimitsRegister.h */ -/* Author: Marty Kraimer Date: 12DEC2002 */ - -#ifndef INCiocCoreLimitsRegisterH -#define INCiocCoreLimitsRegisterH - -#include "shareLib.h" - -#ifdef __cplusplus -extern "C" { -#endif - -epicsShareFunc void epicsShareAPI iocCoreLimitsRegister(void); - -#ifdef __cplusplus -} -#endif - -#endif /*INCiocCoreLimitsRegisterH*/ diff --git a/src/iocsh/iocUtil.c b/src/iocsh/iocUtil.c deleted file mode 100644 index cac98acff..000000000 --- a/src/iocsh/iocUtil.c +++ /dev/null @@ -1,186 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Saskatchewan -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* iocUtil.c */ -/* Author: W. Eric Norum Date: 02MAY2000 */ - -#include -#include -#include -#include -#include - -#include "osiUnistd.h" -#include "epicsThread.h" -#include "logClient.h" -#include "errlog.h" -#include "epicsRelease.h" - -#define epicsExportSharedSymbols -#include "iocsh.h" -#include "iocUtilRegister.h" - -/* chdir */ -static const iocshArg chdirArg0 = { "directory name",iocshArgString}; -static const iocshArg * const chdirArgs[1] = {&chdirArg0}; -static const iocshFuncDef chdirFuncDef = {"cd",1,chdirArgs}; -static void chdirCallFunc(const iocshArgBuf *args) -{ - int status; - status = chdir(args[0].sval); - if (status) { - printf ("Invalid directory path ignored\n"); - } -} - -/* print current working directory */ -static const iocshFuncDef pwdFuncDef = { "pwd", 0, 0 }; -static void pwdCallFunc (const iocshArgBuf *args) -{ - char buf[256]; - char *pwd = getcwd ( buf, sizeof(buf) - 1 ); - if ( pwd ) { - printf ( "%s\n", pwd ); - } -} - -/* thread (thread information) */ -static const iocshArg threadArg0 = { "[-level] [thread ...]", iocshArgArgv}; -static const iocshArg * const threadArgs[1] = { &threadArg0 }; -static const iocshFuncDef threadFuncDef = {"thread",1,threadArgs}; -static void threadCallFunc(const iocshArgBuf *args) -{ - int i = 1; - int first = 1; - int level = 0; - const char *cp; - epicsThreadId tid; - unsigned long ltmp; - int argc = args[0].aval.ac; - char **argv = args[0].aval.av; - char *endp; - - if ((i < argc) && (*(cp = argv[i]) == '-')) { - level = atoi (cp + 1); - i++; - } - if (i >= argc) { - epicsThreadShowAll (level); - return; - } - for ( ; i < argc ; i++) { - cp = argv[i]; - ltmp = strtoul (cp, &endp, 0); - if (*endp) { - tid = epicsThreadGetId (cp); - if (!tid) { - printf ("*** argument %d (%s) is not a valid thread name ***\n", i, cp); - continue; - } - } - else { - tid = (epicsThreadId)ltmp; - } - if (first) { - epicsThreadShow (0, level); - first = 0; - } - epicsThreadShow (tid, level); - } -} - -/* epicsEnvSet */ -static const iocshArg epicsEnvSetArg0 = { "name",iocshArgString}; -static const iocshArg epicsEnvSetArg1 = { "value",iocshArgString}; -static const iocshArg * const epicsEnvSetArgs[2] = {&epicsEnvSetArg0,&epicsEnvSetArg1}; -static const iocshFuncDef epicsEnvSetFuncDef = {"epicsEnvSet",2,epicsEnvSetArgs}; -static void epicsEnvSetCallFunc(const iocshArgBuf *args) -{ - char *name = args[0].sval; - char *value = args[1].sval; - - if (name == NULL) { - printf ("Missing environment variable name argument.\n"); - return; - } - if (value == NULL) { - printf ("Missing environment variable value argument.\n"); - return; - } - epicsEnvSet (name, value); -} - -/* epicsParamShow */ -static const iocshFuncDef epicsParamShowFuncDef = {"epicsParamShow",0,NULL}; -static void epicsParamShowCallFunc(const iocshArgBuf *args) -{ - epicsPrtEnvParams (); -} - -/* epicsEnvShow */ -static const iocshArg epicsEnvShowArg0 = { "[name]",iocshArgString}; -static const iocshArg * const epicsEnvShowArgs[1] = {&epicsEnvShowArg0}; -static const iocshFuncDef epicsEnvShowFuncDef = {"epicsEnvShow",1,epicsEnvShowArgs}; -static void epicsEnvShowCallFunc(const iocshArgBuf *args) -{ - epicsEnvShow (args[0].sval); -} - -/* iocLogInit */ -static const iocshFuncDef iocLogInitFuncDef = {"iocLogInit",0}; -static void iocLogInitCallFunc(const iocshArgBuf *args) -{ - iocLogInit (); -} - -/* iocLogDisable */ -static const iocshArg iocLogDisableArg0 = {"(0,1)=>(false,true)",iocshArgInt}; -static const iocshArg * const iocLogDisableArgs[1] = {&iocLogDisableArg0}; -static const iocshFuncDef iocLogDisableFuncDef = {"setIocLogDisable",1,iocLogDisableArgs}; -static void iocLogDisableCallFunc(const iocshArgBuf *args) -{ - iocLogDisable = args[0].ival; -} - -/* iocLogShow */ -static const iocshArg iocLogShowArg0 = {"level",iocshArgInt}; -static const iocshArg * const iocLogShowArgs[1] = {&iocLogShowArg0}; -static const iocshFuncDef iocLogShowFuncDef = {"iocLogShow",1,iocLogShowArgs}; -static void iocLogShowCallFunc(const iocshArgBuf *args) -{ - iocLogShow (args[0].ival); -} - -/* eltc */ -static const iocshArg eltcArg0 = {"(0,1)=>(false,true)",iocshArgInt}; -static const iocshArg * const eltcArgs[1] = {&eltcArg0}; -static const iocshFuncDef eltcFuncDef = {"eltc",1,eltcArgs}; -static void eltcCallFunc(const iocshArgBuf *args) -{ - eltc(args[0].ival); -} - -/* coreRelease */ -static const iocshFuncDef coreReleaseFuncDef = {"coreRelease",0,NULL}; -static void coreReleaseCallFunc(const iocshArgBuf *args) -{ - coreRelease (); -} - -void epicsShareAPI iocUtilRegister(void) -{ - iocshRegister(&chdirFuncDef,chdirCallFunc); - iocshRegister(&pwdFuncDef,pwdCallFunc); - iocshRegister(&threadFuncDef,threadCallFunc); - iocshRegister(&epicsEnvSetFuncDef,epicsEnvSetCallFunc); - iocshRegister(&epicsParamShowFuncDef,epicsParamShowCallFunc); - iocshRegister(&epicsEnvShowFuncDef,epicsEnvShowCallFunc); - iocshRegister(&iocLogInitFuncDef,iocLogInitCallFunc); - iocshRegister(&iocLogDisableFuncDef,iocLogDisableCallFunc); - iocshRegister(&iocLogShowFuncDef,iocLogShowCallFunc); - iocshRegister(&eltcFuncDef,eltcCallFunc); - iocshRegister(&coreReleaseFuncDef,coreReleaseCallFunc); -} diff --git a/src/iocsh/iocUtilRegister.h b/src/iocsh/iocUtilRegister.h deleted file mode 100644 index 45236ff8b..000000000 --- a/src/iocsh/iocUtilRegister.h +++ /dev/null @@ -1,25 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Saskatchewan -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* iocUtilRegister.h */ -/* Author: W. Eric Norum Date: 03MAY2000 */ - -#ifndef INCiocUtilRegisterH -#define INCiocUtilRegisterH - -#include "shareLib.h" - -#ifdef __cplusplus -extern "C" { -#endif - -epicsShareFunc void epicsShareAPI iocUtilRegister(void); - -#ifdef __cplusplus -} -#endif - -#endif /*INCiocUtilRegisterH*/ diff --git a/src/iocsh/iocsh.rc b/src/iocsh/iocsh.rc deleted file mode 100755 index 5780e7a4f..000000000 --- a/src/iocsh/iocsh.rc +++ /dev/null @@ -1,36 +0,0 @@ -#include -#include "epicsVersion.h" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL - PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS__WINDOWS32 - FILETYPE VFT_UNKNOWN - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments","Ioc Shell Library for EPICS\0" - VALUE "CompanyName", "The EPICS collaboration\0" - VALUE "FileDescription", "Ioc Shell Library\0" - VALUE "FileVersion", EPICS_VERSION_STRING "\0" - VALUE "InternalName", "iocsh\0" - VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0" - VALUE "OriginalFilename", "iocsh.dll\0" - VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0" - VALUE "ProductVersion", EPICS_VERSION_STRING "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END diff --git a/src/iocsh/iocshHost.rc b/src/iocsh/iocshHost.rc deleted file mode 100755 index c742fc3e8..000000000 --- a/src/iocsh/iocshHost.rc +++ /dev/null @@ -1,36 +0,0 @@ -#include -#include "epicsVersion.h" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL - PRODUCTVERSION EPICS_VERSION,EPICS_REVISION,EPICS_MODIFICATION,EPICS_PATCH_LEVEL - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS VOS__WINDOWS32 - FILETYPE VFT_UNKNOWN - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "Comments","Ioc Shell Host Library for EPICS\0" - VALUE "CompanyName", "The EPICS collaboration\0" - VALUE "FileDescription", "Ioc Shell Host Library\0" - VALUE "FileVersion", EPICS_VERSION_STRING "\0" - VALUE "InternalName", "iocshHost\0" - VALUE "LegalCopyright", "Copyright (C) Univ. of California, Univ. of Chicago\0" - VALUE "OriginalFilename", "iocshHost.dll\0" - VALUE "ProductName", "Experimental Physics and Industrial Control System (EPICS)\0" - VALUE "ProductVersion", EPICS_VERSION_STRING "\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END diff --git a/src/iocsh/iocshRegisterCommon.c b/src/iocsh/iocshRegisterCommon.c deleted file mode 100644 index 71f1cc68d..000000000 --- a/src/iocsh/iocshRegisterCommon.c +++ /dev/null @@ -1,51 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* iocshRegisterCommon.c */ -/* Author: Marty Kraimer Date: 26APR2000 */ - -#include -#include -#include -#include -#include -#include - -#define epicsExportSharedSymbols -#include "iocCoreLimitsRegister.h" -#include "dbStaticRegister.h" -#include "iocUtilRegister.h" -#include "dbTestRegister.h" -#include "dbBkptRegister.h" -#include "dbCaTestRegister.h" -#include "caTestRegister.h" -#include "dbAccessRegister.h" -#include "asTestRegister.h" -#include "envRegister.h" -#include "iocshRegisterCommon.h" -#include "osiRegister.h" -#include "registryRegister.h" -#include "iocsh.h" - -void epicsShareAPI iocshRegisterCommon(void) -{ - iocshPpdbbase = &pdbbase; - iocCoreLimitsRegister(); - osiRegister(); - iocUtilRegister(); - dbStaticRegister(); - dbTestRegister(); - dbBkptRegister(); - dbCaTestRegister(); - caTestRegister(); - dbAccessRegister(); - asTestRegister(); - envRegister(); - registryRegister(); -} diff --git a/src/iocsh/registryRegister.h b/src/iocsh/registryRegister.h deleted file mode 100644 index ae2367496..000000000 --- a/src/iocsh/registryRegister.h +++ /dev/null @@ -1,28 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* registryRegister.h */ -/* Author: Andrew Johnson Date: 24SEP2002 */ - -#ifndef INCregistryRegisterH -#define INCregistryRegisterH - -#include "shareLib.h" - -#ifdef __cplusplus -extern "C" { -#endif - -epicsShareFunc void epicsShareAPI registryRegister(void); - -#ifdef __cplusplus -} -#endif - -#endif /*INCregistryRegisterH*/ diff --git a/src/iocsh/systemCommandRegister.c b/src/iocsh/systemCommandRegister.c deleted file mode 100644 index f9221a6cd..000000000 --- a/src/iocsh/systemCommandRegister.c +++ /dev/null @@ -1,39 +0,0 @@ -/*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne -* National Laboratory. -* Copyright (c) 2002 The Regents of the University of California, as -* Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found -* in file LICENSE that is included with this distribution. -\*************************************************************************/ -/* - * Escape to system command interpreter. To enable this command, add - * registrar(iocshSystemCommand) - * to an application dbd file. - * - * $Id$ - */ -#include -#include -#include -#include - -/* system */ -static const iocshArg systemArg0 = { "command string",iocshArgString}; -static const iocshArg * const systemArgs[1] = {&systemArg0}; -static const iocshFuncDef systemFuncDef = {"system",1,systemArgs}; -static void systemCallFunc(const iocshArgBuf *args) -{ - system(args[0].sval); -} - -static void -iocshSystemCommand(void) -{ - if (system(NULL)) - iocshRegister(&systemFuncDef,systemCallFunc); - else - errlogPrintf ("Can't register 'system' command -- no command interpreter available.\n"); -} -epicsExportRegistrar(iocshSystemCommand); diff --git a/src/libCom/Makefile b/src/libCom/Makefile index fff9aea8a..df12a05de 100644 --- a/src/libCom/Makefile +++ b/src/libCom/Makefile @@ -1,10 +1,9 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* TOP = ../.. @@ -103,6 +102,14 @@ INC += gpHash.h SRCS += gpHashLib.c HTMLS += gpHash/gpHash.html +SRC_DIRS += $(LIBCOM)/iocsh +INC += iocsh.h +INC += registry.h +INC += libComRegister.h +SRCS += iocsh.cpp +SRCS += registry.c +SRCS += libComRegister.c + SRC_DIRS += $(LIBCOM)/logClient INC += iocLog.h INC += logClient.h @@ -235,12 +242,13 @@ SRC_DIRS += $(LIBCOM)/tsDefs INC += tsDefs.h SRCS += tsDefs.c -# For vxWorks a clock +# These files are in osi/os/vxWorks +# IOC Time of Day clock INC_vxWorks += iocClock.h SRCS_vxWorks += iocClock.c -#For vxWorks special reboot hook +# Special reboot hook SRCS_vxWorks += atReboot.cpp -#For old vxWorks applications +# For old vxWorks applications INC_vxWorks += camacLib.h INC_vxWorks += epicsDynLink.h INC_vxWorks += module_types.h @@ -252,6 +260,7 @@ SRCS_vxWorks += logMsgToErrlog.cpp #This forces the vxWorks compatibility stuff to be loaded OBJS_vxWorks = vxComLibrary +# These files are in osi/os/WIN32 SRCS_WIN32 += epicsGetopt.c SRCS_WIN32 += setThreadName.cpp #SRCS_WIN32 += dllmain.cpp @@ -276,12 +285,6 @@ endif PROD_LIBS = Com PROD_SYS_LIBS_WIN32 = ws2_32 advapi32 -#USR_CFLAGS += -DTS_TEST -#TESTPROD_SRCS=tsSubr.c -#TESTPROD_HOST=testtsLib -#TESTPROD_HOST=envtest -#TESTPROD_HOST=osiTimeTest fdManagerTest - # for bldErrSymTbl: # ERR_S_FILES += $(TOP)/src/libCom/osi/devLib.h diff --git a/src/iocsh/iocsh.cpp b/src/libCom/iocsh/iocsh.cpp similarity index 99% rename from src/iocsh/iocsh.cpp rename to src/libCom/iocsh/iocsh.cpp index 1acdaffcc..f0f6a032f 100644 --- a/src/iocsh/iocsh.cpp +++ b/src/libCom/iocsh/iocsh.cpp @@ -19,7 +19,6 @@ #include #include "errlog.h" -#include "dbAccess.h" #include "macLib.h" #include "epicsStdio.h" #include "epicsString.h" diff --git a/src/iocsh/iocsh.h b/src/libCom/iocsh/iocsh.h similarity index 100% rename from src/iocsh/iocsh.h rename to src/libCom/iocsh/iocsh.h diff --git a/src/libCom/iocsh/libComRegister.c b/src/libCom/iocsh/libComRegister.c new file mode 100644 index 000000000..a03762ccb --- /dev/null +++ b/src/libCom/iocsh/libComRegister.c @@ -0,0 +1,290 @@ +/*************************************************************************\ +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne +* National Laboratory. +* Copyright (c) 2002 The University of Saskatchewan +* Copyright (c) 2002 The Regents of the University of California, as +* Operator of Los Alamos National Laboratory. +* EPICS BASE is distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. +\*************************************************************************/ + +#include +#include + +#define epicsExportSharedSymbols +#include "iocsh.h" +#include "epicsThread.h" +#include "epicsMutex.h" +#include "envDefs.h" +#include "osiUnistd.h" +#include "logClient.h" +#include "errlog.h" +#include "libComRegister.h" + + +/* chdir */ +static const iocshArg chdirArg0 = { "directory name",iocshArgString}; +static const iocshArg * const chdirArgs[1] = {&chdirArg0}; +static const iocshFuncDef chdirFuncDef = {"cd",1,chdirArgs}; +static void chdirCallFunc(const iocshArgBuf *args) +{ + int status; + status = chdir(args[0].sval); + if (status) { + printf ("Invalid directory path ignored\n"); + } +} + +/* print current working directory */ +static const iocshFuncDef pwdFuncDef = { "pwd", 0, 0 }; +static void pwdCallFunc (const iocshArgBuf *args) +{ + char buf[256]; + char *pwd = getcwd ( buf, sizeof(buf) - 1 ); + if ( pwd ) { + printf ( "%s\n", pwd ); + } +} + +/* epicsEnvSet */ +static const iocshArg epicsEnvSetArg0 = { "name",iocshArgString}; +static const iocshArg epicsEnvSetArg1 = { "value",iocshArgString}; +static const iocshArg * const epicsEnvSetArgs[2] = {&epicsEnvSetArg0,&epicsEnvSetArg1}; +static const iocshFuncDef epicsEnvSetFuncDef = {"epicsEnvSet",2,epicsEnvSetArgs}; +static void epicsEnvSetCallFunc(const iocshArgBuf *args) +{ + char *name = args[0].sval; + char *value = args[1].sval; + + if (name == NULL) { + printf ("Missing environment variable name argument.\n"); + return; + } + if (value == NULL) { + printf ("Missing environment variable value argument.\n"); + return; + } + epicsEnvSet (name, value); +} + +/* epicsParamShow */ +static const iocshFuncDef epicsParamShowFuncDef = {"epicsParamShow",0,NULL}; +static void epicsParamShowCallFunc(const iocshArgBuf *args) +{ + epicsPrtEnvParams (); +} + +/* epicsPrtEnvParams */ +static const iocshFuncDef epicsPrtEnvParamsFuncDef = {"epicsPrtEnvParams",0,0}; +static void epicsPrtEnvParamsCallFunc(const iocshArgBuf *args) +{ + epicsPrtEnvParams (); +} + +/* epicsEnvShow */ +static const iocshArg epicsEnvShowArg0 = { "[name]",iocshArgString}; +static const iocshArg * const epicsEnvShowArgs[1] = {&epicsEnvShowArg0}; +static const iocshFuncDef epicsEnvShowFuncDef = {"epicsEnvShow",1,epicsEnvShowArgs}; +static void epicsEnvShowCallFunc(const iocshArgBuf *args) +{ + epicsEnvShow (args[0].sval); +} + +/* iocLogInit */ +static const iocshFuncDef iocLogInitFuncDef = {"iocLogInit",0}; +static void iocLogInitCallFunc(const iocshArgBuf *args) +{ + iocLogInit (); +} + +/* iocLogDisable */ +static const iocshArg iocLogDisableArg0 = {"(0,1)=>(false,true)",iocshArgInt}; +static const iocshArg * const iocLogDisableArgs[1] = {&iocLogDisableArg0}; +static const iocshFuncDef iocLogDisableFuncDef = {"setIocLogDisable",1,iocLogDisableArgs}; +static void iocLogDisableCallFunc(const iocshArgBuf *args) +{ + iocLogDisable = args[0].ival; +} + +/* iocLogShow */ +static const iocshArg iocLogShowArg0 = {"level",iocshArgInt}; +static const iocshArg * const iocLogShowArgs[1] = {&iocLogShowArg0}; +static const iocshFuncDef iocLogShowFuncDef = {"iocLogShow",1,iocLogShowArgs}; +static void iocLogShowCallFunc(const iocshArgBuf *args) +{ + iocLogShow (args[0].ival); +} + +/* eltc */ +static const iocshArg eltcArg0 = {"(0,1)=>(false,true)",iocshArgInt}; +static const iocshArg * const eltcArgs[1] = {&eltcArg0}; +static const iocshFuncDef eltcFuncDef = {"eltc",1,eltcArgs}; +static void eltcCallFunc(const iocshArgBuf *args) +{ + eltc(args[0].ival); +} + +/* errlogInit */ +static const iocshArg errlogInitArg0 = { "bufsize",iocshArgInt}; +static const iocshArg * const errlogInitArgs[1] = {&errlogInitArg0}; +static const iocshFuncDef errlogInitFuncDef = + {"errlogInit",1,errlogInitArgs}; +static void errlogInitCallFunc(const iocshArgBuf *args) +{ + errlogInit(args[0].ival); +} + +/* errlogInit2 */ +static const iocshArg errlogInit2Arg0 = { "bufSize",iocshArgInt}; +static const iocshArg errlogInit2Arg1 = { "maxMsgSize",iocshArgInt}; +static const iocshArg * const errlogInit2Args[] = + {&errlogInit2Arg0, &errlogInit2Arg1}; +static const iocshFuncDef errlogInit2FuncDef = + {"errlogInit2", 2, errlogInit2Args}; +static void errlogInit2CallFunc(const iocshArgBuf *args) +{ + errlogInit2(args[0].ival, args[1].ival); +} + +/* epicsThreadShowAll */ +static const iocshArg epicsThreadShowAllArg0 = { "level",iocshArgInt}; +static const iocshArg * const epicsThreadShowAllArgs[1] = {&epicsThreadShowAllArg0}; +static const iocshFuncDef epicsThreadShowAllFuncDef = + {"epicsThreadShowAll",1,epicsThreadShowAllArgs}; +static void epicsThreadShowAllCallFunc(const iocshArgBuf *args) +{ + epicsThreadShowAll(args[0].ival); +} + +/* thread (thread information) */ +static const iocshArg threadArg0 = { "[-level] [thread ...]", iocshArgArgv}; +static const iocshArg * const threadArgs[1] = { &threadArg0 }; +static const iocshFuncDef threadFuncDef = {"thread",1,threadArgs}; +static void threadCallFunc(const iocshArgBuf *args) +{ + int i = 1; + int first = 1; + int level = 0; + const char *cp; + epicsThreadId tid; + unsigned long ltmp; + int argc = args[0].aval.ac; + char **argv = args[0].aval.av; + char *endp; + + if ((i < argc) && (*(cp = argv[i]) == '-')) { + level = atoi (cp + 1); + i++; + } + if (i >= argc) { + epicsThreadShowAll (level); + return; + } + for ( ; i < argc ; i++) { + cp = argv[i]; + ltmp = strtoul (cp, &endp, 0); + if (*endp) { + tid = epicsThreadGetId (cp); + if (!tid) { + printf ("*** argument %d (%s) is not a valid thread name ***\n", i, cp); + continue; + } + } + else { + tid = (epicsThreadId)ltmp; + } + if (first) { + epicsThreadShow (0, level); + first = 0; + } + epicsThreadShow (tid, level); + } +} + +/* epicsMutexShowAll */ +static const iocshArg epicsMutexShowAllArg0 = { "onlyLocked",iocshArgInt}; +static const iocshArg epicsMutexShowAllArg1 = { "level",iocshArgInt}; +static const iocshArg * const epicsMutexShowAllArgs[2] = + {&epicsMutexShowAllArg0,&epicsMutexShowAllArg1}; +static const iocshFuncDef epicsMutexShowAllFuncDef = + {"epicsMutexShowAll",1,epicsMutexShowAllArgs}; +static void epicsMutexShowAllCallFunc(const iocshArgBuf *args) +{ + epicsMutexShowAll(args[0].ival,args[1].ival); +} + +/* epicsThreadSleep */ +static const iocshArg epicsThreadSleepArg0 = { "seconds",iocshArgDouble}; +static const iocshArg * const epicsThreadSleepArgs[1] = {&epicsThreadSleepArg0}; +static const iocshFuncDef epicsThreadSleepFuncDef = + {"epicsThreadSleep",1,epicsThreadSleepArgs}; +static void epicsThreadSleepCallFunc(const iocshArgBuf *args) +{ + epicsThreadSleep(args[0].dval); +} + +/* epicsThreadResume */ +static const iocshArg epicsThreadResumeArg0 = { "[thread ...]", iocshArgArgv}; +static const iocshArg * const epicsThreadResumeArgs[1] = { &epicsThreadResumeArg0 }; +static const iocshFuncDef epicsThreadResumeFuncDef = {"epicsThreadResume",1,epicsThreadResumeArgs}; +static void epicsThreadResumeCallFunc(const iocshArgBuf *args) +{ + int i; + const char *cp; + epicsThreadId tid; + unsigned long ltmp; + char nameBuf[64]; + int argc = args[0].aval.ac; + char **argv = args[0].aval.av; + char *endp; + + for (i = 1 ; i < argc ; i++) { + cp = argv[i]; + ltmp = strtoul(cp, &endp, 0); + if (*endp) { + tid = epicsThreadGetId(cp); + if (!tid) { + printf("*** argument %d (%s) is not a valid thread name ***\n", i, cp); + continue; + } + } + else { + tid =(epicsThreadId)ltmp; + epicsThreadGetName(tid, nameBuf, sizeof nameBuf); + if (nameBuf[0] == '\0') { + printf("*** argument %d (%s) is not a valid thread id ***\n", i, cp); + continue; + } + + } + if (!epicsThreadIsSuspended(tid)) { + printf("*** Thread %s is not suspended ***\n", cp); + continue; + } + epicsThreadResume(tid); + } +} + +void epicsShareAPI libComRegister(void) +{ + iocshRegister(&chdirFuncDef, chdirCallFunc); + iocshRegister(&pwdFuncDef, pwdCallFunc); + + iocshRegister(&epicsEnvSetFuncDef, epicsEnvSetCallFunc); + iocshRegister(&epicsParamShowFuncDef, epicsParamShowCallFunc); + iocshRegister(&epicsPrtEnvParamsFuncDef, epicsPrtEnvParamsCallFunc); + iocshRegister(&epicsEnvShowFuncDef, epicsEnvShowCallFunc); + + iocshRegister(&iocLogInitFuncDef, iocLogInitCallFunc); + iocshRegister(&iocLogDisableFuncDef, iocLogDisableCallFunc); + iocshRegister(&iocLogShowFuncDef, iocLogShowCallFunc); + iocshRegister(&eltcFuncDef, eltcCallFunc); + iocshRegister(&errlogInitFuncDef,errlogInitCallFunc); + iocshRegister(&errlogInit2FuncDef,errlogInit2CallFunc); + + iocshRegister(&epicsThreadShowAllFuncDef,epicsThreadShowAllCallFunc); + iocshRegister(&threadFuncDef, threadCallFunc); + iocshRegister(&epicsMutexShowAllFuncDef,epicsMutexShowAllCallFunc); + iocshRegister(&epicsThreadSleepFuncDef,epicsThreadSleepCallFunc); + iocshRegister(&epicsThreadResumeFuncDef,epicsThreadResumeCallFunc); +} diff --git a/src/libCom/iocsh/libComRegister.h b/src/libCom/iocsh/libComRegister.h new file mode 100644 index 000000000..ef93f4a8d --- /dev/null +++ b/src/libCom/iocsh/libComRegister.h @@ -0,0 +1,23 @@ +/*************************************************************************\ +* Copyright (c) 2007 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. +\*************************************************************************/ + +#ifndef INC_libComRegister_H +#define INC_libComRegister_H + +#include "shareLib.h" + +#ifdef __cplusplus +extern "C" { +#endif + +epicsShareFunc void epicsShareAPI libComRegister(void); + +#ifdef __cplusplus +} +#endif + +#endif /* INC_libComRegister_H */ diff --git a/src/iocsh/osiRegister.c b/src/libCom/iocsh/osiRegister.c similarity index 71% rename from src/iocsh/osiRegister.c rename to src/libCom/iocsh/osiRegister.c index 94896f055..1c2a9b606 100644 --- a/src/iocsh/osiRegister.c +++ b/src/libCom/iocsh/osiRegister.c @@ -1,26 +1,19 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* osiRegister.c */ -/* Author: Marty Kraimer Date: 01MAY2000 */ -#include -#include #include #include -#include +#include "iocsh.h" #include "epicsThread.h" #include "epicsMutex.h" -#include "dbEvent.h" #define epicsExportSharedSymbols -#include "iocsh.h" #include "osiRegister.h" /* epicsThreadShowAll */ @@ -33,6 +26,51 @@ static void epicsThreadShowAllCallFunc(const iocshArgBuf *args) epicsThreadShowAll(args[0].ival); } +/* thread (thread information) */ +static const iocshArg threadArg0 = { "[-level] [thread ...]", iocshArgArgv}; +static const iocshArg * const threadArgs[1] = { &threadArg0 }; +static const iocshFuncDef threadFuncDef = {"thread",1,threadArgs}; +static void threadCallFunc(const iocshArgBuf *args) +{ + int i = 1; + int first = 1; + int level = 0; + const char *cp; + epicsThreadId tid; + unsigned long ltmp; + int argc = args[0].aval.ac; + char **argv = args[0].aval.av; + char *endp; + + if ((i < argc) && (*(cp = argv[i]) == '-')) { + level = atoi (cp + 1); + i++; + } + if (i >= argc) { + epicsThreadShowAll (level); + return; + } + for ( ; i < argc ; i++) { + cp = argv[i]; + ltmp = strtoul (cp, &endp, 0); + if (*endp) { + tid = epicsThreadGetId (cp); + if (!tid) { + printf ("*** argument %d (%s) is not a valid thread name ***\n", i, cp); + continue; + } + } + else { + tid = (epicsThreadId)ltmp; + } + if (first) { + epicsThreadShow (0, level); + first = 0; + } + epicsThreadShow (tid, level); + } +} + /* epicsMutexShowAll */ static const iocshArg epicsMutexShowAllArg0 = { "onlyLocked",iocshArgInt}; static const iocshArg epicsMutexShowAllArg1 = { "level",iocshArgInt}; @@ -100,6 +138,7 @@ static void epicsThreadResumeCallFunc(const iocshArgBuf *args) void epicsShareAPI osiRegister(void) { iocshRegister(&epicsThreadShowAllFuncDef,epicsThreadShowAllCallFunc); + iocshRegister(&threadFuncDef, threadCallFunc); iocshRegister(&epicsMutexShowAllFuncDef,epicsMutexShowAllCallFunc); iocshRegister(&epicsThreadSleepFuncDef,epicsThreadSleepCallFunc); iocshRegister(&epicsThreadResumeFuncDef,epicsThreadResumeCallFunc); diff --git a/src/iocsh/osiRegister.h b/src/libCom/iocsh/osiRegister.h similarity index 100% rename from src/iocsh/osiRegister.h rename to src/libCom/iocsh/osiRegister.h diff --git a/src/registry/registry.c b/src/libCom/iocsh/registry.c similarity index 100% rename from src/registry/registry.c rename to src/libCom/iocsh/registry.c diff --git a/src/registry/registry.h b/src/libCom/iocsh/registry.h similarity index 100% rename from src/registry/registry.h rename to src/libCom/iocsh/registry.h diff --git a/src/misc/Makefile b/src/misc/Makefile index 0eb546395..a6f0ef4b5 100644 --- a/src/misc/Makefile +++ b/src/misc/Makefile @@ -13,17 +13,21 @@ include $(TOP)/configure/CONFIG DBD += base.dbd -INC += epicsRelease.h -INC += iocInit.h +INC += epicsRelease.h +INC += iocInit.h +INC += miscIocRegister.h +INC += iocshRegisterCommon.h -LIBSRCS += epicsRelease.c -LIBSRCS += iocInit.c -LIBSRCS += asSubRecordFunctions.c +LIB_SRCS += epicsRelease.c +LIB_SRCS += iocInit.c +LIB_SRCS += asSubRecordFunctions.c +LIB_SRCS += miscIocRegister.c +LIB_SRCS += iocshRegisterCommon.c LIBRARY_IOC = miscIoc miscIoc_RCS_WIN32 = miscIoc.rc -miscIoc_LIBS = rsrvIoc asIoc dbIoc registryIoc dbStaticIoc ca Com +miscIoc_LIBS = rsrvIoc asIoc dbtoolsIoc dbIoc registryIoc dbStaticIoc ca Com # For R3.13 compatibility only ifeq ($(strip $(COMPAT_313)),YES) diff --git a/src/misc/iocshRegisterCommon.c b/src/misc/iocshRegisterCommon.c new file mode 100644 index 000000000..2cf35ea55 --- /dev/null +++ b/src/misc/iocshRegisterCommon.c @@ -0,0 +1,36 @@ +/*************************************************************************\ +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne +* National Laboratory. +* Copyright (c) 2002 The Regents of the University of California, as +* Operator of Los Alamos National Laboratory. +* EPICS BASE is distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. +\*************************************************************************/ + +#include "iocsh.h" +#include "dbAccess.h" +#include "dbStaticIocRegister.h" +#include "registryIocRegister.h" +#include "asIocRegister.h" +#include "dbIocRegister.h" +#include "dbtoolsIocRegister.h" +#include "rsrvIocRegister.h" +#include "miscIocRegister.h" +#include "libComRegister.h" + +#define epicsExportSharedSymbols +#include "iocshRegisterCommon.h" + +void epicsShareAPI iocshRegisterCommon(void) +{ + iocshPpdbbase = &pdbbase; + + dbStaticIocRegister(); + registryIocRegister(); + dbIocRegister(); + dbtoolsIocRegister(); + asIocRegister(); + rsrvIocRegister(); + miscIocRegister(); + libComRegister(); +} diff --git a/src/iocsh/iocshRegisterCommon.h b/src/misc/iocshRegisterCommon.h similarity index 80% rename from src/iocsh/iocshRegisterCommon.h rename to src/misc/iocshRegisterCommon.h index 18a3c57f6..6327d7c68 100644 --- a/src/iocsh/iocshRegisterCommon.h +++ b/src/misc/iocshRegisterCommon.h @@ -1,10 +1,9 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ /* iocshRegisterCommon.h */ diff --git a/src/misc/miscIocRegister.c b/src/misc/miscIocRegister.c new file mode 100644 index 000000000..2de0c092b --- /dev/null +++ b/src/misc/miscIocRegister.c @@ -0,0 +1,65 @@ +/*************************************************************************\ +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne +* National Laboratory. +* Copyright (c) 2002 The Regents of the University of California, as +* Operator of Los Alamos National Laboratory. +* EPICS BASE is distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. +\*************************************************************************/ + +#include + +#include "iocsh.h" +#include "errlog.h" +#include "epicsExport.h" + +#define epicsExportSharedSymbols +#include "iocInit.h" +#include "epicsRelease.h" +#include "miscIocRegister.h" + +/* iocInit */ +static const iocshFuncDef iocInitFuncDef = + {"iocInit",0,NULL}; +static void iocInitCallFunc(const iocshArgBuf *args) +{ + iocInit(); +} + +/* coreRelease */ +static const iocshFuncDef coreReleaseFuncDef = {"coreRelease",0,NULL}; +static void coreReleaseCallFunc(const iocshArgBuf *args) +{ + coreRelease (); +} + + +void epicsShareAPI miscIocRegister(void) +{ + iocshRegister(&iocInitFuncDef,iocInitCallFunc); + iocshRegister(&coreReleaseFuncDef, coreReleaseCallFunc); +} + + +/* system -- escape to system command interpreter. + * + * Disabled by default, for security reasons. To enable this command, add + * registrar(iocshSystemCommand) + * to an application dbd file. + */ +static const iocshArg systemArg0 = { "command string",iocshArgString}; +static const iocshArg * const systemArgs[] = {&systemArg0}; +static const iocshFuncDef systemFuncDef = {"system",1,systemArgs}; +static void systemCallFunc(const iocshArgBuf *args) +{ + system(args[0].sval); +} + +static void iocshSystemCommand(void) +{ + if (system(NULL)) + iocshRegister(&systemFuncDef, systemCallFunc); + else + errlogPrintf ("Can't register 'system' command -- no command interpreter available.\n"); +} +epicsExportRegistrar(iocshSystemCommand); diff --git a/src/iocsh/envRegister.h b/src/misc/miscIocRegister.h similarity index 56% rename from src/iocsh/envRegister.h rename to src/misc/miscIocRegister.h index 8e53c0833..28f67796e 100644 --- a/src/iocsh/envRegister.h +++ b/src/misc/miscIocRegister.h @@ -1,17 +1,14 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 The University of Chicago, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* envRegister.h */ -/* Author: Marty Kraimer Date: 19MAY2000 */ -#ifndef INCenvRegisterH -#define INCenvRegisterH +#ifndef INC_miscIocRegister_H +#define INC_miscIocRegister_H #include "shareLib.h" @@ -19,10 +16,10 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI envRegister(void); +epicsShareFunc void epicsShareAPI miscIocRegister(void); #ifdef __cplusplus } #endif -#endif /*INCenvRegisterH*/ +#endif /* INC_miscIocRegister_H */ diff --git a/src/registry/Makefile b/src/registry/Makefile index a8508c4c3..6203b9afa 100644 --- a/src/registry/Makefile +++ b/src/registry/Makefile @@ -1,38 +1,39 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* TOP=../.. + include $(TOP)/configure/CONFIG -INC += registry.h INC += registryRecordType.h INC += registryDeviceSupport.h INC += registryDriverSupport.h INC += registryFunction.h - +INC += registryCommon.h +INC += registryIocRegister.h SCRIPTS_HOST += registerRecordDeviceDriver.pl -LIBSRCS += registry.c -LIBSRCS += registryRecordType.c -LIBSRCS += registryDeviceSupport.c -LIBSRCS += registryDriverSupport.c -LIBSRCS += registryFunction.c +LIB_SRCS += registryRecordType.c +LIB_SRCS += registryDeviceSupport.c +LIB_SRCS += registryDriverSupport.c +LIB_SRCS += registryFunction.c +LIB_SRCS += registryCommon.c +LIB_SRCS += registryIocRegister.c LIBRARY_IOC = registryIoc -registryIoc_LIBS = Com +registryIoc_LIBS = Com dbStaticIoc registryIoc_RCS_WIN32 = registryIoc.rc ifeq ($(strip $(COMPAT_313)),YES) OBJLIB_vxWorks = registryIoc -OBJLIB_SRCS = $(LIBSRCS) +OBJLIB_SRCS = $(LIB_SRCS) endif include $(TOP)/configure/RULES diff --git a/src/registry/registerRecordDeviceDriver.pl b/src/registry/registerRecordDeviceDriver.pl index b1eedd602..fc1f68308 100755 --- a/src/registry/registerRecordDeviceDriver.pl +++ b/src/registry/registerRecordDeviceDriver.pl @@ -48,9 +48,13 @@ close(INP) or die "$! closing file"; # beginning of generated routine -print "/* THIS IS A GENERATED FILE. DO NOT EDIT */\n", - "/* Generated from $file */\n\n", - "#include \"registryCommon.h\"\n\n", +print "/* THIS IS A GENERATED FILE. DO NOT EDIT! */\n", + "/* Generated from $file */\n", + "\n", + "#include \"registryCommon.h\"\n", + "#include \"iocsh.h\"\n", + "#include \"iocshRegisterCommon.h\"\n", + "\n", "extern \"C\" {\n"; #definitions for recordtype @@ -182,14 +186,13 @@ static const iocshFuncDef registerRecordDeviceDriverFuncDef = {"$subname",1,registerRecordDeviceDriverArgs}; static void registerRecordDeviceDriverCallFunc(const iocshArgBuf *) { - $subname(pdbbase); + $subname(*iocshPpdbbase); } } // extern "C" /* * Register commands on application startup */ -#include "iocshRegisterCommon.h" class IoccrfReg { public: IoccrfReg() { diff --git a/src/iocsh/registryCommon.c b/src/registry/registryCommon.c similarity index 90% rename from src/iocsh/registryCommon.c rename to src/registry/registryCommon.c index ef3bdd49a..0d2de4b15 100644 --- a/src/iocsh/registryCommon.c +++ b/src/registry/registryCommon.c @@ -1,10 +1,9 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ @@ -14,19 +13,13 @@ * Date: 2004-03-19 */ -#include -#include -#include -#include -#include - #include "dbBase.h" #include "shareLib.h" #include "errlog.h" -#include "registryDeviceSupport.h" -#include "registryDriverSupport.h" #define epicsExportSharedSymbols +#include "registryDeviceSupport.h" +#include "registryDriverSupport.h" #include "registryCommon.h" diff --git a/src/iocsh/registryCommon.h b/src/registry/registryCommon.h similarity index 77% rename from src/iocsh/registryCommon.h rename to src/registry/registryCommon.h index ff76f8141..ea851f9e9 100644 --- a/src/iocsh/registryCommon.h +++ b/src/registry/registryCommon.h @@ -1,23 +1,16 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ /* registryCommon.h */ -#include "dbBase.h" #include "dbStaticLib.h" -#include "dbAccess.h" -#include "devSup.h" -#include "drvSup.h" -#include "recSup.h" #include "registryRecordType.h" -#include "iocsh.h" #include "shareLib.h" #ifdef __cplusplus diff --git a/src/registry/registryDeviceSupport.h b/src/registry/registryDeviceSupport.h index 89885f192..9c5f9a0e2 100644 --- a/src/registry/registryDeviceSupport.h +++ b/src/registry/registryDeviceSupport.h @@ -1,16 +1,17 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ + #ifndef INCregistryDeviceSupporth #define INCregistryDeviceSupporth #include "shareLib.h" +#include "devSup.h" #ifdef __cplusplus extern "C" { diff --git a/src/registry/registryDriverSupport.h b/src/registry/registryDriverSupport.h index 495c59ec2..e8e427452 100644 --- a/src/registry/registryDriverSupport.h +++ b/src/registry/registryDriverSupport.h @@ -1,16 +1,17 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ + #ifndef INCregistryDriverSupporth #define INCregistryDriverSupporth #include "shareLib.h" +#include "drvSup.h" #ifdef __cplusplus extern "C" { diff --git a/src/iocsh/registryRegister.c b/src/registry/registryIocRegister.c similarity index 82% rename from src/iocsh/registryRegister.c rename to src/registry/registryIocRegister.c index 1c517658f..cedc10607 100644 --- a/src/iocsh/registryRegister.c +++ b/src/registry/registryIocRegister.c @@ -1,31 +1,20 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* registerRegister.c */ -/* Author: Andrew Johnson Date: 24SEP2002 */ -#include -#include -#include -#include -#include +#include "iocsh.h" -#include "devSup.h" -#include "drvSup.h" +#define epicsExportSharedSymbols #include "registryRecordType.h" #include "registryDeviceSupport.h" #include "registryDriverSupport.h" #include "registryFunction.h" - -#define epicsExportSharedSymbols -#include "iocsh.h" -#include "registryRegister.h" +#include "registryIocRegister.h" static const iocshArg registryXxxFindArg0 = { "name",iocshArgString}; static const iocshArg * const registryXxxFindArgs[1] = {®istryXxxFindArg0}; @@ -58,7 +47,7 @@ static void registryFunctionFindCallFunc(const iocshArgBuf *args) { printf("%p\n", (void*) registryFunctionFind(args[0].sval)); } -void epicsShareAPI registryRegister(void) +void epicsShareAPI registryIocRegister(void) { iocshRegister(®istryRecordTypeFindFuncDef,registryRecordTypeFindCallFunc); iocshRegister(®istryDeviceSupportFindFuncDef,registryDeviceSupportFindCallFunc); diff --git a/src/registry/registryIocRegister.h b/src/registry/registryIocRegister.h new file mode 100644 index 000000000..2f9fdd3c3 --- /dev/null +++ b/src/registry/registryIocRegister.h @@ -0,0 +1,25 @@ +/*************************************************************************\ +* Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne +* National Laboratory. +* Copyright (c) 2002 The Regents of the University of California, as +* Operator of Los Alamos National Laboratory. +* EPICS BASE is distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. +\*************************************************************************/ + +#ifndef INC_registryIocRegister_H +#define INC_registryIocRegister_H + +#include "shareLib.h" + +#ifdef __cplusplus +extern "C" { +#endif + +epicsShareFunc void epicsShareAPI registryIocRegister(void); + +#ifdef __cplusplus +} +#endif + +#endif /* INC_registryIocRegister_H */ diff --git a/src/registry/registryRecordType.h b/src/registry/registryRecordType.h index ca5f80192..49582bb66 100644 --- a/src/registry/registryRecordType.h +++ b/src/registry/registryRecordType.h @@ -10,6 +10,7 @@ #ifndef INCregistryRecordTypeh #define INCregistryRecordTypeh +#include "recSup.h" #include "shareLib.h" #ifdef __cplusplus diff --git a/src/rsrv/Makefile b/src/rsrv/Makefile index 771bcc6b2..8002e64d8 100644 --- a/src/rsrv/Makefile +++ b/src/rsrv/Makefile @@ -1,13 +1,11 @@ #************************************************************************* -# Copyright (c) 2002 The University of Chicago, as Operator of Argonne +# Copyright (c) 2007 UChicago Argonne LLC, as Operator of Argonne # National Laboratory. # Copyright (c) 2002 The Regents of the University of California, as # Operator of Los Alamos National Laboratory. -# EPICS BASE Versions 3.13.7 -# and higher are distributed subject to a Software License Agreement found +# EPICS BASE is distributed subject to a Software License Agreement found # in file LICENSE that is included with this distribution. #************************************************************************* - TOP=../.. include $(TOP)/configure/CONFIG @@ -15,16 +13,20 @@ include $(TOP)/configure/CONFIG USR_INCLUDES = -I../../ca INC += rsrv.h +INC += rsrvIocRegister.h -LIBSRCS += caserverio.c -LIBSRCS += caservertask.c -LIBSRCS += camsgtask.c -LIBSRCS += camessage.c -LIBSRCS += cast_server.c -LIBSRCS += online_notify.c +LIB_SRCS += caserverio.c +LIB_SRCS += caservertask.c +LIB_SRCS += camsgtask.c +LIB_SRCS += camessage.c +LIB_SRCS += cast_server.c +LIB_SRCS += online_notify.c +LIB_SRCS += rsrvIocRegister.c LIBRARY_IOC = rsrvIoc -rsrvIoc_LIBS = asIoc dbIoc ca Com + +rsrvIoc_LIBS = asIoc dbIoc ca Com + rsrvIoc_SYS_LIBS_WIN32 := ws2_32 rsrvIoc_RCS_WIN32 = rsrvIoc.rc diff --git a/src/rsrv/rsrvIocRegister.c b/src/rsrv/rsrvIocRegister.c new file mode 100644 index 000000000..a713a0bd7 --- /dev/null +++ b/src/rsrv/rsrvIocRegister.c @@ -0,0 +1,28 @@ +/*************************************************************************\ +* Copyright (c) 2007 The University of Chicago, as Operator of Argonne +* National Laboratory. +* Copyright (c) 2002 The Regents of the University of California, as +* Operator of Los Alamos National Laboratory. +* EPICS BASE is distributed subject to a Software License Agreement found +* in file LICENSE that is included with this distribution. +\*************************************************************************/ + +#include "iocsh.h" +#define epicsExportSharedSymbols +#include "rsrv.h" +#include "rsrvIocRegister.h" + +/* casr */ +static const iocshArg casrArg0 = { "level",iocshArgInt}; +static const iocshArg * const casrArgs[1] = {&casrArg0}; +static const iocshFuncDef casrFuncDef = {"casr",1,casrArgs}; +static void casrCallFunc(const iocshArgBuf *args) +{ + casr(args[0].ival); +} + + +void epicsShareAPI rsrvIocRegister(void) +{ + iocshRegister(&casrFuncDef,casrCallFunc); +} diff --git a/src/iocsh/dbTestRegister.h b/src/rsrv/rsrvIocRegister.h similarity index 55% rename from src/iocsh/dbTestRegister.h rename to src/rsrv/rsrvIocRegister.h index edece9fff..5f83a03d3 100644 --- a/src/iocsh/dbTestRegister.h +++ b/src/rsrv/rsrvIocRegister.h @@ -1,17 +1,14 @@ /*************************************************************************\ -* Copyright (c) 2002 The University of Chicago, as Operator of Argonne +* Copyright (c) 2007 The University of Chicago, as Operator of Argonne * National Laboratory. * Copyright (c) 2002 The Regents of the University of California, as * Operator of Los Alamos National Laboratory. -* EPICS BASE Versions 3.13.7 -* and higher are distributed subject to a Software License Agreement found +* EPICS BASE is distributed subject to a Software License Agreement found * in file LICENSE that is included with this distribution. \*************************************************************************/ -/* dbTestRegister.h */ -/* Author: Marty Kraimer Date: 27APR2000 */ -#ifndef INCdbTestRegisterH -#define INCdbTestRegisterH +#ifndef INC_rsrvIocRegister_H +#define INC_rsrvIocRegister_H #include "shareLib.h" @@ -19,10 +16,10 @@ extern "C" { #endif -epicsShareFunc void epicsShareAPI dbTestRegister(void); +epicsShareFunc void epicsShareAPI rsrvIocRegister(void); #ifdef __cplusplus } #endif -#endif /*INCdbTestRegisterH*/ +#endif /* INC_rsrvIocRegister_H */