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

Use counter to prevent endless loop in send_mess() after VME58 reboot.

Browse Source
This commit is contained in:
Ron Sluiter
2011-10-20 21:38:58 +00:00
parent dbcf4bc2a9
commit 05b412312a
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
motorApp/OmsSrc/drvOms58.cc
+10 -1
View File
@@ -112,6 +112,8 @@ HeadURL: $URL$
* .40 01-26-11 rls - added reboot flag to DPRAM R/W reserved area. Driver
* sets flag to 0x4321; set_status() disables board if flag
* does not read 0x4321.
* .41 10-20-11 rls - Added counter in send_mess() to prevent endless loop
* after VME58 reboot.
*
*/
@@ -657,6 +659,7 @@ static RTN_STATUS send_mess(int card, char const *com, char *name)
epicsInt16 putIndex;
char outbuf[MAX_MSG_SIZE], *p;
RTN_STATUS return_code;
int count;
if (strlen(com) > MAX_MSG_SIZE)
{
@@ -714,7 +717,7 @@ static RTN_STATUS send_mess(int card, char const *com, char *name)
pmotor->outPutIndex = putIndex; /* Message Sent */
while (putIndex != pmotor->outGetIndex)
for (count = 0; (putIndex != pmotor->outGetIndex) && (count < 1000); count++)
{
#ifdef DEBUG
epicsInt16 deltaIndex, delta;
@@ -725,6 +728,12 @@ static RTN_STATUS send_mess(int card, char const *com, char *name)
#endif
epicsThreadSleep(quantum);
};
if (count >= 1000)
{
errlogPrintf("\n*** VME58 card #%d communication timeout ***\n", card);
return_code = ERROR;
}
return(return_code);
}