Binary-Coalescence/motorDSM
2
0
Fork 0
mirror of https://github.com/Binary-Coalescence/motorDSM.git synced 2025-08-04 21:55:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

removed unused <driver>Setup() argument.

Browse Source
This commit is contained in:
Ron Sluiter
2004-07-16 19:06:58 +00:00
parent b00ce1668f
commit d6ffff666c
3 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
acsApp/src/AcsRegister.cc
View File

@@ -2,9 +2,9 @@
FILENAME... AcsRegister.cc FILENAME... AcsRegister.cc
USAGE... Register ACS motor device driver shell commands. USAGE... Register ACS motor device driver shell commands.
Version: $Revision: 1.3 $ Version: $Revision: 1.4 $
Modified By: $Author: rivers $ Modified By: $Author: sluiter $
Last Modified: $Date: 2004-06-08 22:32:58 $ Last Modified: $Date: 2004-07-16 19:06:58 $
*/ */
/***************************************************************** /*****************************************************************
@@ -27,22 +27,20 @@ extern "C"
// ACS Setup arguments // ACS Setup arguments
static const iocshArg setupArg0 = {"Max. controller count", iocshArgInt}; static const iocshArg setupArg0 = {"Max. controller count", iocshArgInt};
static const iocshArg setupArg1 = {"N/A", iocshArgInt}; static const iocshArg setupArg1 = {"Polling rate", iocshArgInt};
static const iocshArg setupArg2 = {"Polling rate", iocshArgInt};
// ACS Config arguments // ACS Config arguments
static const iocshArg configArg0 = {"Card being configured", iocshArgInt}; static const iocshArg configArg0 = {"Card being configured", iocshArgInt};
static const iocshArg configArg1 = {"asyn port name", iocshArgString}; static const iocshArg configArg1 = {"asyn port name", iocshArgString};
static const iocshArg * const MCB4BSetupArgs[3] = {&setupArg0, &setupArg1, static const iocshArg * const MCB4BSetupArgs[2] = {&setupArg0, &setupArg1};
&setupArg2};
static const iocshArg * const MCB4BConfigArgs[2] = {&configArg0, &configArg1}; static const iocshArg * const MCB4BConfigArgs[2] = {&configArg0, &configArg1};
static const iocshFuncDef setupMCB4B = {"MCB4BSetup", 3, MCB4BSetupArgs}; static const iocshFuncDef setupMCB4B = {"MCB4BSetup", 2, MCB4BSetupArgs};
static const iocshFuncDef configMCB4B = {"MCB4BConfig", 2, MCB4BConfigArgs}; static const iocshFuncDef configMCB4B = {"MCB4BConfig", 2, MCB4BConfigArgs};
static void setupMCB4BCallFunc(const iocshArgBuf *args) static void setupMCB4BCallFunc(const iocshArgBuf *args)
{ {
MCB4BSetup(args[0].ival, args[1].ival, args[2].ival); MCB4BSetup(args[0].ival, args[1].ival);
} }
static void configMCB4BCallFunc(const iocshArgBuf *args) static void configMCB4BCallFunc(const iocshArgBuf *args)
{ {

8
acsApp/src/AcsRegister.h
View File

@@ -2,9 +2,9 @@
FILENAME... AcsRegister.h FILENAME... AcsRegister.h
USAGE... This file contains function prototypes for ACS IOC shell commands. USAGE... This file contains function prototypes for ACS IOC shell commands.
Version: $Revision: 1.2 $ Version: $Revision: 1.3 $
Modified By: $Author: rivers $ Modified By: $Author: sluiter $
Last Modified: $Date: 2004-04-20 20:50:12 $ Last Modified: $Date: 2004-07-16 19:06:58 $
*/ */
/* /*
@@ -40,6 +40,6 @@ Last Modified: $Date: 2004-04-20 20:50:12 $
#include "motordrvCom.h" #include "motordrvCom.h"
/* Function prototypes. */ /* Function prototypes. */
extern RTN_STATUS MCB4BSetup(int, int, int); extern RTN_STATUS MCB4BSetup(int, int);
extern RTN_STATUS MCB4BConfig(int, const char *); extern RTN_STATUS MCB4BConfig(int, const char *);

