- First implementation of Hdbqueue
- First implementation of new object model for SICS
This commit is contained in:
23
scan.c
23
scan.c
@@ -547,10 +547,6 @@ CountEntry CollectCounterData(pScanData self)
|
||||
{
|
||||
/*--------- drive */
|
||||
iRet = self->ScanDrive(self,i);
|
||||
if(!iRet)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
/* finished, check for interrupts. Whatever happened, user
|
||||
interrupt or HW interrupt, it will be on our connection
|
||||
*/
|
||||
@@ -579,13 +575,15 @@ CountEntry CollectCounterData(pScanData self)
|
||||
return 0;
|
||||
break;
|
||||
}
|
||||
if(!iRet)
|
||||
{
|
||||
SCWrite(self->pCon,"WARNING: skipped scan point after drive failure",
|
||||
eWarning);
|
||||
continue;
|
||||
}
|
||||
|
||||
/*-------------- count */
|
||||
iRet = self->ScanCount(self, i);
|
||||
if(!iRet)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* finished, check for interrupts. Whatever happened, user
|
||||
interrupt or HW interrupt, it will be on our connection
|
||||
*/
|
||||
@@ -610,6 +608,13 @@ CountEntry CollectCounterData(pScanData self)
|
||||
return 0;
|
||||
break;
|
||||
}
|
||||
if(!iRet)
|
||||
{
|
||||
SCWrite(self->pCon,"WARNING: skipped scan point after count failure",
|
||||
eWarning);
|
||||
continue;
|
||||
}
|
||||
|
||||
/*-------- scan post processing */
|
||||
self->CollectScanData(self,i);
|
||||
InvokeCallBack(self->pCall,SCANPOINT,self);
|
||||
|
||||
Reference in New Issue
Block a user