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:
@@ -373,7 +373,10 @@ to the global SICS device executor.
|
||||
\mbox{}\verb@ */ @\\
|
||||
\mbox{}\verb@ void *GetExecutorCallback(pExeList self);@\\
|
||||
\mbox{}\verb@/*----------------------- Logging -----------------------------------------*/@\\
|
||||
\mbox{}\verb@ void DevexecLog(char *op, char *device); @\\
|
||||
\mbox{}\verb@ void DevexecLog(char *op, char *device);@\\
|
||||
\mbox{}\verb@ void ExeInterest(pExeList pExe, char *name, char *action); @\\
|
||||
\mbox{}\verb@ void InvokeNewTarget(pExeList pExe, char *name, float fTarget);@\\
|
||||
\mbox{}\verb@ void SetDevexecStatus(pExeList pExe, int code);@\\
|
||||
\mbox{}\verb@#endif @\\
|
||||
\mbox{}\verb@@$\Diamond$
|
||||
\end{list}
|
||||
|
||||
Reference in New Issue
Block a user