find clean way to create dbd file

provide local strncasecmp for 3.13
version macros updated
2015-12-07 17:22:40 +01:00 · 2015-12-07 17:21:44 +01:00 · 2015-12-07 15:15:06 +01:00 · 2015-10-19 13:58:06 +02:00 · 2015-10-19 13:58:06 +02:00 · 2015-10-19 13:58:06 +02:00
80 changed files with 2240 additions and 918 deletions
--- a/15
+++ b/15
@ -1,12 +1,11 @@
+# Remove this file if not using the PSI build system
 include /ioc/tools/driver.makefile
 EXCLUDE_VERSIONS = 3.13.2
-PROJECT=stream2
+PROJECT=stream
 BUILDCLASSES += Linux

 #DOCUDIR = doc

-DBDS = stream.dbd
-
 BUSSES  += AsynDriver
 BUSSES  += Dummy

@ -35,15 +34,13 @@ SOURCES += $(BUSSES:%=src/%Interface.cc)
 SOURCES += $(wildcard src/Stream*.cc)
 SOURCES += src/StreamVersion.c

+HEADERS += devStream.h
 HEADERS += StreamFormat.h
 HEADERS += StreamFormatConverter.h
 HEADERS += StreamBuffer.h
 HEADERS += StreamError.h

-ifeq (${EPICS_BASETYPE},3.13)
-USR_INCLUDES += -include $(INSTALL_INCLUDE)/compat3_13.h
-endif
-ifeq (${EPICS_BASETYPE},3.14)
+ifneq (${EPICS_BASETYPE},3.13)
 RECORDTYPES += calcout
 endif

@ -53,5 +50,7 @@ streamReferences:
 	perl ../src/makeref.pl Interface $(BUSSES) > $@
 	perl ../src/makeref.pl Converter $(FORMATS) >> $@

-stream.dbd:
+export DBDFILES = streamSup.dbd
+streamSup.dbd:
+	@echo Creating $@
 	perl ../src/makedbd.pl $(RECORDTYPES) > $@
--- a/doc/PSI.gif
+++ b/doc/PSI.gif
--- a/doc/PSI.png
+++ b/doc/PSI.png
--- a/doc/aai.html
+++ b/doc/aai.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: aai Records</h1>
+<h1>aai Records</h1>
 <p>
 <b>Note:</b> aai record support is disabled per default.
 Enable it in <code>src/CONFIG_STREAM</code>.
--- a/doc/aao.html
+++ b/doc/aao.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: aao Records</h1>
+<h1>aao Records</h1>
 <p>
 <b>Note:</b> aao record support is disabled per default.
 Enable it in <code>src/CONFIG_STREAM</code>.
--- a/doc/ai.html
+++ b/doc/ai.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: ai Records</h1>
+<h1>ai Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -41,6 +41,12 @@ written or read value.
   (=20.0/0xFFFF) maps 0x0000 to -10.0, 0x7FFF to 0.0 and 0xFFFF to 10.0.
   Using unsigned formats with values &ge; 0x800000 gives different results
   on 64 bit machines.
+   <p>
+   If <code>LINR=="NO CONVERSION"</code> (the default), <code>VAL</code>
+   is directly converted from and to <code>long</code> without going through
+   <code>RVAL</code>. This allows for more bits on 64 bit machines.
+   To get the old behavior, use <code>LINR=="LINEAR"</code>.
+   </p>
  </dd>
 <dt>ENUM format (e.g. <code>%{</code>):</dt>
  <dd>
@ -78,6 +84,6 @@ written or read value.
 <a href="calcout.html">calcout</a>
 <a href="scalcout.html">scalcout</a>
 </p>
-<p><small>Dirk Zimoch, 2005</small></p>
+<p><small>Dirk Zimoch, 2015</small></p>
 </body>
 </html>
--- a/doc/ao.html
+++ b/doc/ao.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: ao Records</h1>
+<h1>ao Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -40,6 +40,12 @@ written or read value.
   (=20.0/0xFFFF) maps -10.0 to 0x0000, 0.0 to 0x7FFF and 10.0 to 0xFFFF.
   Using unsigned formats with values &ge; 0x800000 gives different results
   on 64 bit machines.
+   <p>
+   If <code>LINR=="NO CONVERSION"</code> (the default), <code>OVAL</code>
+   is directly converted to <code>long</code> without going through
+   <code>RVAL</code>. This allows for more bits on 64 bit machines.
+   To get the old behavior, use <code>LINR=="LINEAR"</code>.
+   </p>
  </dd>
 <dt>ENUM format (e.g. <code>%{</code>):</dt>
  <dd>
@ -79,6 +85,6 @@ written or read value.
 <a href="calcout.html">calcout</a>
 <a href="scalcout.html">scalcout</a>
 </p>
-<p><small>Dirk Zimoch, 2005</small></p>
+<p><small>Dirk Zimoch, 2015</small></p>
 </body>
 </html>
--- a/doc/bi.html
+++ b/doc/bi.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: bi Records</h1>
+<h1>bi Records</h1>

 <h2>Normal Operation</h2>
 <p>
--- a/doc/bo.html
+++ b/doc/bo.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: bo Records</h1>
+<h1>bo Records</h1>

 <h2>Normal Operation</h2>
 <p>
--- a/doc/calcout.html
+++ b/doc/calcout.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: calcout Records</h1>
+<h1>calcout Records</h1>

 <p>
 <b>Note:</b> Device support for calcout records is only available for
--- a/doc/epics3_13.html
+++ b/doc/epics3_13.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Using EPICS 3.13</h1>
+<h1>Using EPICS 3.13</h1>

 <a name="pre"></a>
 <h2>1. Prerequisites</h2>
--- a/doc/formatconverter.html
+++ b/doc/formatconverter.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Format Converter API</h1>
+<h1>Format Converter API</h1>

 <a name="class"></a>
 <h2>Converter Class</h2>
--- a/doc/formats.html
+++ b/doc/formats.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Format Converters</h1>
+<h1>Format Converters</h1>

 <a name="syntax"></a>
 <h2>1. Format Syntax</h2>
@ -28,8 +28,8 @@ A format converter consists of
 </p>
 <ul>
 <li>The <code>%</code> character</li>
- <li>Optionally a field <span class="new">or record</span> name in <code>()</code></li>
- <li>Optionally flags out of the characters <code>*# +0-<span class="new">?=</span></code></li>
+ <li>Optionally a field or record name in <code>()</code></li>
+ <li>Optionally flags out of the characters <code>*# +0-?=!</code></li>
 <li>Optionally an integer <em>width</em> field</li>
 <li>Optionally a period character (<code>.</code>) followed
     by an integer <em>precision</em> field (input ony for most formats)</li>
@ -40,7 +40,7 @@ A format converter consists of
 <p>
 The flags <code>*# +0-</code> work like in the C functions
 <em>printf()</em> and <em>scanf()</em>.
-The flags <code>?</code> and <code>=</code> are extensions.
+The flags <code>?</code>, <code>=</code> and <code>!</code> are extensions.
 </p>
 <p>
 The <code>*</code> flag skips data in input formats.
@ -67,16 +67,24 @@ The <code>0</code> flag says that numbers should be left padded with
 The <code>-</code> flag specifies that output is left justified if
 <em>width</em> is larger than required.
 </p>
-<p class="new">
+<p>
 The <code>?</code> flag makes failing input conversions succeed with
 a default zero value (0, 0.0, or "", depending on the format type).
 </p>
-<p class="new">
+<p>
 The <code>=</code> flag allows to compare input with current values.
 It is only allowed in input formats.
 Instead of reading a new value from input, the current value is
 formatted (like for output) and then compared to the input.
 </p>
+<p>
+The <code>!</code> flag demands that input is exactly <em>width</em>
+bytes long (normally <em>width</em> defines the maximum number of
+bytes read in many formats).
+For example <code>in "%!5d";</code> expects exactly 5 digits.
+Fewer digits are considered loss of data and make the format fail.
+This feature has been added by Klemen Vodopivec, SNS.
+</p>

 <h3>Examples:</h3>
 <table>
@ -143,11 +151,8 @@ field formatted as a string.
 Use <code>in&nbsp;"%(<i>otherrecord</i>.RVAL)f";</code> to write the floating
 point input value into the <code>RVAL</code> field of
 <code><i>otherrecord</i></code>. 
-<span class="new">
 If no field is given for an other record .VAL is assumed.
 When a record name conflicts with a field name use .VAL explicitly.
-</span>
-
 </p>
 <p>
 This feature is very useful when one line of input contains many values that should
@ -158,6 +163,9 @@ attribute (see
 target="ex">Record Reference Manual</a>), the record will be processed.
 It is your responsibility that the data type of the record field is
 compatible to the the data type of the converter.
+STRING formats are compatible with arrays of CHAR or UCHAR.
+</p>
+<p>
 Note that using this syntax is by far not as efficient as using the
 default field.
 At the moment it is not possible to set <code>otherrecord</code> to an alarm
@ -189,13 +197,13 @@ With the <code>#</code> flag, output always contains a period character.
 <p>
 <b>Input:</b> All these formats are equivalent. Leading whitespaces are skipped.
 </p>
-<p class="new">
+<p>
 With the <code>#</code> flag additional whitespace between sign and number
 is accepted.
 </p>
-<p class="new">
+<p>
 When a maximum field width is given, leading whitespace only counts to the
-field witdth when the space flag is given.
+field witdth when the space flag is used.
 </p>

 <a name="stdl"></a>
@ -210,6 +218,10 @@ field witdth when the space flag is given.
 <p>
 With the <code>#</code> flag, octal values are prefixed with <code>0</code>
 and hexadecimal values with <code>0x</code> or <code>0X</code>.
+<p>
+Unlike printf, <code>%x</code> and <code>%X</code> truncate the
+output to the the given width (number of least significant half bytes).
+</p>
 </p>
 <p>
 <b>Input:</b> <code>%d</code> matches signed decimal, <code>%u</code> matches
@ -221,16 +233,16 @@ Octal and hexadecimal values can optionally be prefixed.
 hexadecimal notation.
 Leading whitespaces are skipped.
 </p>
-<p class="new">
+<p>
 With the <code>-</code> negative octal and hexadecimal values are accepted. 
 </p>
-<p class="new">
+<p>
 With the <code>#</code> flag additional whitespace between sign and number
 is accepted.
 </p>
-<p class="new">
+<p>
 When a maximum field width is given, leading whitespace only counts to the
-field witdth when the space flag is given.
+field witdth when the space flag is used.
 </p>

 <a name="stds"></a>
@ -246,13 +258,11 @@ and <code>%c</code> matches a sequence of not-null characters.
 The maximum string length is given by <em>width</em>.
 The default <em>width</em> is infinite for <code>%s</code> and
 1 for <code>%c</code>.
-Leading whitespaces are skipped with <code>%s</code> 
-<span class="new">
-except when the space flag is given</span>
-but not with <code>%c</code>.
+Leading whitespaces are skipped with <code>%s</code> except when
+the space flag is used but not with <code>%c</code>.
 The empty string matches.
 </p>
-<p class="new">
+<p>
 With the <code>#</code> flag <code>%s</code> matches a sequence of not-null
 characters instead of non-whitespace characters.
 </p>
@ -286,9 +296,20 @@ to the value 0, <code>STANDBY</code> to 1 and <code>ON</code> to 2.
 <p>
 When using the <code>#</code> flag it is allowed to assign integer values
 to the strings using <code>=</code>.
+Unassigned strings increment their values by 1 as usual.
 </p>
 <p>
-Example: <code>%#{neg=-1|stop=0|pos=1|fast=10}</code>.
+If one string is the initial substing of another, the substing must come
+later to ensure correct matching.
+In particular if one string is the emptry string, it must be the last one.
+Use <code>#</code> and <code>=</code> to renumber if necessary.
+</p>
+<p>
+Use the assignment <code>=?</code> for the last string to make it the
+default value for output formats.
+</p>
+<p>
+Example: <code>%#{neg=-1|stop|pos|fast=10|rewind=-10}</code>.
 </p>
 <p>
 If one of the strings contains <code>|</code> or <code>}</code>
@ -296,10 +317,11 @@ If one of the strings contains <code>|</code> or <code>}</code>
 a <code>\</code> must be used to escape the character.
 </p>
 <p>
-In output, depending on the value, one of the strings is printed.
+<b>Output:</b> Depending on the value, one of the strings is printed,
+or the default if no value matches.
 </p>
 <p>
-In input, if any of the strings matches the value is set accordingly.
+<b>Input:</b> If any of the strings matches, the value is set accordingly.
 </p>

 <a name="bin"></a>
@ -466,21 +488,24 @@ In input, the next byte or bytes must match the checksum.
  (poly=0x07, init=0x00, xorout=0x00).</dd>
 <dt><code>%&lt;ccitt8&gt;</code></dt>
  <dd>One byte. The CCITT standard 8 bit crc checksum
-  (poly=0x31, init=0x00, xorout=0x00).</dd>
+  (poly=0x31, init=0x00, xorout=0x00, reflected).</dd>
 <dt><code>%&lt;crc16&gt;</code></dt>
  <dd>Two bytes. An often used 16 bit crc checksum
  (poly=0x8005, init=0x0000, xorout=0x0000).</dd>
 <dt><code>%&lt;crc16r&gt;</code></dt>
  <dd>Two bytes. An often used reflected 16 bit crc checksum
-  (poly=0x8005, init=0x0000, xorout=0x0000).</dd>
+  (poly=0x8005, init=0x0000, xorout=0x0000, reflected).</dd>
+ <dt><code>%&lt;modbus&gt;</code></dt>
+  <dd>Two bytes. The modbus 16 bit crc checksum
+  (poly=0x8005, init=0xffff, xorout=0x0000, reflected)</dd>
 <dt><code>%&lt;ccitt16&gt;</code></dt>
  <dd>Two bytes. The usual (but <a target="ex"
-   href="http://www.joegeluso.com/software/articles/ccitt.htm">wrong?</a>)
+   href="http://srecord.sourceforge.net/crc16-ccitt.html">wrong?</a>)
   implementation of the CCITT standard 16 bit crc checksum
   (poly=0x1021, init=0xFFFF, xorout=0x0000).</dd>
 <dt><code>%&lt;ccitt16a&gt;</code></dt>
  <dd>Two bytes. The unusual (but <a target="ex"
-   href="http://www.joegeluso.com/software/articles/ccitt.htm">correct?</a>)
+   href="http://srecord.sourceforge.net/crc16-ccitt.html">correct?</a>)
   implementation of the CCITT standard 16 bit crc checksum with augment.
   (poly=0x1021, init=0x1D0F, xorout=0x0000).</dd>
 <dt><code>%&lt;ccitt16x&gt;</code> or <code>%&lt;crc16c&gt;</code> or <code>%&lt;xmodem&gt;</code></dt>
@ -491,10 +516,10 @@ In input, the next byte or bytes must match the checksum.
   (poly=0x04C11DB7, init=0xFFFFFFFF, xorout=0xFFFFFFFF).</dd>
 <dt><code>%&lt;crc32r&gt;</code></dt>
  <dd>Four bytes. The standard reflected 32 bit crc checksum.
-   (poly=0x04C11DB7, init=0xFFFFFFFF, xorout=0xFFFFFFFF).</dd>
+   (poly=0x04C11DB7, init=0xFFFFFFFF, xorout=0xFFFFFFFF, reflected).</dd>
 <dt><code>%&lt;jamcrc&gt;</code></dt>
  <dd>Four bytes. Another reflected 32 bit crc checksum.
-   (poly=0x04C11DB7, init=0xFFFFFFFF, xorout=0x00000000).</dd>
+   (poly=0x04C11DB7, init=0xFFFFFFFF, xorout=0x00000000, reflected).</dd>
 <dt><code>%&lt;adler32&gt;</code></dt>
  <dd>Four bytes. The Adler32 checksum according to <a target="ex"
   href="http://www.ietf.org/rfc/rfc1950.txt">RFC 1950</a>.</dd>
@ -565,7 +590,6 @@ Format flags <code>+</code>, <code>-</code>, and space are supported in
 the usual way (always sign, left justified, space instead of + sign).
 Flags <code>#</code> and <code>0</code> are unsupported.
 </p>
-<div class="new">
 <a name="timestamp"></a>
 <h2>14. Timestamp DOUBLE converter (<code>%T(<em>timeformat</em>)</code>)</h2>
 <p>
@ -618,9 +642,8 @@ Because of the complexity of the problem, locales are not supported.
 Thus, only the English month names can be used (week day names are
 ignored anyway).
 </p>
-</div>
 <hr>
 <p align="right"><a href="processing.html">Next: Record Processing</a></p>
-<p><small>Dirk Zimoch, 2011</small></p>
+<p><small>Dirk Zimoch, 2015</small></p>
 </body>
 </html>
--- a/doc/index.html
+++ b/doc/index.html
@ -88,11 +88,11 @@ many process variables distributed over many records.

 <h2>Recommended Readings</h2>
 <p>
-<a href="http://www.aps.anl.gov/epics/base/R3-14/8-docs/AppDevGuide.pdf"
-target="ex">IOC Application Developer's Guide (PDF)</a>
+<a href="http://www.aps.anl.gov/epics/base/R3-14/12-docs/AppDevGuide"
+target="ex">IOC Application Developer's Guide</a>
 </p>
 <p>
-<a href="http://www.aps.anl.gov/asd/controls/epics/EpicsDocumentation/AppDevManuals/RecordRef/Recordref-1.html"
+<a href="https://wiki-ext.aps.anl.gov/epics/index.php/RRM_3-14"
 target="ex">EPICS Record Reference Manual</a>
 </p>

@ -104,13 +104,8 @@ This marks text you typically type in configuration files etc.
 <pre>
 Longer code segments are often set in a box.
 </pre>
-<p>
-Important modifications and new features are
-<span class="new">highlighted with a yellow background</span>.
-Obsolete features are <strike class="new">highlighted and crossed out</strike>.
-</p>
 <hr>
 <p align="right"><a href="setup.html">Next: Setup</a></p>
-<p><small>Dirk Zimoch, 2011</small></p>
+<p><small>Dirk Zimoch, 2015</small></p>
 </body>
 </html>
--- a/doc/longin.html
+++ b/doc/longin.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: longin Records</h1>
+<h1>longin Records</h1>

 <h2>Normal Operation</h2>
 <p>
--- a/doc/longout.html
+++ b/doc/longout.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: longout Records</h1>
+<h1>longout Records</h1>

 <h2>Normal Operation</h2>
 <p>
--- a/doc/makepdf
+++ b/doc/makepdf
@ -0,0 +1,35 @@
+PAGES="
+index.html
+setup.html
+epics3_13.html
+protocol.html
+formats.html
+processing.html
+recordtypes.html
+aai.html
+aao.html
+ai.html
+ao.html
+bi.html
+bo.html
+mbbi.html
+mbbo.html
+mbbiDirect.html
+mbboDirect.html
+stringin.html
+stringout.html
+longin.html
+longout.html
+waveform.html
+calcout.html
+scalcout.html
+tipsandtricks.html
+recordinterface.html
+businterface.html
+formatconverter.html
+osinterface.html
+"
+
+rm -f stream.pdf
+wkhtmltopdf --print-media-type --dpi 1200 --zoom 0.85 --page-size Letter \
+$PAGES stream.pdf
--- a/doc/mbbi.html
+++ b/doc/mbbi.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: mbbi Records</h1>
+<h1>mbbi Records</h1>

 <h2>Normal Operation</h2>
 <p>
--- a/doc/mbbiDirect.html
+++ b/doc/mbbiDirect.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: mbbiDirect Records</h1>
+<h1>mbbiDirect Records</h1>

 <h2>Normal Operation</h2>
 <p>
--- a/doc/mbbo.html
+++ b/doc/mbbo.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: mbbo Records</h1>
+<h1>mbbo Records</h1>

 <h2>Normal Operation</h2>
 <p>
--- a/doc/mbboDirect.html
+++ b/doc/mbboDirect.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: mbboDirect Records</h1>
+<h1>mbboDirect Records</h1>

 <h2>Normal Operation</h2>
 <p>
--- a/doc/osinterface.html
+++ b/doc/osinterface.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Operating System API</h1>
+<h1>Operating System API</h1>

 <h2>Sorry, this documentation is still missing.</h2>

--- a/doc/processing.html
+++ b/doc/processing.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Record Processing</h1>
+<h1>Record Processing</h1>

 <a name="proc"></a>
 <h2>1. Normal Processing</h2>
--- a/doc/protocol.html
+++ b/doc/protocol.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Protocol Files</h1>
+<h1>Protocol Files</h1>
 <a name="gen"></a>
 <h2>1. General Information</h2>
 <p>
@ -261,7 +261,7 @@ number in the range of <code>-128</code> to <code>255</code>,
 or <code>-0200</code> to <code>0377</code>, respectively. 
 </p>
 <p>
-<em>StreamDevice</em> also recordgnizes the ASCII symbolic names
+<em>StreamDevice</em> also recognizes the ASCII symbolic names
 (not case sensitive) for several byte codes:<br>
 <code>NUL </code>(= <code>0x00</code>) <em>null</em><br>
 <code>SOH </code>(= <code>0x01</code>) <em>start of heading</em><br>
--- a/doc/recordinterface.html
+++ b/doc/recordinterface.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Record API</h1>
+<h1>Record API</h1>

 <h2>Sorry, this documentation is still missing.</h2>

--- a/doc/recordtypes.html
+++ b/doc/recordtypes.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Record Types</h1>
+<h1>Record Types</h1>

 <h2>Supported Record Types</h2>
 <p>
--- a/doc/scalcout.html
+++ b/doc/scalcout.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: scalcout Records</h1>
+<h1>scalcout Records</h1>

 <p>
 <b>Note:</b> The scalcout record is part of the <i>calc</i> module of
--- a/doc/setup.html
+++ b/doc/setup.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Setup</h1>
+<h1>Setup</h1>

 <a name="pre"></a>
 <h2>1. Prerequisites</h2>
--- a/doc/stream.css
+++ b/doc/stream.css
@ -5,8 +5,9 @@ a:hover   {color: #FF0000;}
 body {
    margin-right:1em;
    margin-left:15em;
-    margin-top:11ex;
-    font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
+    margin-top:70px;
+    padding-top:1px;
+    font-family: Helvetica, Arial, sans-serif;
    font-size:14px;
    background-color:#ffffff;
 }
@ -30,26 +31,26 @@ dt {
 }

 h1 {
-    font-size:225%;
+    font-size:250%;
    margin-top:0;
    font-style:italic;
-    font-family:serif;
+    font-weight:bold;
+    font-family:"Times New Roman", serif;
    text-align:center;
    position:fixed;
    top:0;
    left:0;
    width:100%;
-    min-height:60px;
-    height: 4ex;
    line-height:190%;
    background-color:white;
-    border-top:6px solid #1b4486;
-    border-bottom:4px solid #1b4486;
+    border-width:0;
+    border-bottom:3px solid #1b4486;
    white-space:nowrap;
-    background-image:url(PSI.gif);
+    background-image:url(PSI.png);
    background-repeat:no-repeat;
-    background-position:10px 2px;
-    text-shadow: .1em .1em .1em lightgray;           
+    background-position:10px 5px;
+    text-shadow:.1em .1em .1em darkgray;
+    box-shadow:0 .3em .1em -.2em darkgray;
 }

 h2 {
@ -91,7 +92,7 @@ code {
    position:fixed;
    left:0;
    top:0;
-    padding-top:9ex;
+    padding-top:70px;
    width:14em;
    height:100%;
    border-style:solid;
@ -115,13 +116,9 @@ a[target=ex]:hover:after {
 }

@media print {
-  a:link    {color: black; text-decoration:none;}
-  a:visited {color: black; text-decoration:none;}
-  a:hover   {color: black; text-decoration:none;}
-  a[target=ex] {text-decoration:underline;}
+  a:link    {text-decoration:none;}
  a[target=ex]:after {content:" [" attr(href) "]";}
-  code      {color: black; }
-  body      {margin-left:10px;}
-  h1        {position:absolute;}
+  body      {margin:0 4em;}
+  h1        {position:relative; background-position:0 0;}
  #navleft  {display:none;}
 }
--- a/doc/stringin.html
+++ b/doc/stringin.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: stringin Records</h1>
+<h1>stringin Records</h1>

 <h2>Normal Operation</h2>
 <p>
--- a/doc/stringout.html
+++ b/doc/stringout.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: stringout Records</h1>
+<h1>stringout Records</h1>

 <h2>Normal Operation</h2>
 <p>
--- a/doc/tipsandtricks.html
+++ b/doc/tipsandtricks.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: Tips and Tricks</h1>
+<h1>Tips and Tricks</h1>

 <a name="argvar"></a>
 <h2>I have many almost identical protocols</h2>
@ -281,7 +281,7 @@ With some more records, you can clean the message record if SEVR is not INVALID.
 <code>
 record (calcout, "$(DEVICE):clean_1") {<br>
 &nbsp;&nbsp;field (INPA, "$(DEVICE):readcurrent.SEVR CP")<br>
-&nbsp;&nbsp;field (CALC, "A!=2")<br>
+&nbsp;&nbsp;field (CALC, "A#3")<br>
 &nbsp;&nbsp;field (OOPT, "When Non-zero")<br>
 &nbsp;&nbsp;field (OUT,  "$(DEVICE):clean_2.PROC")<br>
 }<br>
--- a/doc/waveform.html
+++ b/doc/waveform.html
@ -10,7 +10,7 @@
 </head>
 <body>
 <iframe src="nav.html" id="navleft"></iframe>
-<h1>StreamDevice: waveform Records</h1>
+<h1>waveform Records</h1>

 <h2>Normal Operation</h2>
 <p>
--- a/src/AsynDriverInterface.cc
+++ b/src/AsynDriverInterface.cc
@ -22,14 +22,14 @@
 #include "StreamError.h"
 #include "StreamBuffer.h"

-#ifdef EPICS_3_14
-#include <epicsAssert.h>
-#include <epicsTime.h>
-#include <epicsTimer.h>
-#else
+#ifdef EPICS_3_13
 #include <assert.h>
 #include <wdLib.h>
 #include <sysLib.h>
+#else
+#include <epicsAssert.h>
+#include <epicsTime.h>
+#include <epicsTimer.h>
 extern "C" {
 #include <callback.h>
 }
@ -126,7 +126,7 @@ static const char* ioActionStr[] = {
 };

 static const char* asynStatusStr[] = {
-    "asynSuccess", "asynTimeout", "asynOverflow", "asynError"
+    "asynSuccess", "asynTimeout", "asynOverflow", "asynError", "asynDisconnected", "asynDisabled"
 };

 static const char* eomReasonStr[] = {
@ -134,7 +134,7 @@ static const char* eomReasonStr[] = {
 };

 class AsynDriverInterface : StreamBusInterface
-#ifdef EPICS_3_14
+#ifndef EPICS_3_13
 , epicsTimerNotify
 #endif
 {
@ -164,12 +164,12 @@ class AsynDriverInterface : StreamBusInterface
    const char* outputBuffer;
    size_t outputSize;
    int peeksize;
-#ifdef EPICS_3_14
-    epicsTimerQueueActive* timerQueue;
-    epicsTimer* timer;
-#else
+#ifdef EPICS_3_13
    WDOG_ID timer;
    CALLBACK timeoutCallback;
+#else
+    epicsTimerQueueActive* timerQueue;
+    epicsTimer* timer;
 #endif

    AsynDriverInterface(Client* client);
@ -189,16 +189,16 @@ class AsynDriverInterface : StreamBusInterface
    bool disconnectRequest();
    void finish();

-#ifdef EPICS_3_14
+#ifdef EPICS_3_13
+    static void expire(CALLBACK *pcallback);
+#else
    // epicsTimerNotify methods
    epicsTimerNotify::expireStatus expire(const epicsTime &);
-#else
-    static void expire(CALLBACK *pcallback);
 #endif

    // local methods
    void timerExpired();
-    bool connectToBus(const char* busname, int addr);
+    bool connectToBus(const char* portname, int addr);
    void lockHandler();
    void writeHandler();
    void readHandler();
@ -211,20 +211,22 @@ class AsynDriverInterface : StreamBusInterface
            (StreamBusInterface::priority());
    }
    void startTimer(double timeout) {
-#ifdef EPICS_3_14
-        timer->start(*this, timeout);
-#else
+#ifdef EPICS_3_13
        callbackSetPriority(priority(), &timeoutCallback);
        wdStart(timer, (int)((timeout+1)*sysClkRateGet())-1,
            reinterpret_cast<FUNCPTR>(callbackRequest),
            reinterpret_cast<int>(&timeoutCallback));
+#else
+        timer->start(*this, timeout
+            +epicsThreadSleepQuantum()*0.5
+        );
 #endif
    }
    void cancelTimer() {
-#ifdef EPICS_3_14
-        timer->cancel();
-#else
+#ifdef EPICS_3_13
        wdCancel(timer);
+#else
+        timer->cancel();
 #endif
    }

@ -240,7 +242,7 @@ class AsynDriverInterface : StreamBusInterface
 public:
    // static creator method
    static StreamBusInterface* getBusInterface(Client* client,
-        const char* busname, int addr, const char* param);
+        const char* portname, int addr, const char* param);
 };

 RegisterStreamBusInterface(AsynDriverInterface);
@ -248,6 +250,7 @@ RegisterStreamBusInterface(AsynDriverInterface);
 AsynDriverInterface::
 AsynDriverInterface(Client* client) : StreamBusInterface(client)
 {
+    debug ("AsynDriverInterface(%s)\n", client->name());
    pasynCommon = NULL;
    pasynOctet = NULL;
    intrPvtOctet = NULL;
@ -259,20 +262,25 @@ AsynDriverInterface(Client* client) : StreamBusInterface(client)
    eventMask = 0;
    receivedEvent = 0;
    peeksize = 1;
+    debug ("AsynDriverInterface(%s) createAsynUser\n", client->name());
    pasynUser = pasynManager->createAsynUser(handleRequest,
        handleTimeout);
    assert(pasynUser);
    pasynUser->userPvt = this;
-#ifdef EPICS_3_14
-    timerQueue = &epicsTimerQueueActive::allocate(true);
-    assert(timerQueue);
-    timer = &timerQueue->createTimer();
-    assert(timer);
-#else
+#ifdef EPICS_3_13
+    debug ("AsynDriverInterface(%s) wdCreate()\n", client->name());
    timer = wdCreate();
    callbackSetCallback(expire, &timeoutCallback);
    callbackSetUser(this, &timeoutCallback);
+#else
+    debug ("AsynDriverInterface(%s) epicsTimerQueueActive::allocate(true)\n", client->name());
+    timerQueue = &epicsTimerQueueActive::allocate(true);
+    assert(timerQueue);
+    debug ("AsynDriverInterface(%s) timerQueue->createTimer()\n", client->name());
+    timer = &timerQueue->createTimer();
+    assert(timer);
 #endif
+    debug ("AsynDriverInterface(%s) done\n", client->name());
 }

 AsynDriverInterface::
@ -306,11 +314,11 @@ AsynDriverInterface::
    }
    // Now, no handler is running any more and none will start.

-#ifdef EPICS_3_14
+#ifdef EPICS_3_13
+    wdDelete(timer);
+#else
    timer->destroy();
    timerQueue->release();
-#else
-    wdDelete(timer);
 #endif
    pasynManager->disconnect(pasynUser);
    pasynManager->freeAsynUser(pasynUser);
@ -318,17 +326,19 @@ AsynDriverInterface::
 }

 // interface function getBusInterface():
-// do we have this bus/addr ?
+// do we have this port/addr ?
 StreamBusInterface* AsynDriverInterface::
 getBusInterface(Client* client,
-    const char* busname, int addr, const char*)
+    const char* portname, int addr, const char*)
 {
+    debug ("AsynDriverInterface::getBusInterface(%s, %s, %d)\n",
+        client->name(), portname, addr);
    AsynDriverInterface* interface = new AsynDriverInterface(client);
-    if (interface->connectToBus(busname, addr))
+    if (interface->connectToBus(portname, addr))
    {
        debug ("AsynDriverInterface::getBusInterface(%s, %d): "
-            "new Interface allocated\n",
-            busname, addr);
+            "new interface allocated\n",
+            portname, addr);
        return interface;
    }
    delete interface;
