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:
@@ -101,6 +101,8 @@ From within the SICS main loops this special function is called:
|
||||
int DevExecTask(void *pEL);
|
||||
void DevExecSignal(void *pEL, int iSignal, void *pSigData);
|
||||
|
||||
int GetDevExecInstStatus(pExeList self);
|
||||
|
||||
@}
|
||||
CheckExeList then scan through its list of executing objects and request a
|
||||
status from each of them. The next action depend on the status returned from
|
||||
@@ -319,7 +321,10 @@ to the global SICS device executor.
|
||||
*/
|
||||
void *GetExecutorCallback(pExeList self);
|
||||
/*----------------------- Logging -----------------------------------------*/
|
||||
void DevexecLog(char *op, char *device);
|
||||
void DevexecLog(char *op, char *device);
|
||||
void ExeInterest(pExeList pExe, char *name, char *action);
|
||||
void InvokeNewTarget(pExeList pExe, char *name, float fTarget);
|
||||
void SetDevexecStatus(pExeList pExe, int code);
|
||||
#endif
|
||||
@}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user