mirror of
https://github.com/Binary-Coalescence/motorDSM.git
synced 2025-08-04 21:55:40 -05:00
asynSyncIO renamed to asynOctetSyncIO
This commit is contained in:
@@ -22,7 +22,7 @@
|
|||||||
#include "motor.h"
|
#include "motor.h"
|
||||||
#include "AcsRegister.h"
|
#include "AcsRegister.h"
|
||||||
#include "drvMCB4B.h"
|
#include "drvMCB4B.h"
|
||||||
#include "asynSyncIO.h"
|
#include "asynOctetSyncIO.h"
|
||||||
#include "epicsExport.h"
|
#include "epicsExport.h"
|
||||||
|
|
||||||
#define STATIC static
|
#define STATIC static
|
||||||
@@ -302,7 +302,7 @@ STATIC RTN_STATUS send_mess(int card, const char *com, char c)
|
|||||||
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);
|
||||||
|
|
||||||
pasynSyncIO->write(cntrl->pasynUser, buff, strlen(buff), TIMEOUT);
|
pasynOctetSyncIO->write(cntrl->pasynUser, buff, strlen(buff), TIMEOUT);
|
||||||
|
|
||||||
return (OK);
|
return (OK);
|
||||||
}
|
}
|
||||||
@@ -338,7 +338,7 @@ STATIC int recv_mess(int card, char *com, int flag)
|
|||||||
flush = 0;
|
flush = 0;
|
||||||
timeout = TIMEOUT;
|
timeout = TIMEOUT;
|
||||||
}
|
}
|
||||||
len = pasynSyncIO->read(cntrl->pasynUser, com, MAX_MSG_SIZE,
|
len = pasynOctetSyncIO->read(cntrl->pasynUser, com, MAX_MSG_SIZE,
|
||||||
"\r", 1, flush, timeout, &eomReason);
|
"\r", 1, flush, timeout, &eomReason);
|
||||||
|
|
||||||
/* The response from the MCB4B is terminated with CR. Remove */
|
/* The response from the MCB4B is terminated with CR. Remove */
|
||||||
@@ -460,8 +460,8 @@ STATIC int motor_init()
|
|||||||
|
|
||||||
/* Initialize communications channel */
|
/* Initialize communications channel */
|
||||||
|
|
||||||
success_rtn = pasynSyncIO->connect(cntrl->port, 0, &cntrl->pasynUser);
|
success_rtn = pasynOctetSyncIO->connect(cntrl->port, 0, &cntrl->pasynUser);
|
||||||
Debug(1, "motor_init, return from pasynSyncIO->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);
|
||||||
|
|
||||||
if (success_rtn == 0)
|
if (success_rtn == 0)
|
||||||
@@ -470,7 +470,7 @@ STATIC int motor_init()
|
|||||||
|
|
||||||
/* Send a message to the board, see if it exists */
|
/* Send a message to the board, see if it exists */
|
||||||
/* flush any junk at input port - should not be any data available */
|
/* flush any junk at input port - should not be any data available */
|
||||||
pasynSyncIO->flush(cntrl->pasynUser);
|
pasynOctetSyncIO->flush(cntrl->pasynUser);
|
||||||
do
|
do
|
||||||
{
|
{
|
||||||
send_mess(card_index, "#00X", 0);
|
send_mess(card_index, "#00X", 0);
|
||||||
|
Reference in New Issue
Block a user