Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
53ea75dc80 | |||
b1f4c2a7d9 | |||
d87e9cedd2 |
@ -831,7 +831,7 @@ initRecord(const char* filename, const char* protocol,
|
|||||||
return ERROR;
|
return ERROR;
|
||||||
}
|
}
|
||||||
debug("Stream::initRecord %s: initialized. %s\n",
|
debug("Stream::initRecord %s: initialized. %s\n",
|
||||||
name(), convert==2 ?
|
name(), convert == DO_NOT_CONVERT ?
|
||||||
"convert" : "don't convert");
|
"convert" : "don't convert");
|
||||||
return convert;
|
return convert;
|
||||||
}
|
}
|
||||||
@ -843,6 +843,7 @@ process()
|
|||||||
debug("Stream::process(%s)\n", name());
|
debug("Stream::process(%s)\n", name());
|
||||||
if (record->pact || record->scan == SCAN_IO_EVENT)
|
if (record->pact || record->scan == SCAN_IO_EVENT)
|
||||||
{
|
{
|
||||||
|
record->proc = 0;
|
||||||
if (status != NO_ALARM)
|
if (status != NO_ALARM)
|
||||||
{
|
{
|
||||||
debug("Stream::process(%s) error status=%s (%d)\n",
|
debug("Stream::process(%s) error status=%s (%d)\n",
|
||||||
@ -854,7 +855,7 @@ process()
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
debug("Stream::process(%s) ready. %s\n",
|
debug("Stream::process(%s) ready. %s\n",
|
||||||
name(), convert==2 ?
|
name(), convert == DO_NOT_CONVERT ?
|
||||||
"convert" : "don't convert");
|
"convert" : "don't convert");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -868,11 +869,15 @@ process()
|
|||||||
debug("Stream::process(%s) start\n", name());
|
debug("Stream::process(%s) start\n", name());
|
||||||
status = NO_ALARM;
|
status = NO_ALARM;
|
||||||
convert = OK;
|
convert = OK;
|
||||||
if (!startProtocol(record->proc==2 ? StreamCore::StartInit : StreamCore::StartNormal))
|
if (!startProtocol(record->proc == 2 ? StreamCore::StartInit : StreamCore::StartNormal))
|
||||||
{
|
{
|
||||||
debug("Stream::process(%s): could not start %sprotocol, status=%d\n",
|
debug("Stream::process(%s): could not start %sprotocol, status=%s (%d)\n",
|
||||||
name(), record->proc==2 ? "@init " : "", status);
|
name(), record->proc == 2 ? "@init " : "",
|
||||||
|
status >= 0 && status < ALARM_NSTATUS ?
|
||||||
|
epicsAlarmConditionStrings[status] : "ERROR",
|
||||||
|
status);
|
||||||
(void) recGblSetSevr(record, status ? status : UDF_ALARM, INVALID_ALARM);
|
(void) recGblSetSevr(record, status ? status : UDF_ALARM, INVALID_ALARM);
|
||||||
|
record->proc = 0;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
debug("Stream::process(%s): protocol started\n", name());
|
debug("Stream::process(%s): protocol started\n", name());
|
||||||
@ -920,7 +925,7 @@ scan(format_t *format, void* value, size_t maxStringSize)
|
|||||||
currentValueLength = scanValue(*format->priv, *(double*)value);
|
currentValueLength = scanValue(*format->priv, *(double*)value);
|
||||||
break;
|
break;
|
||||||
case DBF_STRING:
|
case DBF_STRING:
|
||||||
currentValueLength = scanValue(*format->priv, (char*)value, size);
|
currentValueLength = scanValue(*format->priv, (char*)value, size);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
error("INTERNAL ERROR (%s): Illegal format type %d\n",
|
error("INTERNAL ERROR (%s): Illegal format type %d\n",
|
||||||
|
Reference in New Issue
Block a user