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

Changes for latest asyn

Browse Source
This commit is contained in:
MarkRivers
2004-07-30 04:24:07 +00:00
parent 1984c18d6f
commit 68d2f255c1
5 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/ImsSrc/drvIM483PL.cc
+5 -4
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.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';
motorApp/ImsSrc/drvIM483SM.cc
+5 -4
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.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';
motorApp/MicosSrc/drvMicos.cc
+2 -1
View File
@@ -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 <CR><LF><ETX>. Remove */
if (len < 3) com[0] = '\0';
motorApp/MicroMoSrc/drvMVP2001.cc
+6 -5
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.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);
motorApp/PiSrc/drvPIC844.cc
+5 -4
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.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';