epics/pcas
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Added the EOS logic from Mark Rivers. (It is only supported for HiDEOS

Browse Source 
GPIB interfaces.)
This commit is contained in:
John Winans
1996-05-03 19:05:37 +00:00
parent e1042ca5ee
commit 7e8bdc7e43
3 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/drv/old/drvGpib.c
View File

@@ -59,6 +59,9 @@
*
*
* $Log$
* Revision 1.5 1996/03/06 14:17:34 mrk
* Made STATIC static
*
* Revision 1.4 1995/07/31 19:44:18 winans
* Changed the parameter table and associated support routines to support
* buffer length specifications of size long instead of short.
@@ -143,6 +146,7 @@ STATIC int readIb();
STATIC int writeIbCmd();
STATIC int ioctlIb();
int srqPollInhibit();
int readIbEos();
STATIC int ibLinkInit();
STATIC int ibLinkStart();
@@ -185,13 +189,14 @@ STATIC char testWrite; /* test char to write to 1014 card */
*
******************************************************************************/
struct drvGpibSet drvGpib={
9,
10,
reportGpib,
initGpib,
qGpibReq,
registerSrqCallback,
writeIb,
readIb,
readIbEos,
writeIbCmd,
ioctlIb,
srqPollInhibit
@@ -1943,9 +1948,9 @@ ioctlIb(
* a GPIB message transaction.
*
* A work request represents a function that the ibLinkTask is to call (when
* ready) to allow the user program access to the readIb, writeIb, and
* writeIbCmd functions. The user programs should never call these functions
* at any other times.
* ready) to allow the user program access to the readIb, readIbEos, writeIb,
* and writeIbCmd functions. The user programs should never call these
* functions at any other times.
*
* Returns OK, or ERROR.
*
@@ -2045,6 +2050,10 @@ int time)
* This function returns the number of bytes read from the device, or ERROR
* if the read operation failed.
*
* This routine just calls readIbEos with the eos parameter=-1, which means
* ignore eos. It is written this way to provide backwards compatibility
* since readIbEos was added later.
*
******************************************************************************/
STATIC int
readIb(
@@ -2053,6 +2062,29 @@ int gpibAddr, /* the device number to read the data from */
char *data, /* the buffer to place the data into */
int length, /* max number of bytes to place into the buffer */
int time) /* max time to allow for read operation */
{
return readIbEos(pibLink, gpibAddr, data, length, time, -1);
}
/******************************************************************************
*
* A device support callable entry point used to read data from GPIB devices.
*
* This function returns the number of bytes read from the device, or ERROR
* if the read operation failed.
*
* This routine can terminate a read on receipt of the end-of-string (Eos)
* character. Note that this is presently only supported for HiDEOS. The
* EOS parameter is presently ignored by the NI and Bitbus routines. Support
* for EOS on these may be added in the future.
*
******************************************************************************/
int readIbEos(
struct ibLink *pibLink,
int gpibAddr, /* the device number to read the data from */
char *data, /* the buffer to place the data into */
int length, /* max number of bytes to place into the buffer */
int time, /* max time to allow for read operation */
int eos) /* End-of-string character, -1 if none */
{
char attnCmd[5];
int stat;
@@ -2063,7 +2095,7 @@ int time) /* max time to allow for read operation */
if (pibLink->linkType == GPIB_IO)
{
if (pibLink->linkId > NIGPIB_NUM_LINKS)
return(HiDEOSGpibRead(pibLink, gpibAddr, data, length, time));
return(HiDEOSGpibRead(pibLink, gpibAddr, data, length, time, eos));
else
{
attnCmd[0] = '_'; /* global untalk */
@@ -2694,12 +2726,13 @@ HiDEOSGpibRead(
int DevAddr,
char *Buf,
int BufLen,
int time)
int time,
int Eos)
{
int Actual;
HideosIbLinkStruct *pHLink = (HideosIbLinkStruct*)pibLink;
if (LHideosRead(pHLink->remote_td, Buf, BufLen, &Actual, DevAddr, time)==0)
if (LHideosRead(pHLink->remote_td, Buf, BufLen, &Actual, DevAddr, time, Eos)==0)
return(Actual);
return(-1);

4
src/drv/old/drvGpibInterface.h
View File

@@ -31,6 +31,9 @@
* .03 01-07-92 jrw added a reference to ibLink in dpvtGpibHead
*
* $Log$
* Revision 1.1 1996/01/25 21:17:34 mrk
* moved include files from base/include
*
* Revision 1.11 1995/03/17 21:25:58 winans
* Got rid of the old bogus header in the dpvtGpibHead structure.
*
@@ -110,6 +113,7 @@ struct drvGpibSet {
int (*registerSrqCallback)();
int (*writeIb)();
int (*readIb)();
int (*readIbEos)();
int (*writeIbCmd)();
int (*ioctl)();
int (*srqPollInhibit)();

4
src/drv/old/drvHiDEOSGpib.h
View File

@@ -5,8 +5,8 @@
typedef int (*GPIB_HIDEOS_WRITECMD_FUNC)(void *td, char *Buf, unsigned long BufLen, unsigned long TimeOut);
typedef int (*GPIB_HIDEOS_WRITE_FUNC)(void *td, char *Buf, unsigned long BufLen, unsigned long devAddr, unsigned long TimeOut);
typedef void *(*GPIB_HIDEOS_INIT_FUNC)(int BoardId, char *TaskName);
typedef int (*GPIB_HIDEOS_READ_FUNC)(void *td, char *Buf, unsigned long BufLen, unsigned long *Actual, unsigned long devAddr, unsigned long TimeOut);
typedef int (*GPIB_HIDEOS_WRITEREAD_FUNC)(void *td, char *WBuf, unsigned long WBufLen, char *RBuf, unsigned long RBufLen, unsigned long *RActual, unsigned long devAddr, unsigned long TimeOut);
typedef int (*GPIB_HIDEOS_READ_FUNC)(void *td, char *Buf, unsigned long BufLen, unsigned long *Actual, unsigned long devAddr, unsigned long TimeOut, long Eos);
typedef int (*GPIB_HIDEOS_WRITEREAD_FUNC)(void *td, char *WBuf, unsigned long WBufLen, char *RBuf, unsigned long RBufLen, unsigned long *RActual, unsigned long devAddr, unsigned long TimeOut, long Eos);
#endif