- Adapted indenation to new agreed upon system

- Added support for second generation scriptcontext based counter

obdes.h

@@ -25,19 +25,19 @@
 #include <ifile.h>
 #include <hipadaba.h>
 
-  typedef struct {
-                   char *name;
-                   int   (*SaveStatus)(void *self, char *name,FILE *fd);
-                   void  *(*GetInterface)(void *self, int iInterfaceID);
-                   IPair *pKeys;
-                   pHdb parNode;
-                   } ObjectDescriptor, *pObjectDescriptor;
+typedef struct {
+  char *name;
+  int (*SaveStatus) (void *self, char *name, FILE * fd);
+  void *(*GetInterface) (void *self, int iInterfaceID);
+  IPair *pKeys;
+  pHdb parNode;
+} ObjectDescriptor, *pObjectDescriptor;
 
  /*---------------------------------------------------------------------------*/
-   pObjectDescriptor CreateDescriptor(char *name);
-   void              DeleteDescriptor(pObjectDescriptor self);
-   pObjectDescriptor FindDescriptor(void *pData);
- 
+pObjectDescriptor CreateDescriptor(char *name);
+void DeleteDescriptor(pObjectDescriptor self);
+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
@@ -45,16 +45,16 @@
 */
 
 typedef struct {
-                 pObjectDescriptor pDescriptor;
-               }Dummy, *pDummy;
-                
+  pObjectDescriptor pDescriptor;
+} Dummy, *pDummy;
 
-  pDummy CreateDummy(char *name);
-  void KillDummy(void *pData);  
 
-  int iHasType(void *pData, char *Type);
-                                      
-#endif  
+pDummy CreateDummy(char *name);
+void KillDummy(void *pData);
+
+int iHasType(void *pData, char *Type);
+
+#endif
 
 #line 386 "interface.w"
 
@@ -62,9 +62,9 @@ typedef struct {
 /* 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);
+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);