@ -340,7 +350,66 @@ getBusInterface(Client* client,
 bool AsynDriverInterface::
 supportsEvent()
 {
-    return (pasynInt32 != NULL) || (pasynUInt32 != NULL);
+    if (intrPvtInt32 || intrPvtUInt32) return true;
+
+    // look for interfaces for events
+    asynInterface* pasynInterface;
+
+    pasynInterface = pasynManager->findInterface(pasynUser,
+        asynInt32Type, true);
+    if (pasynInterface)
+    {
+        pasynInt32 = static_cast<asynInt32*>(pasynInterface->pinterface);
+        pvtInt32 = pasynInterface->drvPvt;
+        pasynUser->reason = ASYN_REASON_SIGNAL; // required for GPIB
+        if (pasynInt32->registerInterruptUser(pvtInt32, pasynUser,
+            intrCallbackInt32, this, &intrPvtInt32) == asynSuccess)
+        {
+            printf ("%s: AsynDriverInterface::supportsEvent: "
+                "pasynInt32->registerInterruptUser(%p, %p, %p, %p, %p)\n",
+                clientName(), pvtInt32, pasynUser,
+                intrCallbackInt32, this, &intrPvtInt32);
+            return true;
+        }
+        const char *portname;
+        pasynManager->getPortName(pasynUser, &portname);
+        error("%s: port %s does not allow to register for "
+            "Int32 interrupts: %s\n",
+            clientName(), portname, pasynUser->errorMessage);
+        pasynInt32 = NULL;
+        intrPvtInt32 = NULL;
+    }
+
+    // no asynInt32 available, thus try asynUInt32
+    pasynInterface = pasynManager->findInterface(pasynUser,
+        asynUInt32DigitalType, true);
+    if (pasynInterface)
+    {
+        pasynUInt32 =
+            static_cast<asynUInt32Digital*>(pasynInterface->pinterface);
+        pvtUInt32 = pasynInterface->drvPvt;
+        pasynUser->reason = ASYN_REASON_SIGNAL;
+        if (pasynUInt32->registerInterruptUser(pvtUInt32,
+            pasynUser, intrCallbackUInt32, this, 0xFFFFFFFF,
+            &intrPvtUInt32) == asynSuccess)
+        {
+            printf ("%s: AsynDriverInterface::supportsEvent: "
+                "pasynUInt32->registerInterruptUser(%p, %p, %p, %p, %#X, %p)\n",
+                clientName(), pvtUInt32, pasynUser,
+                intrCallbackUInt32, this, 0xFFFFFFFF, &intrPvtInt32);
+            return true;
+        }
+        const char *portname;
+        pasynManager->getPortName(pasynUser, &portname);
+        error("%s: port %s does not allow to register for "
+            "UInt32 interrupts: %s\n",
+            clientName(), portname, pasynUser->errorMessage);
+        pasynUInt32 = NULL;
+        intrPvtUInt32 = NULL;
+    }
+
+    // no event interface available
+    return false;
 }

 bool AsynDriverInterface::
@ -352,20 +421,32 @@ supportsAsyncRead()
    if (pasynOctet->registerInterruptUser(pvtOctet, pasynUser,
        intrCallbackOctet, this, &intrPvtOctet) != asynSuccess)
    {
-        error("%s: bus does not support asynchronous input: %s\n",
-            clientName(), pasynUser->errorMessage);
+        const char *portname;
+        int addr;
+        pasynManager->getPortName(pasynUser, &portname);
+        pasynManager->getAddr(pasynUser, &addr);
+        if (addr >= 0)
+            error("%s: asyn port %s addr %d does not support asynchronous input: %s\n",
+                clientName(), portname, addr, pasynUser->errorMessage);
+        else
+            error("%s: asyn port %s does not support asynchronous input: %s\n",
+                clientName(), portname, pasynUser->errorMessage);
        return false;
    }
    return true;
 }

 bool AsynDriverInterface::
-connectToBus(const char* busname, int addr)
+connectToBus(const char* portname, int addr)
 {
-    if (pasynManager->connectDevice(pasynUser, busname, addr) !=
-        asynSuccess)
+    asynStatus status = pasynManager->connectDevice(pasynUser, portname, addr);
+    debug("%s: AsynDriverInterface::connectToBus(%s, %d): "
+        "pasynManager->connectDevice(%p, %s, %d) = %s\n",
+        clientName(), portname, addr,  pasynUser,portname, addr,
+            asynStatusStr[status]);    
+    if (status != asynSuccess)
    {
-        // asynDriver does not know this busname/address
+        // asynDriver does not know this portname/address
        return false;
    }

@ -374,10 +455,10 @@ connectToBus(const char* busname, int addr)
    // find the asynCommon interface
    pasynInterface = pasynManager->findInterface(pasynUser,
        asynCommonType, true);
-    if(!pasynInterface)
+    if (!pasynInterface)
    {
-        error("%s: bus %s does not support asynCommon interface\n",
-            clientName(), busname);
+        error("%s: asyn port %s does not support asynCommon interface\n",
+            clientName(), portname);
        return false;
    }
    pasynCommon = static_cast<asynCommon*>(pasynInterface->pinterface);
@ -386,10 +467,10 @@ connectToBus(const char* busname, int addr)
    // find the asynOctet interface
    pasynInterface = pasynManager->findInterface(pasynUser,
        asynOctetType, true);
-    if(!pasynInterface)
+    if (!pasynInterface)
    {
-        error("%s: bus %s does not support asynOctet interface\n",
-            clientName(), busname);
+        error("%s: asyn port %s does not support asynOctet interface\n",
+            clientName(), portname);
        return false;
    }
    pasynOctet = static_cast<asynOctet*>(pasynInterface->pinterface);
@ -398,7 +479,7 @@ connectToBus(const char* busname, int addr)
    // is it a GPIB interface ?
    pasynInterface = pasynManager->findInterface(pasynUser,
        asynGpibType, true);
-    if(pasynInterface)
+    if (pasynInterface)
    {
        pasynGpib = static_cast<asynGpib*>(pasynInterface->pinterface);
        pvtGpib = pasynInterface->drvPvt;
@ -406,50 +487,6 @@ connectToBus(const char* busname, int addr)
        // (read only one byte first).
        peeksize = inputBuffer.capacity();
    }
-
-    // look for interfaces for events
-    pasynInterface = pasynManager->findInterface(pasynUser,
-        asynInt32Type, true);
-    if(pasynInterface)
-    {
-        pasynInt32 = static_cast<asynInt32*>(pasynInterface->pinterface);
-        pvtInt32 = pasynInterface->drvPvt;
-        pasynUser->reason = ASYN_REASON_SIGNAL; // required for GPIB
-        if (pasynInt32->registerInterruptUser(pvtInt32, pasynUser,
-            intrCallbackInt32, this, &intrPvtInt32) == asynSuccess)
-        {
-            return true;
-        }
-        error("%s: bus %s does not allow to register for "
-            "Int32 interrupts: %s\n",
-            clientName(), busname, pasynUser->errorMessage);
-        pasynInt32 = NULL;
-        intrPvtInt32 = NULL;
-    }
-
-    // no asynInt32 available, thus try asynUInt32
-    pasynInterface = pasynManager->findInterface(pasynUser,
-        asynUInt32DigitalType, true);
-    if(pasynInterface)
-    {
-        pasynUInt32 =
-            static_cast<asynUInt32Digital*>(pasynInterface->pinterface);
-        pvtUInt32 = pasynInterface->drvPvt;
-        pasynUser->reason = ASYN_REASON_SIGNAL;
-        if (pasynUInt32->registerInterruptUser(pvtUInt32,
-            pasynUser, intrCallbackUInt32, this, 0xFFFFFFFF,
-            &intrPvtUInt32) == asynSuccess)
-        {
-            return true;
-        }
-        error("%s: bus %s does not allow to register for "
-            "UInt32 interrupts: %s\n",
-            clientName(), busname, pasynUser->errorMessage);
-        pasynUInt32 = NULL;
-        intrPvtUInt32 = NULL;
-    }
-
-    // no event interface available, never mind
    return true;
 }

