- 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

interface.w

@@ -45,11 +45,15 @@ Let's start with the objectdescriptor:
 #ifndef SICSDESCRIPTOR
 #define SICSDESCRIPTOR
 #include <stdio.h>
+#include <ifile.h>
 
   typedef struct {
                    char *name;
                    int   (*SaveStatus)(void *self, char *name,FILE *fd);
                    void  *(*GetInterface)(void *self, int iInterfaceID);
+                   char *description;
+                   char *group;
+                   IPair *pKeys;
                    } ObjectDescriptor, *pObjectDescriptor;
 
  /*---------------------------------------------------------------------------*/
@@ -126,6 +130,7 @@ environment controllers fit this bill as well.
                    int   (*CheckStatus)(void *self, SConnection *pCon);
                    float  (*GetValue)(void *self, SConnection *pCon); 
                    int iErrorCount;
+                   int drivableStatus;
                    } IDrivable, *pIDrivable;
 
         pIDrivable  GetDrivableInterface(void *pObject);                 
@@ -236,7 +241,7 @@ function:
 @d callfunc @{
    typedef void (*KillFuncIT)(void *pData);
    typedef int (*SICSCallBack)(int iEvent, void *pEventData, 
-                 void *pUserData);
+                 void *pUserData, commandContext cc);
 @}   
 
 The callback function is meant to return 0 for failure or 1 for success.
@@ -264,7 +269,8 @@ interface:
    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);
@@ -360,6 +366,16 @@ The environment interface has just one function associated with it:
 
 @o obdes.h -d @{
 @<obdes@>
+/*--------------------------------------------------------------------------*/
+/* Additional properties used by the ANSTO site to provide more information
+ * about each object instance, especially devices.
+ */
+  void SetDescriptorKey(pObjectDescriptor self, char *keyName, char *value);
+  void SetDescriptorGroup(pObjectDescriptor self, char *group);
+  void SetDescriptorDescription(pObjectDescriptor self, char *description);
+  char * GetDescriptorKey(pObjectDescriptor self, char *keyName);
+  char * GetDescriptorGroup(pObjectDescriptor self);
+  char * GetDescriptorDescription(pObjectDescriptor self);
 @}
 
 @o interface.h -d @{
@@ -379,6 +395,7 @@ The environment interface has just one function associated with it:
 
 #ifndef SICSINTERFACES
 #define SICSINTERFACES
+#include "commandcontext.h"
 
 /* interface ID's used to recognize an interface */
 #define DRIVEID 513