linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First commit towards replacing pCon-> with someFunc(pCon)

Browse Source 
This is accompanied with the removal of dead code in conman.c and else
This commit is contained in:
koennecke
2016-10-31 08:33:36 +01:00
parent fd5451e8fd
commit 0e2605b570
21 changed files with 171 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
selector.c
View File

@@ -614,13 +614,13 @@ int MonoRun(pSicsSelector self, SConnection * pCon, float fWaveLength)
/* start each motor in turn */
iRet = StartDevice(GetExecutor(), self->pTheta->name,
self->pTheta->pDescriptor,
self->pTheta, pCon, pCon->runLevel, sNeu.fTheta);
self->pTheta, pCon, SCGetRunLevel(pCon), sNeu.fTheta);
if (!iRet) {
return 0;
}
iRet = StartDevice(GetExecutor(), self->pTwoTheta->name,
self->pTwoTheta->pDescriptor,
self->pTwoTheta, pCon, pCon->runLevel, sNeu.fTwoTheta);
self->pTwoTheta, pCon, SCGetRunLevel(pCon), sNeu.fTwoTheta);
if (!iRet) {
return 0;
}
@@ -630,7 +630,7 @@ int MonoRun(pSicsSelector self, SConnection * pCon, float fWaveLength)
if (self->pBend1) {
iRet = StartDevice(GetExecutor(), self->pBend1->name,
self->pBend1->pDescriptor,
self->pBend1, pCon, pCon->runLevel, sNeu.fVert);
self->pBend1, pCon, SCGetRunLevel(pCon), sNeu.fVert);
if (!iRet) {
return 0;
}
@@ -639,7 +639,7 @@ int MonoRun(pSicsSelector self, SConnection * pCon, float fWaveLength)
if (self->pBend2) {
iRet = StartDevice(GetExecutor(), self->pBend2->name,
self->pBend2->pDescriptor,
self->pBend2, pCon, pCon->runLevel, sNeu.fHor);
self->pBend2, pCon, SCGetRunLevel(pCon), sNeu.fHor);
if (!iRet) {
return 0;
}