diff --git a/motorApp/MicroMoSrc/MicroMoRegister.cc b/motorApp/MicroMoSrc/MicroMoRegister.cc index a54e70ac..77059213 100644 --- a/motorApp/MicroMoSrc/MicroMoRegister.cc +++ b/motorApp/MicroMoSrc/MicroMoRegister.cc @@ -3,9 +3,9 @@ FILENAME... MicroMoRegister.cc USAGE... Register MicroMo MVP 2001 B02 motor controller device driver shell commands. -Version: $Revision: 1.1 $ +Version: $Revision: 1.2 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-03-03 20:02:56 $ +Last Modified: $Date: 2004-03-16 15:15:37 $ */ /***************************************************************** @@ -37,17 +37,18 @@ static const iocshArg setupArg1 = {"Max. motor count", iocshArgInt}; static const iocshArg setupArg2 = {"Polling rate", iocshArgInt}; // MicroMo Config arguments static const iocshArg configArg0 = {"Card being configured", iocshArgInt}; -static const iocshArg configArg1 = {"MPF server location", iocshArgInt}; -static const iocshArg configArg2 = {"MPF server task name", iocshArgString}; +static const iocshArg configArg1 = {"PortType: 0 = GPIB, 1 = RS232", iocshArgInt}; +static const iocshArg configArg2 = {"MPF server location", iocshArgInt}; +static const iocshArg configArg3 = {"MPF server task name", iocshArgString}; static const iocshArg * const MicroMoSetupArgs[3] = {&setupArg0, &setupArg1, &setupArg2}; -static const iocshArg * const MicroMoConfigArgs[3] = {&configArg0, &configArg1, - &configArg2}; +static const iocshArg * const MicroMoConfigArgs[4] = {&configArg0, &configArg1, + &configArg2, &configArg3}; static const iocshFuncDef setupMicroMo = {"MicroMoSetup", 3, MicroMoSetupArgs}; -static const iocshFuncDef configMicroMo = {"MicroMoConfig", 3, MicroMoConfigArgs}; +static const iocshFuncDef configMicroMo = {"MicroMoConfig", 4, MicroMoConfigArgs}; static void setupMicroMoCallFunc(const iocshArgBuf *args) { @@ -57,7 +58,7 @@ static void setupMicroMoCallFunc(const iocshArgBuf *args) static void configMicroMoCallFunc(const iocshArgBuf *args) { - MVP2001Config(args[0].ival, args[1].ival, args[2].sval); + MVP2001Config(args[0].ival, args[1].ival, args[2].ival, args[3].sval); } diff --git a/motorApp/MicroMoSrc/drvMVP2001.h b/motorApp/MicroMoSrc/drvMVP2001.h index deeabd91..ac9eef01 100644 --- a/motorApp/MicroMoSrc/drvMVP2001.h +++ b/motorApp/MicroMoSrc/drvMVP2001.h @@ -3,9 +3,9 @@ FILENAME... drvMVP2001.h USAGE... This file contains driver "include" information that is specific to the MicroMo MVP 2001 B02 (Linear, RS-485). -Version: $Revision: 1.2 $ +Version: $Revision: 1.3 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-03-03 20:02:58 $ +Last Modified: $Date: 2004-03-16 15:14:55 $ */ /* @@ -119,7 +119,7 @@ typedef union /* Function prototypes. */ extern RTN_STATUS MVP2001Setup(int, int, int); -extern RTN_STATUS MVP2001Config(int, int, const char *); +extern RTN_STATUS MVP2001Config(int, int, int, const char *); #endif /* INCdrvMVP2001h */