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:
@ -194,7 +194,7 @@ int SerialSicsExecute(void **pData, char *pCommand,
|
||||
control.data = CreateDynString(1024, 1024);
|
||||
|
||||
/* start task */
|
||||
lTask = TaskRegister(pServ->pTasker,
|
||||
lTask = TaskRegisterN(pServ->pTasker,"serialwait",
|
||||
SWTask, SWSignal, NULL, &control, 1);
|
||||
/* wait for it to end */
|
||||
TaskWait(pServ->pTasker, lTask);
|
||||
|
Reference in New Issue
Block a user