- Added a multiple histogram memory control module. This required a

tiny change in the countable interface which in turn required updating
  of header file includes in a lot of files.
- Some small fixes to TRICS writing as well.
This commit is contained in:
cvs
2001-06-08 15:18:35 +00:00
parent 2d16479717
commit 8f84d45dd6
48 changed files with 671 additions and 157 deletions

View File

@ -1,5 +1,5 @@
#line 343 "interface.w"
#line 345 "interface.w"
/*---------------------------------------------------------------------------
I N T E R F A C E S
@ -44,7 +44,7 @@
pIDrivable GetDrivableInterface(void *pObject);
#line 368 "interface.w"
#line 370 "interface.w"
pIDrivable CreateDrivableInterface(void);
@ -56,6 +56,8 @@
typedef struct {
int ID;
int (*Halt)(void *self);
void (*SetCountParameters)(void *self, float fPreset,
CounterMode eMode);\
int (*StartCount)(void *self, SConnection *pCon);
int (*CheckCountStatus)(void *self, SConnection *pCon);
int (*Pause)(void *self, SConnection *pCon);
@ -66,23 +68,23 @@
pICountable GetCountableInterface(void *pObject);
#line 373 "interface.w"
#line 375 "interface.w"
pICountable CreateCountableInterface(void);
/* ------------------------- The CallBack Interface --------------------*/
#line 227 "interface.w"
#line 229 "interface.w"
typedef void (*KillFuncIT)(void *pData);
typedef int (*SICSCallBack)(int iEvent, void *pEventData,
void *pUserData);
#line 378 "interface.w"
#line 380 "interface.w"
#line 249 "interface.w"
#line 251 "interface.w"
typedef struct __ICallBack *pICallBack;
@ -97,11 +99,11 @@
int RemoveCallback(pICallBack pInterface, long iID);
int RemoveCallback2(pICallBack pInterface, void *pUserData);
#line 379 "interface.w"
#line 381 "interface.w"
/*---------------------- The Environment Interface --------------------*/
#line 307 "interface.w"
#line 309 "interface.w"
typedef enum { EVIdle, EVDrive, EVMonitor, EVError } EVMode;
typedef struct {
@ -111,13 +113,13 @@
int (*HandleError)(void *self);
} EVInterface, *pEVInterface;
#line 381 "interface.w"
#line 383 "interface.w"
#line 333 "interface.w"
#line 335 "interface.w"
pEVInterface CreateEVInterface(void);
#line 382 "interface.w"
#line 384 "interface.w"
#endif