- Added Sycamore protocol and command context to SICS

- Added sinfo to SICS
- Added driver for TCP/IP Astrium velocity selector
- Added driver for TCP/IP Astrium chopper controller


SKIPPED:
	psi/amor2t.c
	psi/amorstat.c
	psi/dornier2.c
	psi/ecb.c
	psi/el734hp.c
	psi/fowrite.c
	psi/libpsi.a
	psi/make_gen
	psi/nextrics.c
	psi/pardef.c
	psi/pimotor.c
	psi/pipiezo.c
	psi/polterwrite.c
	psi/psi.c
	psi/scontroller.c
	psi/serial.c
	psi/tasinit.c
	psi/tasscan.c
	psi/tcpdocho.c
	psi/tcpdornier.c
	psi/tricssupport.c
	psi/velodornier.c
This commit is contained in:
koennecke
2005-12-22 22:16:10 +00:00
parent 603a4fc14b
commit b3138f1197
67 changed files with 4650 additions and 682 deletions

View File

@ -1,8 +1,8 @@
#line 365 "interface.w"
#line 381 "interface.w"
/*---------------------------------------------------------------------------
I N T E R F A C E S
I N T E R F A C E S
Any object in SICS has to adhere to the object descriptor interface (see
file obdes.h). Furthermore SICS objects may choose to support other
@ -17,6 +17,7 @@
#ifndef SICSINTERFACES
#define SICSINTERFACES
#include "commandcontext.h"
/* interface ID's used to recognize an interface */
#define DRIVEID 513
@ -26,7 +27,7 @@
/* ----------------------- The drivable interface -----------------------*/
#line 117 "interface.w"
#line 121 "interface.w"
typedef struct {
@ -39,21 +40,22 @@
int (*CheckStatus)(void *self, SConnection *pCon);
float (*GetValue)(void *self, SConnection *pCon);
int iErrorCount;
int drivableStatus;
} IDrivable, *pIDrivable;
pIDrivable GetDrivableInterface(void *pObject);
int GetDrivablePosition(void *pObject, SConnection *pCon,
float *fPos);
int GetDrivablePosition(void *pObject, SConnection *pCon,
float *fPos);
#line 390 "interface.w"
#line 407 "interface.w"
pIDrivable CreateDrivableInterface(void);
/* ------------------------ The countable interface ---------------------*/
#line 183 "interface.w"
#line 188 "interface.w"
typedef struct {
int ID;
@ -70,23 +72,23 @@
pICountable GetCountableInterface(void *pObject);
#line 395 "interface.w"
#line 412 "interface.w"
pICountable CreateCountableInterface(void);
/* ------------------------- The CallBack Interface --------------------*/
#line 236 "interface.w"
#line 241 "interface.w"
typedef void (*KillFuncIT)(void *pData);
typedef int (*SICSCallBack)(int iEvent, void *pEventData,
void *pUserData);
void *pUserData, commandContext cc);
#line 400 "interface.w"
#line 417 "interface.w"
#line 258 "interface.w"
#line 263 "interface.w"
typedef struct __ICallBack *pICallBack;
@ -96,21 +98,22 @@
int InvokeCallBack(pICallBack pInterface, int iEvent, void *pEventData);
/* callback client side */
long RegisterCallback(pICallBack pInterface, int iEvent, SICSCallBack pFunc,
long RegisterCallback(pICallBack pInterface, commandContext comCon,
int iEvent, SICSCallBack pFunc,
void *pUserData, KillFuncIT pKill);
int RemoveCallback(pICallBack pInterface, long iID);
int RemoveCallback2(pICallBack pInterface, void *pUserData);
int CallbackScript(SConnection *pCon, SicsInterp *pSics, void *pData,
int argc, char *argv[]);
int argc, char *argv[]);
pICallBack GetCallbackInterface(void *pData);
#line 401 "interface.w"
#line 418 "interface.w"
/*---------------------- The Environment Interface --------------------*/
#line 329 "interface.w"
#line 335 "interface.w"
typedef enum { EVIdle, EVDrive, EVMonitor, EVError } EVMode;
typedef struct {
@ -120,13 +123,13 @@
int (*HandleError)(void *self);
} EVInterface, *pEVInterface;
#line 403 "interface.w"
#line 420 "interface.w"
#line 355 "interface.w"
#line 361 "interface.w"
pEVInterface CreateEVInterface(void);
#line 404 "interface.w"
#line 421 "interface.w"
#endif