From f540bdd4ca2f101996881e0d76f8feac8ddf72d0 Mon Sep 17 00:00:00 2001
From: Ron Sluiter <rsluiter@users.noreply.github.com>
Date: Fri, 16 Jul 2004 19:19:42 +0000
Subject: [PATCH] Removed unused <driver>Setup() argument.

---
 motorApp/MclennanSrc/MclennanRegister.cc | 16 +++++++---------
 motorApp/MclennanSrc/drvPM304.cc         |  5 ++---
 motorApp/MclennanSrc/drvPM304.h          |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/motorApp/MclennanSrc/MclennanRegister.cc b/motorApp/MclennanSrc/MclennanRegister.cc
index c6d700bf..1563bdf9 100644
--- a/motorApp/MclennanSrc/MclennanRegister.cc
+++ b/motorApp/MclennanSrc/MclennanRegister.cc
@@ -2,9 +2,9 @@
 FILENAME...	MclennanRegister.cc
 USAGE...	Register Mclennan motor device driver shell commands.
 
-Version:	$Revision: 1.2 $
-Modified By:	$Author: rivers $
-Last Modified:	$Date: 2004-04-20 22:46:07 $
+Version:	$Revision: 1.3 $
+Modified By:	$Author: sluiter $
+Last Modified:	$Date: 2004-07-16 19:17:22 $
 */
 
 /*****************************************************************
@@ -27,25 +27,23 @@ extern "C"
 
 // PM304Setup arguments
 static const iocshArg setupArg0 = {"Max. controller count", iocshArgInt};
-static const iocshArg setupArg1 = {"N/A", iocshArgInt};
-static const iocshArg setupArg2 = {"Polling rate", iocshArgInt};
+static const iocshArg setupArg1 = {"Polling rate", iocshArgInt};
 
 // PM304Config arguments
 static const iocshArg configArg0 = {"Card being configured", iocshArgInt};
 static const iocshArg configArg1 = {"asyn port name", iocshArgString};
 static const iocshArg configArg2 = {"Number of axes", iocshArgInt};
 
-static const iocshArg * const PM304SetupArgs[3]  = {&setupArg0, &setupArg1,
-    &setupArg2};
+static const iocshArg * const PM304SetupArgs[2]  = {&setupArg0, &setupArg1};
 static const iocshArg * const PM304ConfigArgs[3] = {&configArg0, &configArg1,
     &configArg2};
 
-static const iocshFuncDef setupPM304  = {"PM304Setup",  3, PM304SetupArgs};
+static const iocshFuncDef setupPM304  = {"PM304Setup",  2, PM304SetupArgs};
 static const iocshFuncDef configPM304 = {"PM304Config", 3, PM304ConfigArgs};
 
 static void setupPM304CallFunc(const iocshArgBuf *args)
 {
-    PM304Setup(args[0].ival, args[1].ival, args[2].ival);
+    PM304Setup(args[0].ival, args[1].ival);
 }
 static void configPM304CallFunc(const iocshArgBuf *args)
 {
diff --git a/motorApp/MclennanSrc/drvPM304.cc b/motorApp/MclennanSrc/drvPM304.cc
index c973cd9c..3b3bf416 100644
--- a/motorApp/MclennanSrc/drvPM304.cc
+++ b/motorApp/MclennanSrc/drvPM304.cc
@@ -26,6 +26,7 @@
  * .08  03/27/03   rls  R3.14 conversion.
  * .09  02/03/04   rls  Eliminate erroneous "Motor motion timeout ERROR".
  * .10  04/20/04   mlr  Convert from MPF to ASYN
+ * .11  07/16/04   rls  removed unused <driver>Setup() argument.
  */
 
 
@@ -510,7 +511,6 @@ STATIC int send_recv_mess(int card, const char *out, char *response)
 /*****************************************************/
 RTN_STATUS
 PM304Setup(int num_cards,   	/* maximum number of controllers in system */
-           int num_channels,	/* NOT USED            */
            int scan_rate)       /* polling rate - 1/60 sec units */
 {
     int itera;
@@ -609,8 +609,7 @@ STATIC int motor_init()
 
         status = pasynSyncIO->connect(cntrl->port, 0, &cntrl->pasynUser);
         success_rtn = (status == asynSuccess);
-        Debug(1, "motor_init, return from pasynSyncIO->connect for port %s = %d, pasynUser=%p\n",
-              cntrl->port, success_rtn, cntrl->pasynUser);
+        Debug(1, "motor_init, return from pasynSyncIO->connect for port %s = %d, pasynUser=%p\n", cntrl->port, success_rtn, cntrl->pasynUser);
 
         if (success_rtn == true)
         {
diff --git a/motorApp/MclennanSrc/drvPM304.h b/motorApp/MclennanSrc/drvPM304.h
index a264fec3..55c1f505 100644
--- a/motorApp/MclennanSrc/drvPM304.h
+++ b/motorApp/MclennanSrc/drvPM304.h
@@ -42,7 +42,7 @@ struct PM304controller
     char port[80];          /* asyn port name */
 };
 
-RTN_STATUS PM304Setup(int, int, int);
+RTN_STATUS PM304Setup(int, int);
 RTN_STATUS PM304Config(int, const char *, int);
 
 #endif	/* INCdrvPM304h */