lin-epics-modules/motorBase
0
0
Fork 0
forked from epics_driver_modules/motorBase
Code Pull Requests Activity

motor: fixed delayed callbacks due to a non-zero DLY. There are two fixes here. One fixes the problem where a process due to device support causes the record to process and complete a put callback (before the DLY timer expired), and the other fixes the problem where there are no device support processes so that when the callback timer expires for DLY the record gets stuck because it didn't handle DMOV correctly, and also didn't do recGblFwdLink.

Browse Source
This commit is contained in:
mp49
2012-07-13 13:11:21 +00:00
parent 4154a2c410
commit 63f3fe5ec9
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/MotorSrc/motorRecord.cc
+17 -4
View File
@@ -152,6 +152,11 @@ HeadURL: $URL$
* - Use home velocity (HVEL), base velocity (BVEL) and accel.
* time (ACCL) fields to calculate home acceleration rate.
* .63 04-10-12 kmp - Inverted the priority of sync and status update in do_work().
* .64 07-13-12 mrp - Fixed problem with using DLY field. If a process due to device support
* happened before the DLY timer expired, then the put callback
* returned prematurely. Also, if there was no process due to
* device support, then the record could get stuck at the end of the move
* because it wasn't setting DMOV back to True or processing forward links.
*
*/
@@ -1243,6 +1248,12 @@ static long process(dbCommon *arg)
MARK(M_DMOV);
}
/* Set dmov to false if we have a delayed callback in process.*/
if (pmr->mip & MIP_DELAY_REQ)
{
pmr->dmov = FALSE;
}
/* Do another update after LS error. */
if (pmr->mip != MIP_DONE && (pmr->rhls || pmr->rlls))
{
@@ -1282,13 +1293,15 @@ static long process(dbCommon *arg)
{
if (pmr->mip & MIP_DELAY_ACK && !(pmr->mip & MIP_DELAY_REQ))
{
pmr->mip |= MIP_DELAY;
pmr->mip = MIP_DONE;
MARK(M_MIP);
INIT_MSG();
WRITE_MSG(GET_INFO, NULL);
SEND_MSG();
/* Restore DMOV to false and UNMARK it so it is not posted. */
pmr->dmov = FALSE;
UNMARK(M_DMOV);
/* Mark DMOV and process forward links after a MIP_DELAY_ACK.*/
pmr->dmov = TRUE;
MARK(M_DMOV);
recGblFwdLink(pmr);
goto process_exit;
}
else if (pmr->stup != motorSTUP_ON && pmr->mip != MIP_DONE)