diff --git a/src/epics/seq/main.c b/src/epics/seq/main.c index ebc6b92581d1149a4d070521be739a9d306bd3e9..53bf10d2d5bf5886472526b30dc28e424b683f86 100644 --- a/src/epics/seq/main.c +++ b/src/epics/seq/main.c @@ -257,7 +257,7 @@ long droppedPVCount; #define CLEANUP cleanupCASDF(); #define GET_ADDRESS(NAME,ADDRP) getCAIndex((NAME),(ADDRP)) #define PUT_VALUE(ADDR,TYPE,PVAL) setCAValue((ADDR),(TYPE),(PVAL)) -#define PUT_VALUE_INT(ADDR,PVAL) setCAValueLong((ADDR),(PVAL)) +#define PUT_VALUE_INT(ADDR,PVAL) setCAValueEPICSLong((ADDR),(PVAL)) #define GET_VALUE_NUM(ADDR,DESTP,TIMEP,CONNP) syncEpicsDoubleValue((ADDR),(DESTP),(TIMEP),(CONNP)) #define GET_VALUE_INT(ADDR,DESTP,TIMEP,CONNP) syncEpicsIntValue((ADDR),(DESTP),(TIMEP),(CONNP)) #define GET_VALUE_STR(ADDR,DESTP,LEN,TIMEP,CONNP) syncEpicsStrValue((ADDR),(DESTP),(LEN),(TIMEP),(CONNP)) @@ -318,7 +318,7 @@ int getCAIndex(char *, ADDRESS *); int canFindCAChannel(char *entry); int setCAValue(ADDRESS, int, void *); -int setCAValueLong(ADDRESS, unsigned long *); +int setCAValueEPICSLong(ADDRESS, unsigned int *); int syncEpicsDoubleValue(ADDRESS, double *, time_t *, int *); int syncEpicsIntValue(ADDRESS, unsigned int *, time_t *, int *); @@ -1793,11 +1793,11 @@ void newfilterstats(int numchans) { int ii; FILE *log=0; char chname[128]; - unsigned long mask = 0x1ffff; + int mask = 0x1ffff; int tmpreq; int counter = 0; int rsw1,rsw2; - unsigned long tmpL = 0; + unsigned int tmpL = 0; printf("In newfilterstats\n"); for(ii=0;ii<numchans;ii++) { @@ -1828,7 +1828,7 @@ void newfilterstats(int numchans) { strcat(chname,"SWMASK"); status = GET_ADDRESS(chname,&paddr); if(!status) { - status = PUT_VALUE_INT(paddr,&mask); + status = PUT_VALUE_INT(paddr,(unsigned int*)&mask); } // printf("New filter %d %s = 0x%x\t0x%x\t0x%x\n",ii,filterTable[ii].fname,filterTable[ii].swreq,filterTable[ii].sw[0],filterTable[ii].sw[1]); } @@ -2381,7 +2381,7 @@ int setCAValue(ADDRESS ii, int type, void *data) return result; } -int setCAValueLong(ADDRESS ii, unsigned long *data) { +int setCAValueEPICSLong(ADDRESS ii, unsigned int *data) { double tmp = 0.0; if (!data) return 1;