lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

Removed unused <driver>Setup() argument.

Browse Source
This commit is contained in:
Ron Sluiter
2004-07-16 19:33:21 +00:00
parent 67dd775f32
commit eb771bb132
5 changed files with 47 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/NewportSrc/NewportRegister.h
+7 -7
View File
@@ -2,9 +2,9 @@
FILENAME... NewportRegister.h
USAGE... This file contains function prototypes for Newport IOC shell commands.
Version: $Revision: 1.2 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-04-20 20:57:23 $
Version: $Revision: 1.3 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-07-16 19:33:20 $
*/
/*
@@ -40,10 +40,10 @@ Last Modified: $Date: 2004-04-20 20:57:23 $
#include "motordrvCom.h"
/* Function prototypes. */
extern RTN_STATUS MM3000Setup(int, int, int);
extern RTN_STATUS MM4000Setup(int, int, int);
extern RTN_STATUS PM500Setup(int, int, int);
extern RTN_STATUS ESP300Setup(int, int, int);
extern RTN_STATUS MM3000Setup(int, int);
extern RTN_STATUS MM4000Setup(int, int);
extern RTN_STATUS PM500Setup(int, int);
extern RTN_STATUS ESP300Setup(int, int);
extern RTN_STATUS MM3000Config(int, const char *, int);
extern RTN_STATUS MM4000Config(int, const char *, int);
extern RTN_STATUS PM500Config(int, const char *, int);
motorApp/NewportSrc/drvESP300.cc
+4 -4
View File
@@ -2,9 +2,9 @@
FILENAME... drvESP300.cc
USAGE... Motor record driver level support for Newport ESP300.
Version: $Revision: 1.9 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-04-20 20:56:53 $
Version: $Revision: 1.10 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-07-16 19:33:20 $
*/
/*
@@ -39,6 +39,7 @@ Last Modified: $Date: 2004-04-20 20:56:53 $
* .02 05-23-03 rls Converted to R3.14.x.
* .03 10-28-03 rls initialize "drive_resolution".
* .04 02-03-04 rls Eliminate erroneous "Motor motion timeout ERROR".
* .05 07/09/04 rls removed unused <driver>Setup() argument.
*/
@@ -480,7 +481,6 @@ static int recv_mess(int card, char *com, int flag)
/*****************************************************/
RTN_STATUS
ESP300Setup(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;
motorApp/NewportSrc/drvMM3000.cc
+4 -4
View File
@@ -2,9 +2,9 @@
FILENAME... drvMM3000.cc
USAGE... Motor record driver level support for Newport MM3000.
Version: $Revision: 1.8 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-04-20 20:56:04 $
Version: $Revision: 1.9 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-07-16 19:33:20 $
*/
/*
@@ -53,6 +53,7 @@ Last Modified: $Date: 2004-04-20 20:56:04 $
* .08 10/23/03 rls - recv_mess() eats the controller error response, outputs
* an error message and retries.
* .09 02/03/04 rls - Eliminate erroneous "Motor motion timeout ERROR".
* .10 07/09/04 rls - removed unused <driver>Setup() argument.
*
*/
@@ -524,7 +525,6 @@ STATIC int recv_mess(int card, char *com, int flag)
/*****************************************************/
RTN_STATUS
MM3000Setup(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;
motorApp/NewportSrc/drvMM4000.cc
+17 -19
View File
@@ -2,9 +2,9 @@
FILENAME... drvMM4000.cc
USAGE... Motor record driver level support for Newport MM4000.
Version: $Revision: 1.8 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-04-20 20:56:03 $
Version: $Revision: 1.9 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-07-16 19:33:21 $
*/
/*
@@ -52,6 +52,7 @@ Last Modified: $Date: 2004-04-20 20:56:03 $
* (versions 2.40 and 2.44) that the motor is reported as done moving
* on the first poll after a move is begun with the motor power off.
* .09 02/03/04 rls Eliminate erroneous "Motor motion timeout ERROR".
* .10 07/09/04 rls removed unused <driver>Setup() argument.
*/
@@ -65,8 +66,6 @@ Last Modified: $Date: 2004-04-20 20:56:03 $
#include "asynSyncIO.h"
#include "epicsExport.h"
#define STATIC static
#define READ_RESOLUTION "TU;"
#define READ_STATUS "MS;"
#define READ_POSITION "TP;"
@@ -112,14 +111,14 @@ 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 void start_status(int card);
STATIC int set_status(int card, int signal);
static int recv_mess(int, char *, int);
static RTN_STATUS send_mess(int card, char const *com, char c);
static void start_status(int card);
static int set_status(int card, int signal);
static long report(int level);
static long init();
STATIC int motor_init();
STATIC void query_done(int, int, struct mess_node *);
static int motor_init();
static void query_done(int, int, struct mess_node *);
/*----------------functions-----------------*/
@@ -161,7 +160,7 @@ struct
epicsExportAddress(drvet, drvMM4000);
STATIC struct thread_args targs = {SCAN_RATE, &MM4000_access};
static struct thread_args targs = {SCAN_RATE, &MM4000_access};
/*********************************************************
* Print out driver status report
@@ -212,7 +211,7 @@ static long init()
}
STATIC void query_done(int card, int axis, struct mess_node *nodeptr)
static void query_done(int card, int axis, struct mess_node *nodeptr)
{
}
@@ -222,7 +221,7 @@ STATIC void query_done(int card, int axis, struct mess_node *nodeptr)
* start_status(int card)
* if card == -1 then start all cards
*********************************************************/
STATIC void start_status(int card)
static void start_status(int card)
{
struct MMcontroller *cntrl;
int itera, status;
@@ -284,7 +283,7 @@ STATIC void start_status(int card)
* set_status()
************************************************************/
STATIC int set_status(int card, int signal)
static int set_status(int card, int signal)
{
struct MMcontroller *cntrl;
struct mess_node *nodeptr;
@@ -455,7 +454,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 inchar)
{
struct MMcontroller *cntrl;
char local_buff[BUFF_SIZE];
@@ -513,7 +512,7 @@ STATIC RTN_STATUS send_mess(int card, char const *com, char inchar)
* NORMAL RETURN.
*/
STATIC int recv_mess(int card, char *com, int flag)
static int recv_mess(int card, char *com, int flag)
{
struct MMcontroller *cntrl;
double timeout = 0.;
@@ -549,7 +548,6 @@ STATIC int recv_mess(int card, char *com, int flag)
/*****************************************************/
RTN_STATUS
MM4000Setup(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;
@@ -612,7 +610,7 @@ MM4000Config(int card, /* card being configured */
/* device support. */
/* motor_init() */
/*****************************************************/
STATIC int motor_init()
static int motor_init()
{
struct controller *brdptr;
struct MMcontroller *cntrl;
motorApp/NewportSrc/drvPM500.cc
+15 -17
View File
@@ -2,9 +2,9 @@
FILENAME... drvPM500.cc
USAGE... Motor record driver level support for Newport PM500.
Version: $Revision: 1.7 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-04-20 20:51:57 $
Version: $Revision: 1.8 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-07-16 19:33:21 $
*/
/* Device Driver Support routines for PM500 motor controller */
@@ -40,6 +40,7 @@ Last Modified: $Date: 2004-04-20 20:51:57 $
* .03 10/02/01 rls allow one retry after a communication error.
* .04 05-23-03 rls Converted to R3.14.x.
* .05 02/03/04 rls Eliminate erroneous "Motor motion timeout ERROR".
* .06 07/09/04 rls removed unused <driver>Setup() argument.
*/
@@ -53,8 +54,6 @@ Last Modified: $Date: 2004-04-20 20:51:57 $
#include "asynSyncIO.h"
#include "epicsExport.h"
#define STATIC static
#define READ_RESOLUTION ""
#define READ_STATUS ""
#define READ_POSITION ""
@@ -98,13 +97,13 @@ static char PM500_axis_names[PM500_NUM_CHANNELS] = {'X', 'Y', 'Z', 'A', 'B',
#include "motordrvComCode.h"
/*----------------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 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 long init();
STATIC int motor_init();
STATIC void query_done(int, int, struct mess_node *);
static int motor_init();
static void query_done(int, int, struct mess_node *);
/*----------------functions-----------------*/
@@ -146,7 +145,7 @@ struct
epicsExportAddress(drvet, drvPM500);
STATIC struct thread_args targs = {SCAN_RATE, &PM500_access};
static struct thread_args targs = {SCAN_RATE, &PM500_access};
/*********************************************************
* Print out driver status report
@@ -197,7 +196,7 @@ static long init()
}
STATIC void query_done(int card, int axis, struct mess_node *nodeptr)
static void query_done(int card, int axis, struct mess_node *nodeptr)
{
}
@@ -207,7 +206,7 @@ STATIC void query_done(int card, int axis, struct mess_node *nodeptr)
* set_status()
************************************************************/
STATIC int set_status(int card, int signal)
static int set_status(int card, int signal)
{
struct MMcontroller *cntrl;
struct mess_node *nodeptr;
@@ -339,7 +338,7 @@ exit:
/* send a message to the PM500 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 inchar)
{
struct MMcontroller *cntrl;
char local_buff[BUFF_SIZE];
@@ -392,7 +391,7 @@ STATIC RTN_STATUS send_mess(int card, char const *com, char inchar)
* NORMAL RETURN.
*/
STATIC int recv_mess(int card, char *com, int flag)
static int recv_mess(int card, char *com, int flag)
{
struct MMcontroller *cntrl;
double timeout = 0.;
@@ -436,7 +435,6 @@ STATIC int recv_mess(int card, char *com, int flag)
/*****************************************************/
RTN_STATUS
PM500Setup(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;
@@ -499,7 +497,7 @@ PM500Config(int card, /* card being configured */
/* device support. */
/* motor_init() */
/*****************************************************/
STATIC int motor_init()
static int motor_init()
{
struct controller *brdptr;
struct MMcontroller *cntrl;