- Connections write timeouts were incorrectly handled in asynnetc. Fixed.
- Implemented the desired run/drive behaviour: drive waits for what it started run starts, and success waits for everything to finish. This required changes to a lot of files. - Fixed a bug in remob which supressed required messages
This commit is contained in:
@ -92,13 +92,14 @@ static int MMCCStart(void *pData, SConnection * pCon)
|
||||
}
|
||||
|
||||
for (i = 0; i < self->nSlaves; i++) {
|
||||
self->slaves[i]->SetCountParameters(self->slaveData[i],
|
||||
ReleaseCountLock(self->slaves[i]);
|
||||
self->slaves[i]->SetCountParameters(self->slaveData[i],
|
||||
pCount->pDriv->fPreset,
|
||||
pCount->pDriv->eMode);
|
||||
ReleaseCountLock(self->slaves[i]);
|
||||
status = self->slaves[i]->StartCount(self->slaveData[i], pCon);
|
||||
if (status != OKOK) {
|
||||
MMCCHalt(pData);
|
||||
ReleaseCountLock(pCount->pCountInt);
|
||||
return status;
|
||||
}
|
||||
}
|
||||
@ -124,6 +125,7 @@ static int MMCCStatus(void *pData, SConnection * pCon)
|
||||
|
||||
if (self->nSlaves == 0) {
|
||||
pCount->pDriv->iErrorCode = NOCOUNTERS;
|
||||
ReleaseCountLock(pCount->pCountInt);
|
||||
return HWFault;
|
||||
}
|
||||
|
||||
@ -142,6 +144,7 @@ static int MMCCStatus(void *pData, SConnection * pCon)
|
||||
if (strcmp(pDum->pDescriptor->name, "HistMem") == 0) {
|
||||
HistDirty((pHistMem) self->slaveData[i]);
|
||||
}
|
||||
ReleaseCountLock(self->slaves[i]);
|
||||
}
|
||||
}
|
||||
return status;
|
||||
|
Reference in New Issue
Block a user