From 9facc6a34dbdd957bb4fe5152156f51a252a4c93 Mon Sep 17 00:00:00 2001 From: Ron Sluiter Date: Thu, 19 Feb 2009 17:01:02 +0000 Subject: [PATCH] - Use errlogPrintf() for Debug messages. - Add card and status register to "NOT running" error message. --- motorApp/OmsSrc/drvMAXv.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/motorApp/OmsSrc/drvMAXv.cc b/motorApp/OmsSrc/drvMAXv.cc index 9836faeb..1623bff5 100644 --- a/motorApp/OmsSrc/drvMAXv.cc +++ b/motorApp/OmsSrc/drvMAXv.cc @@ -2,9 +2,9 @@ FILENAME... drvMAXv.cc USAGE... Motor record driver level support for OMS model MAXv. -Version: $Revision: 1.21 $ +Version: $Revision: 1.22 $ Modified By: $Author: sluiter $ -Last Modified: $Date: 2009-01-05 19:40:25 $ +Last Modified: $Date: 2009-02-19 16:56:54 $ */ /* @@ -111,7 +111,8 @@ Last Modified: $Date: 2009-01-05 19:40:25 $ /*----------------debugging-----------------*/ #ifdef __GNUG__ #ifdef DEBUG - #define Debug(l, f, args...) {if (l <= drvMAXvdebug) printf(f, ## args);} + #define Debug(l, f, args...) {if (l <= drvMAXvdebug) \ + errlogPrintf(f, ## args);} #else #define Debug(l, f, args...) #endif @@ -1002,7 +1003,8 @@ static int motor_init() pmotor = (struct MAXv_motor *) localaddr; if (pmotor->firmware_status.Bits.running == 0) - errMessage(-1, "controller is NOT running.\n"); + errlogPrintf("MAXv card #%d is NOT running; status = 0x%x\n", + card_index, (unsigned int) pmotor->firmware_status.All); Debug(9, "motor_init: malloc'ing motor_state\n"); motor_state[card_index] = (struct controller *) malloc(sizeof(struct controller));