From c138442a95ccb55d3ffa05118eaa5c78f365ab24 Mon Sep 17 00:00:00 2001 From: zimoch Date: Wed, 14 Sep 2011 08:33:08 +0000 Subject: [PATCH] fixes for 64 bit machines --- src/devaaiStream.c | 42 +++++++++++++++++++++-------------------- src/devaaoStream.c | 42 +++++++++++++++++++++-------------------- src/devwaveformStream.c | 4 ++-- 3 files changed, 46 insertions(+), 42 deletions(-) diff --git a/src/devaaiStream.c b/src/devaaiStream.c index 49d09ff..9f9e0fb 100644 --- a/src/devaaiStream.c +++ b/src/devaaiStream.c @@ -44,10 +44,10 @@ static long readData (dbCommon *record, format_t *format) switch (aai->ftvl) { case DBF_DOUBLE: - ((double *)aai->bptr)[aai->nord] = dval; + ((epicsFloat64 *)aai->bptr)[aai->nord] = (epicsFloat64)dval; break; case DBF_FLOAT: - ((float *)aai->bptr)[aai->nord] = (float)dval; + ((epicsFloat32 *)aai->bptr)[aai->nord] = (epicsFloat32)dval; break; default: errlogSevPrintf (errlogFatal, @@ -67,23 +67,23 @@ static long readData (dbCommon *record, format_t *format) switch (aai->ftvl) { case DBF_DOUBLE: - ((double *)aai->bptr)[aai->nord] = lval; + ((epicsFloat64 *)aai->bptr)[aai->nord] = (epicsFloat64)lval; break; case DBF_FLOAT: - ((float *)aai->bptr)[aai->nord] = (float)lval; + ((epicsFloat32 *)aai->bptr)[aai->nord] = (epicsFloat32)lval; break; case DBF_LONG: case DBF_ULONG: - ((long *)aai->bptr)[aai->nord] = lval; + ((epicsInt32 *)aai->bptr)[aai->nord] = (epicsInt32)lval; break; case DBF_SHORT: case DBF_USHORT: case DBF_ENUM: - ((short *)aai->bptr)[aai->nord] = (short)lval; + ((epicsInt16 *)aai->bptr)[aai->nord] = (epicsInt16)lval; break; case DBF_CHAR: case DBF_UCHAR: - ((char *)aai->bptr)[aai->nord] = (char)lval; + ((epicsInt8 *)aai->bptr)[aai->nord] = (epicsInt8)lval; break; default: errlogSevPrintf (errlogFatal, @@ -157,29 +157,29 @@ static long writeData (dbCommon *record, format_t *format) switch (aai->ftvl) { case DBF_DOUBLE: - dval = ((double *)aai->bptr)[nowd]; + dval = ((epicsFloat64 *)aai->bptr)[nowd]; break; case DBF_FLOAT: - dval = ((float *)aai->bptr)[nowd]; + dval = ((epicsFloat32 *)aai->bptr)[nowd]; break; case DBF_LONG: - dval = ((long *)aai->bptr)[nowd]; + dval = ((epicsInt32 *)aai->bptr)[nowd]; break; case DBF_ULONG: - dval = ((unsigned long *)aai->bptr)[nowd]; + dval = ((epicsUInt32 *)aai->bptr)[nowd]; break; case DBF_SHORT: - dval = ((short *)aai->bptr)[nowd]; + dval = ((epicsInt16 *)aai->bptr)[nowd]; break; case DBF_USHORT: case DBF_ENUM: - dval = ((unsigned short *)aai->bptr)[nowd]; + dval = ((epicsUInt16 *)aai->bptr)[nowd]; break; case DBF_CHAR: - dval = ((char *)aai->bptr)[nowd]; + dval = ((epicsInt8 *)aai->bptr)[nowd]; break; case DBF_UCHAR: - dval = ((unsigned char *)aai->bptr)[nowd]; + dval = ((epicsUInt8 *)aai->bptr)[nowd]; break; default: errlogSevPrintf (errlogFatal, @@ -197,21 +197,23 @@ static long writeData (dbCommon *record, format_t *format) switch (aai->ftvl) { case DBF_LONG: + lval = ((epicsInt32 *)aai->bptr)[nowd]; + break; case DBF_ULONG: - lval = ((long *)aai->bptr)[nowd]; + lval = ((epicsUInt32 *)aai->bptr)[nowd]; break; case DBF_SHORT: - lval = ((short *)aai->bptr)[nowd]; + lval = ((epicsInt16 *)aai->bptr)[nowd]; break; case DBF_USHORT: case DBF_ENUM: - lval = ((unsigned short *)aai->bptr)[nowd]; + lval = ((picsUInt16 *)aai->bptr)[nowd]; break; case DBF_CHAR: - lval = ((char *)aai->bptr)[nowd]; + lval = ((epicsInt8 *)aai->bptr)[nowd]; break; case DBF_UCHAR: - lval = ((unsigned char *)aai->bptr)[nowd]; + lval = ((epicsUInt8 *)aai->bptr)[nowd]; break; default: errlogSevPrintf (errlogFatal, diff --git a/src/devaaoStream.c b/src/devaaoStream.c index af7e220..267f23f 100644 --- a/src/devaaoStream.c +++ b/src/devaaoStream.c @@ -44,10 +44,10 @@ static long readData (dbCommon *record, format_t *format) switch (aao->ftvl) { case DBF_DOUBLE: - ((double *)aao->bptr)[aao->nord] = dval; + ((epicsFloat64 *)aao->bptr)[aao->nord] = (epicsFloat64)dval; break; case DBF_FLOAT: - ((float *)aao->bptr)[aao->nord] = (float)dval; + ((epicsFloat32 *)aao->bptr)[aao->nord] = (epicsFloat32)dval; break; default: errlogSevPrintf (errlogFatal, @@ -67,23 +67,23 @@ static long readData (dbCommon *record, format_t *format) switch (aao->ftvl) { case DBF_DOUBLE: - ((double *)aao->bptr)[aao->nord] = lval; + ((epicsFloat64 *)aao->bptr)[aao->nord] = (epicsFloat64)lval; break; case DBF_FLOAT: - ((float *)aao->bptr)[aao->nord] = (float)lval; + ((epicsFloat32 *)aao->bptr)[aao->nord] = (epicsFloat32)lval; break; case DBF_LONG: case DBF_ULONG: - ((long *)aao->bptr)[aao->nord] = lval; + ((epicsInt32 *)aao->bptr)[aao->nord] = (epicsInt32)lval; break; case DBF_SHORT: case DBF_USHORT: case DBF_ENUM: - ((short *)aao->bptr)[aao->nord] = (short)lval; + ((epicsInt16 *)aao->bptr)[aao->nord] = (epicsInt16)lval; break; case DBF_CHAR: case DBF_UCHAR: - ((char *)aao->bptr)[aao->nord] = (char)lval; + ((epicsInt8 *)aao->bptr)[aao->nord] = (epicsInt8)lval; break; default: errlogSevPrintf (errlogFatal, @@ -157,29 +157,29 @@ static long writeData (dbCommon *record, format_t *format) switch (aao->ftvl) { case DBF_DOUBLE: - dval = ((double *)aao->bptr)[nowd]; + dval = ((epicsFloat64 *)aao->bptr)[nowd]; break; case DBF_FLOAT: - dval = ((float *)aao->bptr)[nowd]; + dval = ((epicsFloat32 *)aao->bptr)[nowd]; break; case DBF_LONG: - dval = ((long *)aao->bptr)[nowd]; + dval = ((epicsInt32 *)aao->bptr)[nowd]; break; case DBF_ULONG: - dval = ((unsigned long *)aao->bptr)[nowd]; + dval = ((epicsUInt32 *)aao->bptr)[nowd]; break; case DBF_SHORT: - dval = ((short *)aao->bptr)[nowd]; + dval = ((epicsInt16 *)aao->bptr)[nowd]; break; case DBF_USHORT: case DBF_ENUM: - dval = ((unsigned short *)aao->bptr)[nowd]; + dval = ((epicsUInt16 *)aao->bptr)[nowd]; break; case DBF_CHAR: - dval = ((char *)aao->bptr)[nowd]; + dval = ((epicsInt8 *)aao->bptr)[nowd]; break; case DBF_UCHAR: - dval = ((unsigned char *)aao->bptr)[nowd]; + dval = ((epicsUInt8 *)aao->bptr)[nowd]; break; default: errlogSevPrintf (errlogFatal, @@ -197,21 +197,23 @@ static long writeData (dbCommon *record, format_t *format) switch (aao->ftvl) { case DBF_LONG: + lval = ((epicsInt32 *)aao->bptr)[nowd]; + break; case DBF_ULONG: - lval = ((long *)aao->bptr)[nowd]; + lval = ((epicsUInt32 *)aao->bptr)[nowd]; break; case DBF_SHORT: - lval = ((short *)aao->bptr)[nowd]; + lval = ((epicsInt16 *)aao->bptr)[nowd]; break; case DBF_USHORT: case DBF_ENUM: - lval = ((unsigned short *)aao->bptr)[nowd]; + lval = ((epicsUInt16 *)aao->bptr)[nowd]; break; case DBF_CHAR: - lval = ((char *)aao->bptr)[nowd]; + lval = ((epicsInt8 *)aao->bptr)[nowd]; break; case DBF_UCHAR: - lval = ((unsigned char *)aao->bptr)[nowd]; + lval = ((epicsUInt8 *)aao->bptr)[nowd]; break; default: errlogSevPrintf (errlogFatal, diff --git a/src/devwaveformStream.c b/src/devwaveformStream.c index 342cda8..81edddb 100644 --- a/src/devwaveformStream.c +++ b/src/devwaveformStream.c @@ -44,7 +44,7 @@ static long readData (dbCommon *record, format_t *format) switch (wf->ftvl) { case DBF_DOUBLE: - ((epicsFloat64 *)wf->bptr)[wf->nord] = dval; + ((epicsFloat64 *)wf->bptr)[wf->nord] = (epicsFloat64)dval; break; case DBF_FLOAT: ((epicsFloat32 *)wf->bptr)[wf->nord] = (epicsFloat32)dval; @@ -74,7 +74,7 @@ static long readData (dbCommon *record, format_t *format) break; case DBF_LONG: case DBF_ULONG: - ((epicsInt32 *)wf->bptr)[wf->nord] = lval; + ((epicsInt32 *)wf->bptr)[wf->nord] = (epicsInt32)lval; break; case DBF_SHORT: case DBF_USHORT: