lin-epics-modules/sinqepicsapp
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'el737' into amorsim

Browse Source 
Port the fix to the el737 driver into this branch
This commit is contained in:
koennecke
2017-08-14 14:53:35 +02:00
parent ebc3de1bd2 124aa97cd6
commit c445af75c1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sinqEPICSApp/src/devScalerEL737.c
View File

@ -57,7 +57,7 @@
/* dset functions */ /* dset functions */
static long el737_init_record(struct scalerRecord *psr, CALLBACK *pcallback); static long el737_init_record(struct scalerRecord *psr, CALLBACK *pcallback);
static long el737_reset(scalerRecord *psr); static long el737_reset(scalerRecord *psr);
static long el737_read(scalerRecord *psr, unsigned long *val); static long el737_read(scalerRecord *psr, epicsUInt32 *val);
static long el737_write_preset(scalerRecord *psr, int signal, unsigned long val); static long el737_write_preset(scalerRecord *psr, int signal, unsigned long val);
static long el737_arm(scalerRecord *psr, int val); static long el737_arm(scalerRecord *psr, int val);
static long el737_done(scalerRecord *psr); static long el737_done(scalerRecord *psr);
@ -238,14 +238,14 @@ static long el737_reset(scalerRecord *psr)
return 0; return 0;
} }
static long el737_read(scalerRecord *psr, unsigned long *val) static long el737_read(scalerRecord *psr, epicsUInt32 *val)
{ {
unsigned int i; unsigned int i;
EL737priv *priv; EL737priv *priv;
priv = (EL737priv *)psr->dpvt; priv = (EL737priv *)psr->dpvt;
for(i = 0; i < NCOUNT; i++){ for(i = 0; i < NCOUNT; i++){
val[i] = priv->values[i]; val[i] = (epicsUInt32)priv->values[i];
} }
return 0; return 0;