diff --git a/modules/database/src/ioc/misc/Makefile b/modules/database/src/ioc/misc/Makefile index 7949e3807..c01ed3786 100644 --- a/modules/database/src/ioc/misc/Makefile +++ b/modules/database/src/ioc/misc/Makefile @@ -11,10 +11,10 @@ SRC_DIRS += $(IOCDIR)/misc -# Include afterInit module with afterInit=YES -ifeq ($(afterInit),YES) -DBD += afterInit.dbd -dbCore_SRCS += afterInit.c +# Include atInit module with atInit=YES +ifeq ($(atInit),YES) +DBD += atInit.dbd +dbCore_SRCS += atInit.c endif DBD += system.dbd diff --git a/modules/database/src/ioc/misc/afterInit.dbd b/modules/database/src/ioc/misc/afterInit.dbd deleted file mode 100644 index 27957a4df..000000000 --- a/modules/database/src/ioc/misc/afterInit.dbd +++ /dev/null @@ -1 +0,0 @@ -registrar(afterInitRegister) diff --git a/modules/database/src/ioc/misc/afterInit.c b/modules/database/src/ioc/misc/atInit.c similarity index 66% rename from modules/database/src/ioc/misc/afterInit.c rename to modules/database/src/ioc/misc/atInit.c index 69e4c276d..04567b327 100644 --- a/modules/database/src/ioc/misc/afterInit.c +++ b/modules/database/src/ioc/misc/atInit.c @@ -1,5 +1,5 @@ /* Copyright (C) 2020 Dirk Zimoch */ -/* Copyright (C) 2020-2024 European Spallation Source, ERIC */ +/* Copyright (C) 2020-2025 European Spallation Source, ERIC */ #include #include @@ -16,11 +16,11 @@ // Version within the message static const char helpMessage[] = - "afterInit version 2.0.1\n" + "atInit version 2.0.1\n" "Allows you to define commands to be run after the iocInit\n" "Example commands:\n" - " afterInit \"dbpf \"\n" - " afterInit \"date\"\n"; + " atInit \"dbpf \"\n" + " atInit \"date\"\n"; struct cmditem { @@ -30,7 +30,7 @@ struct cmditem static ELLLIST cmdlist; -static void afterInitHook(initHookState state) +static void atInitHook(initHookState state) { if(state != initHookAfterIocRunning) return; @@ -42,7 +42,7 @@ static void afterInitHook(initHookState state) epicsStdoutPrintf("%s\n", item->cmd); if(iocshCmd(item->cmd)) - epicsStdoutPrintf("ERROR afterInit command '%s' failed to run\n", item->cmd); + epicsStdoutPrintf("ERROR atInit command '%s' failed to run\n", item->cmd); free(item->cmd); free(item); @@ -67,33 +67,33 @@ static struct cmditem* newItem(char* cmd) return item; } -static const iocshFuncDef afterInitDef = { - "afterInit", +static const iocshFuncDef atInitDef = { + "atInit", 1, (const iocshArg*[]){&(iocshArg){"command (before iocInit)", iocshArgString}}, helpMessage}; -static void afterInitFunc(const iocshArgBuf* args) +static void atInitFunc(const iocshArgBuf* args) { static int first_time = 1; char* cmd = args[0].sval; if(interruptAccept) { - epicsStdoutPrintf("WARNING afterInit can only be used before iocInit (check help)\n"); + epicsStdoutPrintf("WARNING atInit can only be used before iocInit (check help)\n"); return; } if(!cmd || !cmd[0]) { - epicsStdoutPrintf("WARNING afterInit received an empty argument (check help)\n"); + epicsStdoutPrintf("WARNING atInit received an empty argument (check help)\n"); return; } if(first_time) { first_time = 0; - if(initHookRegister(afterInitHook) < 0) + if(initHookRegister(atInitHook) < 0) { errno = ENOMEM; epicsStdoutPrintf("ERROR initHookRegister memory allocation failure %s\n", strerror(errno)); @@ -103,17 +103,17 @@ static void afterInitFunc(const iocshArgBuf* args) struct cmditem* item = newItem(cmd); if(!item) - epicsStdoutPrintf("ERROR afterInit failed to add the command '%s' %s\n", cmd, strerror(errno)); + epicsStdoutPrintf("ERROR atInit failed to add the command '%s' %s\n", cmd, strerror(errno)); } -static void afterInitRegister(void) +static void atInitRegister(void) { static int first_time = 1; if(first_time) { first_time = 0; - iocshRegister(&afterInitDef, afterInitFunc); + iocshRegister(&atInitDef, atInitFunc); } } -epicsExportRegistrar(afterInitRegister); +epicsExportRegistrar(atInitRegister); diff --git a/modules/database/src/ioc/misc/atInit.dbd b/modules/database/src/ioc/misc/atInit.dbd new file mode 100644 index 000000000..71b411133 --- /dev/null +++ b/modules/database/src/ioc/misc/atInit.dbd @@ -0,0 +1 @@ +registrar(atInitRegister) diff --git a/modules/database/src/std/softIoc/Makefile b/modules/database/src/std/softIoc/Makefile index e8827b22c..c50324090 100644 --- a/modules/database/src/std/softIoc/Makefile +++ b/modules/database/src/std/softIoc/Makefile @@ -19,8 +19,8 @@ DBD += softIoc.dbd softIoc_DBD += base.dbd softIoc_DBD += dlload.dbd softIoc_DBD += system.dbd -ifeq ($(afterInit),YES) -softIoc_DBD += afterInit.dbd +ifeq ($(atInit),YES) +softIoc_DBD += atInit.dbd endif softIoc_SRCS += softIoc_registerRecordDeviceDriver.cpp