Cleaned up ANSTO code to merge with sinqdev.sics
This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c Conflicts: .gitignore SICSmain.c asynnet.c confvirtualmot.c counter.c devexec.c drive.c event.h exebuf.c exeman.c histmem.c interface.h motor.c motorlist.c motorsec.c multicounter.c napi.c napi.h napi4.c network.c nwatch.c nxscript.c nxxml.c nxxml.h ofac.c reflist.c scan.c sicshipadaba.c sicsobj.c site_ansto/docs/Copyright.txt site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl statusfile.c tasdrive.c tasub.c tasub.h tasublib.c tasublib.h
This commit is contained in:
13
status.h
13
status.h
@@ -27,19 +27,7 @@ typedef enum {
|
||||
} Status;
|
||||
|
||||
/* for status display */
|
||||
void SetStatus(Status eNew);
|
||||
int SetStatusFromText(char *text);
|
||||
void KillStatus(void *pData);
|
||||
/**
|
||||
* set a status and disallow any further changes to the status. This serves
|
||||
* in order to prevent massive message flows to the client from status
|
||||
* changes while processing synchronisation files
|
||||
*/
|
||||
void SetStatusFixed(Status eNew);
|
||||
/**
|
||||
* clear a fixed status again, status will be updated again.
|
||||
*/
|
||||
void ClearFixedStatus(Status eNew);
|
||||
|
||||
Status GetStatus(void);
|
||||
void GetStatusText(char *buf, int iBufLen);
|
||||
@@ -49,5 +37,6 @@ int UserStatus(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
int argc, char *argv[]);
|
||||
int ResetStatus(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
int argc, char *argv[]);
|
||||
void InitStatus(void);
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user