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

59
acsApp/src/drvMCB4B.cc
View File

@@ -37,12 +37,12 @@
#ifdef __GNUG__
#ifdef DEBUG
volatile int drvMCB4BDebug = 0;
#define Debug(L, FMT, V...) { if(L <= drvMCB4BDebug) \
{ printf("%s(%d):",__FILE__,__LINE__); \
printf(FMT,##V); } }
volatile int drvMCB4BDebug = 0;
#define Debug(L, FMT, V...) { if(L <= drvMCB4BDebug) \
{ printf("%s(%d):",__FILE__,__LINE__); \
printf(FMT,##V); } }
#else
#define Debug(L, FMT, V...)
#define Debug(L, FMT, V...)
#endif
#else
#define Debug()
@@ -215,21 +215,21 @@ STATIC int set_status(int card, int signal)
status.Bits.RA_PLUS_LS = 0;
status.Bits.RA_MINUS_LS = 0;
if (response[5] == '1') {
status.Bits.RA_PLUS_LS = 1;
status.Bits.RA_DIRECTION = 1;
ls_active = true;
status.Bits.RA_PLUS_LS = 1;
status.Bits.RA_DIRECTION = 1;
ls_active = true;
}
if (response[6] == '1') {
status.Bits.RA_MINUS_LS = 1;
status.Bits.RA_DIRECTION = 0;
ls_active = true;
status.Bits.RA_MINUS_LS = 1;
status.Bits.RA_DIRECTION = 0;
ls_active = true;
}
/* encoder status */
status.Bits.EA_SLIP = 0;
status.Bits.EA_SLIP = 0;
status.Bits.EA_POSITION = 0;
status.Bits.EA_SLIP_STALL = 0;
status.Bits.EA_HOME = 0;
status.Bits.EA_HOME = 0;
/* Request the position of this motor */
sprintf(command, "#%02dP", signal);
@@ -240,12 +240,12 @@ STATIC int set_status(int card, int signal)
if (motorData == motor_info->position)
{
if (nodeptr != 0) /* Increment counter only if motor is moving. */
motor_info->no_motion_count++;
if (nodeptr != 0) /* Increment counter only if motor is moving. */
motor_info->no_motion_count++;
}
else
{
status.Bits.RA_DIRECTION = (motorData >= motor_info->position) ? 1 : 0;
status.Bits.RA_DIRECTION = (motorData >= motor_info->position) ? 1 : 0;
motor_info->position = motorData;
motor_info->encoder_position = motorData;
motor_info->no_motion_count = 0;
@@ -260,11 +260,10 @@ STATIC int set_status(int card, int signal)
motor_info->velocity *= -1;
rtn_state = (!motor_info->no_motion_count || ls_active == true ||
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. */
if ((status.Bits.RA_DONE || ls_active == true) && nodeptr != 0 &&
nodeptr->postmsgptr != 0)
if ((status.Bits.RA_DONE || ls_active == true) && nodeptr != 0 && nodeptr->postmsgptr != 0)
{
send_mess(card, nodeptr->postmsgptr, (char) NULL);
/* 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)
{
struct MCB4Bcontroller *cntrl;
int nwrite;
size_t nwrite;
/* Check that card exists */
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)
{
double timeout;
int nread=0;
size_t nread=0;
asynStatus status;
struct MCB4Bcontroller *cntrl;
int flush;
@@ -338,10 +337,11 @@ STATIC int recv_mess(int card, char *com, int flag)
timeout = TIMEOUT;
}
if (flush) status = pasynOctetSyncIO->flush(cntrl->pasynUser);
status = pasynOctetSyncIO->read(cntrl->pasynUser, com, MAX_MSG_SIZE,
status = pasynOctetSyncIO->read(cntrl->pasynUser, com, MAX_MSG_SIZE,
timeout, &nread, &eomReason);
if (nread < 1) com[0] = '\0';
if (nread < 1)
com[0] = '\0';
if (nread > 0) {
Debug(2, "recv_mess: card %d, message = \"%s\"\n",\
@@ -367,7 +367,7 @@ STATIC int recv_mess(int card, char *com, int flag)
/* MCB4BSetup() */
/*****************************************************/
RTN_STATUS
MCB4BSetup(int num_cards, /* maximum number of controllers in system */
MCB4BSetup(int num_cards, /* maximum number of controllers in system */
int scan_rate) /* polling rate - 1/60 sec units */
{
int itera;
@@ -379,9 +379,9 @@ MCB4BSetup(int num_cards, /* maximum number of controllers in system */
/* Set motor polling task rate */
if (scan_rate >= 1 && scan_rate <= 60)
targs.motor_scan_rate = scan_rate;
targs.motor_scan_rate = scan_rate;
else
targs.motor_scan_rate = SCAN_RATE;
targs.motor_scan_rate = SCAN_RATE;
/*
* Allocate space for motor_state structure pointers. Note this must be done
@@ -404,8 +404,8 @@ MCB4BSetup(int num_cards, /* maximum number of controllers in system */
/* MCB4BConfig() */
/*****************************************************/
RTN_STATUS
MCB4BConfig(int card, /* card being configured */
const char *name) /* port name for asyn */
MCB4BConfig(int card, /* card being configured */
const char *name) /* port name for asyn */
{
struct MCB4Bcontroller *cntrl;
@@ -457,8 +457,7 @@ STATIC int motor_init()
cntrl = (struct MCB4Bcontroller *) brdptr->DevicePrivate;
/* 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",\
cntrl->port, success_rtn, cntrl->pasynUser);