@ -458,23 +495,14 @@ connectToBus(const char* busname, int addr)
 bool AsynDriverInterface::
 lockRequest(unsigned long lockTimeout_ms)
 {
-    int connected;
    asynStatus status;
    
    debug("AsynDriverInterface::lockRequest(%s, %ld msec)\n",
        clientName(), lockTimeout_ms);
    lockTimeout = lockTimeout_ms ? lockTimeout_ms*0.001 : -1.0;
    ioAction = Lock;
-    status = pasynManager->isConnected(pasynUser, &connected);
-    if (status != asynSuccess)
-    {
-        error("%s: pasynManager->isConnected() failed: %s\n",
-            clientName(), pasynUser->errorMessage);
-        return false;
-    }
    status = pasynManager->queueRequest(pasynUser,
-        connected ? priority() : asynQueuePriorityConnect,
-        lockTimeout);
+        priority(), lockTimeout);
    if (status != asynSuccess)
    {
        error("%s lockRequest: pasynManager->queueRequest() failed: %s\n",
@ -496,9 +524,13 @@ connectToAsynPort()
    debug("AsynDriverInterface::connectToAsynPort(%s)\n",
        clientName());
    status = pasynManager->isConnected(pasynUser, &connected);
+    debug("%s: AsynDriverInterface::connectToAsynPort: "
+        "pasynManager->isConnected(%p, %p) = %s => %s\n",
+        clientName(), pasynUser, &connected, asynStatusStr[status],
+            connected ? "yes" : "no");
    if (status != asynSuccess)
    {
-        error("%s: pasynManager->isConnected() failed: %s\n",
+        error("%s connectToAsynPort: pasynManager->isConnected() failed: %s\n",
            clientName(), pasynUser->errorMessage);
        return false;
    }
@ -516,7 +548,7 @@ connectToAsynPort()
        status = pasynOctet->read(pvtOctet, pasynUser,
            buffer, 0, &received, &eomReason);
        debug("AsynDriverInterface::connectToAsynPort(%s): "
-            "read(..., 0, ...) [timeout=%f seconds] = %s\n",
+            "read(..., 0, ...) [timeout=%g sec] = %s\n",
            clientName(), pasynUser->timeout,
            asynStatusStr[status]);
        pasynManager->isConnected(pasynUser, &connected);
@ -530,13 +562,19 @@ connectToAsynPort()
        clientName(), connected ? "already" : "not yet");
    if (!connected)
    {
+        printf ("%s: AsynDriverInterface::connectToAsynPort: "
+            "pasynCommon->connect(%p, %p)\n",
+            clientName(), pvtCommon, pasynUser);
        status = pasynCommon->connect(pvtCommon, pasynUser);
+        printf ("%s: AsynDriverInterface::connectToAsynPort: "
+            "pasynCommon->connect(%p, %p) = %s\n",
+            clientName(), pvtCommon, pasynUser, asynStatusStr[status]);
        debug("AsynDriverInterface::connectToAsynPort(%s): "
                "status=%s\n",
            clientName(), asynStatusStr[status]);
        if (status != asynSuccess)
        {
-            error("%s: pasynCommon->connect() failed: %s\n",
+            error("%s connectToAsynPort: pasynCommon->connect() failed: %s\n",
                clientName(), pasynUser->errorMessage);
            return false;
        }
@ -554,21 +592,37 @@ connectToAsynPort()
 void AsynDriverInterface::
 lockHandler()
 {
-    int connected;
+    asynStatus status;
+
    debug("AsynDriverInterface::lockHandler(%s)\n",
        clientName());
-    pasynManager->blockProcessCallback(pasynUser, false);
-    connected = connectToAsynPort();
-    lockCallback(connected ? StreamIoSuccess : StreamIoFault);
+
+    status = pasynManager->blockProcessCallback(pasynUser, false);
+    if (status != asynSuccess)
+    {
+        error("%s lockHandler: pasynManager->blockProcessCallback() failed: %s\n",
+            clientName(), pasynUser->errorMessage);
+        lockCallback(StreamIoFault);
+        return;
+    }
+    lockCallback(StreamIoSuccess);
 }

 // interface function: we don't need exclusive access any more
 bool AsynDriverInterface::
 unlock()
 {
+    asynStatus status;
+
    debug("AsynDriverInterface::unlock(%s)\n",
        clientName());
-    pasynManager->unblockProcessCallback(pasynUser, false);
+    status = pasynManager->unblockProcessCallback(pasynUser, false);
+    if (status != asynSuccess)
+    {
+        error("%s unlock: pasynManager->unblockProcessCallback() failed: %s\n",
+            clientName(), pasynUser->errorMessage);
+        return false;
+    }
    return true;
 }

@ -610,19 +664,39 @@ writeHandler()
        clientName());
    asynStatus status;
    size_t written = 0;
-    pasynUser->timeout = writeTimeout;

-    // discard any early input or early events
-    status = pasynOctet->flush(pvtOctet, pasynUser);
-    receivedEvent = 0;
-
-    if (status != asynSuccess)
+    pasynUser->timeout = 0;
+    if (!pasynGpib)
+    // discard any early input, but forward it to potential async records
+    // thus do not use pasynOctet->flush()
+    // unfortunately we cannot do this with GPIB because addressing a device as talker
+    // when it has nothing to say is an error. Also timeout=0 does not help here (would need
+    // a change in asynGPIB), thus use flush() for GPIB.
+    do {
+        char buffer [256];
+        size_t received = 0;
+        int eomReason = 0;
+        debug("AsynDriverInterface::writeHandler(%s): reading old input\n",
+            clientName());
+        status = pasynOctet->read(pvtOctet, pasynUser,
+            buffer, sizeof(buffer), &received, &eomReason);
+        if (status == asynError || received == 0) break;
+#ifndef NO_TEMPORARY
+        if (received) debug("AsynDriverInterface::writeHandler(%s): flushing %ld bytes: \"%s\"\n",
+            clientName(), (long)received, StreamBuffer(buffer, received).expand()());
+#endif
+    } while (status == asynSuccess);
+    else
    {
-        error("%s: pasynOctet->flush() failed: %s\n",
-                clientName(), pasynUser->errorMessage);
-        writeCallback(StreamIoFault);
-        return;
+        debug("AsynDriverInterface::writeHandler(%s): flushing old input\n",
+            clientName());
+         pasynOctet->flush(pvtOctet, pasynUser);
    }
+        
+    // discard any early events
+    receivedEvent = 0;
+    
+    pasynUser->timeout = writeTimeout;
    
    // has stream already added a terminator or should
    // asyn do so?
@ -648,10 +722,16 @@ writeHandler()
        outputBuffer, outputSize, &written);
    debug("AsynDriverInterface::writeHandler(%s): "
        "write(..., outputSize=%ld, written=%ld) "
-        "[timeout=%f seconds] = %s\n",
+        "[timeout=%g sec] = %s\n",
        clientName(), (long)outputSize,  (long)written,
        pasynUser->timeout, asynStatusStr[status]);

+    if (oldeoslen >= 0) // restore asyn terminator
+    {
+        pasynOctet->setOutputEos(pvtOctet, pasynUser,
+            oldeos, oldeoslen);
+    }
+    
    // Up to asyn 4.17 I can't see when the server has disconnected. Why?
    int connected;
    pasynManager->isConnected(pasynUser, &connected);
@ -659,17 +739,12 @@ writeHandler()
        "device is %sconnected\n",
        clientName(),connected?"":"dis");
    if (!connected) {
-        error("%s: connection closed in write\n",
+        error("%s: write failed because connection was closed by device\n",
            clientName());
        writeCallback(StreamIoFault);
        return;
    }

-    if (oldeoslen >= 0) // restore asyn terminator
-    {
-        pasynOctet->setOutputEos(pvtOctet, pasynUser,
-            oldeos, oldeoslen);
-    }
    switch (status)
    {
        case asynSuccess:
@ -694,32 +769,34 @@ writeHandler()
            writeCallback(StreamIoSuccess);
            return;
        case asynTimeout:
+            error("%s: asynTimeout (%g sec) in write. Asyn says: %s\n",
+                clientName(), pasynUser->timeout, pasynUser->errorMessage);
            writeCallback(StreamIoTimeout);
            return;
        case asynOverflow:
-            error("%s: asynOverflow in write: %s\n",
+            error("%s: asynOverflow in write. Asyn driver says: %s\n",
                clientName(), pasynUser->errorMessage);
            writeCallback(StreamIoFault);
            return;
        case asynError:
-            error("%s: asynError in write: %s\n",
+            error("%s: asynError in write. Asyn driver says: %s\n",
                clientName(), pasynUser->errorMessage);
            writeCallback(StreamIoFault);
            return;
 #ifdef ASYN_VERSION // asyn >= 4.14
        case asynDisconnected:
-            error("%s: asynDisconnected in write: %s\n",
+            error("%s: asynDisconnected in write. Asyn driver says: %s\n",
                clientName(), pasynUser->errorMessage);
            writeCallback(StreamIoFault);
            return;
        case asynDisabled:
-            error("%s: asynDisconnected in write: %s\n",
+            error("%s: asynDisconnected in write. Asyn driver says: %s\n",
                clientName(), pasynUser->errorMessage);
            writeCallback(StreamIoFault);
            return;
 #endif
        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);
            writeCallback(StreamIoFault);
            return;
@ -732,7 +809,7 @@ readRequest(unsigned long replyTimeout_ms, unsigned long readTimeout_ms,
    long _expectedLength, bool async)
 {
    debug("AsynDriverInterface::readRequest(%s, %ld msec reply, "
-        "%ld msec read, expect %ld bytes, asyn=%s)\n",
+        "%ld msec read, expect %ld bytes, async=%s)\n",
        clientName(), replyTimeout_ms, readTimeout_ms,
        _expectedLength, async?"yes":"no");
        
@ -754,12 +831,22 @@ readRequest(unsigned long replyTimeout_ms, unsigned long readTimeout_ms,
        ioAction = Read;
        queueTimeout = replyTimeout;
    }
-    debug("AsynDriverInterface::readRequest %s:  queueRequest(..., priority=%d, queueTimeout=%f)\n",
-        clientName(), priority(), queueTimeout);
    status = pasynManager->queueRequest(pasynUser,
        priority(), queueTimeout);
-    if (status != asynSuccess && !async)
+    debug("AsynDriverInterface::readRequest %s: "
+        "queueRequest(..., priority=%d, queueTimeout=%g sec) = %s [async=%s] %s\n",
+        clientName(), priority(), queueTimeout,
+        asynStatusStr[status], async? "true" : "false",
+        status!=asynSuccess ? pasynUser->errorMessage : "");
+    if (status != asynSuccess)
    {
+        // Not queued for some reason (e.g. disconnected / already queued)
+        if (async)
+        {
+            // silently try again later
+            startTimer(replyTimeout);
+            return true;
+        }
        error("%s readRequest: pasynManager->queueRequest() failed: %s\n",
            clientName(), pasynUser->errorMessage);
        return false;
@ -867,7 +954,7 @@ readHandler()
        
        debug("AsynDriverInterface::readHandler(%s): ioAction=%s "
            "read(..., bytesToRead=%ld, ...) "
-            "[timeout=%f seconds]\n",
+            "[timeout=%g sec]\n",
            clientName(), ioActionStr[ioAction],
            bytesToRead, pasynUser->timeout);
        status = pasynOctet->read(pvtOctet, pasynUser,
@ -961,6 +1048,9 @@ readHandler()
                    // reply timeout
                    if (ioAction == AsyncRead)
                    {
+                        debug("AsynDriverInterface::readHandler(%s): "
+                            "no async input, retry in in %g seconds\n",
+                            clientName(), replyTimeout);
                        // start next poll after timer expires
                        if (replyTimeout != 0.0) startTimer(replyTimeout);
                        // continues with:
@ -977,7 +1067,7 @@ readHandler()
                // read timeout
 #ifndef NO_TEMPORARY
                debug("AsynDriverInterface::readHandler(%s): "
-                        "ioAction=%s, timeout [%f seconds] "
+                        "ioAction=%s, timeout [%g sec] "
                        "after %ld of %ld bytes \"%s\"\n",
                    clientName(), ioActionStr[ioAction], pasynUser->timeout,
                    (long)received, bytesToRead,
@ -1004,29 +1094,29 @@ readHandler()
                }
                peeksize = inputBuffer.capacity();
                // 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);
                readCallback(StreamIoFault, buffer, received);
                break;
            case asynError:
-                error("%s: asynError in read: %s\n",
+                error("%s: asynError in read. Asyn driver says: %s\n",
                    clientName(), pasynUser->errorMessage);
                readCallback(StreamIoFault, buffer, received);
                break;
 #ifdef ASYN_VERSION // asyn >= 4.14
            case asynDisconnected:
-                error("%s: asynDisconnected in read: %s\n",
+                error("%s: asynDisconnected in read. Asyn driver says: %s\n",
                    clientName(), pasynUser->errorMessage);
                readCallback(StreamIoFault);
                return;
            case asynDisabled:
-                error("%s: asynDisconnected in read: %s\n",
+                error("%s: asynDisconnected in read. Asyn driver says: %s\n",
                    clientName(), pasynUser->errorMessage);
                readCallback(StreamIoFault);
                return;
 #endif
            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);
                readCallback(StreamIoFault);
                return;
@ -1189,7 +1279,7 @@ acceptEvent(unsigned long mask, unsigned long replytimeout_ms)
    }
    eventMask = mask;
    ioAction = ReceiveEvent;
-    startTimer(replytimeout_ms*0.001);
+    if (replytimeout_ms) startTimer(replytimeout_ms*0.001);
    return true;
 }

@ -1238,6 +1328,9 @@ timerExpired()
    int autoconnect, connected;
    switch (ioAction)
    {
+        case None:
+            // Timeout of async poll crossed with parasitic input
+            return;
        case ReceiveEvent:
            // timeout while waiting for event
            ioAction = None;
@ -1256,6 +1349,8 @@ timerExpired()
            // queueRequest might fail if another request was just queued
            pasynManager->isAutoConnect(pasynUser, &autoconnect);
            pasynManager->isConnected(pasynUser, &connected);
+            debug("%s: polling for I/O Intr: autoconnected: %d, connect: %d\n",
+                clientName(), autoconnect, connected);
            if (autoconnect && !connected)
            {
                // has explicitely been disconnected
@ -1266,8 +1361,14 @@ timerExpired()
            else
            {
                // queue for read poll (no timeout)
-                pasynManager->queueRequest(pasynUser,
+                asynStatus status = pasynManager->queueRequest(pasynUser,
                    asynQueuePriorityLow, -1.0);
+                // if this fails, we are already queued by another thread
+                debug("AsynDriverInterface::timerExpired %s: "
+                    "queueRequest(..., priority=Low, queueTimeout=-1) = %s %s\n",
+                    clientName(), asynStatusStr[status],
+                    status!=asynSuccess ? pasynUser->errorMessage : "");
+                if (status != asynSuccess) startTimer(replyTimeout);
                // continues with:
                //    handleRequest() -> readHandler() -> readCallback()
            }
@ -1279,14 +1380,7 @@ timerExpired()
    }
 }

-#ifdef EPICS_3_14
-epicsTimerNotify::expireStatus AsynDriverInterface::
-expire(const epicsTime &)
-{
-    timerExpired();
-    return noRestart;
-}
-#else
+#ifdef EPICS_3_13
 void AsynDriverInterface::
 expire(CALLBACK *pcallback)
 {
@ -1294,6 +1388,13 @@ expire(CALLBACK *pcallback)
        static_cast<AsynDriverInterface*>(pcallback->user);
    interface->timerExpired();
 }
+#else
+epicsTimerNotify::expireStatus AsynDriverInterface::
+expire(const epicsTime &)
+{
+    timerExpired();
+    return noRestart;
+}
 #endif

 bool AsynDriverInterface::
@ -1392,6 +1493,7 @@ void handleRequest(asynUser* pasynUser)
 {
    AsynDriverInterface* interface =
        static_cast<AsynDriverInterface*>(pasynUser->userPvt);
+    interface->cancelTimer();
    debug("AsynDriverInterface::handleRequest(%s) %s\n",
        interface->clientName(), ioActionStr[interface->ioAction]);
    switch (interface->ioAction)
--- a/src/BCDConverter.cc
+++ b/src/BCDConverter.cc
@ -31,9 +31,9 @@ class BCDConverter : public StreamFormatConverter
 };

 int BCDConverter::
-parse(const StreamFormat&, StreamBuffer&, const char*&, bool)
+parse(const StreamFormat& fmt, StreamBuffer&, const char*&, bool)
 {
-    return long_format;
+    return (fmt.flags & sign_flag) ? signed_format : unsigned_format;
 }

 bool BCDConverter::
--- a/src/BinaryConverter.cc
+++ b/src/BinaryConverter.cc
@ -19,6 +19,7 @@
 ***************************************************************/

 #include <ctype.h>
+#include <limits.h>
 #include "StreamFormatConverter.h"
 #include "StreamError.h"

@ -32,51 +33,59 @@ class BinaryConverter : public StreamFormatConverter
 };

 int BinaryConverter::
-parse(const StreamFormat& format, StreamBuffer& info,
+parse(const StreamFormat& fmt, StreamBuffer& info,
    const char*& source, bool)
 {
-    if (format.conv == 'B')
+    if (fmt.conv == 'b')
    {
-        // user defined characters for %B (next 2 in source)
+        // default characters 0 and 1 for %b
+        info.append("01");
+        return unsigned_format;
+    }
+    
+    // user defined characters for %B (next 2 in source)
+    if (*source)
+    {
+        if (*source == esc) source++;
+        info.append(*source++);
        if (*source)
        {
            if (*source == esc) source++;
            info.append(*source++);
-            if (*source)
-            {
-                if (*source == esc) source++;
-                info.append(*source++);
-                return long_format;
-            }
+            return unsigned_format;
        }
-        error("Missing characters after %%B format conversion\n");
-        return false;
    }
-    // default characters for %b
-    info.append("01");
-    return long_format;
+    error("Missing characters after %%B format conversion\n");
+    return false;
 }

 bool BinaryConverter::
-printLong(const StreamFormat& format, StreamBuffer& output, long value)
+printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
 {
-    int prec = format.prec;
+    int prec = fmt.prec;
    if (prec == -1)
    {
-        // find number of significant bits
-        prec = sizeof (value) * 8;
-        while (prec && (value & (1L << (prec - 1))) == 0) prec--;
+        // Find number of significant bits is nothing is specified.
+        unsigned long x = (unsigned long) value;
+        prec = 32;
+#if (LONG_BIT > 32)
+        if (x > 0xFFFFFFFF)  { prec = 64;  x >>=32; }
+#endif 
+        if (x <= 0x0000FFFF) { prec -= 16; x <<=16; }
+        if (x <= 0x00FFFFFF) { prec -= 8; x <<=8; }
+        if (x <= 0x0FFFFFFF) { prec -= 4; x <<=4; }
+        if (x <= 0x3FFFFFFF) { prec -= 2; x <<=2; }
+        if (x <= 0x7FFFFFFF) { prec -= 1; }
    }
-    if (prec == 0) prec++; // print at least one bit
    int width = prec;
-    if (format.width > width) width = format.width;
-    char zero = format.info[0];
-    char one = format.info[1];
-    char fill = (format.flags & zero_flag) ? zero : ' ';
-    if (format.flags & alt_flag)
+    if (fmt.width > width) width = fmt.width;
+    char zero = fmt.info[0];
+    char one = fmt.info[1];
+    char fill = (fmt.flags & zero_flag) ? zero : ' ';
+    if (fmt.flags & alt_flag)
    {
        // little endian (least significant bit first)
-        if (!(format.flags & left_flag))
+        if (!(fmt.flags & left_flag))
        {
            // pad left
            while (width > prec)
@ -100,7 +109,7 @@ printLong(const StreamFormat& format, StreamBuffer& output, long value)
    else
    {
        // big endian (most significant bit first)
-        if (!(format.flags & left_flag))
+        if (!(fmt.flags & left_flag))
        {
            // pad left
            while (width > prec)
@ -124,18 +133,18 @@ printLong(const StreamFormat& format, StreamBuffer& output, long value)
 }

 int BinaryConverter::
-scanLong(const StreamFormat& format, const char* input, long& value)
+scanLong(const StreamFormat& fmt, const char* input, long& value)
 {
    long val = 0;
-    int width = format.width;
+    int width = fmt.width;
    if (width == 0) width = -1;
    int length = 0;
-    char zero = format.info[0];
-    char one = format.info[1];
+    char zero = fmt.info[0];
+    char one = fmt.info[1];
    if (!isspace(zero) && !isspace(one))
        while (isspace(input[length])) length++; // skip whitespaces
    if (input[length] != zero && input[length] != one) return -1;
-    if (format.flags & alt_flag)
+    if (fmt.flags & alt_flag)
    {
        // little endian (least significan bit first)
        long mask = 1;
--- a/src/ChecksumConverter.cc
+++ b/src/ChecksumConverter.cc
@ -22,17 +22,26 @@
 #include "StreamError.h"
 #if defined(__vxworks) || defined(vxWorks) || defined(_WIN32) || defined(__rtems__)
 // These systems have no strncasecmp
+#include <epicsVersion.h>
+#ifdef BASE_VERSION
+// 3.13
+#include <ctype.h>
+static int strncasecmp(const char *s1, const char *s2, size_t n)
+{
+    int r=0;
+    while (n && (r = toupper(*s1)-toupper(*s2)) == 0) { n--; s1++; s2++; };
+    return r;
+}
+#else
 #include <epicsString.h>
 #define strncasecmp epicsStrnCaseCmp
 #endif
+#endif
 #include <ctype.h>

-typedef unsigned long ulong;
-typedef unsigned char uchar;
+typedef unsigned int (*checksumFunc)(const unsigned char* data, unsigned int len,  unsigned int init);

-typedef ulong (*checksumFunc)(const uchar* data, ulong len, ulong init);
-
-static ulong sum(const uchar* data, ulong len, ulong sum)
+static unsigned int sum(const unsigned char* data, unsigned int len, unsigned int sum)
 {
    while (len--)
    {
@ -41,7 +50,7 @@ static ulong sum(const uchar* data, ulong len, ulong sum)
    return sum;
 }

-static ulong xor8(const uchar* data, ulong len, ulong sum)
+static unsigned int xor8(const unsigned char* data, unsigned int len, unsigned int sum)
 {
    while (len--)
    {
@ -50,15 +59,15 @@ static ulong xor8(const uchar* data, ulong len, ulong sum)
    return sum;
 }

-static ulong xor7(const uchar* data, ulong len, ulong sum)
+static unsigned int xor7(const unsigned char* data, unsigned int len, unsigned int sum)
 {
    return xor8(data, len, sum) & 0x7F;
 }

-static ulong crc_0x07(const uchar* data, ulong len, ulong crc)
+static unsigned int crc_0x07(const unsigned char* data, unsigned int len, unsigned int crc)
 {
    // x^8 + x^2 + x^1 + x^0 (0x07)
-    const static uchar table[256] = {
+    const static unsigned char table[256] = {
        0x00, 0x07, 0x0E, 0x09, 0x1C, 0x1B, 0x12, 0x15,
        0x38, 0x3F, 0x36, 0x31, 0x24, 0x23, 0x2A, 0x2D,
        0x70, 0x77, 0x7E, 0x79, 0x6C, 0x6B, 0x62, 0x65,
@ -96,10 +105,10 @@ static ulong crc_0x07(const uchar* data, ulong len, ulong crc)
    return crc;
 }

-static ulong crc_0x31(const uchar* data, ulong len, ulong crc)
+static unsigned int crc_0x31(const unsigned char* data, unsigned int len, unsigned int crc)
 {
    // x^8 + x^5 + x^4 + x^0 (0x31)
-    const static uchar table[256] = {
+    const static unsigned char table[256] = {
        0x00, 0x5e, 0xbc, 0xe2, 0x61, 0x3f, 0xdd, 0x83,
        0xc2, 0x9c, 0x7e, 0x20, 0xa3, 0xfd, 0x1f, 0x41,
        0x9d, 0xc3, 0x21, 0x7f, 0xfc, 0xa2, 0x40, 0x1e,
@ -137,90 +146,90 @@ static ulong crc_0x31(const uchar* data, ulong len, ulong crc)
    return crc;
 }

-static ulong crc_0x8005(const uchar* data, ulong len, ulong crc)
+static unsigned int crc_0x8005(const unsigned char* data, unsigned int len, unsigned int crc)
 {
    // x^16 + x^15 + x^2 + x^0  (0x8005)
    const static unsigned short table[256] = {
-        0x0000,0x8005,0x800f,0x000a,0x801b,0x001e,0x0014,0x8011,
-        0x8033,0x0036,0x003c,0x8039,0x0028,0x802d,0x8027,0x0022,
-        0x8063,0x0066,0x006c,0x8069,0x0078,0x807d,0x8077,0x0072,
-        0x0050,0x8055,0x805f,0x005a,0x804b,0x004e,0x0044,0x8041,
-        0x80c3,0x00c6,0x00cc,0x80c9,0x00d8,0x80dd,0x80d7,0x00d2,
-        0x00f0,0x80f5,0x80ff,0x00fa,0x80eb,0x00ee,0x00e4,0x80e1,
-        0x00a0,0x80a5,0x80af,0x00aa,0x80bb,0x00be,0x00b4,0x80b1,
-        0x8093,0x0096,0x009c,0x8099,0x0088,0x808d,0x8087,0x0082,
-        0x8183,0x0186,0x018c,0x8189,0x0198,0x819d,0x8197,0x0192,
-        0x01b0,0x81b5,0x81bf,0x01ba,0x81ab,0x01ae,0x01a4,0x81a1,
-        0x01e0,0x81e5,0x81ef,0x01ea,0x81fb,0x01fe,0x01f4,0x81f1,
-        0x81d3,0x01d6,0x01dc,0x81d9,0x01c8,0x81cd,0x81c7,0x01c2,
-        0x0140,0x8145,0x814f,0x014a,0x815b,0x015e,0x0154,0x8151,
-        0x8173,0x0176,0x017c,0x8179,0x0168,0x816d,0x8167,0x0162,
-        0x8123,0x0126,0x012c,0x8129,0x0138,0x813d,0x8137,0x0132,
-        0x0110,0x8115,0x811f,0x011a,0x810b,0x010e,0x0104,0x8101,
-        0x8303,0x0306,0x030c,0x8309,0x0318,0x831d,0x8317,0x0312,
-        0x0330,0x8335,0x833f,0x033a,0x832b,0x032e,0x0324,0x8321,
-        0x0360,0x8365,0x836f,0x036a,0x837b,0x037e,0x0374,0x8371,
-        0x8353,0x0356,0x035c,0x8359,0x0348,0x834d,0x8347,0x0342,
-        0x03c0,0x83c5,0x83cf,0x03ca,0x83db,0x03de,0x03d4,0x83d1,
-        0x83f3,0x03f6,0x03fc,0x83f9,0x03e8,0x83ed,0x83e7,0x03e2,
-        0x83a3,0x03a6,0x03ac,0x83a9,0x03b8,0x83bd,0x83b7,0x03b2,
-        0x0390,0x8395,0x839f,0x039a,0x838b,0x038e,0x0384,0x8381,
-        0x0280,0x8285,0x828f,0x028a,0x829b,0x029e,0x0294,0x8291,
-        0x82b3,0x02b6,0x02bc,0x82b9,0x02a8,0x82ad,0x82a7,0x02a2,
-        0x82e3,0x02e6,0x02ec,0x82e9,0x02f8,0x82fd,0x82f7,0x02f2,
-        0x02d0,0x82d5,0x82df,0x02da,0x82cb,0x02ce,0x02c4,0x82c1,
-        0x8243,0x0246,0x024c,0x8249,0x0258,0x825d,0x8257,0x0252,
-        0x0270,0x8275,0x827f,0x027a,0x826b,0x026e,0x0264,0x8261,
-        0x0220,0x8225,0x822f,0x022a,0x823b,0x023e,0x0234,0x8231,
-        0x8213,0x0216,0x021c,0x8219,0x0208,0x820d,0x8207,0x0202 };
+        0x0000, 0x8005, 0x800f, 0x000a, 0x801b, 0x001e, 0x0014, 0x8011,
+        0x8033, 0x0036, 0x003c, 0x8039, 0x0028, 0x802d, 0x8027, 0x0022,
+        0x8063, 0x0066, 0x006c, 0x8069, 0x0078, 0x807d, 0x8077, 0x0072,
+        0x0050, 0x8055, 0x805f, 0x005a, 0x804b, 0x004e, 0x0044, 0x8041,
+        0x80c3, 0x00c6, 0x00cc, 0x80c9, 0x00d8, 0x80dd, 0x80d7, 0x00d2,
+        0x00f0, 0x80f5, 0x80ff, 0x00fa, 0x80eb, 0x00ee, 0x00e4, 0x80e1,
+        0x00a0, 0x80a5, 0x80af, 0x00aa, 0x80bb, 0x00be, 0x00b4, 0x80b1,
+        0x8093, 0x0096, 0x009c, 0x8099, 0x0088, 0x808d, 0x8087, 0x0082,
+        0x8183, 0x0186, 0x018c, 0x8189, 0x0198, 0x819d, 0x8197, 0x0192,
+        0x01b0, 0x81b5, 0x81bf, 0x01ba, 0x81ab, 0x01ae, 0x01a4, 0x81a1,
+        0x01e0, 0x81e5, 0x81ef, 0x01ea, 0x81fb, 0x01fe, 0x01f4, 0x81f1,
+        0x81d3, 0x01d6, 0x01dc, 0x81d9, 0x01c8, 0x81cd, 0x81c7, 0x01c2,
+        0x0140, 0x8145, 0x814f, 0x014a, 0x815b, 0x015e, 0x0154, 0x8151,
+        0x8173, 0x0176, 0x017c, 0x8179, 0x0168, 0x816d, 0x8167, 0x0162,
+        0x8123, 0x0126, 0x012c, 0x8129, 0x0138, 0x813d, 0x8137, 0x0132,
+        0x0110, 0x8115, 0x811f, 0x011a, 0x810b, 0x010e, 0x0104, 0x8101,
+        0x8303, 0x0306, 0x030c, 0x8309, 0x0318, 0x831d, 0x8317, 0x0312,
+        0x0330, 0x8335, 0x833f, 0x033a, 0x832b, 0x032e, 0x0324, 0x8321,
+        0x0360, 0x8365, 0x836f, 0x036a, 0x837b, 0x037e, 0x0374, 0x8371,
+        0x8353, 0x0356, 0x035c, 0x8359, 0x0348, 0x834d, 0x8347, 0x0342,
+        0x03c0, 0x83c5, 0x83cf, 0x03ca, 0x83db, 0x03de, 0x03d4, 0x83d1,
+        0x83f3, 0x03f6, 0x03fc, 0x83f9, 0x03e8, 0x83ed, 0x83e7, 0x03e2,
+        0x83a3, 0x03a6, 0x03ac, 0x83a9, 0x03b8, 0x83bd, 0x83b7, 0x03b2,
+        0x0390, 0x8395, 0x839f, 0x039a, 0x838b, 0x038e, 0x0384, 0x8381,
+        0x0280, 0x8285, 0x828f, 0x028a, 0x829b, 0x029e, 0x0294, 0x8291,
+        0x82b3, 0x02b6, 0x02bc, 0x82b9, 0x02a8, 0x82ad, 0x82a7, 0x02a2,
+        0x82e3, 0x02e6, 0x02ec, 0x82e9, 0x02f8, 0x82fd, 0x82f7, 0x02f2,
+        0x02d0, 0x82d5, 0x82df, 0x02da, 0x82cb, 0x02ce, 0x02c4, 0x82c1,
+        0x8243, 0x0246, 0x024c, 0x8249, 0x0258, 0x825d, 0x8257, 0x0252,
+        0x0270, 0x8275, 0x827f, 0x027a, 0x826b, 0x026e, 0x0264, 0x8261,
+        0x0220, 0x8225, 0x822f, 0x022a, 0x823b, 0x023e, 0x0234, 0x8231,
+        0x8213, 0x0216, 0x021c, 0x8219, 0x0208, 0x820d, 0x8207, 0x0202 };

    while (len--) crc = table[((crc>>8) ^ *data++) & 0xFF] ^ (crc << 8);
    return crc;
 }

-static ulong crc_0x8005_r(const uchar* data, ulong len, ulong crc)
+static unsigned int crc_0x8005_r(const unsigned char* data, unsigned int len, unsigned int crc)
 {
    // x^16 + x^15 + x^2 + x^0  (0x8005)
    // reflected
    const static unsigned short table[256] = {
-        0x0000,0xC0C1,0xC181,0x0140,0xC301,0x03C0,0x0280,0xC241,
-        0xC601,0x06C0,0x0780,0xC741,0x0500,0xC5C1,0xC481,0x0440,
-        0xCC01,0x0CC0,0x0D80,0xCD41,0x0F00,0xCFC1,0xCE81,0x0E40,
-        0x0A00,0xCAC1,0xCB81,0x0B40,0xC901,0x09C0,0x0880,0xC841,
-        0xD801,0x18C0,0x1980,0xD941,0x1B00,0xDBC1,0xDA81,0x1A40,
-        0x1E00,0xDEC1,0xDF81,0x1F40,0xDD01,0x1DC0,0x1C80,0xDC41,
-        0x1400,0xD4C1,0xD581,0x1540,0xD701,0x17C0,0x1680,0xD641,
-        0xD201,0x12C0,0x1380,0xD341,0x1100,0xD1C1,0xD081,0x1040,
-        0xF001,0x30C0,0x3180,0xF141,0x3300,0xF3C1,0xF281,0x3240,
-        0x3600,0xF6C1,0xF781,0x3740,0xF501,0x35C0,0x3480,0xF441,
-        0x3C00,0xFCC1,0xFD81,0x3D40,0xFF01,0x3FC0,0x3E80,0xFE41,
-        0xFA01,0x3AC0,0x3B80,0xFB41,0x3900,0xF9C1,0xF881,0x3840,
-        0x2800,0xE8C1,0xE981,0x2940,0xEB01,0x2BC0,0x2A80,0xEA41,
-        0xEE01,0x2EC0,0x2F80,0xEF41,0x2D00,0xEDC1,0xEC81,0x2C40,
-        0xE401,0x24C0,0x2580,0xE541,0x2700,0xE7C1,0xE681,0x2640,
-        0x2200,0xE2C1,0xE381,0x2340,0xE101,0x21C0,0x2080,0xE041,
-        0xA001,0x60C0,0x6180,0xA141,0x6300,0xA3C1,0xA281,0x6240,
-        0x6600,0xA6C1,0xA781,0x6740,0xA501,0x65C0,0x6480,0xA441,
-        0x6C00,0xACC1,0xAD81,0x6D40,0xAF01,0x6FC0,0x6E80,0xAE41,
-        0xAA01,0x6AC0,0x6B80,0xAB41,0x6900,0xA9C1,0xA881,0x6840,
-        0x7800,0xB8C1,0xB981,0x7940,0xBB01,0x7BC0,0x7A80,0xBA41,
-        0xBE01,0x7EC0,0x7F80,0xBF41,0x7D00,0xBDC1,0xBC81,0x7C40,
-        0xB401,0x74C0,0x7580,0xB541,0x7700,0xB7C1,0xB681,0x7640,
-        0x7200,0xB2C1,0xB381,0x7340,0xB101,0x71C0,0x7080,0xB041,
-        0x5000,0x90C1,0x9181,0x5140,0x9301,0x53C0,0x5280,0x9241,
-        0x9601,0x56C0,0x5780,0x9741,0x5500,0x95C1,0x9481,0x5440,
-        0x9C01,0x5CC0,0x5D80,0x9D41,0x5F00,0x9FC1,0x9E81,0x5E40,
-        0x5A00,0x9AC1,0x9B81,0x5B40,0x9901,0x59C0,0x5880,0x9841,
-        0x8801,0x48C0,0x4980,0x8941,0x4B00,0x8BC1,0x8A81,0x4A40,
-        0x4E00,0x8EC1,0x8F81,0x4F40,0x8D01,0x4DC0,0x4C80,0x8C41,
-        0x4400,0x84C1,0x8581,0x4540,0x8701,0x47C0,0x4680,0x8641,
-        0x8201,0x42C0,0x4380,0x8341,0x4100,0x81C1,0x8081,0x4040 };
+        0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241,
+        0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440,
+        0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40,
+        0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841,
+        0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40,
+        0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41,
+        0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641,
+        0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040,
+        0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240,
+        0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441,
+        0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41,
+        0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840,
+        0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41,
+        0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40,
+        0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640,
+        0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041,
+        0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240,
+        0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441,
+        0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41,
+        0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840,
+        0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41,
+        0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40,
+        0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640,
+        0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041,
+        0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241,
+        0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440,
+        0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40,
+        0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841,
+        0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40,
+        0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41,
+        0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641,
+        0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040 };

    while (len--) crc = table[(crc ^ *data++) & 0xFF] ^ (crc >> 8);
    return crc;
 }

-static ulong crc_0x1021(const uchar* data, ulong len, ulong crc)
+static unsigned int crc_0x1021(const unsigned char* data, unsigned int len, unsigned int crc)
 {
    // x^16 + x^12 + x^5 + x^0 (0x1021)
    const static unsigned short table[256] = {
@ -261,7 +270,7 @@ static ulong crc_0x1021(const uchar* data, ulong len, ulong crc)
    return crc;
 }

-static ulong crc_0x04C11DB7(const uchar* data, ulong len, ulong crc)
+static unsigned int crc_0x04C11DB7(const unsigned char* data, unsigned int len, unsigned int crc)
 {
    // x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10 +
    //    x^8 + x^7 + x^5 + x^4 + x^2 + x^1 + x^0  (0x04C11DB7)
@ -335,7 +344,7 @@ static ulong crc_0x04C11DB7(const uchar* data, ulong len, ulong crc)
    return crc;
 }

-static ulong crc_0x04C11DB7_r(const uchar* data, ulong len, ulong crc)
+static unsigned int crc_0x04C11DB7_r(const unsigned char* data, unsigned int len, unsigned int crc)
 {
    // x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10 +
    //    x^8 + x^7 + x^5 + x^4 + x^2 + x^1 + x^0  (0x04C11DB7)
@ -410,13 +419,13 @@ static ulong crc_0x04C11DB7_r(const uchar* data, ulong len, ulong crc)
    return crc;
 }

-static ulong adler32(const uchar* data, ulong len, ulong init)
+static unsigned int adler32(const unsigned char* data, unsigned int len, unsigned int init)
 {
-    ulong a = init & 0xFFFF;
-    ulong b = (init >> 16) & 0xFFFF;
+    unsigned int a = init & 0xFFFF;
+    unsigned int b = (init >> 16) & 0xFFFF;

    while (len) {
-        ulong tlen = len > 5550 ? 5550 : len;
+        unsigned int tlen = len > 5550 ? 5550 : len;
        len -= tlen;
        do {
            a += *data++;
@ -431,10 +440,10 @@ static ulong adler32(const uchar* data, ulong len, ulong init)
   return b << 16 | a;
 }

-static ulong hexsum(const uchar* data, ulong len, ulong sum)
+static unsigned int hexsum(const unsigned char* data, unsigned int len, unsigned int sum)
 {
    // Add all hex digits, ignore all other bytes.
-    ulong d; 
+    unsigned int d; 
    while (len--)
    {
        d = toupper(*data++);
@ -452,8 +461,8 @@ struct checksum
 {
    const char* name;
    checksumFunc func;
-    ulong init;
-    ulong xorout;
+    unsigned int init;
+    unsigned int xorout;
    signed char bytes;
 };

@ -465,20 +474,6 @@ static checksum checksumMap[] =
    {"sum8",    sum,              0x00,       0x00,       1}, // 0xDD
    {"sum16",   sum,              0x0000,     0x0000,     2}, // 0x01DD
    {"sum32",   sum,              0x00000000, 0x00000000, 4}, // 0x000001DD
-    {"nsum",    sum,              0xFF,       0xFF,       1}, // 0x23
-    {"negsum",  sum,              0xFF,       0xFF,       1}, // 0x23
-    {"-sum",    sum,              0xFF,       0xFF,       1}, // 0x23
-    {"nsum8",   sum,              0xFF,       0xFF,       1}, // 0x23
-    {"negsum8", sum,              0xFF,       0xFF,       1}, // 0x23
-    {"-sum8",   sum,              0xFF,       0xFF,       1}, // 0x23
-    {"nsum16",  sum,              0xFFFF,     0xFFFF,     2}, // 0xFE23
-    {"negsum16",sum,              0xFFFF,     0xFFFF,     2}, // 0xFE23
-    {"-sum16",  sum,              0xFFFF,     0xFFFF,     2}, // 0xFE23
-    {"nsum32",  sum,              0xFFFFFFFF, 0xFFFFFFFF, 4}, // 0xFFFFFE23
-    {"negsum32",sum,              0xFFFFFFFF, 0xFFFFFFFF, 4}, // 0xFFFFFE23
-    {"-sum32",  sum,              0xFFFFFFFF, 0xFFFFFFFF, 4}, // 0xFFFFFE23
-    {"notsum",  sum,              0x00,       0xFF,       1}, // 0x22
-    {"~sum",    sum,              0x00,       0xFF,       1}, // 0x22
    {"xor",     xor8,             0x00,       0x00,       1}, // 0x31
    {"xor8",    xor8,             0x00,       0x00,       1}, // 0x31
    {"xor7",    xor7,             0x00,       0x00,       1}, // 0x31
@ -486,6 +481,7 @@ static checksum checksumMap[] =
    {"ccitt8",  crc_0x31,         0x00,       0x00,       1}, // 0xA1
    {"crc16",   crc_0x8005,       0x0000,     0x0000,     2}, // 0xFEE8
    {"crc16r",  crc_0x8005_r,     0x0000,     0x0000,     2}, // 0xBB3D
+    {"modbus",  crc_0x8005_r,     0xFFFF,     0x0000,     2}, // 0x4B37
    {"ccitt16", crc_0x1021,       0xFFFF,     0x0000,     2}, // 0x29B1
    {"ccitt16a",crc_0x1021,       0x1D0F,     0x0000,     2}, // 0xE5CC
    {"ccitt16x",crc_0x1021,       0x0000,     0x0000,     2}, // 0x31C3
@ -498,7 +494,7 @@ static checksum checksumMap[] =
    {"hexsum8", hexsum,           0x00,       0x00,       1}  // 0x2D
 };

-static ulong mask[5] = {0, 0xFF, 0xFFFF, 0xFFFFFF, 0xFFFFFFFF};
+static unsigned int mask[5] = {0, 0xFF, 0xFFFF, 0xFFFFFF, 0xFFFFFFFF};

 class ChecksumConverter : public StreamFormatConverter
 {
@ -517,39 +513,80 @@ parse(const StreamFormat&, StreamBuffer& info, const char*& source, bool)
        return false;
    }

-    size_t fnum;
+    bool negflag=false;
+    bool notflag=false;
+    if (*source == '-')
+    {
+        source++;
+        negflag = true;
+    }
+    if (strncasecmp(source, "neg", 3) == 0)
+    {
+        source+=3;
+        negflag = true;
+    }
+    if (*source == '~')
+    {
+        source++;
+        notflag = true;
+    }
+    if (strncasecmp(source, "not", 3) == 0)
+    {
+        source+=3;
+        notflag = true;
+    }
+    unsigned  fnum;
+    int len = p-source;
+    unsigned int init, xorout;
    for (fnum = 0; fnum < sizeof(checksumMap)/sizeof(checksum); fnum++)
    {
-        if (strncasecmp(source, checksumMap[fnum].name, p-source) == 0)
+        if ((strncasecmp(source, checksumMap[fnum].name, len) == 0) ||
+            (*source == 'n' && len > 1 && strncasecmp(source+1, checksumMap[fnum].name, len-1) == 0 && (negflag = true)))
        {
+            init = checksumMap[fnum].init;
+            xorout = checksumMap[fnum].xorout;
+            if (negflag)
+            {
+                init = ~init;
+                xorout = ~xorout;
+            }
+            if (notflag)
+            {
+                xorout = ~xorout;
+            }
+            info.append(&init,  sizeof(init));
+            info.append(&xorout, sizeof(xorout));
            info.append(fnum);
            source = p+1;
            return pseudo_format;
        }
    }

-    error ("Unknown checksum algorithm \"%.*s\"\n",
-        static_cast<int>(p-source), source);
+    error ("Unknown checksum algorithm \"%.*s\"\n", len, source);
    return false;
 }

 bool ChecksumConverter::
 printPseudo(const StreamFormat& format, StreamBuffer& output)
 {
-    ulong sum;
-    int fnum = format.info[0];
+    unsigned int sum;
+    const char* info = format.info;
+    unsigned int init = extract<unsigned int>(info);
+    unsigned int xorout = extract<unsigned int>(info);
+    int fnum = extract<char>(info);
+
    int start = format.width;
    int length = output.length()-format.width;
    if (format.prec > 0) length -= format.prec;

    debug("ChecksumConverter %s: output to check: \"%s\"\n",
        checksumMap[fnum].name, output.expand(start,length)());
+        
+    sum = (xorout ^ checksumMap[fnum].func(
+        reinterpret_cast<unsigned char*>(output(start)), length, init))
+        & mask[checksumMap[fnum].bytes];

-    sum = (checksumMap[fnum].xorout ^ checksumMap[fnum].func(
-        reinterpret_cast<uchar*>(output(start)), length,
-        checksumMap[fnum].init)) & mask[checksumMap[fnum].bytes];
-
-    debug("ChecksumConverter %s: output checksum is 0x%lX\n",
+    debug("ChecksumConverter %s: output checksum is 0x%X\n",
        checksumMap[fnum].name, sum);

    int i;
@ -559,13 +596,11 @@ printPseudo(const StreamFormat& format, StreamBuffer& output)
    {
        // get number of decimal digits from number of bytes: ceil(xbytes*2.5)
        i = (checksumMap[fnum].bytes+1)*25/10-2;
-        output.print("%0*ld", i, sum);
-        debug("ChecksumConverter %s: decimal appending %0*ld\n",
+        output.print("%0*d", i, sum);
+        debug("ChecksumConverter %s: decimal appending %0*d\n",
            checksumMap[fnum].name, i, sum);
-        return true;
-    }
-    
-    
+    }   
+    else
    if (format.flags & alt_flag) // lsb first (little endian)
    {
        for (i = 0; i < checksumMap[fnum].bytes; i++)
@ -575,6 +610,10 @@ printPseudo(const StreamFormat& format, StreamBuffer& output)
                checksumMap[fnum].name, outchar);
            if (format.flags & zero_flag) // ASCII
                output.print("%02X", outchar);
+            else
+            if (format.flags & left_flag) // poor man's hex: 0x30 - 0x3F
+                output.print("%c%c",
+                    ((outchar>>4)&0x0f)|0x30, (outchar&0x0f)|0x30);
            else                          // binary
                output.append(outchar);
            sum >>= 8;
@ -590,6 +629,10 @@ printPseudo(const StreamFormat& format, StreamBuffer& output)
                checksumMap[fnum].name, outchar);
            if (format.flags & zero_flag) // ASCII
                output.print("%02X", outchar);
+            else
+            if (format.flags & left_flag) // poor man's hex: 0x30 - 0x3F
+                output.print("%c%c",
+                    ((outchar>>4)&0x0f)|0x30, (outchar&0x0f)|0x30);
            else                          // binary
                output.append(outchar);
            sum <<= 8;
@ -601,57 +644,88 @@ printPseudo(const StreamFormat& format, StreamBuffer& output)
 int ChecksumConverter::
 scanPseudo(const StreamFormat& format, StreamBuffer& input, long& cursor)
 {
-    int fnum = format.info[0];
-    ulong sum;
+    unsigned int sum;
+    const char* info = format.info;
+    unsigned int init = extract<unsigned int>(info);
+    unsigned int xorout = extract<unsigned int>(info);
    int start = format.width;
+    int fnum = extract<char>(info);
    int length = cursor-format.width;
+
    if (format.prec > 0) length -= format.prec;
    
    debug("ChecksumConverter %s: input to check: \"%s\n",
        checksumMap[fnum].name, input.expand(start,length)());

-    if (input.length() - cursor <
-        (format.flags & zero_flag ? 2 : 1) * checksumMap[fnum].bytes)
+    int expectedLength =
+        // get number of decimal digits from number of bytes: ceil(bytes*2.5)
+        format.flags & sign_flag ? (checksumMap[fnum].bytes + 1) * 25 / 10 - 2 :
+        format.flags & (zero_flag|left_flag) ? 2 * checksumMap[fnum].bytes :
+        checksumMap[fnum].bytes;
+    
+    if (input.length() - cursor < expectedLength)
    {
-        error("Input too short for checksum\n");
+        debug("ChecksumConverter %s: Input '%s' too short for checksum\n",
+            checksumMap[fnum].name, input.expand(cursor)());
        return -1;
    }

-    sum = (checksumMap[fnum].xorout ^ checksumMap[fnum].func(
-        reinterpret_cast<uchar*>(input(start)), length,
-        checksumMap[fnum].init)) & mask[checksumMap[fnum].bytes];
+    sum = (xorout ^ checksumMap[fnum].func(
+        reinterpret_cast<unsigned char*>(input(start)), length, init))
+        & mask[checksumMap[fnum].bytes];

-    debug("ChecksumConverter %s: input checksum is 0x%0*lX\n",
+    debug("ChecksumConverter %s: input checksum is 0x%0*X\n",
        checksumMap[fnum].name, 2*checksumMap[fnum].bytes, sum);

-    int i,j;
+    int i, j;
    unsigned inchar;
    
    if (format.flags & sign_flag) // decimal
    {
-        ulong sumin = 0;
-        // get number of decimal digits from number of bytes: ceil(xbytes*2.5)
-        j = (checksumMap[fnum].bytes+1)*25/10-2;
-        for (i = 0; i < j; i++)
+        unsigned int sumin = 0;
+        for (i = 0; i < expectedLength; i++)
        {
            inchar = input[cursor+i];
            if (isdigit(inchar)) sumin = sumin*10+inchar-'0';
            else break;
        }
-        if (sumin==sum) return i;
-        error("Input %0*lu does not match checksum %0*lu\n", 
-            i, sumin, j, sum);
-        return -1;
+        if (sumin != sum)
+        {
+            debug("ChecksumConverter %s: Input %0*u does not match checksum %0*u\n", 
+                checksumMap[fnum].name, i, sumin, expectedLength, sum);
+            return -1;
+        }
    }
-    
-    
+    else    
    if (format.flags & alt_flag) // lsb first (little endian)
    {
        for (i = 0; i < checksumMap[fnum].bytes; i++)
        {
            if (format.flags & zero_flag) // ASCII
            {
-                sscanf(input(cursor+2*i), "%2X", &inchar);
+                if (sscanf(input(cursor+2*i), "%2X", &inchar) != 1)
+                {
+                    debug("ChecksumConverter %s: Input byte '%s' is not a hex byte\n", 
+                        checksumMap[fnum].name, input.expand(cursor+2*i,2)());
+                    return -1;
+                }
+            }
+            else
+            if (format.flags & left_flag) // poor man's hex: 0x30 - 0x3F
+            {
+                if ((input[cursor+2*i] & 0xf0) != 0x30)
+                {
+                    debug("ChecksumConverter %s: Input byte 0x%02X is not in range 0x30 - 0x3F\n", 
+                        checksumMap[fnum].name, input[cursor+2*i]);
+                    return -1;
+                }
+                if ((input[cursor+2*i+1] & 0xf0) != 0x30)
+                {
+                    debug("ChecksumConverter %s: Input byte 0x%02X is not in range 0x30 - 0x3F\n", 
+                        checksumMap[fnum].name, input[cursor+2*i+1]);
+                    return -1;
+                }
+                inchar = ((input[cursor+2*i] & 0x0f) << 4) | (input[cursor+2*i+1] & 0x0f);
            }
            else                          // binary
            {
@ -659,8 +733,8 @@ scanPseudo(const StreamFormat& format, StreamBuffer& input, long& cursor)
            }
            if (inchar != ((sum >> 8*i) & 0xff))
            {
-                error("Input byte 0x%02X does not match checksum 0x%0*lX\n", 
-                    inchar, 2*checksumMap[fnum].bytes, sum);
+                debug("ChecksumConverter %s: Input byte 0x%02X does not match checksum 0x%0*X\n", 
+                    checksumMap[fnum].name, inchar, 2*checksumMap[fnum].bytes, sum);
                return -1;
            }
        }
@ -673,21 +747,36 @@ scanPseudo(const StreamFormat& format, StreamBuffer& input, long& cursor)
            {
                sscanf(input(cursor+2*i), "%2x", &inchar);
            }
+            else
+            if (format.flags & left_flag) // poor man's hex: 0x30 - 0x3F
+            {
+                if ((input[cursor+2*i] & 0xf0) != 0x30)
+                {
+                    debug("ChecksumConverter %s: Input byte 0x%02X is not in range 0x30 - 0x3F\n", 
+                        checksumMap[fnum].name, input[cursor+2*i]);
+                    return -1;
+                }
+                if ((input[cursor+2*i+1] & 0xf0) != 0x30)
+                {
+                    debug("ChecksumConverter %s: Input byte 0x%02X is not in range 0x30 - 0x3F\n", 
+                        checksumMap[fnum].name, input[cursor+2*i+1]);
+                    return -1;
+                }
+                inchar = ((input[cursor+2*i] & 0x0f) << 4) | (input[cursor+2*i+1] & 0x0f);
+            }
            else                          // binary
            {
                inchar = input[cursor+i] & 0xff;
            }
            if (inchar != ((sum >> 8*j) & 0xff))
            {
-                error("Input byte 0x%02X does not match checksum 0x%0*lX\n",
-                    inchar, 2*checksumMap[fnum].bytes, sum);
+                debug("ChecksumConverter %s: Input byte 0x%02X does not match checksum 0x%0*X\n",
+                    checksumMap[fnum].name, inchar, 2*checksumMap[fnum].bytes, sum);
                return -1;
            }
        }
    }
-    if (format.flags & zero_flag) // ASCII
-        return 2*checksumMap[fnum].bytes;
-    return checksumMap[fnum].bytes;
+    return expectedLength;
 }

 RegisterConverter (ChecksumConverter, "<");
--- a/src/EnumConverter.cc
+++ b/src/EnumConverter.cc
@ -36,7 +36,7 @@ class EnumConverter : public StreamFormatConverter

 int EnumConverter::
 parse(const StreamFormat& fmt, StreamBuffer& info,
-    const char*& source, bool)
+    const char*& source, bool scanFormat)
 {
    if (fmt.flags & (left_flag|sign_flag|space_flag|zero_flag))
    {
@ -56,7 +56,30 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
        if (*source == '=' && (fmt.flags & alt_flag))
        {
            char* p;
-            index = strtol(++source, &p, 0);
+            
+            if (*++source == '?')
+            {
+                // default choice
+                if (scanFormat)
+                {
+                    error("Default value only allowed in output formats\n");
+                    return false;
+                }
+                if (*++source != '}')
+                {
+                    error("Default value must be last\n");
+                    return false;
+                }
+                source++;
+                numEnums = -(numEnums+1);
+                info.append('\0');
+                memcpy(info(n), &numEnums, sizeof(numEnums));
+                debug("EnumConverter::parse %ld choices with default: %s\n",
+                    -numEnums, info.expand()());
+                return enum_format;
+            }
+            
+            index = strtol(source, &p, 0);
            if (p == source || (*p != '|' && *p != '}'))
            {
                error("Integer expected after '=' "
@ -99,6 +122,9 @@ printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
    const char* s = fmt.info;
    long numEnums = extract<long>(s);
    long index = extract<long>(s);
+    bool noDefault = numEnums >= 0;
+    
+    if (numEnums < 0) numEnums=-numEnums-1;    
    while (numEnums-- && (value != index))
    {
        while(*s)
@ -109,7 +135,7 @@ printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
        s++;
        index = extract<long>(s);
    }
-    if (numEnums == -1)
+    if (numEnums == -1 && noDefault)
    {
        error("Value %li not found in enum set\n", value);
        return false;
--- a/src/Makefile
+++ b/src/Makefile
@ -79,12 +79,11 @@ include $(TOP)/configure/RULES

 # Update version string (contains __DATE__ and __TIME__)
 # each time make runs.
-StreamVersion$(OBJ): FORCE
-FORCE:
+StreamVersion$(OBJ): ../*.c ../*.h ../*.cc ../CONFIG_STREAM ../Makefile

 # Add references to all registrars to main file to avoid
 # missing initialization.
-StreamCore$(OBJ): streamReferences
+StreamCore$(OBJ) StreamCore$(DEP): streamReferences

 streamReferences: ../CONFIG_STREAM
 	$(PERL) ../makeref.pl Interface $(BUSSES) > $@
@ -94,4 +93,7 @@ streamReferences: ../CONFIG_STREAM
 $(COMMON_DIR)/$(LIBRARY_DEFAULT).dbd: ../CONFIG_STREAM
 	$(PERL) ../makedbd.pl $(RECORDS) > $@

+$(LIBRARY_DEFAULT).dbd$(DEP): ../CONFIG_STREAM
+	echo $(LIBRARY_DEFAULT).dbd: $< > $@
+
 endif
--- a/src/RawConverter.cc
+++ b/src/RawConverter.cc
@ -31,23 +31,23 @@ class RawConverter : public StreamFormatConverter
 };

 int RawConverter::
-parse(const StreamFormat&, StreamBuffer&,
+parse(const StreamFormat& fmt, StreamBuffer&,
    const char*&, bool)
 {
-    return long_format;
+    return (fmt.flags & (sign_flag|zero_flag)) ? signed_format : unsigned_format;
 }

 bool RawConverter::
-printLong(const StreamFormat& format, StreamBuffer& output, long value)
+printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
 {
-    int prec = format.prec;      // number of bytes from value
+    int prec = fmt.prec;      // number of bytes from value
    if (prec == -1) prec = 1;    // default: 1 byte
    int width = prec;            // number of bytes in output
    if (prec > (int)sizeof(long)) prec=sizeof(long);
-    if (format.width > width) width = format.width;
+    if (fmt.width > width) width = fmt.width;
    
    char byte = 0;
-    if (format.flags & alt_flag) // little endian (lsb first)
+    if (fmt.flags & alt_flag) // little endian (lsb first)
    {
        while (prec--)
        {
@ -56,7 +56,7 @@ printLong(const StreamFormat& format, StreamBuffer& output, long value)
            value >>= 8;
            width--;
        }
-        if (format.flags & zero_flag)
+        if (fmt.flags & zero_flag)
        {
            // fill with zero
            byte = 0;
@ -73,7 +73,7 @@ printLong(const StreamFormat& format, StreamBuffer& output, long value)
    }
    else // big endian (msb first)
    {
-        if (format.flags & zero_flag)
+        if (fmt.flags & zero_flag)
        {
            // fill with zero
            byte = 0;
@ -97,17 +97,17 @@ printLong(const StreamFormat& format, StreamBuffer& output, long value)
 }

 int RawConverter::
-scanLong(const StreamFormat& format, const char* input, long& value)
+scanLong(const StreamFormat& fmt, const char* input, long& value)
 {
    long length = 0;
    long val = 0;
-    int width = format.width;
+    int width = fmt.width;
    if (width == 0) width = 1; // default: 1 byte
-    if (format.flags & skip_flag)
+    if (fmt.flags & skip_flag)
    {
        return width; // just skip input
    }
-    if (format.flags & alt_flag)
+    if (fmt.flags & alt_flag)
    {
        // little endian (lsb first)
        unsigned int shift = 0;
@ -118,7 +118,7 @@ scanLong(const StreamFormat& format, const char* input, long& value)
        }
        if (width == 0)
        {
-            if (format.flags & zero_flag)
+            if (fmt.flags & zero_flag)
            {
                // fill with zero
                val |= ((unsigned char) input[length++]) << shift;
@ -134,7 +134,7 @@ scanLong(const StreamFormat& format, const char* input, long& value)
    else
    {
        // big endian  (msb first)
-        if (format.flags & zero_flag)
+        if (fmt.flags & zero_flag)
        {
            // fill with zero
            val = (unsigned char) input[length++];
--- a/src/StreamBuffer.cc
+++ b/src/StreamBuffer.cc
@ -30,15 +30,17 @@
 #define vsnprintf epicsVsnprintf
 #endif

+#define P PRINTF_SIZE_T_PREFIX
+
 void StreamBuffer::
-init(const void* s, long minsize)
+init(const void* s, ssize_t minsize)
 {
    len = 0;
    offs = 0;
    buffer = local;
    cap = sizeof(local);
    if (minsize < 0) minsize = 0;
-    if (minsize >= cap)
+    if ((size_t)minsize >= cap)
    {
        // use allocated buffer
        grow(minsize);
@ -55,18 +57,18 @@ init(const void* s, long minsize)
 }

 // How the buffer looks like:
-// |----free-----|####used####|-------free-------|
+// |----free-----|####used####|--------00--------|
 ///|<--- offs -->|<-- len --->|<- cap-offs-len ->|
 // 0            offs      offs+len              cap
 //               |<-------------- minsize --------------->


 void StreamBuffer::
-grow(long minsize)
+grow(size_t minsize)
 {
    // make space for minsize + 1 (for termination) bytes
    char* newbuffer;
-    long newcap;
+    size_t newcap;
 #ifdef EXPLODE
    if (minsize > 1000000)
    {
@ -117,12 +119,12 @@ grow(long minsize)
 }

 StreamBuffer& StreamBuffer::
-append(const void* s, long size)
+append(const void* s, ssize_t size)
 {
    if (size <= 0)
    {
        // append negative number of bytes? let's delete some
-        if (size < -len) size = -len;
+        if (size < -(ssize_t)len) size = -(ssize_t)len;
        memset (buffer+offs+len+size, 0, -size);
    }
    else
@ -134,8 +136,8 @@ append(const void* s, long size)
    return *this;
 }

-long int StreamBuffer::
-find(const void* m, long size, long start) const
+ssize_t StreamBuffer::
+find(const void* m, size_t size, ssize_t start) const
 {
    if (start < 0)
    {
@ -147,7 +149,7 @@ find(const void* m, long size, long start) const
    const char* s = static_cast<const char*>(m);
    char* b = buffer+offs;
    char* p = b+start;
-    long i;
+    size_t i;
    while ((p = static_cast<char*>(memchr(p, s[0], b-p+len-size+1))))
    {
        for (i = 1; i < size; i++)
@ -161,7 +163,7 @@ next:   p++;
 }

 StreamBuffer& StreamBuffer::
-replace(long remstart, long remlen, const void* ins, long inslen)
+replace(ssize_t remstart, ssize_t remlen, const void* ins, ssize_t inslen)
 {
    if (remstart < 0)
    {
@ -187,12 +189,12 @@ replace(long remstart, long remlen, const void* ins, long inslen)
        remlen += remstart;
        remstart = 0;
    }
-    if (remstart > len)
+    if ((size_t)remstart > len)
    {
        // remove begins after bufferend
        remstart = len;
    }
-    if (remlen >= len-remstart)
+    if ((size_t)remlen >= len-remstart)
    {
        // truncate remove after bufferend
        remlen = len-remstart;
@ -205,12 +207,12 @@ replace(long remstart, long remlen, const void* ins, long inslen)
        return *this;
    }
    if (inslen < 0) inslen = 0;
-    long remend = remstart+remlen;
-    long newlen = len+inslen-remlen;
+    size_t remend = remstart+remlen;
+    size_t newlen = len+inslen-remlen;
    if (cap <= newlen)
    {
        // buffer too short
-        long newcap;
+        size_t newcap;
        for (newcap = sizeof(local)*2; newcap <= newlen; newcap *= 2);
        char* newbuffer = new char[newcap];
        memcpy(newbuffer, buffer+offs, remstart);
@ -251,13 +253,13 @@ StreamBuffer& StreamBuffer::
 print(const char* fmt, ...)
 {
    va_list va;
-    int printed;
+    ssize_t printed;
    while (1)
    {
        va_start(va, fmt);
        printed = vsnprintf(buffer+offs+len, cap-offs-len, fmt, va);
        va_end(va);
-        if (printed > -1 && printed < (int)(cap-offs-len))
+        if (printed > -1 && printed < (ssize_t)(cap-offs-len))
        {
            len += printed;
            return *this;
@ -267,9 +269,9 @@ print(const char* fmt, ...)
    }
 }

-StreamBuffer StreamBuffer::expand(long start, long length) const
+StreamBuffer StreamBuffer::expand(ssize_t start, ssize_t length) const
 {
-    long end;
+    size_t end;
    if (start < 0)
    {
        start += len;
@ -289,7 +291,7 @@ StreamBuffer StreamBuffer::expand(long start, long length) const
    StreamBuffer result((end-start)*2);
    start += offs;
    end += offs;
-    long i;
+    size_t i;
    char c;
    for (i = start; i < end; i++)
    {
@ -311,8 +313,8 @@ dump() const
 {
    StreamBuffer result(256+cap*5);
    result.append("\033[0m");
-    long i;
-    result.print("%ld,%ld,%ld:\033[37m", offs, len, cap);
+    size_t i;
+    result.print("%"P"d,%"P"d,%"P"d:\033[37m", offs, len, cap);
    for (i = 0; i < cap; i++)
    {
        if (i == offs) result.append("\033[34m[\033[0m");
--- a/src/StreamBuffer.h
+++ b/src/StreamBuffer.h
@ -21,29 +21,34 @@
 #define StreamBuffer_h

 #include <string.h>
+#include <stdlib.h>

 #ifndef __GNUC__
 #define __attribute__(x)
 #endif

+#ifdef _WIN32
+#define ssize_t ptrdiff_t
+#endif
+
 class StreamBuffer
 {
    char local[64];
-    long len;
-    long cap;
-    long offs;
+    size_t len;
+    size_t cap;
+    size_t offs;
    char* buffer;

-    void init(const void* s, long minsize);
+    void init(const void* s, ssize_t minsize);

-    void check(long size)
+    void check(size_t size)
        {if (len+offs+size >= cap) grow(len+size);}

-    void grow(long minsize);
+    void grow(size_t minsize);

 public:
    // Hints:
-    // * Any index parameter (long) can be negative
+    // * Any index parameter (ssize_t) can be negative
    //   meaning "count from end" (-1 is the last byte)
    // * Appending negative count deletes from end
    // * Any returned char* pointer becomes invalid when
@ -54,7 +59,7 @@ public:
    StreamBuffer()
        {init(NULL, 0);}

-    StreamBuffer(const void* s, long size)
+    StreamBuffer(const void* s, ssize_t size)
        {init(s, size);}

    StreamBuffer(const char* s)
@ -63,24 +68,24 @@ public:
    StreamBuffer(const StreamBuffer& s)
        {init(s.buffer+s.offs, s.len);}

-    StreamBuffer(long size)
+    StreamBuffer(ssize_t size)
        {init(NULL, size);}

    ~StreamBuffer()
        {if (buffer != local) delete buffer;}

    // operator (): get char* pointing to index
-    const char* operator()(long index=0) const
+    const char* operator()(ssize_t index=0) const
        {return buffer+offs+(index<0?index+len:index);}

-    char* operator()(long index=0)
+    char* operator()(ssize_t index=0)
        {return buffer+offs+(index<0?index+len:index);}

    // operator []: get byte at index
-    char operator[](long index) const
+    char operator[](ssize_t index) const
        {return buffer[offs+(index<0?index+len:index)];}

-    char& operator[](long index)
+    char& operator[](ssize_t index)
        {return buffer[offs+(index<0?index+len:index)];}

    // cast to bool: not empty?
@ -88,11 +93,11 @@ public:
        {return len>0;}

    // length: get current data length
-    long length() const
+    ssize_t length() const
        {return len;}

    // capacity: get current max data length (spare one byte for end)
-    long capacity() const
+    ssize_t capacity() const
        {return cap-1;}

    // end: get pointer to byte after last data byte
@ -105,19 +110,19 @@ public:

    // reserve: reserve size bytes of memory and return
    // pointer to that memory (for copying something to it)
-    char* reserve(long size)
+    char* reserve(size_t size)
        {check(size); char* p=buffer+offs+len; len+=size; return p;}

    // append: append data at the end of the buffer
    StreamBuffer& append(char c)
        {check(1); buffer[offs+len++]=c; return *this;}

-    StreamBuffer& append(char c, long count)
+    StreamBuffer& append(char c, ssize_t count)
        {if (count < 0) truncate(count);
         else {check(count); memset(buffer+offs+len, c, count); len+=count;}
         return *this;}

-    StreamBuffer& append(const void* s, long size);
+    StreamBuffer& append(const void* s, ssize_t size);

    StreamBuffer& append(const char* s)
        {return append(s, s?strlen(s):0);}
@ -125,7 +130,7 @@ public:
    StreamBuffer& append(const StreamBuffer& s)
        {return append(s.buffer+s.offs, s.len);}
        
-    // operator += alias for set
+    // operator += alias for append
    StreamBuffer& operator+=(char c)
        {return append(c);}

@ -136,7 +141,7 @@ public:
        {return append(s);}

    // set: clear buffer and fill with new data
-    StreamBuffer& set(const void* s, long size)
+    StreamBuffer& set(const void* s, size_t size)
        {clear(); return append(s, size);}

    StreamBuffer& set(const char* s)
@ -154,61 +159,61 @@ public:

    // replace: delete part of buffer (pos/length) and insert new data
    StreamBuffer& replace(
-        long pos, long length, const void* s, long size);
+        ssize_t pos, ssize_t length, const void* s, ssize_t size);

-    StreamBuffer& replace(long pos, long length, const char* s)
+    StreamBuffer& replace(ssize_t pos, ssize_t length, const char* s)
        {return replace(pos, length, s, s?strlen(s):0);}

-    StreamBuffer& replace(long pos, long length, const StreamBuffer& s)
+    StreamBuffer& replace(ssize_t pos, ssize_t length, const StreamBuffer& s)
        {return replace(pos, length, s.buffer+s.offs, s.len);}

    // remove: delete from start/pos
-    StreamBuffer& remove(long pos, long length)
+    StreamBuffer& remove(ssize_t pos, ssize_t length)
        {return replace(pos, length, NULL, 0);}

    // remove from start: no memset, no function call, fast!
-    StreamBuffer& remove(long length)
+    StreamBuffer& remove(size_t length)
        {if (length>len) length=len;
         offs+=length; len-=length; return *this;}

    // truncate: delete end of buffer
-    StreamBuffer& truncate(long pos)
+    StreamBuffer& truncate(ssize_t pos)
        {return replace(pos, len, NULL, 0);}

    // insert: insert new data into buffer
-    StreamBuffer& insert(long pos, const void* s, long size)
+    StreamBuffer& insert(ssize_t pos, const void* s, ssize_t size)
        {return replace(pos, 0, s, size);}

-    StreamBuffer& insert(long pos, const char* s)
+    StreamBuffer& insert(ssize_t pos, const char* s)
        {return replace(pos, 0, s, s?strlen(s):0);}

-    StreamBuffer& insert(long pos, const StreamBuffer& s)
+    StreamBuffer& insert(ssize_t pos, const StreamBuffer& s)
        {return replace(pos, 0, s.buffer+s.offs, s.len);}

-    StreamBuffer& insert(long pos, char c)
+    StreamBuffer& insert(ssize_t pos, char c)
        {return replace(pos, 0, &c, 1);}

    StreamBuffer& print(const char* fmt, ...)
        __attribute__ ((format(printf,2,3)));

    // find: get index of data in buffer or -1
-    long find(char c, long start=0) const
+    ssize_t find(char c, ssize_t start=0) const
        {char* p;
         return (p = static_cast<char*>(
            memchr(buffer+offs+(start<0?start+len:start),
                c, start<0?-start:len-start)))?
            p-(buffer+offs) : -1;}

-    long find(const void* s, long size, long start=0) const;
+    ssize_t find(const void* s, size_t size, ssize_t start=0) const;

-    long find(const char* s, long start=0) const
+    ssize_t find(const char* s, ssize_t start=0) const
        {return find(s, s?strlen(s):0, start);}

-    long int find(const StreamBuffer& s, long start=0) const
+    ssize_t find(const StreamBuffer& s, ssize_t start=0) const
        {return find(s.buffer+s.offs, s.len, start);}

    // startswith: returns true if first size bytes are equal
-    bool startswith(const void* s, long size) const
+    bool startswith(const void* s, size_t size) const
        {return len>=size ? memcmp(buffer+offs, s, size) == 0 : false;}

    // startswith: returns true if first string is equal (empty string matches)
@ -217,9 +222,9 @@ public:

 // expand: create copy of StreamBuffer where all nonprintable characters
 // are replaced by <xx> with xx being the hex code of the characters
-    StreamBuffer expand(long start, long length) const;
+    StreamBuffer expand(ssize_t start, ssize_t length) const;
    
-    StreamBuffer expand(long start=0) const
+    StreamBuffer expand(ssize_t start=0) const
        {return expand(start, len);}

 // dump: debug function, like expand but also show the 'hidden' memory
@ -227,4 +232,13 @@ public:
    StreamBuffer dump() const;
 };

+// printf size prefix for size_t and ssize_t
+#if defined (__GNUC__) && __GNUC__ >= 3
+#define PRINTF_SIZE_T_PREFIX "z"
+#elif defined (_WIN32)
+#define PRINTF_SIZE_T_PREFIX "I"
+#else
+#define PRINTF_SIZE_T_PREFIX ""
+#endif
+
 #endif
--- a/src/StreamBusInterface.cc
+++ b/src/StreamBusInterface.cc
@ -18,14 +18,9 @@
 ***************************************************************/

 #include "StreamBusInterface.h"
+#include "StreamError.h"

-const char* StreamIoStatusStr[] = {
-    "StreamIoSuccess",
-    "StreamIoTimeout",
-    "StreamIoNoReply",
-    "StreamIoEnd",
-    "StreamIoFault"
-};
+StreamIoStatusStrClass StreamIoStatusStr;

 StreamBusInterfaceRegistrarBase* StreamBusInterfaceRegistrarBase::first;

@ -64,11 +59,17 @@ supportsAsyncRead()
 StreamBusInterface* StreamBusInterface::
 find(Client* client, const char* busname, int addr, const char* param)
 {
+    debug("StreamBusInterface::find(%s, %s, %d, \"%s\")\n",
+            client->name(), busname, addr, param);
    StreamBusInterfaceRegistrarBase* r;
    StreamBusInterface* bus;
-    for (r = r->first; r; r = r->next)
+    for (r = StreamBusInterfaceRegistrarBase::first; r; r = r->next)
    {
+    debug("StreamBusInterface::find %s check %s\n",
+            client->name(), r->name);
        bus = r->find(client, busname, addr, param);
+        debug("StreamBusInterface::find %s %s\n",
+            r->name, bus ? "matches" : "does not match");
        if (bus) return bus;
    }
    return NULL;
--- a/src/StreamBusInterface.h
+++ b/src/StreamBusInterface.h
@ -21,13 +21,26 @@
 #define StreamBusInterface_h

 #include <stddef.h>
+#include <StreamBuffer.h>

 enum StreamIoStatus {
    StreamIoSuccess, StreamIoTimeout, StreamIoNoReply,
    StreamIoEnd, StreamIoFault
 };

-extern const char* StreamIoStatusStr[];
+class StreamIoStatusStrClass {
+public:
+    const char* operator [] (int index) {
+        switch (index) {
+            case StreamIoSuccess: return "StreamIoSuccess";
+            case StreamIoTimeout: return "StreamIoTimeout";
+            case StreamIoNoReply: return "StreamIoNoReply";
+            case StreamIoEnd:     return "StreamIoEnd";
+            case StreamIoFault:   return "StreamIoFault";
+            default:              return "illegal status";
+        }
+    }
+} extern StreamIoStatusStr;

 class StreamBusInterface
 {
@ -44,50 +57,53 @@ public:
        virtual void connectCallback(StreamIoStatus status);
        virtual void disconnectCallback(StreamIoStatus status);
        virtual long priority();
-        virtual const char* name() = 0;
        virtual const char* getInTerminator(size_t& length) = 0;
        virtual const char* getOutTerminator(size_t& length) = 0;
    public:
+        virtual const char* name() = 0;
        virtual ~Client();
    protected:
        StreamBusInterface* businterface;
        bool busSupportsEvent() {
-            return businterface->supportsEvent();
+            return businterface && businterface->supportsEvent();
        }
        bool busSupportsAsyncRead() {
-            return businterface->supportsAsyncRead();
+            return businterface && businterface->supportsAsyncRead();
        }
        bool busAcceptEvent(unsigned long mask,
            unsigned long replytimeout_ms) {
-            return businterface->acceptEvent(mask, replytimeout_ms);
+            return businterface && businterface->acceptEvent(mask, replytimeout_ms);
        }
        void busRelease() {
-            businterface->release();
+            if (businterface) businterface->release();
        }
        bool busLockRequest(unsigned long timeout_ms) {
-            return businterface->lockRequest(timeout_ms);
+            return businterface && businterface->lockRequest(timeout_ms);
        }
        bool busUnlock() {
-            return businterface->unlock();
+            return businterface && businterface->unlock();
        }
        bool busWriteRequest(const void* output, size_t size,
            unsigned long timeout_ms) {
-            return businterface->writeRequest(output, size, timeout_ms);
+            return businterface && businterface->writeRequest(output, size, timeout_ms);
        }
        bool busReadRequest(unsigned long replytimeout_ms,
            unsigned long readtimeout_ms, long expectedLength,
            bool async) {
-            return businterface->readRequest(replytimeout_ms,
-                readtimeout_ms, expectedLength, async);
+            return businterface && businterface->readRequest(replytimeout_ms,
+                    readtimeout_ms, expectedLength, async);
        }
        void busFinish() {
-            businterface->finish();
+            if (businterface) businterface->finish();
        }
        bool busConnectRequest(unsigned long timeout_ms) {
-            return businterface->connectRequest(timeout_ms);
+            return businterface && businterface->connectRequest(timeout_ms);
        }
        bool busDisconnect() {
-            return businterface->disconnectRequest();
+            return businterface && businterface->disconnectRequest();
+        }
+        void busPrintStatus(StreamBuffer& buffer) {
+            if (businterface) businterface->printStatus(buffer);
        }
    };

@ -137,6 +153,7 @@ protected:
    virtual bool connectRequest(unsigned long connecttimeout_ms);
    virtual bool disconnectRequest();
    virtual void finish();
+    virtual void printStatus(StreamBuffer& buffer) {};

 // pure virtual
    virtual bool lockRequest(unsigned long timeout_ms) = 0;
--- a/src/StreamCore.cc
+++ b/src/StreamCore.cc
@ -23,6 +23,8 @@
 #include <ctype.h>
 #include <stdlib.h>

+#define P PRINTF_SIZE_T_PREFIX
+
 enum Commands { end_cmd, in_cmd, out_cmd, wait_cmd, event_cmd, exec_cmd,
    connect_cmd, disconnect_cmd };
 const char* commandStr[] = { "end", "in", "out", "wait", "event", "exec",
@ -57,7 +59,7 @@ static char* printCommands(StreamBuffer& buffer, const char* c)
                break;
            case wait_cmd:
                timeout = extract<unsigned long>(c);
-                buffer.print("    wait %ld;\n # ms", timeout);
+                buffer.print("    wait %ld; # ms\n", timeout);
                break;
            case event_cmd:
                eventnumber = extract<unsigned long>(c);
@ -163,7 +165,7 @@ attachBus(const char* busname, int addr, const char* param)
    businterface = StreamBusInterface::find(this, busname, addr, param);
    if (!businterface)
    {
-        error("Businterface '%s' not found for '%s'\n",
+        error("Cannot find a bus named '%s' for '%s'\n",
            busname, name());
        return false;
    }
@ -341,6 +343,7 @@ compileCommand(StreamProtocolParser::Protocol* protocol,
                return false;
            }
            args++;
+            while (isspace(*args)) args++;
        }
        buffer.append(&eventmask, sizeof(eventmask));
        if (*args)
@ -746,7 +749,7 @@ printSeparator()
 bool StreamCore::
 printValue(const StreamFormat& fmt, long value)
 {
-    if (fmt.type != long_format && fmt.type != enum_format)
+    if (fmt.type != unsigned_format && fmt.type != signed_format && fmt.type != enum_format)
    {
        error("%s: printValue(long) called with %%%c format\n",
            name(), fmt.conv);
@ -760,8 +763,8 @@ printValue(const StreamFormat& fmt, long value)
            name(), value);
        return false;
    }
-    debug("StreamCore::printValue(%s, long): \"%s\"\n",
-        name(), outputLine.expand()());
+    debug("StreamCore::printValue %s %%%c long %ld (%lx): \"%s\"\n",
+        name(), fmt.conv, value, value, outputLine.expand()());
    return true;
 }

@ -782,8 +785,8 @@ printValue(const StreamFormat& fmt, double value)
            name(), value);
        return false;
    }
-    debug("StreamCore::printValue(%s, double): \"%s\"\n",
-        name(), outputLine.expand()());
+    debug("StreamCore::printValue %s %%%c double %#g: \"%s\"\n",
+        name(), fmt.conv, value, outputLine.expand()());
    return true;
 }

@ -805,8 +808,8 @@ printValue(const StreamFormat& fmt, char* value)
            name(), buffer.expand()());
        return false;
    }
-    debug("StreamCore::printValue(%s, char*): \"%s\"\n",
-        name(), outputLine.expand()());
+    debug("StreamCore::printValue %s %%%c char* \"%s\"): \"%s\"\n",
+        name(), fmt.conv, value, outputLine.expand()());
    return true;
 }

@ -815,7 +818,7 @@ lockCallback(StreamIoStatus status)
 {
    MutexLock lock(this);
    debug("StreamCore::lockCallback(%s, status=%s)\n",
-        name(), status ? "Timeout" : "Success");
+        name(), StreamIoStatusStr[status]);
    if (!(flags & LockPending))
    {
        error("StreamCore::lockCallback(%s) called unexpectedly\n",
@ -829,9 +832,21 @@ lockCallback(StreamIoStatus status)
        case StreamIoSuccess:
            break;
        case StreamIoTimeout:
+            error("%s: Cannot lock device within %ld ms, device seems to be busy\n",
+                name(), lockTimeout);
+            flags &= ~BusOwner;
+            finishProtocol(LockTimeout);
+            return;
+        case StreamIoFault:
+            error("%s: Locking failed because of a device fault\n",
+                name());
+            flags &= ~BusOwner;
            finishProtocol(LockTimeout);
            return;
        default:
+            error("StreamCore::lockCallback(%s) unexpected status %s\n",
+                name(), StreamIoStatusStr[status]);
+            flags &= ~BusOwner;
            finishProtocol(Fault);
            return;
    }
@ -982,7 +997,7 @@ readCallback(StreamIoStatus status,
            finishProtocol(ReplyTimeout);
            return 0;
        case StreamIoFault:
-            error("%s: I/O error after reading %ld byte%s: \"%s%s\"\n",
+            error("%s: I/O error after reading %"P"d byte%s: \"%s%s\"\n",
                name(),
                inputBuffer.length(), inputBuffer.length()==1 ? "" : "s",
                inputBuffer.length() > 20 ? "..." : "",
@ -991,7 +1006,7 @@ readCallback(StreamIoStatus status,
            return 0;
    }
    inputBuffer.append(input, size);
-    debug("StreamCore::readCallback(%s) inputBuffer=\"%s\", size %ld\n",
+    debug("StreamCore::readCallback(%s) inputBuffer=\"%s\", size %"P"d\n",
        name(), inputBuffer.expand()(), inputBuffer.length());
    if (*activeCommand != in_cmd)
    {
@ -1184,6 +1199,7 @@ normal_format:
                int consumed;
                // code layout:
                // formatstring <eos> StreamFormat [info]
+                formatstring.clear();
                commandIndex = StreamProtocolParser::printString(formatstring, commandIndex);
                
                StreamFormat fmt = extract<StreamFormat>(commandIndex);
@ -1200,7 +1216,8 @@ normal_format:
                    double ddummy;
                    switch (fmt.type)
                    {
-                        case long_format:
+                        case unsigned_format:
+                        case signed_format:
                        case enum_format:
                            consumed = StreamFormatConverter::find(fmt.conv)->
                                scanLong(fmt, inputLine(consumedInput), ldummy);
@ -1303,8 +1320,8 @@ normal_format:
                                inputLine.length()-consumedInput > 20 ? "..." : "",
                                formatstring());
                        else
-                            error("%s: Format \"%%%s\" has data type %s which does not match variable \"%s\".\n",
-                                name(), formatstring(), StreamFormatTypeStr[fmt.type], fieldName);
+                            error("%s: Format \"%%%s\" has data type %s which does not match the type of \"%s\".\n",
+                                name(), formatstring(), StreamFormatTypeStr[fmt.type], fieldAddress ? fieldName : name());
                    }
                    return false;
                }
@ -1441,7 +1458,7 @@ matchSeparator()
 long StreamCore::
 scanValue(const StreamFormat& fmt, long& value)
 {
-    if (fmt.type != long_format && fmt.type != enum_format)
+    if (fmt.type != unsigned_format && fmt.type != signed_format && fmt.type != enum_format)
    {
        error("%s: scanValue(long&) called with %%%c format\n",
            name(), fmt.conv);
@ -1462,6 +1479,7 @@ scanValue(const StreamFormat& fmt, long& value)
        }
        else return -1;
    }
+    if (fmt.flags & fix_width_flag && consumed != fmt.width) return -1;
    if (consumed > inputLine.length()-consumedInput) return -1;
    debug("StreamCore::scanValue(%s) scanned %li\n",
        name(), value);
@ -1493,6 +1511,7 @@ scanValue(const StreamFormat& fmt, double& value)
        }
        else return -1;
    }
+    if (fmt.flags & fix_width_flag && (consumed != (fmt.width + fmt.prec + 1))) return -1;
    if (consumed > inputLine.length()-consumedInput) return -1;
    debug("StreamCore::scanValue(%s) scanned %#g\n",
        name(), value);
@ -1525,6 +1544,7 @@ scanValue(const StreamFormat& fmt, char* value, long maxlen)
        }
        else return -1;
    }
+    if (fmt.flags & fix_width_flag && consumed != fmt.width) return -1;
    if (consumed > inputLine.length()-consumedInput) return -1;
 #ifndef NO_TEMPORARY
    debug("StreamCore::scanValue(%s) scanned \"%s\"\n",
@ -1734,4 +1754,25 @@ disconnectCallback(StreamIoStatus status)
    }
 }

+void StreamCore::
+printStatus(StreamBuffer& buffer)
+{
+    buffer.print("active command=%s ",
+        activeCommand ? commandName(*activeCommand) : "NULL");
+    buffer.print("flags=0x%04lx ", flags);
+    if (flags & IgnoreExtraInput) buffer.append("IgnoreExtraInput ");
+    if (flags & InitRun) buffer.append("InitRun ");
+    if (flags & AsyncMode) buffer.append("AsyncMode ");
+    if (flags & GotValue) buffer.append("GotValue ");
+    if (flags & BusOwner) buffer.append("BusOwner ");
+    if (flags & Separator) buffer.append("Separator ");
+    if (flags & ScanTried) buffer.append("ScanTried ");
+    if (flags & AcceptInput) buffer.append("AcceptInput ");
+    if (flags & AcceptEvent) buffer.append("AcceptEvent ");
+    if (flags & LockPending) buffer.append("LockPending ");
+    if (flags & WritePending) buffer.append("WritePending ");
+    if (flags & WaitPending) buffer.append("WaitPending ");
+    busPrintStatus(buffer);
+}
+
 #include "streamReferences"
--- a/src/StreamCore.h
+++ b/src/StreamCore.h
@ -219,6 +219,7 @@ public:
    bool parse(const char* filename, const char* protocolname);
    void printProtocol();
    const char* name() { return streamname; }
+    void printStatus(StreamBuffer& buffer);
 };

 #endif
--- a/src/StreamEpics.cc
+++ b/src/StreamEpics.cc
@ -18,14 +18,24 @@
 *                                                              *
 ***************************************************************/

+#define epicsExportSharedSymbols
+#include "devStream.h"
+#undef epicsExportSharedSymbols
 #include "StreamCore.h"
 #include "StreamError.h"
-#include "devStream.h"

-#ifndef EPICS_3_14
+#include <epicsVersion.h>
+#ifdef BASE_VERSION
+#define EPICS_3_13
+#endif
+
+#ifdef EPICS_3_13
 extern "C" {
 #endif

+#define epicsAlarmGLOBAL
+#include <alarm.h>
+#undef epicsAlarmGLOBAL
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdlib.h>
@ -34,10 +44,9 @@ extern "C" {
 #include <recSup.h>
 #include <recGbl.h>
 #include <devLib.h>
-#include <alarm.h>
 #include <callback.h>

-#ifndef EPICS_3_14
+#ifdef EPICS_3_13

 #include <semLib.h>
 #include <wdLib.h>
@ -87,24 +96,24 @@ extern "C" void streamRecordProcessCallback(CALLBACK *pcallback);
 extern "C" long streamReload(char* recordname);

 class Stream : protected StreamCore
-#ifdef EPICS_3_14
+#ifndef EPICS_3_13
    , epicsTimerNotify
 #endif
 {
    dbCommon* record;
-    struct link *ioLink;
+    const struct link *ioLink;
    streamIoFunction readData;
    streamIoFunction writeData;
-#ifdef EPICS_3_14
-    epicsTimerQueueActive* timerQueue;
-    epicsTimer* timer;
-    epicsMutex mutex;
-    epicsEvent initDone;
-#else
+#ifdef EPICS_3_13
    WDOG_ID timer;
    CALLBACK timeoutCallback;
    SEM_ID mutex;
    SEM_ID initDone;
+#else
+    epicsTimerQueueActive* timerQueue;
+    epicsTimer* timer;
+    epicsMutex mutex;
+    epicsEvent initDone;
 #endif
    StreamBuffer fieldBuffer;
    int status;
@ -115,11 +124,11 @@ class Stream : protected StreamCore
    CALLBACK processCallback;


-#ifdef EPICS_3_14
+#ifdef EPICS_3_13
+    static void expire(CALLBACK *pcallback);
+#else
 // epicsTimerNotify method
    expireStatus expire(const epicsTime&);
-#else
-    static void expire(CALLBACK *pcallback);
 #endif

 // StreamCore methods
@ -139,16 +148,19 @@ class Stream : protected StreamCore
    friend void streamRecordProcessCallback(CALLBACK *pcallback);

 // Stream Epics methods
-    long initRecord();
-    Stream(dbCommon* record, struct link *ioLink,
+    Stream(dbCommon* record, const struct link *ioLink,
        streamIoFunction readData, streamIoFunction writeData);
    ~Stream();
+    long parseLink(const struct link *ioLink, char* filename, char* protocol,
+        char* busname, int* addr, char* busparam);
+    long initRecord(const char* filename, const char* protocol,
+        const char* busname, int addr, const char* busparam);
    bool print(format_t *format, va_list ap);
    bool scan(format_t *format, void* pvalue, size_t maxStringSize);
    bool process();

 // device support functions
-    friend long streamInitRecord(dbCommon *record, struct link *ioLink,
+    friend long streamInitRecord(dbCommon *record, const struct link *ioLink,
        streamIoFunction readData, streamIoFunction writeData);
    friend long streamReadWrite(dbCommon *record);
    friend long streamGetIointInfo(int cmd, dbCommon *record,
@ -166,7 +178,7 @@ public:


 // shell functions ///////////////////////////////////////////////////////
-#ifdef EPICS_3_14
+#ifndef EPICS_3_13
 extern "C" {
 epicsExportAddress(int, streamDebug);
 }
@ -225,7 +237,7 @@ extern "C" long streamReload(char* recordname)
    return OK;
 }

-#ifdef EPICS_3_14
+#ifndef EPICS_3_13
 static const iocshArg streamReloadArg0 =
    { "recordname", iocshArgString };
 static const iocshArg * const streamReloadArgs[] =
@ -251,33 +263,27 @@ static void streamRegistrar ()
 extern "C" {
 epicsExportRegistrar(streamRegistrar);
 }
-#endif // EPICS_3_14
+#endif

 // driver support ////////////////////////////////////////////////////////

 struct stream_drvsup {
    long number;
    long (*report)(int);
-    DRVSUPFUN init;
+    long (*init)();
 } stream = {
    2,
    Stream::report,
    Stream::drvInit
 };

-#ifdef EPICS_3_14
+#ifndef EPICS_3_13
 extern "C" {
 epicsExportAddress(drvet, stream);
 }
+#endif

-void streamEpicsPrintTimestamp(char* buffer, int size)
-{
-    int tlen;
-    epicsTime tm = epicsTime::getCurrent();
-    tlen = tm.strftime(buffer, size, "%Y/%m/%d %H:%M:%S.%03f");
-    sprintf(buffer+tlen, " %.*s", size-tlen-2, epicsThreadGetNameSelf());
-}
-#else
+#ifdef EPICS_3_13
 void streamEpicsPrintTimestamp(char* buffer, int size)
 {
    int tlen;
@ -292,6 +298,14 @@ void streamEpicsPrintTimestamp(char* buffer, int size)
    tlen = strlen(buffer);
    sprintf(buffer+tlen, " %.*s", size-tlen-2, taskName(0));
 }
+#else
+void streamEpicsPrintTimestamp(char* buffer, int size)
+{
+    int tlen;
+    epicsTime tm = epicsTime::getCurrent();
+    tlen = tm.strftime(buffer, size, "%Y/%m/%d %H:%M:%S.%06f");
+    sprintf(buffer+tlen, " %.*s", size-tlen-2, epicsThreadGetNameSelf());
+}
 #endif

 long Stream::
@ -336,6 +350,12 @@ report(int interest)
        {
            printf("    %s: %s\n", pstream->name(),
                pstream->ioLink->value.instio.string);
+            if (interest == 3)
+            {
+                StreamBuffer buffer;
+                pstream->printStatus(buffer);
+                printf("      %s\n", buffer());
+            }
        }
    }
    return OK;
@ -393,30 +413,52 @@ long streamInit(int after)
    return OK;
 }

-long streamInitRecord(dbCommon* record, struct link *ioLink,
+long streamInitRecord(dbCommon* record, const struct link *ioLink,
    streamIoFunction readData, streamIoFunction writeData)
 {
+    long status;
+    char filename[80];
+    char protocol[80];
+    char busname[80];
+    int addr = -1;
+    char busparam[80];
+    memset(busparam, 0 ,sizeof(busparam));
+
    debug("streamInitRecord(%s): SEVR=%d\n", record->name, record->sevr);
    Stream* pstream = (Stream*)record->dpvt;
    if (!pstream)
    {
        // initialize the first time
+        debug("streamInitRecord(%s): create new Stream object\n",
+            record->name);
        pstream = new Stream(record, ioLink, readData, writeData);
        record->dpvt = pstream;
    } else {
        // stop any running protocol
+        debug("streamInitRecord(%s): stop running protocol\n",
+            record->name);
        pstream->finishProtocol(Stream::Abort);
    }
+    // scan the i/o link
+    debug("streamInitRecord(%s): parse link \"%s\"\n",
+        record->name, ioLink->value.instio.string);
+    status = pstream->parseLink(ioLink, filename, protocol,
+        busname, &addr, busparam);
    // (re)initialize bus and protocol
-    long status = pstream->initRecord();
+    debug("streamInitRecord(%s): calling initRecord\n",
+        record->name);
+    if (status == 0)
+        status = pstream->initRecord(filename, protocol,
+            busname, addr, busparam);
    if (status != OK && status != DO_NOT_CONVERT)
    {
        error("%s: Record initialization failed\n", record->name);
    }
-    if (!pstream->ioscanpvt)
+    else if (!pstream->ioscanpvt)
    {
        scanIoInit(&pstream->ioscanpvt);
    }
+    debug("streamInitRecord(%s) done status=%#lx\n", record->name, status);
    return status;
 }

@ -436,7 +478,8 @@ long streamGetIointInfo(int cmd, dbCommon *record, IOSCANPVT *ppvt)
 {
    Stream* pstream = (Stream*)record->dpvt;
    debug("streamGetIointInfo(%s,cmd=%d): pstream=%p, ioscanpvt=%p\n",
-        record->name, cmd, (void*)pstream, pstream ? pstream->ioscanpvt : NULL);
+        record->name, cmd,
+        (void*)pstream, pstream ? pstream->ioscanpvt : NULL);
    if (!pstream)
    {
        error("streamGetIointInfo called without stream instance\n");
@ -495,20 +538,20 @@ long streamScanfN(dbCommon* record, format_t *format,
 // Stream methods ////////////////////////////////////////////////////////

 Stream::
-Stream(dbCommon* _record, struct link *ioLink,
+Stream(dbCommon* _record, const struct link *ioLink,
    streamIoFunction readData, streamIoFunction writeData)
 :record(_record), ioLink(ioLink), readData(readData), writeData(writeData)
 {
    streamname = record->name;
-#ifdef EPICS_3_14
-    timerQueue = &epicsTimerQueueActive::allocate(true);
-    timer = &timerQueue->createTimer();
-#else
+#ifdef EPICS_3_13
    timer = wdCreate();
    mutex = semMCreate(SEM_INVERSION_SAFE | SEM_Q_PRIORITY);
    initDone = semBCreate(SEM_Q_FIFO, SEM_EMPTY);
    callbackSetCallback(expire, &timeoutCallback);
    callbackSetUser(this, &timeoutCallback);
+#else
+    timerQueue = &epicsTimerQueueActive::allocate(true);
+    timer = &timerQueue->createTimer();
 #endif
    callbackSetCallback(streamExecuteCommand, &commandCallback);
    callbackSetUser(this, &commandCallback);
@ -532,59 +575,61 @@ Stream::
        record->dpvt = NULL;
        debug("~Stream(%s): dpvt cleared\n", name());
    }
-#ifdef EPICS_3_14
+#ifdef EPICS_3_13
+    wdDelete(timer);
+    debug("~Stream(%s): watchdog destroyed\n", name());
+#else
    timer->destroy();
    debug("~Stream(%s): timer destroyed\n", name());
    timerQueue->release();
    debug("~Stream(%s): timer queue released\n", name());
-#else
-    wdDelete(timer);
-    debug("~Stream(%s): watchdog destroyed\n", name());
 #endif
    releaseMutex();
 }

 long Stream::
-initRecord()
+parseLink(const struct link *ioLink, char* filename,
+    char* protocol, char* busname, int* addr, char* busparam)
 {
-    // scan link parameters: filename protocol busname addr busparam
-    // It is safe to call this function again with different
-    // link text or different protocol file.
-
-    char filename[80];
-    char protocol[80];
-    char busname[80];
-    int addr = -1;
-    char busparam[80];
+    // parse link parameters: filename protocol busname addr busparam
    int n;
-
    if (ioLink->type != INST_IO)
    {
-        error("%s: Wrong link type %s\n", name(),
+        error("%s: Wrong I/O link type %s\n", name(),
            pamaplinkType[ioLink->type].strvalue);
        return S_dev_badInitRet;
    }
-    int items = sscanf(ioLink->value.instio.string, "%79s%79s%79s%n%i%n",
-        filename, protocol, busname, &n, &addr, &n);
+    int items = sscanf(ioLink->value.instio.string, "%s%s%s%n%i%n",
+        filename, protocol, busname, &n, addr, &n);
    if (items <= 0)
    {
-        error("%s: Empty link. Forgot the leading '@' or confused INP with OUT ?\n",
+        error("%s: Empty I/O link. "
+            "Forgot the leading '@' or confused INP with OUT ?\n",
            name());
        return S_dev_badInitRet;
    }
    if (items < 3)
    {
-        error("%s: Wrong link format\n"
+        error("%s: Wrong I/O link format\n"
            "  expect \"@file protocol bus addr params\"\n"
            "  in \"@%s\"\n", name(),
            ioLink->value.instio.string);
        return S_dev_badInitRet;
    }
-    memset(busparam, 0 ,80);
-    for (n = 0; isspace((unsigned char)ioLink->value.instio.string[n]); n++);
-    strncpy (busparam, ioLink->value.constantStr+n, 79);
+    while (isspace((unsigned char)ioLink->value.instio.string[n])) n++;
+    strcpy (busparam, ioLink->value.constantStr+n);
+    return OK;
+}
+
+long Stream::
+initRecord(const char* filename, const char* protocol,
+    const char* busname, int addr, const char* busparam)
+{
+    // It is safe to call this function again with different arguments

    // attach to bus interface
+    debug("Stream::initRecord %s: attachBus(%s, %d, \"%s\")\n",
+        name(), busname, addr, busparam);
    if (!attachBus(busname, addr, busparam))
    {
        error("%s: Can't attach to bus %s %d\n",
@ -593,6 +638,8 @@ initRecord()
    }

    // parse protocol file
+    debug("Stream::initRecord %s: parse(%s, %s)\n",
+        name(), filename, protocol);
    if (!parse(filename, protocol))
    {
        error("%s: Protocol parse error\n",
@ -610,7 +657,8 @@ initRecord()
            name());
        if (record->scan == SCAN_IO_EVENT)
        {
-            debug("Stream::initRecord %s: restarting \"I/O Intr\" after reload\n",
+            debug("Stream::initRecord %s: "
+                "restarting \"I/O Intr\" after reload\n",
                name());
            if (!startProtocol(StartAsync))
            {
@ -635,10 +683,10 @@ initRecord()
    }
    debug("Stream::initRecord %s: waiting for initDone\n",
        name());
-#ifdef EPICS_3_14
-    initDone.wait();
-#else
+#ifdef EPICS_3_13
    semTake(initDone, WAIT_FOREVER);
+#else
+    initDone.wait();
 #endif
    debug("Stream::initRecord %s: initDone\n",
        name());
@ -664,8 +712,11 @@ process()
    {
        if (status != NO_ALARM)
        {
-            debug("Stream::process(%s) error status=%d\n",
-                name(), status);
+            debug("Stream::process(%s) error status=%s (%d)\n",
+                name(),
+                status >= 0 && status < ALARM_NSTATUS ? 
+                    epicsAlarmConditionStrings[status] : "ERROR",
+                status);
            (void) recGblSetSevr(record, status, INVALID_ALARM);
            return false;
        }
@ -700,21 +751,16 @@ process()
 bool Stream::
 print(format_t *format, va_list ap)
 {
-    long lval;
-    double dval;
-    char* sval;
    switch (format->type)
    {
-        case DBF_ENUM:
+        case DBF_ULONG:
        case DBF_LONG:
-            lval = va_arg(ap, long);
-            return printValue(*format->priv, lval);
+        case DBF_ENUM:
+            return printValue(*format->priv, va_arg(ap, long));
        case DBF_DOUBLE:
-            dval = va_arg(ap, double);
-            return printValue(*format->priv, dval);
+            return printValue(*format->priv, va_arg(ap, double));
        case DBF_STRING:
-            sval = va_arg(ap, char*);
-            return printValue(*format->priv, sval);
+            return printValue(*format->priv, va_arg(ap, char*));
    }
    error("INTERNAL ERROR (%s): Illegal format type\n", name());
    return false;
@ -724,27 +770,23 @@ bool Stream::
 scan(format_t *format, void* value, size_t maxStringSize)
 {
    // called by streamScanfN
-    long* lptr;
-    double* dptr;
-    char* sptr;

    // first remove old value from inputLine (if we are scanning arrays)
    consumedInput += currentValueLength;
    currentValueLength = 0;
    switch (format->type)
    {
+        case DBF_ULONG:
        case DBF_LONG:
        case DBF_ENUM:
-            lptr = (long*)value;
-            currentValueLength = scanValue(*format->priv, *lptr);
+            currentValueLength = scanValue(*format->priv, *(long*)value);
            break;
        case DBF_DOUBLE:
-            dptr = (double*)value;
-            currentValueLength = scanValue(*format->priv, *dptr);
+            currentValueLength = scanValue(*format->priv, *(double*)value);
            break;
        case DBF_STRING:
-            sptr = (char*)value;
-            currentValueLength  = scanValue(*format->priv, sptr, maxStringSize);
+            currentValueLength  = scanValue(*format->priv, (char*)value,
+                maxStringSize);
            break;
        default:
            error("INTERNAL ERROR (%s): Illegal format type\n", name());
@ -762,20 +804,20 @@ scan(format_t *format, void* value, size_t maxStringSize)

 // epicsTimerNotify virtual method ///////////////////////////////////////

-#ifdef EPICS_3_14
-epicsTimerNotify::expireStatus Stream::
-expire(const epicsTime&)
-{
-    timerCallback();
-    return noRestart;
-}
-#else
+#ifdef EPICS_3_13
 void Stream::
 expire(CALLBACK *pcallback)
 {
    Stream* pstream = static_cast<Stream*>(pcallback->user);
    pstream->timerCallback();
 }
+#else
+epicsTimerNotify::expireStatus Stream::
+expire(const epicsTime&)
+{
+    timerCallback();
+    return noRestart;
+}
 #endif

 // StreamCore virtual methods ////////////////////////////////////////////
@ -835,10 +877,10 @@ protocolFinishHook(ProtocolResult result)
    }
    if (flags & InitRun)
    {
-#ifdef EPICS_3_14
-        initDone.signal();
-#else
+#ifdef EPICS_3_13
        semGive(initDone);
+#else
+        initDone.signal();
 #endif
        return;
    }
@ -891,13 +933,13 @@ startTimer(unsigned long timeout)
 {
    debug("Stream::startTimer(stream=%s, timeout=%lu) = %f seconds\n",
        name(), timeout, timeout * 0.001);
-#ifdef EPICS_3_14
-    timer->start(*this, timeout * 0.001);
-#else
+#ifdef EPICS_3_13
    callbackSetPriority(priority(), &timeoutCallback);
    wdStart(timer, (timeout+1)*sysClkRateGet()/1000-1,
        reinterpret_cast<FUNCPTR>(callbackRequest),
        reinterpret_cast<int>(&timeoutCallback));
+#else
+    timer->start(*this, timeout * 0.001);
 #endif
 }

@ -913,13 +955,13 @@ getFieldAddress(const char* fieldname, StreamBuffer& address)
    else
    {
        // FIELD in this record or VAL in other record
-        char fullname[PVNAME_SZ + 1];
-        sprintf(fullname, "%s.%s", name(), fieldname);
-        if (dbNameToAddr(fullname, &dbaddr) != OK)
+        StreamBuffer fullname;
+        fullname.print("%s.%s", name(), fieldname);
+        if (dbNameToAddr(fullname(), &dbaddr) != OK)
        {
            // VAL in other record
-            sprintf(fullname, "%s.VAL", fieldname);
-            if (dbNameToAddr(fullname, &dbaddr) != OK) return false;
+            fullname.clear().print("%s.VAL", fieldname);
+            if (dbNameToAddr(fullname(), &dbaddr) != OK) return false;
        }
    }
    address.append(&dbaddr, sizeof(dbaddr));
@ -927,9 +969,9 @@ getFieldAddress(const char* fieldname, StreamBuffer& address)
 }

 static const unsigned char dbfMapping[] =
-    {0, DBF_LONG, DBF_ENUM, DBF_DOUBLE, DBF_STRING};
+    {0, DBF_ULONG, DBF_LONG, DBF_ENUM, DBF_DOUBLE, DBF_STRING};
 static const short typeSize[] =
-    {0, sizeof(epicsInt32), sizeof(epicsUInt16),
+    {0, sizeof(epicsUInt32), sizeof(epicsInt32), sizeof(epicsUInt16),
        sizeof(epicsFloat64), MAX_STRING_SIZE};

 bool Stream::
@ -941,23 +983,24 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
 // --  TO DO: If SCAN is "I/O Intr" and record has not been processed,  --
 // --  do it now to get the latest value (only for output records?)     --

+    format_s fmt;
+    fmt.type = dbfMapping[format.type];
+    fmt.priv = &format;
    if (fieldaddress)
    {
        // Format like "%([record.]field)..." has requested to get value
        // from field of this or other record.
        DBADDR* pdbaddr = (DBADDR*)fieldaddress;
-        long i;
-        long nelem = pdbaddr->no_elements;
-        size_t size = nelem * typeSize[format.type];
-        char* buffer = fieldBuffer.clear().reserve(size);
        
+        /* Handle time stamps special. %T converter takes double. */
        if (strcmp(((dbFldDes*)pdbaddr->pfldDes)->name, "TIME") == 0)
        {
            double time;
            
            if (format.type != double_format)
            {
-                error ("%s: can only read double values from TIME field\n", name());
+                error ("%s: can only read double values from TIME field\n",
+                    name());
                return false;
            }
            if (pdbaddr->precord == record)
@ -965,12 +1008,37 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
                /* if getting time from own record, update timestamp first */
                recGblGetTimeStamp(record);
            }
-            time = pdbaddr->precord->time.secPastEpoch + 631152000u + pdbaddr->precord->time.nsec * 1e-9;
-            debug("Stream::formatValue(%s): read %f from TIME field\n", name(), time);
+            /* convert EPICS epoch (1990) to unix epoch (1970) */
+            /* we are losing about 3 digits precision here */
+            time = pdbaddr->precord->time.secPastEpoch +
+                631152000u + pdbaddr->precord->time.nsec * 1e-9;
+            debug("Stream::formatValue(%s): read %f from TIME field\n",
+                name(), time);
            return printValue(format, time);
        }

-        if (dbGet(pdbaddr, dbfMapping[format.type], buffer,
+        /* convert type to LONG, ENUM, DOUBLE, or STRING */
+        long nelem = pdbaddr->no_elements;
+        size_t size = nelem * typeSize[format.type];
+
+        /* print (U)CHAR arrays as string */
+        if (format.type == string_format &&
+            (pdbaddr->field_type == DBF_CHAR || pdbaddr->field_type == DBF_UCHAR))
+        {
+            debug("Stream::formatValue(%s): format %s.%s array[%ld] size %d of %s as string\n",
+                name(),
+                pdbaddr->precord->name,
+                ((dbFldDes*)pdbaddr->pfldDes)->name,
+                nelem,
+                pdbaddr->field_size,
+                pamapdbfType[pdbaddr->field_type].strvalue);
+            fmt.type = DBF_CHAR;
+            size = nelem;
+        }
+        
+        char* buffer = fieldBuffer.clear().reserve(size);
+
+        if (dbGet(pdbaddr, fmt.type, buffer,
            NULL, &nelem, NULL) != 0)
        {
            error("%s: dbGet(%s.%s, %s) failed\n",
@ -980,6 +1048,18 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
                pamapdbfType[dbfMapping[format.type]].strvalue);
            return false;
        }
+        debug("Stream::formatValue(%s): got %ld elements\n",
+                name(),nelem);
+
+        /* terminate CHAR array as string */
+        if (fmt.type == DBF_CHAR)
+        {
+            if (nelem >= pdbaddr->no_elements) nelem = pdbaddr->no_elements-1;
+            buffer[nelem] = 0;
+            nelem = 1; /* array is only 1 string */
+        }
+
+        long i;
        for (i = 0; i < nelem; i++)
        {
            switch (format.type)
@ -989,7 +1069,12 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
                        (long)((epicsUInt16*)buffer)[i]))
                        return false;
                    break;
-                case long_format:
+                case unsigned_format:
+                    if (!printValue(format,
+                        (long)((epicsUInt32*)buffer)[i]))
+                        return false;
+                    break;
+                case signed_format:
                    if (!printValue(format,
                        (long)((epicsInt32*)buffer)[i]))
                        return false;
@ -1004,8 +1089,10 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
                        return false;
                    break;
                case pseudo_format:
-                    error("%s: %%(FIELD) syntax not allowed with pseudo formats\n",
+                    error("%s: %%(FIELD) syntax not allowed "
+                        "with pseudo formats\n",
                        name());
+                    return false;
                default:
                    error("INTERNAL ERROR %s: Illegal format.type=%d\n",
                        name(), format.type);
@ -1014,9 +1101,6 @@ formatValue(const StreamFormat& format, const void* fieldaddress)
        }
        return true;
    }
-    format_s fmt;
-    fmt.type = dbfMapping[format.type];
-    fmt.priv = &format;
    debug("Stream::formatValue(%s) format=%%%c type=%s\n",
        name(), format.conv, pamapdbfType[fmt.type].strvalue);
    if (!writeData)
@ -1042,7 +1126,10 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
    char* buffer;
    int status;
    const char* putfunc;
+    format_s fmt;

+    fmt.type = dbfMapping[format.type];
+    fmt.priv = &format;
    if (fieldaddress)
    {
        // Format like "%([record.]field)..." has requested to put value
@ -1054,43 +1141,79 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
        buffer = fieldBuffer.clear().reserve(size);
        for (nord = 0; nord < nelem; nord++)
        {
-            debug("Stream::matchValue(%s): buffer before: %s\n", name(), fieldBuffer.expand()());
+            debug("Stream::matchValue(%s): buffer before: %s\n",
+                name(), fieldBuffer.expand()());
            switch (format.type)
            {
-                case long_format:
+                case unsigned_format:
+                {
+                    consumed = scanValue(format, lval);
+                    if (consumed >= 0) ((epicsUInt32*)buffer)[nord] = lval;
+                    debug("Stream::matchValue(%s): %s.%s[%li] = %lu\n",
+                            name(), pdbaddr->precord->name,
+                            ((dbFldDes*)pdbaddr->pfldDes)->name,
+                            nord, lval);
+                    break;
+                }
+                case signed_format:
                {
                    consumed = scanValue(format, lval);
                    if (consumed >= 0) ((epicsInt32*)buffer)[nord] = lval;
-                    debug("Stream::matchValue(%s): %s[%li] = %li\n",
-                            name(), pdbaddr->precord->name, nord, lval);
+                    debug("Stream::matchValue(%s): %s.%s[%li] = %li\n",
+                            name(), pdbaddr->precord->name,
+                            ((dbFldDes*)pdbaddr->pfldDes)->name,
+                            nord, lval);
                    break;
                }
                case enum_format:
                {
                    consumed = scanValue(format, lval);
-                    if (consumed >= 0) ((epicsUInt16*)buffer)[nord] = (epicsUInt16)lval;
-                    debug("Stream::matchValue(%s): %s[%li] = %li\n",
-                            name(), pdbaddr->precord->name, nord, lval);
+                    if (consumed >= 0)
+                        ((epicsUInt16*)buffer)[nord] = (epicsUInt16)lval;
+                    debug("Stream::matchValue(%s): %s.%s[%li] = %li\n",
+                            name(), pdbaddr->precord->name,
+                            ((dbFldDes*)pdbaddr->pfldDes)->name,
+                            nord, lval);
                    break;
                }
                case double_format:
                {
                    consumed = scanValue(format, dval);
-                    // Direct assignment to buffer fails fith gcc 3.4.3 for xscale_be
+                    // Direct assignment to buffer fails with
+                    // gcc 3.4.3 for xscale_be
                    // Optimization bug?
                    epicsFloat64 f64=dval;
-                    if (consumed >= 0) memcpy(((epicsFloat64*)buffer)+nord, &f64, sizeof(f64));
-                    debug("Stream::matchValue(%s): %s[%li] = %#g %#g\n",
-                            name(), pdbaddr->precord->name, nord, dval,
+                    if (consumed >= 0)
+                        memcpy(((epicsFloat64*)buffer)+nord,
+                            &f64, sizeof(f64));
+                    debug("Stream::matchValue(%s): %s.%s[%li] = %#g %#g\n",
+                            name(), pdbaddr->precord->name,
+                            ((dbFldDes*)pdbaddr->pfldDes)->name,
+                            nord, dval,
                            ((epicsFloat64*)buffer)[nord]);
                    break;
                }
                case string_format:
                {
-                    consumed = scanValue(format,
-                        buffer+MAX_STRING_SIZE*nord, MAX_STRING_SIZE);
-                    debug("Stream::matchValue(%s): %s[%li] = \"%.*s\"\n",
-                            name(), pdbaddr->precord->name, nord, MAX_STRING_SIZE, buffer+MAX_STRING_SIZE*nord);
+                    if (pdbaddr->field_type == DBF_CHAR)
+                    {
+                        // string to char array
+                        consumed = scanValue(format, buffer, nelem);
+                        debug("Stream::matchValue(%s): %s.%s = \"%.*s\"\n",
+                                name(), pdbaddr->precord->name,
+                                ((dbFldDes*)pdbaddr->pfldDes)->name,
+                                (int)consumed, buffer);
+                        nord = nelem;
+                    }
+                    else
+                    {
+                        consumed = scanValue(format,
+                            buffer+MAX_STRING_SIZE*nord, MAX_STRING_SIZE);
+                        debug("Stream::matchValue(%s): %s.%s[%li] = \"%.*s\"\n",
+                                name(), pdbaddr->precord->name,
+                                ((dbFldDes*)pdbaddr->pfldDes)->name,
+                                nord, MAX_STRING_SIZE, buffer+MAX_STRING_SIZE*nord);
+                    }
                    break;
                }
                default:
@ -1098,7 +1221,8 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
                        "Illegal format type\n", name());
                    return false;
            }
-            debug("Stream::matchValue(%s): buffer after: %s\n", name(), fieldBuffer.expand()());
+            debug("Stream::matchValue(%s): buffer after: %s\n",
+                name(), fieldBuffer.expand()());
            if (consumed < 0) break;
            consumedInput += consumed;
        }
@ -1107,7 +1231,8 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
            // scan error: set other record to alarm status
            if (pdbaddr->precord != record)
            {
-                (void) recGblSetSevr(pdbaddr->precord, CALC_ALARM, INVALID_ALARM);
+                (void) recGblSetSevr(pdbaddr->precord,
+                    CALC_ALARM, INVALID_ALARM);
                if (!INIT_RUN)
                {
                    // process other record to send alarm monitor
@ -1121,34 +1246,42 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
 #ifdef epicsTimeEventDeviceTime
            if (format.type != double_format)
            {
-                error ("%s: can only write double values to TIME field\n", name());
+                error ("%s: can only write double values to TIME field\n",
+                    name());
                return false;
            }
+            /* convert from Unix epoch (1 Jan 1970) to EPICS epoch (1 Jan 1990) */
            dval = dval-631152000u;
            pdbaddr->precord->time.secPastEpoch = (long)dval;
-            /* rouding: we don't have 9 digits precision in a double of today's number of seconds */
+            // rouding: we don't have 9 digits precision
+            // in a double of today's number of seconds
            pdbaddr->precord->time.nsec = (long)((dval-(long)dval)*1e6)*1000;
-            debug("Stream::matchValue(%s): writing %i.%i to TIME field\n", name(),
-                pdbaddr->precord->time.secPastEpoch, pdbaddr->precord->time.nsec);
+            debug("Stream::matchValue(%s): writing %i.%i to %s.TIME field\n",
+                name(),
+                pdbaddr->precord->time.secPastEpoch,
+                pdbaddr->precord->time.nsec,
+                pdbaddr->precord->name);
            pdbaddr->precord->tse = epicsTimeEventDeviceTime;
            return true;
 #else
-            error ("%s: writing TIME field is not supported in this EPICS version\n", name());
+            error ("%s: writing TIME field is not supported "
+                "in this EPICS version\n", name());
            return false;
 #endif
        }
-        
+        if (format.type == string_format &&
+            (pdbaddr->field_type == DBF_CHAR || pdbaddr->field_type == DBF_UCHAR))
+        {
+            /* write strings to [U]CHAR arrays */
+            nord = consumed;
+            fmt.type = DBF_CHAR;
+        }
        if (pdbaddr->precord == record || INIT_RUN)
        {
            // write into own record, thus don't process it
            // in @init we must not process other record
-            debug("Stream::matchValue(%s): dbPut(%s.%s,%s)\n",
-                name(),
-                pdbaddr->precord->name,
-                ((dbFldDes*)pdbaddr->pfldDes)->name,
-                fieldBuffer.expand()());
            putfunc = "dbPut";
-            status = dbPut(pdbaddr, dbfMapping[format.type], buffer, nord);
+            status = dbPut(pdbaddr, fmt.type, buffer, nord);
            if (INIT_RUN && pdbaddr->precord != record)
            {
                // clean error status of other record in @init
@ -1160,40 +1293,44 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
        else
        {
            // write into other record, thus process it
-            debug("Stream::matchValue(%s): dbPutField(%s.%s,%s)\n",
-                name(),
-                pdbaddr->precord->name,
-                ((dbFldDes*)pdbaddr->pfldDes)->name,
-                fieldBuffer.expand()());
            putfunc = "dbPutField";
-            status = dbPutField(pdbaddr, dbfMapping[format.type], buffer, nord);
+            status = dbPutField(pdbaddr, fmt.type,
+                buffer, nord);
        }
+        debug("Stream::matchValue(%s): %s(%s.%s, %s, %s) status=0x%x\n",
+            name(), putfunc,
+            pdbaddr->precord->name,
+            ((dbFldDes*)pdbaddr->pfldDes)->name,
+            pamapdbfType[fmt.type].strvalue,
+            fieldBuffer.expand()(),
+            status);
        if (status != 0)
        {
            flags &= ~ScanTried;
-            switch (format.type)
+            switch (fmt.type)
            {
-                case long_format:
-                case enum_format:
+                case DBF_ULONG:
+                case DBF_LONG:
+                case DBF_ENUM:
                    error("%s: %s(%s.%s, %s, %li) failed\n",
-                        putfunc, name(), pdbaddr->precord->name,
+                        name(), putfunc, pdbaddr->precord->name,
                        ((dbFldDes*)pdbaddr->pfldDes)->name,
-                        pamapdbfType[dbfMapping[format.type]].strvalue,
+                        pamapdbfType[fmt.type].strvalue,
                        lval);
                    return false;
-                case double_format:
+                case DBF_DOUBLE:
                    error("%s: %s(%s.%s, %s, %#g) failed\n",
-                        putfunc, name(), pdbaddr->precord->name,
+                        name(), putfunc, pdbaddr->precord->name,
                        ((dbFldDes*)pdbaddr->pfldDes)->name,
-                        pamapdbfType[dbfMapping[format.type]].strvalue,
+                        pamapdbfType[fmt.type].strvalue,
                        dval);
                    return false;
-                case string_format:
-                    error("%s: %s(%s.%s, %s, \"%s\") failed\n",
-                        putfunc, name(), pdbaddr->precord->name,
+                case DBF_STRING:
+                    error("%s: %s(%s.%s, %s, \"%.*s\") failed\n",
+                        name(), putfunc, pdbaddr->precord->name,
                        ((dbFldDes*)pdbaddr->pfldDes)->name,
-                        pamapdbfType[dbfMapping[format.type]].strvalue,
-                        buffer);
+                        pamapdbfType[fmt.type].strvalue,
+                        (int)consumed, buffer);
                    return false;
                default:
                    return false;
@ -1202,9 +1339,6 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
        return true;
    }
    // no fieldaddress (the "normal" case)
-    format_s fmt;
-    fmt.type = dbfMapping[format.type];
-    fmt.priv = &format;
    if (!readData)
    {
        error("%s: No readData() function provided\n", name());
@ -1229,13 +1363,15 @@ matchValue(const StreamFormat& format, const void* fieldaddress)
    return true;
 }

-#ifdef EPICS_3_14
-// Pass command to iocsh
+#ifdef EPICS_3_13
+// Pass command to vxWorks shell
+extern "C" int execute(const char *cmd);
+
 void streamExecuteCommand(CALLBACK *pcallback)
 {
    Stream* pstream = static_cast<Stream*>(pcallback->user);

-    if (iocshCmd(pstream->outputLine()) != OK)
+    if (execute(pstream->outputLine()) != OK)
    {
        pstream->execCallback(StreamIoFault);
    }
@ -1245,14 +1381,12 @@ void streamExecuteCommand(CALLBACK *pcallback)
    }
 }
 #else
-// Pass command to vxWorks shell
-extern "C" int execute(const char *cmd);
-
+// Pass command to iocsh
 void streamExecuteCommand(CALLBACK *pcallback)
 {
    Stream* pstream = static_cast<Stream*>(pcallback->user);

-    if (execute(pstream->outputLine()) != OK)
+    if (iocshCmd(pstream->outputLine()) != OK)
    {
        pstream->execCallback(StreamIoFault);
    }
@ -1274,19 +1408,19 @@ execute()
 void Stream::
 lockMutex()
 {
-#ifdef EPICS_3_14
-    mutex.lock();
-#else
+#ifdef EPICS_3_13
    semTake(mutex, WAIT_FOREVER);
+#else
+    mutex.lock();
 #endif
 }

 void Stream::
 releaseMutex()
 {
-#ifdef EPICS_3_14
-    mutex.unlock();
-#else
+#ifdef EPICS_3_13
    semGive(mutex);
+#else
+    mutex.unlock();
 #endif
 }
--- a/src/StreamFormat.h
+++ b/src/StreamFormat.h
@ -30,15 +30,17 @@ typedef enum {
    zero_flag    = 0x10,
    skip_flag    = 0x20,
    default_flag = 0x40,
-    compare_flag = 0x80
+    compare_flag = 0x80,
+    fix_width_flag = 0x100,
 } StreamFormatFlag;

 typedef enum {
-    long_format   = 1,
-    enum_format   = 2,
-    double_format = 3,
-    string_format = 4,
-    pseudo_format = 5
+    unsigned_format = 1,
+    signed_format,
+    enum_format,
+    double_format,
+    string_format,
+    pseudo_format
 } StreamFormatType;

 extern const char* StreamFormatTypeStr[];
@ -47,7 +49,7 @@ typedef struct StreamFormat
 {
    char conv;
    StreamFormatType type;
-    unsigned char flags;
+    unsigned short flags;
    short prec;
    unsigned short width;
    unsigned short infolen;
--- a/src/StreamFormatConverter.cc
+++ b/src/StreamFormatConverter.cc
@ -21,6 +21,7 @@

 #include <stdlib.h>
 #include <ctype.h>
+#include <limits.h>
 #include "StreamFormatConverter.h"
 #include "StreamError.h"

@ -37,7 +38,7 @@ parseFormat(const char*& source, FormatType formatType, StreamFormat& streamForm
 {
 /*
    source := [flags] [width] ['.' prec] conv [extra]
-    flags := '-' | '+' | ' ' | '#' | '0' | '*' | '?' | '='
+    flags := '-' | '+' | ' ' | '#' | '0' | '*' | '?' | '=' | '!'
    width := integer
    prec :=  integer
    conv := character
@ -84,6 +85,15 @@ parseFormat(const char*& source, FormatType formatType, StreamFormat& streamForm
                }
                streamFormat.flags |= default_flag;
                break;
+            case '!':
+                if (formatType != ScanFormat)
+                {
+                    error("Use of fixed width modifier '!' "
+                          "only allowed in input formats\n");
+                    return false;
+                }
+                streamFormat.flags |= fix_width_flag;
+                break;
            case '=':
                if (formatType != ScanFormat)
                {
@ -310,12 +320,16 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
        info.append('l');
        info.append(fmt.conv);
    }
-    return long_format;
+    if (fmt.conv == 'd' || fmt.conv == 'i') return signed_format;
+    return unsigned_format;
 }

 bool StdLongConverter::
 printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
 {
+    // limits %x/%X formats to number of half bytes in width.
+    if (fmt.width && (fmt.conv == 'x' || fmt.conv == 'X') && fmt.width < 2*sizeof(long))
+        value &= ~(-1L << (fmt.width*4));
    output.print(fmt.info, value);
    return true;
 }
@ -327,6 +341,7 @@ scanLong(const StreamFormat& fmt, const char* input, long& value)
    int length;
    bool neg;
    int base;
+    long v;

    length = prepareval(fmt, input, neg);
    if (length < 0) return -1;
@ -336,14 +351,11 @@ scanLong(const StreamFormat& fmt, const char* input, long& value)
            base = 10;
            break;
        case 'o':
-            base = 8;
-            goto signcheck;
        case 'x':
        case 'X':
-            base = 16;
-signcheck:
-        // allow negative hex and oct numbers with - flag
+            // allow negative hex and oct numbers with - flag
            if (neg && !(fmt.flags & left_flag)) return -1;
+            base = (fmt.conv == 'o') ? 8 : 16;
            break;
        case 'u':
            if (neg) return -1;
@ -352,10 +364,10 @@ signcheck:
        default:
            base = 0;
    }
-    value = strtoul(input, &end, base);
-    if (neg) value = -value;
+    v = strtoul(input, &end, base);
    if (end == input) return -1;
    length += end-input;
+    value = neg ? -v : v;
    return length;
 }

@ -543,7 +555,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
        info.append("%n");
        return string_format;
    }
-    return long_format;
+    return unsigned_format;
 }

 bool StdCharsConverter::
--- a/src/StreamProtocol.cc
+++ b/src/StreamProtocol.cc
@ -26,7 +26,8 @@
 #include "StreamError.h"

 const char* StreamFormatTypeStr[] = {
-    "none", "long", "enum", "double", "string", "pseudo"
+    // must match the order in StreamFormat.h
+    "none", "unsigned", "signed", "enum", "double", "string", "pseudo"
 };

 class StreamProtocolParser::Protocol::Variable
@ -1037,7 +1038,7 @@ compileNumber(unsigned long& number, const char*& source, unsigned long max)
            "Garbage after numeric value: %s\n", buffer());
        return false;
    }
-    if (n < 0 || n > max)
+    if (n > max)
    {
        debug("StreamProtocolParser::Protocol::compileNumber: %s\n",
            buffer.expand()());
@ -1438,7 +1439,7 @@ compileFormat(StreamBuffer& buffer, const char*& formatstr,
        // parsing failed
        return false;
    }
-    if (type < long_format && type > pseudo_format)
+    if (type < 1 && type > pseudo_format)
    {
        error(line, filename(),
            "Illegal format type %d returned from '%%%c' converter\n",
--- a/src/TimestampConverter.cc
+++ b/src/TimestampConverter.cc
@ -26,6 +26,24 @@
 #include <stdlib.h>
 #include <errno.h>

+/* timezone in UNIX contains the seconds between UTC and local time,
+but not in Free-BSD! Here timezone() is a function delivering
+the time zone abbreviation (e.g. CET). Alternatively, the timezone
+value can also be gained from tm_gmtoff of the tm-structure. 
+                                                    HJK, 4.4.14 */
+/* The same seems to be true for other BSDs. DZ. */
+                                                    
+#if defined(__FreeBSD__) || \
+    defined(__NetBSD__) || \
+    defined(__OpenBSD__) || \
+    defined(__bsdi__ ) || \
+    defined(__DragonFly__)
+static int timezone_bsd=0;
+#define timezone timezone_bsd
+#define tzset() { struct tm tm; time_t timet; tzset(); time(&timet);	\
+                  localtime_r(&timet, &tm); timezone=tm.tm_gmtoff; }
+#endif
+
 #ifdef _WIN32
 #define tzset() _tzset()
 #define timezone _timezone
@ -46,6 +64,13 @@ int timezone = 0;
 } while (0)
 #endif

+#if defined(__MINGW32__)
+/* MinGW has no re-entrant localtime. How about other environments? */
+/* Just let's hope for the best */
+#undef localtime_r
+#define localtime_r(timet,tm) (*(tm)=*localtime(timet))
+#endif
+
 class TimestampConverter : public StreamFormatConverter
 {
    int parse(const StreamFormat&, StreamBuffer&, const char*&, bool);
@ -366,7 +391,7 @@ startover:
                        debug ("TimestampConverter::scantime: %s hour = %d\n", pm?"PM":"AM", tm->tm_hour);
                        break;
                    case 'M': /* minute */
-                        i = nummatch(input, 1, 59);
+                        i = nummatch(input, 0, 59);
                        if (i < 0)
                        {
                            error ("error parsing minute: '%.20s'\n", input);
@ -376,7 +401,7 @@ startover:
                        debug ("TimestampConverter::scantime: min = %d\n", tm->tm_min);
                        break;
                    case 'S': /* second */
-                        i = nummatch(input, 1, 60);
+                        i = nummatch(input, 0, 60);
                        if (i < 0)
                        {
                            error ("error parsing week second: '%.20s'\n", input);
--- a/src/devStream.h
+++ b/src/devStream.h
@ -22,8 +22,8 @@
 #define devStream_h

 #define STREAM_MAJOR 2
-#define STREAM_MINOR 5
-#define STREAM_PATCHLEVEL 10
+#define STREAM_MINOR 7
+#define STREAM_PATCHLEVEL 1

 #if defined(__vxworks) || defined(vxWorks)
 #include <vxWorks.h>
@ -41,14 +41,19 @@
 #define INIT_RUN (!interruptAccept)

 #include <epicsVersion.h>
-#if (EPICS_VERSION == 3 && EPICS_REVISION == 14)
-#define EPICS_3_14
+#ifdef BASE_VERSION
+#define EPICS_3_13
 #endif

-#if defined(__cplusplus) && !defined(EPICS_3_14)
+#if defined(__cplusplus) && defined(EPICS_3_13)
 extern "C" {
 #endif

+#ifdef epicsExportSharedSymbols
+#   define devStream_epicsExportSharedSymbols
+#   undef epicsExportSharedSymbols
+#endif
+
 #include <stdio.h>
 #include <dbCommon.h>
 #include <dbScan.h>
@ -56,7 +61,12 @@ extern "C" {
 /* #include <dbFldTypes.h> */
 #include <dbAccess.h>

-#if defined(__cplusplus) && !defined(EPICS_3_14)
+#ifdef devStream_epicsExportSharedSymbols
+#   define epicsExportSharedSymbols
+#   include "shareLib.h"
+#endif
+
+#if defined(__cplusplus) && defined(EPICS_3_13)
 }
 #endif

@ -70,23 +80,22 @@ typedef const struct format_s {
 extern "C" {
 #endif

-#ifdef _WIN32
-__declspec(dllimport)
-#endif
-extern FILE* StreamDebugFile;
+epicsShareExtern FILE* StreamDebugFile;

 extern const char StreamVersion [];

 typedef long (*streamIoFunction) (dbCommon*, format_t*);

-long streamInit(int after);
-long streamInitRecord(dbCommon *record, struct link *ioLink,
+epicsShareFunc long streamInit(int after);
+epicsShareFunc long streamInitRecord(dbCommon *record,
+    const struct link *ioLink,
    streamIoFunction readData, streamIoFunction writeData);
-long streamReport(int interest);
-long streamReadWrite(dbCommon *record);
-long streamGetIointInfo(int cmd, dbCommon *record, IOSCANPVT *ppvt);
-long streamPrintf(dbCommon *record, format_t *format, ...);
-long streamScanfN(dbCommon *record, format_t *format,
+epicsShareFunc long streamReport(int interest);
+epicsShareFunc long streamReadWrite(dbCommon *record);
+epicsShareFunc long streamGetIointInfo(int cmd,
+    dbCommon *record, IOSCANPVT *ppvt);
+epicsShareFunc long streamPrintf(dbCommon *record, format_t *format, ...);
+epicsShareFunc long streamScanfN(dbCommon *record, format_t *format,
    void*, size_t maxStringSize);

 /* backward compatibility stuff */
--- a/src/devaaiStream.c
+++ b/src/devaaiStream.c
@ -20,9 +20,9 @@

 #include <string.h>
 #include <stdlib.h>
-#include "devStream.h"
-#include <aaiRecord.h>
 #include <errlog.h>
+#include <aaiRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
@ -57,6 +57,7 @@ static long readData (dbCommon *record, format_t *format)
                }
                break;
            }
+            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
@ -191,6 +192,7 @@ static long writeData (dbCommon *record, format_t *format)
                    return ERROR;
                break;
            }
+            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
--- a/src/devaaoStream.c
+++ b/src/devaaoStream.c
@ -20,9 +20,9 @@

 #include <string.h>
 #include <stdlib.h>
-#include "devStream.h"
-#include <aaoRecord.h>
 #include <errlog.h>
+#include <aaoRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
@ -57,6 +57,7 @@ static long readData (dbCommon *record, format_t *format)
                }
                break;
            }
+            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
@ -191,6 +192,7 @@ static long writeData (dbCommon *record, format_t *format)
                    return ERROR;
                break;
            }
+            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
--- a/src/devaiStream.c
+++ b/src/devaiStream.c
@ -18,10 +18,18 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
+#include <math.h>
+#include <menuConvert.h>
 #include <aiRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

+#ifdef vxWorks
+#include <private/mathP.h>
+#define isinf(x) isInf(x)
+#define isnan(x) isNan(x)
+#endif
+
 static long readData (dbCommon *record, format_t *format)
 {
    aiRecord *ai = (aiRecord *) record;
@ -32,20 +40,28 @@ static long readData (dbCommon *record, format_t *format)
        {
            double val;
            if (streamScanf (record, format, &val)) return ERROR;
-            if (ai->aslo != 0.0) val *= ai->aslo;
+            if (ai->aslo != 0.0 && ai->aslo != 1.0) val *= ai->aslo;
            val += ai->aoff;
-            if (!INIT_RUN && ai->smoo != 0.0)
-            {
+            if (!(ai->smoo == 0.0 || ai->init || ai->udf || isinf(ai->val) || isnan(ai->val)))
                val = ai->val * ai->smoo + val * (1.0 - ai->smoo);
-            }
            ai->val = val;
            return DO_NOT_CONVERT;
        }
+        case DBF_ULONG:
        case DBF_LONG:
        {
            long rval;
            if (streamScanf (record, format, &rval)) return ERROR;
            ai->rval = rval;
+            if (ai->linr == menuConvertNO_CONVERSION)
+            {
+                /* allow more bits than 32 */
+                if (format->type == DBF_ULONG)
+                    ai->val = (unsigned long)rval;
+                else    
+                    ai->val = rval;
+                return DO_NOT_CONVERT;
+            }
            return OK;
        }
    }
@ -55,19 +71,32 @@ static long readData (dbCommon *record, format_t *format)
 static long writeData (dbCommon *record, format_t *format)
 {
    aiRecord *ai = (aiRecord *) record;
-    double val;

    switch (format->type)
    {
        case DBF_DOUBLE:
        {
-            val = ai->val - ai->aoff;
-            if (ai->aslo != 0) val /= ai->aslo;
+            double val = ai->val - ai->aoff;
+            if (ai->aslo != 0.0 && ai->aslo != 1.0) val /= ai->aslo;
            return streamPrintf (record, format, val);
        }
+        case DBF_ULONG:
+        {
+            if (ai->linr == menuConvertNO_CONVERSION)
+            {
+                /* allow more bits than 32 */
+                return streamPrintf (record, format, (unsigned long)ai->val);
+            }
+            return streamPrintf (record, format, (unsigned long)ai->rval);
+        }
        case DBF_LONG:
        {
-            return streamPrintf (record, format, (long) ai->rval);
+            if (ai->linr == menuConvertNO_CONVERSION)
+            {
+                /* allow more bits than 32 */
+                return streamPrintf (record, format, (long)ai->val);
+            }
+            return streamPrintf (record, format, (long)ai->rval);
        }
    }
    return ERROR;
--- a/src/devaoStream.c
+++ b/src/devaoStream.c
@ -18,8 +18,9 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
+#include <menuConvert.h>
 #include <aoRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
@ -32,16 +33,26 @@ static long readData (dbCommon *record, format_t *format)
        {
            double val;
            if (streamScanf (record, format, &val)) return ERROR;
-            if (ao->aslo != 0) val *= ao->aslo;
+            if (ao->aslo != 0.0 && ao->aslo != 1.0) val *= ao->aslo;
            ao->val = val + ao->aoff;
            return DO_NOT_CONVERT;
        }
+        case DBF_ULONG:
        case DBF_LONG:
        {
            long rval;
            if (streamScanf (record, format, &rval)) return ERROR;
            ao->rbv = rval;
-            if (INIT_RUN) ao->rval = rval;
+            ao->rval = rval;
+            if (ao->linr == menuConvertNO_CONVERSION)
+            {
+                /* allow more bits than 32 */
+                if (format->type == DBF_ULONG)
+                    ao->val = (unsigned long)rval;
+                else    
+                    ao->val = rval;
+                return DO_NOT_CONVERT;
+            }
            return OK;
        }
    }
@ -56,16 +67,27 @@ static long writeData (dbCommon *record, format_t *format)
    {
        case DBF_DOUBLE:
        {
-            double val;
-            if (INIT_RUN) val = ao->val;
-            else val = ao->oval;
-            val -= ao->aoff;
-            if (ao->aslo != 0) val /= ao->aslo;
+            double val = (INIT_RUN ? ao->val : ao->oval) - ao->aoff;
+            if (ao->aslo != 0.0 && ao->aslo != 1.0) val /= ao->aslo;
            return streamPrintf (record, format, val);
        }
+        case DBF_ULONG:
+        {
+            if (ao->linr == menuConvertNO_CONVERSION)
+            {
+                /* allow more bits than 32 */
+                return streamPrintf (record, format, (unsigned long)(INIT_RUN ? ao->val : ao->oval));
+            }
+            return streamPrintf (record, format, (unsigned long)ao->rval);
+        }
        case DBF_LONG:
        {
-            return streamPrintf (record, format, (long) ao->rval);
+            if (ao->linr == menuConvertNO_CONVERSION)
+            {
+                /* allow more bits than 32 */
+                return streamPrintf (record, format, (long)(INIT_RUN ? ao->val : ao->oval));
+            }
+            return streamPrintf (record, format, (long)ao->rval);
        }
    }
    return ERROR;
--- a/src/devbiStream.c
+++ b/src/devbiStream.c
@ -18,9 +18,9 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
-#include <biRecord.h>
 #include <string.h>
+#include <biRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
@ -30,6 +30,7 @@ static long readData (dbCommon *record, format_t *format)

    switch (format->type)
    {
+        case DBF_ULONG:
        case DBF_LONG:
        {
            if (streamScanf (record, format, &val)) return ERROR;
@ -69,13 +70,14 @@ static long writeData (dbCommon *record, format_t *format)

    switch (format->type)
    {
+        case DBF_ULONG:
        case DBF_LONG:
        {
            return streamPrintf (record, format, bi->rval);
        }
        case DBF_ENUM:
        {
-            return streamPrintf (record, format, (long) bi->val);
+            return streamPrintf (record, format, (long)bi->val);
        }
        case DBF_STRING:
        {
--- a/src/devboStream.c
+++ b/src/devboStream.c
@ -18,9 +18,9 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
-#include <boRecord.h>
 #include <string.h>
+#include <boRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
@ -30,6 +30,7 @@ static long readData (dbCommon *record, format_t *format)

    switch (format->type)
    {
+        case DBF_ULONG:
        case DBF_LONG:
        {
            if (streamScanf (record, format, &val)) return ERROR;
@ -70,13 +71,14 @@ static long writeData (dbCommon *record, format_t *format)

    switch (format->type)
    {
+        case DBF_ULONG:
        case DBF_LONG:
        {
            return streamPrintf (record, format, bo->rval);
        }
        case DBF_ENUM:
        {
-            return streamPrintf (record, format, (long) bo->val);
+            return streamPrintf (record, format, (long)bo->val);
        }
        case DBF_STRING:
        {
--- a/src/devcalcoutStream.c
+++ b/src/devcalcoutStream.c
@ -17,9 +17,9 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
 #include <postfix.h>
 #include <calcoutRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
@ -32,13 +32,17 @@ static long readData (dbCommon *record, format_t *format)
        {
            return streamScanf (record, format, &co->val);
        }
+        case DBF_ULONG:
        case DBF_LONG:
        case DBF_ENUM:
        {
            long lval;

            if (streamScanf (record, format, &lval)) return ERROR;
-            co->val = lval;
+            if (format->type == DBF_LONG)
+                co->val = lval;
+            else
+                co->val = (unsigned long)lval;
            return OK;
        }
    }
@ -55,8 +59,12 @@ static long writeData (dbCommon *record, format_t *format)
        {
            return streamPrintf (record, format, co->oval);
        }
-        case DBF_LONG:
+        case DBF_ULONG:
        case DBF_ENUM:
+        {
+            return streamPrintf (record, format, (unsigned long)co->oval);
+        }
+        case DBF_LONG:
        {
            return streamPrintf (record, format, (long)co->oval);
        }
--- a/src/devlonginStream.c
+++ b/src/devlonginStream.c
@ -18,20 +18,25 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
 #include <longinRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
 {
    longinRecord *li = (longinRecord *) record;

-    if (format->type == DBF_LONG || format->type == DBF_ENUM)
+    switch (format->type)
    {
-        long val;
-        if (streamScanf (record, format, &val)) return ERROR;
-        li->val = val;
-        return OK;
+        case DBF_ULONG:
+        case DBF_LONG:
+        case DBF_ENUM:
+        {       
+            long val;
+            if (streamScanf (record, format, &val)) return ERROR;
+            li->val = val;
+            return OK;
+        }
    }
    return ERROR;
 }
@ -40,9 +45,13 @@ static long writeData (dbCommon *record, format_t *format)
 {
    longinRecord *li = (longinRecord *) record;

-    if (format->type == DBF_LONG || format->type == DBF_ENUM)
+    switch (format->type)
    {
-        return streamPrintf (record, format, (long) li->val);
+        case DBF_ULONG:
+        case DBF_ENUM:
+            return streamPrintf (record, format, (unsigned long)li->val);
+        case DBF_LONG:
+            return streamPrintf (record, format, (long)li->val);
    }
    return ERROR;
 }
--- a/src/devlongoutStream.c
+++ b/src/devlongoutStream.c
@ -19,20 +19,25 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
 #include <longoutRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
 {
    longoutRecord *lo = (longoutRecord *) record;

-    if (format->type == DBF_LONG || format->type == DBF_ENUM)
+    switch (format->type)
    {
-        long val;
-        if (streamScanf (record, format, &val)) return ERROR;
-        lo->val = val;
-        return OK;
+        case DBF_ULONG:
+        case DBF_LONG:
+        case DBF_ENUM:
+        {       
+            long val;
+            if (streamScanf (record, format, &val)) return ERROR;
+            lo->val = val;
+            return OK;
+        }
    }
    return ERROR;
 }
@ -41,9 +46,13 @@ static long writeData (dbCommon *record, format_t *format)
 {
    longoutRecord *lo = (longoutRecord *) record;

-    if (format->type == DBF_LONG || format->type == DBF_ENUM)
+    switch (format->type)
    {
-        return streamPrintf (record, format, (long) lo->val);
+        case DBF_ULONG:
+        case DBF_ENUM:
+            return streamPrintf (record, format, (unsigned long)lo->val);
+        case DBF_LONG:
+            return streamPrintf (record, format, (long)lo->val);
    }
    return ERROR;
 }
--- a/src/devmbbiDirectStream.c
+++ b/src/devmbbiDirectStream.c
@ -19,16 +19,16 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
 #include <mbbiDirectRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
 {
    mbbiDirectRecord *mbbiD = (mbbiDirectRecord *) record;
-    long val;
+    unsigned long val;

-    if (format->type == DBF_LONG)
+    if (format->type == DBF_ULONG || format->type == DBF_LONG)
    {
        if (streamScanf (record, format, &val)) return ERROR;
        if (mbbiD->mask)
@ -40,7 +40,7 @@ static long readData (dbCommon *record, format_t *format)
        else
        {
            /* No MASK, (NOBT = 0): use VAL field */
-            mbbiD->val = (short)val;
+            mbbiD->val = (unsigned short)val;
            return DO_NOT_CONVERT;
        }
    }
@ -50,9 +50,9 @@ static long readData (dbCommon *record, format_t *format)
 static long writeData (dbCommon *record, format_t *format)
 {
    mbbiDirectRecord *mbbiD = (mbbiDirectRecord *) record;
-    long val;
+    unsigned long val;

-    if (format->type == DBF_LONG)
+    if (format->type == DBF_ULONG || format->type == DBF_LONG)
    {
        if (mbbiD->mask) val = mbbiD->rval & mbbiD->mask;
        else val = mbbiD->val;
--- a/src/devmbbiStream.c
+++ b/src/devmbbiStream.c
@ -19,19 +19,20 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
-#include <mbbiRecord.h>
 #include <string.h>
+#include <mbbiRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
 {
    mbbiRecord *mbbi = (mbbiRecord *) record;
-    long val;
+    unsigned long val;
    int i;

    switch (format->type)
    {
+        case DBF_ULONG:
        case DBF_LONG:
        {
            if (streamScanf (record, format, &val)) return ERROR;
--- a/src/devmbboDirectStream.c
+++ b/src/devmbboDirectStream.c
@ -19,16 +19,16 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
 #include <mbboDirectRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
 {
    mbboDirectRecord *mbboD = (mbboDirectRecord *) record;
-    long val;
+    unsigned long val;

-    if (format->type == DBF_LONG)
+    if (format->type == DBF_ULONG || format->type == DBF_LONG)
    {
        if (streamScanf (record, format, &val)) return ERROR;
        if (mbboD->mask)
@ -53,7 +53,7 @@ static long writeData (dbCommon *record, format_t *format)
    mbboDirectRecord *mbboD = (mbboDirectRecord *) record;
    long val;

-    if (format->type == DBF_LONG)
+    if (format->type == DBF_ULONG || format->type == DBF_LONG)
    {
        if (mbboD->mask) val = mbboD->rval & mbboD->mask;
        else val = mbboD->val;
--- a/src/devmbboStream.c
+++ b/src/devmbboStream.c
@ -19,19 +19,20 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
-#include <mbboRecord.h>
 #include <string.h>
+#include <mbboRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
 {
    mbboRecord *mbbo = (mbboRecord *) record;
-    long val;
+    unsigned long val;
    int i;

    switch (format->type)
    {
+        case DBF_ULONG:
        case DBF_LONG:
        {
            if (streamScanf (record, format, &val)) return ERROR;
@ -76,11 +77,12 @@ static long readData (dbCommon *record, format_t *format)
 static long writeData (dbCommon *record, format_t *format)
 {
    mbboRecord *mbbo = (mbboRecord *) record;
-    long val;
+    unsigned long val;
    int i;

    switch (format->type)
    {
+        case DBF_ULONG:
        case DBF_LONG:
        {
            /* print VAL or RVAL ? */
--- a/src/devstringinStream.c
+++ b/src/devstringinStream.c
@ -18,8 +18,8 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
 #include <stringinRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
--- a/src/devstringoutStream.c
+++ b/src/devstringoutStream.c
@ -18,8 +18,8 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
 #include <stringoutRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
--- a/src/devwaveformStream.c
+++ b/src/devwaveformStream.c
@ -18,10 +18,10 @@
 *                                                              *
 ***************************************************************/

-#include "devStream.h"
-#include <waveformRecord.h>
 #include <string.h>
 #include <errlog.h>
+#include <waveformRecord.h>
+#include "devStream.h"
 #include <epicsExport.h>

 static long readData (dbCommon *record, format_t *format)
@ -57,6 +57,7 @@ static long readData (dbCommon *record, format_t *format)
                }
                break;
            }
+            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
--- a/streamApp/Makefile
+++ b/streamApp/Makefile
@ -29,18 +29,13 @@ PROD_SRCS_vxWorks = -nil-
 PROD_LIBS = stream

 ifdef ASYN
-# Which types of asyn busses do you have?
-
-# asynDriver up to version 4-16 does not support serial port for Windows!
-#ifneq ($(OS_CLASS), WIN32)
-streamApp_DBD += drvAsynSerialPort.dbd
-#endif
-
-streamApp_DBD += drvAsynIPPort.dbd
-#streamApp_DBD += drvGsIP488.dbd
-#streamApp_DBD += drvNi1014.dbd
-streamApp_DBD += drvVxi11.dbd
+# edit asynRegistrars.dbd if necessary
+streamApp_DBD += asynRegistrars.dbd
+# add asynRecord.dbd if you like
+streamApp_DBD += asynRecord.dbd
 PROD_LIBS += asyn
+# cygwin needs separate RPC library for asyn
+PROD_SYS_LIBS_cygwin32 += $(CYGWIN_RPC_LIB)
 endif

 ifneq ($(words $(CALC) $(SYNAPPS)), 0)
@ -56,7 +51,7 @@ endif
 streamApp_DBD += stream.dbd

 ifdef PCRE
-LIB_LIBS += pcre
+PROD_LIBS += pcre
 else
 ifneq ($(words $(PCRE_LIB) $(PCRE_INCLUDE)),0)
 PROD_SYS_LIBS_DEFAULT += pcre
@ -73,7 +68,11 @@ CPPFLAGS += -DDEBUGFILE=StreamDebug.log

 include $(TOP)/configure/RULES

+ifeq ($(BASE_3_14), YES)
 clean:: myclean
+else
+clean: myclean
+endif

 myclean:
 	$(RM) core* StreamDebug.log
--- a/streamApp/asynRegistrars.dbd
+++ b/streamApp/asynRegistrars.dbd
@ -0,0 +1,9 @@
+registrar(asynRegister)
+registrar(asynInterposeFlushRegister)
+registrar(asynInterposeEosRegister)
+
+# asynDriver up to version 4-16 does not support serial port for Windows!
+registrar(drvAsynSerialPortRegisterCommands)
+registrar(drvAsynIPPortRegisterCommands)
+registrar(drvAsynIPServerPortRegisterCommands)
+registrar(vxi11RegisterCommands)
--- a/streamApp/terminal.tcl
+++ b/streamApp/terminal.tcl
@ -18,7 +18,7 @@ proc createTerm {sock} {
 }

 proc connect {sock addr port} {
-    fconfigure $sock -blocking 0 -buffering none
+    fconfigure $sock -blocking 0 -buffering none -translation binary
    createTerm $sock
    fileevent $sock readable "receiveHandler $sock"
 }
@ -40,11 +40,13 @@ proc escape {string} {
 }

 proc sendReply {sock text} {
-    .$sock.t mark set insert end
-    .$sock.t insert end $text
-    .$sock.t see end
-    puts -nonewline $sock $text
-#    puts "sending \"[escape $text]\"\n" 
+    catch {
+        # ignore that socket may already be closed
+        .$sock.t mark set insert end
+        .$sock.t insert end $text
+        .$sock.t see end
+        puts -nonewline $sock $text
+    }
 }

 proc checkNum {n} {
@ -89,7 +91,7 @@ proc receiveHandler {sock} {
            "start" {
                set wait [checkNum [lindex $l 1]]
                set ::counter 0
-                after $wait sendAsync $wait [list [lrange $l 2 end-1]]
+                after $wait [list sendAsync $wait "[string range $a [string wordend $a 7] end]"]
                sendReply $sock "Started\n"
            }
            "stop" {
@ -131,19 +133,11 @@ proc receiveHandler {sock} {
 proc sendAsync {wait message} {
    if {$::counter < 0} return
    foreach term [array names ::socket] {
-        sendReply $::socket($term) "Message number [incr ::counter] $message\n";
+        sendReply $::socket($term) "Message number [incr ::counter]$message";
    }
    after $wait sendAsync $wait [list $message]
 }

-proc sendAsyncX {wait} {
-    if {$::counter < 0} return
-    foreach term [array names ::socket] {
-        sendReply $::socket($term) "\u00101\u0004~\u0005~\u00100\u0002|0062|2|1|0|1216|0|0.1087E+0 \u0003\u0012"
-    }
-    after $wait sendAsyncX $wait
-}
-
 if {[info proc tkTextInsert] != ""} {
    set insert tkTextInsert
    set paste tkTextPaste
@ -196,7 +190,7 @@ for {set ascii 0x61} {$ascii <= 0x7a} {incr ascii} {
    bind Text <Control-[format %c $ascii]> ""
 }
 #remove bindings on symbolic tags
-foreach tag {Clear Paste Copy Cut } {
+foreach tag {Clear Paste Copy Cut} {
    bind Text <<$tag>> ""
 }

--- a/streamApp/test.proto
+++ b/streamApp/test.proto
@ -1,5 +1,5 @@
-terminator = CR LF;
-readtimeout = 1000;
+terminator = LF;
+readtimeout = 10;
 pollperiod = 10;
 replytimeout = 1000;
 command {
--- a/streamApp/tests/streamtestlib.tcl
+++ b/streamApp/tests/streamtestlib.tcl
@ -41,7 +41,7 @@ proc receiveHandler {sock} {
 }

 proc startioc {} {
-    global debug records protocol startup port sock ioc testname env streamversion
+    global debug records protocol startup port sock ioc testname env streamversion asynversion
    set fd [open test.db w]
    puts $fd $records
    close $fd
@ -52,7 +52,10 @@ proc startioc {} {
    
    if [info exists streamversion] {
        puts $fd "#!/usr/local/bin/iocsh"
-        puts $fd "require stream2,$streamversion"
+        if [info exists asynversion] {
+            puts $fd "require asyn,$asynversion"
+        }
+        puts $fd "require stream,$streamversion"
    } else {
        puts $fd "#!../O.$env(EPICS_HOST_ARCH)/streamApp"
        puts $fd "dbLoadDatabase ../O.Common/streamApp.dbd"
@ -74,7 +77,9 @@ proc startioc {} {
    }
    fconfigure $ioc -blocking yes -buffering none
    debugmsg "waiting to connect"
+    set timer [after 1000 {puts stderr "\033\[31;7mCannot start IOC.\033\[0m"; exit 1}]
    vwait sock
+    after cancel $timer
 }

 set lastcommand ""
@ -202,3 +207,7 @@ if {[lindex $argv 0] == "-sls"} {
    set streamversion [lindex $argv 1]
    set argv [lrange $argv 2 end]
 }
+if {[lindex $argv 0] == "-asyn"} {
+    set asynversion [lindex $argv 1]
+    set argv [lrange $argv 2 end]
+}
--- a/streamApp/tests/testChecksum
+++ b/streamApp/tests/testChecksum
@ -7,7 +7,7 @@ source streamtestlib.tcl
 # Send commands to the ioc shell with ioccmd

 set records {
-    record (ao, "DZ:test1")
+    record (stringout, "DZ:test1")
    {
        field (DTYP, "stream")
        field (OUT,  "@test.proto test1 device")
@ -15,7 +15,225 @@ set records {
 }

 set protocol {
-    test1 {out 0x55 0x40 0x04 0x00 0x00 'z;' "%<sum>";}
+    Terminator="\n";
+    test1 {
+        out "sum      %s %9.1<sum>";         in "sum      %=s %9.1<sum>";
+        out "sum8     %s %9.1<sum8>";        in "sum8     %=s %9.1<sum8>";
+        out "sum16    %s %9.1<sum16>";       in "sum16    %=s %9.1<sum16>";
+        out "sum32    %s %9.1<sum32>";       in "sum32    %=s %9.1<sum32>";
+        out "nsum     %s %9.1<nsum>";        in "nsum     %=s %9.1<nsum>";
+        out "negsum   %s %9.1<negsum>";      in "negsum   %=s %9.1<negsum>";
+        out "-sum     %s %9.1<-sum>";        in "-sum     %=s %9.1<-sum>";
+        out "nsum8    %s %9.1<nsum8>";       in "nsum8    %=s %9.1<nsum8>";
+        out "negsum8  %s %9.1<negsum8>";     in "negsum8  %=s %9.1<negsum8>";
+        out "-sum8    %s %9.1<-sum8>";       in "-sum8    %=s %9.1<-sum8>";
+        out "nsum16   %s %9.1<nsum16>";      in "nsum16   %=s %9.1<nsum16>";
+        out "negsum16 %s %9.1<negsum1>";     in "negsum16 %=s %9.1<negsum1>";
+        out "-sum16   %s %9.1<-sum16>";      in "-sum16   %=s %9.1<-sum16>";
+        out "nsum32   %s %9.1<nsum32>";      in "nsum32   %=s %9.1<nsum32>";
+        out "negsum32 %s %9.1<negsum3>";     in "negsum32 %=s %9.1<negsum3>";
+        out "-sum32   %s %9.1<-sum32>";      in "-sum32   %=s %9.1<-sum32>";
+        out "notsum   %s %9.1<notsum>";      in "notsum   %=s %9.1<notsum>";
+        out "~sum     %s %9.1<~sum>";        in "~sum     %=s %9.1<~sum>";
+        out "xor      %s %9.1<xor>";         in "xor      %=s %9.1<xor>";
+        out "xor8     %s %9.1<xor8>";        in "xor8     %=s %9.1<xor8>";
+        out "xor7     %s %9.1<xor7>";        in "xor7     %=s %9.1<xor7>";
+        out "crc8     %s %9.1<crc8>";        in "crc8     %=s %9.1<crc8>";
+        out "ccitt8   %s %9.1<ccitt8>";      in "ccitt8   %=s %9.1<ccitt8>";
+        out "crc16    %s %9.1<crc16>";       in "crc16    %=s %9.1<crc16>";
+        out "crc16r   %s %9.1<crc16r>";      in "crc16r   %=s %9.1<crc16r>";
+        out "ccitt16  %s %9.1<ccitt16>";     in "ccitt16  %=s %9.1<ccitt16>";
+        out "ccitt16a %s %9.1<ccitt16a>";    in "ccitt16a %=s %9.1<ccitt16a>";
+        out "ccitt16x %s %9.1<ccitt16x>";    in "ccitt16x %=s %9.1<ccitt16x>";
+        out "crc16c   %s %9.1<crc16c>";      in "crc16c   %=s %9.1<crc16c>";
+        out "xmodem   %s %9.1<xmodem>";      in "xmodem   %=s %9.1<xmodem>";
+        out "crc32    %s %9.1<crc32>";       in "crc32    %=s %9.1<crc32>";
+        out "crc32r   %s %9.1<crc32r>";      in "crc32r   %=s %9.1<crc32r>";
+        out "jamcrc   %s %9.1<jamcrc>";      in "jamcrc   %=s %9.1<jamcrc>";
+        out "adler32  %s %9.1<adler32>";     in "adler32  %=s %9.1<adler32>";
+        out "hexsum8  %s %9.1<hexsum8>";     in "hexsum8  %=s %9.1<hexsum8>";
+        
+        out "sum      %s %09.1<sum>";        in "sum      %=s %09.1<sum>";
+        out "sum8     %s %09.1<sum8>";       in "sum8     %=s %09.1<sum8>";
+        out "sum16    %s %09.1<sum16>";      in "sum16    %=s %09.1<sum16>";
+        out "sum32    %s %09.1<sum32>";      in "sum32    %=s %09.1<sum32>";
+        out "nsum     %s %09.1<nsum>";       in "nsum     %=s %09.1<nsum>";
+        out "negsum   %s %09.1<negsum>";     in "negsum   %=s %09.1<negsum>";
+        out "-sum     %s %09.1<-sum>";       in "-sum     %=s %09.1<-sum>";
+        out "nsum8    %s %09.1<nsum8>";      in "nsum8    %=s %09.1<nsum8>";
+        out "negsum8  %s %09.1<negsum8>";    in "negsum8  %=s %09.1<negsum8>";
+        out "-sum8    %s %09.1<-sum8>";      in "-sum8    %=s %09.1<-sum8>";
+        out "nsum16   %s %09.1<nsum16>";     in "nsum16   %=s %09.1<nsum16>";
+        out "negsum16 %s %09.1<negsum1>";    in "negsum16 %=s %09.1<negsum1>";
+        out "-sum16   %s %09.1<-sum16>";     in "-sum16   %=s %09.1<-sum16>";
+        out "nsum32   %s %09.1<nsum32>";     in "nsum32   %=s %09.1<nsum32>";
+        out "negsum32 %s %09.1<negsum3>";    in "negsum32 %=s %09.1<negsum3>";
+        out "-sum32   %s %09.1<-sum32>";     in "-sum32   %=s %09.1<-sum32>";
+        out "notsum   %s %09.1<notsum>";     in "notsum   %=s %09.1<notsum>";
+        out "~sum     %s %09.1<~sum>";       in "~sum     %=s %09.1<~sum>";
+        out "xor      %s %09.1<xor>";        in "xor      %=s %09.1<xor>";
+        out "xor8     %s %09.1<xor8>";       in "xor8     %=s %09.1<xor8>";
+        out "xor7     %s %09.1<xor7>";       in "xor7     %=s %09.1<xor7>";
+        out "crc8     %s %09.1<crc8>";       in "crc8     %=s %09.1<crc8>";
+        out "ccitt8   %s %09.1<ccitt8>";     in "ccitt8   %=s %09.1<ccitt8>";
+        out "crc16    %s %09.1<crc16>";      in "crc16    %=s %09.1<crc16>";
+        out "crc16r   %s %09.1<crc16r>";     in "crc16r   %=s %09.1<crc16r>";
+        out "ccitt16  %s %09.1<ccitt16>";    in "ccitt16  %=s %09.1<ccitt16>";
+        out "ccitt16a %s %09.1<ccitt16a>";   in "ccitt16a %=s %09.1<ccitt16a>";
+        out "ccitt16x %s %09.1<ccitt16x>";   in "ccitt16x %=s %09.1<ccitt16x>";
+        out "crc16c   %s %09.1<crc16c>";     in "crc16c   %=s %09.1<crc16c>";
+        out "xmodem   %s %09.1<xmodem>";     in "xmodem   %=s %09.1<xmodem>";
+        out "crc32    %s %09.1<crc32>";      in "crc32    %=s %09.1<crc32>";
+        out "crc32r   %s %09.1<crc32r>";     in "crc32r   %=s %09.1<crc32r>";
+        out "jamcrc   %s %09.1<jamcrc>";     in "jamcrc   %=s %09.1<jamcrc>";
+        out "adler32  %s %09.1<adler32>";    in "adler32  %=s %09.1<adler32>";
+        out "hexsum8  %s %09.1<hexsum8>";    in "hexsum8  %=s %09.1<hexsum8>";
+
+        out "sum      %s %-9.1<sum>";        in "sum      %=s %-9.1<sum>";
+        out "sum8     %s %-9.1<sum8>";       in "sum8     %=s %-9.1<sum8>";
+        out "sum16    %s %-9.1<sum16>";      in "sum16    %=s %-9.1<sum16>";
+        out "sum32    %s %-9.1<sum32>";      in "sum32    %=s %-9.1<sum32>";
+        out "nsum     %s %-9.1<nsum>";       in "nsum     %=s %-9.1<nsum>";
+        out "negsum   %s %-9.1<negsum>";     in "negsum   %=s %-9.1<negsum>";
+        out "-sum     %s %-9.1<-sum>";       in "-sum     %=s %-9.1<-sum>";
+        out "nsum8    %s %-9.1<nsum8>";      in "nsum8    %=s %-9.1<nsum8>";
+        out "negsum8  %s %-9.1<negsum8>";    in "negsum8  %=s %-9.1<negsum8>";
+        out "-sum8    %s %-9.1<-sum8>";      in "-sum8    %=s %-9.1<-sum8>";
+        out "nsum16   %s %-9.1<nsum16>";     in "nsum16   %=s %-9.1<nsum16>";
+        out "negsum16 %s %-9.1<negsum1>";    in "negsum16 %=s %-9.1<negsum1>";
+        out "-sum16   %s %-9.1<-sum16>";     in "-sum16   %=s %-9.1<-sum16>";
+        out "nsum32   %s %-9.1<nsum32>";     in "nsum32   %=s %-9.1<nsum32>";
+        out "negsum32 %s %-9.1<negsum3>";    in "negsum32 %=s %-9.1<negsum3>";
+        out "-sum32   %s %-9.1<-sum32>";     in "-sum32   %=s %-9.1<-sum32>";
+        out "notsum   %s %-9.1<notsum>";     in "notsum   %=s %-9.1<notsum>";
+        out "~sum     %s %-9.1<~sum>";       in "~sum     %=s %-9.1<~sum>";
+        out "xor      %s %-9.1<xor>";        in "xor      %=s %-9.1<xor>";
+        out "xor8     %s %-9.1<xor8>";       in "xor8     %=s %-9.1<xor8>";
+        out "xor7     %s %-9.1<xor7>";       in "xor7     %=s %-9.1<xor7>";
+        out "crc8     %s %-9.1<crc8>";       in "crc8     %=s %-9.1<crc8>";
+        out "ccitt8   %s %-9.1<ccitt8>";     in "ccitt8   %=s %-9.1<ccitt8>";
+        out "crc16    %s %-9.1<crc16>";      in "crc16    %=s %-9.1<crc16>";
+        out "crc16r   %s %-9.1<crc16r>";     in "crc16r   %=s %-9.1<crc16r>";
+        out "ccitt16  %s %-9.1<ccitt16>";    in "ccitt16  %=s %-9.1<ccitt16>";
+        out "ccitt16a %s %-9.1<ccitt16a>";   in "ccitt16a %=s %-9.1<ccitt16a>";
+        out "ccitt16x %s %-9.1<ccitt16x>";   in "ccitt16x %=s %-9.1<ccitt16x>";
+        out "crc16c   %s %-9.1<crc16c>";     in "crc16c   %=s %-9.1<crc16c>";
+        out "xmodem   %s %-9.1<xmodem>";     in "xmodem   %=s %-9.1<xmodem>";
+        out "crc32    %s %-9.1<crc32>";      in "crc32    %=s %-9.1<crc32>";
+        out "crc32r   %s %-9.1<crc32r>";     in "crc32r   %=s %-9.1<crc32r>";
+        out "jamcrc   %s %-9.1<jamcrc>";     in "jamcrc   %=s %-9.1<jamcrc>";
+        out "adler32  %s %-9.1<adler32>";    in "adler32  %=s %-9.1<adler32>";
+        out "hexsum8  %s %-9.1<hexsum8>";    in "hexsum8  %=s %-9.1<hexsum8>";
+
+        out "sum      %s %#9.1<sum>";        in "sum      %=s %#9.1<sum>";
+        out "sum8     %s %#9.1<sum8>";       in "sum8     %=s %#9.1<sum8>";
+        out "sum16    %s %#9.1<sum16>";      in "sum16    %=s %#9.1<sum16>";
+        out "sum32    %s %#9.1<sum32>";      in "sum32    %=s %#9.1<sum32>";
+        out "nsum     %s %#9.1<nsum>";       in "nsum     %=s %#9.1<nsum>";
+        out "negsum   %s %#9.1<negsum>";     in "negsum   %=s %#9.1<negsum>";
+        out "-sum     %s %#9.1<-sum>";       in "-sum     %=s %#9.1<-sum>";
+        out "nsum8    %s %#9.1<nsum8>";      in "nsum8    %=s %#9.1<nsum8>";
+        out "negsum8  %s %#9.1<negsum8>";    in "negsum8  %=s %#9.1<negsum8>";
+        out "-sum8    %s %#9.1<-sum8>";      in "-sum8    %=s %#9.1<-sum8>";
+        out "nsum16   %s %#9.1<nsum16>";     in "nsum16   %=s %#9.1<nsum16>";
+        out "negsum16 %s %#9.1<negsum1>";    in "negsum16 %=s %#9.1<negsum1>";
+        out "-sum16   %s %#9.1<-sum16>";     in "-sum16   %=s %#9.1<-sum16>";
+        out "nsum32   %s %#9.1<nsum32>";     in "nsum32   %=s %#9.1<nsum32>";
+        out "negsum32 %s %#9.1<negsum3>";    in "negsum32 %=s %#9.1<negsum3>";
+        out "-sum32   %s %#9.1<-sum32>";     in "-sum32   %=s %#9.1<-sum32>";
+        out "notsum   %s %#9.1<notsum>";     in "notsum   %=s %#9.1<notsum>";
+        out "~sum     %s %#9.1<~sum>";       in "~sum     %=s %#9.1<~sum>";
+        out "xor      %s %#9.1<xor>";        in "xor      %=s %#9.1<xor>";
+        out "xor8     %s %#9.1<xor8>";       in "xor8     %=s %#9.1<xor8>";
+        out "xor7     %s %#9.1<xor7>";       in "xor7     %=s %#9.1<xor7>";
+        out "crc8     %s %#9.1<crc8>";       in "crc8     %=s %#9.1<crc8>";
+        out "ccitt8   %s %#9.1<ccitt8>";     in "ccitt8   %=s %#9.1<ccitt8>";
+        out "crc16    %s %#9.1<crc16>";      in "crc16    %=s %#9.1<crc16>";
+        out "crc16r   %s %#9.1<crc16r>";     in "crc16r   %=s %#9.1<crc16r>";
+        out "ccitt16  %s %#9.1<ccitt16>";    in "ccitt16  %=s %#9.1<ccitt16>";
+        out "ccitt16a %s %#9.1<ccitt16a>";   in "ccitt16a %=s %#9.1<ccitt16a>";
+        out "ccitt16x %s %#9.1<ccitt16x>";   in "ccitt16x %=s %#9.1<ccitt16x>";
+        out "crc16c   %s %#9.1<crc16c>";     in "crc16c   %=s %#9.1<crc16c>";
+        out "xmodem   %s %#9.1<xmodem>";     in "xmodem   %=s %#9.1<xmodem>";
+        out "crc32    %s %#9.1<crc32>";      in "crc32    %=s %#9.1<crc32>";
+        out "crc32r   %s %#9.1<crc32r>";     in "crc32r   %=s %#9.1<crc32r>";
+        out "jamcrc   %s %#9.1<jamcrc>";     in "jamcrc   %=s %#9.1<jamcrc>";
+        out "adler32  %s %#9.1<adler32>";    in "adler32  %=s %#9.1<adler32>";
+        out "hexsum8  %s %#9.1<hexsum8>";    in "hexsum8  %=s %#9.1<hexsum8>";
+        
+        out "sum      %s %#09.1<sum>";       in "sum      %=s %#09.1<sum>";
+        out "sum8     %s %#09.1<sum8>";      in "sum8     %=s %#09.1<sum8>";
+        out "sum16    %s %#09.1<sum16>";     in "sum16    %=s %#09.1<sum16>";
+        out "sum32    %s %#09.1<sum32>";     in "sum32    %=s %#09.1<sum32>";
+        out "nsum     %s %#09.1<nsum>";      in "nsum     %=s %#09.1<nsum>";
+        out "negsum   %s %#09.1<negsum>";    in "negsum   %=s %#09.1<negsum>";
+        out "-sum     %s %#09.1<-sum>";      in "-sum     %=s %#09.1<-sum>";
+        out "nsum8    %s %#09.1<nsum8>";     in "nsum8    %=s %#09.1<nsum8>";
+        out "negsum8  %s %#09.1<negsum8>";   in "negsum8  %=s %#09.1<negsum8>";
+        out "-sum8    %s %#09.1<-sum8>";     in "-sum8    %=s %#09.1<-sum8>";
+        out "nsum16   %s %#09.1<nsum16>";    in "nsum16   %=s %#09.1<nsum16>";
+        out "negsum16 %s %#09.1<negsum1>";   in "negsum16 %=s %#09.1<negsum1>";
+        out "-sum16   %s %#09.1<-sum16>";    in "-sum16   %=s %#09.1<-sum16>";
+        out "nsum32   %s %#09.1<nsum32>";    in "nsum32   %=s %#09.1<nsum32>";
+        out "negsum32 %s %#09.1<negsum3>";   in "negsum32 %=s %#09.1<negsum3>";
+        out "-sum32   %s %#09.1<-sum32>";    in "-sum32   %=s %#09.1<-sum32>";
+        out "notsum   %s %#09.1<notsum>";    in "notsum   %=s %#09.1<notsum>";
+        out "~sum     %s %#09.1<~sum>";      in "~sum     %=s %#09.1<~sum>";
+        out "xor      %s %#09.1<xor>";       in "xor      %=s %#09.1<xor>";
+        out "xor8     %s %#09.1<xor8>";      in "xor8     %=s %#09.1<xor8>";
+        out "xor7     %s %#09.1<xor7>";      in "xor7     %=s %#09.1<xor7>";
+        out "crc8     %s %#09.1<crc8>";      in "crc8     %=s %#09.1<crc8>";
+        out "ccitt8   %s %#09.1<ccitt8>";    in "ccitt8   %=s %#09.1<ccitt8>";
+        out "crc16    %s %#09.1<crc16>";     in "crc16    %=s %#09.1<crc16>";
+        out "crc16r   %s %#09.1<crc16r>";    in "crc16r   %=s %#09.1<crc16r>";
+        out "ccitt16  %s %#09.1<ccitt16>";   in "ccitt16  %=s %#09.1<ccitt16>";
+        out "ccitt16a %s %#09.1<ccitt16a>";  in "ccitt16a %=s %#09.1<ccitt16a>";
+        out "ccitt16x %s %#09.1<ccitt16x>";  in "ccitt16x %=s %#09.1<ccitt16x>";
+        out "crc16c   %s %#09.1<crc16c>";    in "crc16c   %=s %#09.1<crc16c>";
+        out "xmodem   %s %#09.1<xmodem>";    in "xmodem   %=s %#09.1<xmodem>";
+        out "crc32    %s %#09.1<crc32>";     in "crc32    %=s %#09.1<crc32>";
+        out "crc32r   %s %#09.1<crc32r>";    in "crc32r   %=s %#09.1<crc32r>";
+        out "jamcrc   %s %#09.1<jamcrc>";    in "jamcrc   %=s %#09.1<jamcrc>";
+        out "adler32  %s %#09.1<adler32>";   in "adler32  %=s %#09.1<adler32>";
+        out "hexsum8  %s %#09.1<hexsum8>";   in "hexsum8  %=s %#09.1<hexsum8>";
+        
+        out "sum      %s %#-9.1<sum>";       in "sum      %=s %#-9.1<sum>";
+        out "sum8     %s %#-9.1<sum8>";      in "sum8     %=s %#-9.1<sum8>";
+        out "sum16    %s %#-9.1<sum16>";     in "sum16    %=s %#-9.1<sum16>";
+        out "sum32    %s %#-9.1<sum32>";     in "sum32    %=s %#-9.1<sum32>";
+        out "nsum     %s %#-9.1<nsum>";      in "nsum     %=s %#-9.1<nsum>";
+        out "negsum   %s %#-9.1<negsum>";    in "negsum   %=s %#-9.1<negsum>";
+        out "-sum     %s %#-9.1<-sum>";      in "-sum     %=s %#-9.1<-sum>";
+        out "nsum8    %s %#-9.1<nsum8>";     in "nsum8    %=s %#-9.1<nsum8>";
+        out "negsum8  %s %#-9.1<negsum8>";   in "negsum8  %=s %#-9.1<negsum8>";
+        out "-sum8    %s %#-9.1<-sum8>";     in "-sum8    %=s %#-9.1<-sum8>";
+        out "nsum16   %s %#-9.1<nsum16>";    in "nsum16   %=s %#-9.1<nsum16>";
+        out "negsum16 %s %#-9.1<negsum1>";   in "negsum16 %=s %#-9.1<negsum1>";
+        out "-sum16   %s %#-9.1<-sum16>";    in "-sum16   %=s %#-9.1<-sum16>";
+        out "nsum32   %s %#-9.1<nsum32>";    in "nsum32   %=s %#-9.1<nsum32>";
+        out "negsum32 %s %#-9.1<negsum3>";   in "negsum32 %=s %#-9.1<negsum3>";
+        out "-sum32   %s %#-9.1<-sum32>";    in "-sum32   %=s %#-9.1<-sum32>";
+        out "notsum   %s %#-9.1<notsum>";    in "notsum   %=s %#-9.1<notsum>";
+        out "~sum     %s %#-9.1<~sum>";      in "~sum     %=s %#-9.1<~sum>";
+        out "xor      %s %#-9.1<xor>";       in "xor      %=s %#-9.1<xor>";
+        out "xor8     %s %#-9.1<xor8>";      in "xor8     %=s %#-9.1<xor8>";
+        out "xor7     %s %#-9.1<xor7>";      in "xor7     %=s %#-9.1<xor7>";
+        out "crc8     %s %#-9.1<crc8>";      in "crc8     %=s %#-9.1<crc8>";
+        out "ccitt8   %s %#-9.1<ccitt8>";    in "ccitt8   %=s %#-9.1<ccitt8>";
+        out "crc16    %s %#-9.1<crc16>";     in "crc16    %=s %#-9.1<crc16>";
+        out "crc16r   %s %#-9.1<crc16r>";    in "crc16r   %=s %#-9.1<crc16r>";
+        out "ccitt16  %s %#-9.1<ccitt16>";   in "ccitt16  %=s %#-9.1<ccitt16>";
+        out "ccitt16a %s %#-9.1<ccitt16a>";  in "ccitt16a %=s %#-9.1<ccitt16a>";
+        out "ccitt16x %s %#-9.1<ccitt16x>";  in "ccitt16x %=s %#-9.1<ccitt16x>";
+        out "crc16c   %s %#-9.1<crc16c>";    in "crc16c   %=s %#-9.1<crc16c>";
+        out "xmodem   %s %#-9.1<xmodem>";    in "xmodem   %=s %#-9.1<xmodem>";
+        out "crc32    %s %#-9.1<crc32>";     in "crc32    %=s %#-9.1<crc32>";
+        out "crc32r   %s %#-9.1<crc32r>";    in "crc32r   %=s %#-9.1<crc32r>";
+        out "jamcrc   %s %#-9.1<jamcrc>";    in "jamcrc   %=s %#-9.1<jamcrc>";
+        out "adler32  %s %#-9.1<adler32>";   in "adler32  %=s %#-9.1<adler32>";
+        out "hexsum8  %s %#-9.1<hexsum8>";   in "hexsum8  %=s %#-9.1<hexsum8>";
+        out "DONE";
+    }
 }

 set startup {
@ -24,7 +242,432 @@ set startup {
 set debug 0

 startioc
-ioccmd {dbpf DZ:test1 "1"}
-assure "\x55\x40\x04\x00\x00z;\x4e"
-
+ioccmd {dbpf DZ:test1 "123456789"}
+assure "sum      123456789 \xDD\n"
+send   "sum      123456789 \xDD\n"
+assure "sum8     123456789 \xDD\n"
+send   "sum8     123456789 \xDD\n"
+assure "sum16    123456789 \x01\xDD\n"
+send   "sum16    123456789 \x01\xDD\n"
+assure "sum32    123456789 \x00\x00\x01\xDD\n"
+send   "sum32    123456789 \x00\x00\x01\xDD\n"
+assure "nsum     123456789 \x23\n"
+send   "nsum     123456789 \x23\n"
+assure "negsum   123456789 \x23\n"
+send   "negsum   123456789 \x23\n"
+assure "-sum     123456789 \x23\n"
+send   "-sum     123456789 \x23\n"
+assure "nsum8    123456789 \x23\n"
+send   "nsum8    123456789 \x23\n"
+assure "negsum8  123456789 \x23\n"
+send   "negsum8  123456789 \x23\n"
+assure "-sum8    123456789 \x23\n"
+send   "-sum8    123456789 \x23\n"
+assure "nsum16   123456789 \xFE\x23\n"
+send   "nsum16   123456789 \xFE\x23\n"
+assure "negsum16 123456789 \xFE\x23\n"
+send   "negsum16 123456789 \xFE\x23\n"
+assure "-sum16   123456789 \xFE\x23\n"
+send   "-sum16   123456789 \xFE\x23\n"
+assure "nsum32   123456789 \xFF\xFF\xFE\x23\n"
+send   "nsum32   123456789 \xFF\xFF\xFE\x23\n"
+assure "negsum32 123456789 \xFF\xFF\xFE\x23\n"
+send   "negsum32 123456789 \xFF\xFF\xFE\x23\n"
+assure "-sum32   123456789 \xFF\xFF\xFE\x23\n"
+send   "-sum32   123456789 \xFF\xFF\xFE\x23\n"
+assure "notsum   123456789 \x22\n"
+send   "notsum   123456789 \x22\n"
+assure "~sum     123456789 \x22\n"
+send   "~sum     123456789 \x22\n"
+assure "xor      123456789 \x31\n"
+send   "xor      123456789 \x31\n"
+assure "xor8     123456789 \x31\n"
+send   "xor8     123456789 \x31\n"
+assure "xor7     123456789 \x31\n"
+send   "xor7     123456789 \x31\n"
+assure "crc8     123456789 \xF4\n"
+send   "crc8     123456789 \xF4\n"
+assure "ccitt8   123456789 \xA1\n"
+send   "ccitt8   123456789 \xA1\n"
+assure "crc16    123456789 \xFE\xE8\n"
+send   "crc16    123456789 \xFE\xE8\n"
+assure "crc16r   123456789 \xBB\x3D\n"
+send   "crc16r   123456789 \xBB\x3D\n"
+assure "ccitt16  123456789 \x29\xB1\n"
+send   "ccitt16  123456789 \x29\xB1\n"
+assure "ccitt16a 123456789 \xE5\xCC\n"
+send   "ccitt16a 123456789 \xE5\xCC\n"
+assure "ccitt16x 123456789 \x31\xC3\n"
+send   "ccitt16x 123456789 \x31\xC3\n"
+assure "crc16c   123456789 \x31\xC3\n"
+send   "crc16c   123456789 \x31\xC3\n"
+assure "xmodem   123456789 \x31\xC3\n"
+send   "xmodem   123456789 \x31\xC3\n"
+assure "crc32    123456789 \xFC\x89\x19\x18\n"
+send   "crc32    123456789 \xFC\x89\x19\x18\n"
+assure "crc32r   123456789 \xCB\xF4\x39\x26\n"
+send   "crc32r   123456789 \xCB\xF4\x39\x26\n"
+assure "jamcrc   123456789 \x34\x0B\xC6\xD9\n"
+send   "jamcrc   123456789 \x34\x0B\xC6\xD9\n"
+assure "adler32  123456789 \x09\x1E\x01\xDE\n"
+send   "adler32  123456789 \x09\x1E\x01\xDE\n"
+assure "hexsum8  123456789 \x2D\n"
+send   "hexsum8  123456789 \x2D\n"
+                
+assure "sum      123456789 DD\n"
+send   "sum      123456789 DD\n"
+assure "sum8     123456789 DD\n"
+send   "sum8     123456789 DD\n"
+assure "sum16    123456789 01DD\n"
+send   "sum16    123456789 01DD\n"
+assure "sum32    123456789 000001DD\n"
+send   "sum32    123456789 000001DD\n"
+assure "nsum     123456789 23\n"
+send   "nsum     123456789 23\n"
+assure "negsum   123456789 23\n"
+send   "negsum   123456789 23\n"
+assure "-sum     123456789 23\n"
+send   "-sum     123456789 23\n"
+assure "nsum8    123456789 23\n"
+send   "nsum8    123456789 23\n"
+assure "negsum8  123456789 23\n"
+send   "negsum8  123456789 23\n"
+assure "-sum8    123456789 23\n"
+send   "-sum8    123456789 23\n"
+assure "nsum16   123456789 FE23\n"
+send   "nsum16   123456789 FE23\n"
+assure "negsum16 123456789 FE23\n"
+send   "negsum16 123456789 FE23\n"
+assure "-sum16   123456789 FE23\n"
+send   "-sum16   123456789 FE23\n"
+assure "nsum32   123456789 FFFFFE23\n"
+send   "nsum32   123456789 FFFFFE23\n"
+assure "negsum32 123456789 FFFFFE23\n"
+send   "negsum32 123456789 FFFFFE23\n"
+assure "-sum32   123456789 FFFFFE23\n"
+send   "-sum32   123456789 FFFFFE23\n"
+assure "notsum   123456789 22\n"
+send   "notsum   123456789 22\n"
+assure "~sum     123456789 22\n"
+send   "~sum     123456789 22\n"
+assure "xor      123456789 31\n"
+send   "xor      123456789 31\n"
+assure "xor8     123456789 31\n"
+send   "xor8     123456789 31\n"
+assure "xor7     123456789 31\n"
+send   "xor7     123456789 31\n"
+assure "crc8     123456789 F4\n"
+send   "crc8     123456789 F4\n"
+assure "ccitt8   123456789 A1\n"
+send   "ccitt8   123456789 A1\n"
+assure "crc16    123456789 FEE8\n"
+send   "crc16    123456789 FEE8\n"
+assure "crc16r   123456789 BB3D\n"
+send   "crc16r   123456789 BB3D\n"
+assure "ccitt16  123456789 29B1\n"
+send   "ccitt16  123456789 29B1\n"
+assure "ccitt16a 123456789 E5CC\n"
+send   "ccitt16a 123456789 E5CC\n"
+assure "ccitt16x 123456789 31C3\n"
+send   "ccitt16x 123456789 31C3\n"
+assure "crc16c   123456789 31C3\n"
+send   "crc16c   123456789 31C3\n"
+assure "xmodem   123456789 31C3\n"
+send   "xmodem   123456789 31C3\n"
+assure "crc32    123456789 FC891918\n"
+send   "crc32    123456789 FC891918\n"
+assure "crc32r   123456789 CBF43926\n"
+send   "crc32r   123456789 CBF43926\n"
+assure "jamcrc   123456789 340BC6D9\n"
+send   "jamcrc   123456789 340BC6D9\n"
+assure "adler32  123456789 091E01DE\n"
+send   "adler32  123456789 091E01DE\n"
+assure "hexsum8  123456789 2D\n"
+send   "hexsum8  123456789 2D\n"
+                
+assure "sum      123456789 \x3D\x3D\n"
+send   "sum      123456789 \x3D\x3D\n"
+assure "sum8     123456789 \x3D\x3D\n"
+send   "sum8     123456789 \x3D\x3D\n"
+assure "sum16    123456789 \x30\x31\x3D\x3D\n"
+send   "sum16    123456789 \x30\x31\x3D\x3D\n"
+assure "sum32    123456789 \x30\x30\x30\x30\x30\x31\x3D\x3D\n"
+send   "sum32    123456789 \x30\x30\x30\x30\x30\x31\x3D\x3D\n"
+assure "nsum     123456789 \x32\x33\n"
+send   "nsum     123456789 \x32\x33\n"
+assure "negsum   123456789 \x32\x33\n"
+send   "negsum   123456789 \x32\x33\n"
+assure "-sum     123456789 \x32\x33\n"
+send   "-sum     123456789 \x32\x33\n"
+assure "nsum8    123456789 \x32\x33\n"
+send   "nsum8    123456789 \x32\x33\n"
+assure "negsum8  123456789 \x32\x33\n"
+send   "negsum8  123456789 \x32\x33\n"
+assure "-sum8    123456789 \x32\x33\n"
+send   "-sum8    123456789 \x32\x33\n"
+assure "nsum16   123456789 \x3F\x3E\x32\x33\n"
+send   "nsum16   123456789 \x3F\x3E\x32\x33\n"
+assure "negsum16 123456789 \x3F\x3E\x32\x33\n"
+send   "negsum16 123456789 \x3F\x3E\x32\x33\n"
+assure "-sum16   123456789 \x3F\x3E\x32\x33\n"
+send   "-sum16   123456789 \x3F\x3E\x32\x33\n"
+assure "nsum32   123456789 \x3F\x3F\x3F\x3F\x3F\x3E\x32\x33\n"
+send   "nsum32   123456789 \x3F\x3F\x3F\x3F\x3F\x3E\x32\x33\n"
+assure "negsum32 123456789 \x3F\x3F\x3F\x3F\x3F\x3E\x32\x33\n"
+send   "negsum32 123456789 \x3F\x3F\x3F\x3F\x3F\x3E\x32\x33\n"
+assure "-sum32   123456789 \x3F\x3F\x3F\x3F\x3F\x3E\x32\x33\n"
+send   "-sum32   123456789 \x3F\x3F\x3F\x3F\x3F\x3E\x32\x33\n"
+assure "notsum   123456789 \x32\x32\n"
+send   "notsum   123456789 \x32\x32\n"
+assure "~sum     123456789 \x32\x32\n"
+send   "~sum     123456789 \x32\x32\n"
+assure "xor      123456789 \x33\x31\n"
+send   "xor      123456789 \x33\x31\n"
+assure "xor8     123456789 \x33\x31\n"
+send   "xor8     123456789 \x33\x31\n"
+assure "xor7     123456789 \x33\x31\n"
+send   "xor7     123456789 \x33\x31\n"
+assure "crc8     123456789 \x3F\x34\n"
+send   "crc8     123456789 \x3F\x34\n"
+assure "ccitt8   123456789 \x3A\x31\n"
+send   "ccitt8   123456789 \x3A\x31\n"
+assure "crc16    123456789 \x3F\x3E\x3E\x38\n"
+send   "crc16    123456789 \x3F\x3E\x3E\x38\n"
+assure "crc16r   123456789 \x3B\x3B\x33\x3D\n"
+send   "crc16r   123456789 \x3B\x3B\x33\x3D\n"
+assure "ccitt16  123456789 \x32\x39\x3B\x31\n"
+send   "ccitt16  123456789 \x32\x39\x3B\x31\n"
+assure "ccitt16a 123456789 \x3E\x35\x3C\x3C\n"
+send   "ccitt16a 123456789 \x3E\x35\x3C\x3C\n"
+assure "ccitt16x 123456789 \x33\x31\x3C\x33\n"
+send   "ccitt16x 123456789 \x33\x31\x3C\x33\n"
+assure "crc16c   123456789 \x33\x31\x3C\x33\n"
+send   "crc16c   123456789 \x33\x31\x3C\x33\n"
+assure "xmodem   123456789 \x33\x31\x3C\x33\n"
+send   "xmodem   123456789 \x33\x31\x3C\x33\n"
+assure "crc32    123456789 \x3F\x3C\x38\x39\x31\x39\x31\x38\n"
+send   "crc32    123456789 \x3F\x3C\x38\x39\x31\x39\x31\x38\n"
+assure "crc32r   123456789 \x3C\x3B\x3F\x34\x33\x39\x32\x36\n"
+send   "crc32r   123456789 \x3C\x3B\x3F\x34\x33\x39\x32\x36\n"
+assure "jamcrc   123456789 \x33\x34\x30\x3B\x3C\x36\x3D\x39\n"
+send   "jamcrc   123456789 \x33\x34\x30\x3B\x3C\x36\x3D\x39\n"
+assure "adler32  123456789 \x30\x39\x31\x3E\x30\x31\x3D\x3E\n"
+send   "adler32  123456789 \x30\x39\x31\x3E\x30\x31\x3D\x3E\n"
+assure "hexsum8  123456789 \x32\x3D\n"
+send   "hexsum8  123456789 \x32\x3D\n"
+                
+assure "sum      123456789 \xDD\n"
+send   "sum      123456789 \xDD\n"
+assure "sum8     123456789 \xDD\n"
+send   "sum8     123456789 \xDD\n"
+assure "sum16    123456789 \xDD\x01\n"
+send   "sum16    123456789 \xDD\x01\n"
+assure "sum32    123456789 \xDD\x01\x00\x00\n"
+send   "sum32    123456789 \xDD\x01\x00\x00\n"
+assure "nsum     123456789 \x23\n"
+send   "nsum     123456789 \x23\n"
+assure "negsum   123456789 \x23\n"
+send   "negsum   123456789 \x23\n"
+assure "-sum     123456789 \x23\n"
+send   "-sum     123456789 \x23\n"
+assure "nsum8    123456789 \x23\n"
+send   "nsum8    123456789 \x23\n"
+assure "negsum8  123456789 \x23\n"
+send   "negsum8  123456789 \x23\n"
+assure "-sum8    123456789 \x23\n"
+send   "-sum8    123456789 \x23\n"
+assure "nsum16   123456789 \x23\xFE\n"
+send   "nsum16   123456789 \x23\xFE\n"
+assure "negsum16 123456789 \x23\xFE\n"
+send   "negsum16 123456789 \x23\xFE\n"
+assure "-sum16   123456789 \x23\xFE\n"
+send   "-sum16   123456789 \x23\xFE\n"
+assure "nsum32   123456789 \x23\xFE\xFF\xFF\n"
+send   "nsum32   123456789 \x23\xFE\xFF\xFF\n"
+assure "negsum32 123456789 \x23\xFE\xFF\xFF\n"
+send   "negsum32 123456789 \x23\xFE\xFF\xFF\n"
+assure "-sum32   123456789 \x23\xFE\xFF\xFF\n"
+send   "-sum32   123456789 \x23\xFE\xFF\xFF\n"
+assure "notsum   123456789 \x22\n"
+send   "notsum   123456789 \x22\n"
+assure "~sum     123456789 \x22\n"
+send   "~sum     123456789 \x22\n"
+assure "xor      123456789 \x31\n"
+send   "xor      123456789 \x31\n"
+assure "xor8     123456789 \x31\n"
+send   "xor8     123456789 \x31\n"
+assure "xor7     123456789 \x31\n"
+send   "xor7     123456789 \x31\n"
+assure "crc8     123456789 \xF4\n"
+send   "crc8     123456789 \xF4\n"
+assure "ccitt8   123456789 \xA1\n"
+send   "ccitt8   123456789 \xA1\n"
+assure "crc16    123456789 \xE8\xFE\n"
+send   "crc16    123456789 \xE8\xFE\n"
+assure "crc16r   123456789 \x3D\xBB\n"
+send   "crc16r   123456789 \x3D\xBB\n"
+assure "ccitt16  123456789 \xB1\x29\n"
+send   "ccitt16  123456789 \xB1\x29\n"
+assure "ccitt16a 123456789 \xCC\xE5\n"
+send   "ccitt16a 123456789 \xCC\xE5\n"
+assure "ccitt16x 123456789 \xC3\x31\n"
+send   "ccitt16x 123456789 \xC3\x31\n"
+assure "crc16c   123456789 \xC3\x31\n"
+send   "crc16c   123456789 \xC3\x31\n"
+assure "xmodem   123456789 \xC3\x31\n"
+send   "xmodem   123456789 \xC3\x31\n"
+assure "crc32    123456789 \x18\x19\x89\xFC\n"
+send   "crc32    123456789 \x18\x19\x89\xFC\n"
+assure "crc32r   123456789 \x26\x39\xF4\xCB\n"
+send   "crc32r   123456789 \x26\x39\xF4\xCB\n"
+assure "jamcrc   123456789 \xD9\xC6\x0B\x34\n"
+send   "jamcrc   123456789 \xD9\xC6\x0B\x34\n"
+assure "adler32  123456789 \xDE\x01\x1E\x09\n"
+send   "adler32  123456789 \xDE\x01\x1E\x09\n"
+assure "hexsum8  123456789 \x2D\n"
+send   "hexsum8  123456789 \x2D\n"
+                
+assure "sum      123456789 DD\n"
+send   "sum      123456789 DD\n"
+assure "sum8     123456789 DD\n"
+send   "sum8     123456789 DD\n"
+assure "sum16    123456789 DD01\n"
+send   "sum16    123456789 DD01\n"
+assure "sum32    123456789 DD010000\n"
+send   "sum32    123456789 DD010000\n"
+assure "nsum     123456789 23\n"
+send   "nsum     123456789 23\n"
+assure "negsum   123456789 23\n"
+send   "negsum   123456789 23\n"
+assure "-sum     123456789 23\n"
+send   "-sum     123456789 23\n"
+assure "nsum8    123456789 23\n"
+send   "nsum8    123456789 23\n"
+assure "negsum8  123456789 23\n"
+send   "negsum8  123456789 23\n"
+assure "-sum8    123456789 23\n"
+send   "-sum8    123456789 23\n"
+assure "nsum16   123456789 23FE\n"
+send   "nsum16   123456789 23FE\n"
+assure "negsum16 123456789 23FE\n"
+send   "negsum16 123456789 23FE\n"
+assure "-sum16   123456789 23FE\n"
+send   "-sum16   123456789 23FE\n"
+assure "nsum32   123456789 23FEFFFF\n"
+send   "nsum32   123456789 23FEFFFF\n"
+assure "negsum32 123456789 23FEFFFF\n"
+send   "negsum32 123456789 23FEFFFF\n"
+assure "-sum32   123456789 23FEFFFF\n"
+send   "-sum32   123456789 23FEFFFF\n"
+assure "notsum   123456789 22\n"
+send   "notsum   123456789 22\n"
+assure "~sum     123456789 22\n"
+send   "~sum     123456789 22\n"
+assure "xor      123456789 31\n"
+send   "xor      123456789 31\n"
+assure "xor8     123456789 31\n"
+send   "xor8     123456789 31\n"
+assure "xor7     123456789 31\n"
+send   "xor7     123456789 31\n"
+assure "crc8     123456789 F4\n"
+send   "crc8     123456789 F4\n"
+assure "ccitt8   123456789 A1\n"
+send   "ccitt8   123456789 A1\n"
+assure "crc16    123456789 E8FE\n"
+send   "crc16    123456789 E8FE\n"
+assure "crc16r   123456789 3DBB\n"
+send   "crc16r   123456789 3DBB\n"
+assure "ccitt16  123456789 B129\n"
+send   "ccitt16  123456789 B129\n"
+assure "ccitt16a 123456789 CCE5\n"
+send   "ccitt16a 123456789 CCE5\n"
+assure "ccitt16x 123456789 C331\n"
+send   "ccitt16x 123456789 C331\n"
+assure "crc16c   123456789 C331\n"
+send   "crc16c   123456789 C331\n"
+assure "xmodem   123456789 C331\n"
+send   "xmodem   123456789 C331\n"
+assure "crc32    123456789 181989FC\n"
+send   "crc32    123456789 181989FC\n"
+assure "crc32r   123456789 2639F4CB\n"
+send   "crc32r   123456789 2639F4CB\n"
+assure "jamcrc   123456789 D9C60B34\n"
+send   "jamcrc   123456789 D9C60B34\n"
+assure "adler32  123456789 DE011E09\n"
+send   "adler32  123456789 DE011E09\n"
+assure "hexsum8  123456789 2D\n"
+send   "hexsum8  123456789 2D\n"
+                
+assure "sum      123456789 \x3D\x3D\n"
+send   "sum      123456789 \x3D\x3D\n"
+assure "sum8     123456789 \x3D\x3D\n"
+send   "sum8     123456789 \x3D\x3D\n"
+assure "sum16    123456789 \x3D\x3D\x30\x31\n"
+send   "sum16    123456789 \x3D\x3D\x30\x31\n"
+assure "sum32    123456789 \x3D\x3D\x30\x31\x30\x30\x30\x30\n"
+send   "sum32    123456789 \x3D\x3D\x30\x31\x30\x30\x30\x30\n"
+assure "nsum     123456789 \x32\x33\n"
+send   "nsum     123456789 \x32\x33\n"
+assure "negsum   123456789 \x32\x33\n"
+send   "negsum   123456789 \x32\x33\n"
+assure "-sum     123456789 \x32\x33\n"
+send   "-sum     123456789 \x32\x33\n"
+assure "nsum8    123456789 \x32\x33\n"
+send   "nsum8    123456789 \x32\x33\n"
+assure "negsum8  123456789 \x32\x33\n"
+send   "negsum8  123456789 \x32\x33\n"
+assure "-sum8    123456789 \x32\x33\n"
+send   "-sum8    123456789 \x32\x33\n"
+assure "nsum16   123456789 \x32\x33\x3F\x3E\n"
+send   "nsum16   123456789 \x32\x33\x3F\x3E\n"
+assure "negsum16 123456789 \x32\x33\x3F\x3E\n"
+send   "negsum16 123456789 \x32\x33\x3F\x3E\n"
+assure "-sum16   123456789 \x32\x33\x3F\x3E\n"
+send   "-sum16   123456789 \x32\x33\x3F\x3E\n"
+assure "nsum32   123456789 \x32\x33\x3F\x3E\x3F\x3F\x3F\x3F\n"
+send   "nsum32   123456789 \x32\x33\x3F\x3E\x3F\x3F\x3F\x3F\n"
+assure "negsum32 123456789 \x32\x33\x3F\x3E\x3F\x3F\x3F\x3F\n"
+send   "negsum32 123456789 \x32\x33\x3F\x3E\x3F\x3F\x3F\x3F\n"
+assure "-sum32   123456789 \x32\x33\x3F\x3E\x3F\x3F\x3F\x3F\n"
+send   "-sum32   123456789 \x32\x33\x3F\x3E\x3F\x3F\x3F\x3F\n"
+assure "notsum   123456789 \x32\x32\n"
+send   "notsum   123456789 \x32\x32\n"
+assure "~sum     123456789 \x32\x32\n"
+send   "~sum     123456789 \x32\x32\n"
+assure "xor      123456789 \x33\x31\n"
+send   "xor      123456789 \x33\x31\n"
+assure "xor8     123456789 \x33\x31\n"
+send   "xor8     123456789 \x33\x31\n"
+assure "xor7     123456789 \x33\x31\n"
+send   "xor7     123456789 \x33\x31\n"
+assure "crc8     123456789 \x3F\x34\n"
+send   "crc8     123456789 \x3F\x34\n"
+assure "ccitt8   123456789 \x3A\x31\n"
+send   "ccitt8   123456789 \x3A\x31\n"
+assure "crc16    123456789 \x3E\x38\x3F\x3E\n"
+send   "crc16    123456789 \x3E\x38\x3F\x3E\n"
+assure "crc16r   123456789 \x33\x3D\x3B\x3B\n"
+send   "crc16r   123456789 \x33\x3D\x3B\x3B\n"
+assure "ccitt16  123456789 \x3B\x31\x32\x39\n"
+send   "ccitt16  123456789 \x3B\x31\x32\x39\n"
+assure "ccitt16a 123456789 \x3C\x3C\x3E\x35\n"
+send   "ccitt16a 123456789 \x3C\x3C\x3E\x35\n"
+assure "ccitt16x 123456789 \x3C\x33\x33\x31\n"
+send   "ccitt16x 123456789 \x3C\x33\x33\x31\n"
+assure "crc16c   123456789 \x3C\x33\x33\x31\n"
+send   "crc16c   123456789 \x3C\x33\x33\x31\n"
+assure "xmodem   123456789 \x3C\x33\x33\x31\n"
+send   "xmodem   123456789 \x3C\x33\x33\x31\n"
+assure "crc32    123456789 \x31\x38\x31\x39\x38\x39\x3F\x3C\n"
+send   "crc32    123456789 \x31\x38\x31\x39\x38\x39\x3F\x3C\n"
+assure "crc32r   123456789 \x32\x36\x33\x39\x3F\x34\x3C\x3B\n"
+send   "crc32r   123456789 \x32\x36\x33\x39\x3F\x34\x3C\x3B\n"
+assure "jamcrc   123456789 \x3D\x39\x3C\x36\x30\x3B\x33\x34\n"
+send   "jamcrc   123456789 \x3D\x39\x3C\x36\x30\x3B\x33\x34\n"
+assure "adler32  123456789 \x3D\x3E\x30\x31\x31\x3E\x30\x39\n"
+send   "adler32  123456789 \x3D\x3E\x30\x31\x31\x3E\x30\x39\n"
+assure "hexsum8  123456789 \x32\x3D\n"
+send   "hexsum8  123456789 \x32\x3D\n"
+assure "DONE\n"
+                
 finish
--- a/streamApp/tests/testDouble
+++ b/streamApp/tests/testDouble
@ -41,12 +41,10 @@ set protocol {
 set startup {
 }

-set debug 0
-
 startioc

 set inf [format %f inf]
-set nan [format %f nan]
+if [catch {set nan [format %f nan]}] {set nan nan}

 ioccmd {dbpf DZ:test1.PROC 1}
 send "3.14159265359\n"
--- a/streamApp/tests/testEnum
+++ b/streamApp/tests/testEnum
@ -50,7 +50,7 @@ set protocol {
    in  {in  "%{zero|one|two}bla"; out "%d";}
    out1 {out "%#{zero|one|two}bla";}
    in1  {in  "%#{zero|one|two}bla"; out "%d";}
-    out2 {out "%#{zero=-1|one|two=5}bla";}
+    out2 {out "%#{zero=-1|one|two=5|default=?}bla";}
    in2  {in  "%#{zero=-1|one|two=5}bla"; out "%d";}
    in3  {in  "%{\x00|\r|}bla"; out "%d";}
 }
@ -81,6 +81,8 @@ ioccmd {dbpf DZ:testout2 0}
 assure "onebla\n"
 ioccmd {dbpf DZ:testout2 5}
 assure "twobla\n"
+ioccmd {dbpf DZ:testout2 17}
+assure "defaultbla\n"

 ioccmd {dbpf DZ:testin.PROC 1}
 send "zerobla\n"
--- a/streamApp/tests/testFormats
+++ b/streamApp/tests/testFormats
@ -30,11 +30,6 @@ set records {
        field (DTYP, "stream")
        field (OUT,  "@test.proto bcd device")
    }
-    record (stringout, "DZ:chksum")
-    {
-        field (DTYP, "stream")
-        field (OUT,  "@test.proto chksum device")
-    }
 }

 set protocol {
@ -43,13 +38,6 @@ set protocol {
    ao {out "%.2f %.2e %.2E %.2g %.2G %i %d %u %o %04x %#.2f %#.2e %#.2E %#.2g %#.2G %#i %#d %#u %#o %#06x";}
    lo {out "%d %(VAL)d %06d %x %06X %b %06b %.6b %B.! %06B.!";}
    bcd {out "%D %6D %.2D %.4D %.6D %.8D %#D %#6D %#.2D %#.4D %#.6D";}
-    chksum {out "%s%<xor>";
-            out "%s%0<sum>";
-            out "%s%0<crc8>";
-            out "%s%0<crc16>";
-            out "%s%0<crc32>";
-            out "%s%0<adler32>";
-     }
 }

 set startup {
@ -80,15 +68,15 @@ ioccmd {dbpf DZ:lo 12345}
 assure "12345 12345 012345 3039 003039 11000000111001 11000000111001 111001 !!......!!!..! !!......!!!..!\n"
 ioccmd {dbpf DZ:lo -1}
 if {$tcl_platform(machine) == "x86_64"} {
-assure "-1 -1 -00001 ffffffffffffffff FFFFFFFFFFFFFFFF 1111111111111111111111111111111111111111111111111111111111111111 1111111111111111111111111111111111111111111111111111111111111111 111111 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
+assure "-1 -1 -00001 ffffffffffffffff FFFFFF 11111111111111111111111111111111 11111111111111111111111111111111 111111 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
 } else {
-assure "-1 -1 -00001 ffffffff FFFFFFFF 11111111111111111111111111111111 11111111111111111111111111111111 111111 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
+assure "-1 -1 -00001 ffffffff FFFFFF 11111111111111111111111111111111 11111111111111111111111111111111 111111 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"
 }
 ioccmd {dbpf DZ:lo -1234}
 if {$tcl_platform(machine) == "x86_64"} {
-assure "-1234 -1234 -01234 fffffffffffffb2e FFFFFFFFFFFFFB2E 1111111111111111111111111111111111111111111111111111101100101110 1111111111111111111111111111111111111111111111111111101100101110 101110 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!.!!..!.!!!. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!.!!..!.!!!.\n"
+assure "-1234 -1234 -01234 fffffffffffffb2e FFFB2E 11111111111111111111101100101110 11111111111111111111101100101110 101110 !!!!!!!!!!!!!!!!!!!!!.!!..!.!!!. !!!!!!!!!!!!!!!!!!!!!.!!..!.!!!.\n"
 } else {
-assure "-1234 -1234 -01234 fffffb2e FFFFFB2E 11111111111111111111101100101110 11111111111111111111101100101110 101110 !!!!!!!!!!!!!!!!!!!!!.!!..!.!!!. !!!!!!!!!!!!!!!!!!!!!.!!..!.!!!.\n"
+assure "-1234 -1234 -01234 fffffb2e FFFB2E 11111111111111111111101100101110 11111111111111111111101100101110 101110 !!!!!!!!!!!!!!!!!!!!!.!!..!.!!!. !!!!!!!!!!!!!!!!!!!!!.!!..!.!!!.\n"
 }
 ioccmd {dbpf DZ:lo 255}
 assure "255 255 000255 ff 0000FF 11111111 11111111 111111 !!!!!!!! !!!!!!!!\n"
@ -100,11 +88,4 @@ assure "\0\0\0\0\1\2\3\4 \0\0\0\0\1\2\3\4 \4 \3\4 \2\3\4 \1\2\3\4 \4\3\2\1\0\0\0
 } else {
 assure "\1\2\3\4 \0\0\1\2\3\4 \4 \3\4 \2\3\4 \1\2\3\4 \4\3\2\1 \4\3\2\1\0\0 \4 \4\3 \4\3\2\n"
 }
-ioccmd {dbpf DZ:chksum "123456789"}
-assure "1234567891\n"
-assure "123456789DD\n"
-assure "123456789F4\n"
-assure "123456789FEE8\n"
-assure "123456789FC891918\n"
-assure "123456789091E01DE\n"
 finish
--- a/streamApp/tests/testInteger
+++ b/streamApp/tests/testInteger
@ -10,16 +10,19 @@ set records {
    record (ai, "DZ:test1")
    {
        field (DTYP, "stream")
+        field (LINR, "LINEAR")
        field (INP,  "@test.proto test1 device")
    }
    record (ai, "DZ:test2")
    {
        field (DTYP, "stream")
+        field (LINR, "LINEAR")
        field (INP,  "@test.proto test2 device")
    }
    record (ai, "DZ:test3")
    {
        field (DTYP, "stream")
+        field (LINR, "LINEAR")
        field (INP,  "@test.proto test3 device")
    }
    record (ai, "DZ:test4")
@ -30,26 +33,31 @@ set records {
    record (ai, "DZ:test5")
    {
        field (DTYP, "stream")
+        field (LINR, "LINEAR")
        field (INP,  "@test.proto test5 device")
    }
    record (ai, "DZ:test6")
    {
        field (DTYP, "stream")
+        field (LINR, "LINEAR")
        field (INP,  "@test.proto test6 device")
    }
    record (ai, "DZ:test7")
    {
        field (DTYP, "stream")
+        field (LINR, "LINEAR")
        field (INP,  "@test.proto test7 device")
    }
    record (ai, "DZ:test8")
    {
        field (DTYP, "stream")
+        field (LINR, "LINEAR")
        field (INP,  "@test.proto test8 device")
    }
    record (ai, "DZ:test9")
    {
        field (DTYP, "stream")
+        field (LINR, "LINEAR")
        field (INP,  "@test.proto test9 device")
    }
    record (ai, "DZ:test10")
--- a/streamApp/tests/testStrangesum
+++ b/streamApp/tests/testStrangesum
@ -0,0 +1,33 @@
+#!/usr/bin/env tclsh
+source streamtestlib.tcl
+
+# Define records, protocol and startup (text goes to files)
+# The asynPort "device" is connected to a network TCP socket
+# Talk to the socket with send/receive/assure
+# Send commands to the ioc shell with ioccmd
+
+set records {
+    record (stringout, "DZ:test1")
+    {
+        field (DTYP, "stream")
+        field (OUT,  "@test.proto test1 device")
+    }
+}
+
+set protocol {
+    Terminator="\r\n";
+    test1 {
+        out ":%s%01<-hexsum8>";
+    }
+}
+
+set startup {
+}
+
+set debug 0
+
+startioc
+ioccmd {dbpf DZ:test1 "010304010001"}
+assure ":010304010001F6\r\n"
+                
+finish
--- a/streamApp/tests/testStreamBuffer
+++ b/streamApp/tests/testStreamBuffer
@ -53,13 +53,22 @@ int main () {
 }
 EOF

-g++ -I ../../src ../../src/O.$EPICS_HOST_ARCH/StreamBuffer.o test.cc -o test.exe
-
-test.exe
-if [ $? != 0 ]
+if [ "$1" = "-sls" ]
 then
-    echo -e "\033[31;7mTest failed.\033[0m"
-    exit 1
+    O=../../O.*_$EPICS_HOST_ARCH/StreamBuffer.o
+else
+    O=../../src/O.$EPICS_HOST_ARCH/StreamBuffer.o
 fi
+
+for o in $O
+do
+    g++ -I ../../src $o test.cc -o test.exe
+    test.exe
+    if [ $? != 0 ]
+    then
+        echo -e "\033[31;7mTest failed.\033[0m"
+        exit 1
+    fi
+done
 rm test.*
 echo -e "\033[32mTest passed.\033[0m"
Author	SHA1	Message	Date
Dirk Zimoch	74775996db	find clean way to create dbd file	2015-12-07 17:22:40 +01:00
Dirk Zimoch	74426aab66	provide local strncasecmp for 3.13	2015-12-07 17:21:44 +01:00
Dirk Zimoch	690bbb13d4	version macros updated	2015-12-07 15:15:06 +01:00
Dirk Zimoch	871fbed2b0	checksums updated	2015-10-19 13:58:06 +02:00
Dirk Zimoch	85c68d2ae6	uppercase	2015-10-19 13:58:06 +02:00
Dirk Zimoch	8870611d4d	modbus checksum added	2015-10-19 13:58:06 +02:00
Dirk Zimoch	67af7fc1bf	links updated	2015-10-19 13:58:06 +02:00
Dirk Zimoch	93bea174e4	highlinting of new featured removed	2015-10-19 13:58:06 +02:00
Dirk Zimoch	84fc6aabc8	fixed witdth flag ! added	2015-10-19 13:58:06 +02:00
Dirk Zimoch	38c4f5bcb6	renamed to make Windows happy	2015-09-17 14:13:01 +02:00
zimoch	e2af7e3149	typo fixed	2015-09-15 07:21:41 +00:00
zimoch	950d75ba43	Split long_format into signed_format and unsigned_format to hangle sign extension from EPICS LONG or ULONG to long or unsigned long correctly on systems with 64 bit long.	2015-08-31 15:25:23 +00:00
zimoch	e651c99697	fix tests	2015-08-18 14:34:11 +00:00
zimoch	9694628d3f	limit number of significant half bytes in %x formats to avoid problems on 64 bit machines	2015-08-18 14:33:48 +00:00
zimoch	046582d1a0	add default choice in enum output	2015-08-18 14:32:24 +00:00
zimoch	f6f0ea9ae5	fix redirection of strings to char arrays	2015-08-18 14:30:54 +00:00
zimoch	018547cdf3	allow and document direct conversion from VAL/OVAL to integer to get more bits on 64 bit systems	2015-08-18 14:28:26 +00:00
zimoch	d763a64f03	fix for 64 bit machines	2015-08-17 13:34:00 +00:00
zimoch	cefa460a0d	find correct object code	2015-08-17 13:33:35 +00:00
zimoch	cc5948ad0b	If ai uses no conversion, transport long i/o to and from val directly. This preverves more bits on 64 bit systems than going through the 32 bit rval field.	2015-07-17 13:24:37 +00:00
zimoch	be1943a66d	fix for version check	2015-06-25 16:06:39 +00:00
zimoch	d9acb47afe	make it work with old and new version of driver.makefile	2015-06-25 16:03:49 +00:00
zimoch	b721d26fb8	avoid buffer overflow	2015-04-08 09:35:00 +00:00
zimoch	7530c7c67d	check for error condifiton	2015-04-08 09:34:46 +00:00
zimoch	824cd4d283	debug message improved	2015-04-02 13:16:22 +00:00
zimoch	2e30e7aee6	fix message when INP/OUT link is empty fix bug with formatting arrays of char as strings in redirect	2015-04-02 13:15:46 +00:00
zimoch	3a5a3e22b9	Stupid error: Minutes and seconds start from 0, not 1.	2015-02-10 16:48:39 +00:00
zimoch	51bd766ba6	Fix or rather workaround for MinGW and maybe other systems without localtime_r function	2014-06-24 13:20:19 +00:00
zimoch	0ab0d6db07	function pointer type problem fixed	2014-06-24 13:19:36 +00:00
zimoch	a12de614d6	script to make a pdf from the hrml pages	2014-05-02 15:10:18 +00:00
zimoch	240abd2788	new logo and design cleanup, printing improved	2014-05-02 15:09:49 +00:00
zimoch	e131fcb32f	new logo, png instead of gif, better quality	2014-05-02 15:08:36 +00:00
zimoch	f88f594e87	shorter header, better for printing	2014-05-02 15:07:06 +00:00
zimoch	56ef0651f2	fix for BSD Linux	2014-04-07 11:55:36 +00:00
zimoch	9b9726b800	patchlevel fixed	2013-11-06 13:29:42 +00:00
zimoch	b139221f0b	error messages improved	2013-11-06 10:22:51 +00:00
zimoch	b0ab8a7a8b	write error message on write timeout	2013-11-06 09:52:39 +00:00
zimoch	ddac589676	newline in report output fixed	2013-11-06 09:44:18 +00:00
zimoch	5b380cdaad	No connection checking before locking device. Multi-devices (GPIB) behave strangely. Get an error when device is disconnected.	2013-11-05 14:48:53 +00:00
zimoch	cc9adc77fa	patchlevel updated	2013-10-23 14:38:28 +00:00
zimoch	2b38f7bcfa	.	2013-10-23 14:36:35 +00:00
zimoch	0ceada70b5	status information added	2013-10-23 14:35:08 +00:00
zimoch	7bf91b403d	status information added error messages improved dont mark device as BusOwner when locking fails	2013-10-23 14:34:53 +00:00
zimoch	bf5c359649	status information added use class for status strings to make array overrun impossible	2013-10-23 14:33:15 +00:00
zimoch	c41ac44bd1	typo in comment	2013-10-23 14:31:35 +00:00
zimoch	e36013d64e	error messages improved Do not queue lock request when not connected Do not call lock callback when unlock fails	2013-10-23 14:31:00 +00:00
zimoch	9e48ad3e61	typo	2013-10-02 13:09:17 +00:00
zimoch	054e74d04a	Do not connect unrequested. Do not register for int/uint interrupts without need.	2013-09-20 12:06:56 +00:00
zimoch	5f6319ed3d	stay at version 2.6	2013-09-20 09:52:43 +00:00
zimoch	2f39622a57	Error Message improved	2013-09-20 09:44:26 +00:00
zimoch	7801119215	fix for cygwin	2013-06-13 15:21:12 +00:00
zimoch	a6696cae49	fixes for windows	2013-06-13 15:13:53 +00:00
zimoch	40b52167aa	lock timeout error message added	2013-06-13 15:12:06 +00:00
zimoch	814e3d53a3	version update	2013-05-16 08:49:30 +00:00
zimoch	6bd46e0470	* empty log message *	2013-05-16 08:47:16 +00:00
zimoch	d5cda13f6f	version updated	2013-05-16 08:45:49 +00:00
zimoch	bfc8e6a9cd	Handle inverted and negative checksums generically. Get rid of ulong and uchar typedefs. use unsigned int unstead of ulolg for return types.	2013-05-16 08:31:33 +00:00
zimoch	73cba130c3	use ssize_t for signed index types. Win has no ssize_t, use ptrdiff_t instead. use P instead of S as shortcut for PRINTF_SIZE_T_PREFIX because some OK already use S.	2013-05-16 08:28:34 +00:00
zimoch	c09bc44aa4	use ssize_t for signed index types. Win has no ssize_t, use ptrdiff_t instead.	2013-05-16 08:27:24 +00:00
zimoch	b907e3f469	changed shortcut for PRINTF_SIZE_T_PREFIX from S to P. Some OS use S already.	2013-05-16 08:26:01 +00:00
zimoch	8c3bed09e4	more debug init I/O Intr scanning only if init_record did not fail	2013-05-16 08:24:40 +00:00
zimoch	4c99b82bb7	make name() public	2013-05-16 08:22:56 +00:00
zimoch	a6d72761b9	more debug	2013-05-16 08:22:13 +00:00
zimoch	6c504d30cf	use size_t and ssize_t in streamBuffer	2013-04-26 12:21:51 +00:00
zimoch	1c814a451b	new format: %-<> prints "poor man's hex": 0x30 - 0x3f characters	2013-04-26 09:56:39 +00:00
zimoch	daafc125c3	bug in debug output fixed	2013-04-26 09:56:04 +00:00
zimoch	63f680bdc1	allow selecting asyn version	2013-04-24 14:27:39 +00:00
zimoch	e88a327957	* empty log message *	2013-04-24 14:27:09 +00:00
zimoch	223c71bc68	fix the fake flush: break early when no bytes are left	2013-04-24 14:25:52 +00:00
zimoch	14a04fd200	handle errors in flushing read correctly	2013-04-15 07:03:49 +00:00
zimoch	dc85511fe9	missing space ckeck in event command	2013-01-21 10:03:27 +00:00
zimoch	d0b8d3f585	problems with 3.13 solved	2012-11-20 10:51:40 +00:00
zimoch	97652917c9	Can't poll GPIB.	2012-11-08 09:27:21 +00:00
zimoch	c171a62f93	Fixes for 3.15	2012-11-08 09:26:57 +00:00
zimoch	c7c28e7fa2	compiler warning removed	2012-10-08 12:32:44 +00:00
zimoch	79a17788f2	application developper's guide link updated	2012-09-13 13:00:06 +00:00
zimoch	9f0a2d2fb6	record reference manual link updated	2012-09-13 12:23:10 +00:00
zimoch	66f6ce9bd2	version release	2012-09-13 11:47:28 +00:00
zimoch	e5dfe7b816	version update	2012-08-30 13:41:24 +00:00
zimoch	6efb17be64	remove warning	2012-08-30 13:39:05 +00:00
zimoch	0310b30446	Fixes for 3.15	2012-08-30 13:37:25 +00:00
zimoch	863cdf3d7f	avoid multiple inclusion of asyn.dbd	2012-08-22 12:33:20 +00:00
zimoch	e51bb2555e	Adjustments for 3.15: test for 3.13 instead of 3.14	2012-08-22 11:49:43 +00:00
zimoch	9e0157d679	link pointer is const	2012-08-09 12:22:50 +00:00
zimoch	3e91eb4fc1	Link parsing in a separate function	2012-08-09 12:22:32 +00:00
zimoch	caf811c23a	Improved debug message, more digits in debug timestamp.	2012-08-09 08:38:05 +00:00
zimoch	de116c9e5a	Dummy-read stale input instead of flushing it in order to make it available for I/O Intr records.	2012-08-09 08:37:08 +00:00
zimoch	eef38b0557	check if businterface exists before calling its methods	2012-08-08 09:44:18 +00:00
zimoch	0057899476	missing header	2012-08-07 14:19:51 +00:00
zimoch	0148e6e27e	version update	2012-08-07 14:17:46 +00:00
zimoch	c6af859f9d	no eol translation	2012-07-06 11:19:06 +00:00
zimoch	01f0761ca8	Fixes for Windows: dll import and export	2012-07-02 16:25:55 +00:00
zimoch	d7770846aa	fixes for asyn 4.11+ (queueRequest fails on disconnected ports)	2012-06-19 13:45:38 +00:00