epics/epics-base
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

encorporate latest SAFE (hop[efully) changes on 09JUL99

Browse Source
This commit is contained in:
Marty Kraimer
1999-07-09 14:04:38 +00:00
parent 41228df369
commit 446621f87a
43 changed files with 460 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/devOpt/Makefile.Vx
+1 -1
View File
@@ -5,7 +5,7 @@ USR_INCLUDES = -I../../drv
SRCS.c += ../devAnalytekGpib.c
SRCS.c += ../devXxDg535Gpib.c
SRCS.c += ../devBBInteract.c
#SRCS.c += ../devBBInteract.c
SRCS.c += ../devGpibInteract.c
SRCS.c += ../devXxSr620Gpib.c
SRCS.c += ../devK486Gpib.c
src/devOpt/devAnalytekGpib.c
+15 -29
View File
@@ -553,34 +553,6 @@ static struct gpibCmd gpibCmds[] =
/* The following is the number of elements in the command array above. */
#define NUMPARAMS sizeof(gpibCmds)/sizeof(struct gpibCmd)
/******************************************************************************
*
* Structure containing the user's functions and operating parameters needed
* by the gpib library functions.
*
* The magic SRQ parm is the parm number that, if specified on a passive
* record, will cause the record to be processed automatically when an
* unsolicited SRQ interrupt is detected from the device.
*
* If the parm is specified on a non-passive record, it will NOT be processed
* when an unsolicited SRQ is detected.
*
******************************************************************************/
static struct devGpibParmBlock devSupParms = {
&AnalytekDebug, /* debugging flag pointer */
-1, /* set to -1 if the device does NOT respond to writes */
TIME_WINDOW, /* # of clock ticks to skip after a device times out */
NULL, /* hwpvt list head */
gpibCmds, /* GPIB command array */
NUMPARAMS, /* number of supported parameters */
-1, /* magic SRQ param number (-1 if none) */
"devXxAnalytekGpib", /* device support module type name */
DMA_TIME, /* # of clock ticks to wait for DMA completions */
NULL, /* pointer to SRQ handler function (NULL if none) */
NULL /* pointer to secondary conversion routine */
};
/******************************************************************************
*
* Initialization for device support
@@ -594,8 +566,22 @@ static struct devGpibParmBlock devSupParms = {
STATIC long
init_dev_sup(int parm)
{
if(parm==0) {
devSupParms.debugFlag = &AnalytekDebug;
devSupParms.respond2Writes = -1;
devSupParms.timeWindow = TIME_WINDOW;
devSupParms.hwpvtHead = 0;
devSupParms.gpibCmds = gpibCmds;
devSupParms.numparams = NUMPARAMS;
devSupParms.magicSrq = -1;
devSupParms.name = "devXxAnalytekGpib";
devSupParms.dmaTimeout = DMA_TIME;
devSupParms.srqHandler = 0;
devSupParms.wrConversion = 0;
}
return(devGpibLib_initDevSup(parm, &DSET_AI));
}
};
/******************************************************************************
*
src/devOpt/devK486Gpib.c
+13 -29
View File
@@ -265,35 +265,6 @@ static struct gpibCmd gpibCmds[] =
/* The following is the number of elements in the command array above. */
#define NUMPARAMS sizeof(gpibCmds)/sizeof(struct gpibCmd)
/******************************************************************************
*
* Structure containing the user's functions and operating parameters needed
* by the gpib library functions.
*
* The magic SRQ parm is the parm number that, if specified on a passive
* record, will cause the record to be processed automatically when an
* unsolicited SRQ interrupt is detected from the device.
*
* If the parm is specified on a non-passive record, it will NOT be processed
* when an unsolicited SRQ is detected.
*
******************************************************************************/
static struct devGpibParmBlock devSupParms =
{
&K486Debug, /* debugging flag pointer */
-1, /* set to -1 if the device does NOT respond to writes */
TIME_WINDOW, /* # of clock ticks to skip after a device times out */
NULL, /* hwpvt list head */
gpibCmds, /* GPIB command array */
NUMPARAMS, /* number of supported parameters */
-1, /* magic SRQ param number (-1 if none) */
"devXxK486Gpib", /* device support module type name */
DMA_TIME, /* # of clock ticks to wait for DMA completions */
NULL, /* pointer to SRQ handler function (NULL if none) */
NULL /* pointer to secondary conversion routine */
};
/******************************************************************************
*
* Initialization for device support
@@ -308,6 +279,19 @@ static long
init_dev_sup(parm)
int parm;
{
if(parm==0) {
devSupParms.debugFlag = &K486Debug;
devSupParms.respond2Writes = -1;
devSupParms.timeWindow = TIME_WINDOW;
devSupParms.hwpvtHead = 0;
devSupParms.gpibCmds = gpibCmds;
devSupParms.numparams = NUMPARAMS;
devSupParms.magicSrq = -1;
devSupParms.name = "devXxK486Gpib";
devSupParms.dmaTimeout = DMA_TIME;
devSupParms.srqHandler = 0;
devSupParms.wrConversion = 0;
}
return(devGpibLib_initDevSup(parm, &DSET_AI));
}
src/devOpt/devXxDc5009Gpib.c
+13 -32
View File
@@ -266,38 +266,6 @@ static struct gpibCmd gpibCmds[] =
/* The following is the number of elements in the command array above. */
#define NUMPARAMS sizeof(gpibCmds)/sizeof(struct gpibCmd)
/******************************************************************************
*
* Structure containing the user's functions and operating parameters needed
* by the gpib library functions.
*
* The magic SRQ parm is the parm number that, if specified on a passive
* record, will cause the record to be processed automatically when an
* unsolicited SRQ interrupt is detected from the device.
*
* If the parm is specified on a non-passive record, it will NOT be processed
* when an unsolicited SRQ is detected.
*
* In the future, the magic SRQ parm records will be processed as "I/O event
* scanned"... not passive.
*
******************************************************************************/
STATIC struct devGpibParmBlock devSupParms = {
&Dc5009Debug, /* debugging flag pointer */
-1, /* device does not respond to writes */
TIME_WINDOW, /* # of clock ticks to skip after a device times out */
NULL, /* hwpvt list head */
gpibCmds, /* GPIB command array */
NUMPARAMS, /* number of supported parameters */
4, /* magic SRQ param number (-1 if none) */
"devXxDc5009Gpib", /* device support module type name */
DMA_TIME, /* # of clock ticks to wait for DMA completions */
srqHandler, /* SRQ handler function (NULL if none) */
NULL /* secondary conversion routine (NULL if none) */
};
/******************************************************************************
*
* Initialization for device support
@@ -309,6 +277,19 @@ STATIC struct devGpibParmBlock devSupParms = {
STATIC long
init_dev_sup(int parm)
{
if(parm==0) {
devSupParms.debugFlag = &Dc5009Debug;
devSupParms.respond2Writes = -1;
devSupParms.timeWindow = TIME_WINDOW;
devSupParms.hwpvtHead = 0;
devSupParms.gpibCmds = gpibCmds;
devSupParms.numparams = NUMPARAMS;
devSupParms.magicSrq = 4;
devSupParms.name = "devXxDc5009Gpib";
devSupParms.dmaTimeout = DMA_TIME;
devSupParms.srqHandler = srqHandler;
devSupParms.wrConversion = 0;
}
return(devGpibLib_initDevSup(parm,&DSET_AI));
}
src/devOpt/devXxDg535Gpib.c
+13 -28
View File
@@ -664,34 +664,6 @@ static struct gpibCmd gpibCmds[] =
/* The following is the number of elements in the command array above. */
#define NUMPARAMS sizeof(gpibCmds)/sizeof(struct gpibCmd)
/******************************************************************************
*
* Structure containing the user's functions and operating parameters needed
* by the gpib library functions.
*
* The magic SRQ parm is the parm number that, if specified on a passive
* record, will cause the record to be processed automatically when an
* unsolicited SRQ interrupt is detected from the device.
*
* If the parm is specified on a non-passive record, it will NOT be processed
* when an unsolicited SRQ is detected.
*
******************************************************************************/
static struct devGpibParmBlock devSupParms = {
&Dg535Debug, /* debugging flag pointer */
-1, /* set to -1 if the device does NOT respond to writes */
TIME_WINDOW, /* # of clock ticks to skip after a device times out */
NULL, /* hwpvt list head */
gpibCmds, /* GPIB command array */
NUMPARAMS, /* number of supported parameters */
-1, /* magic SRQ param number (-1 if none) */
"devXxDg535Gpib", /* device support module type name */
DMA_TIME, /* # of clock ticks to wait for DMA completions */
NULL, /* pointer to SRQ handler function (NULL if none) */
NULL /* pointer to secondary conversion routine */
};
/******************************************************************************
*
* Initialization for device support
@@ -703,6 +675,19 @@ static struct devGpibParmBlock devSupParms = {
STATIC long
init_dev_sup(int parm)
{
if(parm==0) {
devSupParms.debugFlag = &Dg535Debug;
devSupParms.respond2Writes = -1;
devSupParms.timeWindow = TIME_WINDOW;
devSupParms.hwpvtHead = 0;
devSupParms.gpibCmds = gpibCmds;
devSupParms.numparams = NUMPARAMS;
devSupParms.magicSrq = -1;
devSupParms.name = "devXxDg535Gpib";
devSupParms.dmaTimeout = DMA_TIME;
devSupParms.srqHandler = 0;
devSupParms.wrConversion = 0;
}
return(devGpibLib_initDevSup(parm, &DSET_AI));
}
src/devOpt/devXxK196Gpib.c
+13 -28
View File
@@ -240,34 +240,6 @@ static struct gpibCmd gpibCmds[] =
/* The following is the number of elements in the command array above. */
#define NUMPARAMS sizeof(gpibCmds)/sizeof(struct gpibCmd)
/******************************************************************************
*
* Structure containing the user's functions and operating parameters needed
* by the gpib library functions.
*
* The magic SRQ parm is the parm number that, if specified on a passive
* record, will cause the record to be processed automatically when an
* unsolicited SRQ interrupt is detected from the device.
*
* If the parm is specified on a non-passive record, it will NOT be processed
* when an unsolicited SRQ is detected.
*
******************************************************************************/
static struct devGpibParmBlock devSupParms = {
&K196Debug, /* debugging flag pointer */
-1, /* set to -1 if the device does NOT respond to writes */
TIME_WINDOW, /* # of clock ticks to skip after a device times out */
NULL, /* hwpvt list head */
gpibCmds, /* GPIB command array */
NUMPARAMS, /* number of supported parameters */
-1, /* magic SRQ param number (-1 if none) */
"devXxK196Gpib", /* device support module type name */
DMA_TIME, /* # of clock ticks to wait for DMA completions */
NULL, /* pointer to SRQ handler function (NULL if none) */
NULL /* pointer to secondary conversion routine */
};
/******************************************************************************
*
* Initialization for device support
@@ -281,6 +253,19 @@ static struct devGpibParmBlock devSupParms = {
static long
init_dev_sup(int parm)
{
if(parm==0) {
devSupParms.debugFlag = &K196Debug;
devSupParms.respond2Writes = -1;
devSupParms.timeWindow = TIME_WINDOW;
devSupParms.hwpvtHead = 0;
devSupParms.gpibCmds = gpibCmds;
devSupParms.numparams = NUMPARAMS;
devSupParms.magicSrq = -1;
devSupParms.name = "devXxK196Gpib";
devSupParms.dmaTimeout = DMA_TIME;
devSupParms.srqHandler = 0;
devSupParms.wrConversion = 0;
}
return(devGpibLib_initDevSup(parm, &DSET_AI));
}
src/devOpt/devXxK263Gpib.c
+13 -28
View File
@@ -176,34 +176,6 @@ static struct gpibCmd gpibCmds[] =
/* The following is the number of elements in the command array above. */
#define NUMPARAMS sizeof(gpibCmds)/sizeof(struct gpibCmd)
/******************************************************************************
*
* Structure containing the user's functions and operating parameters needed
* by the gpib library functions.
*
* The magic SRQ parm is the parm number that, if specified on a passive
* record, will cause the record to be processed automatically when an
* unsolicited SRQ interrupt is detected from the device.
*
* If the parm is specified on a non-passive record, it will NOT be processed
* when an unsolicited SRQ is detected.
*
******************************************************************************/
static struct devGpibParmBlock devSupParms = {
&K263Debug, /* debugging flag pointer */
-1, /* set to -1 if the device does NOT respond to writes */
TIME_WINDOW, /* # of clock ticks to skip after a device times out */
NULL, /* hwpvt list head */
gpibCmds, /* GPIB command array */
NUMPARAMS, /* number of supported parameters */
-1, /* magic SRQ param number (-1 if none) */
"devXxK263Gpib", /* device support module type name */
DMA_TIME, /* # of clock ticks to wait for DMA completions */
NULL, /* pointer to SRQ handler function (NULL if none) */
NULL /* pointer to secondary conversion routine */
};
/******************************************************************************
*
* Initialization for device support
@@ -217,6 +189,19 @@ static struct devGpibParmBlock devSupParms = {
static long
init_dev_sup(int parm)
{
if(parm==0) {
devSupParms.debugFlag = &K263Debug;
devSupParms.respond2Writes = -1;
devSupParms.timeWindow = TIME_WINDOW;
devSupParms.hwpvtHead = 0;
devSupParms.gpibCmds = gpibCmds;
devSupParms.numparams = NUMPARAMS;
devSupParms.magicSrq = -1;
devSupParms.name = "devXxK263Gpib";
devSupParms.dmaTimeout = DMA_TIME;
devSupParms.srqHandler = 0;
devSupParms.wrConversion = 0;
}
return(devGpibLib_initDevSup(parm, &DSET_AI));
}
src/devOpt/devXxSkeletonGpib.c
+20 -25
View File
@@ -274,9 +274,13 @@ static struct gpibCmd gpibCmds[] =
/******************************************************************************
*
* Structure containing the user's functions and operating parameters needed
* by the gpib library functions.
* Initialization for device support
* This is called one time before any records are initialized with a parm
* value of 0. And then again AFTER all record-level init is complete
* with a param value of 1.
*
*****************************************************************************/
/******************************************************************************
* The magic SRQ parm is the parm number that, if specified on a passive
* record, will cause the record to be processed automatically when an
* unsolicited SRQ interrupt is detected from the device.
@@ -287,32 +291,23 @@ static struct gpibCmd gpibCmds[] =
* In the future, the magic SRQ parm records will be processed as "I/O event
* scanned"... not passive.
*
******************************************************************************/
static struct devGpibParmBlock devSupParms = {
&SkeletonDebug, /* debugging flag pointer */
-1, /* device does not respond to writes */
TIME_WINDOW, /* # of clock ticks to skip after a device times out */
NULL, /* hwpvt list head */
gpibCmds, /* GPIB command array */
NUMPARAMS, /* number of supported parameters */
-1, /* magic SRQ param number (-1 if none) */
"devXxSkeletonGpib", /* device support module type name */
DMA_TIME, /* # of clock ticks to wait for DMA completions */
NULL, /* SRQ handler function (NULL if none) */
NULL /* secondary conversion routine (NULL if none) */
};
/******************************************************************************
*
* Initialization for device support
* This is called one time before any records are initialized with a parm
* value of 0. And then again AFTER all record-level init is complete
* with a param value of 1.
*
******************************************************************************/
*****************************************************************************/
STATIC long
init_dev_sup(int parm)
{
if(parm==0) {
devSupParms.debugFlag = &SkeletonDebug;
devSupParms.respond2Writes = -1;
devSupParms.timeWindow = TIME_WINDOW;
devSupParms.hwpvtHead = 0;
devSupParms.gpibCmds = gpibCmds;
devSupParms.numparams = NUMPARAMS;
devSupParms.magicSrq = -1;
devSupParms.name = "devXxSkeletonGpib";
devSupParms.dmaTimeout = DMA_TIME;
devSupParms.srqHandler = 0;
devSupParms.wrConversion = 0;
}
return(devGpibLib_initDevSup(parm,&DSET_AI));
}
src/devOpt/devXxSr620Gpib.c
+13 -29
View File
@@ -204,35 +204,6 @@ static struct gpibCmd gpibCmds[] =
/* The following is the number of elements in the command array above. */
#define NUMPARAMS sizeof(gpibCmds)/sizeof(struct gpibCmd)
/******************************************************************************
*
* Structure containing the user's functions and operating parameters needed
* by the gpib library functions.
*
* The magic SRQ parm is the parm number that, if specified on a passive
* record, will cause the record to be processed automatically when an
* unsolicited SRQ interrupt is detected from the device.
*
* If the parm is specified on a non-passive record, it will NOT be processed
* when an unsolicited SRQ is detected.
*
******************************************************************************/
static struct devGpibParmBlock devSupParms = {
&sr620Debug, /* debugging flag pointer */
-1, /* device does not respond to writes */
TIME_WINDOW, /* # of clock ticks to skip after a device times out */
NULL, /* hwpvt list head */
gpibCmds, /* GPIB command array */
NUMPARAMS, /* number of supported parameters */
-1, /* magic SRQ param number */
"devXxSr620Gpib", /* device support module type name */
DMA_TIME,
srqHandler, /* pointer to SRQ handler function */
NULL /* pointer to secondary converstion routine */
};
/******************************************************************************
*
* This is invoked by the linkTask when an SRQ is detected from a device
@@ -308,6 +279,19 @@ STATIC int srqHandler(struct hwpvt *phwpvt, int srqStatus)
STATIC long
init_dev_sup(int parm)
{
if(parm==0) {
devSupParms.debugFlag = &sr620Debug;
devSupParms.respond2Writes = -1;
devSupParms.timeWindow = TIME_WINDOW;
devSupParms.hwpvtHead = 0;
devSupParms.gpibCmds = gpibCmds;
devSupParms.numparams = NUMPARAMS;
devSupParms.magicSrq = -1;
devSupParms.name = "devXxSr620Gpib";
devSupParms.dmaTimeout = DMA_TIME;
devSupParms.srqHandler = srqHandler;
devSupParms.wrConversion = 0;
}
return(devGpibLib_initDevSup(parm, &DSET_AI));
}