EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

error messages improved

Browse Source
This commit is contained in:
zimoch
2013-11-06 10:22:51 +00:00
parent b0ab8a7a8b
commit b139221f0b
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/AsynDriverInterface.cc
View File

@ -371,9 +371,11 @@ supportsEvent()
intrCallbackInt32, this, &intrPvtInt32); intrCallbackInt32, this, &intrPvtInt32);
return true; return true;
} }
error("%s: port does not allow to register for " const char *portname;
pasynManager->getPortName(pasynUser, &portname);
error("%s: port %s does not allow to register for "
"Int32 interrupts: %s\n", "Int32 interrupts: %s\n",
clientName(), pasynUser->errorMessage); clientName(), portname, pasynUser->errorMessage);
pasynInt32 = NULL; pasynInt32 = NULL;
intrPvtInt32 = NULL; intrPvtInt32 = NULL;
} }
@ -397,9 +399,11 @@ supportsEvent()
intrCallbackUInt32, this, 0xFFFFFFFF, &intrPvtInt32); intrCallbackUInt32, this, 0xFFFFFFFF, &intrPvtInt32);
return true; return true;
} }
error("%s: port does not allow to register for " const char *portname;
pasynManager->getPortName(pasynUser, &portname);
error("%s: port %s does not allow to register for "
"UInt32 interrupts: %s\n", "UInt32 interrupts: %s\n",
clientName(), pasynUser->errorMessage); clientName(), portname, pasynUser->errorMessage);
pasynUInt32 = NULL; pasynUInt32 = NULL;
intrPvtUInt32 = NULL; intrPvtUInt32 = NULL;
} }
@ -765,34 +769,34 @@ writeHandler()
writeCallback(StreamIoSuccess); writeCallback(StreamIoSuccess);
return; return;
case asynTimeout: case asynTimeout:
error("%s: timeout (%g sec) in write: %s\n", error("%s: asynTimeout (%g sec) in write. Asyn says: %s\n",
clientName(), pasynUser->timeout, pasynUser->errorMessage); clientName(), pasynUser->timeout, pasynUser->errorMessage);
writeCallback(StreamIoTimeout); writeCallback(StreamIoTimeout);
return; return;
case asynOverflow: case asynOverflow:
error("%s: asynOverflow in write: %s\n", error("%s: asynOverflow in write. Asyn driver says: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
writeCallback(StreamIoFault); writeCallback(StreamIoFault);
return; return;
case asynError: case asynError:
error("%s: asynError in write: %s\n", error("%s: asynError in write. Asyn driver says: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
writeCallback(StreamIoFault); writeCallback(StreamIoFault);
return; return;
#ifdef ASYN_VERSION // asyn >= 4.14 #ifdef ASYN_VERSION // asyn >= 4.14
case asynDisconnected: case asynDisconnected:
error("%s: asynDisconnected in write: %s\n", error("%s: asynDisconnected in write. Asyn driver says: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
writeCallback(StreamIoFault); writeCallback(StreamIoFault);
return; return;
case asynDisabled: case asynDisabled:
error("%s: asynDisconnected in write: %s\n", error("%s: asynDisconnected in write. Asyn driver says: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
writeCallback(StreamIoFault); writeCallback(StreamIoFault);
return; return;
#endif #endif
default: default:
error("%s: unknown asyn error in write: %s\n", error("%s: unknown asyn error in write. Asyn driver says: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
writeCallback(StreamIoFault); writeCallback(StreamIoFault);
return; return;
@ -1090,29 +1094,29 @@ readHandler()
} }
peeksize = inputBuffer.capacity(); peeksize = inputBuffer.capacity();
// deliver whatever we could save // deliver whatever we could save
error("%s: asynOverflow in read: %s\n", error("%s: asynOverflow in read. Asyn driver says: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
readCallback(StreamIoFault, buffer, received); readCallback(StreamIoFault, buffer, received);
break; break;
case asynError: case asynError:
error("%s: asynError in read: %s\n", error("%s: asynError in read. Asyn driver says: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
readCallback(StreamIoFault, buffer, received); readCallback(StreamIoFault, buffer, received);
break; break;
#ifdef ASYN_VERSION // asyn >= 4.14 #ifdef ASYN_VERSION // asyn >= 4.14
case asynDisconnected: case asynDisconnected:
error("%s: asynDisconnected in read: %s\n", error("%s: asynDisconnected in read. Asyn driver says: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
readCallback(StreamIoFault); readCallback(StreamIoFault);
return; return;
case asynDisabled: case asynDisabled:
error("%s: asynDisconnected in read: %s\n", error("%s: asynDisconnected in read. Asyn driver says: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
readCallback(StreamIoFault); readCallback(StreamIoFault);
return; return;
#endif #endif
default: default:
error("%s: unknown asyn error in read: %s\n", error("%s: unknown asyn error in read. Asyn driver says: %s\n",
clientName(), pasynUser->errorMessage); clientName(), pasynUser->errorMessage);
readCallback(StreamIoFault); readCallback(StreamIoFault);
return; return;