- Removed old code
- Extended tasker to support task groups - Added task functions for motors and counters - Modifed devexec to use the new task functions - Modified TAS to treat the monochromator separatly - Coded a EIGER monochromator module to reflect even more new requirements - Added EPICS counters and motors - Modified multicounter to be better performing SKIPPED: psi/eigermono.c psi/make_gen psi/makefile_linux psi/psi.c psi/sinqhttp.c
This commit is contained in:
54
obdes.h
54
obdes.h
@ -1,5 +1,5 @@
|
||||
|
||||
#line 385 "interface.w"
|
||||
#line 398 "interface.w"
|
||||
|
||||
|
||||
#line 29 "interface.w"
|
||||
@ -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,26 +45,26 @@ pObjectDescriptor FindDescriptor(void *pData);
|
||||
*/
|
||||
|
||||
typedef struct {
|
||||
pObjectDescriptor pDescriptor;
|
||||
} Dummy, *pDummy;
|
||||
pObjectDescriptor pDescriptor;
|
||||
}Dummy, *pDummy;
|
||||
|
||||
|
||||
pDummy CreateDummy(char *name);
|
||||
void KillDummy(void *pData);
|
||||
|
||||
pDummy CreateDummy(char *name);
|
||||
void KillDummy(void *pData);
|
||||
int iHasType(void *pData, char *Type);
|
||||
|
||||
#endif
|
||||
|
||||
int iHasType(void *pData, char *Type);
|
||||
|
||||
#endif
|
||||
|
||||
#line 386 "interface.w"
|
||||
#line 399 "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);
|
||||
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);
|
||||
|
Reference in New Issue
Block a user