From 87131fc463f3811224b6820294d6aff9e155818e Mon Sep 17 00:00:00 2001 From: MarkRivers Date: Thu, 23 Mar 2006 00:24:20 +0000 Subject: [PATCH] Changed int32_t and uint32_t to epicInt32 and epicsUInt32 --- motorApp/MotorSimSrc/devMotorSim.c | 6 +++--- motorApp/MotorSrc/devMotorAsyn.c | 10 +++++----- motorApp/MotorSrc/drvMotorAsyn.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/motorApp/MotorSimSrc/devMotorSim.c b/motorApp/MotorSimSrc/devMotorSim.c index 37b6c066..365c2267 100644 --- a/motorApp/MotorSimSrc/devMotorSim.c +++ b/motorApp/MotorSimSrc/devMotorSim.c @@ -53,9 +53,9 @@ epicsExportAddress(dset,devMotorSim); */ typedef struct motorStatus_t { - uint32_t status; /**< bit mask of errors and other binary information. The bit positions are in motor.h */ - int32_t position; /**< Current motor position in motor steps (if not servoing) or demand position (if servoing) */ - int32_t encoder_position; /**< Current motor position in encoder units (only available if a servo system). */ + epicsUInt32 status; /**< bit mask of errors and other binary information. The bit positions are in motor.h */ + epicsInt32 position; /**< Current motor position in motor steps (if not servoing) or demand position (if servoing) */ + epicsInt32 encoder_position; /**< Current motor position in encoder units (only available if a servo system). */ } motorStatus_t; typedef struct diff --git a/motorApp/MotorSrc/devMotorAsyn.c b/motorApp/MotorSrc/devMotorAsyn.c index 9efd5ff6..f573adf7 100644 --- a/motorApp/MotorSrc/devMotorAsyn.c +++ b/motorApp/MotorSrc/devMotorAsyn.c @@ -61,11 +61,11 @@ typedef struct { typedef struct { struct motorRecord * pmr; - uint32_t status; /**< bit mask of errors and other binary information. The + epicsUInt32 status; /**< bit mask of errors and other binary information. The bit positions are in motor.h */ - int32_t position; /**< Current motor position in motor steps (if not + epicsInt32 position; /**< Current motor position in motor steps (if not servoing) or demand position (if servoing) */ - int32_t encoder_position; /**< Current motor position in encoder units + epicsInt32 encoder_position; /**< Current motor position in encoder units (only available if a servo system). */ motor_cmnd move_cmd; double param; @@ -439,7 +439,7 @@ static void positionCallback(void *drvPvt, asynUser *pasynUser, pmr->name, value); dbScanLock((dbCommon *)pmr); - pPvt->position = (int32_t)floor(value+0.5); + pPvt->position = (epicsInt32)floor(value+0.5); pPvt->needUpdate = 1; dbScanUnlock((dbCommon*)pmr); scanOnce(pmr); @@ -456,7 +456,7 @@ static void encoderCallback(void *drvPvt, asynUser *pasynUser, pmr->name, value); dbScanLock((dbCommon *)pmr); - pPvt->encoder_position = (int32_t)floor(value+0.5); + pPvt->encoder_position = (epicsInt32)floor(value+0.5); pPvt->needUpdate = 1; dbScanUnlock((dbCommon*)pmr); scanOnce(pmr); diff --git a/motorApp/MotorSrc/drvMotorAsyn.c b/motorApp/MotorSrc/drvMotorAsyn.c index 6e0bbdf8..86e200d0 100644 --- a/motorApp/MotorSrc/drvMotorAsyn.c +++ b/motorApp/MotorSrc/drvMotorAsyn.c @@ -82,7 +82,7 @@ typedef struct drvmotorAxisPvt { double min_velocity; double accel; /* Received status */ - int32_t status; + epicsInt32 status; struct drvmotorPvt *pPvt; } drvmotorAxisPvt; @@ -463,7 +463,7 @@ static void intCallback(void *axisPvt, unsigned int nChanged, int ivalue; double dvalue; int i, bit_num; - int32_t changedmask = 0; + epicsInt32 changedmask = 0; /* We are called back with an array of things that have changed. First put these into a single int32 word for passing up to higher layers