lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

Changed int32_t and uint32_t to epicInt32 and epicsUInt32

Browse Source
This commit is contained in:
MarkRivers
2006-03-23 00:24:20 +00:00
parent 578c01f0ab
commit 87131fc463
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/MotorSimSrc/devMotorSim.c
+3 -3
View File
@@ -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
motorApp/MotorSrc/devMotorAsyn.c
+5 -5
View File
@@ -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);
motorApp/MotorSrc/drvMotorAsyn.c
+2 -2
View File
@@ -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