- 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

obdes.h

@@ -1,32 +1,36 @@
 
-#line 361 "interface.w"
+#line 367 "interface.w"
 
 
 #line 29 "interface.w"
 
 /*--------------------------------------------------------------------------
-        In SICS there is the to find out what an
-        object is capable of at runtime. If this has been done a general
-        way to access those capabilities is needed. In order to do all
-        this each SICS-object is required to carry an object descriptor
-        struct as first parameter in its class/object struct. Additionslly
-        it is required to initialize this struct to something sensible.
-        
-        This file defines this struct. Additionally a few functions of
-        general use are prototyped.
-        
-        Mark Koennecke, June, 1997
-        
-        copyrigth: see implementation file 
+   In SICS there is the to find out what an
+   object is capable of at runtime. If this has been done a general
+   way to access those capabilities is needed. In order to do all
+   this each SICS-object is required to carry an object descriptor
+   struct as first parameter in its class/object struct. Additionslly
+   it is required to initialize this struct to something sensible.
+   
+   This file defines this struct. Additionally a few functions of
+   general use are prototyped.
+   
+   Mark Koennecke, June, 1997
+   
+   copyrigth: see implementation file 
 ----------------------------------------------------------------------------*/
 #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;
 
  /*---------------------------------------------------------------------------*/
@@ -35,9 +39,9 @@
    pObjectDescriptor FindDescriptor(void *pData);
  
 /*============================================================================
-        Objects which do not carry data need a dummy descriptor. Otherwise
-        drive or scan will protection fault when trying to drive something
-        which should not be driven. This is defined below.
+   Objects which do not carry data need a dummy descriptor. Otherwise
+   drive or scan will protection fault when trying to drive something
+   which should not be driven. This is defined below.
 */
 
 typedef struct {
@@ -46,11 +50,21 @@ typedef struct {
                 
 
   pDummy CreateDummy(char *name);
-  void KillDummy(void *pData);  
+  void KillDummy(void *pData);   
 
   int iHasType(void *pData, char *Type);
                                       
 #endif  
 
-#line 362 "interface.w"
+#line 368 "interface.w"
 
+/*--------------------------------------------------------------------------*/
+/* 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);