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

Corrected compiler error when passing Asyn parameter(s).

Browse Source
This commit is contained in:
David Kline
2005-04-14 18:36:19 +00:00
parent a03a4c70a4
commit 1a9f569836
1 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
acsApp/src/drvMCB4B.cc
View File

@@ -263,8 +263,7 @@ STATIC int set_status(int card, int signal)
status.Bits.RA_DONE | status.Bits.RA_PROBLEM) ? 1 : 0; status.Bits.RA_DONE | status.Bits.RA_PROBLEM) ? 1 : 0;
/* Test for post-move string. */ /* Test for post-move string. */
if ((status.Bits.RA_DONE || ls_active == true) && nodeptr != 0 && if ((status.Bits.RA_DONE || ls_active == true) && nodeptr != 0 && nodeptr->postmsgptr != 0)
nodeptr->postmsgptr != 0)
{ {
send_mess(card, nodeptr->postmsgptr, (char) NULL); send_mess(card, nodeptr->postmsgptr, (char) NULL);
/* The MCB4B always sends back a response, read it and discard */ /* The MCB4B always sends back a response, read it and discard */
@@ -284,7 +283,7 @@ STATIC int set_status(int card, int signal)
STATIC RTN_STATUS send_mess(int card, const char *com, char *name) STATIC RTN_STATUS send_mess(int card, const char *com, char *name)
{ {
struct MCB4Bcontroller *cntrl; struct MCB4Bcontroller *cntrl;
int nwrite; size_t nwrite;
/* Check that card exists */ /* Check that card exists */
if (!motor_state[card]) if (!motor_state[card])
@@ -313,7 +312,7 @@ 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 nread=0; size_t nread=0;
asynStatus status; asynStatus status;
struct MCB4Bcontroller *cntrl; struct MCB4Bcontroller *cntrl;
int flush; int flush;
@@ -341,7 +340,8 @@ STATIC int recv_mess(int card, char *com, int flag)
status = pasynOctetSyncIO->read(cntrl->pasynUser, com, MAX_MSG_SIZE, status = pasynOctetSyncIO->read(cntrl->pasynUser, com, MAX_MSG_SIZE,
timeout, &nread, &eomReason); timeout, &nread, &eomReason);
if (nread < 1) com[0] = '\0'; if (nread < 1)
com[0] = '\0';
if (nread > 0) { if (nread > 0) {
Debug(2, "recv_mess: card %d, message = \"%s\"\n",\ Debug(2, "recv_mess: card %d, message = \"%s\"\n",\
@@ -457,7 +457,6 @@ STATIC int motor_init()
cntrl = (struct MCB4Bcontroller *) brdptr->DevicePrivate; cntrl = (struct MCB4Bcontroller *) brdptr->DevicePrivate;
/* Initialize communications channel */ /* Initialize communications channel */
success_rtn = pasynOctetSyncIO->connect(cntrl->port, 0, &cntrl->pasynUser, NULL); success_rtn = pasynOctetSyncIO->connect(cntrl->port, 0, &cntrl->pasynUser, NULL);
Debug(1, "motor_init, return from pasynOctetSyncIO->connect for port %s = %d, pasynUser=%p\n",\ Debug(1, "motor_init, return from pasynOctetSyncIO->connect for port %s = %d, pasynUser=%p\n",\
cntrl->port, success_rtn, cntrl->pasynUser); cntrl->port, success_rtn, cntrl->pasynUser);