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

Changes in asynSyncIO->read for latest asyn

Browse Source
This commit is contained in:
MarkRivers
2004-07-30 04:09:11 +00:00
parent a5bf12cc29
commit a35cc6aac7
6 changed files with 32 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/AcsSrc/drvMCB4B.cc
+2 -1
View File
@@ -318,6 +318,7 @@ STATIC int recv_mess(int card, char *com, int flag)
int len=0;
struct MCB4Bcontroller *cntrl;
int flush;
int eomReason;
/* Check that card exists */
if (!motor_state[card])
@@ -338,7 +339,7 @@ STATIC int recv_mess(int card, char *com, int flag)
timeout = TIMEOUT;
}
len = pasynSyncIO->read(cntrl->pasynUser, com, MAX_MSG_SIZE,
"\r", 1, flush, timeout);
"\r", 1, flush, timeout, &eomReason);
/* The response from the MCB4B is terminated with CR. Remove */
if (len < 1) com[0] = '\0';
motorApp/MclennanSrc/drvPM304.cc
+7 -3
View File
@@ -346,6 +346,7 @@ STATIC RTN_STATUS send_mess(int card, const char *com, char c)
char buff[BUFF_SIZE];
char response[BUFF_SIZE];
struct PM304controller *cntrl;
int eomReason;
/* Check that card exists */
if (!motor_state[card])
@@ -366,7 +367,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);
pasynSyncIO->writeRead(cntrl->pasynUser, buff, strlen(buff), response,
BUFF_SIZE, INPUT_TERMINATOR, 1, TIMEOUT);
BUFF_SIZE, INPUT_TERMINATOR, 1, TIMEOUT, &eomReason);
Debug(2, "send_mess: card %d, response=%s\n", card, response);
}
@@ -390,6 +391,7 @@ STATIC int recv_mess(int card, char *com, int flag)
char *pos;
char temp[BUFF_SIZE];
int flush;
int eomReason;
struct PM304controller *cntrl;
com[0] = '\0';
@@ -410,7 +412,7 @@ STATIC int recv_mess(int card, char *com, int flag)
timeout = TIMEOUT;
}
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE,
INPUT_TERMINATOR, 1, flush, timeout);
INPUT_TERMINATOR, 1, flush, timeout, &eomReason);
/* The response from the PM304 is terminated with CR/LF. Remove these */
if (len < 2) com[0] = '\0'; else com[len-2] = '\0';
@@ -456,6 +458,7 @@ STATIC int send_recv_mess(int card, const char *out, char *response)
struct PM304controller *cntrl;
int len=0;
char *pos;
int eomReason;
char temp[BUFF_SIZE];
response[0] = '\0';
@@ -479,7 +482,8 @@ STATIC int send_recv_mess(int card, const char *out, char *response)
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),
response, BUFF_SIZE, INPUT_TERMINATOR, 1, TIMEOUT);
response, BUFF_SIZE, INPUT_TERMINATOR, 1, TIMEOUT,
&eomReason);
}
/* The response from the PM304 is terminated with CR/LF. Remove these */
motorApp/NewportSrc/drvESP300.cc
+6 -5
View File
@@ -2,9 +2,9 @@
FILENAME... drvESP300.cc
USAGE... Motor record driver level support for Newport ESP300.
Version: $Revision: 1.11 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-07-28 20:05:41 $
Version: $Revision: 1.12 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:05:06 $
*/
/*
@@ -437,6 +437,7 @@ static int recv_mess(int card, char *com, int flag)
double timeout = 0.;
int flush = 1;
int len = 0;
int eomReason;
/* Check that card exists */
if (!motor_state[card])
@@ -449,7 +450,7 @@ static int recv_mess(int card, char *com, int flag)
timeout = SERIAL_TIMEOUT;
}
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE,
"\n", 1, flush, timeout);
"\n", 1, flush, timeout, &eomReason);
if (len > 3 && com[0] == 'E')
{
long error;
@@ -457,7 +458,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,
"\n", 1, flush, timeout);
"\n", 1, flush, timeout, &eomReason);
}
if (len <= 0)
motorApp/NewportSrc/drvMM3000.cc
+7 -5
View File
@@ -2,9 +2,9 @@
FILENAME... drvMM3000.cc
USAGE... Motor record driver level support for Newport MM3000.
Version: $Revision: 1.10 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-07-28 20:05:42 $
Version: $Revision: 1.11 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:05:06 $
*/
/*
@@ -473,6 +473,7 @@ STATIC int recv_mess(int card, char *com, int flag)
double timeout = 0.;
int flush = 1;
int len = 0;
int eomReason;
/* Check that card exists */
if (!motor_state[card])
@@ -485,7 +486,7 @@ STATIC int recv_mess(int card, char *com, int flag)
timeout = SERIAL_TIMEOUT;
}
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *)
"\n", 1, flush, timeout);
"\n", 1, flush, timeout, &eomReason);
if (len > 3 && com[0] == 'E')
{
long error;
@@ -493,7 +494,8 @@ 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,
(char *) "\n", 1, flush, timeout);
(char *) "\n", 1, flush, timeout,
&eomReason);
}
if (len <= 0)
motorApp/NewportSrc/drvMM4000.cc
+5 -4
View File
@@ -2,9 +2,9 @@
FILENAME... drvMM4000.cc
USAGE... Motor record driver level support for Newport MM4000.
Version: $Revision: 1.10 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-07-28 20:05:42 $
Version: $Revision: 1.11 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:05:06 $
*/
/*
@@ -520,6 +520,7 @@ static int recv_mess(int card, char *com, int flag)
double timeout = 0.;
int flush = 0;
int len = 0;
int eomReason;
/* Check that card exists */
if (!motor_state[card])
@@ -529,7 +530,7 @@ static int recv_mess(int card, char *com, int flag)
timeout = TIMEOUT;
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, (char *) "\r",
1, flush, timeout);
1, flush, timeout, &eomReason);
if (len <= 0)
{
motorApp/NewportSrc/drvPM500.cc
+5 -4
View File
@@ -2,9 +2,9 @@
FILENAME... drvPM500.cc
USAGE... Motor record driver level support for Newport PM500.
Version: $Revision: 1.9 $
Modified By: $Author: sluiter $
Last Modified: $Date: 2004-07-28 20:05:42 $
Version: $Revision: 1.10 $
Modified By: $Author: rivers $
Last Modified: $Date: 2004-07-30 04:05:07 $
*/
/* Device Driver Support routines for PM500 motor controller */
@@ -399,6 +399,7 @@ static int recv_mess(int card, char *com, int flag)
double timeout = 0.;
int flush=1;
int len = 0;
int eomReason;
/* Check that card exists */
if (!motor_state[card])
@@ -411,7 +412,7 @@ static int recv_mess(int card, char *com, int flag)
timeout = SERIAL_TIMEOUT;
}
len = pasynSyncIO->read(cntrl->pasynUser, com, BUFF_SIZE, "\r",
1, flush, timeout);
1, flush, timeout, &eomReason);
if (len <= 0)
{