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

rename dynamic_registerRecordDeviceDriver -> registerAllRecordDeviceDrivers

Browse Source
This commit is contained in:
Michael Davidsaver
2020-06-15 13:58:33 -07:00
parent 9e3d5d52ab
commit e40970bd5e
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/database/src/ioc/misc/Makefile
View File

@@ -25,6 +25,6 @@ dbCore_SRCS += iocInit.c
dbCore_SRCS += miscIocRegister.c
dbCore_SRCS += dlload.c
dbCore_SRCS += iocshRegisterCommon.c
dbCore_SRCS += dynamic_registerRecordDeviceDriver.cpp
dbCore_SRCS += registerAllRecordDeviceDrivers.cpp
miscIocRegister_CFLAGS_iOS = -DSYSTEM_UNAVAILABLE

6
modules/database/src/ioc/misc/iocshRegisterCommon.c
View File

@@ -26,14 +26,14 @@
#define quote(v) #v
#define str(v) quote(v)
/* dynamic_registerRecordDeviceDriver */
/* registerAllRecordDeviceDrivers */
static const iocshArg rrddArg0 = {"pdbbase", iocshArgPdbbase};
static const iocshArg *rrddArgs[] = {&rrddArg0};
static const iocshFuncDef rrddFuncDef =
{"dynamic_registerRecordDeviceDriver", 1, rrddArgs};
{"registerAllRecordDeviceDrivers", 1, rrddArgs};
static void rrddCallFunc(const iocshArgBuf *args)
{
iocshSetError(dynamic_registerRecordDeviceDriver(*iocshPpdbbase));
iocshSetError(registerAllRecordDeviceDrivers(*iocshPpdbbase));
}
void iocshRegisterCommon(void)

2
modules/database/src/ioc/misc/iocshRegisterCommon.h
View File

@@ -26,7 +26,7 @@ epicsShareFunc void iocshRegisterCommon(void);
epicsShareFunc
long
dynamic_registerRecordDeviceDriver(struct dbBase *pdbbase);
registerAllRecordDeviceDrivers(struct dbBase *pdbbase);
epicsShareFunc
void runRegistrarOnce(void (*reg_func)(void));

4
modules/database/src/ioc/misc/dynamic_registerRecordDeviceDriver.cpp → modules/database/src/ioc/misc/registerAllRecordDeviceDrivers.cpp
View File

@@ -98,12 +98,12 @@ void clearRegistrarOnce()
}
long
dynamic_registerRecordDeviceDriver(DBBASE *pdbbase)
registerAllRecordDeviceDrivers(DBBASE *pdbbase)
{
DBENTRY entry;
if(!pdbbase) {
fprintf(stderr, "Must call dbLoadRecords() before dynamic_registerRecordDeviceDriver(pdbbase)\n");
fprintf(stderr, "Must call dbLoadRecords() before registerAllRecordDeviceDrivers(pdbbase)\n");
return 1;
}

6
modules/database/test/std/rec/analogMonitorTest.c
View File

@@ -162,10 +162,10 @@ MAIN(analogMonitorTest)
"../O.Common" OSI_PATH_LIST_SEPARATOR "O.Common", NULL))
testAbort("Error reading database description 'analogMonitorTest.dbd'");
/* testing dynamic_registerRecordDeviceDriver() */
dynamic_registerRecordDeviceDriver(pdbbase);
/* testing registerAllRecordDeviceDrivers() */
registerAllRecordDeviceDrivers(pdbbase);
analogMonitorTest_registerRecordDeviceDriver(pdbbase);
dynamic_registerRecordDeviceDriver(pdbbase);
registerAllRecordDeviceDrivers(pdbbase);
if (dbReadDatabase(&pdbbase, "analogMonitorTest.db",
"." OSI_PATH_LIST_SEPARATOR "..", NULL))