diff --git a/src/ca/db_access.h b/src/ca/db_access.h index 37d98c51c..890bc8668 100644 --- a/src/ca/db_access.h +++ b/src/ca/db_access.h @@ -60,6 +60,7 @@ typedef epicsUInt16 dbr_put_ackt_t; typedef epicsUInt16 dbr_put_acks_t; typedef epicsOldString dbr_class_name_t; +#ifndef db_accessHFORdb_accessC /* database field types */ #define DBF_STRING 0 #define DBF_INT 1 @@ -177,7 +178,7 @@ epicsShareExtern READONLY epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1]; * DBR_CTRL_LONG returns a control long structure (dbr_ctrl_long) * DBR_CTRL_DOUBLE returns a control double structure (dbr_ctrl_double) */ - +#endif /*db_accessHFORdb_accessC*/ /* VALUES WITH STATUS STRUCTURES */ @@ -524,6 +525,7 @@ struct dbr_ctrl_double{ dbr_double_t value; /* current value */ }; +#ifndef db_accessHFORdb_accessC #define dbr_size_n(TYPE,COUNT)\ ((unsigned)((COUNT)<=0?dbr_size[TYPE]:dbr_size[TYPE]+((COUNT)-1)*dbr_value_size[TYPE])) @@ -730,6 +732,7 @@ epicsShareExtern READONLY char *dbf_text_invalid; epicsShareExtern READONLY char *dbr_text[LAST_BUFFER_TYPE+1]; epicsShareExtern READONLY short dbr_text_dim; epicsShareExtern READONLY char *dbr_text_invalid; +#endif /*db_accessHFORdb_accessC*/ #ifdef __cplusplus } diff --git a/src/db/dbAccessDefs.h b/src/db/dbAccessDefs.h index e0b33fe90..cd13debb4 100644 --- a/src/db/dbAccessDefs.h +++ b/src/db/dbAccessDefs.h @@ -13,8 +13,19 @@ #ifndef INCdbAccessDefsh #define INCdbAccessDefsh +#ifdef epicsExportSharedSymbols +# define INCLdb_accessh_epicsExportSharedSymbols +# undef epicsExportSharedSymbols +#endif + +#include "epicsTypes.h" #include "epicsTime.h" -#include "shareLib.h" + +#ifdef INCLdb_accessh_epicsExportSharedSymbols +# define epicsExportSharedSymbols +# include "shareLib.h" +#endif + #ifdef __cplusplus extern "C" { #endif @@ -45,7 +56,7 @@ epicsShareExtern volatile int interruptAccept; * struct { * DBRstatus * DBRtime - * float value[10] + * epicsFloat32 value[10] * } buffer; * * IMPORTANT!! The DBRoptions must be given in the order that they @@ -78,7 +89,7 @@ epicsShareExtern volatile int interruptAccept; * typedef struct { * DBRstatus * DBRtime - * float value[10] + * epicsFloat32 value[10] * } MYBUFFER; * * With this definition you can give definitions such as the following: @@ -89,44 +100,44 @@ epicsShareExtern volatile int interruptAccept; /* Macros for defining each option */ #define DBRstatus \ - unsigned short status; /* alarm status */\ - unsigned short severity; /* alarm severity*/\ - unsigned short acks; /* alarm ack severity*/\ - unsigned short ackt; /* Acknowledge transient alarms?*/ + epicsUInt16 status; /* alarm status */\ + epicsUInt16 severity; /* alarm severity*/\ + epicsUInt16 acks; /* alarm ack severity*/\ + epicsUInt16 ackt; /* Acknowledge transient alarms?*/ #define DB_UNITS_SIZE 16 #define DBRunits \ char units[DB_UNITS_SIZE]; /* units */ #define DBRprecision \ - long precision; /* number of decimal places*/\ - long field_width; /* field width */ + epicsInt32 precision; /* number of decimal places*/\ + epicsInt32 field_width; /* field width */ #define DBRtime \ epicsTimeStamp time; /* time stamp*/ #define DBRenumStrs \ - unsigned long no_str; /* number of strings*/\ - long padenumStrs; /*padding to force 8 byte align*/\ + epicsUInt32 no_str; /* number of strings*/\ + epicsInt32 padenumStrs; /*padding to force 8 byte align*/\ char strs[DB_MAX_CHOICES][MAX_STRING_SIZE]; /* string values */ #define DBRgrLong \ - long upper_disp_limit; /*upper limit of graph*/\ - long lower_disp_limit; /*lower limit of graph*/ + epicsInt32 upper_disp_limit; /*upper limit of graph*/\ + epicsInt32 lower_disp_limit; /*lower limit of graph*/ #define DBRgrDouble \ - double upper_disp_limit; /*upper limit of graph*/\ - double lower_disp_limit; /*lower limit of graph*/ + epicsFloat64 upper_disp_limit; /*upper limit of graph*/\ + epicsFloat64 lower_disp_limit; /*lower limit of graph*/ #define DBRctrlLong \ - long upper_ctrl_limit; /*upper limit of graph*/\ - long lower_ctrl_limit; /*lower limit of graph*/ + epicsInt32 upper_ctrl_limit; /*upper limit of graph*/\ + epicsInt32 lower_ctrl_limit; /*lower limit of graph*/ #define DBRctrlDouble \ - double upper_ctrl_limit; /*upper limit of graph*/\ - double lower_ctrl_limit; /*lower limit of graph*/ + epicsFloat64 upper_ctrl_limit; /*upper limit of graph*/\ + epicsFloat64 lower_ctrl_limit; /*lower limit of graph*/ #define DBRalLong \ - long upper_alarm_limit;\ - long upper_warning_limit;\ - long lower_warning_limit;\ - long lower_alarm_limit; + epicsInt32 upper_alarm_limit;\ + epicsInt32 upper_warning_limit;\ + epicsInt32 lower_warning_limit;\ + epicsInt32 lower_alarm_limit; #define DBRalDouble \ - double upper_alarm_limit;\ - double upper_warning_limit;\ - double lower_warning_limit;\ - double lower_alarm_limit; + epicsFloat64 upper_alarm_limit;\ + epicsFloat64 upper_warning_limit;\ + epicsFloat64 lower_warning_limit;\ + epicsFloat64 lower_alarm_limit; /* structures for each option type */ struct dbr_status {DBRstatus}; diff --git a/src/db/dbConvert.c b/src/db/dbConvert.c index d176b3dc8..7c187a7a7 100644 --- a/src/db/dbConvert.c +++ b/src/db/dbConvert.c @@ -235,12 +235,12 @@ static long getStringUshort( static long getStringLong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - long *pbuffer = (long *)pto; + epicsInt32 *pbuffer = (epicsInt32 *)pto; char *psrc=(char *)paddr->pfield; - long value; + epicsInt32 value; if(nRequest==1 && offset==0) { - if(sscanf(psrc,"%ld",&value) == 1) { + if(sscanf(psrc,"%d",&value) == 1) { *pbuffer = value; return(0); } else if(strlen(psrc) == 0) { @@ -252,7 +252,7 @@ static long getStringLong( } psrc += MAX_STRING_SIZE*offset; while (nRequest) { - if(sscanf(psrc,"%ld",&value) == 1) { + if(sscanf(psrc,"%d",&value) == 1) { *pbuffer = value; } else if(strlen(psrc) == 0) { *pbuffer = 0; @@ -272,15 +272,15 @@ static long getStringLong( static long getStringUlong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned long *pbuffer = (unsigned long *)pto; - char *psrc=(char *)paddr->pfield; - double value; + epicsUInt32 *pbuffer = (epicsUInt32 *)pto; + char *psrc=(char *)paddr->pfield; + double value; /*Convert to double first so that numbers like 1.0e3 convert properly*/ /*Problem was old database access said to get unsigned long as double*/ if(nRequest==1 && offset==0) { if(sscanf(psrc,"%lf",&value) == 1) { - *pbuffer = (unsigned long)value; + *pbuffer = (epicsUInt32)value; return(0); } else if(strlen(psrc) == 0) { *pbuffer = 0; @@ -292,7 +292,7 @@ static long getStringUlong( psrc += MAX_STRING_SIZE*offset; while (nRequest) { if(sscanf(psrc,"%lf",&value) == 1) { - *pbuffer = (unsigned long)value; + *pbuffer = (epicsUInt32)value; } else if(strlen(psrc) == 0) { *pbuffer = 0; } else { @@ -490,7 +490,7 @@ static long getCharUshort( static long getCharLong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - long *pbuffer = (long *)pto; + epicsInt32 *pbuffer = (epicsInt32 *)pto; char *psrc=(char *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -509,7 +509,7 @@ static long getCharLong( static long getCharUlong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned long *pbuffer = (unsigned long *)pto; + epicsUInt32 *pbuffer = (epicsUInt32 *)pto; char *psrc=(char *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -566,7 +566,7 @@ static long getCharDouble( static long getCharEnum( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned short *pbuffer = (unsigned short *)pto; + epicsEnum16 *pbuffer = (epicsEnum16 *)pto; char *psrc=(char *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -684,7 +684,7 @@ static long getUcharUshort( static long getUcharLong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - long *pbuffer = (long *)pto; + epicsInt32 *pbuffer = (epicsInt32 *)pto; unsigned char *psrc=(unsigned char *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -703,7 +703,7 @@ static long getUcharLong( static long getUcharUlong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned long *pbuffer = (unsigned long *)pto; + epicsUInt32 *pbuffer = (epicsUInt32 *)pto; unsigned char *psrc=(unsigned char *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -760,7 +760,7 @@ static long getUcharDouble( static long getUcharEnum( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned short *pbuffer = (unsigned short *)pto; + epicsEnum16 *pbuffer = (epicsEnum16 *)pto; unsigned char *psrc=(unsigned char *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -877,7 +877,7 @@ static long getShortUshort( static long getShortLong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - long *pbuffer = (long *)pto; + epicsInt32 *pbuffer = (epicsInt32 *)pto; short *psrc=(short *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -896,7 +896,7 @@ static long getShortLong( static long getShortUlong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned long *pbuffer = (unsigned long *)pto; + epicsUInt32 *pbuffer = (epicsUInt32 *)pto; short *psrc=(short *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -953,7 +953,7 @@ static long getShortDouble( static long getShortEnum( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned short *pbuffer = (unsigned short *)pto; + epicsEnum16 *pbuffer = (epicsEnum16 *)pto; short *psrc=(short *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -1070,7 +1070,7 @@ static long getUshortUshort( static long getUshortLong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - long *pbuffer = (long *)pto; + epicsInt32 *pbuffer = (epicsInt32 *)pto; unsigned short *psrc=(unsigned short *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -1089,7 +1089,7 @@ static long getUshortLong( static long getUshortUlong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned long *pbuffer = (unsigned long *)pto; + epicsUInt32 *pbuffer = (epicsUInt32 *)pto; unsigned short *psrc=(unsigned short *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -1146,7 +1146,7 @@ static long getUshortDouble( static long getUshortEnum( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned short *pbuffer = (unsigned short *)pto; + epicsEnum16 *pbuffer = (epicsEnum16 *)pto; unsigned short *psrc=(unsigned short *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -1166,7 +1166,7 @@ static long getLongString( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { char *pbuffer = (char *)pto; - long *psrc=(long *)(paddr->pfield); + epicsInt32 *psrc=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { cvtLongToString(*psrc,pbuffer); @@ -1177,7 +1177,7 @@ static long getLongString( cvtLongToString(*psrc,pbuffer); pbuffer += MAX_STRING_SIZE; if(++offset==no_elements) - psrc=(long *)paddr->pfield; + psrc=(epicsInt32 *)paddr->pfield; else psrc++; nRequest--; @@ -1189,7 +1189,7 @@ static long getLongChar( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { char *pbuffer = (char *)pto; - long *psrc=(long *)(paddr->pfield); + epicsInt32 *psrc=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1198,7 +1198,7 @@ static long getLongChar( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1208,7 +1208,7 @@ static long getLongUchar( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { unsigned char *pbuffer = (unsigned char *)pto; - long *psrc=(long *)(paddr->pfield); + epicsInt32 *psrc=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1217,7 +1217,7 @@ static long getLongUchar( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1227,7 +1227,7 @@ static long getLongShort( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { short *pbuffer = (short *)pto; - long *psrc=(long *)(paddr->pfield); + epicsInt32 *psrc=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1236,7 +1236,7 @@ static long getLongShort( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1246,7 +1246,7 @@ static long getLongUshort( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { unsigned short *pbuffer = (unsigned short *)pto; - long *psrc=(long *)(paddr->pfield); + epicsInt32 *psrc=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1255,7 +1255,7 @@ static long getLongUshort( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1264,8 +1264,8 @@ static long getLongUshort( static long getLongLong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - long *pbuffer = (long *)pto; - long *psrc=(long *)(paddr->pfield); + epicsInt32 *pbuffer = (epicsInt32 *)pto; + epicsInt32 *psrc=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1274,7 +1274,7 @@ static long getLongLong( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1283,8 +1283,8 @@ static long getLongLong( static long getLongUlong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned long *pbuffer = (unsigned long *)pto; - long *psrc=(long *)(paddr->pfield); + epicsUInt32 *pbuffer = (epicsUInt32 *)pto; + epicsInt32 *psrc=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1293,7 +1293,7 @@ static long getLongUlong( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1303,7 +1303,7 @@ static long getLongFloat( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { float *pbuffer = (float *)pto; - long *psrc=(long *)(paddr->pfield); + epicsInt32 *psrc=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1312,7 +1312,7 @@ static long getLongFloat( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1322,7 +1322,7 @@ static long getLongDouble( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { double *pbuffer = (double *)pto; - long *psrc=(long *)(paddr->pfield); + epicsInt32 *psrc=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1331,7 +1331,7 @@ static long getLongDouble( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1340,8 +1340,8 @@ static long getLongDouble( static long getLongEnum( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned short *pbuffer = (unsigned short *)pto; - long *psrc=(long *)(paddr->pfield); + epicsEnum16 *pbuffer = (epicsEnum16 *)pto; + epicsInt32 *psrc=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1350,7 +1350,7 @@ static long getLongEnum( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1360,7 +1360,7 @@ static long getUlongString( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { char *pbuffer = (char *)pto; - unsigned long *psrc=(unsigned long *)(paddr->pfield); + epicsUInt32 *psrc=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { cvtUlongToString(*psrc,pbuffer); @@ -1371,7 +1371,7 @@ static long getUlongString( cvtUlongToString(*psrc,pbuffer); pbuffer += MAX_STRING_SIZE; if(++offset==no_elements) - psrc=(unsigned long *)paddr->pfield; + psrc=(epicsUInt32 *)paddr->pfield; else psrc++; nRequest--; @@ -1383,7 +1383,7 @@ static long getUlongChar( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { char *pbuffer = (char *)pto; - unsigned long *psrc=(unsigned long *)(paddr->pfield); + epicsUInt32 *psrc=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1392,7 +1392,7 @@ static long getUlongChar( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1402,7 +1402,7 @@ static long getUlongUchar( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { unsigned char *pbuffer = (unsigned char *)pto; - unsigned long *psrc=(unsigned long *)(paddr->pfield); + epicsUInt32 *psrc=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1411,7 +1411,7 @@ static long getUlongUchar( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1421,7 +1421,7 @@ static long getUlongShort( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { short *pbuffer = (short *)pto; - unsigned long *psrc=(unsigned long *)(paddr->pfield); + epicsUInt32 *psrc=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1430,7 +1430,7 @@ static long getUlongShort( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1440,7 +1440,7 @@ static long getUlongUshort( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { unsigned short *pbuffer = (unsigned short *)pto; - unsigned long *psrc=(unsigned long *)(paddr->pfield); + epicsUInt32 *psrc=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1449,7 +1449,7 @@ static long getUlongUshort( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1458,8 +1458,8 @@ static long getUlongUshort( static long getUlongLong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - long *pbuffer = (long *)pto; - unsigned long *psrc=(unsigned long *)(paddr->pfield); + epicsInt32 *pbuffer = (epicsInt32 *)pto; + epicsUInt32 *psrc=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1468,7 +1468,7 @@ static long getUlongLong( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1477,8 +1477,8 @@ static long getUlongLong( static long getUlongUlong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned long *pbuffer = (unsigned long *)pto; - unsigned long *psrc=(unsigned long *)(paddr->pfield); + epicsUInt32 *pbuffer = (epicsUInt32 *)pto; + epicsUInt32 *psrc=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1487,7 +1487,7 @@ static long getUlongUlong( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1497,7 +1497,7 @@ static long getUlongFloat( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { float *pbuffer = (float *)pto; - unsigned long *psrc=(unsigned long *)(paddr->pfield); + epicsUInt32 *psrc=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1506,7 +1506,7 @@ static long getUlongFloat( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1516,7 +1516,7 @@ static long getUlongDouble( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { double *pbuffer = (double *)pto; - unsigned long *psrc=(unsigned long *)(paddr->pfield); + epicsUInt32 *psrc=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1525,7 +1525,7 @@ static long getUlongDouble( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1534,8 +1534,8 @@ static long getUlongDouble( static long getUlongEnum( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned short *pbuffer = (unsigned short *)pto; - unsigned long *psrc=(unsigned long *)(paddr->pfield); + epicsEnum16 *pbuffer = (epicsEnum16 *)pto; + epicsUInt32 *psrc=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1544,7 +1544,7 @@ static long getUlongEnum( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned long *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -1658,7 +1658,7 @@ static long getFloatUshort( static long getFloatLong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - long *pbuffer = (long *)pto; + epicsInt32 *pbuffer = (epicsInt32 *)pto; float *psrc=(float *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -1677,7 +1677,7 @@ static long getFloatLong( static long getFloatUlong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned long *pbuffer = (unsigned long *)pto; + epicsUInt32 *pbuffer = (epicsUInt32 *)pto; float *psrc=(float *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -1734,7 +1734,7 @@ static long getFloatDouble( static long getFloatEnum( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned short *pbuffer = (unsigned short *)pto; + epicsEnum16 *pbuffer = (epicsEnum16 *)pto; float *psrc=(float *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -1858,7 +1858,7 @@ static long getDoubleUshort( static long getDoubleLong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - long *pbuffer = (long *)pto; + epicsInt32 *pbuffer = (epicsInt32 *)pto; double *psrc=(double *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -1877,7 +1877,7 @@ static long getDoubleLong( static long getDoubleUlong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned long *pbuffer = (unsigned long *)pto; + epicsUInt32 *pbuffer = (epicsUInt32 *)pto; double *psrc=(double *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -1935,7 +1935,7 @@ static long getDoubleDouble( static long getDoubleEnum( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned short *pbuffer = (unsigned short *)pto; + epicsEnum16 *pbuffer = (epicsEnum16 *)pto; double *psrc=(double *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -1969,7 +1969,7 @@ static long getEnumChar( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { char *pbuffer = (char *)pto; - unsigned short *psrc=(unsigned short *)(paddr->pfield); + epicsEnum16 *psrc=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1978,7 +1978,7 @@ static long getEnumChar( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned short *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -1988,7 +1988,7 @@ static long getEnumUchar( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { unsigned char *pbuffer = (unsigned char *)pto; - unsigned short *psrc=(unsigned short *)(paddr->pfield); + epicsEnum16 *psrc=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -1997,7 +1997,7 @@ static long getEnumUchar( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned short *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -2007,7 +2007,7 @@ static long getEnumShort( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { short *pbuffer = (short *)pto; - unsigned short *psrc=(unsigned short *)(paddr->pfield); + epicsEnum16 *psrc=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -2016,7 +2016,7 @@ static long getEnumShort( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned short *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -2026,7 +2026,7 @@ static long getEnumUshort( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { unsigned short *pbuffer = (unsigned short *)pto; - unsigned short *psrc=(unsigned short *)(paddr->pfield); + epicsEnum16 *psrc=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -2035,7 +2035,7 @@ static long getEnumUshort( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned short *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -2044,8 +2044,8 @@ static long getEnumUshort( static long getEnumLong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - long *pbuffer = (long *)pto; - unsigned short *psrc=(unsigned short *)(paddr->pfield); + epicsInt32 *pbuffer = (epicsInt32 *)pto; + epicsEnum16 *psrc=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -2054,7 +2054,7 @@ static long getEnumLong( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned short *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -2063,8 +2063,8 @@ static long getEnumLong( static long getEnumUlong( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned long *pbuffer = (unsigned long *)pto; - unsigned short *psrc=(unsigned short *)(paddr->pfield); + epicsUInt32 *pbuffer = (epicsUInt32 *)pto; + epicsEnum16 *psrc=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -2073,7 +2073,7 @@ static long getEnumUlong( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned short *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -2083,7 +2083,7 @@ static long getEnumFloat( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { float *pbuffer = (float *)pto; - unsigned short *psrc=(unsigned short *)(paddr->pfield); + epicsEnum16 *psrc=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -2092,7 +2092,7 @@ static long getEnumFloat( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned short *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -2102,7 +2102,7 @@ static long getEnumDouble( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { double *pbuffer = (double *)pto; - unsigned short *psrc=(unsigned short *)(paddr->pfield); + epicsEnum16 *psrc=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -2111,7 +2111,7 @@ static long getEnumDouble( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned short *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -2120,8 +2120,8 @@ static long getEnumDouble( static long getEnumEnum( DBADDR *paddr, void *pto, long nRequest, long no_elements, long offset) { - unsigned short *pbuffer = (unsigned short *)pto; - unsigned short *psrc=(unsigned short *)(paddr->pfield); + epicsEnum16 *pbuffer = (epicsEnum16 *)pto; + epicsEnum16 *psrc=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pbuffer = *psrc; @@ -2130,7 +2130,7 @@ static long getEnumEnum( psrc += offset; while (nRequest) { *pbuffer++ = *psrc++; - if(++offset==no_elements) psrc=(unsigned short *)paddr->pfield; + if(++offset==no_elements) psrc=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -2144,7 +2144,7 @@ static long getMenuString(DBADDR *paddr, void *pto, dbMenu *pdbMenu; char **papChoiceValue; char *pchoice; - unsigned short choice_ind= *((unsigned short*)paddr->pfield); + epicsEnum16 choice_ind= *((epicsEnum16*)paddr->pfield); if(no_elements!=1){ recGblDbaddrError(S_db_onlyOne,paddr,"dbGet(getMenuString)"); @@ -2170,7 +2170,7 @@ static long getDeviceString(DBADDR *paddr, void *pto, dbDeviceMenu *pdbDeviceMenu; char **papChoice; char *pchoice; - unsigned short choice_ind= *((unsigned short*)paddr->pfield); + epicsEnum16 choice_ind= *((epicsEnum16*)paddr->pfield); if(no_elements!=1){ recGblDbaddrError(S_db_onlyOne,paddr,"dbGet(getDeviceString)"); @@ -2473,7 +2473,7 @@ static long putStringEnum( { char *pbuffer = (char *)pfrom; struct rset *prset; - unsigned short *pfield= (unsigned short*)(paddr->pfield); + epicsEnum16 *pfield= (epicsEnum16*)(paddr->pfield); long status; unsigned int nchoices,ind; int nargs,nchars; @@ -2516,7 +2516,7 @@ static long putStringMenu( dbMenu *pdbMenu; char **papChoiceValue; char *pchoice; - unsigned short *pfield= (unsigned short*)(paddr->pfield); + epicsEnum16 *pfield= (epicsEnum16*)(paddr->pfield); unsigned int nChoice,ind; int nargs,nchars; @@ -2553,7 +2553,7 @@ static long putStringDevice( dbDeviceMenu *pdbDeviceMenu = (dbDeviceMenu *)pdbFldDes->ftPvt; char **papChoice; char *pchoice; - unsigned short *pfield= (unsigned short*)(paddr->pfield); + epicsEnum16 *pfield= (epicsEnum16*)(paddr->pfield); unsigned int nChoice,ind; int nargs,nchars; @@ -2763,7 +2763,7 @@ static long putCharEnum( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { char *pbuffer = (char *)pfrom; - unsigned short *pdest=(unsigned short *)(paddr->pfield); + epicsEnum16 *pdest=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -2772,7 +2772,7 @@ static long putCharEnum( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned short *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -2959,7 +2959,7 @@ static long putUcharEnum( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { unsigned char *pbuffer = (unsigned char *)pfrom; - unsigned short *pdest=(unsigned short *)(paddr->pfield); + epicsEnum16 *pdest=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -2968,7 +2968,7 @@ static long putUcharEnum( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned short *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -3155,7 +3155,7 @@ static long putShortEnum( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { short *pbuffer = (short *)pfrom; - unsigned short *pdest=(unsigned short *)(paddr->pfield); + epicsEnum16 *pdest=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3164,7 +3164,7 @@ static long putShortEnum( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned short *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -3275,7 +3275,7 @@ static long putUshortLong( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { unsigned short *pbuffer = (unsigned short *)pfrom; - long *pdest=(long *)(paddr->pfield); + epicsInt32 *pdest=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3284,7 +3284,7 @@ static long putUshortLong( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(long *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -3294,7 +3294,7 @@ static long putUshortUlong( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { unsigned short *pbuffer = (unsigned short *)pfrom; - unsigned long *pdest=(unsigned long *)(paddr->pfield); + epicsUInt32 *pdest=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3303,7 +3303,7 @@ static long putUshortUlong( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned long *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -3351,7 +3351,7 @@ static long putUshortEnum( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { unsigned short *pbuffer = (unsigned short *)pfrom; - unsigned short *pdest=(unsigned short *)(paddr->pfield); + epicsEnum16 *pdest=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3360,7 +3360,7 @@ static long putUshortEnum( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned short *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -3369,7 +3369,7 @@ static long putUshortEnum( static long putLongString( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - long *pbuffer = (long *)pfrom; + epicsInt32 *pbuffer = (epicsInt32 *)pfrom; char *pdest=(char *)(paddr->pfield); short size=paddr->field_size; @@ -3394,7 +3394,7 @@ static long putLongString( static long putLongChar( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - long *pbuffer = (long *)pfrom; + epicsInt32 *pbuffer = (epicsInt32 *)pfrom; char *pdest=(char *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -3413,7 +3413,7 @@ static long putLongChar( static long putLongUchar( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - long *pbuffer = (long *)pfrom; + epicsInt32 *pbuffer = (epicsInt32 *)pfrom; unsigned char *pdest=(unsigned char *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -3432,7 +3432,7 @@ static long putLongUchar( static long putLongShort( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - long *pbuffer = (long *)pfrom; + epicsInt32 *pbuffer = (epicsInt32 *)pfrom; short *pdest=(short *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -3451,7 +3451,7 @@ static long putLongShort( static long putLongUshort( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - long *pbuffer = (long *)pfrom; + epicsInt32 *pbuffer = (epicsInt32 *)pfrom; unsigned short *pdest=(unsigned short *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -3470,8 +3470,8 @@ static long putLongUshort( static long putLongLong( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - long *pbuffer = (long *)pfrom; - long *pdest=(long *)(paddr->pfield); + epicsInt32 *pbuffer = (epicsInt32 *)pfrom; + epicsInt32 *pdest=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3480,7 +3480,7 @@ static long putLongLong( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(long *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -3489,8 +3489,8 @@ static long putLongLong( static long putLongUlong( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - long *pbuffer = (long *)pfrom; - unsigned long *pdest=(unsigned long *)(paddr->pfield); + epicsInt32 *pbuffer = (epicsInt32 *)pfrom; + epicsUInt32 *pdest=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3499,7 +3499,7 @@ static long putLongUlong( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned long *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -3508,7 +3508,7 @@ static long putLongUlong( static long putLongFloat( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - long *pbuffer = (long *)pfrom; + epicsInt32 *pbuffer = (epicsInt32 *)pfrom; float *pdest=(float *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -3527,7 +3527,7 @@ static long putLongFloat( static long putLongDouble( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - long *pbuffer = (long *)pfrom; + epicsInt32 *pbuffer = (epicsInt32 *)pfrom; double *pdest=(double *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -3546,8 +3546,8 @@ static long putLongDouble( static long putLongEnum( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - long *pbuffer = (long *)pfrom; - unsigned short *pdest=(unsigned short *)(paddr->pfield); + epicsInt32 *pbuffer = (epicsInt32 *)pfrom; + epicsEnum16 *pdest=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3556,7 +3556,7 @@ static long putLongEnum( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned short *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -3565,7 +3565,7 @@ static long putLongEnum( static long putUlongString( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned long *pbuffer = (unsigned long *)pfrom; + epicsUInt32 *pbuffer = (epicsUInt32 *)pfrom; char *pdest=(char *)(paddr->pfield); short size=paddr->field_size; @@ -3590,7 +3590,7 @@ static long putUlongString( static long putUlongChar( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned long *pbuffer = (unsigned long *)pfrom; + epicsUInt32 *pbuffer = (epicsUInt32 *)pfrom; char *pdest=(char *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -3609,7 +3609,7 @@ static long putUlongChar( static long putUlongUchar( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned long *pbuffer = (unsigned long *)pfrom; + epicsUInt32 *pbuffer = (epicsUInt32 *)pfrom; unsigned char *pdest=(unsigned char *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -3628,7 +3628,7 @@ static long putUlongUchar( static long putUlongShort( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned long *pbuffer = (unsigned long *)pfrom; + epicsUInt32 *pbuffer = (epicsUInt32 *)pfrom; short *pdest=(short *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -3647,7 +3647,7 @@ static long putUlongShort( static long putUlongUshort( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned long *pbuffer = (unsigned long *)pfrom; + epicsUInt32 *pbuffer = (epicsUInt32 *)pfrom; unsigned short *pdest=(unsigned short *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -3666,8 +3666,8 @@ static long putUlongUshort( static long putUlongLong( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned long *pbuffer = (unsigned long *)pfrom; - long *pdest=(long *)(paddr->pfield); + epicsUInt32 *pbuffer = (epicsUInt32 *)pfrom; + epicsInt32 *pdest=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3676,7 +3676,7 @@ static long putUlongLong( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(long *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -3685,8 +3685,8 @@ static long putUlongLong( static long putUlongUlong( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned long *pbuffer = (unsigned long *)pfrom; - unsigned long *pdest=(unsigned long *)(paddr->pfield); + epicsUInt32 *pbuffer = (epicsUInt32 *)pfrom; + epicsUInt32 *pdest=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3695,7 +3695,7 @@ static long putUlongUlong( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned long *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -3704,7 +3704,7 @@ static long putUlongUlong( static long putUlongFloat( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned long *pbuffer = (unsigned long *)pfrom; + epicsUInt32 *pbuffer = (epicsUInt32 *)pfrom; float *pdest=(float *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -3723,7 +3723,7 @@ static long putUlongFloat( static long putUlongDouble( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned long *pbuffer = (unsigned long *)pfrom; + epicsUInt32 *pbuffer = (epicsUInt32 *)pfrom; double *pdest=(double *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -3742,8 +3742,8 @@ static long putUlongDouble( static long putUlongEnum( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned long *pbuffer = (unsigned long *)pfrom; - unsigned short *pdest=(unsigned short *)(paddr->pfield); + epicsUInt32 *pbuffer = (epicsUInt32 *)pfrom; + epicsEnum16 *pdest=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3752,7 +3752,7 @@ static long putUlongEnum( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned short *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -3868,7 +3868,7 @@ static long putFloatLong( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { float *pbuffer = (float *)pfrom; - long *pdest=(long *)(paddr->pfield); + epicsInt32 *pdest=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3877,7 +3877,7 @@ static long putFloatLong( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(long *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -3887,7 +3887,7 @@ static long putFloatUlong( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { float *pbuffer = (float *)pfrom; - unsigned long *pdest=(unsigned long *)(paddr->pfield); + epicsUInt32 *pdest=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3896,7 +3896,7 @@ static long putFloatUlong( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned long *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -3944,7 +3944,7 @@ static long putFloatEnum( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { float *pbuffer = (float *)pfrom; - unsigned short *pdest=(unsigned short *)(paddr->pfield); + epicsEnum16 *pdest=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -3953,7 +3953,7 @@ static long putFloatEnum( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned short *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -4069,7 +4069,7 @@ static long putDoubleLong( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { double *pbuffer = (double *)pfrom; - long *pdest=(long *)(paddr->pfield); + epicsInt32 *pdest=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -4078,7 +4078,7 @@ static long putDoubleLong( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(long *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -4088,7 +4088,7 @@ static long putDoubleUlong( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { double *pbuffer = (double *)pfrom; - unsigned long *pdest=(unsigned long *)(paddr->pfield); + epicsUInt32 *pdest=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -4097,7 +4097,7 @@ static long putDoubleUlong( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned long *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -4146,7 +4146,7 @@ static long putDoubleEnum( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { double *pbuffer = (double *)pfrom; - unsigned short *pdest=(unsigned short *)(paddr->pfield); + epicsEnum16 *pdest=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -4155,7 +4155,7 @@ static long putDoubleEnum( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned short *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); @@ -4164,7 +4164,7 @@ static long putDoubleEnum( static long putEnumString( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned short *pbuffer = (unsigned short *)pfrom; + epicsEnum16 *pbuffer = (epicsEnum16 *)pfrom; char *pdest=(char *)(paddr->pfield); short size=paddr->field_size; @@ -4189,7 +4189,7 @@ static long putEnumString( static long putEnumChar( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned short *pbuffer = (unsigned short *)pfrom; + epicsEnum16 *pbuffer = (epicsEnum16 *)pfrom; char *pdest=(char *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -4208,7 +4208,7 @@ static long putEnumChar( static long putEnumUchar( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned short *pbuffer = (unsigned short *)pfrom; + epicsEnum16 *pbuffer = (epicsEnum16 *)pfrom; unsigned char *pdest=(unsigned char *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -4227,7 +4227,7 @@ static long putEnumUchar( static long putEnumShort( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned short *pbuffer = (unsigned short *)pfrom; + epicsEnum16 *pbuffer = (epicsEnum16 *)pfrom; short *pdest=(short *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -4246,7 +4246,7 @@ static long putEnumShort( static long putEnumUshort( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned short *pbuffer = (unsigned short *)pfrom; + epicsEnum16 *pbuffer = (epicsEnum16 *)pfrom; unsigned short *pdest=(unsigned short *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -4265,8 +4265,8 @@ static long putEnumUshort( static long putEnumLong( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned short *pbuffer = (unsigned short *)pfrom; - long *pdest=(long *)(paddr->pfield); + epicsEnum16 *pbuffer = (epicsEnum16 *)pfrom; + epicsInt32 *pdest=(epicsInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -4275,7 +4275,7 @@ static long putEnumLong( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(long *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsInt32 *)paddr->pfield; nRequest--; } return(0); @@ -4284,8 +4284,8 @@ static long putEnumLong( static long putEnumUlong( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned short *pbuffer = (unsigned short *)pfrom; - unsigned long *pdest=(unsigned long *)(paddr->pfield); + epicsEnum16 *pbuffer = (epicsEnum16 *)pfrom; + epicsUInt32 *pdest=(epicsUInt32 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -4294,7 +4294,7 @@ static long putEnumUlong( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned long *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsUInt32 *)paddr->pfield; nRequest--; } return(0); @@ -4303,7 +4303,7 @@ static long putEnumUlong( static long putEnumFloat( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned short *pbuffer = (unsigned short *)pfrom; + epicsEnum16 *pbuffer = (epicsEnum16 *)pfrom; float *pdest=(float *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -4322,7 +4322,7 @@ static long putEnumFloat( static long putEnumDouble( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned short *pbuffer = (unsigned short *)pfrom; + epicsEnum16 *pbuffer = (epicsEnum16 *)pfrom; double *pdest=(double *)(paddr->pfield); if(nRequest==1 && offset==0) { @@ -4341,8 +4341,8 @@ static long putEnumDouble( static long putEnumEnum( DBADDR *paddr,const void *pfrom,long nRequest,long no_elements,long offset) { - unsigned short *pbuffer = (unsigned short *)pfrom; - unsigned short *pdest=(unsigned short *)(paddr->pfield); + epicsEnum16 *pbuffer = (epicsEnum16 *)pfrom; + epicsEnum16 *pdest=(epicsEnum16 *)(paddr->pfield); if(nRequest==1 && offset==0) { *pdest = *pbuffer; @@ -4351,7 +4351,7 @@ static long putEnumEnum( pdest += offset; while (nRequest) { *pdest++ = *pbuffer++; - if(++offset==no_elements) pdest=(unsigned short *)paddr->pfield; + if(++offset==no_elements) pdest=(epicsEnum16 *)paddr->pfield; nRequest--; } return(0); diff --git a/src/db/dbFastLinkConv.c b/src/db/dbFastLinkConv.c index ce529b9a9..27e8c016d 100644 --- a/src/db/dbFastLinkConv.c +++ b/src/db/dbFastLinkConv.c @@ -168,12 +168,12 @@ static long cvt_st_us( /* Convert String to Long */ static long cvt_st_l( char *from, - long *to, + epicsInt32 *to, struct dbAddr *paddr) { - long value; + epicsInt32 value; - if (sscanf(from, "%ld", &value) == 1) { + if (sscanf(from, "%d", &value) == 1) { *to = value; return(0); } @@ -188,7 +188,7 @@ static long cvt_st_l( /* Convert String to Unsigned Long */ static long cvt_st_ul( char *from, - unsigned long *to, + epicsUInt32 *to, struct dbAddr *paddr) { double value; @@ -196,7 +196,7 @@ static long cvt_st_ul( /*Convert to double first so that numbers like 1.0e3 convert properly*/ /*Problem was old database access said to get unsigned long as double*/ if (sscanf(from, "%lf", &value) == 1) { - *to = (unsigned long)value; + *to = (epicsUInt32)value; return(0); } if(strlen(from) == 0) { @@ -250,12 +250,12 @@ static long cvt_st_d( /* Convert String to Enumerated */ static long cvt_st_e( char *from, - unsigned short *to, + epicsEnum16 *to, struct dbAddr *paddr) { struct rset *prset = 0; long status; - unsigned short *pfield= (unsigned short*)(paddr->pfield); + epicsEnum16 *pfield= (epicsEnum16*)(paddr->pfield); unsigned int nchoices,ind; int nargs,nchars; struct dbr_enumStrs enumStrs; @@ -292,7 +292,7 @@ static long cvt_st_e( /* Convert String to Menu */ static long cvt_st_menu( char *from, - unsigned short *to, + epicsEnum16 *to, struct dbAddr *paddr) { dbFldDes *pdbFldDes = (dbFldDes *)paddr->pfldDes; @@ -324,7 +324,7 @@ static long cvt_st_menu( /* Convert String to Device */ static long cvt_st_device( char *from, - unsigned short *to, + epicsEnum16 *to, struct dbAddr *paddr) { dbFldDes *pdbFldDes = (dbFldDes *)paddr->pfldDes; @@ -391,14 +391,14 @@ static long cvt_c_us( /* Convert Char to Long */ static long cvt_c_l( char *from, - long *to, + epicsInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Char to Unsigned Long */ static long cvt_c_ul( char *from, - unsigned long *to, + epicsUInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } @@ -419,7 +419,7 @@ static long cvt_c_d( /* Convert Char to Enumerated */ static long cvt_c_e( char *from, - unsigned short *to, + epicsEnum16 *to, struct dbAddr *paddr) { *to=*from; return(0); } @@ -461,14 +461,14 @@ static long cvt_uc_us( /* Convert Unsigned Char to Long */ static long cvt_uc_l( unsigned char *from, - long *to, + epicsInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Unsigned Char to Unsigned Long */ static long cvt_uc_ul( unsigned char *from, - unsigned long *to, + epicsUInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } @@ -489,7 +489,7 @@ static long cvt_uc_d( /* Convert Unsigned Char to Enumerated */ static long cvt_uc_e( unsigned char *from, - unsigned short *to, + epicsEnum16 *to, struct dbAddr *paddr) { *to=*from; return(0); } @@ -531,14 +531,14 @@ static long cvt_s_us( /* Convert Short to Long */ static long cvt_s_l( short *from, - long *to, + epicsInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Short to Unsigned Long */ static long cvt_s_ul( short *from, - unsigned long *to, + epicsUInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } @@ -559,7 +559,7 @@ static long cvt_s_d( /* Convert Short to Enumerated */ static long cvt_s_e( short *from, - unsigned short *to, + epicsEnum16 *to, struct dbAddr *paddr) { *to=*from; return(0); } @@ -601,14 +601,14 @@ static long cvt_us_us( /* Convert Unsigned Short to Long */ static long cvt_us_l( unsigned short *from, - long *to, + epicsInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Unsigned Short to Unsigned Long */ static long cvt_us_ul( unsigned short *from, - unsigned long *to, + epicsUInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } @@ -635,141 +635,141 @@ static long cvt_us_e( /* Convert Long to String */ static long cvt_l_st( - long *from, + epicsInt32 *from, char *to, struct dbAddr *paddr) { cvtLongToString(*from, to); return(0); } /* Convert Long to Char */ static long cvt_l_c( - long *from, + epicsInt32 *from, char *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Long to Unsigned Char */ static long cvt_l_uc( - long *from, + epicsInt32 *from, unsigned char *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Long to Short */ static long cvt_l_s( - long *from, + epicsInt32 *from, short *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Long to Unsigned Short */ static long cvt_l_us( - long *from, + epicsInt32 *from, unsigned short *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Long to Long */ static long cvt_l_l( - long *from, - long *to, + epicsInt32 *from, + epicsInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Long to Unsigned Long */ static long cvt_l_ul( - long *from, - unsigned long *to, + epicsInt32 *from, + epicsUInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Long to Float */ static long cvt_l_f( - long *from, + epicsInt32 *from, float *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Long to Double */ static long cvt_l_d( - long *from, + epicsInt32 *from, double *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Long to Enumerated */ static long cvt_l_e( - long *from, - unsigned short *to, + epicsInt32 *from, + epicsEnum16 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Unsigned Long to String */ static long cvt_ul_st( - unsigned long *from, + epicsUInt32 *from, char *to, struct dbAddr *paddr) { cvtUlongToString(*from, to); return(0); } /* Convert Unsigned Long to Char */ static long cvt_ul_c( - unsigned long *from, + epicsUInt32 *from, char *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Unsigned Long to Unsigned Char */ static long cvt_ul_uc( - unsigned long *from, + epicsUInt32 *from, unsigned char *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Unsigned Long to Short */ static long cvt_ul_s( - unsigned long *from, + epicsUInt32 *from, short *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Unsigned Long to Unsigned Short */ static long cvt_ul_us( - unsigned long *from, + epicsUInt32 *from, unsigned short *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Unsigned Long to Long */ static long cvt_ul_l( - unsigned long *from, - long *to, + epicsUInt32 *from, + epicsInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Unsigned Long to Unsigned Long */ static long cvt_ul_ul( - unsigned long *from, - unsigned long *to, + epicsUInt32 *from, + epicsUInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Unsigned Long to Float */ static long cvt_ul_f( - unsigned long *from, + epicsUInt32 *from, float *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Unsigned Long to Double */ static long cvt_ul_d( - unsigned long *from, + epicsUInt32 *from, double *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Unsigned Long to Enumerated */ static long cvt_ul_e( - unsigned long *from, - unsigned short *to, + epicsUInt32 *from, + epicsEnum16 *to, struct dbAddr *paddr) { *to=*from; return(0); } @@ -822,14 +822,14 @@ static long cvt_f_us( /* Convert Float to Long */ static long cvt_f_l( float *from, - long *to, + epicsInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Float to Unsigned Long */ static long cvt_f_ul( float *from, - unsigned long *to, + epicsUInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } @@ -850,7 +850,7 @@ static long cvt_f_d( /* Convert Float to Enumerated */ static long cvt_f_e( float *from, - unsigned short *to, + epicsEnum16 *to, struct dbAddr *paddr) { *to=*from; return(0); } @@ -903,14 +903,14 @@ static long cvt_d_us( /* Convert Double to Long */ static long cvt_d_l( double *from, - long *to, + epicsInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Double to Unsigned Long */ static long cvt_d_ul( double *from, - unsigned long *to, + epicsUInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } @@ -943,70 +943,70 @@ static long cvt_d_d( /* Convert Double to Enumerated */ static long cvt_d_e( double *from, - unsigned short *to, + epicsEnum16 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Enumerated to Char */ static long cvt_e_c( - unsigned short *from, + epicsEnum16 *from, char *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Enumerated to Unsigned Char */ static long cvt_e_uc( - unsigned short *from, + epicsEnum16 *from, unsigned char *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Enumerated to Short */ static long cvt_e_s( - unsigned short *from, + epicsEnum16 *from, short *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Enumerated to Unsigned Short */ static long cvt_e_us( - unsigned short *from, + epicsEnum16 *from, unsigned short *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Enumerated to Long */ static long cvt_e_l( - unsigned short *from, - long *to, + epicsEnum16 *from, + epicsInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Enumerated to Unsigned Long */ static long cvt_e_ul( - unsigned short *from, - unsigned long *to, + epicsEnum16 *from, + epicsUInt32 *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Enumerated to Float */ static long cvt_e_f( - unsigned short *from, + epicsEnum16 *from, float *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Enumerated to Double */ static long cvt_e_d( - unsigned short *from, + epicsEnum16 *from, double *to, struct dbAddr *paddr) { *to=*from; return(0); } /* Convert Enumerated to Enumerated */ static long cvt_e_e( - unsigned short *from, - unsigned short *to, + epicsEnum16 *from, + epicsEnum16 *to, struct dbAddr *paddr) { *to=*from; return(0); } @@ -1014,7 +1014,7 @@ static long cvt_e_e( /* Get Enumerated to String */ static long cvt_e_st_get( - unsigned short *from, + epicsEnum16 *from, char *to, struct dbAddr *paddr) { @@ -1034,14 +1034,14 @@ static long cvt_e_st_get( /* Put Enumerated to String */ static long cvt_e_st_put( - unsigned short *from, + epicsEnum16 *from, char *to, struct dbAddr *paddr) { cvtUshortToString(*from, to); return(0); } /* Get Menu to String */ static long cvt_menu_st( - unsigned short *from, + epicsEnum16 *from, char *to, struct dbAddr *paddr) { @@ -1066,7 +1066,7 @@ static long cvt_menu_st( /* Get Device to String */ static long cvt_device_st( - unsigned short *from, + epicsEnum16 *from, char *to, struct dbAddr *paddr) { diff --git a/src/db/dbTest.c b/src/db/dbTest.c index 11be7092c..949c256a6 100644 --- a/src/db/dbTest.c +++ b/src/db/dbTest.c @@ -799,7 +799,7 @@ static void printBuffer( if (retOptions & DBR_PRECISION){ struct dbr_precision *pdbr_precision = (void *)pbuffer; - printf("precision=%ld\n", pdbr_precision->precision); + printf("precision=%d\n", pdbr_precision->precision); }else{ printf("precision not returned\n"); } @@ -820,7 +820,7 @@ static void printBuffer( if (retOptions & DBR_ENUM_STRS) { struct dbr_enumStrs *pdbr_enumStrs = (void *)pbuffer; - printf("no_strs=%lu\n", pdbr_enumStrs->no_str); + printf("no_strs=%u\n", pdbr_enumStrs->no_str); for (i = 0; i no_str; i++) printf("%s\n",&pdbr_enumStrs->strs[i][0]); } else @@ -831,7 +831,7 @@ static void printBuffer( if (retOptions & DBR_GR_LONG) { struct dbr_grLong *pdbr_grLong = (void *)pbuffer; - printf("grLong: %ld %ld\n",pdbr_grLong->upper_disp_limit, + printf("grLong: %d %d\n",pdbr_grLong->upper_disp_limit, pdbr_grLong->lower_disp_limit); }else{ printf("DBRgrLong not returned\n"); @@ -853,7 +853,7 @@ static void printBuffer( if (retOptions & DBR_CTRL_LONG){ struct dbr_ctrlLong *pdbr_ctrlLong = (void *)pbuffer; - printf("ctrlLong: %ld %ld\n",pdbr_ctrlLong->upper_ctrl_limit, + printf("ctrlLong: %d %d\n",pdbr_ctrlLong->upper_ctrl_limit, pdbr_ctrlLong->lower_ctrl_limit); }else{ printf("DBRctrlLong not returned\n"); @@ -875,7 +875,7 @@ static void printBuffer( if (retOptions & DBR_AL_LONG) { struct dbr_alLong *pdbr_alLong = (void *)pbuffer; - printf("alLong: %ld %ld %ld %ld\n", + printf("alLong: %d %d %d %d\n", pdbr_alLong->upper_alarm_limit,pdbr_alLong->upper_warning_limit, pdbr_alLong->lower_warning_limit,pdbr_alLong->lower_alarm_limit); }else{ diff --git a/src/db/db_access.c b/src/db/db_access.c index 9747b1f77..a52c4d08e 100644 --- a/src/db/db_access.c +++ b/src/db/db_access.c @@ -39,6 +39,9 @@ #include "errMdef.h" #include "recSup.h" #include "alarm.h" +#define db_accessHFORdb_accessC +#include "db_access.h" +#undef db_accessHFORdb_accessC #define epicsExportSharedSymbols #include "dbNotify.h" #include "dbAccessDefs.h" @@ -105,7 +108,7 @@ #define oldDBR_STSACK_STRING oldDBR_PUT_ACKS + 1 #define oldDBR_CLASS_NAME oldDBR_STSACK_STRING + 1 -/*Following is defined in db_access.h*/ +/*Following is defined in dbConvert.h*/ extern unsigned short dbDBRnewToDBRold[DBR_ENUM+1]; @@ -115,354 +118,6 @@ extern unsigned short dbDBRnewToDBRold[DBR_ENUM+1]; #define MAX_STRING_SIZE 40 #endif -#ifndef MAX_UNITS_SIZE -#define MAX_UNITS_SIZE 8 -#endif - -/* VALUES WITH STATUS STRUCTURES */ - -/* structure for a string status field */ -struct dbr_sts_string{ - short status; /* status of value */ - short severity; /* severity of alarm */ - char value[MAX_STRING_SIZE]; /* current value */ -}; - -/* structure for a string status field */ -struct dbr_stsack_string{ - unsigned short status; /* status of value */ - unsigned short severity; /* severity of alarm */ - unsigned short ackt; /* ack transient? */ - unsigned short acks; /* ack severity */ - char value[MAX_STRING_SIZE]; /* current value */ -}; - -/* structure for an short status field */ -struct dbr_sts_int{ - short status; /* status of value */ - short severity; /* severity of alarm */ - short value; /* current value */ -}; -struct dbr_sts_short{ - short status; /* status of value */ - short severity; /* severity of alarm */ - short value; /* current value */ -}; - -/* structure for a float status field */ -struct dbr_sts_float{ - short status; /* status of value */ - short severity; /* severity of alarm */ - float value; /* current value */ -}; - -/* structure for a enum status field */ -struct dbr_sts_enum{ - short status; /* status of value */ - short severity; /* severity of alarm */ - short value; /* current value */ -}; - -/* structure for a char status field */ -struct dbr_sts_char{ - short status; /* status of value */ - short severity; /* severity of alarm */ - char RISC_pad; /* RISC alignment */ - unsigned char value; /* current value */ -}; - -/* structure for a long status field */ -struct dbr_sts_long{ - short status; /* status of value */ - short severity; /* severity of alarm */ - long value; /* current value */ -}; - -/* structure for a double status field */ -struct dbr_sts_double{ - short status; /* status of value */ - short severity; /* severity of alarm */ - long RISC_pad; /* RISC alignment */ - double value; /* current value */ -}; - -/* VALUES WITH STATUS AND TIME STRUCTURES */ - -/* structure for a string time field */ -struct dbr_time_string{ - short status; /* status of value */ - short severity; /* severity of alarm */ - epicsTimeStamp stamp; /* time stamp */ - char value[MAX_STRING_SIZE]; /* current value */ -}; - -/* structure for an short time field */ -struct dbr_time_short{ - short status; /* status of value */ - short severity; /* severity of alarm */ - epicsTimeStamp stamp; /* time stamp */ - short RISC_pad; /* RISC alignment */ - short value; /* current value */ -}; - -/* structure for a float time field */ -struct dbr_time_float{ - short status; /* status of value */ - short severity; /* severity of alarm */ - epicsTimeStamp stamp; /* time stamp */ - float value; /* current value */ -}; - -/* structure for a enum time field */ -struct dbr_time_enum{ - short status; /* status of value */ - short severity; /* severity of alarm */ - epicsTimeStamp stamp; /* time stamp */ - short RISC_pad; /* RISC alignment */ - short value; /* current value */ -}; - -/* structure for a char time field */ -struct dbr_time_char{ - short status; /* status of value */ - short severity; /* severity of alarm */ - epicsTimeStamp stamp; /* time stamp */ - short RISC_pad0; /* RISC alignment */ - char RISC_pad1; /* RISC alignment */ - unsigned char value; /* current value */ -}; - -/* structure for a long time field */ -struct dbr_time_long{ - short status; /* status of value */ - short severity; /* severity of alarm */ - epicsTimeStamp stamp; /* time stamp */ - long value; /* current value */ -}; - -/* structure for a double time field */ -struct dbr_time_double{ - short status; /* status of value */ - short severity; /* severity of alarm */ - epicsTimeStamp stamp; /* time stamp */ - long RISC_pad; /* RISC alignment */ - double value; /* current value */ -}; - -/* VALUES WITH STATUS AND GRAPHIC STRUCTURES */ - -/* structure for a graphic string */ - /* not implemented; use struct_dbr_sts_string */ - -/* structure for a graphic short field */ -struct dbr_gr_int{ - short status; /* status of value */ - short severity; /* severity of alarm */ - char units[MAX_UNITS_SIZE]; /* units of value */ - short upper_disp_limit; /* upper limit of graph */ - short lower_disp_limit; /* lower limit of graph */ - short upper_alarm_limit; - short upper_warning_limit; - short lower_warning_limit; - short lower_alarm_limit; - short value; /* current value */ -}; -struct dbr_gr_short{ - short status; /* status of value */ - short severity; /* severity of alarm */ - char units[MAX_UNITS_SIZE]; /* units of value */ - short upper_disp_limit; /* upper limit of graph */ - short lower_disp_limit; /* lower limit of graph */ - short upper_alarm_limit; - short upper_warning_limit; - short lower_warning_limit; - short lower_alarm_limit; - short value; /* current value */ -}; - -/* structure for a graphic floating point field */ -struct dbr_gr_float{ - short status; /* status of value */ - short severity; /* severity of alarm */ - short precision; /* number of decimal places */ - short RISC_pad0; /* RISC alignment */ - char units[MAX_UNITS_SIZE]; /* units of value */ - float upper_disp_limit; /* upper limit of graph */ - float lower_disp_limit; /* lower limit of graph */ - float upper_alarm_limit; - float upper_warning_limit; - float lower_warning_limit; - float lower_alarm_limit; - float value; /* current value */ -}; - -/* structure for a graphic enumeration field */ -struct dbr_gr_enum{ - short status; /* status of value */ - short severity; /* severity of alarm */ - short no_str; /* number of strings */ - char strs[16][26]; /* state strings */ - short value; /* current value */ -}; - -/* structure for a graphic char field */ -struct dbr_gr_char{ - short status; /* status of value */ - short severity; /* severity of alarm */ - char units[MAX_UNITS_SIZE]; /* units of value */ - unsigned char upper_disp_limit; /* upper limit of graph */ - unsigned char lower_disp_limit; /* lower limit of graph */ - unsigned char upper_alarm_limit; - unsigned char upper_warning_limit; - unsigned char lower_warning_limit; - unsigned char lower_alarm_limit; - char RISC_pad; /* RISC alignment */ - unsigned char value; /* current value */ -}; - -/* structure for a graphic long field */ -struct dbr_gr_long{ - short status; /* status of value */ - short severity; /* severity of alarm */ - char units[MAX_UNITS_SIZE]; /* units of value */ - long upper_disp_limit; /* upper limit of graph */ - long lower_disp_limit; /* lower limit of graph */ - long upper_alarm_limit; - long upper_warning_limit; - long lower_warning_limit; - long lower_alarm_limit; - long value; /* current value */ -}; - -/* structure for a graphic double field */ -struct dbr_gr_double{ - short status; /* status of value */ - short severity; /* severity of alarm */ - short precision; /* number of decimal places */ - short RISC_pad0; /* RISC alignment */ - char units[MAX_UNITS_SIZE]; /* units of value */ - double upper_disp_limit; /* upper limit of graph */ - double lower_disp_limit; /* lower limit of graph */ - double upper_alarm_limit; - double upper_warning_limit; - double lower_warning_limit; - double lower_alarm_limit; - double value; /* current value */ -}; - -/* VALUES WITH STATUS, GRAPHIC and CONTROL STRUCTURES */ - -/* structure for a control string */ - /* not implemented; use struct_dbr_sts_string */ - -/* structure for a control integer */ -struct dbr_ctrl_int{ - short status; /* status of value */ - short severity; /* severity of alarm */ - char units[MAX_UNITS_SIZE]; /* units of value */ - short upper_disp_limit; /* upper limit of graph */ - short lower_disp_limit; /* lower limit of graph */ - short upper_alarm_limit; - short upper_warning_limit; - short lower_warning_limit; - short lower_alarm_limit; - short upper_ctrl_limit; /* upper control limit */ - short lower_ctrl_limit; /* lower control limit */ - short value; /* current value */ -}; -struct dbr_ctrl_short{ - short status; /* status of value */ - short severity; /* severity of alarm */ - char units[MAX_UNITS_SIZE]; /* units of value */ - short upper_disp_limit; /* upper limit of graph */ - short lower_disp_limit; /* lower limit of graph */ - short upper_alarm_limit; - short upper_warning_limit; - short lower_warning_limit; - short lower_alarm_limit; - short upper_ctrl_limit; /* upper control limit */ - short lower_ctrl_limit; /* lower control limit */ - short value; /* current value */ -}; - -/* structure for a control floating point field */ -struct dbr_ctrl_float{ - short status; /* status of value */ - short severity; /* severity of alarm */ - short precision; /* number of decimal places */ - short RISC_pad; /* RISC alignment */ - char units[MAX_UNITS_SIZE]; /* units of value */ - float upper_disp_limit; /* upper limit of graph */ - float lower_disp_limit; /* lower limit of graph */ - float upper_alarm_limit; - float upper_warning_limit; - float lower_warning_limit; - float lower_alarm_limit; - float upper_ctrl_limit; /* upper control limit */ - float lower_ctrl_limit; /* lower control limit */ - float value; /* current value */ -}; - -/* structure for a control enumeration field */ -struct dbr_ctrl_enum{ - short status; /* status of value */ - short severity; /* severity of alarm */ - short no_str; /* number of strings */ - char strs[16][26]; /* state strings */ - short value; /* current value */ -}; - -/* structure for a control char field */ -struct dbr_ctrl_char{ - short status; /* status of value */ - short severity; /* severity of alarm */ - char units[MAX_UNITS_SIZE]; /* units of value */ - unsigned char upper_disp_limit; /* upper limit of graph */ - unsigned char lower_disp_limit; /* lower limit of graph */ - unsigned char upper_alarm_limit; - unsigned char upper_warning_limit; - unsigned char lower_warning_limit; - unsigned char lower_alarm_limit; - unsigned char upper_ctrl_limit; /* upper control limit */ - unsigned char lower_ctrl_limit; /* lower control limit */ - char RISC_pad; /* RISC alignment */ - unsigned char value; /* current value */ -}; - -/* structure for a control long field */ -struct dbr_ctrl_long{ - short status; /* status of value */ - short severity; /* severity of alarm */ - char units[MAX_UNITS_SIZE]; /* units of value */ - long upper_disp_limit; /* upper limit of graph */ - long lower_disp_limit; /* lower limit of graph */ - long upper_alarm_limit; - long upper_warning_limit; - long lower_warning_limit; - long lower_alarm_limit; - long upper_ctrl_limit; /* upper control limit */ - long lower_ctrl_limit; /* lower control limit */ - long value; /* current value */ -}; - -/* structure for a control double field */ -struct dbr_ctrl_double{ - short status; /* status of value */ - short severity; /* severity of alarm */ - short precision; /* number of decimal places */ - short RISC_pad0; /* RISC alignment */ - char units[MAX_UNITS_SIZE]; /* units of value */ - double upper_disp_limit; /* upper limit of graph */ - double lower_disp_limit; /* lower limit of graph */ - double upper_alarm_limit; - double upper_warning_limit; - double lower_warning_limit; - double lower_alarm_limit; - double upper_ctrl_limit; /* upper control limit */ - double lower_ctrl_limit; /* lower control limit */ - double value; /* current value */ -}; - /*safe double to float conversion*/ static void safeDoubleToFloat(double *pd,float *pf) { @@ -616,7 +271,7 @@ void *pfl /* case(oldDBR_INT): */ case(oldDBR_SHORT): { - short *pvalue = (short *)pbuffer; + dbr_short_t *pvalue = (dbr_short_t *)pbuffer; options=0; nRequest=no_elements; @@ -627,7 +282,7 @@ void *pfl break; case(oldDBR_FLOAT): { - float *pvalue = (float *)pbuffer; + dbr_float_t *pvalue = (dbr_float_t *)pbuffer; options=0; nRequest=no_elements; @@ -638,7 +293,7 @@ void *pfl break; case(oldDBR_ENUM): { - short *pvalue = (short *)pbuffer; + dbr_enum_t *pvalue = (dbr_enum_t *)pbuffer; options=0; nRequest=no_elements; @@ -649,7 +304,7 @@ void *pfl break; case(oldDBR_CHAR): { - char *pvalue = (char *)pbuffer; + dbr_char_t *pvalue = (dbr_char_t *)pbuffer; options=0; nRequest=no_elements; @@ -660,7 +315,7 @@ void *pfl break; case(oldDBR_LONG): { - long *pvalue = (long *)pbuffer; + dbr_long_t *pvalue = (dbr_long_t *)pbuffer; options=0; nRequest=no_elements; @@ -671,7 +326,7 @@ void *pfl break; case(oldDBR_DOUBLE): { - double *pvalue = (double *)pbuffer; + dbr_double_t *pvalue = (dbr_double_t *)pbuffer; options=0; nRequest=no_elements; @@ -710,7 +365,7 @@ void *pfl struct { DBRstatus } new; - short *pvalue = &pold->value; + dbr_short_t *pvalue = &pold->value; options=DBR_STATUS; nRequest=0; @@ -731,7 +386,7 @@ void *pfl struct { DBRstatus } new; - float *pvalue = &pold->value; + dbr_float_t *pvalue = &pold->value; options=DBR_STATUS; nRequest=0; @@ -752,7 +407,7 @@ void *pfl struct { DBRstatus } new; - short *pvalue = &pold->value; + dbr_enum_t *pvalue = &pold->value; options=DBR_STATUS; nRequest=0; @@ -773,7 +428,7 @@ void *pfl struct { DBRstatus } new; - unsigned char *pvalue = &pold->value; + dbr_char_t *pvalue = &pold->value; options=DBR_STATUS; nRequest=0; @@ -794,7 +449,7 @@ void *pfl struct { DBRstatus } new; - long *pvalue = &pold->value; + dbr_long_t *pvalue = &pold->value; options=DBR_STATUS; nRequest=0; @@ -815,7 +470,7 @@ void *pfl struct { DBRstatus } new; - double *pvalue = &pold->value; + dbr_double_t *pvalue = &pold->value; options=DBR_STATUS; nRequest=0; @@ -861,7 +516,7 @@ void *pfl DBRstatus DBRtime } new; - short *pvalue = &pold->value; + dbr_short_t *pvalue = &pold->value; options=DBR_STATUS | DBR_TIME; nRequest=0; @@ -884,7 +539,7 @@ void *pfl DBRstatus DBRtime } new; - float *pvalue = &pold->value; + dbr_float_t *pvalue = &pold->value; options=DBR_STATUS | DBR_TIME; nRequest=0; @@ -907,7 +562,7 @@ void *pfl DBRstatus DBRtime } new; - short *pvalue = &pold->value; + dbr_enum_t *pvalue = &pold->value; options=DBR_STATUS | DBR_TIME; nRequest=0; @@ -930,7 +585,7 @@ void *pfl DBRstatus DBRtime } new; - unsigned char *pvalue = &pold->value; + dbr_char_t *pvalue = &pold->value; options=DBR_STATUS | DBR_TIME; nRequest=0; @@ -953,7 +608,7 @@ void *pfl DBRstatus DBRtime } new; - long *pvalue = &pold->value; + dbr_long_t *pvalue = &pold->value; options=DBR_STATUS | DBR_TIME; nRequest=0; @@ -976,7 +631,7 @@ void *pfl DBRstatus DBRtime } new; - double *pvalue = &pold->value; + dbr_double_t *pvalue = &pold->value; options=DBR_STATUS | DBR_TIME; nRequest=0; @@ -1003,7 +658,7 @@ void *pfl DBRgrLong DBRalLong } new; - short *pvalue = &pold->value; + dbr_short_t *pvalue = &pold->value; options=DBR_STATUS|DBR_UNITS|DBR_GR_LONG|DBR_AL_LONG; nRequest=0; @@ -1036,7 +691,7 @@ void *pfl DBRgrDouble DBRalDouble } new; - float *pvalue = &pold->value; + dbr_float_t *pvalue = &pold->value; options=DBR_STATUS|DBR_UNITS|DBR_PRECISION|DBR_GR_DOUBLE |DBR_AL_DOUBLE; @@ -1071,7 +726,7 @@ void *pfl DBRgrLong DBRalLong } new; - unsigned char *pvalue = &pold->value; + dbr_char_t *pvalue = &pold->value; options=DBR_STATUS|DBR_UNITS|DBR_GR_LONG|DBR_AL_LONG; nRequest=0; @@ -1103,7 +758,7 @@ void *pfl DBRgrLong DBRalLong } new; - long *pvalue = &pold->value; + dbr_long_t *pvalue = &pold->value; options=DBR_STATUS|DBR_UNITS|DBR_GR_LONG|DBR_AL_LONG; nRequest=0; @@ -1136,7 +791,7 @@ void *pfl DBRgrDouble DBRalDouble } new; - double *pvalue = &pold->value; + dbr_double_t *pvalue = &pold->value; options=DBR_STATUS|DBR_UNITS|DBR_PRECISION|DBR_GR_DOUBLE |DBR_AL_DOUBLE; @@ -1172,7 +827,7 @@ void *pfl DBRctrlLong DBRalLong } new; - short *pvalue = &pold->value; + dbr_short_t *pvalue = &pold->value; options=DBR_STATUS|DBR_UNITS|DBR_GR_LONG|DBR_CTRL_LONG |DBR_AL_LONG; @@ -1209,7 +864,7 @@ void *pfl DBRctrlDouble DBRalDouble } new; - float *pvalue = &pold->value; + dbr_float_t *pvalue = &pold->value; options=DBR_STATUS|DBR_UNITS|DBR_PRECISION|DBR_GR_DOUBLE |DBR_CTRL_DOUBLE|DBR_AL_DOUBLE; @@ -1245,7 +900,7 @@ void *pfl DBRenumStrs } new; short no_str; - short *pvalue = &pold->value; + dbr_enum_t *pvalue = &pold->value; memset(pold,'\0',sizeof(struct dbr_ctrl_enum)); /* first get status and severity */ @@ -1278,7 +933,7 @@ void *pfl DBRctrlLong DBRalLong } new; - unsigned char *pvalue = &pold->value; + dbr_char_t *pvalue = &pold->value; options=DBR_STATUS|DBR_UNITS|DBR_GR_LONG|DBR_CTRL_LONG |DBR_AL_LONG; @@ -1314,7 +969,7 @@ void *pfl DBRctrlLong DBRalLong } new; - long *pvalue = &pold->value; + dbr_long_t *pvalue = &pold->value; options=DBR_STATUS|DBR_UNITS|DBR_GR_LONG|DBR_CTRL_LONG |DBR_AL_LONG; @@ -1350,7 +1005,7 @@ void *pfl DBRctrlDouble DBRalDouble } new; - double *pvalue = &pold->value; + dbr_double_t *pvalue = &pold->value; options=DBR_STATUS|DBR_UNITS|DBR_PRECISION|DBR_GR_DOUBLE |DBR_CTRL_DOUBLE|DBR_AL_DOUBLE; diff --git a/src/dbStatic/dbToRecordtypeH.c b/src/dbStatic/dbToRecordtypeH.c index c79e9efa4..5872b3361 100644 --- a/src/dbStatic/dbToRecordtypeH.c +++ b/src/dbStatic/dbToRecordtypeH.c @@ -121,6 +121,7 @@ int main(int argc,char **argv) fprintf(outFile,"#include \"epicsMutex.h\"\n"); fprintf(outFile,"#include \"link.h\"\n"); fprintf(outFile,"#include \"epicsTime.h\"\n"); + fprintf(outFile,"#include \"epicsTypes.h\"\n"); pdbMenu = (dbMenu *)ellFirst(&pdbbase->menuList); while(pdbMenu) { fprintf(outFile,"\n#ifndef INC%sH\n",pdbMenu->name); @@ -172,7 +173,7 @@ int main(int argc,char **argv) name,pdbFldDes->prompt); break; case DBF_LONG : - fprintf(outFile,"\tlong\t\t%s;\t/*%s*/\n", + fprintf(outFile,"\tepicsInt32\t\t%s;\t/*%s*/\n", name,pdbFldDes->prompt); break; case DBF_ULONG : @@ -190,7 +191,7 @@ int main(int argc,char **argv) case DBF_ENUM : case DBF_MENU : case DBF_DEVICE : - fprintf(outFile,"\tunsigned short\t%s;\t/*%s*/\n", + fprintf(outFile,"\tepicsEnum16\t%s;\t/*%s*/\n", name,pdbFldDes->prompt); break; case DBF_INLINK : diff --git a/src/libCom/cvtFast/cvtFast.c b/src/libCom/cvtFast/cvtFast.c index 5211207ad..65e4d5dec 100644 --- a/src/libCom/cvtFast/cvtFast.c +++ b/src/libCom/cvtFast/cvtFast.c @@ -35,7 +35,7 @@ * This routine converts numbers less than 10,000,000. It defers to f_to_str for * numbers requiring more than 8 places of precision. There are only eight decimal */ -static long frac_multiplier[] = +static epicsInt32 frac_multiplier[] = {1,10,100,1000,10000,100000,1000000,10000000,100000000}; int epicsShareAPI cvtFloatToString( @@ -44,7 +44,7 @@ int epicsShareAPI cvtFloatToString( unsigned short precision) { unsigned short got_one,i; - long whole,iplace,number,fraction,fplace; + epicsInt32 whole,iplace,number,fraction,fplace; float ftemp; char *startAddr; @@ -62,12 +62,12 @@ int epicsShareAPI cvtFloatToString( }; /* remove the whole number portion */ - whole = (long)flt_value; + whole = (epicsInt32)flt_value; ftemp = flt_value - whole; /* multiplier to convert fractional portion to integer */ fplace = frac_multiplier[precision]; - fraction = (long)(ftemp * fplace * 10); + fraction = (epicsInt32)(ftemp * fplace * 10); fraction = (fraction + 5) / 10; /* round up */ /* determine rounding into the whole number portion */ @@ -118,7 +118,7 @@ int epicsShareAPI cvtDoubleToString( unsigned short precision) { unsigned short got_one,i; - long whole,iplace,number,fraction,fplace; + epicsInt32 whole,iplace,number,fraction,fplace; double ftemp; char *startAddr; @@ -143,12 +143,12 @@ int epicsShareAPI cvtDoubleToString( }; /* remove the whole number portion */ - whole = (long)flt_value; + whole = (epicsInt32)flt_value; ftemp = flt_value - whole; /* multiplier to convert fractional portion to integer */ fplace = frac_multiplier[precision]; - fraction = (long)(ftemp * fplace * 10); + fraction = (epicsInt32)(ftemp * fplace * 10); fraction = (fraction + 5) / 10; /* round up */ /* determine rounding into the whole number portion */ @@ -401,10 +401,10 @@ int epicsShareAPI cvtUshortToString( int epicsShareAPI cvtLongToString( - long source, + epicsInt32 source, char *pdest) { - long val,temp; + epicsInt32 val,temp; char digit[11]; int i,j; char *startAddr = pdest; @@ -415,8 +415,8 @@ int epicsShareAPI cvtLongToString( return((int)(pdest-startAddr)); } if(source<0) { - if(source == LONG_MIN) { - sprintf(pdest,"%ld",source); + if(source == INT_MIN) { + sprintf(pdest,"%d",source); return((int)strlen(pdest)); } *pdest++ = '-'; @@ -437,10 +437,10 @@ int epicsShareAPI cvtLongToString( int epicsShareAPI cvtUlongToString( - unsigned long source, + epicsUInt32 source, char *pdest) { - unsigned long val,temp; + epicsUInt32 val,temp; char digit[10]; int i,j; char *startAddr = pdest; @@ -471,10 +471,10 @@ static char hex_digit_to_ascii[16]={'0','1','2','3','4','5','6','7','8','9', int epicsShareAPI cvtLongToHexString( - long source, + epicsInt32 source, char *pdest) { - long val,temp; + epicsInt32 val,temp; char digit[10]; int i,j; char *startAddr = pdest; @@ -485,8 +485,8 @@ int epicsShareAPI cvtLongToHexString( return((int)(pdest-startAddr)); } if(source<0) { - if(source == LONG_MIN) { - sprintf(pdest,"-0x%lx",source); + if(source == INT_MIN) { + sprintf(pdest,"-0x%x",source); return((int)strlen(pdest)); } *pdest++ = '-'; @@ -508,10 +508,10 @@ int epicsShareAPI cvtLongToHexString( int epicsShareAPI cvtLongToOctalString( - long source, + epicsInt32 source, char *pdest) { - long val,temp; + epicsInt32 val,temp; char digit[16]; int i,j; char *startAddr = pdest; @@ -522,8 +522,8 @@ int epicsShareAPI cvtLongToOctalString( return((int)(pdest-startAddr)); } if(source<0) { - if(source == LONG_MIN) { - sprintf(pdest,"-0%lo",source); + if(source == INT_MIN) { + sprintf(pdest,"-0%o",source); return((int)strlen(pdest)); } *pdest++ = '-'; @@ -551,14 +551,14 @@ int epicsShareAPI cvtLongToOctalString( * * cvtBitsToUlong() * - * extract a bit field from the source unsigend long + * extract a bit field from the source epicsUInt32 */ -unsigned long epicsShareAPI cvtBitsToUlong( -unsigned long src, +epicsUInt32 epicsShareAPI cvtBitsToUlong( +epicsUInt32 src, unsigned bitFieldOffset, unsigned bitFieldLength) { - unsigned long mask; + epicsUInt32 mask; src = src >> bitFieldOffset; @@ -575,16 +575,16 @@ unsigned bitFieldLength) * * cvtUlongToBits() * - * insert a bit field from the source unsigend long - * into the destination unsigned long + * insert a bit field from the source epicsUInt32 + * into the destination epicsUInt32 */ -unsigned long epicsShareAPI cvtUlongToBits( -unsigned long src, -unsigned long dest, +epicsUInt32 epicsShareAPI cvtUlongToBits( +epicsUInt32 src, +epicsUInt32 dest, unsigned bitFieldOffset, unsigned bitFieldLength) { - unsigned long mask; + epicsUInt32 mask; mask = (1< +#include "epicsTypes.h" #include "shareLib.h" #ifdef __cplusplus @@ -57,20 +58,20 @@ epicsShareFunc int epicsShareAPI epicsShareFunc int epicsShareAPI cvtUshortToString(unsigned short value, char *pstring); epicsShareFunc int epicsShareAPI - cvtLongToString(long value, char *pstring); + cvtLongToString(epicsInt32 value, char *pstring); epicsShareFunc int epicsShareAPI - cvtUlongToString(unsigned long value, char *pstring); + cvtUlongToString(epicsUInt32 value, char *pstring); epicsShareFunc int epicsShareAPI - cvtLongToHexString(long value, char *pstring); + cvtLongToHexString(epicsInt32 value, char *pstring); epicsShareFunc int epicsShareAPI - cvtLongToOctalString(long value, char *pstring); -epicsShareFunc unsigned long epicsShareAPI cvtBitsToUlong( - unsigned long src, + cvtLongToOctalString(epicsInt32 value, char *pstring); +epicsShareFunc epicsUInt32 epicsShareAPI cvtBitsToUlong( + epicsUInt32 src, unsigned bitFieldOffset, unsigned bitFieldLength); -epicsShareFunc unsigned long epicsShareAPI cvtUlongToBits( - unsigned long src, - unsigned long dest, +epicsShareFunc epicsUInt32 epicsShareAPI cvtUlongToBits( + epicsUInt32 src, + epicsUInt32 dest, unsigned bitFieldOffset, unsigned bitFieldLength);