From 4f5c764b4fd051ff190bf4996f886c183e0e553d Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Thu, 3 Jun 1993 14:07:30 +0000 Subject: [PATCH] Changed to work with vxWorks 5.1 and GCC 2.2.3. --- src/dev/devAiXy566DiL.c | 8 +++---- src/dev/devAiXy566Se.c | 6 +++--- src/dev/devAllenBradley.c | 2 +- src/dev/devAoSoft.c | 4 ++-- src/dev/devAoSoftRaw.c | 2 +- src/dev/devAoTestAsyn.c | 6 +++--- src/dev/devAoVmiVme4100.c | 6 +++--- src/dev/devBiSoft.c | 4 ++-- src/dev/devBiSoftRaw.c | 4 ++-- src/dev/devBiTestAsyn.c | 6 +++--- src/dev/devBiXVme210.c | 4 ++-- src/dev/devBoSoft.c | 2 +- src/dev/devBoSoftRaw.c | 4 ++-- src/dev/devBoTestAsyn.c | 6 +++--- src/dev/devEventSoft.c | 4 ++-- src/dev/devEventTestIoEvent.c | 8 +++---- src/dev/devHistogramSoft.c | 4 ++-- src/dev/devHistogramTestAsyn.c | 6 +++--- src/dev/devLiSoft.c | 4 ++-- src/dev/devLoSoft.c | 4 ++-- src/dev/devMbbiSoft.c | 4 ++-- src/dev/devMbbiSoftRaw.c | 4 ++-- src/dev/devMbbiTestAsyn.c | 6 +++--- src/dev/devMbbiXVme210.c | 4 ++-- src/dev/devMbboSoft.c | 4 ++-- src/dev/devMbboSoftRaw.c | 4 ++-- src/dev/devMbboTestAsyn.c | 6 +++--- src/dev/devPtSoft.c | 4 ++-- src/dev/devSiSoft.c | 4 ++-- src/dev/devSiTestAsyn.c | 6 +++--- src/dev/devSmCompumotor1830.c | 2 +- src/dev/devSmOms6Axis.c | 2 +- src/dev/devSoSoft.c | 4 ++-- src/dev/devSoTestAsyn.c | 6 +++--- src/dev/devVxiTDM.c | 39 +++++++++++++++++----------------- src/dev/devWfComet.c | 8 +++---- src/dev/devWfJoergerVtr1.c | 6 +++--- src/dev/devWfSoft.c | 4 ++-- src/dev/devWfTestAsyn.c | 6 +++--- src/dev/devWfXy566Sc.c | 6 +++--- 40 files changed, 111 insertions(+), 112 deletions(-) diff --git a/src/dev/devAiXy566DiL.c b/src/dev/devAiXy566DiL.c index 2517200f0..3fa215354 100644 --- a/src/dev/devAiXy566DiL.c +++ b/src/dev/devAiXy566DiL.c @@ -53,10 +53,10 @@ #include #include -long init_record(); -long get_ioint_info(); -long read_ai(); -long special_linconv(); +static long init_record(); +static long get_ioint_info(); +static long read_ai(); +static long special_linconv(); struct { long number; diff --git a/src/dev/devAiXy566Se.c b/src/dev/devAiXy566Se.c index 03286afca..32ffbba6a 100644 --- a/src/dev/devAiXy566Se.c +++ b/src/dev/devAiXy566Se.c @@ -50,9 +50,9 @@ #include #include -long init_record(); -long read_ai(); -long special_linconv(); +static long init_record(); +static long read_ai(); +static long special_linconv(); struct { long number; diff --git a/src/dev/devAllenBradley.c b/src/dev/devAllenBradley.c index ce18f9e89..aa16e8766 100644 --- a/src/dev/devAllenBradley.c +++ b/src/dev/devAllenBradley.c @@ -77,6 +77,7 @@ static long linconv_1771Il(); static long init_1771Ixe(); static long read_1771Ixe(); static long linconv_1771Ixe(); +static int read_1771Ofe(); typedef struct { long number; DEVSUPFUN report; @@ -534,7 +535,6 @@ static long linconv_1771Ixe(struct aiRecord *pai, int after) return(0); } -int read_1771Ofe(); static long init_1771Ofe(struct aoRecord *pao) { diff --git a/src/dev/devAoSoft.c b/src/dev/devAoSoft.c index f380b7af6..8df67e7ff 100644 --- a/src/dev/devAoSoft.c +++ b/src/dev/devAoSoft.c @@ -55,10 +55,10 @@ /* added for Channel Access Links */ long dbCaAddOutlink(); long dbCaPutLink(); -long init_record(); +static long init_record(); /* Create the dset for devAoSoft */ -long write_ao(); +static long write_ao(); struct { long number; DEVSUPFUN report; diff --git a/src/dev/devAoSoftRaw.c b/src/dev/devAoSoftRaw.c index 9d7be1c45..5f0082e60 100644 --- a/src/dev/devAoSoftRaw.c +++ b/src/dev/devAoSoftRaw.c @@ -53,7 +53,7 @@ /* added for Channel Access Links */ long dbCaAddOutlink(); long dbCaPutLink(); -long init_record(); +static long init_record(); /* Create the dset for devAoSoftRaw */ static long write_ao(); diff --git a/src/dev/devAoTestAsyn.c b/src/dev/devAoTestAsyn.c index 62e779976..ee1588bf8 100644 --- a/src/dev/devAoTestAsyn.c +++ b/src/dev/devAoTestAsyn.c @@ -58,8 +58,8 @@ #include /* Create the dset for devAoTestAsyn */ -long init_record(); -long write_ao(); +static long init_record(); +static long write_ao(); struct { long number; DEVSUPFUN report; @@ -136,7 +136,7 @@ static long write_ao(pao) if(wait_time<=0) return(0); callbackSetPriority(pao->prio,pcallback); printf("%s Starting asynchronous processing\n",pao->name); - wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); + wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pao->pact=TRUE; return(0); } diff --git a/src/dev/devAoVmiVme4100.c b/src/dev/devAoVmiVme4100.c index 160564d65..4bd049743 100644 --- a/src/dev/devAoVmiVme4100.c +++ b/src/dev/devAoVmiVme4100.c @@ -55,9 +55,9 @@ #define LINEAR 1 /* Create the dset for devAoAoVmiVme4100 */ -long init_record(); -long write_ao(); -long special_linconv(); +static long init_record(); +static long write_ao(); +static long special_linconv(); struct { long number; diff --git a/src/dev/devBiSoft.c b/src/dev/devBiSoft.c index 7e1fc94a3..7376e9275 100644 --- a/src/dev/devBiSoft.c +++ b/src/dev/devBiSoft.c @@ -54,8 +54,8 @@ long dbCaAddInlink(); long dbCaGetLink(); /* Create the dset for devBiSoft */ -long init_record(); -long read_bi(); +static long init_record(); +static long read_bi(); struct { long number; diff --git a/src/dev/devBiSoftRaw.c b/src/dev/devBiSoftRaw.c index 6fb7b5f5e..696429115 100644 --- a/src/dev/devBiSoftRaw.c +++ b/src/dev/devBiSoftRaw.c @@ -55,8 +55,8 @@ long dbCaAddInlink(); long dbCaGetLink(); /* Create the dset for devBiSoftRaw */ -long init_record(); -long read_bi(); +static long init_record(); +static long read_bi(); struct { long number; diff --git a/src/dev/devBiTestAsyn.c b/src/dev/devBiTestAsyn.c index 6d3bb713f..cff36914d 100644 --- a/src/dev/devBiTestAsyn.c +++ b/src/dev/devBiTestAsyn.c @@ -57,8 +57,8 @@ #include /* Create the dset for devBiTestAsyn */ -long init_record(); -long read_bi(); +static long init_record(); +static long read_bi(); struct { long number; DEVSUPFUN report; @@ -137,7 +137,7 @@ static long read_bi(pbi) if(wait_time<=0) return(0); callbackSetPriority(pbi->prio,pcallback); printf("%s Starting asynchronous processing\n",pbi->name); - wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); + wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pbi->pact=TRUE; return(0); } diff --git a/src/dev/devBiXVme210.c b/src/dev/devBiXVme210.c index db8df48d9..94caeae5e 100644 --- a/src/dev/devBiXVme210.c +++ b/src/dev/devBiXVme210.c @@ -51,8 +51,8 @@ /* Create the dset for devBiXVme210 */ -long init_record(); -long read_bi(); +static long init_record(); +static long read_bi(); struct { long number; diff --git a/src/dev/devBoSoft.c b/src/dev/devBoSoft.c index 141bee533..81b8ec165 100644 --- a/src/dev/devBoSoft.c +++ b/src/dev/devBoSoft.c @@ -54,7 +54,7 @@ /* added for Channel Access Links */ long dbCaAddOutlink(); long dbCaPutLink(); -long init_record(); +static long init_record(); /* Create the dset for devBoSoft */ long write_bo(); diff --git a/src/dev/devBoSoftRaw.c b/src/dev/devBoSoftRaw.c index b43952e30..9e81e0e3a 100644 --- a/src/dev/devBoSoftRaw.c +++ b/src/dev/devBoSoftRaw.c @@ -51,10 +51,10 @@ /* added for Channel Access Links */ long dbCaAddOutlink(); long dbCaPutLink(); -long init_record(); +static long init_record(); /* Create the dset for devBoSoftRaw */ -long write_bo(); +static long write_bo(); struct { long number; diff --git a/src/dev/devBoTestAsyn.c b/src/dev/devBoTestAsyn.c index 437d93132..d0177a5ab 100644 --- a/src/dev/devBoTestAsyn.c +++ b/src/dev/devBoTestAsyn.c @@ -59,8 +59,8 @@ #include /* Create the dset for devBoTestAsyn */ -long init_record(); -long write_bo(); +static long init_record(); +static long write_bo(); struct { long number; DEVSUPFUN report; @@ -136,7 +136,7 @@ static long write_bo(pbo) if(wait_time<=0) return(0); callbackSetPriority(pbo->prio,pcallback); printf("%s Starting asynchronous processing\n",pbo->name); - wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); + wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pbo->pact=TRUE; return(0); } diff --git a/src/dev/devEventSoft.c b/src/dev/devEventSoft.c index f4b619e44..62a9a0acc 100644 --- a/src/dev/devEventSoft.c +++ b/src/dev/devEventSoft.c @@ -52,8 +52,8 @@ long dbCaAddInlink(); long dbCaGetLink(); /* Create the dset for devEventSoft */ -long init_record(); -long read_event(); +static long init_record(); +static long read_event(); struct { long number; diff --git a/src/dev/devEventTestIoEvent.c b/src/dev/devEventTestIoEvent.c index 2a9d5ae80..682717851 100644 --- a/src/dev/devEventTestIoEvent.c +++ b/src/dev/devEventTestIoEvent.c @@ -47,9 +47,9 @@ #include #include /* Create the dset for devEventTestIoEvent */ -long init(); -long get_ioint_info(); -long read_event(); +static long init(); +static long get_ioint_info(); +static long read_event(); struct { long number; DEVSUPFUN report; @@ -98,6 +98,6 @@ static long read_event(pevent) pevent->udf = FALSE; if(wd_id==NULL) wd_id = wdCreate(); printf("%s Requesting Next ioEnevt\n",pevent->name); - wdStart(wd_id,wait_time,scanIoRequest,(int)ioscanpvt); + wdStart(wd_id,wait_time,(FUNCPTR)scanIoRequest,(int)ioscanpvt); return(0); } diff --git a/src/dev/devHistogramSoft.c b/src/dev/devHistogramSoft.c index c58c66df6..0a1c1a1e9 100644 --- a/src/dev/devHistogramSoft.c +++ b/src/dev/devHistogramSoft.c @@ -51,8 +51,8 @@ #include /* Create the dset for devHistogramSoft */ -long init_record(); -long read_histogram(); +static long init_record(); +static long read_histogram(); struct { long number; DEVSUPFUN report; diff --git a/src/dev/devHistogramTestAsyn.c b/src/dev/devHistogramTestAsyn.c index 3f94f5d7c..bf5803aac 100644 --- a/src/dev/devHistogramTestAsyn.c +++ b/src/dev/devHistogramTestAsyn.c @@ -56,8 +56,8 @@ #include /* Create the dset for devHistogramTestAsyn */ -long init_record(); -long read_histogram(); +static long init_record(); +static long read_histogram(); struct { long number; DEVSUPFUN report; @@ -133,7 +133,7 @@ static long read_histogram(phistogram) if(wait_time<=0) return(0); callbackSetPriority(phistogram->prio,pcallback); printf("%s Starting asynchronous processing\n",phistogram->name); - wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); + wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); phistogram->pact=TRUE; return(0); } diff --git a/src/dev/devLiSoft.c b/src/dev/devLiSoft.c index 8ccc27372..9e1d3c89d 100644 --- a/src/dev/devLiSoft.c +++ b/src/dev/devLiSoft.c @@ -52,8 +52,8 @@ long dbCaAddInlink(); long dbCaGetLink(); /* Create the dset for devLiSoft */ -long init_record(); -long read_longin(); +static long init_record(); +static long read_longin(); struct { long number; diff --git a/src/dev/devLoSoft.c b/src/dev/devLoSoft.c index 2209f31bc..4768f15eb 100644 --- a/src/dev/devLoSoft.c +++ b/src/dev/devLoSoft.c @@ -50,10 +50,10 @@ /* added for Channel Access Links */ long dbCaAddOutlink(); long dbCaPutLink(); -long init_record(); +static long init_record(); /* Create the dset for devLoSoft */ -long write_longout(); +static long write_longout(); struct { long number; diff --git a/src/dev/devMbbiSoft.c b/src/dev/devMbbiSoft.c index dd2581033..36bccd131 100644 --- a/src/dev/devMbbiSoft.c +++ b/src/dev/devMbbiSoft.c @@ -55,8 +55,8 @@ long dbCaGetLink(); /* Create the dset for devMbbiSoft */ -long init_record(); -long read_mbbi(); +static long init_record(); +static long read_mbbi(); struct { long number; diff --git a/src/dev/devMbbiSoftRaw.c b/src/dev/devMbbiSoftRaw.c index 2585c4d6b..e3158af00 100644 --- a/src/dev/devMbbiSoftRaw.c +++ b/src/dev/devMbbiSoftRaw.c @@ -56,8 +56,8 @@ long dbCaGetLink(); /* Create the dset for devMbbiSoftRaw */ -long init_record(); -long read_mbbi(); +static long init_record(); +static long read_mbbi(); struct { long number; diff --git a/src/dev/devMbbiTestAsyn.c b/src/dev/devMbbiTestAsyn.c index f378882d7..f9397f0c0 100644 --- a/src/dev/devMbbiTestAsyn.c +++ b/src/dev/devMbbiTestAsyn.c @@ -57,8 +57,8 @@ #include /* Create the dset for devMbbiTestAsyn */ -long init_record(); -long read_mbbi(); +static long init_record(); +static long read_mbbi(); struct { long number; DEVSUPFUN report; @@ -136,7 +136,7 @@ static long read_mbbi(pmbbi) if(wait_time<=0) return(0); callbackSetPriority(pmbbi->prio,pcallback); printf("%s Starting asynchronous processing\n",pmbbi->name); - wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); + wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pmbbi->pact=TRUE; return(0); } diff --git a/src/dev/devMbbiXVme210.c b/src/dev/devMbbiXVme210.c index 68020b184..5ae9a88b1 100644 --- a/src/dev/devMbbiXVme210.c +++ b/src/dev/devMbbiXVme210.c @@ -52,8 +52,8 @@ /* Create the dset for devAiMbbiXVme210 */ -long init_record(); -long read_mbbi(); +static long init_record(); +static long read_mbbi(); struct { long number; diff --git a/src/dev/devMbboSoft.c b/src/dev/devMbboSoft.c index a642831c0..df3f8198e 100644 --- a/src/dev/devMbboSoft.c +++ b/src/dev/devMbboSoft.c @@ -54,10 +54,10 @@ /* added for Channel Access Links */ long dbCaAddOutlink(); long dbCaPutLink(); -long init_record(); +static long init_record(); /* Create the dset for devMbboSoft */ -long write_mbbo(); +static long write_mbbo(); struct { long number; diff --git a/src/dev/devMbboSoftRaw.c b/src/dev/devMbboSoftRaw.c index 4879e7388..8b364c852 100644 --- a/src/dev/devMbboSoftRaw.c +++ b/src/dev/devMbboSoftRaw.c @@ -51,10 +51,10 @@ /* added for Channel Access Links */ long dbCaAddOutlink(); long dbCaPutLink(); -long init_record(); +static long init_record(); /* Create the dset for devMbboSoftRaw */ -long write_mbbo(); +static long write_mbbo(); struct { long number; diff --git a/src/dev/devMbboTestAsyn.c b/src/dev/devMbboTestAsyn.c index 142be9b91..a3cc124dd 100644 --- a/src/dev/devMbboTestAsyn.c +++ b/src/dev/devMbboTestAsyn.c @@ -58,8 +58,8 @@ #include /* Create the dset for devMbboTestAsyn */ -long init_record(); -long write_mbbo(); +static long init_record(); +static long write_mbbo(); struct { long number; DEVSUPFUN report; @@ -136,7 +136,7 @@ static long write_mbbo(pmbbo) if(wait_time<=0) return(0); callbackSetPriority(pmbbo->prio,pcallback); printf("%s Starting asynchronous processing\n",pmbbo->name); - wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); + wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pmbbo->pact=TRUE; return(0); } diff --git a/src/dev/devPtSoft.c b/src/dev/devPtSoft.c index 2fec4614c..932670ba6 100644 --- a/src/dev/devPtSoft.c +++ b/src/dev/devPtSoft.c @@ -52,10 +52,10 @@ /* added for Channel Access Links */ long dbCaAddOutlink(); long dbCaPutLink(); -long init_record(); +static long init_record(); /* Create the dset for devPtSoft */ -long write_pt(); +static long write_pt(); struct { long number; diff --git a/src/dev/devSiSoft.c b/src/dev/devSiSoft.c index 3caa8710a..c8b893b07 100644 --- a/src/dev/devSiSoft.c +++ b/src/dev/devSiSoft.c @@ -53,8 +53,8 @@ long dbCaGetLink(); /* Create the dset for devSiSoft */ -long init_record(); -long read_stringin(); +static long init_record(); +static long read_stringin(); struct { long number; diff --git a/src/dev/devSiTestAsyn.c b/src/dev/devSiTestAsyn.c index adf065930..326f818f9 100644 --- a/src/dev/devSiTestAsyn.c +++ b/src/dev/devSiTestAsyn.c @@ -56,8 +56,8 @@ #include /* Create the dset for devSiTestAsyn */ -long init_record(); -long read_stringin(); +static long init_record(); +static long read_stringin(); struct { long number; DEVSUPFUN report; @@ -137,7 +137,7 @@ static long read_stringin(pstringin) if(wait_time<=0) return(0); callbackSetPriority(pstringin->prio,pcallback); printf("%s Starting asynchronous processing\n",pstringin->name); - wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); + wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pstringin->pact=TRUE; return(0); } diff --git a/src/dev/devSmCompumotor1830.c b/src/dev/devSmCompumotor1830.c index e16279358..0af3307f6 100644 --- a/src/dev/devSmCompumotor1830.c +++ b/src/dev/devSmCompumotor1830.c @@ -50,7 +50,7 @@ #include /* Create the dset for */ -long sm_command(); +static long sm_command(); struct { long number; diff --git a/src/dev/devSmOms6Axis.c b/src/dev/devSmOms6Axis.c index ae415842b..5adf7eb64 100644 --- a/src/dev/devSmOms6Axis.c +++ b/src/dev/devSmOms6Axis.c @@ -51,7 +51,7 @@ #include /* Create the dset for */ -long sm_command(); +static long sm_command(); struct { long number; diff --git a/src/dev/devSoSoft.c b/src/dev/devSoSoft.c index 7e70d3f64..f5468af7b 100644 --- a/src/dev/devSoSoft.c +++ b/src/dev/devSoSoft.c @@ -50,10 +50,10 @@ /* added for Channel Access Links */ long dbCaAddOutlink(); long dbCaPutLink(); -long init_record(); +static long init_record(); /* Create the dset for devSoSoft */ -long write_stringout(); +static long write_stringout(); struct { long number; diff --git a/src/dev/devSoTestAsyn.c b/src/dev/devSoTestAsyn.c index 98950f819..083ecb540 100644 --- a/src/dev/devSoTestAsyn.c +++ b/src/dev/devSoTestAsyn.c @@ -57,8 +57,8 @@ #include /* Create the dset for devSoTestAsyn */ -long init_record(); -long write_stringout(); +static long init_record(); +static long write_stringout(); struct { long number; DEVSUPFUN report; @@ -134,7 +134,7 @@ static long write_stringout(pstringout) if(wait_time<=0) return(0); callbackSetPriority(pstringout->prio,pcallback); printf("%s Starting asynchronous processing\n",pstringout->name); - wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); + wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pstringout->pact=TRUE; return(0); } diff --git a/src/dev/devVxiTDM.c b/src/dev/devVxiTDM.c index 1ce9bd96d..60e54728d 100644 --- a/src/dev/devVxiTDM.c +++ b/src/dev/devVxiTDM.c @@ -93,11 +93,11 @@ /* Create the dsets for devVxiTDM */ -long report(); -long init(); -long init_pd(); -long get_ioint_info(); -long write_pd(); +static long report(); +static long init(); +static long init_pd(); +static long get_ioint_info(); +static long write_pd(); typedef struct { long number; @@ -182,9 +182,9 @@ struct tdm_config { static double cons[] = { 1e9,1e6,1e3,1,1e-3 }; -void tdmInitLA(); -void tdm_stat(); -void tdm_report(); +static void tdmInitLA(); +static void tdm_stat(); +static void tdm_report(); @@ -203,7 +203,7 @@ epvxiDeviceSearchPattern dsp; if( epvxiLookupLA(&dsp,tdm_report,(void *)&interest)<0 ) return ERROR; - + return (OK); } static void tdm_report(unsigned la,void *interest) @@ -285,8 +285,7 @@ struct tdm_config *tc; case (VXI_IO): break; - default : - recGblRecordError(S_dev_badBus,pd, + recGblRecordError(S_dev_badBus,(void *)pd, "devVxiTDM (init_record) Illegal OUT Bus Type"); return(S_dev_badBus); } @@ -299,7 +298,7 @@ struct tdm_config *tc; signal=pvxiio->parm[0]-'0'; else { - recGblRecordError(S_dev_badSignal,pd, + recGblRecordError(S_dev_badSignal,(void *)pd, "devVxiTDM (init_record) Illegal SIGNAL field"); return(S_dev_badSignal); } @@ -313,14 +312,14 @@ struct tdm_config *tc; if(la>MAXCARDS) { - recGblRecordError(S_dev_badCard,pd, + recGblRecordError(S_dev_badCard,(void *)pd, "devVxiTDM (init_record) exceeded maximum supported cards"); return(S_dev_badCard); } if(signal>MAXSIG) { - recGblRecordError(S_dev_badSignal,pd, + recGblRecordError(S_dev_badSignal,(void *)pd, "devVxiTDM (init_record) Illegal SIGNAL field"); return(S_dev_badSignal); } @@ -336,7 +335,7 @@ struct tdm_config *tc; if( tc->stat&(1<parm[0]-'0'; else { - recGblRecordError(S_dev_badSignal,pr, + recGblRecordError(S_dev_badSignal,(void *)pr, "devVxiTDM (init_record) Illegal SIGNAL field"); return(S_dev_badSignal); } @@ -467,7 +466,7 @@ struct tdm_config *tc; if(pr->hts > 3 || pr->hts < 0) { recGblSetSevr(pr,WRITE_ALARM,INVALID_ALARM); - recGblRecordError(S_db_badField,pr,"invalid trigger value"); + recGblRecordError(S_db_badField,(void *)pr,"invalid trigger value"); return(0); } @@ -475,12 +474,12 @@ struct tdm_config *tc; /* write to register */ channel_reg[signal]=channel_value; + + Debug("Ending channel value = %04.4X\n",channel_value); } FASTUNLOCK(&tc->lock); - Debug("Ending channel value = %04.4X\n",channel_value); - return(0); } diff --git a/src/dev/devWfComet.c b/src/dev/devWfComet.c index d10a89133..860ffda92 100644 --- a/src/dev/devWfComet.c +++ b/src/dev/devWfComet.c @@ -49,10 +49,10 @@ #include #include -long init_record(); -long read_wf(); -long arm_wf(); -long get_ioint_info(); +static long init_record(); +static long read_wf(); +static long arm_wf(); +static long get_ioint_info(); struct { diff --git a/src/dev/devWfJoergerVtr1.c b/src/dev/devWfJoergerVtr1.c index 1c138554e..b194eb551 100644 --- a/src/dev/devWfJoergerVtr1.c +++ b/src/dev/devWfJoergerVtr1.c @@ -57,9 +57,9 @@ #include #include -long init_record(); -long read_wf(); -long arm_wf(); +static long init_record(); +static long read_wf(); +static long arm_wf(); struct { diff --git a/src/dev/devWfSoft.c b/src/dev/devWfSoft.c index fd2f893c5..80f5c1407 100644 --- a/src/dev/devWfSoft.c +++ b/src/dev/devWfSoft.c @@ -54,8 +54,8 @@ long dbCaAddInlink(); long dbCaGetLink(); /* Create the dset for devWfSoft */ -long init_record(); -long read_wf(); +static long init_record(); +static long read_wf(); struct { long number; DEVSUPFUN report; diff --git a/src/dev/devWfTestAsyn.c b/src/dev/devWfTestAsyn.c index e5a5ff360..c3dce19dc 100644 --- a/src/dev/devWfTestAsyn.c +++ b/src/dev/devWfTestAsyn.c @@ -57,8 +57,8 @@ #include /* Create the dset for devWfTestAsyn */ -long init_record(); -long read_wf(); +static long init_record(); +static long read_wf(); struct { long number; DEVSUPFUN report; @@ -134,7 +134,7 @@ static long read_wf(pwf) if(wait_time<=0) return(0); callbackSetPriority(pwf->prio,pcallback); printf("%s Starting asynchronous processing\n",pwf->name); - wdStart(pcallback->wd_id,wait_time,callbackRequest,(int)pcallback); + wdStart(pcallback->wd_id,wait_time,(FUNCPTR)callbackRequest,(int)pcallback); pwf->pact=TRUE; return(0); } diff --git a/src/dev/devWfXy566Sc.c b/src/dev/devWfXy566Sc.c index ccce7a802..1d953aa15 100644 --- a/src/dev/devWfXy566Sc.c +++ b/src/dev/devWfXy566Sc.c @@ -53,9 +53,9 @@ #include #include -long init_record(); -long read_wf(); -long arm_wf(); +static long init_record(); +static long read_wf(); +static long arm_wf(); struct {