Binary-Coalescence/motorDSM
2
0
Fork 0
mirror of https://github.com/Binary-Coalescence/motorDSM.git synced 2025-08-04 21:55:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Changes for new asynOctetSyncIO API

Browse Source
This commit is contained in:
MarkRivers
2004-09-28 23:53:28 +00:00
parent 1ebc15c9c6
commit 8b6f2577f9
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
acsApp/src/drvMCB4B.cc
View File

@@ -287,6 +287,7 @@ STATIC RTN_STATUS send_mess(int card, const char *com, char *name)
{ {
char buff[BUFF_SIZE]; char buff[BUFF_SIZE];
struct MCB4Bcontroller *cntrl; struct MCB4Bcontroller *cntrl;
int nwrite;
/* Check that card exists */ /* Check that card exists */
if (!motor_state[card]) if (!motor_state[card])
@@ -305,7 +306,7 @@ STATIC RTN_STATUS send_mess(int card, const char *com, char *name)
Debug(2, "send_mess: sending message to card %d, message=%s\n",\ Debug(2, "send_mess: sending message to card %d, message=%s\n",\
card, buff); card, buff);
pasynOctetSyncIO->write(cntrl->pasynUser, buff, strlen(buff), TIMEOUT); pasynOctetSyncIO->write(cntrl->pasynUser, buff, strlen(buff), TIMEOUT, &nwrite);
return (OK); return (OK);
} }
@@ -318,7 +319,8 @@ STATIC RTN_STATUS send_mess(int card, const char *com, char *name)
STATIC int recv_mess(int card, char *com, int flag) STATIC int recv_mess(int card, char *com, int flag)
{ {
double timeout; double timeout;
int len=0; int nread=0;
asynStatus status;
struct MCB4Bcontroller *cntrl; struct MCB4Bcontroller *cntrl;
int flush; int flush;
int eomReason; int eomReason;
@@ -341,18 +343,18 @@ STATIC int recv_mess(int card, char *com, int flag)
flush = 0; flush = 0;
timeout = TIMEOUT; timeout = TIMEOUT;
} }
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, MAX_MSG_SIZE, status = pasynOctetSyncIO->read(cntrl->pasynUser, com, MAX_MSG_SIZE,
"\r", 1, flush, timeout, &eomReason); "\r", 1, flush, timeout, &nread, &eomReason);
/* The response from the MCB4B is terminated with CR. Remove */ /* The response from the MCB4B is terminated with CR. Remove */
if (len < 1) com[0] = '\0'; if (nread < 1) com[0] = '\0';
else com[len-1] = '\0'; else com[nread-1] = '\0';
if (len > 0) { if (nread > 0) {
Debug(2, "recv_mess: card %d, message = \"%s\"\n",\ Debug(2, "recv_mess: card %d, message = \"%s\"\n",\
card, com); card, com);
} }
if (len == 0) { if (nread == 0) {
if (flag != FLUSH) { if (flag != FLUSH) {
Debug(1, "recv_mess: card %d ERROR: no response\n",\ Debug(1, "recv_mess: card %d ERROR: no response\n",\
card); card);
@@ -362,7 +364,7 @@ STATIC int recv_mess(int card, char *com, int flag)
} }
} }
return (len); return (nread);
} }