From bab310fc18fc4d17df486a41ef3496eac862fbfe Mon Sep 17 00:00:00 2001 From: jsullivan-anl Date: Thu, 6 Jul 2006 21:22:45 +0000 Subject: [PATCH] convert 8750 driver to 87xx (supports 8750 and 8752) --- motorApp/NewFocusSrc/Makefile | 9 ++++----- motorApp/NewFocusSrc/NewFocusRegister.cc | 16 ++++++++-------- motorApp/NewFocusSrc/NewFocusRegister.h | 4 ++-- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/motorApp/NewFocusSrc/Makefile b/motorApp/NewFocusSrc/Makefile index 60fc9655..f98bdf64 100644 --- a/motorApp/NewFocusSrc/Makefile +++ b/motorApp/NewFocusSrc/Makefile @@ -4,9 +4,8 @@ include $(TOP)/configure/CONFIG # Both the following line, and a line in the *.dbd file, # must be uncommented to use diagnostic debugging messages. -USR_CXXFLAGS += -DDEBUG - -OPT_CXXFLAGS = +# USR_CXXFLAGS += -DDEBUG +# OPT_CXXFLAGS = -g -O0 DBD += devNewFocus.dbd @@ -14,8 +13,8 @@ LIBRARY_IOC = NewFocus SRCS += NewFocusRegister.cc -# PMNC8750 (i.e., PMNC8750) device driver. -SRCS += devPMNC8750.cc drvPMNC8750.cc +# PMNC87xx (i.e., PMNC87xx) device driver. +SRCS += devPMNC87xx.cc drvPMNC87xx.cc NewFocus_LIBS += motor asyn NewFocus_LIBS += $(EPICS_BASE_IOC_LIBS) diff --git a/motorApp/NewFocusSrc/NewFocusRegister.cc b/motorApp/NewFocusSrc/NewFocusRegister.cc index 7150323f..7302ad52 100644 --- a/motorApp/NewFocusSrc/NewFocusRegister.cc +++ b/motorApp/NewFocusSrc/NewFocusRegister.cc @@ -41,26 +41,26 @@ static const iocshArg * const NewFocusConfigArgs[3] = {&configArg0, &configArg1, &configArg2}; -static const iocshFuncDef setupPMNC8750 = {"PMNC8750Setup", 3, NewFocusSetupArgs}; +static const iocshFuncDef setupPMNC87xx = {"PMNC87xxSetup", 3, NewFocusSetupArgs}; -static const iocshFuncDef configPMNC8750 = {"PMNC8750Config", 3, NewFocusConfigArgs}; +static const iocshFuncDef configPMNC87xx = {"PMNC87xxConfig", 3, NewFocusConfigArgs}; -static void setupPMNC8750CallFunc(const iocshArgBuf *args) +static void setupPMNC87xxCallFunc(const iocshArgBuf *args) { - PMNC8750Setup(args[0].ival, args[1].ival, args[2].ival); + PMNC87xxSetup(args[0].ival, args[1].ival, args[2].ival); } -static void configPMNC8750CallFunc(const iocshArgBuf *args) +static void configPMNC87xxCallFunc(const iocshArgBuf *args) { - PMNC8750Config(args[0].ival, args[1].sval, args[2].ival); + PMNC87xxConfig(args[0].ival, args[1].sval, args[2].ival); } static void NewFocusRegister(void) { - iocshRegister(&setupPMNC8750, setupPMNC8750CallFunc); + iocshRegister(&setupPMNC87xx, setupPMNC87xxCallFunc); - iocshRegister(&configPMNC8750, configPMNC8750CallFunc); + iocshRegister(&configPMNC87xx, configPMNC87xxCallFunc); } epicsExportRegistrar(NewFocusRegister); diff --git a/motorApp/NewFocusSrc/NewFocusRegister.h b/motorApp/NewFocusSrc/NewFocusRegister.h index 96345f7c..6392b62c 100644 --- a/motorApp/NewFocusSrc/NewFocusRegister.h +++ b/motorApp/NewFocusSrc/NewFocusRegister.h @@ -40,6 +40,6 @@ Last Modified: 2004/07/28 18:45:16 #include "motordrvCom.h" /* Function prototypes. */ -extern RTN_STATUS PMNC8750Setup(int, int, int); -extern RTN_STATUS PMNC8750Config(int, const char *, int); +extern RTN_STATUS PMNC87xxSetup(int, int, int); +extern RTN_STATUS PMNC87xxConfig(int, const char *, int);