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:
22
mumoconf.c
22
mumoconf.c
@@ -158,28 +158,6 @@ static int GetNextToken(psParser self)
|
||||
return UNKNOWN;
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------------
|
||||
in this code we need to find a motor for a name quite frequently.......
|
||||
*/
|
||||
pMotor FindMotor(SicsInterp * pSics, char *name)
|
||||
{
|
||||
CommandList *pC;
|
||||
pMotor pMot;
|
||||
|
||||
pC = FindCommand(pSics, name);
|
||||
if (!pC) {
|
||||
return NULL;
|
||||
}
|
||||
pMot = (pMotor) pC->pData;
|
||||
if (!pMot) {
|
||||
return NULL;
|
||||
}
|
||||
if (strcmp(pMot->pDescriptor->name, "Motor") != 0) {
|
||||
return NULL;
|
||||
}
|
||||
return pMot;
|
||||
}
|
||||
|
||||
/*--------------------------------------------------------------------------*/
|
||||
|
||||
int MakeMulti(SConnection * pCon, SicsInterp * pSics, void *pData,
|
||||
|
||||
Reference in New Issue
Block a user