EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fixes for 64 bit machines

Browse Source
This commit is contained in:
zimoch
2011-09-12 08:55:23 +00:00
parent a42fbc9c6c
commit ff46c9a4a7
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/devwaveformStream.c
View File

@ -44,10 +44,10 @@ static long readData (dbCommon *record, format_t *format)
switch (wf->ftvl)
{
case DBF_DOUBLE:
((double *)wf->bptr)[wf->nord] = dval;
((epicsFloat64 *)wf->bptr)[wf->nord] = dval;
break;
case DBF_FLOAT:
((float *)wf->bptr)[wf->nord] = (float)dval;
((epicsFloat32 *)wf->bptr)[wf->nord] = (epicsFloat32)dval;
break;
default:
errlogSevPrintf (errlogFatal,
@ -67,23 +67,23 @@ static long readData (dbCommon *record, format_t *format)
switch (wf->ftvl)
{
case DBF_DOUBLE:
((double *)wf->bptr)[wf->nord] = (double)lval;
((epicsFloat64 *)wf->bptr)[wf->nord] = (epicsFloat64)lval;
break;
case DBF_FLOAT:
((float *)wf->bptr)[wf->nord] = (float)lval;
((epicsFloat32 *)wf->bptr)[wf->nord] = (epicsFloat32)lval;
break;
case DBF_LONG:
case DBF_ULONG:
((long *)wf->bptr)[wf->nord] = lval;
((epicsInt32 *)wf->bptr)[wf->nord] = lval;
break;
case DBF_SHORT:
case DBF_USHORT:
case DBF_ENUM:
((short *)wf->bptr)[wf->nord] = (short)lval;
((epicsInt16 *)wf->bptr)[wf->nord] = (epicsInt16)lval;
break;
case DBF_CHAR:
case DBF_UCHAR:
((char *)wf->bptr)[wf->nord] = (char)lval;
((epicsInt8 *)wf->bptr)[wf->nord] = (epicsInt8)lval;
break;
default:
errlogSevPrintf (errlogFatal,
@ -157,29 +157,29 @@ static long writeData (dbCommon *record, format_t *format)
switch (wf->ftvl)
{
case DBF_DOUBLE:
dval = ((double *)wf->bptr)[nowd];
dval = ((epicsFloat64 *)wf->bptr)[nowd];
break;
case DBF_FLOAT:
dval = ((float *)wf->bptr)[nowd];
dval = ((epicsFloat32 *)wf->bptr)[nowd];
break;
case DBF_LONG:
dval = ((long *)wf->bptr)[nowd];
dval = ((epicsInt32 *)wf->bptr)[nowd];
break;
case DBF_ULONG:
dval = ((unsigned long *)wf->bptr)[nowd];
dval = ((epicsUInt32 *)wf->bptr)[nowd];
break;
case DBF_SHORT:
dval = ((short *)wf->bptr)[nowd];
dval = ((epicsInt16 *)wf->bptr)[nowd];
break;
case DBF_USHORT:
case DBF_ENUM:
dval = ((unsigned short *)wf->bptr)[nowd];
dval = ((epicsUInt16 *)wf->bptr)[nowd];
break;
case DBF_CHAR:
dval = ((char *)wf->bptr)[nowd];
dval = ((epicsInt8 *)wf->bptr)[nowd];
break;
case DBF_UCHAR:
dval = ((unsigned char *)wf->bptr)[nowd];
dval = ((epicsUInt8 *)wf->bptr)[nowd];
break;
default:
errlogSevPrintf (errlogFatal,
@ -197,21 +197,23 @@ static long writeData (dbCommon *record, format_t *format)
switch (wf->ftvl)
{
case DBF_LONG:
lval = ((epicsInt32 *)wf->bptr)[nowd];
break;
case DBF_ULONG:
lval = ((long *)wf->bptr)[nowd];
lval = ((epicsUInt32 *)wf->bptr)[nowd];
break;
case DBF_SHORT:
lval = ((short *)wf->bptr)[nowd];
lval = ((epicsInt16 *)wf->bptr)[nowd];
break;
case DBF_USHORT:
case DBF_ENUM:
lval = ((unsigned short *)wf->bptr)[nowd];
lval = ((epicsUInt16 *)wf->bptr)[nowd];
break;
case DBF_CHAR:
lval = ((char *)wf->bptr)[nowd];
lval = ((epicsInt8 *)wf->bptr)[nowd];
break;
case DBF_UCHAR:
lval = ((unsigned char *)wf->bptr)[nowd];
lval = ((epicsUInt8 *)wf->bptr)[nowd];
break;
default:
errlogSevPrintf (errlogFatal,