diff --git a/motorApp/NewportSrc/drvESP300.cc b/motorApp/NewportSrc/drvESP300.cc index 3027e290..d63b4631 100644 --- a/motorApp/NewportSrc/drvESP300.cc +++ b/motorApp/NewportSrc/drvESP300.cc @@ -2,9 +2,9 @@ FILENAME... drvESP300.cc USAGE... Motor record driver level support for Newport ESP300. -Version: $Revision: 1.13 $ -Modified By: $Author: rivers $ -Last Modified: $Date: 2004-08-17 21:28:21 $ +Version: $Revision: 1.14 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2004-09-21 14:47:01 $ */ /* @@ -41,6 +41,7 @@ Last Modified: $Date: 2004-08-17 21:28:21 $ * .04 02-03-04 rls Eliminate erroneous "Motor motion timeout ERROR". * .05 07/09/04 rls removed unused Setup() argument. * .06 07/28/04 rls "epicsExport" debug variable. + * .07 09/21/04 rls support for 32axes/controller. */ @@ -83,9 +84,9 @@ int ESP300_num_cards = 0; /*----------------functions-----------------*/ static int recv_mess(int, char *, int); -static RTN_STATUS send_mess(int card, char const *com, char c); -static int set_status(int card, int signal); -static long report(int level); +static RTN_STATUS send_mess(int, char const *, char *); +static int set_status(int, int); +static long report(int); static long init(); static int motor_init(); static void query_done(int, int, struct mess_node *); @@ -346,7 +347,7 @@ exit: /* send a message to the ESP300 board */ /* send_mess() */ /*****************************************************/ -static RTN_STATUS send_mess(int card, char const *com, char inchar) +static RTN_STATUS send_mess(int card, char const *com, char *name) { struct MMcontroller *cntrl; char local_buff[BUFF_SIZE]; @@ -368,9 +369,9 @@ static RTN_STATUS send_mess(int card, char const *com, char inchar) return(ERROR); } - if (inchar != (char) NULL) + if (name != NULL) { - errlogPrintf("drvESP300:send_mess() - invalid argument = %c\n", inchar); + errlogPrintf("drvESP300:send_mess() - invalid argument = %s\n", name); return(ERROR); } diff --git a/motorApp/NewportSrc/drvMM3000.cc b/motorApp/NewportSrc/drvMM3000.cc index 2018cc09..45a1bddf 100644 --- a/motorApp/NewportSrc/drvMM3000.cc +++ b/motorApp/NewportSrc/drvMM3000.cc @@ -2,9 +2,9 @@ FILENAME... drvMM3000.cc USAGE... Motor record driver level support for Newport MM3000. -Version: $Revision: 1.12 $ -Modified By: $Author: rivers $ -Last Modified: $Date: 2004-08-17 21:28:21 $ +Version: $Revision: 1.13 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2004-09-21 14:45:38 $ */ /* @@ -55,6 +55,7 @@ Last Modified: $Date: 2004-08-17 21:28:21 $ * .09 02/03/04 rls - Eliminate erroneous "Motor motion timeout ERROR". * .10 07/09/04 rls - removed unused Setup() argument. * .11 07/28/04 rls - "epicsExport" debug variable. + * .12 09/21/04 rls - support for 32axes/controller. * */ @@ -112,9 +113,9 @@ int MM3000_num_cards = 0; /*----------------functions-----------------*/ STATIC int recv_mess(int, char *, int); -STATIC RTN_STATUS send_mess(int card, char const *com, char c); -STATIC int set_status(int card, int signal); -static long report(int level); +STATIC RTN_STATUS send_mess(int, char const *, char *); +STATIC int set_status(int, int); +static long report(int); static long init(); STATIC int motor_init(); STATIC void query_done(int, int, struct mess_node *); @@ -382,7 +383,7 @@ exit: /* send a message to the MM3000 board */ /* send_mess() */ /*****************************************************/ -STATIC RTN_STATUS send_mess(int card, char const *com, char inchar) +STATIC RTN_STATUS send_mess(int card, char const *com, char *name) { struct MMcontroller *cntrl; char local_buff[BUFF_SIZE]; @@ -404,9 +405,9 @@ STATIC RTN_STATUS send_mess(int card, char const *com, char inchar) return(ERROR); } - if (inchar != (char) NULL) + if (name != NULL) { - errlogPrintf("drvMM3000:send_mess() - invalid argument = %c\n", inchar); + errlogPrintf("drvMM3000:send_mess() - invalid argument = %s\n", name); return(ERROR); } diff --git a/motorApp/NewportSrc/drvMM4000.cc b/motorApp/NewportSrc/drvMM4000.cc index 1fb4f609..38be7e92 100644 --- a/motorApp/NewportSrc/drvMM4000.cc +++ b/motorApp/NewportSrc/drvMM4000.cc @@ -2,9 +2,9 @@ FILENAME... drvMM4000.cc USAGE... Motor record driver level support for Newport MM4000. -Version: $Revision: 1.12 $ -Modified By: $Author: rivers $ -Last Modified: $Date: 2004-08-17 21:28:21 $ +Version: $Revision: 1.13 $ +Modified By: $Author: sluiter $ +Last Modified: $Date: 2004-09-21 14:48:33 $ */ /* @@ -54,6 +54,7 @@ Last Modified: $Date: 2004-08-17 21:28:21 $ * .09 02/03/04 rls Eliminate erroneous "Motor motion timeout ERROR". * .10 07/09/04 rls removed unused Setup() argument. * .11 07/28/04 rls "epicsExport" debug variable. + * .12 09/21/04 rls support for 32axes/controller. */ @@ -114,7 +115,7 @@ volatile double drvMM4000ReadbackDelay = 0.; /*----------------functions-----------------*/ static int recv_mess(int, char *, int); -static RTN_STATUS send_mess(int card, char const *com, char c); +static RTN_STATUS send_mess(int, char const *, char *name); static void start_status(int card); static int set_status(int card, int signal); static long report(int level); @@ -456,7 +457,7 @@ exit: /* send a message to the MM4000 board */ /* send_mess() */ /*****************************************************/ -static RTN_STATUS send_mess(int card, char const *com, char inchar) +static RTN_STATUS send_mess(int card, char const *com, char *name) { struct MMcontroller *cntrl; char local_buff[BUFF_SIZE]; @@ -478,9 +479,9 @@ static RTN_STATUS send_mess(int card, char const *com, char inchar) return(ERROR); } - if (inchar != (char) NULL) + if (name != NULL) { - errlogPrintf("drvMM4000.c:send_mess() - invalid argument = %c\n", inchar); + errlogPrintf("drvMM4000.c:send_mess() - invalid argument = %s\n", name); return(ERROR); }