From ec0b414e782284e5f2b671377955bd25e00ca32b Mon Sep 17 00:00:00 2001 From: Marty Kraimer Date: Mon, 31 Aug 1992 15:30:10 +0000 Subject: [PATCH] removed get_ioint_info --- src/dev/devWfJoergerVtr1.c | 20 ++------------------ src/rec/recTimer.c | 27 +++------------------------ 2 files changed, 5 insertions(+), 42 deletions(-) diff --git a/src/dev/devWfJoergerVtr1.c b/src/dev/devWfJoergerVtr1.c index 470282ab4..1c138554e 100644 --- a/src/dev/devWfJoergerVtr1.c +++ b/src/dev/devWfJoergerVtr1.c @@ -52,12 +52,12 @@ #include #include #include +#include #include #include #include long init_record(); -long get_ioint_info(); long read_wf(); long arm_wf(); @@ -74,7 +74,7 @@ struct { NULL, NULL, init_record, - get_ioint_info, + NULL, read_wf}; @@ -113,22 +113,6 @@ static void myCallback(pwf,no_read,pdata) (*prset->process)(pwf); dbScanUnlock((struct dbCommon *)pwf); } - -static long get_ioint_info(cmd,pwf,io_type,card_type,card_number) - short *cmd; - struct waveformRecord *pwf; - short *io_type; - short *card_type; - short *card_number; -{ - *cmd=-1; - if(pwf->inp.type != VME_IO) return(S_dev_badInpType); - *io_type = IO_WF; - *card_type = JGVTR1; - *card_number = pwf->inp.value.vmeio.card; - return(0); -} - static long init_record(pwf) struct waveformRecord *pwf; diff --git a/src/rec/recTimer.c b/src/rec/recTimer.c index 151aca2ea..f94059643 100644 --- a/src/rec/recTimer.c +++ b/src/rec/recTimer.c @@ -105,30 +105,9 @@ struct rset timerRSET={ get_alarm_double }; /* because the driver does all the work just declare device support here*/ -static long get_ioint_info(); -struct dset devTmMizar8310={4,NULL,NULL,NULL,get_ioint_info}; -struct dset devTmDg535={4,NULL,NULL,NULL,get_ioint_info}; -struct dset devTmVxiAt5={4,NULL,NULL,NULL,get_ioint_info}; -static long get_ioint_info(cmd,ptimer,io_type,card_type,card_number) - short *cmd; - struct timerRecord *ptimer; - short *io_type; - short *card_type; - short *card_number; -{ - *cmd=-1; - if(ptimer->out.type != VME_IO) return(S_dev_badInpType); - *io_type = IO_TIMER; - if(ptimer->dtyp==0) - *card_type = MZ8310; - else if(ptimer->dtyp==3) - *card_type = VXI_AT5_TIME; - else - return(1); - *card_number = ptimer->out.value.vmeio.card; - return(0); -} - +struct dset devTmMizar8310={4,NULL,NULL,NULL,NULL}; +struct dset devTmDg535={4,NULL,NULL,NULL,NULL}; +struct dset devTmAt5Vxi={4,NULL,NULL,NULL,NULL}; extern int post_event();