diff --git a/motorApp/ImsSrc/drvIM483PL.cc b/motorApp/ImsSrc/drvIM483PL.cc index 841cda65..9aec1bec 100644 --- a/motorApp/ImsSrc/drvIM483PL.cc +++ b/motorApp/ImsSrc/drvIM483PL.cc @@ -3,9 +3,9 @@ FILENAME... drvIM483PL.cc USAGE... Motor record driver level support for Intelligent Motion Systems, Inc. IM483(I/IE). -Version: $Revision: 1.8 $ -Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-07-16 19:13:22 $ +Version: $Revision: 1.9 $ +Modified By: $Author: rivers $ +Last Modified: $Date: 2004-07-30 04:17:07 $ */ /***************************************************************** @@ -422,6 +422,7 @@ int recv_mess(int card, char *com, int flag) int timeout; int flush = 0; int len = 0; + int eomReason; /* Check that card exists */ if (!motor_state[card]) @@ -435,7 +436,7 @@ int recv_mess(int card, char *com, int flag) timeout = COMM_TIMEOUT; len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\n", - 1, flush, timeout); + 1, flush, timeout, &eomReason); if (len == 0) com[0] = '\0'; diff --git a/motorApp/ImsSrc/drvIM483SM.cc b/motorApp/ImsSrc/drvIM483SM.cc index 015811ec..6bc8b4c9 100644 --- a/motorApp/ImsSrc/drvIM483SM.cc +++ b/motorApp/ImsSrc/drvIM483SM.cc @@ -3,9 +3,9 @@ FILENAME... drvIM483SM.cc USAGE... Motor record driver level support for Intelligent Motion Systems, Inc. IM483(I/IE). -Version: $Revision: 1.9 $ -Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-07-16 19:14:18 $ +Version: $Revision: 1.10 $ +Modified By: $Author: rivers $ +Last Modified: $Date: 2004-07-30 04:17:07 $ */ /***************************************************************** @@ -428,6 +428,7 @@ static int recv_mess(int card, char *com, int flag) int timeout; int flush = 0; int len = 0; + int eomReason; /* Check that card exists */ if (!motor_state[card]) @@ -441,7 +442,7 @@ static int recv_mess(int card, char *com, int flag) timeout = COMM_TIMEOUT; len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\r\n", - 2, flush, timeout); + 2, flush, timeout, &eomReason); if (len < 2) com[0] = '\0'; diff --git a/motorApp/MicosSrc/drvMicos.cc b/motorApp/MicosSrc/drvMicos.cc index b4ec2f54..9f998ffa 100644 --- a/motorApp/MicosSrc/drvMicos.cc +++ b/motorApp/MicosSrc/drvMicos.cc @@ -325,6 +325,7 @@ static int recv_mess(int card, char *com, int flag) int timeout; int flush = 0; int len=0; + int eomReason; struct MicosController *cntrl; /* Check that card exists */ @@ -343,7 +344,7 @@ static int recv_mess(int card, char *com, int flag) timeout = COMM_TIMEOUT; len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\3", - 1, flush, timeout); + 1, flush, timeout, &eomReason); /* The response from the Micos is terminated with . Remove */ if (len < 3) com[0] = '\0'; diff --git a/motorApp/MicroMoSrc/drvMVP2001.cc b/motorApp/MicroMoSrc/drvMVP2001.cc index 74de5e62..a211076f 100644 --- a/motorApp/MicroMoSrc/drvMVP2001.cc +++ b/motorApp/MicroMoSrc/drvMVP2001.cc @@ -3,9 +3,9 @@ FILENAME... drvMVP2001.cc USAGE... Motor record driver level support for MicroMo MVP 2001 B02 (Linear, RS-485). -Version: $Revision: 1.2 $ -Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-07-16 19:26:11 $ +Version: $Revision: 1.3 $ +Modified By: $Author: rivers $ +Last Modified: $Date: 2004-07-30 04:22:14 $ */ /* @@ -488,6 +488,7 @@ static int recv_mess(int card, char *com, int flag) int timeout; int flush = 0; int len=0, lenTemp=0; + int eomReason; /* Check that card exists */ if (!motor_state[card]) @@ -501,9 +502,9 @@ static int recv_mess(int card, char *com, int flag) timeout = COMM_TIMEOUT; len = pasynSyncIO->read(cntrl->pasynUser, temp, BUFF_SIZE, (char *) "\n", - 1, flush, timeout); + 1, flush, timeout, &eomReason); len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\n", - 1, flush, timeout); + 1, flush, timeout, &eomReason); Debug(5, "bytes: 1st call: %d\t2nd call: %d\n", lenTemp, len); diff --git a/motorApp/PiSrc/drvPIC844.cc b/motorApp/PiSrc/drvPIC844.cc index 1c0e9f9a..3955e6d0 100644 --- a/motorApp/PiSrc/drvPIC844.cc +++ b/motorApp/PiSrc/drvPIC844.cc @@ -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.5 $ -Modified By: $Author: sluiter $ -Last Modified: $Date: 2004-07-16 19:40:25 $ +Version: $Revision: 1.6 $ +Modified By: $Author: rivers $ +Last Modified: $Date: 2004-07-30 04:20:56 $ */ /* @@ -445,6 +445,7 @@ static int recv_mess(int card, char *com, int flag) int flush = 0; int timeout; int len=0; + int eomReason; /* Check that card exists */ if (!motor_state[card]) @@ -458,7 +459,7 @@ static int recv_mess(int card, char *com, int flag) timeout = COMM_TIMEOUT; len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\n", - 1, flush, timeout); + 1, flush, timeout, &eomReason); if (len == 0) com[0] = '\0';