- Fixed a bug fix with Fixed motor in TAS code

- Made AMOR write HDF-5 data in chunks
- Added  driver for a PSI-DSP magnet controller as used at SLS
- Added code for directly accessing RS232 controllers connected to a
  terminal server, thereby bypassing the SerPortServer
- A rounding problem in the PSD histogram memory was resolved.
This commit is contained in:
cvs
2001-10-25 13:57:59 +00:00
parent 22688ac0fc
commit 3c916c9a7d
32 changed files with 2247 additions and 758 deletions

View File

@@ -9,6 +9,13 @@
Mark Koennecke, October 1996
Free for non-commercial use, no warranties taken!
Added functions:
NETavailable
NETReadTillTerm
in order to support RS-232 connection through a terminal server.
Mark Koennecke, October 2001
----------------------------------------------------------------------------*/
#ifndef NNNET
@@ -17,7 +24,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
typedef struct {
typedef struct __MKCHANNEL{
int sockid;
int iType;
struct sockaddr_in adresse;
@@ -68,7 +75,23 @@
data, and else the length of the data read. With a negative value
or 0 for timeout this function blocks for the read.
*/
int NETAvailable(mkChannel *self, int timeout);
/*
returns 1 if data is pending on the port, 0 if none is
pending.
*/
int NETReadTillTerm(mkChannel *self, int timeout,
char *pTerm, char *pBuffer, int iBufLen);
/*
reads data until one of the terminators defined in pTerm has
been found. The data is copied into the buffer pBuffer. A
maximum length of iBufLen characters is observed. The timeout
parameter defines a maximum time to wait for a terminator to
appear. NETReadTillTerm returns 1 on success, 0 on a timeout,
and a negative value if a network error occurred. Beware that
this may not work correctly if the wrong terminator is given.
The last one is really needed.
*/
/* ********************* KILLING FIELD ******************************** */
int NETClosePort(mkChannel *self);
/* closes a port, do not forget to free the channel data-