15
acsApp/src/drvMCB4B.cc
View File

@@ -11,6 +11,8 @@
* .02 07-03-2002 rls replaced RA_OVERTRAVEL with RA_PLUS_LS and RA_MINUS_LS * .02 07-03-2002 rls replaced RA_OVERTRAVEL with RA_PLUS_LS and RA_MINUS_LS
* .03 05-23-2003 rls Converted to R3.14.x. * .03 05-23-2003 rls Converted to R3.14.x.
* .04 02-03-2004 rls Eliminate erroneous "Motor motion timeout ERROR". * .04 02-03-2004 rls Eliminate erroneous "Motor motion timeout ERROR".
* .05 07-09-2004 rls - removed unused <driver>Setup() argument.
* - added "\" at end of long Debug stmt's for SunPro.
*/ */
@@ -297,7 +299,7 @@ STATIC RTN_STATUS send_mess(int card, const char *com, char c)
strcpy(buff, com); strcpy(buff, com);
strcat(buff, OUTPUT_TERMINATOR); strcat(buff, OUTPUT_TERMINATOR);
Debug(2, "send_mess: sending message to card %d, message=%s\n", Debug(2, "send_mess: sending message to card %d, message=%s\n",\
card, buff); card, buff);
pasynSyncIO->write(cntrl->pasynUser, buff, strlen(buff), TIMEOUT); pasynSyncIO->write(cntrl->pasynUser, buff, strlen(buff), TIMEOUT);
@@ -326,7 +328,7 @@ STATIC int recv_mess(int card, char *com, int flag)
cntrl = (struct MCB4Bcontroller *) motor_state[card]->DevicePrivate; cntrl = (struct MCB4Bcontroller *) motor_state[card]->DevicePrivate;
Debug(3, "recv_mess entry: card %d, flag=%d\n", Debug(3, "recv_mess entry: card %d, flag=%d\n",\
card, flag); card, flag);
if (flag == FLUSH) { if (flag == FLUSH) {
flush = 1; flush = 1;
@@ -343,15 +345,15 @@ STATIC int recv_mess(int card, char *com, int flag)
else com[len-1] = '\0'; else com[len-1] = '\0';
if (len > 0) { if (len > 0) {
Debug(2, "recv_mess: card %d, message = \"%s\"\n", Debug(2, "recv_mess: card %d, message = \"%s\"\n",\
card, com); card, com);
} }
if (len == 0) { if (len == 0) {
if (flag != FLUSH) { if (flag != FLUSH) {
Debug(1, "recv_mess: card %d ERROR: no response\n", Debug(1, "recv_mess: card %d ERROR: no response\n",\
card); card);
} else { } else {
Debug(3, "recv_mess: card %d flush returned no characters\n", Debug(3, "recv_mess: card %d flush returned no characters\n",\
card); card);
} }
} }
@@ -367,7 +369,6 @@ STATIC int recv_mess(int card, char *com, int flag)
/*****************************************************/ /*****************************************************/
RTN_STATUS RTN_STATUS
MCB4BSetup(int num_cards, /* maximum number of controllers in system */ MCB4BSetup(int num_cards, /* maximum number of controllers in system */
int num_channels, /* NOT USED */
int scan_rate) /* polling rate - 1/60 sec units */ int scan_rate) /* polling rate - 1/60 sec units */
{ {
int itera; int itera;
@@ -459,7 +460,7 @@ STATIC int motor_init()
/* Initialize communications channel */ /* Initialize communications channel */
success_rtn = pasynSyncIO->connect(cntrl->port, 0, &cntrl->pasynUser); success_rtn = pasynSyncIO->connect(cntrl->port, 0, &cntrl->pasynUser);
Debug(1, "motor_init, return from pasynSyncIO->connect for port %s = %d, pasynUser=%p\n", Debug(1, "motor_init, return from pasynSyncIO->connect for port %s = %d, pasynUser=%p\n",\
cntrl->port, success_rtn, cntrl->pasynUser); cntrl->port, success_rtn, cntrl->pasynUser);
if (success_rtn == 0) if (success_rtn == 0)