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

asynSyncIO renamed to asynOctetSyncIO

Browse Source
This commit is contained in:
MarkRivers
2004-08-17 21:29:52 +00:00
parent 68d2f255c1
commit 4e2eeeb680
18 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/AcsSrc/drvMCB4B.cc
+6 -6
View File
@@ -22,7 +22,7 @@
#include "motor.h"
#include "AcsRegister.h"
#include "drvMCB4B.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
#include "epicsExport.h"
#define STATIC static
@@ -302,7 +302,7 @@ STATIC RTN_STATUS send_mess(int card, const char *com, char c)
Debug(2, "send_mess: sending message to card %d, message=%s\n",\
card, buff);
pasynSyncIO->write(cntrl->pasynUser, buff, strlen(buff), TIMEOUT);
pasynOctetSyncIO->write(cntrl->pasynUser, buff, strlen(buff), TIMEOUT);
return (OK);
}
@@ -338,7 +338,7 @@ STATIC int recv_mess(int card, char *com, int flag)
flush = 0;
timeout = TIMEOUT;
}
len = pasynSyncIO->read(cntrl->pasynUser, com, MAX_MSG_SIZE,
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, MAX_MSG_SIZE,
"\r", 1, flush, timeout, &eomReason);
/* The response from the MCB4B is terminated with CR. Remove */
@@ -460,8 +460,8 @@ STATIC int motor_init()
/* Initialize communications channel */
success_rtn = pasynSyncIO->connect(cntrl->port, 0, &cntrl->pasynUser);
Debug(1, "motor_init, return from pasynSyncIO->connect for port %s = %d, pasynUser=%p\n",\
success_rtn = pasynOctetSyncIO->connect(cntrl->port, 0, &cntrl->pasynUser);
Debug(1, "motor_init, return from pasynOctetSyncIO->connect for port %s = %d, pasynUser=%p\n",\
cntrl->port, success_rtn, cntrl->pasynUser);
if (success_rtn == 0)
@@ -470,7 +470,7 @@ STATIC int motor_init()
/* Send a message to the board, see if it exists */
/* flush any junk at input port - should not be any data available */
pasynSyncIO->flush(cntrl->pasynUser);
pasynOctetSyncIO->flush(cntrl->pasynUser);
do
{
send_mess(card_index, "#00X", 0);
motorApp/ImsSrc/drvIM483.h
+4 -4
View File
@@ -3,9 +3,9 @@ FILENAME... drvIM483.h
USAGE... This file contains driver "include" information that is specific to
Intelligent Motion Systems, Inc. IM483(I/IE).
Version: $Revision: 1.5 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-07-16 19:12:08 $
Version: $Revision: 1.6 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-08-17 21:28:30 $
*/
/*
@@ -46,7 +46,7 @@ Last Modified: $Date: 2004-07-16 19:12:08 $
#include "motordrvCom.h"
#include "asynDriver.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
#define COMM_TIMEOUT 2 /* Timeout in seconds */
motorApp/ImsSrc/drvIM483PL.cc
+7 -7
View File
@@ -3,9 +3,9 @@ FILENAME... drvIM483PL.cc
USAGE... Motor record driver level support for Intelligent Motion
Systems, Inc. IM483(I/IE).
Version: $Revision: 1.9 $
Version: $Revision: 1.10 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:17:07 $
Last Modified: $Date: 2004-08-17 21:28:30 $
*/
/*****************************************************************
@@ -53,7 +53,7 @@ DESIGN LIMITATIONS...
#include <drvSup.h>
#include "motor.h"
#include "drvIM483.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
#include "epicsExport.h"
/* Read Limit Status response values. */
@@ -405,7 +405,7 @@ RTN_STATUS send_mess(int card, char const *com, char inchar)
Debug(2, "send_mess(): message = %s\n", local_buff);
cntrl = (struct IM483controller *) motor_state[card]->DevicePrivate;
pasynSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
pasynOctetSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
COMM_TIMEOUT);
return(OK);
@@ -435,7 +435,7 @@ int recv_mess(int card, char *com, int flag)
else
timeout = COMM_TIMEOUT;
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\n",
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\n",
1, flush, timeout, &eomReason);
if (len == 0)
@@ -541,13 +541,13 @@ static int motor_init()
cntrl = (struct IM483controller *) brdptr->DevicePrivate;
/* Initialize communications channel */
success_rtn = pasynSyncIO->connect(cntrl->asyn_port, 0, &cntrl->pasynUser);
success_rtn = pasynOctetSyncIO->connect(cntrl->asyn_port, 0, &cntrl->pasynUser);
if (success_rtn == asynSuccess)
{
/* Send a message to the board, see if it exists */
/* flush any junk at input port - should not be any data available */
pasynSyncIO->flush(cntrl->pasynUser);
pasynOctetSyncIO->flush(cntrl->pasynUser);
for (total_axis = 0; total_axis < MAX_AXES; total_axis++)
{
motorApp/ImsSrc/drvIM483SM.cc
+7 -7
View File
@@ -3,9 +3,9 @@ FILENAME... drvIM483SM.cc
USAGE... Motor record driver level support for Intelligent Motion
Systems, Inc. IM483(I/IE).
Version: $Revision: 1.10 $
Version: $Revision: 1.11 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:17:07 $
Last Modified: $Date: 2004-08-17 21:28:30 $
*/
/*****************************************************************
@@ -54,7 +54,7 @@ DESIGN LIMITATIONS...
#include <drvSup.h>
#include "motor.h"
#include "drvIM483.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
#include "epicsExport.h"
/* Read Limit Status response values. */
@@ -411,7 +411,7 @@ static RTN_STATUS send_mess(int card, char const *com, char inchar)
Debug(2, "send_mess(): message = %s\n", local_buff);
cntrl = (struct IM483controller *) motor_state[card]->DevicePrivate;
pasynSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
pasynOctetSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
COMM_TIMEOUT);
return(OK);
@@ -441,7 +441,7 @@ static int recv_mess(int card, char *com, int flag)
else
timeout = COMM_TIMEOUT;
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\r\n",
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\r\n",
2, flush, timeout, &eomReason);
if (len < 2)
@@ -546,7 +546,7 @@ static int motor_init()
cntrl = (struct IM483controller *) brdptr->DevicePrivate;
/* Initialize communications channel */
success_rtn = pasynSyncIO->connect(cntrl->asyn_port, 0, &cntrl->pasynUser);
success_rtn = pasynOctetSyncIO->connect(cntrl->asyn_port, 0, &cntrl->pasynUser);
if (success_rtn == asynSuccess)
{
@@ -555,7 +555,7 @@ static int motor_init()
/* Send a message to the board, see if it exists */
/* flush any junk at input port - should not be any data available */
pasynSyncIO->flush(cntrl->pasynUser);
pasynOctetSyncIO->flush(cntrl->pasynUser);
send_mess(card_index, "\003", (char) NULL); /* Reset device. */
epicsThreadSleep(1.0);
motorApp/ImsSrc/drvMDrive.cc
+8 -8
View File
@@ -3,9 +3,9 @@ FILENAME... drvMDrive.cc
USAGE... Motor record driver level support for Intelligent Motion
Systems, Inc. MDrive series; M17, M23, M34.
Version: $Revision: 1.11 $
Version: $Revision: 1.12 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:17:25 $
Last Modified: $Date: 2004-08-17 21:28:30 $
*/
/*
@@ -57,7 +57,7 @@ DESIGN LIMITATIONS...
#include <drvSup.h>
#include "motor.h"
#include "drvIM483.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
#include "epicsExport.h"
#define MDrive_NUM_CARDS 8
@@ -433,7 +433,7 @@ static RTN_STATUS send_mess(int card, char const *com, char inchar)
Debug(2, "send_mess(): message = %s\n", local_buff);
cntrl = (struct IM483controller *) motor_state[card]->DevicePrivate;
pasynSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
pasynOctetSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
COMM_TIMEOUT);
return(OK);
@@ -464,7 +464,7 @@ static int eat_garbage(int card, char *com, int flag)
timeout = COMM_TIMEOUT;
/* Get the response. */
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\r\n",
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\r\n",
2, flush, timeout, &eomReason);
Debug(2, "eat_garbage(): len = %i\n", len);
@@ -502,7 +502,7 @@ static int recv_mess(int card, char *com, int flag)
timeout = COMM_TIMEOUT;
/* Get the response. */
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\r\n",
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\r\n",
1, flush, timeout, &eomReason);
if (len == 0)
@@ -610,13 +610,13 @@ static int motor_init()
cntrl = (struct IM483controller *) brdptr->DevicePrivate;
/* Initialize communications channel */
success_rtn = pasynSyncIO->connect(cntrl->asyn_port, 0, &cntrl->pasynUser);
success_rtn = pasynOctetSyncIO->connect(cntrl->asyn_port, 0, &cntrl->pasynUser);
if (success_rtn == asynSuccess)
{
/* Send a message to the board, see if it exists */
/* flush any junk at input port - should not be any data available */
pasynSyncIO->flush(cntrl->pasynUser);
pasynOctetSyncIO->flush(cntrl->pasynUser);
for (total_axis = 0; total_axis < MAX_AXES; total_axis++)
{
motorApp/MclennanSrc/drvPM304.cc
+6 -6
View File
@@ -35,7 +35,7 @@
#include <drvSup.h>
#include "motor.h"
#include "drvPM304.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
#include "epicsExport.h"
#define STATIC static
@@ -366,7 +366,7 @@ STATIC RTN_STATUS send_mess(int card, const char *com, char c)
strcpy(buff, p);
strcat(buff, OUTPUT_TERMINATOR);
Debug(2, "send_mess: sending message to card %d, message=%s\n", card, buff);
pasynSyncIO->writeRead(cntrl->pasynUser, buff, strlen(buff), response,
pasynOctetSyncIO->writeRead(cntrl->pasynUser, buff, strlen(buff), response,
BUFF_SIZE, INPUT_TERMINATOR, 1, TIMEOUT, &eomReason);
Debug(2, "send_mess: card %d, response=%s\n", card, response);
}
@@ -411,7 +411,7 @@ STATIC int recv_mess(int card, char *com, int flag)
flush = 0;
timeout = TIMEOUT;
}
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE,
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE,
INPUT_TERMINATOR, 1, flush, timeout, &eomReason);
/* The response from the PM304 is terminated with CR/LF. Remove these */
@@ -481,7 +481,7 @@ STATIC int send_recv_mess(int card, const char *out, char *response)
strcpy(buff, p);
strcat(buff, OUTPUT_TERMINATOR);
Debug(2, "send_recv_mess: sending message to card %d, message=%s\n", card, buff);
len = pasynSyncIO->writeRead(cntrl->pasynUser, buff, strlen(buff),
len = pasynOctetSyncIO->writeRead(cntrl->pasynUser, buff, strlen(buff),
response, BUFF_SIZE, INPUT_TERMINATOR, 1, TIMEOUT,
&eomReason);
}
@@ -611,9 +611,9 @@ STATIC int motor_init()
/* Initialize communications channel */
success_rtn = false;
status = pasynSyncIO->connect(cntrl->port, 0, &cntrl->pasynUser);
status = pasynOctetSyncIO->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 pasynOctetSyncIO->connect for port %s = %d, pasynUser=%p\n", cntrl->port, success_rtn, cntrl->pasynUser);
if (success_rtn == true)
{
motorApp/MclennanSrc/drvPM304.h
+1 -1
View File
@@ -20,7 +20,7 @@
#define INCdrvPM304h 1
#include "motordrvCom.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
/* PM304 default profile. */
motorApp/MicosSrc/drvMicos.cc
+3 -3
View File
@@ -310,7 +310,7 @@ static RTN_STATUS send_mess(int card, const char *com, char c)
strcat(buff, OUTPUT_TERMINATOR);
Debug(2, "send_mess: sending message to card %d, message=%s\n", card, buff);
cntrl = (struct MicosController *) motor_state[card]->DevicePrivate;
pasynSyncIO->write(cntrl->pasynUser, buff, strlen(buff), COMM_TIMEOUT);
pasynOctetSyncIO->write(cntrl->pasynUser, buff, strlen(buff), COMM_TIMEOUT);
return (OK);
}
@@ -343,7 +343,7 @@ static int recv_mess(int card, char *com, int flag)
else
timeout = COMM_TIMEOUT;
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\3",
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\3",
1, flush, timeout, &eomReason);
/* The response from the Micos is terminated with <CR><LF><ETX>. Remove */
@@ -468,7 +468,7 @@ static int motor_init()
/* Initialize communications channel */
errind = false;
success_rtn = pasynSyncIO->connect(cntrl->asyn_port, 0, &cntrl->pasynUser);
success_rtn = pasynOctetSyncIO->connect(cntrl->asyn_port, 0, &cntrl->pasynUser);
if (success_rtn == asynSuccess)
{
motorApp/MicosSrc/drvMicos.h
+1 -1
View File
@@ -19,7 +19,7 @@
#include "motor.h"
#include "motordrvCom.h"
#include "asynDriver.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
/* Micos default profile. */
motorApp/MicroMoSrc/drvMVP2001.cc
+6 -6
View File
@@ -3,9 +3,9 @@ FILENAME... drvMVP2001.cc
USAGE... Motor record driver level support for MicroMo
MVP 2001 B02 (Linear, RS-485).
Version: $Revision: 1.3 $
Version: $Revision: 1.4 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:22:14 $
Last Modified: $Date: 2004-08-17 21:29:31 $
*/
/*
@@ -471,7 +471,7 @@ static RTN_STATUS send_mess(int card, char const *com, char inchar)
Debug(2, "send_mess(): message = %s\n", local_buff);
cntrl = (struct MVPcontroller *) motor_state[card]->DevicePrivate;
pasynSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
pasynOctetSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
COMM_TIMEOUT);
return(OK);
}
@@ -501,9 +501,9 @@ static int recv_mess(int card, char *com, int flag)
else
timeout = COMM_TIMEOUT;
len = pasynSyncIO->read(cntrl->pasynUser, temp, BUFF_SIZE, (char *) "\n",
len = pasynOctetSyncIO->read(cntrl->pasynUser, temp, BUFF_SIZE, (char *) "\n",
1, flush, timeout, &eomReason);
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\n",
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\n",
1, flush, timeout, &eomReason);
Debug(5, "bytes: 1st call: %d\t2nd call: %d\n", lenTemp, len);
@@ -610,7 +610,7 @@ static int motor_init()
cntrl = (struct MVPcontroller *) brdptr->DevicePrivate;
/* Initialize communications channel */
success_rtn = pasynSyncIO->connect(cntrl->asyn_port, 0, &cntrl->pasynUser);
success_rtn = pasynOctetSyncIO->connect(cntrl->asyn_port, 0, &cntrl->pasynUser);
if (success_rtn == asynSuccess)
{
motorApp/MicroMoSrc/drvMVP2001.h
+4 -4
View File
@@ -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.4 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-07-16 19:25:33 $
Version: $Revision: 1.5 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-08-17 21:29:32 $
*/
/*
@@ -77,7 +77,7 @@ Last Modified: $Date: 2004-07-16 19:25:33 $
#include "motor.h"
#include "motordrvCom.h"
#include "asynDriver.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
#define COMM_TIMEOUT 2 /* Command timeout in seconds. */
motorApp/NewportSrc/drvESP300.cc
+10 -10
View File
@@ -2,9 +2,9 @@
FILENAME... drvESP300.cc
USAGE... Motor record driver level support for Newport ESP300.
Version: $Revision: 1.12 $
Version: $Revision: 1.13 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:05:06 $
Last Modified: $Date: 2004-08-17 21:28:21 $
*/
/*
@@ -50,7 +50,7 @@ Last Modified: $Date: 2004-07-30 04:05:06 $
#include "motor.h"
#include "NewportRegister.h"
#include "drvMMCom.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
#include "epicsExport.h"
#define READ_POSITION "%.2dTP"
@@ -381,7 +381,7 @@ static RTN_STATUS send_mess(int card, char const *com, char inchar)
cntrl = (struct MMcontroller *) motor_state[card]->DevicePrivate;
pasynSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
pasynOctetSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
SERIAL_TIMEOUT);
return(OK);
@@ -413,7 +413,7 @@ static RTN_STATUS send_mess(int card, char const *com, char inchar)
* IF input "flag" indicates NOT flushing the input buffer.
* Set receive timeout nonzero.
* ENDIF
* Call pasynSyncIO->read().
* Call pasynOctetSyncIO->read().
*
* NOTE: The ESP300 sometimes responds to an MS command with an error
* message (see ESP300 User's Manual Appendix A). This is an
@@ -423,7 +423,7 @@ static RTN_STATUS send_mess(int card, char const *com, char inchar)
* IF input "com" buffer length is > 3 characters, AND, the 1st
* character is an "E" (Maybe this an unsolicited error
* message response?).
* Call pasynSyncIO->read().
* Call pasynOctetSyncIO->read().
* ENDIF
* BREAK
* ENDSWITCH
@@ -449,7 +449,7 @@ static int recv_mess(int card, char *com, int flag)
flush = 0;
timeout = SERIAL_TIMEOUT;
}
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE,
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE,
"\n", 1, flush, timeout, &eomReason);
if (len > 3 && com[0] == 'E')
{
@@ -457,7 +457,7 @@ static int recv_mess(int card, char *com, int flag)
error = strtol(&com[1], NULL, 0);
if (error >= 35 && error <= 42)
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE,
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE,
"\n", 1, flush, timeout, &eomReason);
}
@@ -573,14 +573,14 @@ static int motor_init()
cntrl = (struct MMcontroller *) brdptr->DevicePrivate;
/* Initialize communications channel */
success_rtn = pasynSyncIO->connect(cntrl->asyn_port,
success_rtn = pasynOctetSyncIO->connect(cntrl->asyn_port,
cntrl->asyn_address, &cntrl->pasynUser);
if (success_rtn == asynSuccess)
{
/* Send a message to the board, see if it exists */
/* flush any junk at input port - should not be any data available */
pasynSyncIO->flush(cntrl->pasynUser);
pasynOctetSyncIO->flush(cntrl->pasynUser);
send_mess(card_index, GET_IDENT, (char) NULL);
status = recv_mess(card_index, buff, 1);
motorApp/NewportSrc/drvMM3000.cc
+10 -10
View File
@@ -2,9 +2,9 @@
FILENAME... drvMM3000.cc
USAGE... Motor record driver level support for Newport MM3000.
Version: $Revision: 1.11 $
Version: $Revision: 1.12 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:05:06 $
Last Modified: $Date: 2004-08-17 21:28:21 $
*/
/*
@@ -64,7 +64,7 @@ Last Modified: $Date: 2004-07-30 04:05:06 $
#include "motor.h"
#include "NewportRegister.h"
#include "drvMMCom.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
#include "epicsExport.h"
#define STATIC static
@@ -417,7 +417,7 @@ STATIC RTN_STATUS send_mess(int card, char const *com, char inchar)
cntrl = (struct MMcontroller *) motor_state[card]->DevicePrivate;
pasynSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
pasynOctetSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
SERIAL_TIMEOUT);
return(OK);
@@ -449,7 +449,7 @@ STATIC RTN_STATUS send_mess(int card, char const *com, char inchar)
* IF input "flag" indicates NOT flushing the input buffer.
* Set receive timeout nonzero.
* ENDIF
* Call pasynSyncIO->read().
* Call pasynOctetSyncIO->read().
*
* NOTE: The MM3000 sometimes responds to an MS command with an error
* message (see MM3000 User's Manual Appendix A). This is an
@@ -459,7 +459,7 @@ STATIC RTN_STATUS send_mess(int card, char const *com, char inchar)
* IF input "com" buffer length is > 3 characters, AND, the 1st
* character is an "E" (Maybe this an unsolicited error
* message response?).
* Call pasynSyncIO->read().
* Call pasynOctetSyncIO->read().
* ENDIF
* BREAK
* ENDSWITCH
@@ -485,7 +485,7 @@ STATIC int recv_mess(int card, char *com, int flag)
flush = 0;
timeout = SERIAL_TIMEOUT;
}
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *)
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *)
"\n", 1, flush, timeout, &eomReason);
if (len > 3 && com[0] == 'E')
{
@@ -493,7 +493,7 @@ STATIC int recv_mess(int card, char *com, int flag)
error = strtol(&com[1], NULL, 0);
if (error >= 35 && error <= 42)
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE,
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE,
(char *) "\n", 1, flush, timeout,
&eomReason);
}
@@ -622,13 +622,13 @@ STATIC int motor_init()
cntrl = (struct MMcontroller *) brdptr->DevicePrivate;
/* Initialize communications channel */
success_rtn = pasynSyncIO->connect(cntrl->asyn_port,
success_rtn = pasynOctetSyncIO->connect(cntrl->asyn_port,
cntrl->asyn_address, &cntrl->pasynUser);
if (success_rtn == asynSuccess)
{
/* Send a message to the board, see if it exists */
/* flush any junk at input port - should not be any data available */
pasynSyncIO->flush(cntrl->pasynUser);
pasynOctetSyncIO->flush(cntrl->pasynUser);
send_mess(card_index, GET_IDENT, (char) NULL);
status = recv_mess(card_index, axis_pos, 1);
motorApp/NewportSrc/drvMM4000.cc
+7 -7
View File
@@ -2,9 +2,9 @@
FILENAME... drvMM4000.cc
USAGE... Motor record driver level support for Newport MM4000.
Version: $Revision: 1.11 $
Version: $Revision: 1.12 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:05:06 $
Last Modified: $Date: 2004-08-17 21:28:21 $
*/
/*
@@ -64,7 +64,7 @@ Last Modified: $Date: 2004-07-30 04:05:06 $
#include "motor.h"
#include "NewportRegister.h"
#include "drvMMCom.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
#include "epicsExport.h"
#define READ_RESOLUTION "TU;"
@@ -491,7 +491,7 @@ static RTN_STATUS send_mess(int card, char const *com, char inchar)
cntrl = (struct MMcontroller *) motor_state[card]->DevicePrivate;
pasynSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
pasynOctetSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
TIMEOUT);
return(OK);
@@ -529,7 +529,7 @@ static int recv_mess(int card, char *com, int flag)
cntrl = (struct MMcontroller *) motor_state[card]->DevicePrivate;
timeout = TIMEOUT;
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\r",
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\r",
1, flush, timeout, &eomReason);
if (len <= 0)
@@ -642,7 +642,7 @@ static int motor_init()
cntrl = (struct MMcontroller *) brdptr->DevicePrivate;
/* Initialize communications channel */
success_rtn = pasynSyncIO->connect(cntrl->asyn_port,
success_rtn = pasynOctetSyncIO->connect(cntrl->asyn_port,
cntrl->asyn_address, &cntrl->pasynUser);
if (success_rtn == asynSuccess)
@@ -651,7 +651,7 @@ static int motor_init()
/* Send a message to the board, see if it exists */
/* flush any junk at input port - should not be any data available */
pasynSyncIO->flush(cntrl->pasynUser);
pasynOctetSyncIO->flush(cntrl->pasynUser);
do
{
motorApp/NewportSrc/drvMMCom.h
+3 -3
View File
@@ -3,9 +3,9 @@ FILENAME... drvMMCom.h
USAGE... This file contains Newport Motion Master (MM) driver "include"
information that is specific to Motion Master models 3000/4000.
Version: $Revision: 1.9 $
Version: $Revision: 1.10 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-04-20 20:52:12 $
Last Modified: $Date: 2004-08-17 21:28:22 $
*/
/*
@@ -46,7 +46,7 @@ Last Modified: $Date: 2004-04-20 20:52:12 $
#include "motor.h"
#include "motordrvCom.h"
#include "asynDriver.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
enum MM_model
{
motorApp/NewportSrc/drvPM500.cc
+7 -7
View File
@@ -2,9 +2,9 @@
FILENAME... drvPM500.cc
USAGE... Motor record driver level support for Newport PM500.
Version: $Revision: 1.10 $
Version: $Revision: 1.11 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:05:07 $
Last Modified: $Date: 2004-08-17 21:28:22 $
*/
/* Device Driver Support routines for PM500 motor controller */
@@ -52,7 +52,7 @@ Last Modified: $Date: 2004-07-30 04:05:07 $
#include "motor.h"
#include "NewportRegister.h"
#include "drvMMCom.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
#include "epicsExport.h"
#define READ_RESOLUTION ""
@@ -370,7 +370,7 @@ static RTN_STATUS send_mess(int card, char const *com, char inchar)
cntrl = (struct MMcontroller *) motor_state[card]->DevicePrivate;
pasynSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
pasynOctetSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
SERIAL_TIMEOUT);
return(OK);
@@ -411,7 +411,7 @@ static int recv_mess(int card, char *com, int flag)
flush=0;
timeout = SERIAL_TIMEOUT;
}
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, "\r",
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, "\r",
1, flush, timeout, &eomReason);
if (len <= 0)
@@ -527,13 +527,13 @@ static int motor_init()
cntrl = (struct MMcontroller *) brdptr->DevicePrivate;
/* Initialize communications channel */
success_rtn = pasynSyncIO->connect(cntrl->asyn_port,
success_rtn = pasynOctetSyncIO->connect(cntrl->asyn_port,
cntrl->asyn_address, &cntrl->pasynUser);
if (success_rtn == asynSuccess)
{
/* flush any junk at input port - should not be any data available */
pasynSyncIO->flush(cntrl->pasynUser);
pasynOctetSyncIO->flush(cntrl->pasynUser);
/* Send a SCUM 1 command to put device in this mode. */
send_mess(card_index, "SCUM 1", (char) NULL);
motorApp/PiSrc/drvPI.h
+4 -4
View File
@@ -3,9 +3,9 @@ FILENAME... drvPI.h
USAGE... This file contains driver "include" information that is specific to
Physik Instrumente (PI) GmbH & Co. motor controller driver support.
Version: $Revision: 1.2 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-07-16 19:38:52 $
Version: $Revision: 1.3 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-08-17 21:29:52 $
*/
/*
@@ -47,7 +47,7 @@ Last Modified: $Date: 2004-07-16 19:38:52 $
#include "motor.h"
#include "motordrvCom.h"
#include "asynDriver.h"
#include "asynSyncIO.h"
#include "asynOctetSyncIO.h"
#define COMM_TIMEOUT 2 /* Timeout in seconds. */
motorApp/PiSrc/drvPIC844.cc
+5 -5
View File
@@ -3,9 +3,9 @@ FILENAME... drvPIC844.cc
USAGE... Motor record driver level support for Physik Instrumente (PI)
GmbH & Co. C-844 motor controller.
Version: $Revision: 1.6 $
Version: $Revision: 1.7 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:20:56 $
Last Modified: $Date: 2004-08-17 21:29:52 $
*/
/*
@@ -428,7 +428,7 @@ static RTN_STATUS send_mess(int card, char const *com, char inchar)
Debug(2, "send_mess(): message = %s\n", local_buff);
cntrl = (struct PIC844controller *) motor_state[card]->DevicePrivate;
pasynSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
pasynOctetSyncIO->write(cntrl->pasynUser, local_buff, strlen(local_buff),
COMM_TIMEOUT);
return(OK);
@@ -458,7 +458,7 @@ static int recv_mess(int card, char *com, int flag)
else
timeout = COMM_TIMEOUT;
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\n",
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\n",
1, flush, timeout, &eomReason);
if (len == 0)
@@ -569,7 +569,7 @@ static int motor_init()
cntrl = (struct PIC844controller *) brdptr->DevicePrivate;
/* Initialize communications channel */
success_rtn = pasynSyncIO->connect(cntrl->asyn_port,
success_rtn = pasynOctetSyncIO->connect(cntrl->asyn_port,
cntrl->asyn_address, &cntrl->pasynUser);
if (success_rtn == asynSuccess)