checksums updated

uppercase
modbus checksum added
2015-10-19 13:58:06 +02: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 · 2015-10-19 13:58:06 +02:00 · 2015-10-19 13:58:06 +02:00
158 changed files with 11053 additions and 2041 deletions
--- a/58
+++ b/58
@ -0,0 +1,58 @@
+include /ioc/tools/driver.makefile
+EXCLUDE_VERSIONS = 3.13.2
+PROJECT=stream
+BUILDCLASSES += Linux
+
+#DOCUDIR = doc
+
+BUSSES  += AsynDriver
+BUSSES  += Dummy
+
+FORMATS += Enum
+FORMATS += BCD
+FORMATS += Raw
+FORMATS += RawFloat
+FORMATS += Binary
+FORMATS += Checksum
+FORMATS += Regexp
+FORMATS += MantissaExponent
+FORMATS += Timestamp
+
+RECORDTYPES += aai aao
+RECORDTYPES += ao ai
+RECORDTYPES += bo bi
+RECORDTYPES += mbbo mbbi
+RECORDTYPES += mbboDirect mbbiDirect
+RECORDTYPES += longout longin
+RECORDTYPES += stringout stringin
+RECORDTYPES += waveform
+
+SOURCES += $(RECORDTYPES:%=src/dev%Stream.c)
+SOURCES += $(FORMATS:%=src/%Converter.cc)
+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)
+# old gcc needs full path for -include
+CXXFLAGS += -include $(foreach d,${INCLUDES:-I%=%},$(wildcard $d/compat3_13.h))
+else
+RECORDTYPES += calcout
+endif
+
+StreamCore.o: streamReferences
+
+streamReferences:
+	perl ../src/makeref.pl Interface $(BUSSES) > $@
+	perl ../src/makeref.pl Converter $(FORMATS) >> $@
+
+# have to hack a bit to work with both versions of driver.makefile
+DBDFILES = O.$${EPICSVERSION}_$${T_A}/streamSup.dbd
+../O.${EPICSVERSION}_${T_A}/streamSup.dbd:
+	perl ../src/makedbd.pl $(RECORDTYPES) > $@
--- a/86
+++ b/86
@ -1,70 +1,24 @@
-include /ioc/tools/driver.makefile
-EXCLUDE_VERSIONS = 3.13.2
-PROJECT=stream2
-BUILDCLASSES += Linux
+TOP = ..

-#DOCUDIR = doc
+DIRS = src
+streamApp_DEPEND_DIRS  = src

-DBDS = stream.dbd
-
-BUSSES  += AsynDriver
-FORMATS += Enum
-FORMATS += BCD
-FORMATS += Raw
-FORMATS += RawFloat
-FORMATS += Binary
-FORMATS += Checksum
-FORMATS += Regexp
-FORMATS += MantissaExponent
-RECORDTYPES += aai aao
-RECORDTYPES += ao ai
-RECORDTYPES += bo bi
-RECORDTYPES += mbbo mbbi
-RECORDTYPES += mbboDirect mbbiDirect
-RECORDTYPES += longout longin
-RECORDTYPES += stringout stringin
-RECORDTYPES += waveform
-
-SOURCES += $(RECORDTYPES:%=src/dev%Stream.c)
-SOURCES += $(FORMATS:%=src/%Converter.cc)
-SOURCES += $(BUSSES:%=src/%Interface.cc)
-SOURCES += $(wildcard src/Stream*.cc)
-SOURCES += src/StreamVersion.c
-SOURCES_3.14 += src/devcalcoutStream.c
-
-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
-
-StreamCore.o: streamReferences
-
-streamReferences:
-	@for i in $(BUSSES); \
-	do echo "extern void* ref_$${i}Interface;"; \
-           echo "void* p$$i = ref_$${i}Interface;"; \
-	done > $@
-	@for i in $(FORMATS); \
-	do echo "extern void* ref_$${i}Converter;"; \
-           echo "void* p$$i = ref_$${i}Converter;"; \
-	done >> $@
-
-ifeq (${EPICS_BASETYPE},3.13)
-stream.dbd:
-	@for r in $(RECORDTYPES); \
-	do echo "device($$r,INST_IO,dev$${r}Stream,\"stream\")"; \
-	done > $@
-	@echo "driver(stream)" >> $@
+# Look if we have EPICS R3.13 or R3.14
+ifeq ($(wildcard $(TOP)/configure),)
+  # EPICS R3.13
+  include $(TOP)/config/CONFIG_APP
+  CONFIG = $(TOP)/config
 else
-stream.dbd:
-	@for r in $(RECORDTYPES) calcout; \
-	do echo "device($$r,INST_IO,dev$${r}Stream,\"stream\")"; \
-	done > $@
-	@echo "driver(stream)" >> $@
-	@echo "variable(streamDebug, int)" >> $@
-	@echo "registrar(streamRegistrar)" >> $@
+  # EPICS R3.14
+  include $(TOP)/configure/CONFIG
+  ifneq ($(words $(CALC) $(SYNAPPS)), 0)
+    # with synApps calc module (contains scalcout)
+    DIRS += srcSynApps
+    srcSynApps_DEPEND_DIRS  = src
+    streamApp_DEPEND_DIRS  += srcSynApps
+  endif
 endif
+
+DIRS += streamApp
+
+include $(CONFIG)/RULES_DIRS
--- a/doc/EPICS.gif
+++ b/doc/EPICS.gif
--- a/doc/PSI.gif
+++ b/doc/PSI.gif
--- a/doc/PSI.png
+++ b/doc/PSI.png
--- a/doc/SLS.gif
+++ b/doc/SLS.gif
--- a/doc/aai.html
+++ b/doc/aai.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: aai Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: aai Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>aai Records</h1>
 <p>
 <b>Note:</b> aai record support is disabled per default.
 Enable it in <code>src/CONFIG_STREAM</code>.
@ -123,6 +124,5 @@ the written or read value.
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2006</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/aao.html
+++ b/doc/aao.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: aao Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: aao Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>aao Records</h1>
 <p>
 <b>Note:</b> aao record support is disabled per default.
 Enable it in <code>src/CONFIG_STREAM</code>.
@ -123,6 +124,5 @@ the written or read value.
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2006</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/ai.html
+++ b/doc/ai.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: ai Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: ai Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>ai Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -38,6 +39,14 @@ written or read value.
   definition. <em>StreamDevice</em> does not set it. For example,
   <code>EOFF=-10</code> and <code>ESLO=0.000305180437934</code>
   (=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>
@ -75,7 +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>
-<script src="stream.js" type="text/javascript"></script>
+<p><small>Dirk Zimoch, 2015</small></p>
 </body>
 </html>
--- a/doc/ao.html
+++ b/doc/ao.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: ao Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: ao Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>ao Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -37,6 +38,14 @@ written or read value.
   might be set in the record definition. <em>StreamDevice</em> does not set it.
   For example, <code>EOFF=-10</code> and <code>ESLO=0.000305180437934</code>
   (=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>
@ -76,7 +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>
-<script src="stream.js" type="text/javascript"></script>
+<p><small>Dirk Zimoch, 2015</small></p>
 </body>
 </html>
--- a/doc/bg.gif
+++ b/doc/bg.gif
--- a/doc/bi.html
+++ b/doc/bi.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: bi Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: bi Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>bi Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -72,6 +73,5 @@ written or read value.
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/bo.html
+++ b/doc/bo.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: bo Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: bo Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>bo Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -71,6 +72,5 @@ written or read value.
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/businterface.html
+++ b/doc/businterface.html
@ -3,12 +3,13 @@
 <html>
 <head>
 <title>StreamDevice: Bus API</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
+<iframe src="nav.html" id="navleft"></iframe>
 <h1>Bus API</h1>

 <a name="class"></a>
@ -640,6 +641,5 @@ other request method like <code>writeRequest()</code>.
 </p>
 <hr>
 <p><small>Dirk Zimoch, 2007</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/calcout.html
+++ b/doc/calcout.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: calcout Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: calcout Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>calcout Records</h1>

 <p>
 <b>Note:</b> Device support for calcout records is only available for
@ -78,6 +79,5 @@ Different record fields are used for output and input. The variable
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/epics3_13.html
+++ b/doc/epics3_13.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: Using EPICS 3.13</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: Using EPICS 3.13</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>Using EPICS 3.13</h1>

 <a name="pre"></a>
 <h2>1. Prerequisites</h2>
@ -219,6 +220,5 @@ asynSetOption ("PS1", 0, "stop", "1")

 <hr>
 <p><small>Dirk Zimoch, 2006</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/favicon.ico
+++ b/doc/favicon.ico
--- a/doc/formatconverter.html
+++ b/doc/formatconverter.html
@ -3,18 +3,219 @@
 <html>
 <head>
 <title>StreamDevice: Format Converter API</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: Format Converter API</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>Format Converter API</h1>

-<h2>Sorry, this documentation is still missing.</h2>
+<a name="class"></a>
+<h2>Converter Class</h2>
+<p>
+A user defined converter class inherits public from
+<i>StreamFormatConverter</i> and handles one or more conversion characters.
+It is not necessary that a given conversion character supports both,
+printing and scanning.
+But if it does, both must be handled by the same converter class.
+</p>
+<p>
+Any conversion corresponds to one data type. The converter class must
+implement print and/or scan methods for this data type. It must also
+implement a parse method to analyse the format string.
+</p>
+<p>
+A converter class must be registered with a call to RegisterConverter()
+in the global file context.
+</p>
+<p>
+The converter must not contain any class variables, because there will be
+only one global instance for each conversion character - not one for each
+format string!
+</p>
+
+<h3>Example: LONG converter for <code>%Q</code></h3>
+<pre>
+#include "StreamFormatConverter.h"
+
+class MyConverter : public StreamFormatConverter
+{
+    int parse(const StreamFormat&, StreamBuffer&, const char*&, bool);
+    bool printLong(const StreamFormat&, StreamBuffer&, long);
+    int scanLong(const StreamFormat&, const char*, long&);
+};
+
+RegisterConverter(MyConverter,"Q");
+
+// ... (implementation)
+</pre>
+
+<a name="theory"></a>
+<h2>Theroy of Operation</h2>
+
+<a name="registration"></a>
+<h3>Registration </h3>
+<div class="indent"><code>
+RegisterConverter(<i>converterClass</i>, "<i>characters</i>");
+</code></div>
+<p>
+This macro registers the converter class for all given conversion
+characters. In most cases, you will give only one character.
+The macro must be called once for each class in the global file context.
+</p>
+<p>
+HINT: Do not branch depending on the conversion character.
+Provide multiple classes, that's more efficient.
+</p>
+
+<a name="parsing"></a>
+<h3>Parsing</h3>
+<div class="indent"><code>
+int parse (const&nbsp;StreamFormat&&nbsp;fmt, StreamBuffer&&nbsp;info,
+const&nbsp;char*&&nbsp;source, bool&nbsp;scanFormat);
+</code></div>
+<div class="indent"><code>
+struct&nbsp;StreamFormat {
+char&nbsp;conv;
+StreamFormatType&nbsp;type;
+unsigned&nbsp;char&nbsp;flags;
+short&nbsp;prec;
+unsigned&nbsp;short&nbsp;width;
+unsigned&nbsp;short&nbsp;infolen;
+const&nbsp;char*&nbsp;info;
+};
+</code></div>
+
+<p>
+During initialization, <code>parse()</code> is called whenever one of the
+conversion characters handled by your converter class is found in a protocol.
+The fields <code>fmt.conv</code>, <code>fmt.flags</code>,
+<code>fmt.prec</code>, and <code>fmt.width</code> have
+already been filled in. If a scan format is parsed, <code>scanFormat</code>
+is <code>true</code>. If a print format is parsed, <code>scanFormat</code>
+is <code>false</code>.
+</p>
+<p>
+The <code>fmt.flags</code> field is a bitset and can have any of the following
+flags set:
+</p>
+<ul>
+ <li><code>left_flag</code>: the format contained a <code>-</code>.
+   This is normaly used to indicate that the value should be printed
+   left-aligned.
+ </li>
+ <li><code>sign_flag</code>: the format contained a <code>+</code>.
+   This normaly requests to print a sign even for positive numbers.
+ </li>
+ <li><code>space_flag</code>: the format contained a '<code>&nbsp;</code>' (space).
+   This normaly requests to print a space instead of a sign for positive numbers.
+ </li>
+ <li><code>alt_flag</code>: the format contained a <code>#</code>.
+   This indicated the request to use an alternative format. For example in
+   <code>%#x</code> the hex number is preficed with <code>0x</code>.
+ </li>
+ <li><code>zero_flag</code>: the format contained a <code>0</code>.
+   This normaly requests to pad a numerical value with leading zeros
+   instead of leading spaces.
+ <li><code>skip_flag</code>: the format contained a <code>*</code>.
+   The value is parsed and checked but then discarded.
+</ul>
+<p>
+It is not necessary that these flags have exactly the same meaning in your
+formats, but a similar and intuitive meaning helpful for the user.
+</p>
+<p>
+There are two additional flags, <code>default_flag</code> indicating a
+<code>?</code> and <code>compare_flag</code> indicating a <code>=</code>
+int the format, that are handled internally by <em>StreamDevice</em> and
+are not of interest to the converter class.
+</p>
+<p>
+The <code>source</code> pointer points to the character of the format string
+just after the conversion character. You can parse additional characters if
+they belong to the format string handled by your class.
+Move the <code>source</code> pointer so that is points to the first character
+after your format string.
+This is done for example in the builtin formats
+<code>%[charset]</code> or <code>%{enum0|enum1}</code>.
+However, many formats don't need additional characters.
+
+</p>
+<h4>Example</h4>
+<pre>
+ source       source
+ before       after
+ parse()      parse()
+     |         |
+"%39[0-9a-zA-Z]constant text"
+    |
+ conversion
+ character
+</pre>
+
+<p>
+You can write any data you may need later in <code>print*()</code> or
+<code>scan*()</code> to the
+<a href="streambuffer.html"><i>Streambuffer</i></a> <code>info</code>.
+This will probably be necessary if you have parsed additional characters
+from the format string as in the above example<br>
+</p>
+<p>
+Return <code>long_format</code>, <em>double_format</em>,
+<em>string_format</em>, or <code>enum_format</code> depending on the
+datatype associated with the conversion character.
+It is not necessary to return the same value for print and for scan
+formats.
+You can even return different values depending on the format string,
+but I can't imagine why anyone should do that.
+</p>
+<p>
+If the format is not a real data conversion but does other things with
+the data (append or check a checksum, encode or decode the data,...),
+return <code>pseudo_format</code>.
+</p>
+<p>
+Return <code>false</code> if there is any parse error or if print or scan
+is requested but not supported by this conversion.
+</p>
+
+<a name="printing_scanning"></a>
+<h3>Printing and Scanning</h3>
+<p>
+Provide a <code>print[Long|Double|String|Pseudo]()</code> and/or
+<code>scan[Long|Double|String|Pseudo]()</code> method appropriate
+for the data type you have returned in the <code>parse()</code> method.
+That method is called whenever the conversion appears in an output or input,
+respectively.
+You only need to implement the flavour of print and/or scan suitable for
+the datatype returned by <code>parse()</code>.
+</p>
+<p>
+Now, <code>fmt.type</code> contains the value returned by <code>parse()</code>.
+With <code>fmt.info()</code> get access to the string you have written to
+<code>info</code> in <code>parse()</code> (null terminated).
+</p>
+<p>
+The length of the info string can be found in <code>fmt.infolen</code>.
+</p>
+<p>
+In <code>print*()</code>, append the converted value to <code>output</code>.
+Do not modify what is already in output (unless you really know what you're
+doing).
+Return <code>true</code> on success, <code>false</code> on failure.
+</p>
+<p>
+In <code>scan*()</code>, read the value from input and return the number of
+consumed bytes.
+In the string version, don't write more bytes than <code>maxlen</code>!
+If the <code>skip_flag</code> is set, you don't need to write to
+<code>value</code>, since the value will be discarded anyway. 
+Return <code>-1</code> on failure.
+</p>

 <hr>
-<p><small>Dirk Zimoch, 2006</small></p>
-<script src="stream.js" type="text/javascript"></script>
+<p><small>Dirk Zimoch, 2007</small></p>
 </body>
 </html>
--- a/doc/formats.html
+++ b/doc/formats.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: Format Converters</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: Format Converters</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>Format Converters</h1>

 <a name="syntax"></a>
 <h2>1. Format Syntax</h2>
@ -27,8 +28,8 @@ A format converter consists of
 </p>
 <ul>
 <li>The <code>%</code> character</li>
- <li>Optionally a field name in <code>()</code></li>
- <li>Optionally flags out of the characters <code>*# +0-</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>
@ -36,6 +37,11 @@ A format converter consists of
 <li>Additional information required by some converters</li>
 </ul>

+<p>
+The flags <code>*# +0-</code> work like in the C functions
+<em>printf()</em> and <em>scanf()</em>.
+The flags <code>?</code>, <code>=</code> and <code>!</code> are extensions.
+</p>
 <p>
 The <code>*</code> flag skips data in input formats.
 Input is consumed and parsed, a mismatch is an error, but the read
@ -61,6 +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>
+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>
+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>
@ -84,6 +108,14 @@ The <code>-</code> flag specifies that output is left justified if
  <td><code>in "%*i";</code></td>
  <td>skipped integer number</td>
 </tr>
+ <tr>
+  <td><code>in "%?d";</code></td>
+  <td>decimal number or nothing (read as 0)</td>
+ </tr>
+ <tr>
+  <td><code>in "%=.3f";</code></td>
+  <td>compare input to the current value formatted as a float with precision 3</td>
+ </tr>
 </table>

 <a name="types"></a>
@ -108,18 +140,22 @@ Thus, data type modifiers like <code>l</code> or <code>h</code> do not
 exist in <em>StreamDevice</em> formats.
 </p>

-<h3>Accessing record fields directly</h3>
+<a name="redirection"></a>
+<h3>Redirection</h3>
 <p>
 To use other fields of the record or even fields of other records on the
 same IOC for the conversion, write the field name in parentheses directly
 after the <code>%</code>.
 For example <code>out&nbsp;"%(EGU)s";</code> outputs the <code>EGU</code>
 field formatted as a string.
-Use <code>in&nbsp;"%(<i>otherrecord</i>.VAL)f";</code> to write the floating
-point input value into the <code>VAL</code> field of
-<code><i>otherrecord</i></code>.
-(You can't skip <code>.VAL</code> here.)
-This is very useful when one line of input contains many values that should
+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>. 
+If no field is given for an other record .VAL is assumed.
+When a record name conflicts with a field name use .VAL explicitly.
+</p>
+<p>
+This feature is very useful when one line of input contains many values that should
 be distributed to many records.
 If <code><i>otherrecord</i></code> is passive and the field has the PP
 attribute (see
@ -127,8 +163,13 @@ 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
+state when anything fails.
 </p>

 <h3>Pseudo-converters</h3>
@ -144,31 +185,46 @@ No data type corresponds to those <em>pseudo-converters</em> and the
 <h2>3. Standard DOUBLE Converters (<code>%f</code>, <code>%e</code>,
 <code>%E</code>, <code>%g</code>, <code>%G</code>)</h2>
 <p>
-In output, <code>%f</code> prints fixed point, <code>%e</code> prints
+<b>Output:</b> <code>%f</code> prints fixed point, <code>%e</code> prints
 exponential notation and <code>%g</code> prints either fixed point or
 exponential depending on the magnitude of the value.
 <code>%E</code> and <code>%G</code> use <code>E</code> instead of
 <code>e</code> to separate the exponent.
+</p>
+<p>
 With the <code>#</code> flag, output always contains a period character.
 </p>
 <p>
-In input, all these formats are equivalent.
-Leading whitespaces are skipped.
+<b>Input:</b> All these formats are equivalent. Leading whitespaces are skipped.
+</p>
+<p>
+With the <code>#</code> flag additional whitespace between sign and number
+is accepted.
+</p>
+<p>
+When a maximum field width is given, leading whitespace only counts to the
+field witdth when the space flag is used.
 </p>

 <a name="stdl"></a>
 <h2>4. Standard LONG Converters (<code>%d</code>, <code>%i</code>,
 <code>%u</code>, <code>%o</code>, <code>%x</code>, <code>%X</code>)</h2>
 <p>
-In output, <code>%d</code> and <code>%i</code> print signed decimal,
+<b>Output</b>: <code>%d</code> and <code>%i</code> print signed decimal,
 <code>%u</code> unsigned decimal, <code>%o</code> unsigned octal, and
 <code>%x</code> or <code>%X</code> unsigned hexadecimal.
 <code>%X</code> uses upper case letters.
-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>
 <p>
-In input, <code>%d</code> matches signed decimal, <code>%u</code> matches
+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
 unsigned decimal, <code>%o</code> unsigned octal.
 <code>%x</code> and <code>%X</code> both match upper or lower case unsigned
 hexadecimal.
@ -177,23 +233,38 @@ Octal and hexadecimal values can optionally be prefixed.
 hexadecimal notation.
 Leading whitespaces are skipped.
 </p>
+<p>
+With the <code>-</code> negative octal and hexadecimal values are accepted. 
+</p>
+<p>
+With the <code>#</code> flag additional whitespace between sign and number
+is accepted.
+</p>
+<p>
+When a maximum field width is given, leading whitespace only counts to the
+field witdth when the space flag is used.
+</p>

 <a name="stds"></a>
 <h2>5. Standard STRING Converters (<code>%s</code>, <code>%c</code>)</h2>
 <p>
-In output, <code>%s</code> prints a string.
+<b>Output:</b> <code>%s</code> prints a string.
 If <em>precision</em> is specified, this is the maximum string length.
 <code>%c</code> is a LONG format in output, printing one character!
 </p>
 <p>
-In input, <code>%s</code> matches a sequence of non-whitespace characters
-and <code>%c</code> a sequence of not-null characters.
+<b>Input:</b> <code>%s</code> matches a sequence of non-whitespace characters
+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> but not with
-<code>%c</code>.
-The empty string matches. 
+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>
+With the <code>#</code> flag <code>%s</code> matches a sequence of not-null
+characters instead of non-whitespace characters.
 </p>

 <a name="cset"></a>
@ -217,18 +288,40 @@ to <code>z</code>.
 This format maps an unsigned integer value on a set of strings.
 The value 0 corresponds to <em>string0</em> and so on.
 The strings are separated by <code>|</code>.
-If one of the strings contains <code>|</code> or <code>}</code>,
-a <code>\</code> must be used to escape the character.
 </p>
 <p>
 Example: <code>%{OFF|STANDBY|ON}</code> mapps the string <code>OFF</code>
 to the value 0, <code>STANDBY</code> to 1 and <code>ON</code> to 2.
 </p>
 <p>
-In output, depending on the value, one of the strings is printed.
+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>
-In input, if any of the strings matches the value is set accordingly.
+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>
+(or <code>=</code>  if the <code>#</code> flag is used)
+a <code>\</code> must be used to escape the character.
+</p>
+<p>
+<b>Output:</b> Depending on the value, one of the strings is printed,
+or the default if no value matches.
+</p>
+<p>
+<b>Input:</b> If any of the strings matches, the value is set accordingly.
 </p>

 <a name="bin"></a>
@ -248,12 +341,11 @@ Examples: <code>%B.!</code> or <code>%B\x00\xff</code>.
 <code>%B01</code> is equivalent to <code>%b</code>.
 </p>
 <p>
-If in output <em>width</em> is larger than the number of significant bits,
+In output, if <em>width</em> is larger than the number of significant bits,
 then the flag <code>0</code> means that the value should be padded with
 with the chosen zero character instead of spaces.
 If <em>precision</em> is set, it means the number of significant bits.
 Otherwise, the highest 1 bit defines the number of significant bits. 
-There is no alternate format when <code>#</code> is used.
 </p>
 <p>
 In input, leading spaces are skipped.
@ -275,11 +367,9 @@ endian</em>, i.e. least significant byte first.
 With the <code>0</code> flag, the value is unsigned, otherwise signed.
 </p>
 <p>
-In output, the <em>width</em> least significant bytes of the value
-are written.
-If <em>width</em> is larger than the size of a <code>long</code>,
-the value is sign extended or zero extended, depending on the
-<code>0</code> flag.
+In output, the <em>prec</em> (or sizeof(long) whatever is less) least
+significant bytes of the value are sign extended or zero extended
+(depending on the <code>0</code> flag) to <em>width</em> bytes.
 </p>
 <p>
 In input, <em>width</em> bytes are read and put into the value.
@ -289,9 +379,25 @@ If <em>width</em> is smaller than the size of a <code>long</code>,
 the value is sign extended or zero extended, depending on the
 <code>0</code> flag.
 </p>
+<p>
+Example: <code>out "%.2r"</code>
+</p>
+
+<a name="rawdouble"></a>
+<h2>10. Raw DOUBLE Converter (<code>%R</code>)</h2>
+<p>
+The raw converter does not really "convert".
+A float or double value is written or read in the internal
+(maybe IEEE) representation of the computer.
+The normal byte order is <em>big endian</em>, i.e. most significant byte
+first.
+With the <code>#</code> flag, the byte order is changed to <em>little
+endian</em>, i.e. least significant byte first.
+The <em>width</em> must be 4 (float) or 8 (double). The default is 4.
+</p>

 <a name="bcd"></a>
-<h2>10. Packed BCD (Binary Coded Decimal) LONG Converter (<code>%D</code>)</h2>
+<h2>11. Packed BCD (Binary Coded Decimal) LONG Converter (<code>%D</code>)</h2>
 <p>
 Packed BCD is a format where each byte contains two binary coded
 decimal digits (<code>0</code> ... <code>9</code>).
@ -320,7 +426,7 @@ than 9.
 </p>

 <a name="chksum"></a>
-<h2>11. Checksum Pseudo-Converter (<code>%&lt;<em>checksum</em>&gt;</code>)</h2>
+<h2>12. Checksum Pseudo-Converter (<code>%&lt;<em>checksum</em>&gt;</code>)</h2>
 <p>
 This is not a normal "converter", because no user data is converted.
 Instead, a checksum is calculated from the input or output.
@ -382,32 +488,38 @@ 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>
+  <dd>Two bytes. The XMODEM checksum.
+   (poly=0x1021, init=0x0000, xorout=0x0000).</dd>
 <dt><code>%&lt;crc32&gt;</code></dt>
  <dd>Four bytes. The standard 32 bit crc 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>
@ -450,7 +562,7 @@ If <em>prec</em> is given, it specifies the sub-expression whose match
 is retuned.
 Otherwise the complete match is returned.
 In any case, the complete match is consumed from the input buffer.
-If the expression contains a <code>/</code> is must be escaped.
+If the expression contains a <code>/</code> it must be escaped.
 </p>
 <p>
 Example: <code>%.1/&lt;title&gt;(.*)&lt;\/title&gt;/</code> returns
@ -458,23 +570,80 @@ the title of an HTML page, skipps anything before the
 <code>&lt;title&gt</code> tag and leaves anything after the
 <code>&lt;/title&gt;</code> tag in the input buffer.
 </p>
-<a name="exp"></a>
-<h2>13. Exponential DOUBLE converter (<code>%m</code>)</h2>
+<a name="mantexp"></a>
+<h2>13. MantissaExponent DOUBLE converter (<code>%m</code>)</h2>
 <p>
-This experimental input-only format matches numbers in the format
-<i>[sign] mantissa sign exponent<i>, e.g <code>+123-4</code> meaning
-123e-4 or 0.0123. Mantissa and exponent are integers. The sign of the
-mantissa is optional. Compared to the standard <code>%e</code> format,
-this format does not contain the characters <code>.</code> and <code>e</code>.
+This exotic and experimental format matches numbers in the format
+<i>[sign] mantissa sign exponent</i>, e.g <code>+123-4</code> meaning
+123e-4 or 0.0123. Mantissa and exponent are decimal integers.
+The sign of the mantissa is optional.
+Compared to the standard <code>%e</code> format, this format does not
+contain the characters <code>.</code> and <code>e</code>.
 </p>
 <p>
 Output formatting is ambigous (e.g. <code>123-4</code> versus
-<code>1230-5</code>). Until it has been specified how to handle this,
-output is not supported.
+<code>1230-5</code>). I chose the following convention:
+Format <em>precision</em> defines number of digits in mantissa.
+No leading '0' in mantissa (except for 0.0 of course).
+Number of digits in exponent is at least 2.
+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>
+<a name="timestamp"></a>
+<h2>14. Timestamp DOUBLE converter (<code>%T(<em>timeformat</em>)</code>)</h2>
+<p>
+This format reads or writes timestamps and converts them to a double number.
+The value represents the number of seconds since 1970 (the UNIX epoch).
+The precision of a double is large enough for microseconds (but not for
+nanoseconds). This format is probably used best in combination with a
+redirection to the <code>TIME</code> field. In this case, the value is
+converted to EPICS timestamps (seconds since 1990 and nanoseconds).
+The timestamp format understands the usual converters that the C function
+<em>strftime()</em> understands. In addition, fractions of a second can
+be specified and the time zone can be set in the format string.
+</p>
+<p>
+Example: <code>%(TIME)T(%d %b %Y %H:%M:%.3S %z)</code> may print something like
+<code> 3 Sep 2010 15:45:59 +0200</code>.
+</p>
+<p>
+Fractions of a second can be specified as <code>%.<em>n</em>S</code>
+(seconds with <em>n</em> fractional digits), as <code>%0<em>n</em>f</code>
+or <code>%<em>n</em>f</code> (<em>n</em> fractional digits) or as
+<code>%N</code> (nanoseconds).
+In input, <em>n</em> is the maximum number of digits parsed, there may be
+actually less digits in the input.
+If <em>n</em> is not specified (<code>%.S</code> or <code>%f</code>) it uses
+a default value of 6.
+</p>
+<p>
+In input, the time zone can be specified in the format like
+<code>%+<em>hhmm</em></code> or <code>%-<em>hhmm</em></code> for cases
+where the parsed time stamp does not specify the time zone, where
+<em>hhmm</em> is a 4 digit number specifying the offset in hours and minutes.
+</p>
+<p>
+In output, the system function <em>strftime()</em> is used to format the time.
+There may be differences in the implementation between operating systems.
+</p>
+<p>
+In input, <em>StreamDevice</em> used its own implementation because many
+systems are missing the <em>strptime()</em> function and additional formats
+are supported.
+</p>
+<p>
+Day of the week can be parsed but is ignored because the information is
+redundant when used together with day, month and year and more or less
+useless otherwise. No check is done for consistency.
+</p>
+<p>
+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>
 <hr>
 <p align="right"><a href="processing.html">Next: Record Processing</a></p>
-<p><small>Dirk Zimoch, 2007</small></p>
-<script src="stream.js" type="text/javascript"></script>
+<p><small>Dirk Zimoch, 2015</small></p>
 </body>
 </html>
--- a/doc/head.html
+++ b/doc/head.html
@ -1,32 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>Headbar</title>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta name="author" content="Dirk Zimoch">
-<style type="text/css">
-<!--
-body      {margin:0px 0px 0px 0px;}
-big       {font-size: 30px; font-family:serif;}
-->
-</style>
-</head>
-<body bgcolor="white">
-<table cellspacing=0 cellpadding=0 border=0 width="100%">
- <tr><td bgcolor="#267ab8" colspan=6 valign="bottom" height=9 width="100%"></td></tr>
- <tr><td bgcolor="#000000" colspan=6 valign="bottom" height=1 width="100%"></td></tr>
- <tr>
-  <td><img src="space.gif" width=180 height=1 alt=""><center><a href="http://www.psi.ch" target="ex"><img src="PSI.gif" width=150 height=55 alt="PSI" border=0></a></center></td>
-  <td><img src="space.gif" width=1 height=65 alt=""></td>
-  <td><a href="http://www.aps.anl.gov/epics" target="ex"><img
-    src="EPICS.gif" border=0 width=50 height=50 alt="EPICS"></a></td>
-  <td width="100%" align="center" nowrap>
-  <big><b><em id="subtitle">StreamDevice</em></b></big></td>
-  <td><img src="space.gif" width=166 height=1 alt=""><center><a href="http://sls.web.psi.ch/view.php/about/index.html" target="ex"><img src="SLS.gif" width=146 height=55 alt="SLS" border=0></a></center></td>
- </tr>
- <tr><td bgcolor="#267ab8" colspan=6 valign="bottom" height=4 width="100%"></td></tr>
- <tr><td bgcolor="#000000" colspan=6 valign="bottom" height=1 width="100%"></td></tr>
-</table>
-</body>
-</html>
--- a/doc/index.html
+++ b/doc/index.html
@ -1,20 +1,111 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"
-   "http://www.w3.org/TR/html4/frameset.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<title>StreamDevice Documentation</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<title>StreamDevice</title>
+<link rel="shortcut icon" href="favicon.ico">
+<link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
-<frameset rows="80,*" framespacing=0 frameborder=0 border=0>
-  <frame src="head.html" name="head" scrolling="no" noresize> 
-  <frameset cols="180,*" >
-    <frame src="nav.html" name="nav" noresize> 
-    <frame src="stream.html" name="text"> 
-  </frameset>
-  <noframes>
-    <a href="stream.html">Click here for no-frames version.</a>
-  </noframes>
-</frameset>
+<body>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>EPICS <em>StreamDevice</em></h1>
+
+<h2>What is <em>StreamDevice</em>?</h2>
+<p>
+<em>StreamDevice</em> is a generic
+<a href="http://www.aps.anl.gov/epics" target="ex">EPICS</a>
+device support for devices with a "byte stream" based
+communication interface.
+That means devices that can be controlled by sending and
+receiving strings (in the broadest sense, including non-printable
+characters and even null-bytes). 
+Examples for this type of communication interface are
+serial line (RS-232, RS-485, ...),
+IEEE-488 (also known as GPIB or HP-IB), and telnet-like TCP/IP.
+</p>
+<p>
+<em>StreamDevice</em> is not limited to a specific device type or
+manufacturer nor is it necessary to re-compile anything to support a
+new device type.
+Instead, it can be configured for any device type with
+<a href="protocol.html"><em>protocol files</em></a> in plain ASCII text
+which describes the commands a device understands and the replies it sends.
+If the device can be controlled with strings like
+"<kbd>RF:FREQ 499.655 MHZ</kbd>" <em>StreamDevice</em> can be used.
+Formatting and parsing of values is done with
+<a href="formats.html"><em>format converters</em></a> similar to those
+known from the C functions <em>printf()</em> and <em>scanf()</em>.
+To support other formats, it is possible to
+<a href="formatconverter.html">write your own converters</a>.
+</p>
+<p>
+Each record with <em>StreamDevice</em> support runs one protocol
+from the protocol file to read or write its value.
+Protocols can be as simple as just one output string or can
+consist of many strings sent to and read from the device.
+However, a protocol is linear.
+That means it runs from start to end each time the record is
+<a href="processing.html">processed</a>.
+It does not provide loops or branches.
+</p>
+<p>
+<em>StreamDevice</em> comes with an interface to<a target="ex"
+href="http://www.aps.anl.gov/epics/modules/soft/asyn/">
+<em>asynDriver</em></a>
+but can be extended to
+<a href="businterface.html">support other bus drivers</a>.
+Note that <em>StreamDevice</em> is not an alternative or replacement
+but a supplement for <em>asynDriver</em>.
+<em>StreamDevice</em> converts record values to and from strings but
+leaves it to <em>asynDriver</em> (or other bus interfaces) to exchange
+these strings with the device.
+Thus any bus type supported by <em>asynDriver</em> (to be exact by
+<em>asynOctet</em>) can automatically be used with <em>StreamDevice</em>.
+</p>
+<p>
+<em>StreamDevice</em> supports all
+<a href="recordtypes.html">standard records</a> of EPICS base
+which can have device support.
+It is also possible to
+<a href="recordinterface.html">write support for new record types</a>.
+</p>
+
+<h2>What is <em>StreamDevice</em> not?</h2>
+<p>
+It is not a programming language for a high-level application.
+It is, for example, not possible to write a complete scanning program
+in a protocol.
+Use other tools for that and use <em>StreamDevice</em> only for the
+primitive commands.
+</p>
+<p>
+It is not a block oriented device support.
+It is not possible to send or receive huge blocks of data that contain
+many process variables distributed over many records.
+</p>
+
+<h2>Recommended Readings</h2>
+<p>
+<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="https://wiki-ext.aps.anl.gov/epics/index.php/RRM_3-14"
+target="ex">EPICS Record Reference Manual</a>
+</p>
+
+<h2>Color and Style Conventions</h2>
+<p>
+In this document, code is witten in <code>green fixed width font</code>.
+This marks text you typically type in configuration files etc.
+</p>
+<pre>
+Longer code segments are often set in a box.
+</pre>
+<hr>
+<p align="right"><a href="setup.html">Next: Setup</a></p>
+<p><small>Dirk Zimoch, 2015</small></p>
+</body>
 </html>
--- a/doc/longin.html
+++ b/doc/longin.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: longin Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: longin Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>longin Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -25,6 +26,8 @@ written or read value.
  <dd>
   <u>Output:</u> <code><i>x</i>=VAL</code><br>
   <u>Input:</u> <code>VAL=<i>x</i></code>
+   Using unsigned formats with values &ge; 0x800000 gives different results
+   on 64 bit machines.
  </dd>
 <dt>ENUM format (e.g. <code>%{</code>):</dt>
  <dd>
@ -63,6 +66,5 @@ written or read value.
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/longout.html
+++ b/doc/longout.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: longout Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: longout Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>longout Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -25,6 +26,8 @@ written or read value.
  <dd>
   <u>Output:</u> <code><i>x</i>=VAL</code><br>
   <u>Input:</u> <code>VAL=<i>x</i></code>
+   Using unsigned formats with values &ge; 0x800000 gives different results
+   on 64 bit machines.
  </dd>
 <dt>ENUM format (e.g. <code>%{</code>):</dt>
  <dd>
@ -63,6 +66,5 @@ written or read value.
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- 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
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: mbbi Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: mbbi Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>mbbi Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -89,6 +90,5 @@ written or read value.
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/mbbiDirect.html
+++ b/doc/mbbiDirect.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: mbbiDirect Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: mbbiDirect Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>mbbiDirect Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -75,6 +76,5 @@ written or read value.
 <a href="scalcout.html">calcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/mbbo.html
+++ b/doc/mbbo.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: mbbo Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: mbbo Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>mbbo Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -90,6 +91,5 @@ written or read value.
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/mbboDirect.html
+++ b/doc/mbboDirect.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: mbboDirect Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: mbboDirect Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>mbboDirect Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -77,6 +78,5 @@ written or read value.
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/nav.html
+++ b/doc/nav.html
@ -5,216 +5,210 @@
 <title>Navbar</title>
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
-<script type="text/javascript">
-<!--
-active="";
-function show(name) {
-    var m = document.getElementById(name);
-    var b = document.getElementById(name+"Button");
-    if (active != "") { hide(active); }
-    m.style.display = "block";
-    b.innerHTML="[&laquo;]";
-    b.href="javascript:hide(\'"+name+"\')"
-    active=name;
-}
-function hide(name) {
-    var m = document.getElementById(name);
-    var b = document.getElementById(name+"Button");
-    m.style.display = "none";
-    b.innerHTML="[&raquo;]";
-    b.href="javascript:show(\'"+name+"\')"
-    active="";
-}
-function printview() {
-    w = window.open(parent.text.location, "_parent", "dependent=yes,width=800,menubar=yes,toolbar=yes,location=yes");
-}
-->
-</script>
 <style type="text/css">
 <!--
-body      {margin:0px 0px 0px 0px;
-           font-family:sans-serif;
+body      {margin:0 0 13ex 1em;
+           font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
           font-weight:bold;
-           font-size:13px;}
+           font-size:13px;
+           background-color:#e3eaf6;}
 a         {text-decoration:none;}
 a:link    {color:#333333;}
 a:visited {color:#333333;}
 a:hover   {color:#FF0000;}
 a:active  {color:#FF0000;}
-.top      {margin-bottom: 0px;
-           margin-top: 10px;
-           border-bottom: solid 1px black;}
-.top ul   {margin-left: 5px;
-           margin-top: 2px;
-           margin-bottom: 2px;
-           font-size:95%;
-           line-height:120%;
-           padding-left:1em;}
-.subsub   {margin-left: 15px;
-           line-height:120%;
-           font-size:80%;}
+
 h1        {font-size:120%;
           margin-top: 20px;
           margin-right: 20px;
           margin-bottom: 10px;
           color:#267ab8;}
+
+div       {border-bottom:1px solid black;
+           padding-top:1ex;}
+
+div div, div div div, div:hover div div
+          {
+           padding-top:0;
+           margin-right:.1em;
+           border:none;
+           box-shadow: none;
+           -moz-box-shadow: none;
+           -webkit-box-shadow: none;
+           padding 0;
+           display:block;
+           position:relative;
+           }
+div div
+          {display:none;
+           margin-left:2em;
+           margin-right:1em;
+           background-color:#e3eaf6;
+           padding:0 .5em .5ex .5em;
+           border-width:0 thick thick 1px;
+           border-color:black;
+           border-style:solid;
+           }
+:root *> div div
+         {border-width:0 1px 1px 1px;
+           box-shadow: 5px 5px 5px black;
+           -moz-box-shadow: 5px 5px 5px black;
+           -webkit-box-shadow: 5px 5px 5px black;
+         }
+div:hover div {
+            position:absolute;
+            display:block;}
+
+div div div {margin-left:0;}
+
+a         {display:block;
+           margin-top:.3ex;}
+
+div div a {display:list-item;
+           margin-left:1em;
+           list-style-type:disc;
+           }
+
+div div div a {list-style-type:circle;}
+
 -->
 </style>

 </head>
-<body background="bg.gif">
-<p align="center">
-</p>
-<div style="margin-left: 20px;">
- <h1>User's Guide</h1>
- <div class="top">
-  <a target="text" href="stream.html">Intro</a>
- </div>
- <div class="top">
-  <a target="text" href="setup.html">Setup</a>
-  <a href="javascript:show('setup')" id="setupButton"></a>
-  <ul id="setup">
-   <li><a target="text" href="setup.html#pre">Prerequisites</a>
-    <ul>
-     <li><a target="text" href="epics3_13.html">Using EPICS 3.13</a></li>
-   </ul></li>
-   <li><a target="text" href="setup.html#lib">Build Library</a></li>
-   <li><a target="text" href="setup.html#app">Build Application</a></li>
-   <li><a target="text" href="setup.html#sta">Startup Script</a></li>
-   <li><a target="text" href="setup.html#pro">Protocol File</a>
-    <ul>
-     <li><a target="text" href="setup.html#reload">Reloading</a></li>
-    </ul></li>
-   <li><a target="text" href="setup.html#rec">Records</a></li>
-  </ul>
- </div>
- <div class="top">
-  <a target="text" href="protocol.html">Protocol Files</a>
-  <a href="javascript:show('protocol')" id="protocolButton"></a>
-  <ul id="protocol">
-   <li><a target="text" href="protocol.html#gen">General</a></li>
-   <li><a target="text" href="protocol.html#proto">Protocols</a></li>
-   <li><a target="text" href="protocol.html#cmd">Commands</a></li>
-   <li><a target="text" href="protocol.html#str">Strings</a></li>
-   <li><a target="text" href="protocol.html#var">Variables</a>
-    <ul>
-     <li><a target="text" href="protocol.html#sysvar">System variables</a></li>
-     <li><a target="text" href="protocol.html#argvar">Protocol Arguments</a></li>
-     <li><a target="text" href="protocol.html#usrvar">User variables</a></li>
-    </ul></li>
-   <li><a target="text" href="protocol.html#except">Exception Handlers</a></li>
-  </ul>
- </div>
- <div class="top">
-  <a target="text" href="formats.html">Format Converters</a>
-  <a href="javascript:show('formats')" id="formatsButton"></a>
-  <ul id="formats">
-   <li><a target="text" href="formats.html#syntax">Syntax</a></li>
-   <li><a target="text" href="formats.html#types">Types &amp; Fields</a></li>
-   <li><a target="text" href="formats.html#stdd">%f %e %g</a></li>
-   <li><a target="text" href="formats.html#stdl">%i %d %u %o %x</a></li>
-   <li><a target="text" href="formats.html#stds">%s %c</a></li>
-   <li><a target="text" href="formats.html#cset">%[<em>charset</em>]</a></li>
-   <li><a target="text" href="formats.html#enum">%{<em>s0</em>|<em>s1</em>|...}</a></li>
-   <li><a target="text" href="formats.html#bin">%b %B</a></li>
-   <li><a target="text" href="formats.html#raw">%r</a></li>
-   <li><a target="text" href="formats.html#bcd">%D</a></li>
-   <li><a target="text" href="formats.html#chksum">%&lt;<em>checksum</em>&gt;</a></li>
-   <li><a target="text" href="formats.html#regex">%/<em>regex</em>/</a></li>
-   <li><a target="text" href="formats.html#exp">%m</a></li>
-  </ul>
- </div>
- <div class="top">
-  <a target="text" href="processing.html">Record Processing</a>
-  <a href="javascript:show('proc')" id="procButton"></a>
-  <ul id="proc">
-   <li><a target="text" href="processing.html#proc">Normal Processing</a></li>
-   <li><a target="text" href="processing.html#init">Initialization</a></li>
-   <li><a target="text" href="processing.html#iointr">I/O Intr</a></li>
-  </ul>
- </div>
- <div class="top">
-  <a target="text" href="recordtypes.html">Record Types</a>
-  <a href="javascript:show('records')" id="recordsButton"></a>
-  <ul id="records" class="sub">
-   <li><a target="text" href="aai.html">aai</a></li>
-   <li><a target="text" href="aao.html">aao</a></li>
-   <li><a target="text" href="ai.html">ai</a></li>
-   <li><a target="text" href="ao.html">ao</a></li>
-   <li><a target="text" href="bi.html">bi</a></li>
-   <li><a target="text" href="bo.html">bo</a></li>
-   <li><a target="text" href="mbbi.html">mbbi</a></li>
-   <li><a target="text" href="mbbo.html">mbbo</a></li>
-   <li><a target="text" href="mbbiDirect.html">mbbiDirect</a></li>
-   <li><a target="text" href="mbboDirect.html">mbboDirect</a></li>
-   <li><a target="text" href="stringin.html">stringin</a></li>
-   <li><a target="text" href="stringout.html">stringout</a></li>
-   <li><a target="text" href="longin.html">longin</a></li>
-   <li><a target="text" href="longout.html">longout</a></li>
-   <li><a target="text" href="waveform.html">waveform</a></li>
-   <li><a target="text" href="calcout.html">calcout</a></li>
-   <li><a target="text" href="scalcout.html">scalcout</a></li>
-  </ul>
- </div>
- <div class="top">
-  <a target="text" href="tipsandtricks.html">Tips &amp; Tricks</a>
-  <a href="javascript:show('tipsandtricks')" id="tipsandtricksButton"></a>
-  <ul id="tipsandtricks">
-   <li><a target="text" href="tipsandtricks.html#argvar">Many almost identical protocols</a></li>
-   <li><a target="text" href="tipsandtricks.html#iointr">Read unsolicited input</a></li>
-   <li><a target="text" href="tipsandtricks.html#multiline">Read multi-line messages</a></li>
-   <li><a target="text" href="tipsandtricks.html#writemany">Write more than one value in one message</a></li>
-   <li><a target="text" href="tipsandtricks.html#readmany">Read more than one value from one message</a></li>
-   <li><a target="text" href="tipsandtricks.html#mixed">Read values of mixed data type</a></li>
-  </ul>
- </div>
-    
- <h1>Programmer's Guide</h1>
- <div class="top">
-  <a target="text" href="recordinterface.html">Record API</a>
- </div>
- <div class="top">
-  <a target="text" href="businterface.html">Bus API</a>
-  <a href="javascript:show('bus')" id="busButton"></a>
-  <ul id="bus">
-   <li><a target="text" href="businterface.html#class">Interface Class</a></li>
-   <li><a target="text" href="businterface.html#theory">Theory of Operation</a>
-    <ul>
-     <li><a target="text" href="businterface.html#registration">Registration</a></li>
-     <li><a target="text" href="businterface.html#create">Creation &amp; deletion</a></li>
-     <li><a target="text" href="businterface.html#connect">Connecting</a></li>
-     <li><a target="text" href="businterface.html#lock">Bus locking</a></li>
-     <li><a target="text" href="businterface.html#write">Writing output</a></li>
-     <li><a target="text" href="businterface.html#read">Reading input</a></li>
-     <li><a target="text" href="businterface.html#event">Handling events</a></li>
-   </ul></li>
-  </ul>
- </div>
- <div class="top">
-  <a target="text" href="formatconverter.html">Format Converter API</a>
- </div>
- <div class="top">
-  <a target="text" href="osinterface.html">Operating System API</a>
+<body>
+<h1>User's Guide</h1>
+<div>
+ <a target="_parent" href="index.html">Intro</a>
+</div>
+<div>
+ <a target="_parent" href="setup.html">Setup</a>
+ <a href="javascript:show('setup')" id="setupButton"></a>
+ <div>
+  <a target="_parent" href="setup.html#pre">Prerequisites</a>
+   <div>
+    <a target="_parent" href="epics3_13.html">Using EPICS 3.13</a>
+  </div>
+  <a target="_parent" href="setup.html#lib">Build Library</a>
+  <a target="_parent" href="setup.html#app">Build Application</a>
+  <a target="_parent" href="setup.html#sta">Startup Script</a>
+  <a target="_parent" href="setup.html#pro">Protocol File</a>
+   <div>
+    <a target="_parent" href="setup.html#reload">Reloading</a>
+   </div>
+  <a target="_parent" href="setup.html#rec">Records</a>
 </div>
 </div>
-<p align="center" style="margin-top:20px;">
-<script type="text/javascript">
-<!--
-    document.writeln('<a href="javascript:printview()">' +
-        '<img src="printer.gif" alt="Printer friendly" border=0><br>' +
-        '<small>Printer friendly<\/small><\/a>');
-    hide('setup');
-    hide('protocol');
-    hide('formats');
-    hide('proc');
-    hide('records');
-    hide('bus');
-    hide('tipsandtricks');
-    chapter=decodeURIComponent(parent.location.search.substr(1));
-    if (chapter) parent.text.location.href=chapter;
-//-->
-</script>
-</p>
+<div>
+ <a target="_parent" href="protocol.html">Protocol Files</a>
+ <a href="javascript:show('protocol')" id="protocolButton"></a>
+ <div>
+  <a target="_parent" href="protocol.html#gen">General</a>
+  <a target="_parent" href="protocol.html#proto">Protocols</a>
+  <a target="_parent" href="protocol.html#cmd">Commands</a>
+  <a target="_parent" href="protocol.html#str">Strings</a>
+  <a target="_parent" href="protocol.html#var">Variables</a>
+   <div>
+    <a target="_parent" href="protocol.html#sysvar">System variables</a>
+    <a target="_parent" href="protocol.html#argvar">Protocol Arguments</a>
+    <a target="_parent" href="protocol.html#usrvar">User variables</a>
+   </div>
+  <a target="_parent" href="protocol.html#except">Exception Handlers</a>
+ </div>
+</div>
+<div>
+ <a target="_parent" href="formats.html">Format Converters</a>
+ <a href="javascript:show('formats')" id="formatsButton"></a>
+ <div>
+  <a target="_parent" href="formats.html#syntax">Syntax</a>
+  <a target="_parent" href="formats.html#types">Types &amp; Fields</a>
+  <a target="_parent" href="formats.html#stdd"      title="Standard DOUBLE converters">%f %e %g</a>
+  <a target="_parent" href="formats.html#stdl"      title="Standard LONG converters">%i %d %u %o %x</a>
+  <a target="_parent" href="formats.html#stds"      title="Standard STRING converters">%s %c</a>
+  <a target="_parent" href="formats.html#cset"      title="Character set STRING converter">%[<em>charset</em>]</a>
+  <a target="_parent" href="formats.html#enum"      title="Enumeration LONG converter">%{<em>s0</em>|<em>s1</em>|...}</a>
+  <a target="_parent" href="formats.html#bin"       title="Binary LONG converter">%b %B</a>
+  <a target="_parent" href="formats.html#raw"       title="Raw LONG converter">%r</a>
+  <a target="_parent" href="formats.html#rawdouble" title="Raw DOUBLE converter">%R</a>
+  <a target="_parent" href="formats.html#bcd"       title="Binary coded decimal LONG converter">%D</a>
+  <a target="_parent" href="formats.html#chksum"    title="Checksum pseudo converter">%&lt;<em>checksum</em>&gt;</a>
+  <a target="_parent" href="formats.html#regex"     title="Perl regular expression STRING converter">%/<em>regex</em>/</a>
+  <a target="_parent" href="formats.html#mantexp"   title="MantissaExponent DOUBLE converter">%m</a>
+  <a target="_parent" href="formats.html#timestamp" title="Timestamp DOUBLE converter">%T</a>
+ </div>
+</div>
+<div>
+ <a target="_parent" href="processing.html">Record Processing</a>
+ <a href="javascript:show('proc')" id="procButton"></a>
+ <div>
+  <a target="_parent" href="processing.html#proc">Normal Processing</a>
+  <a target="_parent" href="processing.html#init">Initialization</a>
+  <a target="_parent" href="processing.html#iointr">I/O Intr</a>
+ </div>
+</div>
+<div>
+ <a target="_parent" href="recordtypes.html">Record Types</a>
+ <a href="javascript:show('records')" id="recordsButton"></a>
+ <div>
+  <a target="_parent" href="aai.html">aai</a>
+  <a target="_parent" href="aao.html">aao</a>
+  <a target="_parent" href="ai.html">ai</a>
+  <a target="_parent" href="ao.html">ao</a>
+  <a target="_parent" href="bi.html">bi</a>
+  <a target="_parent" href="bo.html">bo</a>
+  <a target="_parent" href="mbbi.html">mbbi</a>
+  <a target="_parent" href="mbbo.html">mbbo</a>
+  <a target="_parent" href="mbbiDirect.html">mbbiDirect</a>
+  <a target="_parent" href="mbboDirect.html">mbboDirect</a>
+  <a target="_parent" href="stringin.html">stringin</a>
+  <a target="_parent" href="stringout.html">stringout</a>
+  <a target="_parent" href="longin.html">longin</a>
+  <a target="_parent" href="longout.html">longout</a>
+  <a target="_parent" href="waveform.html">waveform</a>
+  <a target="_parent" href="calcout.html">calcout</a>
+  <a target="_parent" href="scalcout.html">scalcout</a>
+ </div>
+</div>
+<div>
+ <a target="_parent" href="tipsandtricks.html">Tips &amp; Tricks</a>
+ <a href="javascript:show('tipsandtricks')" id="tipsandtricksButton"></a>
+ <div>
+  <a target="_parent" href="tipsandtricks.html#argvar">Many almost identical protocols</a>
+  <a target="_parent" href="tipsandtricks.html#iointr">Read unsolicited input</a>
+  <a target="_parent" href="tipsandtricks.html#multiline">Read multi-line messages</a>
+  <a target="_parent" href="tipsandtricks.html#writemany">Write more than one value in one message</a>
+  <a target="_parent" href="tipsandtricks.html#readmany">Read more than one value from one message</a>
+  <a target="_parent" href="tipsandtricks.html#mixed">Read values of mixed data type</a>
+  <a target="_parent" href="tipsandtricks.html#web">Read a web page</a>
+ </div>
+</div>
+
+<h1>Programmer's Guide</h1>
+<div>
+ <a target="_parent" href="recordinterface.html">Record API</a>
+</div>
+<div>
+ <a target="_parent" href="businterface.html">Bus API</a>
+ <a href="javascript:show('bus')" id="busButton"></a>
+ <div>
+  <a target="_parent" href="businterface.html#class">Interface Class</a>
+  <a target="_parent" href="businterface.html#theory">Theory of Operation</a>
+   <div>
+    <a target="_parent" href="businterface.html#registration">Registration</a>
+    <a target="_parent" href="businterface.html#create">Creation &amp; deletion</a>
+    <a target="_parent" href="businterface.html#connect">Connecting</a>
+    <a target="_parent" href="businterface.html#lock">Bus locking</a>
+    <a target="_parent" href="businterface.html#write">Writing output</a>
+    <a target="_parent" href="businterface.html#read">Reading input</a>
+    <a target="_parent" href="businterface.html#event">Handling events</a>
+  </div>
+ </div>
+</div>
+<div>
+ <a target="_parent" href="formatconverter.html">Format Converter API</a>
+</div>
+<div>
+ <a target="_parent" href="osinterface.html">Operating System API</a>
+</div>
 </body>
 </html>

--- a/doc/osinterface.html
+++ b/doc/osinterface.html
@ -3,18 +3,18 @@
 <html>
 <head>
 <title>StreamDevice: Operating System API</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: Operating System API</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>Operating System API</h1>

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

 <hr>
 <p><small>Dirk Zimoch, 2006</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/printer.gif
+++ b/doc/printer.gif
--- a/doc/processing.html
+++ b/doc/processing.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: Record Processing</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: Record Processing</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>Record Processing</h1>

 <a name="proc"></a>
 <h2>1. Normal Processing</h2>
@ -239,6 +240,5 @@ with "<code>ROI</code>", followed by two floating point numbers.
 <hr>
 <p align="right"><a href="recordtypes.html">Next: Supported Record Types</a></p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/protocol.html
+++ b/doc/protocol.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: Protocol Files</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: Protocol Files</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>Protocol Files</h1>
 <a name="gen"></a>
 <h2>1. General Information</h2>
 <p>
@ -241,8 +242,12 @@ that hex value.<br>
 that octal value.<br>
 <code>\1</code> to <code>\9</code> followed by up to two more decimal
 digits means a byte with that decimal value.<br>
-<code>\?</code> in the argument string of an <code>in</code>
-<a href="#cmd">command</a> matches any input byte<br>
+<code>\?</code> in input matches any byte, in output it does not print
+anything.<br>
+<span class="new">
+<code>\_</code> in input matches any amount of white space (including none),
+in output it prints a single space.<br>
+</span>
 <code>\$</code> followed by the name of a
 <a href="#var">protocol varible</a> is replaced by the contents of that
 variable.
@ -251,29 +256,54 @@ variable.
 For non-printable characters, it is often easier to write sequences of
 byte values instead of escaped quoted string literals.
 A byte is written as an unquoted decimal, hexadecimal, or octal
-number in the range of -128 to 255 (-0x80 to 0xff, -0200 to 0377).
-<em>StreamDevice</em> also defines some symbolic names for frequently
-used byte codes as aliases for the numeric byte value:<br>
-<code>EOT</code> means <em>end of transmission</em> (ASCII code 4).<br>
-<code>ACK</code> means <em>acknowledge</em> (ASCII code 6).<br>
-<code>BEL</code> means <em>bell</em> (ASCII code 7).<br>
-<code>BS</code> means <em>backspace</em> (ASCII code 8).<br>
-<code>HT</code> or <code>TAB</code> mean <em>horizontal tabulator</em>
-(ASCII code 9).<br>
-<code>LF</code> or <code>NL</code> mean <em>line feed</em> /
-<em>new line</em> (ASCII code 10).<br>
-<code>CR</code> means <em>carriage return</em> (ASCII code 13).<br>
-<code>ESC</code> means <em>escape</em> (ASCII code 27).<br>
-<code>DEL</code> means <em>delete</em> (ASCII code 127).<br>
-<code>SKIP</code> in the argument string of an <code>in</code>
-<a href="#cmd">command</a> matches any input byte.
+number in the range of <code>-128</code> to <code>255</code>,
+<code>-0x80</code> to <code>0xff</code> (not case sesitive),
+or <code>-0200</code> to <code>0377</code>, respectively. 
+</p>
+<p>
+<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>
+<code>STX </code>(= <code>0x02</code>) <em>start of text</em><br>
+<code>ETX </code>(= <code>0x03</code>) <em>end of text</em><br>
+<code>EOT </code>(= <code>0x04</code>) <em>end of transmission</em><br>
+<code>ENQ </code>(= <code>0x05</code>) <em>enquiry</em><br>
+<code>ACK </code>(= <code>0x06</code>) <em>acknowledge</em><br>
+<code>BEL </code>(= <code>0x07</code>) <em>bell</em><br>
+<code>BS&nbsp; </code>(= <code>0x08</code>) <em>backspace</em><br>
+<code>HT</code> or <code>TAB</code> (= <code>0x09</code>) <em>horizontal tabulator</em><br>
+<code>LF</code> or <code>NL</code> (= <code>0x0A</code> or <code>10</code>) <em>line feed / new line</em><br>
+<code>VT&nbsp; </code>(= <code>0x0B</code> or <code>11</code>) <em>vertical tabulator</em><br>
+<code>FF</code> or <code>NP</code> (= <code>0x0C</code> or <code>12</code>) <em>form feed / new page</em><br>
+<code>CR&nbsp; </code>(= <code>0x0D</code> or <code>13</code>) <em>carriage return</em><br>
+<code>SO&nbsp; </code>(= <code>0x0E</code> or <code>14</code>) <em>shift out</em><br>
+<code>SI&nbsp; </code>(= <code>0x0F</code> or <code>15</code>) <em>shift in</em><br>
+<code>DLE </code>(= <code>0x10</code> or <code>16</code>) <em>data link escape</em><br>
+<code>DC1 </code>(= <code>0x11</code> or <code>17</code>) <em>device control 1</em><br>
+<code>DC2 </code>(= <code>0x12</code> or <code>18</code>) <em>device control 2</em><br>
+<code>DC3 </code>(= <code>0x13</code> or <code>19</code>) <em>device control 3</em><br>
+<code>DC4 </code>(= <code>0x14</code> or <code>20</code>) <em>device control 4</em><br>
+<code>NAK </code>(= <code>0x15</code> or <code>21</code>) <em>negative acknowledge</em><br>
+<code>SYN </code>(= <code>0x16</code> or <code>22</code>) <em>synchronous idle</em><br>
+<code>ETB </code>(= <code>0x17</code> or <code>23</code>) <em>end of transmission block</em><br>
+<code>CAN </code>(= <code>0x18</code> or <code>24</code>) <em>cancel</em><br>
+<code>EM&nbsp; </code>(= <code>0x19</code> or <code>25</code>) <em>end of medium</em><br>
+<code>SUB </code>(= <code>0x1A</code> or <code>26</code>) <em></em>substitute<br>
+<code>ESC </code>(= <code>0x1B</code> or <code>27</code>) <em>escape</em><br>
+<code>FS&nbsp; </code>(= <code>0x1C</code> or <code>28</code>) <em>file separator</em><br>
+<code>GS&nbsp; </code>(= <code>0x1D</code> or <code>29</code>) <em>group separator</em><br>
+<code>RS&nbsp; </code>(= <code>0x1E</code> or <code>30</code>) <em>record separator</em><br>
+<code>US&nbsp; </code>(= <code>0x1F</code> or <code>31</code>) <em>unit separator</em><br>
+<code>DEL </code>(= <code>0x7F</code> or <code>127</code>) <em>delete</em><br>
+<code>SKIP</code> or <code>?</code> matches any input byte
 </p>
 <p>
 A single string can be built from several quoted literals and byte values
 by writing them separated by whitespaces or comma.
 </p>

-<h3>Example:</h3>
+<h3>Examples:</h3>
 <p>
 The following lines represent the same string:<br>
 <code>"Hello world\r\n"</code><br>
@ -408,9 +438,12 @@ what they influence.
  (see <a href="formats.html">formats</a> and
  <a href="waveform.html">waveform record</a>), what string
  to write or to expect between values?
-  If the first character of the <code>Separator</code> is a
+  <span class="new">
+  <strike>If the first character of the <code>Separator</code> is a
  space, it matches any number of any whitespace characters in
-  an <code>in</code> command. 
+  an <code>in</code> command.</strike> To match arbitrary amount of
+  whitespace in input, use <code>"\_"</code>.
+  </span>
 </dd>
 <dt><code>ExtraInput = Error;</code></dt>
 <dd>
@ -546,7 +579,6 @@ settings from the protocol in which the exception occurred.
 </p>
 <hr>
 <p align="right"><a href="formats.html">Next: Format Converters</a></p>
-<p><small>Dirk Zimoch, 2006</small></p>
-<script src="stream.js" type="text/javascript"></script>
+<p><small>Dirk Zimoch, 2011</small></p>
 </body>
 </html>
--- a/doc/recordinterface.html
+++ b/doc/recordinterface.html
@ -3,18 +3,18 @@
 <html>
 <head>
 <title>StreamDevice: Record API</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: Record API</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>Record API</h1>

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

 <hr>
 <p><small>Dirk Zimoch, 2006</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/recordtypes.html
+++ b/doc/recordtypes.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: Record Types</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: Record Types</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>Record Types</h1>

 <h2>Supported Record Types</h2>
 <p>
@ -49,6 +50,5 @@ It is also possible to

 <hr>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/scalcout.html
+++ b/doc/scalcout.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: scalcout Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: scalcout Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>scalcout Records</h1>

 <p>
 <b>Note:</b> The scalcout record is part of the <i>calc</i> module of
@ -96,6 +97,5 @@ Different record fields are used for output and input. The variable
 <a href="calcout.html">calcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/setup.html
+++ b/doc/setup.html
@ -3,79 +3,159 @@
 <html>
 <head>
 <title>StreamDevice: Setup</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: Setup</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>Setup</h1>

 <a name="pre"></a>
 <h2>1. Prerequisites</h2>
 <p>
-<em>StreamDevice</em> requires either 
+<em>StreamDevice</em> requires either
 <a href="http://www.aps.anl.gov/epics/base/R3-14/index.php"
 target="ex">EPICS base R3.14.6 or higher</a> or
 <a href="http://www.aps.anl.gov/epics/base/R3-13.php"
 target="ex">EPICS base R3.13.7 or higher</a>.
 How to use <em>StreamDevice</em> on EPICS R3.13 is described on a
 <a href="epics3_13.html">separate page</a>.
-Because <em>StreamDevice</em> comes with an interface to
-<a href="http://www.aps.anl.gov/epics/modules/soft/asyn/"
-target="ex"><em>asynDriver</em> version R4-3 or higher</a> as the
-underlying driver layer,
-you should have <em>asynDriver</em> installed first.
-</p>
-<p>
-<em>StreamDevice</em> has support for the
-<a href="scalcout.html"><em>scalcout</em></a> record from the
-<em>calc</em> module of <a target="ex"
-href="http://www.aps.anl.gov/aod/bcda/synApps/index.php"
-><em>synApps</em></a>.
-Up to <em>calc</em> release R2-6 (<em>synApps</em> release R5_1),
-the <em>scalcout</em> record needs a fix.
-(See separate <a href="scalcout.html"><em>scalcout</em> page</a>.)
-Support for the scalcout is optional. <em>StreamDevice</em> works
-as well without scalcout or SynApps.
 </p>
+<h3>Fix required for base R3.14.8.2 and earlier on Windows</h3>
 <p>
 Up to release R3.14.8.2, a fix in EPICS base is required to build
 <em>StreamDevice</em> on Windows (not cygwin).
-In <kbd>src/iocsh/iocsh.h</kbd>, add the following line
+Add the following line to <kbd>src/iocsh/iocsh.h</kbd>
 and rebuild base.
 </p>
 <pre>
 epicsShareFunc int epicsShareAPI iocshCmd(const char *command);
 </pre>

+<h3>Configuration</h3>
 <p>
-Make sure that the <em>asyn</em> library (and the <em>calc</em> module of
-<em>synApps</em>, if desired) can be found, e.g. by
-adding <code>ASYN</code>
-and (if installed) <code>CALC</code> or <code>SYNAPPS</code>
-to your <kbd>&lt;top&gt;/configure/RELEASE</kbd> file:
+<em>StreamDevice</em> does not come with its own <kbd>&lt;top&gt;</kbd>
+location and <kbd>&lt;top&gt;/configure</kbd> directory.
+It expects to be put into an already existing <kbd>&lt;top&gt;</kbd>
+directory structure.
+You can simply create one with <code>makeBaseApp.pl</code>
+(which is part of EPICS base):
 </p>
+<p>
+<code>mkdir top</code><br>
+<code>cd top</code><br>
+<code>makeBaseApp.pl -t support</code>
+</p>
+<p>
+When asked for "Application names" just hit Enter.
+Then go to the newly created <kbd>configure</kbd> subdirectory and
+edit the <kbd>RELEASE</kbd> file you find there according to the
+instructions below.
+</p>
+<p>
+After changing any configuration, you should run <code>make</code>
+in this directory.
+</p>
+<p>
+For details on <kbd>&lt;top&gt;</kbd> directories and <kbd>RELEASE</kbd>
+files please refer to the
+<a href="http://www.aps.anl.gov/epics/base/R3-14/8-docs/AppDevGuide.pdf"
+target="ex"><em>IOC Application Developer's Guide</em></a> chapter 4:
+EPICS Build Facility.
+</p>
+
+<h4>Support for <em>asynDriver</em></h4>
+<p>
+You most probably want <em>asynDriver</em> support included, because that is the
+standard way for <em>StreamDevice</em> to talk to hardware.
+First get and install <a href="http://www.aps.anl.gov/epics/modules/soft/asyn/"
+target="ex"><em>asynDriver</em></a> version 4-3 or higher before you build <em>StreamDevice</em>.
+I have tested <em>StreamDevice</em> with <em>asynDriver</em> versions up to 4-17.
+Make sure that the <em>asyn</em> library can be found by adding the path to the
+<em>&lt;top&gt;</em> directory of your <em>asyn</em> installation to the
+<kbd>RELEASE</kbd> file:
 <pre>
-ASYN=/home/epics/asyn/4-5
-CALC=/home/epics/synApps/calc/2-7
+ASYN=/home/epics/asyn4-17
+</pre>
+
+<h4>Support for sCalcout record</h4>
+<p>
+The <a target="ex"
+href="http://www.aps.anl.gov/bcda/synApps/calc/R2-8/sCalcoutRecord.html"
+><em>sCalcout</em></a> record is part of <a target="ex"
+href="http://www.aps.anl.gov/aod/bcda/synApps/index.php"
+><em>synApps</em></a>.
+If <em>streamDevice</em> should be built with support for this record,
+you have to install the <em>calc</em> module from <em>SynApps</em> first.
+Add references to the <kbd>RELEASE</kbd> file as shown here:
+<pre>
+CALC=/home/epics/synApps/calc-2-8
 </pre>
 <p>
+Up to <em>calc</em> release R2-6 (<em>synApps</em> release R5_1),
+the <em>sCalcout</em> record needs a fix.
+(See separate <a href="scalcout.html"><em>scalcout</em> page</a>.)
+And the <em>calc</em> modue had dependencies on other <em>SynApps</em>
+modules. Release R2-8 or newer is recommended.
+</p>
+<p>
+Support for the scalcout is optional. <em>StreamDevice</em> works
+as well without scalcout or SynApps.
+</p>
+
+<h4>Support for regular expression matching</h4>
+<p>
 If you want to enable regular expression matching, you need the <em>PCRE</em> package.
-For most Linux systems, it is already installed. In that case add the locations
-of the <em>PCRE</em> header and library to your <kbd>RELEASE</kbd> file:
+For most Linux systems, it is already installed.
+In that case add the locations you have to make the locations of the
+<em>PCRE</em> header file and library known.
+However, the pre-installed package can only by used for the host architecture.
+Thus, add them not to <kbd>RELEASE</kbd> but to <kbd>RELEASE.Common.linux-x86</kbd>
+(if linux-x86 is your EPICS_HOST_ARCH).
+Note that different Linux distributions may locate the files in different directories.
 </p>
 <pre>
 PCRE_INCLUDE=/usr/include/pcre
 PCRE_LIB=/usr/lib
 </pre>
 <p>
-If you want to build <em>StreamDevice</em> for platforms without <em>PCRE</em> support,
-it is the easiest to build <em>PCRE</em> as an EPICS application.
-Download the <em>PCRE</em> package from <a target=ex href="http://www.pcre.org">www.pcre.org</a>
-and compile it with my EPICS compatible
-<a target=ex href="http://epics.web.psi.ch/software/streamdevice/pcre/Makefile">Makefile</a>.
-Then define the location of the application in your RELEASE file.
+A pre-compiled Windows version of <em>PCRE</em> is available at
+<a href="http://sourceforge.net/projects/gnuwin32/files/pcre/7.0/pcre-7.0.exe/download"
+target="ex">sourceforge</a>
+</p>
+<p>
+If you want to have <em>PCRE</em> support on platforms that don't support it natively,
+e.g. vxWorks, it is probably the easiest to build <em>PCRE</em> as an EPICS application.
+</p>
+<p>
+<h4>Building the <em>PCRE</em> package as an EPICS module</h4>
+<p>
+<ol>
+<li>
+Download the <em>PCRE</em> package from <a target=ex href="http://www.pcre.org">www.pcre.org</a>.
+</li>
+<li>
+Extract the <em>PCRE</em> package in the <kbd>&lt;top&gt;</kbd> directory of
+<em>StreamDevice</em> or create a separate <kbd>&lt;top&gt;</kbd> location using
+<code>makeBaseApp.pl</code>.
+</li>
+<li>
+Download this <a target=ex href="http://epics.web.psi.ch/software/streamdevice/pcre/Makefile"
+>Makefile</a> and this
+<a target=ex href="http://epics.web.psi.ch/software/streamdevice/pcre/fixforvxworks.pl"
+>fixforvxworks.pl</a> script and save them to the extracted pcre directory.
+</li>
+<li>
+Change into the pcre direcrory and run <code>perl fixforvxworks.pl</code>
+</li>
+<li>
+Run <code>make</code> (or <code>gmake</code>)
+</li>
+</ol>
+<p>
+Define the location of the pcre <kbd>&lt;top&gt;</kbd> in the RELEASE file for <em>StreamDevice</em>.
 </p>
 <pre>
 PCRE=/home/epics/pcre
@ -84,25 +164,17 @@ PCRE=/home/epics/pcre
 Regular expressions are optional. If you don't want them, you don't need this.
 </p>

-<p>
-For details on <kbd>&lt;top&gt;</kbd> directories and RELEASE files,
-please refer to the
-<a href="http://www.aps.anl.gov/epics/base/R3-14/8-docs/AppDevGuide.pdf"
-target="ex"><em>IOC Application Developer's Guide</em></a> chapter 4:
-EPICS Build Facility.
-</p>
-
 <a name="lib"></a>
 <h2>2. Build the <em>StreamDevice</em> Library</h2>
 <p>
 Unpack the
 <a href="http://epics.web.psi.ch/software/streamdevice/StreamDevice-2.tgz"
-><em>StreamDevice</em> package</a> in a <kbd>&lt;top&gt;</kbd> directory
+><em>StreamDevice</em> package</a> in the <kbd>&lt;top&gt;</kbd> directory
 of your application build area.
 (You might probably have done this already.)
 Go to the newly created <em>StreamDevice</em> directory
-and run <kbd>make</kbd> (or <kbd>gmake</kbd>).
-This will create and install the <em>stream</em> library and the 
+and run <code>make</code> (or <code>gmake</code>).
+This will create and install the <em>stream</em> library and the
 <kbd>stream.dbd</kbd> file.
 </p>
 <a name="app"></a>
@ -121,7 +193,8 @@ PROD_LIBS += asyn
 </pre>
 <p>
 Include the following lines in your xxxAppInclude.dbd file to use
-<em>stream</em> and <em>asyn</em> with serial lines and IP sockets:
+<em>stream</em> and <em>asyn</em> with serial lines, IP sockets,
+and vxi11 ("GPIB over ethernet") support.
 </p>
 <pre>
 include "base.dbd"
@ -129,6 +202,7 @@ include "stream.dbd"
 include "asyn.dbd"
 registrar(drvAsynIPPortRegisterCommands)
 registrar(drvAsynSerialPortRegisterCommands)
+registrar(vxi11RegisterCommands)
 </pre>
 <p>
 You can find an example application in the <kbd>streamApp</kbd>
@ -151,7 +225,7 @@ i.e. the current directory.
 <p>
 Also configure the buses (in <em>asynDriver</em> terms: ports) you want
 to use with <em>StreamDevice</em>.
-You can give the buses any name you want, like <kbd>COM1</kbd> or 
+You can give the buses any name you want, like <kbd>COM1</kbd> or
 <kbd>socket</kbd>, but I recommend to use names related to the
 connected device.
 </p>
@ -189,7 +263,7 @@ drvAsynIPPortConfigure ("PS1", "192.168.164.10:23")
 </pre>

 <p>
-With a VXI11 (GPIB via TCP/IP) connection, e.g. a 
+With a VXI11 (GPIB via TCP/IP) connection, e.g. a
 HP E2050A on IP address 192.168.164.10, it would look like this:
 </p>
 <pre>
@ -211,7 +285,7 @@ During <code>iocInit</code>, <em>streamDevice</em> loads and parses
 the required protocol files.
 If the files contain errors, they are printed on the IOC shell.
 Put the protocol file in one of the directories listed in
-<code>STREAM_PROTOCOL_PATH</code>. 
+<code>STREAM_PROTOCOL_PATH</code>.
 </p>
 <h3>Example:</h3>
 <p>
@ -234,7 +308,7 @@ Terminator = CR LF;

 setCurrent {
    out "CURRENT %.2f";
-    @init { 
+    @init {
        out "CURRENT?";
        in "CURRENT %f A";
    }
@ -270,19 +344,24 @@ See the <a href="protocol.html">next chapter</a> for protocol files in depth.
 <p>
 To make a record use <em>StreamDevice</em>, set its <code>DTYP</code> field to
 <code>"stream"</code>.
+</p>
+<p>
 The <code>INP</code> or <code>OUT</code> link has the form
 <code>"@<var>file&nbsp;protocol&nbsp;bus</var>&nbsp;[<var>address</var>&nbsp;[<var>parameters</var>]]"</code>.
 </p>
 <p>
 Here, <code><var>file</var></code> is the name of the protocol file and
 <code><var>protocol</var></code> is the name of a protocol defined in this file.
+(See the <a href="protocol.html">next chapter</a>.)
+</p>
+<p>
 If the protocol requires <a href="protocol.html#argvar">arguments</a>,
 specify them enclosed in parentheses:
 <code><var>protocol</var>(<var>arg1,arg2,...</var>)</code>.
 </p>
 <p>
-The communication channel is specified with <code><var>bus</var></code> and
-<code><var>addr</var></code>.
+The communication channel is specified with <code><var>bus</var></code>
+(aka <em>asynDriver</em> "port") and <code><var>addr</var></code>.
 If the bus does not have addresses, <code><var>addr</var></code> is dispensable.
 Optional <code><var>parameters</var></code> are passed to the bus driver.
 </p>
@ -298,8 +377,8 @@ The bus is called <em>PS1</em> like the device.
 record (ao, "PS1:I-set")
 {
    field (DESC, "Set current of PS1")
-    field (DTYP, "stream")
-    field (OUT,  "@ExamplePS.proto setCurrent PS1")
+    <b>field (DTYP, "stream")</b>
+    <b>field (OUT,  "@ExamplePS.proto setCurrent PS1")</b>
    field (EGU,  "A")
    field (PREC, "2")
    field (DRVL, "0")
@ -311,7 +390,6 @@ record (ao, "PS1:I-set")

 <hr>
 <p align="right"><a href="protocol.html">Next: Protocol Files</a></p>
-<p><small>Dirk Zimoch, 2007</small></p>
-<script src="stream.js" type="text/javascript"></script>
+<p><small>Dirk Zimoch, 2011</small></p>
 </body>
 </html>
--- a/doc/sls_icon.ico
+++ b/doc/sls_icon.ico
--- a/doc/space.gif
+++ b/doc/space.gif
--- a/doc/stream.css
+++ b/doc/stream.css
@ -1,13 +1,18 @@
-a:link    {color: #0000D0; text-decoration:none;}
-a:visited {color: #0000D0; text-decoration:none;}
-a:hover   {color: #FF0000; text-decoration:none;}
+a:link    {color: #0000D0;}
+a:visited {color: #0000D0;}
+a:hover   {color: #FF0000;}

 body {
-    margin-right:20px;
-    font-family:sans-serif;
+    margin-right:1em;
+    margin-left:15em;
+    margin-top:70px;
+    padding-top:1px;
+    font-family: Helvetica, Arial, sans-serif;
    font-size:14px;
    background-color:#ffffff;
-}    
+}
+
+a[name] { position:relative; top:-11ex;}

 pre {
    background-color:#f4f4f4;
@ -17,15 +22,35 @@ pre {
    margin:2ex;
 }

+kbd {
+    font-weight:bold;
+}
+
 dt {
    margin-top:0.5ex;
 }

 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%;
+    line-height:190%;
+    background-color:white;
+    border-width:0;
+    border-bottom:3px solid #1b4486;
+    white-space:nowrap;
+    background-image:url(PSI.png);
+    background-repeat:no-repeat;
+    background-position:10px 5px;
+    text-shadow:.1em .1em .1em darkgray;
+    box-shadow:0 .3em .1em -.2em darkgray;
 }

 h2 {
@ -34,6 +59,11 @@ h2 {
 }

 h3 {
+    font-size:120%;
+    margin-bottom:0.25ex;
+}
+
+h4 {
    font-size:100%;
    margin-bottom:0.25ex;
 }
@ -58,22 +88,37 @@ code {
    text-align:left;
 }

-/*
-  a[target=ex] {
-      background-image:url(ex.png);
-      background-repeat:no-repeat;
-      background-position:right center;
-      padding-right: 12px;
-  }
+#navleft {
+    position:fixed;
+    left:0;
+    top:0;
+    padding-top:70px;
+    width:14em;
+    height:100%;
+    border-style:solid;
+    border-color:black;
+    border-width:0 1px 0 0;
+    background-color:#e3eaf6;
+    overflow:hidden;
+    z-index:0;
+}

-  a[target=ex]:hover {
-      background-image:url(exr.png);
-  }
-*/
+.new {
+    background-color: #ffc;
+}
+
+a[target=ex]:after {
+  content:" " url(ex.png);
+}
+
+a[target=ex]:hover:after {
+  content: " " url(exr.png);
+}

@media print {
-  a:link    {color: black; text-decoration:none;}
-  a:visited {color: black; text-decoration:none;}
-  a:hover   {color: black; text-decoration:none;}
-  code      {color: black; }
+  a:link    {text-decoration:none;}
+  a[target=ex]:after {content:" [" attr(href) "]";}
+  body      {margin:0 4em;}
+  h1        {position:relative; background-position:0 0;}
+  #navleft  {display:none;}
 }
--- a/doc/stream.html
+++ b/doc/stream.html
@ -1,92 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<title>StreamDevice</title>
-<link rel="shortcut icon" href="sls_icon.ico">
-<link rel="stylesheet" type="text/css" href="stream.css">
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<meta name="author" content="Dirk Zimoch">
-</head>
-<body>
-<h1>EPICS <em>StreamDevice</em> Documentation</h1>
-
-<h2>What is <em>StreamDevice</em>?</h2>
-<p>
-<em>StreamDevice</em> is a generic
-<a href="http://www.aps.anl.gov/epics" target="ex">EPICS</a>
-device support for devices with a "byte stream" based
-communication interface.
-That means devices that can be controlled by sending and
-receiving strings (in the broadest sense, including non-printable
-characters and even null-bytes). 
-Examples for this type of communication interface are
-serial line (RS-232, RS-485, ...),
-IEEE-488 (also known as GPIB or HP-IB), and TCP/IP.
-<em>StreamDevice</em> comes with an interface to<a target="ex"
-href="http://www.aps.anl.gov/epics/modules/soft/asyn/">
-<em>asynDriver</em></a>
-but can be extended to
-<a href="businterface.html">support other bus drivers</a>.
-</p>
-<p>
-If the device can be controlled with strings like
-"<code>RF:FREQ 499.655 MHZ</code>", <em>StreamDevice</em> can be used.
-How the strings exactly look like is defined in <em>protocols</em>.
-Formatting and interpretation of values is done with
-<a href="formats.html"><em>format converters</em></a> similar to those
-known from the C functions <em>printf()</em> and <em>scanf()</em>.
-To support other formats, it is possible to
-<a href="formatconverter.html">write your own converters</a>.
-</p>
-<p>
-Each record with <em>StreamDevice</em> support runs one <em>protocol</em>
-to read or write its value.
-All <em>protocols</em> are defined in
-<a href="protocol.html"><em>protocol files</em></a> in plain ASCII text.
-No compiling is necessary to change a protocol or to support new devices.
-<em>Protocols</em> can be as simple as just one output string or can
-consist of many strings sent to and read from the device.
-However, a protocol is linear.
-That means it runs from start to end each time the record is
-<a href="processing.html">processed</a>.
-It does not provide loops or branches.
-</p>
-<p>
-<em>StreamDevice</em> supports all
-<a href="recordtypes.html">standard records</a> of EPICS base
-which can have device support.
-It is also possible to
-<a href="recordinterface.html">write support for new record types</a>.
-</p>
-
-<h2>What is <em>StreamDevice</em> not?</h2>
-<p>
-It is not a programming language for a high-level application.
-It is, for example, not possible to write a complete scanning program
-in a <em>protocol</em>.
-Use other tools for that and use <em>StreamDevice</em> only for the
-primitive commands.
-</p>
-<p>
-It is not a block oriented device support.
-It is not possible to send or receive huge blocks of data that contain
-many process variables distributed over many records.
-</p>
-
-<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>
-</p>
-<p>
-<a href="http://www.aps.anl.gov/asd/controls/epics/EpicsDocumentation/AppDevManuals/RecordRef/Recordref-1.html"
-target="ex">EPICS Record Reference Manual</a>
-</p>
-
-<hr>
-<p align="right"><a href="setup.html">Next: Setup</a></p>
-<p><small>Dirk Zimoch, 2006</small></p>
-<script src="stream.js" type="text/javascript"></script>
-</body>
-</html>
--- a/doc/stream.js
+++ b/doc/stream.js
@ -1,5 +0,0 @@
-if (parent.head) {
-    parent.head.document.getElementById('subtitle').innerHTML=document.title;
-    parent.document.title=document.title;
-    document.getElementsByTagName('h1')[0].style.display="none";
-}
--- a/doc/stringin.html
+++ b/doc/stringin.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: stringin Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: stringin Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>stringin Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -62,6 +63,5 @@ written or read value.
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/stringout.html
+++ b/doc/stringout.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: stringout Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: stringout Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>stringout Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -62,6 +63,5 @@ written or read value.
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- a/doc/tipsandtricks.html
+++ b/doc/tipsandtricks.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: Tips and Tricks</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: Tips and Tricks</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>Tips and Tricks</h1>

 <a name="argvar"></a>
 <h2>I have many almost identical protocols</h2>
@ -54,7 +55,7 @@ read {in "new value = %f";}
 <code>
 record (ai, "$(RECORD)") {<br>
 &nbsp;&nbsp;field (DTYP, "stream")<br>
-&nbsp;&nbsp;field (INP, "@(DEVICETYPE).proto read $(BUS)")<br>
+&nbsp;&nbsp;field (INP, "@$(DEVICETYPE).proto read $(BUS)")<br>
 &nbsp;&nbsp;field (SCAN, "I/O Intr")<br>
 }
 </code>
@ -95,14 +96,14 @@ array_out {separator=", "; out "an array: (%.2f)";}
 The format <code>%.2f</code> is repeated for each element of the array.
 All elements are separated by <code>", "</code>.<br>
 Output will look like this:
+</p>
 <pre>
 an array: (3.14, 17.30, -12.34)
 </pre>
-</p>
 <h3>B) We have up to 12 numeric values</h3>
 <p>
 Use a <a href="calcout.html">calcout</a> record and
-<a href="formats.html#types">field references</a> in the format.
+<a href="formats.html#redirection">redirection to fields</a>.
 </p>
 <p>
 <code>
@ -121,24 +122,24 @@ record (calcout, "$(RECORD)") {<br>
 &nbsp;&nbsp;field (INPC, "$(C_RECORD)")<br>
 &nbsp;&nbsp;field (CALC, "0")<br>
 &nbsp;&nbsp;field (DTYP, "stream")<br>
-&nbsp;&nbsp;field (OUT, "@(DEVICETYPE).proto write_ABC $(BUS)")<br>
+&nbsp;&nbsp;field (OUT, "@$(DEVICETYPE).proto write_ABC $(BUS)")<br>
 }
 </code>
 </p>
 <h3>C) Values are in other records on the same IOC</h3>
 <p>
-Use <a href="formats.html#types">record references</a> in the format.
+Use <a href="formats.html#redirection">redirection to records</a>.
 </p>
 <p>
 <code>
-acquire {out 'ACQUIRE "%(\$1:directory.VAL)s/%s",%(\$1:time.VAL).3f;';}
+acquire {out 'ACQUIRE "%(\$1:directory)s/%s",%(\$1:time).3f;';}
 </code>
 </p>
 <p>
-You must specify the full <code>record.FIELD</code> name,
-even for <code>VAL</code> fields.
-To avoid record names in protocol files use
-<a href="protocol.html#argvar">protocol arguments</a>.
+You can specify a record name or record.FIELD in parentheses directly
+after the <code>%</code>.
+To avoid plain record names in protocol files use
+<a href="protocol.html#argvar">protocol arguments</a> like <code>\$1</code>.
 In the link, specify the record name or just the basename of the
 other records (device name) in parentheses.
 </p>
@ -146,7 +147,7 @@ other records (device name) in parentheses.
 <code>
 record (stringout, "$(DEVICE):getimage") {<br>
 &nbsp;&nbsp;field (DTYP, "stream")<br>
-&nbsp;&nbsp;field (OUT, "@(DEVICETYPE).proto acquire($(DEVICE)) $(BUS)")<br>
+&nbsp;&nbsp;field (OUT, "@$(DEVICETYPE).proto acquire($(DEVICE)) $(BUS)")<br>
 }
 </code>
 </p>
@ -190,12 +191,12 @@ read_B {in "A=%*f, B=%f";}
 <code>
 record (ai, "$(DEVICE):A") {<br>
 &nbsp;&nbsp;field (DTYP, "stream")<br>
-&nbsp;&nbsp;field (INP, "@(DEVICETYPE).proto read_A $(BUS)")<br>
+&nbsp;&nbsp;field (INP, "@$(DEVICETYPE).proto read_A $(BUS)")<br>
 &nbsp;&nbsp;field (SCAN, "1 second")<br>
 }<br>
 record (ai, "$(DEVICE):B") {<br>
 &nbsp;&nbsp;field (DTYP, "stream")<br>
-&nbsp;&nbsp;field (INP, "@(DEVICETYPE).proto read_B $(BUS)")<br>
+&nbsp;&nbsp;field (INP, "@$(DEVICETYPE).proto read_B $(BUS)")<br>
 &nbsp;&nbsp;field (SCAN, "I/O Intr")<br>
 }
 </code>
@ -215,20 +216,20 @@ Any non-matching input is ignored by record B.
 </p>
 <h3>C) Values should be stored in other records on the same IOC</h3>
 <p>
-Use <a href="formats.html#types">record references</a> in the format.
+Use <a href="formats.html#redirection">redirection to records</a>.
 To avoid record names in protocol files, use
 <a href="protocol.html#argvar">protocol arguments</a>.
 </p>
 <p>
 <code>
-read_AB {out "GET A,B"; in "A=%f, B=%(\$1.VAL)f";}
+read_AB {out "GET A,B"; in "A=%f, B=%(\$1)f";}
 </code>
 </p>
 <p>
 <code>
 record (ai, "$(DEVICE):A") {<br>
 &nbsp;&nbsp;field (DTYP, "stream")<br>
-&nbsp;&nbsp;field (INP, "@(DEVICETYPE).proto read_AB($(DEVICE):B) $(BUS)")<br>
+&nbsp;&nbsp;field (INP, "@$(DEVICETYPE).proto read_AB($(DEVICE):B) $(BUS)")<br>
 &nbsp;&nbsp;field (SCAN, "1 second")<br>
 }<br>
 record (ai, "$(DEVICE):B") {<br>
@ -243,11 +244,11 @@ processes record B.
 </p>

 <a name="mixed"></a>
-<h2>I have a device that sends mixed data types: numbers and strings</h2>
+<h2>I have a device that sends mixed data types: numbers or strings</h2>
 <p>
 Use a <code>@mismatch</code>
 <a href="protocol.html#except">exception handler</a> and
-<a href="formats.html#types">record references</a> in the format.
+<a href="formats.html#redirection">redirection to records</a>.
 To avoid record names in protocol files, use
 <a href="protocol.html#argvar">protocol arguments</a>.
 </p>
@ -259,14 +260,14 @@ When asked "<code>CURRENT?</code>", the device send something like
 </p>
 <p>
 <code>
-read_current {out "CURRENT?"; in "CURRENT %f A"; @mismatch {in "%(\1.VAL)39c";}}
+read_current {out "CURRENT?"; in "CURRENT %f A"; @mismatch {in "%(\1)39c";}}
 </code>
 </p>
 <p>
 <code>
 record (ai, "$(DEVICE):readcurrent") {<br>
 &nbsp;&nbsp;field (DTYP, "stream")<br>
-&nbsp;&nbsp;field (INP, "@(DEVICETYPE).proto read_current($(DEVICE):message) $(BUS)")<br>
+&nbsp;&nbsp;field (INP, "@$(DEVICETYPE).proto read_current($(DEVICE):message) $(BUS)")<br>
 }<br>
 record (stringin, "$(DEVICE):message") {<br>
 }
@ -280,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>
@ -288,10 +289,124 @@ record (stringout, "$(DEVICE):clean_2") {<br>
 &nbsp;&nbsp;field (VAL, "OK")<br>
 &nbsp;&nbsp;field (OUT,  "$(DEVICE):message PP")<br>
 }<br>
-
 </code>
+<a name="web"></a>
+<h2>I need to read a web page</h2>
+<p>
+First you have to send a correctly formatted HTML request.
+Note that this request must contain the full URL like
+"http://server/page" and must be terminated with <u>two</u> newlines.
+The server should be the same as in the
+<a href="setup.html#sta"><code>drvAsynIPPortConfigure</code></a>
+command (if not using a http proxy).
+
+The web page you get often contains much more information than you need.
+<a href="formats.html#regex">Regular expressions</a> are great
+to find what you are looking for.
+</p>
+<h3>Example 1</h3>
+<p>
+Read the title of a web page.
+</p>
+<p>
+<code>
+get_title {<br>
+&nbsp;&nbsp;extrainput = ignore;<br>
+&nbsp;&nbsp;replyTimeout = 1000;<br>
+&nbsp;&nbsp;out "GET http://\$1\n\n";<br>
+&nbsp;&nbsp;in "%+.1/(?im)&lt;title&gt(.*)&lt\/title&gt;/";<br>
+}
+</code>
+</p>
+<p>
+Terminate the request with two newlines, either explicit like here
+<u>or</u> using an 
+<a href="protocol.html#sysvar"><code>outTerminator</code></a>.
+The URI (without http:// but including the web server host name)
+is passed as <a href="protocol.html#argvar">argument</a> 1 to <code>\$1</code>.
+Note that web servers may be slow, so allow some
+<a href="protocol.html#argvar"><code>replyTimeout</code></a>.
+</p>
+<p>
+If you don't use an <code>inTerminator</code> then the whole page is
+read as one "line" to the <code>in</code> command and can be parsed easily
+with a regular expression.
+We want to see the string between <code>&lt;title&gt</code> and
+<code>&lt;/title&gt;</code>, so we put it into a subexpression in
+<code>()</code> and request the first subexpression with <code>.1</code>.
+Note that the <code>/</code> in the closing tag has be be escaped
+to avoid a misinterpretation as the closing <code>/</code> of the regular
+expression.
+</p>
+<p>
+The tags may be upper or lower case like <code>&lt;TITLE&gt;</code> or
+<code>&lt;Title&gt;</code>, so we ask for case insensitive matching with
+<code>(?i)</code>.
+</p>
+<p>
+The string should be terminated with the first closing
+<code>&lt;/title&gt;</code>, not the last one in the file.
+(There should not be more than one title but you never know.)
+Thus we ask not to be greedy with <code>(?m)</code>.
+<code>(?i)</code> and <code>(?m)</code> can be combined to <code>(?im)</code>.
+See the PCRE documentation for more regexp syntax.
+</p>
+<p>
+The regular expression matcher ignores and discards any content before the
+matching section.
+Content after the match is discarded with <code>extrainput = ignore</code>
+so that it does not trigger errors reporting "surplus input".
+</p>
+<p>
+Finally, the title may be too long for the record.
+The <code>+</code> tells the format matcher not to fail in this case
+but to truncate the string instead.
+You can read the string with a stringin record or for longer strings with
+a waveform record with data type CHAR.
+</p>
+<p>
+<code>
+record (stringin, "$(DEVICE):title") {<br>
+&nbsp;&nbsp;field (DTYP, "stream")<br>
+&nbsp;&nbsp;field (INP,  "@$(DEVICETYPE).proto get_title($(PAGE)) $(BUS)")<br>
+}<br>
+record (waveform, "$(DEVICE):longtitle") {<br>
+&nbsp;&nbsp;field (DTYP, "stream")<br>
+&nbsp;&nbsp;field (INP,  "@$(DEVICETYPE).proto get_title($(PAGE)) $(BUS)")<br>
+&nbsp;&nbsp;field (FTVL, "CHAR")<br>
+&nbsp;&nbsp;field (NELM, "100")<br>
+}<br>
+</code>
+</p>
+
+<h3>Example 2</h3>
+<p>
+Read a number from a web page. First we have to locate the number.
+For that we match against any known string right before the number
+(and <a href="formats.html#syntax">discard the match</a> with <code>*</code>).
+Then we read the number.
+</p>
+<code>
+get_title {<br>
+&nbsp;&nbsp;extrainput = ignore;<br>
+&nbsp;&nbsp;replyTimeout = 1000;<br>
+&nbsp;&nbsp;out "GET http://\$1\n\n";<br>
+&nbsp;&nbsp;in "%*/Interesting value:/%f more text";<br>
+}
+</code>
+<p>
+When using <code>extrainput = ignore;</code>, it is always a good idea to
+match a few bytes after the value, too.
+This catches errors where loading of the page is interrupted in the middle
+of the number. (You don't want to miss the exponent from something like 1.23E-14).
+</p>
+<p>
+You can read more than one value from a file with successive regular expressions
+and <a href="formats.html#redirection">redirections</a>.
+But this only works if the order of the values is predictible.
+<i>StreamDevice</i> is not an XML parser! It always reads sequentially.
+</p>
 <hr>
-<p><small>Dirk Zimoch, 2007</small></p>
-<script src="stream.js" type="text/javascript"></script>
+<p><small>Dirk Zimoch, 2012</small></p>
 </body>
 </html>
--- a/doc/waveform.html
+++ b/doc/waveform.html
@ -3,13 +3,14 @@
 <html>
 <head>
 <title>StreamDevice: waveform Records</title>
-<link rel="shortcut icon" href="sls_icon.ico">
+<link rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" type="text/css" href="stream.css">
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta name="author" content="Dirk Zimoch">
 </head>
 <body>
-<h1>StreamDevice: waveform Records</h1>
+<iframe src="nav.html" id="navleft"></iframe>
+<h1>waveform Records</h1>

 <h2>Normal Operation</h2>
 <p>
@ -121,6 +122,5 @@ the written or read value.
 <a href="scalcout.html">scalcout</a>
 </p>
 <p><small>Dirk Zimoch, 2005</small></p>
-<script src="stream.js" type="text/javascript"></script>
 </body>
 </html>
--- 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,42 +189,44 @@ 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();
    void connectHandler();
    void disconnectHandler();
    bool connectToAsynPort();
-    void asynReadHandler(const char *data, int numchars, int eomReason);
+    void asynReadHandler(const char *data, size_t numchars, int eomReason);
    asynQueuePriority priority() {
        return static_cast<asynQueuePriority>
            (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,23 +524,57 @@ 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;
    }
+    // Is it really connected? 
+
+/*  does not work because read(...,0,...) deletes 1 byte from input.
+
+    if (connected && !pasynGpib)
+    {
+        size_t received;
+        int eomReason;
+        char buffer[8];
+
+        pasynUser->timeout = 0.0;
+        status = pasynOctet->read(pvtOctet, pasynUser,
+            buffer, 0, &received, &eomReason);
+        debug("AsynDriverInterface::connectToAsynPort(%s): "
+            "read(..., 0, ...) [timeout=%g sec] = %s\n",
+            clientName(), pasynUser->timeout,
+            asynStatusStr[status]);
+        pasynManager->isConnected(pasynUser, &connected);
+        debug("AsynDriverInterface::connectToAsynPort(%s): "
+            "device was %sconnected!\n",
+            clientName(),connected?"":"dis");
+    }
+*/
+        
    debug("AsynDriverInterface::connectToAsynPort(%s) is %s connected\n",
        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;
        }
@ -530,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;
 }

@ -586,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?
@ -622,11 +720,31 @@ writeHandler()
    }
    status = pasynOctet->write(pvtOctet, pasynUser,
        outputBuffer, outputSize, &written);
+    debug("AsynDriverInterface::writeHandler(%s): "
+        "write(..., outputSize=%ld, written=%ld) "
+        "[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);
+    debug("AsynDriverInterface::writeHandler(%s): "
+        "device is %sconnected\n",
+        clientName(),connected?"":"dis");
+    if (!connected) {
+        error("%s: write failed because connection was closed by device\n",
+            clientName());
+        writeCallback(StreamIoFault);
+        return;
+    }
+
    switch (status)
    {
        case asynSuccess:
@ -651,15 +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. Asyn driver says: %s\n",
+                clientName(), pasynUser->errorMessage);
+            writeCallback(StreamIoFault);
+            return;
+        case asynDisabled:
+            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. Asyn driver says: %s\n",
                clientName(), pasynUser->errorMessage);
            writeCallback(StreamIoFault);
            return;
@ -672,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");
        
@ -696,8 +833,20 @@ readRequest(unsigned long replyTimeout_ms, unsigned long readTimeout_ms,
    }
    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;
@ -722,40 +871,46 @@ readHandler()
    streameos = getInTerminator(streameoslen);
    deveos = streameos;
    deveoslen = streameoslen;
-    if (streameos) do // streameos == NULL means: don't change eos
+    if (streameos) // streameos == NULL means: don't change eos
    {
        asynStatus status;
        status = pasynOctet->getInputEos(pvtOctet,
            pasynUser, oldeos, sizeof(oldeos)-1, &oldeoslen);
        if (status != asynSuccess)
        {
-            oldeoslen = -1;
            // No EOS support?
-        }
-        // device (e.g. GPIB) might not accept full eos length
-        if (pasynOctet->setInputEos(pvtOctet, pasynUser,
-            deveos, deveoslen) == asynSuccess)
-        {
-#ifndef NO_TEMPORARY
-            if (ioAction != AsyncRead)
+            if (streameos[0])
            {
-                debug("AsynDriverInterface::readHandler(%s) "
-                    "input EOS set to %s\n",
-                    clientName(),
-                    StreamBuffer(deveos, deveoslen).expand()());
+                error("%s: warning: No input EOS support.\n",
+                    clientName());
            }
+            oldeoslen = -1;
+        } else do {
+            // device (e.g. GPIB) might not accept full eos length
+            if (pasynOctet->setInputEos(pvtOctet, pasynUser,
+                deveos, deveoslen) == asynSuccess)
+            {
+#ifndef NO_TEMPORARY
+                if (ioAction != AsyncRead)
+                {
+                    debug("AsynDriverInterface::readHandler(%s) "
+                        "input EOS set to %s\n",
+                        clientName(),
+                        StreamBuffer(deveos, deveoslen).expand()());
+                }
 #endif
-            break;
-        }
-        deveos++; deveoslen--;
-        if (!deveoslen)
-        {
-            error("%s: warning: pasynOctet->setInputEos() failed: %s\n",
-                clientName(), pasynUser->errorMessage);
-        }
-    } while (deveoslen);
+                break;
+            }
+            deveos++; deveoslen--;
+            if (!deveoslen)
+            {
+                error("%s: warning: pasynOctet->setInputEos() failed: %s\n",
+                    clientName(), pasynUser->errorMessage);
+            }
+        } while (deveoslen);
+    }

-    int bytesToRead = peeksize;
+    long bytesToRead = peeksize;
    long buffersize;

    if (expectedLength > 0)
@ -789,6 +944,7 @@ readHandler()
    int eomReason;
    asynStatus status;
    long readMore;
+    int connected;

    while (1)
    {
@ -796,16 +952,36 @@ readHandler()
        received = 0;
        eomReason = 0;
        
+        debug("AsynDriverInterface::readHandler(%s): ioAction=%s "
+            "read(..., bytesToRead=%ld, ...) "
+            "[timeout=%g sec]\n",
+            clientName(), ioActionStr[ioAction],
+            bytesToRead, pasynUser->timeout);
        status = pasynOctet->read(pvtOctet, pasynUser,
            buffer, bytesToRead, &received, &eomReason);
-        if (ioAction == Read || status != asynTimeout)
+        debug("AsynDriverInterface::readHandler(%s): "
+            "read returned %s: ioAction=%s received=%ld, eomReason=%s, buffer=\"%s\"\n",
+            clientName(), asynStatusStr[status], ioActionStr[ioAction],
+            (long)received,eomReasonStr[eomReason&0x7],
+            StreamBuffer(buffer, received).expand()());
+
+        pasynManager->isConnected(pasynUser, &connected);
+        debug("AsynDriverInterface::readHandler(%s): "
+            "device is now %sconnected\n",
+            clientName(),connected?"":"dis");        
+        // asyn 4.16 sets reason to ASYN_EOM_END when device disconnects.
+        // What about earlier versions?
+        if (!connected) eomReason |= ASYN_EOM_END;
+        
+        if (status == asynTimeout &&
+            pasynUser->timeout == 0.0 &&
+            received > 0)
        {
-            debug("AsynDriverInterface::readHandler(%s): "
-                "read(..., bytesToRead=%d, ...) [timeout=%f seconds] = %s\n",
-                clientName(), bytesToRead, pasynUser->timeout,
-                asynStatusStr[status]);
+            // Jens Eden (PTB) pointed out that polling asynInterposeEos
+            // with timeout = 0.0 returns asynTimeout even when bytes
+            // have been received, but not yet the terminator.               
+            status = asynSuccess;
        }
-        // pasynOctet->read() has already cut off terminator.

        switch (status)
        {
@ -814,24 +990,25 @@ readHandler()
                {
 #ifndef NO_TEMPORARY
                    debug("AsynDriverInterface::readHandler(%s): "
-                        "AsyncRead poll: received %d of %d bytes \"%s\" "
+                        "AsyncRead poll: received %ld of %ld bytes \"%s\" "
                        "eomReason=%s [data ignored]\n",
-                        clientName(), (int)received, bytesToRead,
-                        StreamBuffer(buffer, (int)received).expand()(),
+                        clientName(), (long)received, bytesToRead,
+                        StreamBuffer(buffer, received).expand()(),
                        eomReasonStr[eomReason&0x7]);
 #endif
                    // ignore what we got from here.
                    // input was already handeled by asynReadHandler()
+
                    // read until no more input is available
                    readMore = -1;
                    break;
                }
 #ifndef NO_TEMPORARY
                debug("AsynDriverInterface::readHandler(%s): "
-                        "received %d of %d bytes \"%s\" "
+                        "received %ld of %ld bytes \"%s\" "
                        "eomReason=%s\n",
-                    clientName(), (int)received, bytesToRead,
-                    StreamBuffer(buffer, (int)received).expand()(),
+                    clientName(), (long)received, bytesToRead,
+                    StreamBuffer(buffer, received).expand()(),
                    eomReasonStr[eomReason&0x7]);
 #endif
                // asynOctet->read() cuts off terminator, but:
@ -871,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:
@ -887,9 +1067,10 @@ readHandler()
                // read timeout
 #ifndef NO_TEMPORARY
                debug("AsynDriverInterface::readHandler(%s): "
-                        "ioAction=%s, timeout after %d of %d bytes \"%s\"\n",
-                    clientName(), ioActionStr[ioAction],
-                    (int)received, bytesToRead,
+                        "ioAction=%s, timeout [%g sec] "
+                        "after %ld of %ld bytes \"%s\"\n",
+                    clientName(), ioActionStr[ioAction], pasynUser->timeout,
+                    (long)received, bytesToRead,
                    StreamBuffer(buffer, received).expand()());
 #endif
                if (ioAction == AsyncRead || ioAction == AsyncReadMore)
@ -913,15 +1094,32 @@ 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. Asyn driver says: %s\n",
+                    clientName(), pasynUser->errorMessage);
+                readCallback(StreamIoFault);
+                return;
+            case asynDisabled:
+                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. Asyn driver says: %s\n",
+                    clientName(), pasynUser->errorMessage);
+                readCallback(StreamIoFault);
+                return;
        }
        if (!readMore) break;
        if (readMore > 0)
@ -933,7 +1131,7 @@ readHandler()
            bytesToRead = inputBuffer.capacity();
        }
        debug("AsynDriverInterface::readHandler(%s) "
-            "readMore=%ld bytesToRead=%d\n",
+            "readMore=%ld bytesToRead=%ld\n",
            clientName(), readMore, bytesToRead);
        pasynUser->timeout = readTimeout;
        waitForReply = false;
@ -965,7 +1163,7 @@ void intrCallbackOctet(void* /*pvt*/, asynUser *pasynUser,

 // get asynchronous input
 void AsynDriverInterface::
-asynReadHandler(const char *buffer, int received, int eomReason)
+asynReadHandler(const char *buffer, size_t received, int eomReason)
 {
    // Due to multithreading, timerExpired() might come at any time.
    // It queues the next poll request which is now useless because
@ -981,9 +1179,9 @@ asynReadHandler(const char *buffer, int received, int eomReason)
    
 #ifndef NO_TEMPORARY
    debug("AsynDriverInterface::asynReadHandler(%s, buffer=\"%s\", "
-            "received=%d eomReason=%s) ioAction=%s\n",
+            "received=%ld eomReason=%s) ioAction=%s\n",
        clientName(), StreamBuffer(buffer, received).expand()(),
-        received, eomReasonStr[eomReason&0x7], ioActionStr[ioAction]);
+        (long)received, eomReasonStr[eomReason&0x7], ioActionStr[ioAction]);
 #endif

    ioAction = None;
@ -1039,7 +1237,7 @@ asynReadHandler(const char *buffer, int received, int eomReason)
            // set by stream, cut it off now.
            status = pasynOctet->getInputEos(pvtOctet,
                pasynUser, deveos, sizeof(deveos)-1, &deveoslen);
-            if (status == asynSuccess && received >= deveoslen)
+            if (status == asynSuccess && (long)received >= (long)deveoslen)
            {
                int i;
                for (i = 1; i <= deveoslen; i++)
@ -1081,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;
 }

@ -1130,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;
@ -1148,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
@ -1158,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()
            }
@ -1171,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)
 {
@ -1186,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::
@ -1284,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,17 +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;
-    while (isspace(input[length])) length++; // skip whitespaces
-    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/CONFIG_STREAM
+++ b/src/CONFIG_STREAM
@ -13,7 +13,7 @@ RECORDS += longout longin
 RECORDS += stringout stringin
 RECORDS += waveform
 RECORDS += calcout
-#RECORDS += aai aao
+RECORDS += aai aao

 # Do you have synApps and want support for scalcout?
 # Then define CALC or SYNAPPS in your RELEASE file
@ -22,6 +22,7 @@ RECORDS += calcout
 # you have to build the 'sscan' and 'genSub'
 # modules before building 'calc'.
 # See doc/scalcout.html for a required fix in scalcout.
+
 SYNAPPS_RECORDS += scalcout

 # You may add more bus interfaces
@ -29,7 +30,9 @@ SYNAPPS_RECORDS += scalcout
 # $(BUS)Interface.cc
 # asynDriver interface is added automatically
 # if ASYN is defined in your RELEASE file.
-# BUSSES += Debug
+
+BUSSES += Debug
+BUSSES += Dummy

 # You may add more format converters
 # This requires the naming convention
@ -42,6 +45,7 @@ FORMATS += RawFloat
 FORMATS += Binary
 FORMATS += Checksum
 FORMATS += MantissaExponent
+FORMATS += Timestamp

 # Want Perl regular expression matching?
 # If PCRE is installed at the same location for all
@ -66,10 +70,6 @@ endif
 # by "static IoccrfReg iocshReg;"
 # LOADABLE_MODULE = YES

-# Want to add some memory tracing
-# to find memory leaks?
-# USE_MEMGUARD = YES
-
 # Sources of Stream Kernel
 # Do not modify

--- a/src/ChecksumConverter.cc
+++ b/src/ChecksumConverter.cc
@ -27,12 +27,9 @@
 #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 +38,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 +47,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 +93,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 +134,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,11 +258,11 @@ 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)
-    const static ulong table[] = {
+    const static unsigned int table[] = {
        0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
        0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005,
        0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
@ -335,12 +332,12 @@ 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)
    // reflected
-    const static ulong table[] = {
+    const static unsigned int table[] = {
        0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
        0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
        0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
@ -410,13 +407,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 +428,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 +449,8 @@ struct checksum
 {
    const char* name;
    checksumFunc func;
-    ulong init;
-    ulong xorout;
+    unsigned int init;
+    unsigned int xorout;
    signed char bytes;
 };

@ -465,20 +462,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,8 +469,12 @@ 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
+    {"crc16c",  crc_0x1021,       0x0000,     0x0000,     2}, // 0x31C3
+    {"xmodem",  crc_0x1021,       0x0000,     0x0000,     2}, // 0x31C3
    {"crc32",   crc_0x04C11DB7,   0xFFFFFFFF, 0xFFFFFFFF, 4}, // 0xFC891918
    {"crc32r",  crc_0x04C11DB7_r, 0xFFFFFFFF, 0xFFFFFFFF, 4}, // 0xCBF43926
    {"jamcrc",  crc_0x04C11DB7_r, 0xFFFFFFFF, 0x00000000, 4}, // 0x340BC6D9
@ -495,7 +482,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
 {
@ -514,44 +501,94 @@ 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;
    unsigned outchar;
    
+    if (format.flags & sign_flag) // decimal
+    {
+        // get number of decimal digits from number of bytes: ceil(xbytes*2.5)
+        i = (checksumMap[fnum].bytes+1)*25/10-2;
+        output.print("%0*d", i, sum);
+        debug("ChecksumConverter %s: decimal appending %0*d\n",
+            checksumMap[fnum].name, i, sum);
+    }   
+    else
    if (format.flags & alt_flag) // lsb first (little endian)
    {
        for (i = 0; i < checksumMap[fnum].bytes; i++)
@ -560,7 +597,11 @@ printPseudo(const StreamFormat& format, StreamBuffer& output)
            debug("ChecksumConverter %s: little endian appending 0x%X\n",
                checksumMap[fnum].name, outchar);
            if (format.flags & zero_flag) // ASCII
-                output.printf("%02X", outchar);
+                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;
@ -575,7 +616,11 @@ printPseudo(const StreamFormat& format, StreamBuffer& output)
            debug("ChecksumConverter %s: big endian appending 0x%X\n",
                checksumMap[fnum].name, outchar);
            if (format.flags & zero_flag) // ASCII
-                output.printf("%02X", outchar);
+                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;
@ -587,39 +632,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
+    {
+        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)
+        {
+            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
            {
@ -627,8 +721,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;
            }
        }
@ -641,21 +735,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/DummyInterface.cc
+++ b/src/DummyInterface.cc
@ -0,0 +1,76 @@
+/***************************************************************
+* StreamDevice Support                                         *
+*                                                              *
+* (C) 2011 Dirk Zimoch (dirk.zimoch@psi.ch)                    *
+*                                                              *
+* This is the interface to a "dummy" bus driver for            *
+* StreamDevice. It does not provide any I/O functionality.     *
+*                                                              *
+* If you do any changes in this file, you are not allowed to   *
+* redistribute it any more. If there is a bug or a missing     *
+* feature, send me an email and/or your patch. If I accept     *
+* your changes, they will go to the next release.              *
+*                                                              *
+* DISCLAIMER: If this software breaks something or harms       *
+* someone, it's your problem.                                  *
+*                                                              *
+***************************************************************/
+
+#include "StreamBusInterface.h"
+#include "StreamError.h"
+#include "StreamBuffer.h"
+
+class DummyInterface : StreamBusInterface
+{
+    DummyInterface(Client* client);
+
+    // StreamBusInterface methods
+    bool lockRequest(unsigned long lockTimeout_ms);
+    bool unlock();
+
+protected:
+    ~DummyInterface();
+
+public:
+    // static creator method
+    static StreamBusInterface* getBusInterface(Client* client,
+        const char* busname, int addr, const char* param);
+};
+
+RegisterStreamBusInterface(DummyInterface);
+
+DummyInterface::
+DummyInterface(Client* client) : StreamBusInterface(client)
+{
+    // Nothing to do
+}
+
+DummyInterface::
+~DummyInterface()
+{
+    // Nothing to do
+}
+
+StreamBusInterface* DummyInterface::
+getBusInterface(Client* client,
+    const char* busname, int addr, const char*)
+{
+    if (strcmp(busname, "dummy") == 0)
+    {
+        DummyInterface* interface = new DummyInterface(client);
+        return interface;
+    }
+    return NULL;
+}
+
+bool DummyInterface::
+lockRequest(unsigned long lockTimeout_ms)
+{
+    return false;
+}
+
+bool DummyInterface::
+unlock()
+{
+    return false;
+}
--- 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
@ -65,49 +65,35 @@ ifdef PCRE
 LIB_LIBS += pcre
 else
 ifneq ($(words $(PCRE_LIB) $(PCRE_INCLUDE)),0)
-LIB_SYS_LIBS += pcre
+LIB_SYS_LIBS_DEFAULT += pcre
+LIB_SYS_LIBS_WIN32 += $(PCRE_LIB)\\pcre
 SHRLIB_DEPLIB_DIRS += $(PCRE_LIB)
 endif
 endif

 LIB_LIBS += $(EPICS_BASE_IOC_LIBS)

-ifeq ($(USE_MEMGUARD),YES)
-# memguard looks for memory leaks (gcc only)
-CPPFLAGS += -include ../memguard.h
-LIB_SRCS += memguard.cc
-endif
-
 INC += devStream.h

 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
-	@for i in $(BUSSES); \
-	do echo "extern void* ref_$${i}Interface;"; \
-           echo "void* p$$i = ref_$${i}Interface;"; \
-	done > $@
-	@for i in $(FORMATS); \
-	do echo "extern void* ref_$${i}Converter;"; \
-           echo "void* p$$i = ref_$${i}Converter;"; \
-	done >> $@
+	$(PERL) ../makeref.pl Interface $(BUSSES) > $@
+	$(PERL) ../makeref.pl Converter $(FORMATS) >> $@

 # create stream.dbd from all RECORDS
 $(COMMON_DIR)/$(LIBRARY_DEFAULT).dbd: ../CONFIG_STREAM
-	@for r in $(RECORDS); \
-	do echo "device($$r,INST_IO,dev$${r}Stream,\"stream\")"; \
-	done > $@
-	@echo "driver(stream)" >> $@
-	@echo "variable(streamDebug, int)" >> $@
-	@echo "registrar(streamRegistrar)" >> $@
+	$(PERL) ../makedbd.pl $(RECORDS) > $@
+
+$(LIBRARY_DEFAULT).dbd$(DEP): ../CONFIG_STREAM
+	echo $(LIBRARY_DEFAULT).dbd: $< > $@

 endif
--- a/src/Makefile.Host
+++ b/src/Makefile.Host
@ -39,7 +39,4 @@ include $(TOP)/config/RULES.Host

 # create stream.dbd from all RECORDS
 stream.dbd: ../CONFIG_STREAM
-	@for r in $(RECORDS_3_13); \
-	do echo "device($$r,INST_IO,dev$${r}Stream,\"stream\")"; \
-	done > $@
-	@echo "driver(stream)" >> $@
+	$(PERL) ../makedbd.pl -3.13 $(RECORDS_3_13) > $@
--- a/src/MantissaExponentConverter.cc
+++ b/src/MantissaExponentConverter.cc
@ -44,8 +44,8 @@ class MantissaExponentConverter : public StreamFormatConverter
 };

 int MantissaExponentConverter::
-parse(const StreamFormat& fmt, StreamBuffer& info,
-    const char*& source, bool scanFormat)
+parse(const StreamFormat&, StreamBuffer&,
+    const char*&, bool)
 {
    return double_format;
 }
@ -75,7 +75,7 @@ printDouble(const StreamFormat& fmt, StreamBuffer& output, double value)
    int prec = fmt.prec;
    
    if (prec < 1) prec = 6;
-    buf.printf("%.*e", prec-1, fabs(value)/pow(10.0, prec-1));
+    buf.print("%.*e", prec-1, fabs(value)/pow(10.0, prec-1));
    buf.remove(1,1);
    buf.remove(buf.find('e'),1);
    
--- 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/RawFloatConverter.cc
+++ b/src/RawFloatConverter.cc
@ -40,10 +40,10 @@ parse(const StreamFormat& format, StreamBuffer&,
    if (!endian) {
        union {long l; char c [sizeof(long)];} u;
        u.l=1;
-        if (u.c[0]) { endian = 1234;} // little endian 
-        else if (u.c[sizeof(long)-1]) { endian = 4321;} // big endian 
+        if (u.c[0]) { endian = 1234;} // little endian
+        else if (u.c[sizeof(long)-1]) { endian = 4321;} // big endian
        else {
-            error ("Cannot find out byte order for %%R format.\n"); 
+            error ("Cannot find out byte order for %%R format.\n");
            return false;
        }
    }
@ -64,16 +64,16 @@ printDouble(const StreamFormat& format, StreamBuffer& output, double value)
        float  fval;
        char   bytes[8];
    } buffer;
-    
+
    nbOfBytes = format.width;
    if (nbOfBytes == 0)
        nbOfBytes = 4;

    if (nbOfBytes == 4)
-        buffer.fval = value;
-    else 
+        buffer.fval = (float)value;
+    else
        buffer.dval = value;
-    
+
    if (!(format.flags & alt_flag) ^ (endian == 4321))
    {
        // swap if byte orders differ
@ -86,7 +86,7 @@ printDouble(const StreamFormat& format, StreamBuffer& output, double value)
    	{
            output.append(buffer.bytes[n]);
    	}
-    } 
+    }
    return true;
 }

@ -101,7 +101,7 @@ scanDouble(const StreamFormat& format, const char* input, double& value)
        float  fval;
        char   bytes[8];
    } buffer;
-    
+
    nbOfBytes = format.width;
    if (nbOfBytes == 0)
        nbOfBytes = 4;
@ -110,7 +110,7 @@ scanDouble(const StreamFormat& format, const char* input, double& value)
    {
        return(nbOfBytes); // just skip input
    }
-    
+
    if (!(format.flags & alt_flag) ^ (endian == 4321))
    {
        // swap if byte orders differ
@ -127,7 +127,7 @@ scanDouble(const StreamFormat& format, const char* input, double& value)

    if (nbOfBytes == 4)
        value = buffer.fval;
-    else 
+    else
        value = buffer.dval;

    return nbOfBytes;
--- a/src/RegexpConverter.cc
+++ b/src/RegexpConverter.cc
@ -70,7 +70,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
        }
        if (*source == esc) {
            source++;
-            pattern.printf("\\x%02x", *source++ & 0xFF);
+            pattern.print("\\x%02x", *source++ & 0xFF);
            continue;
        }
        pattern.append(*source++);
@ -110,7 +110,7 @@ scanString(const StreamFormat& fmt, const char* input,
    len = ovector[subexpr*2+1] - ovector[subexpr*2];
    if (len >= maxlen) {
        if (!(fmt.flags & sign_flag)) {
-            debug("Matching string \"%s\" too long (%d>%d bytes)\n",
+            error("Regexp: Matching string \"%s\" too long (%d>%d bytes). You may want to try the + flag: \"%%+/.../\"\n",
                StreamBuffer(input+ovector[subexpr*2], len).expand()(),
                (int)len, (int)maxlen-1);
            return -1;
--- 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);
@ -46,7 +48,7 @@ init(const void* s, long minsize)
    else
    {
        // clear local buffer
-        memset(buffer+minsize, 0, cap-minsize);
+        memset(buffer, 0, cap);
    }
    if (s) {
        len = minsize;
@ -54,12 +56,19 @@ init(const void* s, long minsize)
    }
 }

+// How the buffer looks like:
+// |----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)
    {
@ -102,7 +111,7 @@ grow(long minsize)
    memset(newbuffer+len, 0, newcap-len);
    if (buffer != local)
    {
-        delete buffer;
+        delete [] buffer;
    }
    buffer = newbuffer;
    cap = newcap;
@ -110,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
@ -127,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)
    {
@ -140,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++)
@ -154,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)
    {
@ -180,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;
@ -198,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);
@ -212,7 +221,7 @@ replace(long remstart, long remlen, const void* ins, long inslen)
        memset(newbuffer+newlen, 0, newcap-newlen);
        if (buffer != local)
        {
-            delete buffer;
+            delete [] buffer;
        }
        buffer = newbuffer;
        cap = newcap;
@ -241,16 +250,16 @@ replace(long remstart, long remlen, const void* ins, long inslen)
 }

 StreamBuffer& StreamBuffer::
-printf(const char* fmt, ...)
+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;
@ -260,27 +269,36 @@ printf(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;
-        if (start < 0) start = 0;
    }
-    end = length >= 0 ? start+length : len;
+    if (length < 0)
+    {
+        start += length;
+        length = -length;
+    }
+    if (start < 0)
+    {
+        length += start;
+        start = 0;
+    }
+    end = start+length;
    if (end > len) end = len;
    StreamBuffer result((end-start)*2);
    start += offs;
    end += offs;
-    long i;
+    size_t i;
    char c;
    for (i = start; i < end; i++)
    {
        c = buffer[i];
        if ((c & 0x7f) < 0x20 || (c & 0x7f) == 0x7f)
        {
-            result.printf("<%02x>", c & 0xff);
+            result.print("<%02x>", c & 0xff);
        }
        else
        {
@ -295,18 +313,18 @@ dump() const
 {
    StreamBuffer result(256+cap*5);
    result.append("\033[0m");
-    long i;
-    result.printf("%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");
        if ((buffer[i] & 0x7f) < 0x20 || (buffer[i] & 0x7f) == 0x7f)
        {
            if (i < offs || i >= offs+len)
-            result.printf(
+            result.print(
                "<%02x>", buffer[i] & 0xff);
            else
-            result.printf(
+            result.print(
                "\033[34m<%02x>\033[37m", buffer[i] & 0xff);
        }
        else
--- a/src/StreamBuffer.h
+++ b/src/StreamBuffer.h
@ -21,63 +21,71 @@
 #define StreamBuffer_h

 #include <string.h>
-#include <stdio.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 grow(long);
-    void init(const void*, long);
+    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(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
    //   the StreamBuffer is modified.
+    // * End of StreamBuffer always contains 0x00 bytes
+    // * Deleting from start and clearing is fast

    StreamBuffer()
        {init(NULL, 0);}

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

-    StreamBuffer(const char*s)
+    StreamBuffer(const char* s)
        {init(s, s?strlen(s):0);}

    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
-        {buffer[offs+len]=0; return buffer+offs+(index<0?index+len:index);}
+    const char* operator()(ssize_t index=0) const
+        {return buffer+offs+(index<0?index+len:index);}

-    char* operator()(long index=0)
-        {buffer[offs+len]=0; return buffer+offs+(index<0?index+len:index);}
+    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?
@ -85,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
@ -102,23 +110,38 @@ public:

    // reserve: reserve size bytes of memory and return
    // pointer to that memory (for copying something to it)
-    char* reserve(long size)
-        {grow(size); char* p=buffer+len; len+=size; return p;}
+    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, long count=1)
-        {check(count); while(count-->0) buffer[offs+len++]=c; return *this;}
+    StreamBuffer& append(char c)
+        {check(1); buffer[offs+len++]=c; return *this;}

-    StreamBuffer& append(const void* s, long size);
+    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, ssize_t size);

    StreamBuffer& append(const char* s)
        {return append(s, s?strlen(s):0);}

    StreamBuffer& append(const StreamBuffer& s)
        {return append(s.buffer+s.offs, s.len);}
+        
+    // operator += alias for append
+    StreamBuffer& operator+=(char c)
+        {return append(c);}
+
+    StreamBuffer& operator+=(const char* s)
+        {return append(s);}
+
+    StreamBuffer& operator+=(const StreamBuffer& s)
+        {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)
@ -127,7 +150,7 @@ public:
    StreamBuffer& set(const StreamBuffer& s)
        {clear(); return append(s.buffer+s.offs, s.len);}

-    // operator =: alias for set
+    // operator = alias for set
    StreamBuffer& operator=(const char* s)
        {return set(s);}

@ -136,73 +159,86 @@ 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);}

-    StreamBuffer& remove(long length)
+    // remove from start: no memset, no function call, fast!
+    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& printf(const char* fmt, ...)
+    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);}

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

-    // equals: returns true if first string is equal (empty string match)
-    bool equals(const char* s) const
+    // startswith: returns true if first string is equal (empty string matches)
+    bool startswith(const char* s) const
        {return len ? strcmp(buffer+offs, s) == 0 : !s || !*s;}

 // 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=0, long length=-1) const;
+    StreamBuffer expand(ssize_t start, ssize_t length) const;
+    
+    StreamBuffer expand(ssize_t start=0) const
+        {return expand(start, len);}

 // dump: debug function, like expand but also show the 'hidden' memory
 // before and after the real data. Uses colours.
    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",
@ -39,7 +41,6 @@ static char* printCommands(StreamBuffer& buffer, const char* c)
 {
    unsigned long timeout;
    unsigned long eventnumber;
-    unsigned short cmdlen;
    while (1)
    {
        switch(*c++)
@ -58,22 +59,21 @@ static char* printCommands(StreamBuffer& buffer, const char* c)
                break;
            case wait_cmd:
                timeout = extract<unsigned long>(c);
-                buffer.printf("    wait %ld;\n # ms", timeout);
+                buffer.print("    wait %ld; # ms\n", timeout);
                break;
            case event_cmd:
                eventnumber = extract<unsigned long>(c);
                timeout = extract<unsigned long>(c);
-                buffer.printf("    event(%ld) %ld; # ms\n", eventnumber, timeout);
+                buffer.print("    event(%ld) %ld; # ms\n", eventnumber, timeout);
                break;
            case exec_cmd:
                buffer.append("    exec \"");
-                cmdlen = extract<unsigned short>(c);
                c = StreamProtocolParser::printString(buffer, c);
                buffer.append("\";\n");
                break;
            case connect_cmd:
                timeout = extract<unsigned long>(c);
-                buffer.printf("    connect %ld; # ms\n", timeout);
+                buffer.print("    connect %ld; # ms\n", timeout);
                break;
            case disconnect_cmd:
                buffer.append("    disconnect;\n");
@ -120,7 +120,6 @@ printProtocol()
    if (onMismatch)
        printf("  @Mismatch {\n%s  }\n",
        printCommands(buffer.clear(), onMismatch()));
-    debug("StreamCore::printProtocol: commands=%s\n", commands.expand()());
    printf("\n%s}\n",
        printCommands(buffer.clear(), commands()));
 }
@ -166,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;
    }
@ -325,7 +324,7 @@ compileCommand(StreamProtocolParser::Protocol* protocol,
    {
        if (!busSupportsEvent())
        {
-            protocol->errorMsg(getLineNumber(command),
+            error(getLineNumber(command), protocol->filename(),
                    "Events not supported by businterface.\n");
            return false;
        }
@ -339,11 +338,12 @@ compileCommand(StreamProtocolParser::Protocol* protocol,
            }
            if (*args != ')')
            {
-                protocol->errorMsg(getLineNumber(command),
+                error(getLineNumber(command), protocol->filename(),
                    "Expect ')' instead of: '%s'\n", args);
                return false;
            }
            args++;
+            while (isspace(*args)) args++;
        }
        buffer.append(&eventmask, sizeof(eventmask));
        if (*args)
@ -383,7 +383,7 @@ compileCommand(StreamProtocolParser::Protocol* protocol,
        return true;
    }
    
-    protocol->errorMsg(getLineNumber(command),
+    error(getLineNumber(command), protocol->filename(),
        "Unknown command name '%s'\n", command);
    return false;
 }
@ -504,6 +504,7 @@ finishProtocol(ProtocolResult status)
                break;
            default:
                // get rid of all the rubbish whe might have collected
+                unparsedInput = false;
                inputBuffer.clear();
                handler = NULL;
        }
@ -590,9 +591,9 @@ evalCommand()
 bool StreamCore::
 evalOut()
 {
-    inputBuffer.clear(); // flush all unread input
+    // flush all unread input
    unparsedInput = false;
-    outputLine.clear();
+    inputBuffer.clear();
    if (!formatOutput())
    {
        finishProtocol(FormatError);
@ -634,13 +635,15 @@ formatOutput()
    const char* fieldName = NULL;
    const char* formatstring;
    int formatstringlen;
+    
+    outputLine.clear();
    while ((command = *commandIndex++) != StreamProtocolParser::eos)
    {
        switch (command)
        {
            case StreamProtocolParser::format_field:
            {
-                debug("StreamCore::formatOutput(%s): StreamProtocolParser::format_field\n",
+                debug("StreamCore::formatOutput(%s): StreamProtocolParser::redirect_format\n",
                    name());
                // code layout:
                // field <eos> addrlen AddressStructure formatstring <eos> StreamFormat [info]
@ -649,9 +652,12 @@ formatOutput()
                unsigned short addrlen = extract<unsigned short>(commandIndex);
                fieldAddress.set(commandIndex, addrlen);
                commandIndex += addrlen;
+                goto normal_format;
            }
            case StreamProtocolParser::format:
            {
+                fieldAddress.clear();
+normal_format:
                // code layout:
                // formatstring <eos> StreamFormat [info]
                formatstring = commandIndex;
@ -663,6 +669,7 @@ formatOutput()
                }
                formatstringlen = commandIndex-formatstring;
                commandIndex++;
+                
                StreamFormat fmt = extract<StreamFormat>(commandIndex);
                fmt.info = commandIndex; // point to info string
                commandIndex += fmt.infolen;
@ -670,6 +677,7 @@ formatOutput()
                debug("StreamCore::formatOutput(%s): format = %%%s\n",
                    name(), StreamBuffer(formatstring, formatstringlen).expand()());
 #endif
+
                if (fmt.type == pseudo_format)
                {
                    if (!StreamFormatConverter::find(fmt.conv)->
@ -685,7 +693,7 @@ formatOutput()
                if (!formatValue(fmt, fieldAddress ? fieldAddress() : NULL))
                {
                    StreamBuffer formatstr(formatstring, formatstringlen);
-                    if (fieldName)
+                    if (fieldAddress)
                        error("%s: Cannot format field '%s' with '%%%s'\n",
                            name(), fieldName, formatstr.expand()());
                    else
@ -693,10 +701,12 @@ formatOutput()
                            name(), formatstr.expand()());
                    return false;
                }
-                fieldAddress.clear();
-                fieldName = NULL;
                continue;
            }
+            case StreamProtocolParser::whitespace:
+                outputLine.append(' ');
+            case StreamProtocolParser::skip:
+                continue;
            case esc:
                // escaped literal byte
                command = *commandIndex++;
@ -718,19 +728,28 @@ printSeparator()
    }
    if (!separator) return;
    long i = 0;
-    if (separator[0] == ' ') i++; // ignore leading space
    for (; i < separator.length(); i++)
    {
-        if (separator[i] == StreamProtocolParser::skip) continue; // wildcard
-        if (separator[i] == esc) i++;       // escaped literal byte
-        outputLine.append(separator[i]);
+        switch (separator[i])
+        {
+            case StreamProtocolParser::whitespace:
+                outputLine.append(' '); // print single space
+            case StreamProtocolParser::skip:
+                continue;
+            case esc:
+                // escaped literal byte
+                i++;
+            default:
+                // literal byte
+                outputLine.append(separator[i]);
+        }
    }
 }

 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);
@ -744,6 +763,8 @@ printValue(const StreamFormat& fmt, long value)
            name(), value);
        return false;
    }
+    debug("StreamCore::printValue %s %%%c long %ld (%lx): \"%s\"\n",
+        name(), fmt.conv, value, value, outputLine.expand()());
    return true;
 }

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

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

@ -793,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",
@ -802,12 +827,28 @@ lockCallback(StreamIoStatus status)
    }
    flags &= ~LockPending;
    flags |= BusOwner;
-    if (status != StreamIoSuccess)
+    switch (status)
    {
-        error("%s: Lock timeout\n",
-            name());
-        finishProtocol(LockTimeout);
-        return;
+        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;
    }
    flags |= WritePending;
    if (!busWriteRequest(outputLine(), outputLine.length(), writeTimeout))
@ -927,7 +968,6 @@ readCallback(StreamIoStatus status,
        return 0;
    }
 ////    flags &= ~AcceptInput;
-    unparsedInput = false;
    switch (status)
    {
        case StreamIoTimeout:
@ -957,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 ? "..." : "",
@ -966,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)
    {
@ -984,7 +1024,27 @@ readCallback(StreamIoStatus status,
    if (inTerminator)
    {
        // look for terminator
-        end = inputBuffer.find(inTerminator);
+        // performance issue for long inputs that come in chunks:
+        // do not parse old chunks again or performance decreases to O(n^2)
+        // but make sure to get all terminators in multi-line input
+
+        long start;
+        if (unparsedInput)
+        {
+            // multi-line input sets 'unparsedInput' and removes the line
+            // remaining unparsed lines are left at start of inputBuffer
+            start = 0;
+        }
+        else
+        {
+            // long line does not set 'unparsedInput' but keeps
+            // already parsed chunks in inputBuffer
+            // start parsing at beginning of new data
+            // but beware of split terminators
+            start = inputBuffer.length() - size - inTerminator.length();
+            if (start < 0) start = 0;
+        }
+        end = inputBuffer.find(inTerminator, start);
        if (end >= 0)
        {
            termlen = inTerminator.length();
@ -1041,6 +1101,7 @@ readCallback(StreamIoStatus status,
        {
            debug("StreamCore::readCallback(%s) async timeout: just restart\n",
                name());
+            unparsedInput = false;
            inputBuffer.clear();
            commandIndex = commandStart;
            evalIn();
@ -1065,6 +1126,10 @@ readCallback(StreamIoStatus status,
            name(), inputBuffer.expand()());
        unparsedInput = true;
    }
+    else
+    {
+        unparsedInput = false;
+    }
    if (!matches)
    {
        if (status == StreamIoTimeout)
@ -1107,7 +1172,8 @@ matchInput()
       is installed and starts with 'in' (then we reparse the input).
    */
    char command;
-    const char* formatstring;
+    const char* fieldName = NULL;
+    StreamBuffer formatstring;
    
    consumedInput = 0;
    
@ -1119,29 +1185,39 @@ matchInput()
            {
                // code layout:
                // field <StreamProtocolParser::eos> addrlen AddressStructure formatstring <StreamProtocolParser::eos> StreamFormat [info]
+                fieldName = commandIndex;
                commandIndex += strlen(commandIndex)+1;
                unsigned short addrlen = extract<unsigned short>(commandIndex);
                fieldAddress.set(commandIndex, addrlen);
                commandIndex += addrlen;
+                goto normal_format;
            }
            case StreamProtocolParser::format:
            {
+                fieldAddress.clear();
+normal_format:
                int consumed;
                // code layout:
                // formatstring <eos> StreamFormat [info]
-                formatstring = commandIndex;
-                while (*commandIndex++ != StreamProtocolParser::eos); // jump after <eos>
+                formatstring.clear();
+                commandIndex = StreamProtocolParser::printString(formatstring, commandIndex);
                
                StreamFormat fmt = extract<StreamFormat>(commandIndex);
-                fmt.info = commandIndex;
+                fmt.info = commandIndex; // point to info string
                commandIndex += fmt.infolen;
+#ifndef NO_TEMPORARY
+                debug("StreamCore::matchInput(%s): format = \"%%%s\"\n",
+                    name(), formatstring());
+#endif
+
                if (fmt.flags & skip_flag || fmt.type == pseudo_format)
                {
                    long ldummy;
                    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);
@ -1174,10 +1250,10 @@ matchInput()
                        {
                            if (!(flags & AsyncMode) && onMismatch[0] != in_cmd)
                            {
-                                error("%s: Input \"%s%s\" does not match format %%%s\n",
+                                error("%s: Input \"%s%s\" does not match format \"%%%s\"\n",
                                    name(), inputLine.expand(consumedInput, 20)(),
                                    inputLine.length()-consumedInput > 20 ? "..." : "",
-                                    formatstring);
+                                    formatstring());
                            }
                            return false;
                        }
@ -1185,30 +1261,81 @@ matchInput()
                    consumedInput += consumed;
                    break;
                }
+                if (fmt.flags & compare_flag)
+                {
+                    outputLine.clear();
+                    flags &= ~Separator;
+                    if (!formatValue(fmt, fieldAddress ? fieldAddress() : NULL))
+                    {
+                        if (fieldAddress)
+                            error("%s: Cannot format variable \"%s\" with \"%%%s\"\n",
+                                name(), fieldName, formatstring());
+                        else
+                            error("%s: Cannot format value with \"%%%s\"\n",
+                                name(), formatstring());
+                        return false;
+                    }
+#ifndef NO_TEMPORARY
+                    debug("StreamCore::matchInput(%s): compare \"%s\" with \"%s\"\n",
+                        name(), inputLine.expand(consumedInput,
+                            outputLine.length())(), outputLine.expand()()); 
+#endif
+                    if (inputLine.length() - consumedInput < outputLine.length())
+                    {
+                        if (!(flags & AsyncMode) && onMismatch[0] != in_cmd)
+                        {
+                            error("%s: Input \"%s%s\" too short."
+                                  " No match for format \"%%%s\" (\"%s\")\n",
+                                name(), 
+                                inputLine.length() > 20 ? "..." : "",
+                                inputLine.expand(-20)(),
+                                formatstring(),
+                                outputLine.expand()());
+                        }
+                        return false;
+                    }
+                    if (!outputLine.startswith(inputLine(consumedInput),outputLine.length()))
+                    {
+                        if (!(flags & AsyncMode) && onMismatch[0] != in_cmd)
+                        {
+                            error("%s: Input \"%s%s\" does not match format \"%%%s\" (\"%s\")\n",
+                                name(), inputLine.expand(consumedInput, 20)(),
+                                inputLine.length()-consumedInput > 20 ? "..." : "",
+                                formatstring(),
+                                outputLine.expand()());
+                        }
+                        return false;
+                    }
+                    consumedInput += outputLine.length();
+                    break;
+                }
                flags &= ~Separator;
                if (!matchValue(fmt, fieldAddress ? fieldAddress() : NULL))
                {
                    if (!(flags & AsyncMode) && onMismatch[0] != in_cmd)
                    {
                        if (flags & ScanTried)
-                            error("%s: Input \"%s%s\" does not match format %%%s\n",
+                            error("%s: Input \"%s%s\" does not match format \"%%%s\"\n",
                                name(), inputLine.expand(consumedInput, 20)(),
                                inputLine.length()-consumedInput > 20 ? "..." : "",
-                                formatstring);
+                                formatstring());
                        else
-                            error("%s: Can't scan value with format %%%s\n",
-                                name(), formatstring);
+                            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;
                }
                // matchValue() has already removed consumed bytes from inputBuffer
-                fieldAddress = NULL;
                break;
            }
            case StreamProtocolParser::skip:
                // ignore next input byte
                consumedInput++;
                break;
+            case StreamProtocolParser::whitespace:
+                // any number of whitespace (including 0)
+                while (isspace(inputLine[consumedInput])) consumedInput++;
+                break;
            case esc:
                // escaped literal byte
                command = *commandIndex++;
@ -1220,12 +1347,14 @@ matchInput()
                    while (commandIndex[i] >= ' ') i++;
                    if (!(flags & AsyncMode) && onMismatch[0] != in_cmd)
                    {
-                        error("%s: Input \"%s%s\" too short."
-                              " No match for \"%s\"\n",
+                        error("%s: Input \"%s%s\" too short.\n",
                            name(), 
                            inputLine.length() > 20 ? "..." : "",
-                            inputLine.expand(-20)(),
+                            inputLine.expand(-20)());
+#ifndef NO_TEMPORARY
+                        error("No match for \"%s\"\n",
                            StreamBuffer(commandIndex-1,i+1).expand()());
+#endif
                    }
                    return false;
                }
@ -1243,10 +1372,12 @@ matchInput()
                            consumedInput,
                            consumedInput==1 ? "" : "s");

+#ifndef NO_TEMPORARY
                        error("%s: got \"%s\" where \"%s\" was expected\n",
                            name(),
                            inputLine.expand(consumedInput, 20)(),
                            StreamBuffer(commandIndex-1,i+1).expand()());
+#endif
                    }
                    return false;
                }
@ -1282,43 +1413,52 @@ matchInput()
 bool StreamCore::
 matchSeparator()
 {
+    // called before value is read, first value has Separator flag cleared
+    // for second and next value set Separator flag
+
+    if (!separator) {
+        // empty separator matches
+        return true;
+    }
    if (!(flags & Separator))
    {
+        // before first element, don't expect separator yet
        flags |= Separator;
        return true;
    }
-    if (!separator) return true;
-    long i = 0;
-    if (separator[0] == ' ')
+    long i;
+    long j = consumedInput;
+    for (i = 0; i < separator.length(); i++)
    {
-        i++;
-        // skip leading whitespaces
-        while (isspace(inputLine[consumedInput++]));
+        switch (separator[i])
+        {
+            case StreamProtocolParser::skip:
+                j++;
+                continue;
+            case StreamProtocolParser::whitespace:
+                while (isspace(inputLine[j])) j++;
+                continue;
+            case esc:
+                i++;
+            default:
+                if (separator[i] != inputLine[j])
+                {
+                    // no match
+                    // don't complain here, just return false
+                    return false;
+                }
+            j++;
+        }
    }
-    for (; i < separator.length(); i++,consumedInput++)
-    {
-        if (!inputLine[consumedInput]) return false;
-        if (separator[i] == StreamProtocolParser::skip) continue; // wildcard
-        if (separator[i] == esc) i++;       // escaped literal byte
-        if (separator[i] != inputLine[consumedInput]) return false;
-    }
-    return true;
-}
-
-bool StreamCore::
-scanSeparator()
-{
-    // for compatibility only
-    // read and remove separator
-    if (!matchSeparator()) return false;
-    flags &= ~Separator;
+    // separator successfully read
+    consumedInput = j;
    return true;
 }

 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);
@ -1339,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);
@ -1360,7 +1501,7 @@ scanValue(const StreamFormat& fmt, double& value)
    long consumed = StreamFormatConverter::find(fmt.conv)->
        scanDouble(fmt, inputLine(consumedInput), value);
    debug("StreamCore::scanValue(%s, format=%%%c, double) input=\"%s\"\n",
-        name(), fmt.conv, inputLine.expand(consumedInput)());
+        name(), fmt.conv, inputLine.expand(consumedInput, 20)());
    if (consumed < 0)
    {
        if (fmt.flags & default_flag)
@ -1370,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);
@ -1402,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",
@ -1514,8 +1657,8 @@ timerCallback()
 bool StreamCore::
 evalExec()
 {
-    outputLine.clear();
    formatOutput();
+    debug ("StreamCore::evalExec: command = \"%s\"\n", outputLine.expand()());
    // release bus
    if (flags & BusOwner)
    {
@ -1611,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
@ -139,7 +139,6 @@ protected:
    long scanValue(const StreamFormat& format, double& value);
    long scanValue(const StreamFormat& format, char* value, long maxlen);
    long scanValue(const StreamFormat& format);
-    bool scanSeparator(); // disencouraged

    StreamBuffer protocolname;
    unsigned long lockTimeout;
@ -220,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
--- a/src/StreamError.cc
+++ b/src/StreamError.cc
@ -20,6 +20,7 @@
 #include "StreamError.h"
 #include <string.h>
 #include <time.h>
+#include <stdio.h>

 int streamDebug = 0;
 extern "C" {
@ -58,11 +59,19 @@ void StreamError(const char* fmt, ...)
 {
    va_list args;
    va_start(args, fmt);
-    StreamVError(fmt, args);
+    StreamVError(0, NULL, fmt, args);
    va_end(args);
 }

-void StreamVError(const char* fmt, va_list args)
+void StreamError(int line, const char* file, const char* fmt, ...)
+{
+    va_list args;
+    va_start(args, fmt);
+    StreamVError(line, file, fmt, args);
+    va_end(args);
+}
+
+void StreamVError(int line, const char* file, const char* fmt, va_list args)
 {
    char timestamp[40];
    StreamPrintTimestampFunction(timestamp, 40);
@ -79,6 +88,10 @@ void StreamVError(const char* fmt, va_list args)
 #endif
    fprintf(stderr, "\033[31;1m");
    fprintf(stderr, "%s ", timestamp);
+    if (file)
+    {
+        fprintf(stderr, "%s line %d: ", file, line);
+    }
    vfprintf(stderr, fmt, args);
    fprintf(stderr, "\033[0m");
 }
--- a/src/StreamError.h
+++ b/src/StreamError.h
@ -20,8 +20,8 @@
 #ifndef StreamError_h
 #define StreamError_h

-#include <stdio.h>
 #include <stdarg.h>
+#include <stddef.h>

 #ifndef __GNUC__
 #define __attribute__(x)
@ -30,11 +30,19 @@
 extern int streamDebug;
 extern void (*StreamPrintTimestampFunction)(char* buffer, int size);

+void StreamError(int line, const char* file, const char* fmt, ...)
+__attribute__ ((format(printf,3,4)));
+
+void StreamVError(int line, const char* file, const char* fmt, va_list args)
+__attribute__ ((format(printf,3,0)));
+
 void StreamError(const char* fmt, ...)
 __attribute__ ((format(printf,1,2)));

-void StreamVError(const char* fmt, va_list args)
-__attribute__ ((format(printf,1,0)));
+inline void StreamVError(const char* fmt, va_list args)
+{
+    StreamVError(0, NULL, fmt, args); 
+}

 class StreamDebugClass
 {
--- a/src/StreamFormat.h
+++ b/src/StreamFormat.h
@ -29,15 +29,18 @@ typedef enum {
    alt_flag     = 0x08,
    zero_flag    = 0x10,
    skip_flag    = 0x20,
-    default_flag = 0x40
+    default_flag = 0x40,
+    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[];
@ -46,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
@ -19,8 +19,10 @@
 *                                                              *
 ***************************************************************/

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

 StreamFormatConverter* StreamFormatConverter::
@ -31,6 +33,134 @@ StreamFormatConverter::
 {
 }

+int StreamFormatConverter::
+parseFormat(const char*& source, FormatType formatType, StreamFormat& streamFormat, StreamBuffer& infoString)
+{
+/*
+    source := [flags] [width] ['.' prec] conv [extra]
+    flags := '-' | '+' | ' ' | '#' | '0' | '*' | '?' | '=' | '!'
+    width := integer
+    prec :=  integer
+    conv := character
+    extra := string
+*/
+
+    // look for flags
+    streamFormat.flags = 0;
+    bool loop = true;
+    while (loop)
+    {
+        switch (*++source)
+        {
+            case '-':
+                streamFormat.flags |= left_flag;
+                break;
+            case '+':
+                streamFormat.flags |= sign_flag;
+                break;
+            case ' ':
+                streamFormat.flags |= space_flag;
+                break;
+            case '#':
+                streamFormat.flags |= alt_flag;
+                break;
+            case '0':
+                streamFormat.flags |= zero_flag;
+                break;
+            case '*':
+                if (formatType != ScanFormat)
+                {
+                    error("Use of skip modifier '*' "
+                          "only allowed in input formats\n");
+                    return false;
+                }
+                streamFormat.flags |= skip_flag;
+                break;
+            case '?':
+                if (formatType != ScanFormat)
+                {
+                    error("Use of default modifier '?' "
+                          "only allowed in input formats\n");
+                    return false;
+                }
+                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)
+                {
+                    error("Use of compare modifier '=' "
+                          "only allowed in input formats\n");
+                    return false;
+                }
+                streamFormat.flags |= compare_flag;
+                formatType = PrintFormat;
+                break;
+            default:
+                loop = false;
+        }
+    }
+    // look for width
+    unsigned long val;
+    char* p;
+    val = strtoul (source, &p, 10);
+    source = p;
+    if (val > 0xFFFF)
+    {
+        error("Field width %ld out of range\n", val);
+        return false;
+    }
+    streamFormat.width = (unsigned short)val;
+    // look for prec
+    streamFormat.prec = -1;
+    if (*source == '.')
+    {
+        source++;
+        val = strtoul(source, &p, 10);
+        if (p == source)
+        {
+            debug("source = %s\n", source);
+            error("Numeric precision field expected after '.'\n");
+            return false;
+        }
+        source = p;
+        if (val > 0x7FFF)
+        {
+            error("Precision %ld out of range\n", val);
+            return false;
+        }
+        streamFormat.prec = (short)val;
+    }
+    // look for converter
+    streamFormat.conv = *source++;
+    if (!streamFormat.conv || strchr("'\" (.0+-*?=", streamFormat.conv))
+    {
+        error("Missing converter character\n");
+        return false;
+    }
+    debug("StreamFormatConverter::parseFormat: converter='%c'\n",
+        streamFormat.conv);
+    StreamFormatConverter* converter;
+    converter = StreamFormatConverter::find(streamFormat.conv);
+    if (!converter)
+    {
+        error("No converter registered for format '%%%c'\n",
+            streamFormat.conv);
+        return false;
+    }
+    // parse format and get info string
+    return converter->parse(streamFormat, infoString,
+        source, formatType == ScanFormat);
+}
+
 void StreamFormatConverter::
 provides(const char* name, const char* provided)
 {
@ -112,11 +242,57 @@ static void copyFormatString(StreamBuffer& info, const char* source)
    const char* p = source - 1;
    while (*p != '%' && *p != ')') p--;
    info.append('%');
-    while (++p != source-1) if (*p != '?') info.append(*p);
+    while (++p != source-1) if (*p != '?' && *p != '=') info.append(*p);
 }

+// A word on sscanf
+// GNU's sscanf implementation sucks. It calls strlen on the buffer.
+// That leads to a time consumption proportional to the buffer size.
+// When reading huge arrays element-wise by repeatedly calling sscanf,
+// the performance drops to O(n^2).
+// The vxWorks implementation sucks, too. When all parsed values are skipped
+// with %*, it returns -1 instead of 0 even though it was successful.
+
 // Standard Long Converter for 'diouxX'

+static int prepareval(const StreamFormat& fmt, const char*& input, bool& neg)
+{
+    int length = 0;
+    neg = false;
+    while (isspace(*input)) { input++; length++; }
+    if (fmt.width)
+    {
+        // take local copy because strto* don't have width parameter
+        int width = fmt.width;
+        if (fmt.flags & space_flag)
+        {
+            // normally whitespace does not count to width
+            // but do so if space flag is present
+            width -= length;
+        }
+        strncpy((char*)fmt.info, input, width);
+        ((char*)fmt.info)[width] = 0;
+        input = fmt.info;
+    }
+    if (*input == '+')
+    {
+        goto skipsign;
+    }
+    if (*input == '-')
+    {
+        neg = true;
+skipsign:
+        input++;
+        length++;
+    }
+    if (isspace(*input))
+    {
+        // allow space after sign only if # flag is set
+        if (!(fmt.flags & alt_flag)) return -1;
+    }
+    return length;
+}
+
 class StdLongConverter : public StreamFormatConverter
 {
    int parse(const StreamFormat& fmt, StreamBuffer& output, const char*& value, bool scanFormat);
@ -128,46 +304,70 @@ int StdLongConverter::
 parse(const StreamFormat& fmt, StreamBuffer& info,
    const char*& source, bool scanFormat)
 {
-    if (scanFormat && (fmt.flags & alt_flag))
-    {
-        error("Use of modifier '#' not allowed with %%%c input conversion\n",
-            fmt.conv);
-        return false;
-    }
    if (scanFormat && fmt.prec >= 0)
    {
        error("Use of precision field '.%d' not allowed with %%%c input conversion\n",
            fmt.prec, fmt.conv);
        return false;
    }
-    copyFormatString(info, source);
-    info.append('l');
-    info.append(fmt.conv);
-    if (scanFormat) info.append("%n");
-    return long_format;
+    if (scanFormat)
+    {
+        if (fmt.width) info.reserve(fmt.width+1);
+    }
+    else
+    {
+        copyFormatString(info, source);
+        info.append('l');
+        info.append(fmt.conv);
+    }
+    if (fmt.conv == 'd' || fmt.conv == 'i') return signed_format;
+    return unsigned_format;
 }

 bool StdLongConverter::
 printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
 {
-    output.printf(fmt.info, 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;
 }

 int StdLongConverter::
 scanLong(const StreamFormat& fmt, const char* input, long& value)
 {
-    int length = -1;
-    if (fmt.flags & skip_flag)
+    char* end;
+    int length;
+    bool neg;
+    int base;
+    long v;
+
+    length = prepareval(fmt, input, neg);
+    if (length < 0) return -1;
+    switch (fmt.conv)
    {
-        /* can't use return value on vxWorks: sscanf with %* format
-           returns -1 at end of string whether value is found or not */
-        sscanf(input, fmt.info, &length);
-    }
-    else
-    {
-        if (sscanf(input, fmt.info, &value, &length) < 1) return -1;
+        case 'd':
+            base = 10;
+            break;
+        case 'o':
+        case 'x':
+        case 'X':
+            // 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;
+            base = 10;
+            break;
+        default:
+            base = 0;
    }
+    v = strtoul(input, &end, base);
+    if (end == input) return -1;
+    length += end-input;
+    value = neg ? -v : v;
    return length;
 }

@ -186,46 +386,44 @@ int StdDoubleConverter::
 parse(const StreamFormat& fmt, StreamBuffer& info,
    const char*& source, bool scanFormat)
 {
-    if (scanFormat && (fmt.flags & alt_flag))
-    {
-        error("Use of modifier '#' not allowed with %%%c input conversion\n",
-            fmt.conv);
-        return false;
-    }
    if (scanFormat && fmt.prec >= 0)
    {
        error("Use of precision field '.%d' not allowed with %%%c input conversion\n",
            fmt.prec, fmt.conv);
        return false;
    }
-    copyFormatString(info, source);
-    if (scanFormat) info.append('l');
-    info.append(fmt.conv);
-    if (scanFormat) info.append("%n");
+    if (scanFormat)
+    {
+        if (fmt.width) info.reserve(fmt.width+1);
+    }
+    else
+    {
+        copyFormatString(info, source);
+        info.append(fmt.conv);
+    }
    return double_format;
 }

 bool StdDoubleConverter::
 printDouble(const StreamFormat& fmt, StreamBuffer& output, double value)
 {
-    output.printf(fmt.info, value);
+    output.print(fmt.info, value);
    return true;
 }

 int StdDoubleConverter::
 scanDouble(const StreamFormat& fmt, const char* input, double& value)
 {
-    int length = -1;
-    if (fmt.flags & skip_flag)
-    {
-        /* can't use return value on vxWorks: sscanf with %* format
-           returns -1 at end of string whether value is found or not */
-        sscanf(input, fmt.info, &length);
-    }
-    else
-    {
-        if (sscanf(input, fmt.info, &value, &length) < 1) return -1;
-    }
+    char* end;
+    int length;
+    bool neg;
+
+    length = prepareval(fmt, input, neg);
+    if (length < 0) return -1;
+    value = strtod(input, &end);
+    if (neg) value = -value;
+    if (end == input) return -1;
+    length += end-input;
    return length;
 }

@ -244,11 +442,10 @@ int StdStringConverter::
 parse(const StreamFormat& fmt, StreamBuffer& info,
    const char*& source, bool scanFormat)
 {
-    if (fmt.flags & (sign_flag|space_flag|zero_flag|alt_flag))
+    if (fmt.flags & (sign_flag|zero_flag))
    {
-        error("Use of modifiers '+', ' ', '0', '#' "
-            "not allowed with %%%c conversion\n",
-            fmt.conv);
+        error("Use of modifiers '+', '0'"
+            "not allowed with %%s conversion\n");
        return false;
    }
    if (scanFormat && fmt.prec >= 0)
@ -266,7 +463,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
 bool StdStringConverter::
 printString(const StreamFormat& fmt, StreamBuffer& output, const char* value)
 {
-    output.printf(fmt.info, value);
+    output.print(fmt.info, value);
    return true;
 }

@ -274,40 +471,52 @@ int StdStringConverter::
 scanString(const StreamFormat& fmt, const char* input,
    char* value, size_t maxlen)
 {
-    int length = -1;
-    if (*input == '\0')
+    int length = 0;
+
+    int width = fmt.width;
+
+    if ((fmt.flags & skip_flag) || value == NULL) maxlen = 0;
+
+    // if user does not specify width assume "ininity" (-1)
+    if (width == 0)
    {
-        // match empty string
-        if (value) value[0] = '\0';
-        return 0;
+        if (fmt.conv == 'c') width = 1;
+        else width = -1;
    }
-    if (fmt.flags & skip_flag)
+
+    while (isspace(*input) && width)
    {
-        /* can't use return value on vxWorks: sscanf with %* format
-           returns -1 at end of string whether value is found or not */
-        sscanf(input, fmt.info, &length);
+        // normally leading whitespace does not count to width
+        // but do so if space flag is present
+        if (fmt.flags & space_flag)
+        {
+            if (maxlen > 1)
+            {
+                *value++ = *input;
+                maxlen--;
+            }
+            width--;
+        }
+        length++;
+        input++;
    }
-    else
+    while (*input && width)
    {
-        char tmpformat[10];
-        const char* f;
-        if (maxlen <= fmt.width || fmt.width == 0)
+        // normally whitespace ends string
+        // but don't end if # flag is present
+        if (!(fmt.flags & alt_flag) && isspace(*input)) break;
+        if (maxlen > 1)
        {
-            // assure not to read too much
-            sprintf(tmpformat, "%%%ld%c%%n", (long)maxlen-1, fmt.conv);
-            f = tmpformat;
+            *value++ = *input;
+            maxlen--;
        }
-        else
-        {
-            f = fmt.info;
-        }
-        if (sscanf(input, f, value, &length) < 1) return -1;
-        if (length < 0) return -1;
-        value[length] = '\0';
-#ifndef NO_TEMPORARY
-        debug("StdStringConverter::scanString: length=%d, value=%s\n",
-            length, StreamBuffer(value,length).expand()());
-#endif
+        length++;
+        width--;
+        input++;
+    }
+    if (maxlen > 0)
+    {
+        *value = '\0';
    }
    return length;
 }
@ -316,11 +525,11 @@ RegisterConverter (StdStringConverter, "s");

 // Standard Characters Converter for 'c'

-class StdCharsConverter : public StdStringConverter
+class StdCharsConverter : public StreamFormatConverter
 {
    virtual int parse(const StreamFormat&, StreamBuffer&, const char*&, bool);
    virtual bool printLong(const StreamFormat&, StreamBuffer&, long);
-    // scanString is inherited from %s format
+    virtual int scanString(const StreamFormat&, const char*, char*, size_t);
 };

 int StdCharsConverter::
@ -330,8 +539,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
    if (fmt.flags & (sign_flag|space_flag|zero_flag|alt_flag))
    {
        error("Use of modifiers '+', ' ', '0', '#' "
-            "not allowed with %%%c conversion\n",
-            fmt.conv);
+            "not allowed with %%c conversion\n");
        return false;
    }
    if (scanFormat && fmt.prec >= 0)
@ -347,16 +555,47 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
        info.append("%n");
        return string_format;
    }
-    return long_format;
+    return unsigned_format;
 }

 bool StdCharsConverter::
 printLong(const StreamFormat& fmt, StreamBuffer& output, long value)
 {
-    output.printf(fmt.info, value);
+    output.print(fmt.info, value);
    return true;
 }

+int StdCharsConverter::
+scanString(const StreamFormat& fmt, const char* input,
+    char* value, size_t maxlen)
+{
+    int length = 0;
+
+    int width = fmt.width;
+
+    if ((fmt.flags & skip_flag) || value == NULL) maxlen = 0;
+
+    // if user does not specify width assume 1
+    if (width == 0) width = 1;
+
+    while (*input && width)
+    {
+        if (maxlen > 1)
+        {
+            *value++ = *input;
+            maxlen--;
+        }
+        length++;
+        width--;
+        input++;
+    }
+    if (maxlen > 0)
+    {
+        *value = '\0';
+    }
+    return length;
+}
+
 RegisterConverter (StdCharsConverter, "c");

 // Standard Charset Converter for '['
@ -368,6 +607,17 @@ class StdCharsetConverter : public StreamFormatConverter
    // no print method, %[ is readonly
 };

+inline void markbit(StreamBuffer& info, bool notflag, char c)
+{
+    char &infobyte = info[c>>3];
+    char mask = 1<<(c&7);
+
+    if (notflag)
+        infobyte |= mask;
+    else
+        infobyte &= ~mask;
+}
+
 int StdCharsetConverter::
 parse(const StreamFormat& fmt, StreamBuffer& info,
    const char*& source, bool scanFormat)
@ -380,8 +630,7 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
    if (fmt.flags & (left_flag|sign_flag|space_flag|zero_flag|alt_flag))
    {
        error("Use of modifiers '-', '+', ' ', '0', '#'"
-            "not allowed with %%%c conversion\n",
-            fmt.conv);
+            "not allowed with %%[ conversion\n");
        return false;
    }
    if (scanFormat && fmt.prec >= 0)
@ -390,18 +639,46 @@ parse(const StreamFormat& fmt, StreamBuffer& info,
            fmt.prec, fmt.conv);
        return false;
    }
-    info.printf("%%%s%d[", fmt.flags & skip_flag ? "*" : "", fmt.width);
-    while (*source && *source != ']')
+
+    bool notflag = false;
+    char c = 0;
+
+    info.clear().reserve(32);
+    if (*source == '^')
    {
-        if (*source == esc) source++;
-        info.append(*source++);
+        notflag = true;
+        source++;
+    }
+    else
+    {
+        memset(info(1), 255, 32);
+    }
+    if (*source == ']')
+    {
+        markbit(info, notflag, *source++);
+    }
+    for (; *source && *source != ']'; source++)
+    {
+        if (*source == esc)
+        {
+            markbit(info, notflag, *++source);
+            continue;
+        }
+        if (*source == '-' && c && source[1] && source[1] != ']')
+        {
+            source++;
+            while (c < *source) markbit(info, notflag, c++);
+            while (c > *source) markbit(info, notflag, c--);
+        }
+        c = *source;
+        markbit(info, notflag, c);
    }
    if (!*source) {
        error("Missing ']' after %%[ format conversion\n");
        return false;
    }
    source++; // consume ']'
-    info.append("]%n");
+
    return string_format;
 }

@ -409,33 +686,29 @@ int StdCharsetConverter::
 scanString(const StreamFormat& fmt, const char* input,
    char* value, size_t maxlen)
 {
-    int length = -1;
-    if (fmt.flags & skip_flag)
+    int length = 0;
+    int width = fmt.width;
+
+    if ((fmt.flags & skip_flag) || value == NULL) maxlen = 0;
+
+    // if user does not specify width assume "ininity" (-1)
+    if (width == 0) width = -1;
+
+    while (*input && width)
    {
-        /* can't use return value on vxWorks: sscanf with %* format
-           returns -1 at end of string whether value is found or not */
-        sscanf(input, fmt.info, &length);
+        if (fmt.info[*input>>3] & 1<<(*input&7)) break;
+        if (maxlen > 1)
+        {
+            *value++ = *input;
+            maxlen--;
+        }
+        length++;
+        width--;
+        input++;
    }
-    else
+    if (maxlen > 0)
    {
-        char tmpformat[256];
-        const char* f;
-        if (maxlen <= fmt.width || fmt.width == 0)
-        {
-            const char *p = strchr (fmt.info, '[');
-            // assure not to read too much
-            sprintf(tmpformat, "%%%ld%s", (long)maxlen-1, p);
-            f = tmpformat;
-        }
-        else
-        {
-            f = fmt.info;
-        }
-        if (sscanf(input, f, value, &length) < 1) return -1;
-        if (length < 0) return -1;
-        value[length] = '\0';
-        debug("StdCharsetConverter::scanString: length=%d, value=%s\n",
-            length, value);
+        *value = '\0';
    }
    return length;
 }
--- a/src/StreamFormatConverter.h
+++ b/src/StreamFormatConverter.h
@ -22,6 +22,7 @@

 #include "StreamFormat.h"
 #include "StreamBuffer.h"
+#include "StreamProtocol.h"

 #define esc (0x1b)

@ -41,6 +42,7 @@ class StreamFormatConverter
    const char* _name;
 public:
    virtual ~StreamFormatConverter();
+    static int parseFormat(const char*& source, FormatType, StreamFormat&, StreamBuffer& infoString);
    const char* name() { return _name; }
    void provides(const char* name, const char* provided);
    static StreamFormatConverter* find(unsigned char c);
--- 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
@ -81,18 +82,6 @@ StreamProtocolParser::
    delete next;
 }

-void StreamProtocolParser::
-errorMsg(const char* fmt, ...)
-{
-    char fmt2[200];
-    sprintf (fmt2, "'%s' line %d: %s",
-        filename(), line, fmt);
-    va_list args;
-    va_start(args, fmt);
-    StreamVError(fmt2, args);
-    va_end(args);
-}
-
 void StreamProtocolParser::
 report()
 {
@ -118,7 +107,7 @@ getProtocol(const char* filename, const StreamBuffer& protocolAndParams)
    // Have we already seen this file?
    for (parser = parsers; parser; parser = parser->next)
    {
-        if (parser->filename.equals(filename))
+        if (parser->filename.startswith(filename))
        {
            if (!parser->valid)
            {
@ -234,12 +223,12 @@ getProtocol(const StreamBuffer& protocolAndParams)
    Protocol* protocol;
    for (protocol = protocols; protocol; protocol = protocol->next)
    {
-        if (protocol->protocolname.equals(name()))
+        if (protocol->protocolname.startswith(name()))
        // constructor also replaces parameters
        return new Protocol(*protocol, name, 0);
    }
    error("Protocol '%s' not found in protocol file '%s'\n",
-        name(), filename());
+        protocolAndParams(), filename());
    return NULL;
 }

@ -292,18 +281,18 @@ parseProtocol(Protocol& protocol, StreamBuffer* commands)
                // end of protocol or handler definition
                return true;
            }
-            errorMsg("Stray '}' in global context\n");
+            error(line, filename(), "Stray '}' in global context\n");
            return false;
        }
        if (strchr("{=", token[0]))
        {
-            errorMsg("Expect name before '%c'\n", token[0]);
+            error(line, filename(), "Expect name before '%c'\n", token[0]);
            return false;
        }
        do op = readChar(); while (op == ' '); // what comes after token?
        if (op == EOF)
        {
-            errorMsg("Unexpected end of file after: %s\n", token());
+            error(line, filename(), "Unexpected end of file after: %s\n", token());
            return false;
        }
        if (op == '=')
@ -311,20 +300,20 @@ parseProtocol(Protocol& protocol, StreamBuffer* commands)
            // variable assignment
            if (isHandlerContext(protocol, commands))
            {
-                errorMsg("Variables are not allowed in handlers: %s\n",
+                error(line, filename(), "Variables are not allowed in handlers: %s\n",
                    token());
                return false;
            }
            if (token[0] == '@' || (token[0] >= '0' && token[0] <= '9'))
            {
-                errorMsg("Variable name cannot start with '%c': %s\n",
+                error(line, filename(), "Variable name cannot start with '%c': %s\n",
                    token[0], token());
                return false;
            }
            if (!parseAssignment(token(), protocol))
            {
                line = startline;
-                errorMsg("in variable assignment '%s = ...'\n", token());
+                error(line, filename(), "in variable assignment '%s = ...'\n", token());
                return false;
            }
            continue;
@ -336,7 +325,7 @@ parseProtocol(Protocol& protocol, StreamBuffer* commands)
            {
                if (isHandlerContext(protocol, commands))
                {
-                    errorMsg("Handlers are not allowed in handlers: %s\n",
+                    error(line, filename(), "Handlers are not allowed in handlers: %s\n",
                        token());
                    return false;
                }
@ -345,7 +334,7 @@ parseProtocol(Protocol& protocol, StreamBuffer* commands)
                if (!parseProtocol(protocol, handler))
                {
                    line = startline;
-                    errorMsg("in handler '%s'\n", token());
+                    error(line, filename(), "in handler '%s'\n", token());
                    return false;
                }
                continue;
@ -353,16 +342,16 @@ parseProtocol(Protocol& protocol, StreamBuffer* commands)
            // protocol definition
            if (!isGlobalContext(commands))
            {
-                errorMsg("Definition of '%s' not in global context (missing '}' ?)\n",
+                error(line, filename(), "Definition of '%s' not in global context (missing '}' ?)\n",
                    token());
                return false;
            }
            Protocol** ppP;
            for (ppP = &protocols; *ppP; ppP = &(*ppP)->next)
            {
-                if ((*ppP)->protocolname.equals(token()))
+                if ((*ppP)->protocolname.startswith(token()))
                {
-                    errorMsg("Protocol '%s' redefined\n", token());
+                    error(line, filename(), "Protocol '%s' redefined\n", token());
                    return false;
                }
            }
@ -370,7 +359,7 @@ parseProtocol(Protocol& protocol, StreamBuffer* commands)
            if (!parseProtocol(*pP, pP->commands))
            {
                line = startline;
-                errorMsg("in protocol '%s'\n", token());
+                error(line, filename(), "in protocol '%s'\n", token());
                delete pP;
                return false;
            }
@ -381,7 +370,7 @@ parseProtocol(Protocol& protocol, StreamBuffer* commands)
        // Must be a command or a protocol reference.
        if (isGlobalContext(commands))
        {
-            errorMsg("Expect '=' or '{' instead of '%c' after '%s'\n",
+            error(line, filename(), "Expect '=' or '{' instead of '%c' after '%s'\n",
                op, token());
            return false;
        }
@ -392,7 +381,7 @@ parseProtocol(Protocol& protocol, StreamBuffer* commands)
            Protocol* p;
            for (p = protocols; p; p = p->next)
            {
-                if (p->protocolname.equals(token()))
+                if (p->protocolname.startswith(token()))
                {
                    commands->append(*p->commands);
                    break;
@ -406,7 +395,7 @@ parseProtocol(Protocol& protocol, StreamBuffer* commands)
        if (parseValue(*commands, true) == false)
        {
            line = startline;
-            errorMsg("after command '%s'\n", token());
+            error(line, filename(), "after command '%s'\n", token());
            return false;
        }
        debug("parseProtocol: command '%s'\n", (*commands).expand()());
@ -486,7 +475,7 @@ Each time newline is read, line is incremented.
            c = getc(file);
            if (c != '}')
            {
-                errorMsg("Expect '}' instead of '%c' after: %s\n",
+                error(line, filename(), "Expect '}' instead of '%c' after: %s\n",
                        c, buffer(token));
                return false;
            }
@ -495,12 +484,12 @@ Each time newline is read, line is incremented.
        }
        if (c == EOF)
        {
-            errorMsg("Unexpected end of file after '$'\n");
+            error(line, filename(), "Unexpected end of file after '$'\n");
            return false;
        }
        if (strchr (specialchars, c))
        {
-            errorMsg("Unexpected '%c' after '$'\n,", c);
+            error(line, filename(), "Unexpected '%c' after '$'\n,", c);
            return false;
        }
        // variable like $xyz handled as word token
@ -519,7 +508,7 @@ Each time newline is read, line is incremented.
        {
            if (c == EOF || c == '\n')
            {
-                errorMsg("Unterminated quoted string: %s\n",
+                error(line, filename(), "Unterminated quoted string: %s\n",
                    buffer(token));
                return false;
            }
@ -532,7 +521,7 @@ Each time newline is read, line is incremented.
                break;
            }
            buffer.append(c);
-            if (c == quote && buffer[-1] != '\\')
+            if (c == quote && buffer[-2] != '\\')
            {
                quote = false;
                break;
@ -547,7 +536,7 @@ Each time newline is read, line is incremented.
        // end of file
        if (!eofAllowed)
        {
-            errorMsg("Unexpected end of file\n");
+            error(line, filename(), "Unexpected end of file\n");
            return false;
        }
        buffer.append('\0');
@ -620,7 +609,7 @@ parseValue(StreamBuffer& buffer, bool lazy)
        }
        if (c == '{' || c == '=')
        {
-            errorMsg("Unexpected '%c' (missing ';' or '\"' ?)\n", c);
+            error(line, filename(), "Unexpected '%c' (missing ';' or '\"' ?)\n", c);
            return false;
        }
        if (strchr (";}", c))
@ -646,7 +635,7 @@ printString(StreamBuffer& buffer, const char* s)
        switch (*s)
        {
            case esc:
-                buffer.printf("\\x%02x", (*++s) & 0xff);
+                buffer.print("\\x%02x", (*++s) & 0xff);
                break;
            case '\r':
                buffer.append("\\r");
@ -657,6 +646,9 @@ printString(StreamBuffer& buffer, const char* s)
            case skip:
                buffer.append("\\?");
                break;
+            case whitespace:
+                buffer.append("\\_");
+                break;
            case '"':
                buffer.append("\\\"");
                break;
@ -664,7 +656,7 @@ printString(StreamBuffer& buffer, const char* s)
                buffer.append("\\\\");
                break;
            case format_field:
-                buffer.printf("%%(%s)", ++s);
+                buffer.print("%%(%s)", ++s);
                while (*s++);
                s += extract<unsigned short>(s); // skip fieldaddress
                goto format;
@ -679,7 +671,7 @@ format:         {
                continue;
            default:
                if ((*s & 0x7f) < 0x20 || (*s & 0x7f) == 0x7f)
-                    buffer.printf("\\x%02x", *s & 0xff);
+                    buffer.print("\\x%02x", *s & 0xff);
                else
                    buffer.append(*s);
        }
@ -751,7 +743,7 @@ Protocol(const Protocol& p, StreamBuffer& name, int _line)
    int i;
    const char* nextparameter;
    parameter[0] = protocolname();
-    for (i = 0; i < 10; i++)
+    for (i = 0; i < 9; i++)
    {
        debug("StreamProtocolParser::Protocol::Protocol $%d=\"%s\"\n",
            i, parameter[i]);
@ -768,18 +760,6 @@ StreamProtocolParser::Protocol::
    delete next;
 }

-void StreamProtocolParser::Protocol::
-errorMsg(int l, const char* fmt, ...)
-{
-    char fmt2[200];
-    sprintf (fmt2, "'%s' line %d: %s",
-        filename(), line, fmt);
-    va_list args;
-    va_start(args, fmt);
-    StreamVError(fmt2, args);
-    va_end(args);
-}
-
 void StreamProtocolParser::Protocol::
 report()
 {
@ -811,7 +791,7 @@ createVariable(const char* name, int linenr)
    Variable** ppV;
    for (ppV = &variables; *ppV; ppV = &(*ppV)->next)
    {
-        if ((*ppV)->name.equals(name))
+        if ((*ppV)->name.startswith(name))
        {
            (*ppV)->line = linenr;
            return &(*ppV)->value;
@ -829,7 +809,7 @@ getVariable(const char* name)

    for (pV = variables; pV; pV = pV->next)
    {
-        if (pV->name.equals(name))
+        if (pV->name.startswith(name))
        {
            pV->used = true;
            return pV;
@ -847,12 +827,12 @@ getNumberVariable(const char* varname, unsigned long& value, unsigned long max)
    if (!compileNumber(value, source, max))
    {
        int linenr = getLineNumber(source);
-        errorMsg(linenr, "in variable %s\n", varname);
+        error(linenr, filename(), "in variable %s\n", varname);
        return false;
    }
    if (source != pvar->value.end())
    {
-        errorMsg(getLineNumber(source),
+        error(getLineNumber(source), filename(),
            "Garbage in variable '%s' after numeric value %ld: %s\n",
                varname, value, source);
        return false;
@ -867,7 +847,7 @@ getEnumVariable(const char* varname, unsigned short& value, const char** enumstr
    if (!pvar) return true;
    for (value = 0; enumstrings[value]; value++)
    {
-        if (pvar->value.equals(enumstrings[value]))
+        if (pvar->value.startswith(enumstrings[value]))
        {
            return true;
        }
@ -925,13 +905,14 @@ getCommands(const char* handlername,StreamBuffer& code, Client* client)
    {
        if (handlername)
        {
-            errorMsg(pvar->line,
+            error(pvar->line, filename(),
                "in handler '%s'\n", handlername);
-            errorMsg(variables->line,
+            error(variables->line, filename(),
                "used by protocol '%s'\n", protocolname());
            return false;
        }
-        errorMsg(pvar->line, "in protocol '%s'\n", protocolname());
+        error(pvar->line, filename(),
+            "in protocol '%s'\n", protocolname());
        return false;
    }
    debug("commands %s: %s\n", handlername, pvar->value.expand()());
@ -955,7 +936,7 @@ replaceVariable(StreamBuffer& buffer, const char* varname)
        const char* p = parameter[*varname-'0'];
        if (!p)
        {
-            errorMsg(linenr,
+            error(linenr, filename(),
                "Missing value for parameter $%c\n", *varname);
            return false;
        }
@ -981,7 +962,7 @@ replaceVariable(StreamBuffer& buffer, const char* varname)
    const Variable* v = getVariable(varname);
    if (!v)
    {
-        errorMsg(linenr,
+        error(linenr, filename(),
            "Undefined variable '%s' referenced\n",
            varname);
        return false;
@ -1045,7 +1026,7 @@ compileNumber(unsigned long& number, const char*& source, unsigned long max)
    {
        debug("StreamProtocolParser::Protocol::compileNumber: %s\n",
            buffer.expand()());
-        errorMsg(getLineNumber(source),
+        error(getLineNumber(source), filename(),
            "Unsigned numeric value expected: %s\n", buffer());
        return false;
    }
@ -1053,15 +1034,15 @@ compileNumber(unsigned long& number, const char*& source, unsigned long max)
    {
        debug("StreamProtocolParser::Protocol::compileNumber: %s\n",
            buffer.expand()());
-        errorMsg(getLineNumber(source),
+        error(getLineNumber(source), filename(),
            "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()());
-        errorMsg(getLineNumber(source),
+        error(getLineNumber(source), filename(),
            "Value %s out of range [0...%ld]\n", buffer(), max);
        return false;
    }
@ -1079,11 +1060,9 @@ compileString(StreamBuffer& buffer, const char*& source,
    FormatType formatType, Client* client, int quoted)
 {
    bool escaped = false;
-    int n;
-    long formatPos[20];
-    int numFormats = 0;
    int newline = 0;
    StreamBuffer formatbuffer;
+    int formatpos = buffer.length();
    line = getLineNumber(source);

    debug("StreamProtocolParser::Protocol::compileString "
@ -1094,41 +1073,58 @@ compileString(StreamBuffer& buffer, const char*& source,
    // 1) read a line from protocol source and code quoted strings,
    //    numerical bytes, tokens, etc, and replace variables and parameters
    // 2) replace the formats in the line
-    // thus variables can be replaces inside the format info string
+    // thus variables can be replaced inside the format info string

    while (1)
    {
+        debug("StreamProtocolParser::Protocol::compileString "
+            "buffer so far: %s\n", buffer.expand()());
        // this is step 2: replacing the formats
        if (!*source || (newline = getLineNumber(source)) != line)
        {
            // compile all formats in this line
            // We do this here after all variables in this line
            // have been replaced and after string has been coded.
-            int offs = 0;
-            for (n = 0; n < numFormats; n++)
+            if (formatType != NoFormat)
            {
-                int pos = formatPos[n] + offs;
-                debug("StreamProtocolParser::Protocol::compileString "
-                    "format=\"%s\"\n", buffer.expand(pos)());
-                formatbuffer.clear();
-                const char* p = buffer(pos);
-                if (!compileFormat(formatbuffer, p, formatType, client))
+                int nformats=0;
+                char c;
+                while ((c = buffer[formatpos]) != '\0')
                {
-                    p = buffer(pos);
-                    formatbuffer.clear();
-                    printString(formatbuffer, p);
-                    errorMsg(line, "in format string: \"%s\"\n",
-                            formatbuffer());
-                    return false;
+                    if (c == esc) {
+                        // ignore escaped %
+                        formatpos+=2;
+                        continue;
+                    }
+                    if (c == '%') {
+                        debug("StreamProtocolParser::Protocol::compileString "
+                            "format=\"%s\"\n", buffer.expand(formatpos)());
+                        nformats++;
+                        formatbuffer.clear();
+                        const char* p = buffer(formatpos);
+                        if (!compileFormat(formatbuffer, p, formatType, client))
+                        {
+                            p = buffer(formatpos);
+                            formatbuffer.clear();
+                            printString(formatbuffer, p);
+                            error(line, filename(),
+                                "in format string: \"%s\"\n",
+                                formatbuffer());
+                            return false;
+                        }
+                        int formatlen = p - buffer(formatpos);
+                        buffer.replace(formatpos, formatlen, formatbuffer);
+                        debug("StreamProtocolParser::Protocol::compileString "
+                            "replaced by: \"%s\"\n", buffer.expand(formatpos)());
+                        formatpos += formatbuffer.length();
+                        continue;
+                    }
+                    formatpos ++;
                }
-                int formatlen = p - buffer(pos);
-                buffer.replace(pos, formatlen, formatbuffer);
                debug("StreamProtocolParser::Protocol::compileString "
-                    "replaced by: \"%s\"\n", buffer.expand(pos)());
-                offs += formatbuffer.length() - formatlen;
+                    "%d formats found in line %d\n", nformats, line);
            }
            if (!*source) break;
-            numFormats = 0;
            line = newline;
        }
        // this is step 1: coding the string
@ -1140,74 +1136,60 @@ compileString(StreamBuffer& buffer, const char*& source,
        if (escaped)   // char after \ in quoted text
        {
            escaped = false;
-            unsigned int temp;
+            unsigned int c;
+            int n=1;
            switch (*source)
            {
                case '$': // can't be: readToken would have made a token from this
-                    errorMsg(line,
+                    error(line, filename(),
                        "INTERNAL ERROR: unconverted \\$ in quoted string\n");
                    return false;
                case '?':
-                    if (formatType != ScanFormat)
-                    {
-                        errorMsg(line,
-                            "Quoted \\? only allowed in input: %s\n",
-                            source-1);
-                        return false;
-                    }
                    buffer.append(skip);
-                    break;
+                    source++;
+                    continue;
+                case '_':
+                    buffer.append(whitespace);
+                    source++;
+                    continue;
                case 'a':
-                    buffer.append(7);
+                    c=7;
                    break;
                case 'b':
-                    buffer.append(8);
+                    c=8;
                    break;
                case 't':
-                    buffer.append(9);
+                    c=9;
                    break;
                case 'n':
-                    buffer.append('\n');
+                    c='\n';
                    break;
                case 'r':
-                    buffer.append('\r');
+                    c='\r';
                    break;
                case 'e':
-                    buffer.append(esc).append(esc);
+                    c=esc;
                    break;
-                case '0':  // octal numbers (max 3 digits after 0)
-                    sscanf (source, "%3o%n", &temp, &n);
-                    if (temp > 0xFF)
+                case '0':  // octal numbers (max 4 digits)
+                    sscanf (source, "%4o%n", &c, &n); //cannot fail
+                    if (c > 0xFF)
                    {
-                        errorMsg(line,
-                            "Octal source %#o does not fit in byte: %s\n",
-                            temp, source-1);
+                        error(line, filename(),
+                            "Octal number %#o does not fit in byte: \"%s\"\n",
+                            c, source-1);
                        return false;
                    }
-                    if (formatType != NoFormat &&
-                        (temp < last_function_code || temp == esc))
+                    break;
+                case 'x':  // hex numbers (max 2 digits after x)
+                    if (sscanf (source+1, "%2x%n", &c, &n) < 1)
                    {
-                        buffer.append(esc);
-                    }
-                    buffer.append(temp);
-                    source += n;
-                    continue;
-                case 'x':  // hex numbers (max 2 digits after 0)
-                    if (sscanf (source+1, "%2x%n", &temp, &n) < 1)
-                    {
-                        errorMsg(line,
-                            "Hex digit expected after \\x: %s\n",
+                        error(line, filename(),
+                            "Hex digit expected after \\x: \"%s\"\n",
                            source-1);
                        return false;
                    }
-                    if (formatType != NoFormat &&
-                        (temp < last_function_code || temp == esc))
-                    {
-                        buffer.append(esc);
-                    }
-                    buffer.append(temp);
-                    source += n+1;
-                    continue;
+                    n++;
+                    break;
                case '1': // decimal numbers (max 3 digits)
                case '2':
                case '3':
@ -1217,51 +1199,33 @@ compileString(StreamBuffer& buffer, const char*& source,
                case '7':
                case '8':
                case '9':
-                    sscanf (source, "%3u%n", &temp, &n);
-                    if (temp > 0xFF)
+                    sscanf (source, "%3u%n", &c, &n); //cannot fail
+                    if (c > 0xFF)
                    {
-                        errorMsg(line,
-                            "Decimal source %d does not fit in byte: %s\n",
-                            temp, source-1);
+                        error(line, filename(),
+                            "Decimal number %d does not fit in byte: \"%s\"\n",
+                            c, source-1);
                        return false;
                    }
-                    if (formatType != NoFormat &&
-                        (temp < last_function_code || temp == esc))
-                    {
-                        buffer.append(esc);
-                    }
-                    buffer.append(temp);
-                    source += n;
-                    continue;
+                    break;
                default:  // escaped literals
-                    buffer.append(esc).append(*source);
+                    c=*source;
            }
-            source++;
+            source+=n;
+            if (formatType != NoFormat)
+            {
+                buffer.append(esc);
+            }
+            buffer.append(c);
            continue;
        }
-        if (quoted) // look for ending quotes, escapes, and formats
+        if (quoted) // look for ending quotes and escapes
        {
            switch (*source)
            {
                case '\\':  // escape next character
                    escaped = true;
                    break;
-                case '%': // format specifier in string
-                    if (formatType != NoFormat)
-                    {
-                        // format is allowed here
-                        // just memorize position here and and do actual coding later
-                        // after all variables and parameters have been replaced
-                        // so that extra information is ready for format converter
-                        if (numFormats+1 == sizeof(formatPos))
-                        {
-                            errorMsg(line, "Max 20 formats allowed in one protocol line");
-                            return false;
-                        }
-                        formatPos[numFormats++]=buffer.length();
-                        buffer.append(*source);
-                        break;
-                    }
                case '"':
                case '\'':
                    if (*source == quoted) // ending quote
@ -1305,27 +1269,26 @@ compileString(StreamBuffer& buffer, const char*& source,
        }
        // try numeric byte value
        char* p;
-        int temp = strtol(source, &p, 0);
+        int c = strtol(source, &p, 0);
        if (p != source)
        {
            if (*p != 0)
            {
-                errorMsg(line,
+                error(line, filename(),
                    "Garbage after numeric source: %s", source);
                return false;
            }
-            if (temp > 0xFF || temp < -0x80)
+            if (c > 0xFF || c < -0x80)
            {
-                errorMsg(line,
+                error(line, filename(),
                    "Value %s does not fit in byte\n", source);
                return false;
            }
-            if (formatType != NoFormat &&
-                (temp < last_function_code || temp == esc))
+            if (formatType != NoFormat)
            {
                buffer.append(esc);
            }
-            buffer.append(temp);
+            buffer.append(c);
            source = p+1+sizeof(int);
            continue;
        }
@ -1349,6 +1312,7 @@ compileString(StreamBuffer& buffer, const char*& source,
            {"nl",   0x0A},
            {"vt",   0x0B},
            {"ff",   0x0C},
+            {"np",   0x0C},
            {"cr",   0x0D},
            {"so",   0x0E},
            {"si",   0x0F},
@ -1371,7 +1335,7 @@ compileString(StreamBuffer& buffer, const char*& source,
            {"del",  0x7f}
        };
        size_t i;
-        char c = 0;
+        c=-1;
        for (i = 0; i < sizeof(codes)/sizeof(*codes); i++)
        {
            if (strcmp(source, codes[i].name) == 0)
@ -1379,13 +1343,12 @@ compileString(StreamBuffer& buffer, const char*& source,
                c = codes[i].code;
                if (c == skip && formatType != ScanFormat)
                {
-                    errorMsg(line,
+                    error(line, filename(),
                        "Use of '%s' only allowed in input formats\n",
                        source);
                    return false;
                }
-                if (formatType != NoFormat &&
-                    (temp < last_function_code || temp == esc))
+                if (formatType != NoFormat)
                {
                    buffer.append(esc);
                }
@ -1394,10 +1357,10 @@ compileString(StreamBuffer& buffer, const char*& source,
                break;
            }
        }
-        if (c) continue;
+        if (c >= 0) continue;
        // source may contain a function name
-        errorMsg(line,
-            "Unexpected word: %s\n", source);
+        error(line, filename(),
+            "Unexpected word: \"%s\"\n", source);
        return false;
    }
    debug("StreamProtocolParser::Protocol::compileString buffer=%s\n", buffer.expand()());
@ -1432,14 +1395,14 @@ compileFormat(StreamBuffer& buffer, const char*& formatstr,
        buffer.append(format_field);
        if (!client)
        {
-            errorMsg(line,
+            error(line, filename(),
                "Using fieldname is not possible in this context\n");
            return false;
        }
        const char* fieldnameEnd = strchr(source+=2, ')');
        if (!fieldnameEnd)
        {
-            errorMsg(line,
+            error(line, filename(),
                "Missing ')' after field name\n");
            return false;
        }
@ -1451,7 +1414,7 @@ compileFormat(StreamBuffer& buffer, const char*& formatstr,
        StreamBuffer fieldAddress;
        if (!client->getFieldAddress(buffer(fieldname), fieldAddress))
        {
-            errorMsg(line,
+            error(line, filename(),
                "Field '%s' not found\n", buffer(fieldname));
            return false;
        }
@ -1465,159 +1428,38 @@ compileFormat(StreamBuffer& buffer, const char*& formatstr,
        buffer.append(format);
    }
    const char* formatstart = source + 1;
-    // look for flags
-    streamFormat.flags = 0;
-    bool loop = true;
-    while (loop)
-    {
-        switch (*++source)
-        {
-            case '-':
-                streamFormat.flags |= left_flag;
-                break;
-            case '+':
-                streamFormat.flags |= sign_flag;
-                break;
-            case ' ':
-                streamFormat.flags |= space_flag;
-                break;
-            case '#':
-                streamFormat.flags |= alt_flag;
-                break;
-            case '0':
-                streamFormat.flags |= zero_flag;
-                break;
-            case '*':
-                if (formatType != ScanFormat)
-                {
-                    errorMsg(line,
-                        "Use of skip modifier '*' "
-                        "only allowed in input formats\n");
-                    return false;
-                }
-                if (fieldname)
-                {
-                    errorMsg(line,
-                        "Use of skip modifier '*' not allowed "
-                        "together with field name\n");
-                    return false;
-                }
-                streamFormat.flags |= skip_flag;
-                break;
-            case '?':
-                if (formatType != ScanFormat)
-                {
-                    errorMsg(line,
-                        "Use of default modifier '?' "
-                        "only allowed in input formats\n");
-                    return false;
-                }
-                streamFormat.flags |= default_flag;
-                break;
-            default:
-                loop = false;
-        }
-    }
-/*
-    if (formatType != PrintFormat &&
-        streamFormat.flags & (left_flag|sign_flag|space_flag|zero_flag))
-    {
-        errorMsg(line,
-            "Use of format modifiers '-', '+', ' ', '0' "
-            "only allowed in output formats\n");
-        return false;
-    }
-    if (!(~streamFormat.flags & (left_flag|zero_flag)))
-    {
-        errorMsg(line,
-            "Can't use modifiers '-' and '0' together\n");
-        return false;
-    }
-    if (!(~streamFormat.flags & (space_flag|sign_flag)))
-    {
-        errorMsg(line,
-            "Can't use modifiers ' ' and '+' together\n");
-        return false;
-    }
-*/
-    // look for width
-    unsigned long val;
-    char* p;
-    val = strtoul (source, &p, 10);
-    source = p;
-    if (val > 0xFFFF)
-    {
-        errorMsg(line,
-            "Field width %ld out of range\n", val);
-        return false;
-    }
-    streamFormat.width = (unsigned short)val;
-    // look for prec
-    streamFormat.prec = -1;
-    if (*source == '.')
-    {
-        source++;
-        val = strtoul(source, &p, 10);
-        if (p == source)
-        {
-            debug("source = %s\n", source);
-            errorMsg(line,
-                "Numeric precision field expected after '.'\n");
-            return false;
-        }
-        source = p;
-        if (val > 0x7FFF)
-        {
-            errorMsg(line,
-                "Precision %ld out of range\n", val);
-            return false;
-        }
-        streamFormat.prec = (short)val;
-    }
-    // look for converter
-    streamFormat.conv = *source++;
-    debug("StreamProtocolParser::Protocol::compileFormat: converter='%c'\n",
-        streamFormat.conv);
-    if (!streamFormat.conv || strchr("'\" (.0+-*", streamFormat.conv))
-    {
-        debug("StreamProtocolParser::Protocol::compileFormat: formatstr='%s'\n",
-            formatstr);
-        errorMsg(line,
-            "Missing converter character\n");
-        return false;
-    }
-    StreamFormatConverter* converter;
-    converter = StreamFormatConverter::find(streamFormat.conv);
-    if (!converter)
-    {
-        errorMsg(line,
-            "No converter registered for format '%%%c'\n",
-            streamFormat.conv);
-        return false;
-    }
+    
    // parse format and get info string
    StreamBuffer infoString;
-    int type = converter->parse(streamFormat, infoString,
-        source, formatType == ScanFormat);
+    int type = StreamFormatConverter::parseFormat(source,
+        formatType, streamFormat, infoString);
+        
    if (!type)
    {
        // parsing failed
        return false;
    }
-    if (type < long_format && type > pseudo_format)
+    if (type < 1 && type > pseudo_format)
    {
-        errorMsg(line,
+        error(line, filename(),
            "Illegal format type %d returned from '%%%c' converter\n",
            type, streamFormat.conv);
        return false;
    }
    if (type == pseudo_format && fieldname)
    {
-        errorMsg(line,
+        error(line, filename(),
            "Fieldname not allowed with pseudo format: '%%(%s)%c'\n",
            buffer(fieldname), streamFormat.conv);
        return false;
    }
+    if (fieldname && streamFormat.flags & skip_flag)
+    {
+        error(line, filename(),
+            "Use of skip modifier '*' not allowed "
+            "together with redirection\n");
+        return false;
+    }
    streamFormat.type = static_cast<StreamFormatType>(type);
    if (infoString && infoString[-1] != eos)
    {
@ -1637,8 +1479,10 @@ compileFormat(StreamBuffer& buffer, const char*& formatstr,
    buffer.append(&streamFormat, sizeof(streamFormat));
    buffer.append(infoString);

-    debug("StreamProtocolParser::Protocol::compileFormat: format.type=%s, infolen=%d\n",
-        StreamFormatTypeStr[streamFormat.type], streamFormat.infolen);
+    debug("StreamProtocolParser::Protocol::compileFormat: format.type=%s, "
+        "infolen=%d infostring=\"%s\"\n",
+        StreamFormatTypeStr[streamFormat.type],
+        streamFormat.infolen, infoString.expand()());
    formatstr = source; // move pointer after parsed format
    return true;
 }
@ -1655,13 +1499,13 @@ compileCommands(StreamBuffer& buffer, const char*& source, Client* client)
        args = source + strlen(source)+1+sizeof(int);
        if (!client->compileCommand(this, buffer, command, args))
        {
-            errorMsg(getLineNumber(source),
+            error(getLineNumber(source), filename(),
                "in command '%s'\n", command);
            return false;
        }
        if (*args)
        {
-            errorMsg(getLineNumber(source),
+            error(getLineNumber(source), filename(),
                "Garbage after '%s' command: '%s'\n",
                command, args);
            return false;
--- a/src/StreamProtocol.h
+++ b/src/StreamProtocol.h
@ -32,7 +32,7 @@ public:

    enum Codes
    {
-        eos = 0, skip, format, format_field, last_function_code
+        eos = 0, skip, whitespace, format, format_field, last_function_code
    };

    class Client;
@ -75,8 +75,6 @@ public:
        bool compileString(StreamBuffer& buffer, const char*& source,
            FormatType formatType = NoFormat, Client* = NULL, int quoted = false);
        bool checkUnused();
-        void errorMsg(int line, const char* fmt, ...)
-            __attribute__ ((format(printf,3,4)));
        ~Protocol();
        void report();
    };
@ -115,8 +113,6 @@ private:
        const char* specialchars = NULL, bool eofAllowed = false);
    bool parseAssignment(const char* variable, Protocol&);
    bool parseValue(StreamBuffer& buffer, bool lazy = false);
-    void errorMsg(const char* fmt, ...)
-        __attribute__ ((format(printf,2,3)));

 protected: 
    ~StreamProtocolParser(); // get rid of cygnus-2.7.2 compiler warning
--- a/src/StreamVersion.c
+++ b/src/StreamVersion.c
@ -23,6 +23,7 @@
 #define STR2(x) #x
 #define STR(x) STR2(x)
 const char StreamVersion [] =
-    "StreamDevice " STR(STREAM_MAJOR) "." STR(STREAM_MINOR)
+    "StreamDevice " STR(STREAM_MAJOR)
+    "." STR(STREAM_MINOR)
+    "." STR(STREAM_PATCHLEVEL)
    " built " __DATE__ " " __TIME__;
-
--- a/src/TimestampConverter.cc
+++ b/src/TimestampConverter.cc
@ -0,0 +1,564 @@
+/***************************************************************
+* StreamDevice Support                                         *
+*                                                              *
+* (C) 1999 Dirk Zimoch (zimoch@delta.uni-dortmund.de)          *
+* (C) 2010 Dirk Zimoch (dirk.zimoch@psi.ch)                    *
+*                                                              *
+* This is the time stamp converter of StreamDevice.            *
+* Please refer to the HTML files in ../doc/ for a detailed     *
+* documentation.                                               *
+*                                                              *
+* If you do any changes in this file, you are not allowed to   *
+* redistribute it any more. If there is a bug or a missing     *
+* feature, send me an email and/or your patch. If I accept     *
+* your changes, they will go to the next release.              *
+*                                                              *
+* DISCLAIMER: If this software breaks something or harms       *
+* someone, it's your problem.                                  *
+*                                                              *
+***************************************************************/
+
+#include "StreamFormatConverter.h"
+#include "StreamError.h"
+
+#include <time.h>
+#include <ctype.h>
+#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
+#define localtime_r(timet,tm) localtime_s(tm,timet) /* Windows sucks */
+#endif
+
+#ifdef __rtems__
+#define timezone _timezone
+#endif
+
+#ifdef vxWorks
+int timezone = 0;
+#define tzset() do {\
+    (void) (sscanf(getenv("TIMEZONE"), "%*[^:]::%d", &timezone) || \
+            sscanf(getenv("TIMEZONE"), "%*[^:]:%*[^:]:%d", &timezone) || \
+            sscanf(getenv("EPICS_TS_MIN_WEST"), "%d", &timezone));\
+    timezone*=60;\
+} 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);
+    bool printDouble(const StreamFormat&, StreamBuffer&, double);
+    int scanDouble(const StreamFormat&, const char*, double&);
+};
+
+int TimestampConverter::
+parse(const StreamFormat&, StreamBuffer& info,
+    const char*& source, bool)
+{
+    unsigned int n;
+    char* c;
+
+    if (*source == '(')
+    {
+        while (*++source != ')')
+        {
+            switch (*source)
+            {
+                case 0:
+                    error ("missing ')' after %%T format\n");
+                    return false;
+                case esc:
+                    info.append(*++source);
+                    if (*source == '%') info.append('%');
+                    break;
+                case '%':
+                    source++;
+                    /* look for formatted fractions like %3f */
+                    if (isdigit(*source))
+                    {
+                        n = strtoul(source, &c, 10);
+                        if (*c == 'f')
+                        {
+                            source = c;
+                            info.print("%%0%uf", n);
+                            break;
+                        }
+                    }
+                    /* look for nanoseconds %N of %f */
+                    if (*source == 'N' || *source == 'f')
+                    {
+                        info.print("%%09f");
+                        break;
+                    }
+                    /* look for seconds with fractions like %.3S */
+                    if (*source == '.')
+                    {
+                        c = (char*) source+1;
+                        n = isdigit(*c) ? strtoul(c, &c, 10) : 9;
+                        if (toupper(*c) == 'S')
+                        {
+                            source = c;
+                            info.print("%%%c.%%0%uf", *c, n);
+                            break;
+                        }
+                    }
+                    /* else normal format */
+                    info.append('%');
+                default:
+                    info.append(*source);
+            }
+        }
+        source++;
+        info.append('\0');
+    }
+    else
+    {
+        info.append("%Y-%m-%d %H:%M:%S").append('\0');
+    }
+    return double_format;
+}
+
+bool TimestampConverter::
+printDouble(const StreamFormat& format, StreamBuffer& output, double value)
+{
+    struct tm brokenDownTime;
+    char buffer [40];
+    char fracbuffer [15];
+    int length;
+    time_t sec;
+    double frac;
+    int i, n;
+    char* c;
+    char* p;
+
+    sec = (time_t) value;
+    frac = value - sec;
+    localtime_r(&sec, &brokenDownTime);
+    debug ("TimestampConverter::printDouble %f, '%s'\n", value, format.info);
+    length = strftime(buffer, sizeof(buffer), format.info, &brokenDownTime);
+    i = output.length();
+    output.append(buffer, length);
+
+    /* look for fractional seconds */
+    while ((i = output.find("%0",i)) != -1)
+    {
+        n = strtol(output(i+1), &c, 10);
+        if (*c++ != 'f') return false;
+        /* print fractional part */
+        sprintf(fracbuffer, "%.*f", n, frac);
+        p = strchr(fracbuffer, '.')+1;
+        output.replace(i, c-output(i), p);
+    }
+    return true;
+}
+
+/* many OS don't have strptime or strptime does not fully support
+   all fields, e.g. %z.
+ */
+
+static int strmatch(const char*& input, const char** strings, int minlen)
+{
+    int i;
+    int c;
+
+    for (i=0; strings[i]; i++) {
+        for (c=0; ; c++)
+        {
+            if (strings[i][c] == 0) {
+                input += c;
+                return i;
+            }
+            if (tolower(input[c]) != strings[i][c]) {
+                if (c >= minlen) {
+                    input += c;
+                    return i;
+                }
+                break;
+            }
+        }
+    }
+    return -1;
+}
+
+static int nummatch(const char*& input, int min, int max)
+{
+    int i;
+    char *c;
+
+    i = strtol(input, &c, 10);
+    if (c == input) return -10000;
+    if (i < min || i > max) return -10000;
+    input = c;
+    return i;
+}
+
+static const char* scantime(const char* input, const char* format, struct tm *tm, unsigned long *ns)
+{
+    static const char* months[] = {
+        "january", "february", "march", "april", "may", "june",
+        "july", "august", "september", "november", "december", 0 };
+    static const char* ampm[] = {
+        "am", "pm", 0 };
+
+    int i, n;
+    int pm = -1;
+    int century = -1;
+    int zone = 0;
+
+    tzset();
+    zone = timezone/60;
+    debug ("TimestampConverter::scantime: native time zone = %d\n", zone);
+
+    while (*format)
+    {
+        switch (*format)
+        {
+            case '%':
+                debug ("TimestampConverter::scantime: input = '%s'\n", input);
+                format++;
+startover:
+                switch (*format++)
+                {
+                /* Modifiers (ignore) */
+                    case 'E':
+                    case 'O':
+                        goto startover;
+                /* constants */
+                    case 0: /* stray % at end of format string */
+                        format--;
+                    case '%':
+                        if (*input++ != '%') return NULL;
+                        break;
+                    case 'n':
+                        if (*input++ != '\n') return NULL;
+                        break;
+                    case 't':
+                        if (*input++ != '\t') return NULL;
+                        break;
+                /* ignored */
+                    case 'A': /* day of week name */
+                    case 'a':
+                        while (isalpha((int)*input)) input++;
+                        /* ignore */
+                        break;
+                    case 'u': /* day of week number (Monday = 1 to Sunday = 7) */
+                    case 'w': /* day of week number (Sunday = 0 to Saturday = 6) */
+                        i = nummatch(input, 0, 7);
+                        if (i < 0)
+                        {
+                            error ("error parsing day of week: '%.20s'\n", input);
+                            return NULL;
+                        }
+                        debug ("TimestampConverter::scantime: day of week = %d\n", i);
+                        /* ignore */
+                        break;
+                    case 'U': /* week number */
+                    case 'W':
+                    case 'V':
+                        i = nummatch(input, 0, 53);
+                        if (i < 0)
+                        {
+                            error ("error parsing week number: '%.20s'\n", input);
+                            return NULL;
+                        }
+                        debug ("TimestampConverter::scantime: week number = %d\n", i);
+                        /* ignore */
+                        break;
+                    case 'j': /* day of year */
+                        i = nummatch(input, 0, 366);
+                        if (i < 0)
+                        {
+                            error ("error parsing day of year: '%.20s'\n", input);
+                            return NULL;
+                        }
+                        debug ("TimestampConverter::scantime: day of year = %d\n", i);
+                        /* ignore */
+                        break;
+                    case 'Z': /* time zone name */
+                        while (isalpha((int)*input)) input++;
+                        /* ignore */
+                        break;
+                /* date */
+                    case 'b': /* month */
+                    case 'h':
+                    case 'B':
+                    case 'm':
+                        i = strmatch(input, months, 3);
+                        if (i < 0)
+                        {
+                            i = nummatch(input, 1, 12);
+                            if (i < 0)
+                            {
+                                error ("error parsing month: '%.20s'\n", input);
+                                return NULL;
+                            }
+                            i--;  /* Jan = 0 */
+                        }
+                        tm->tm_mon = i;
+                        debug ("TimestampConverter::scantime: month = %d (%s)\n", tm->tm_mon+1, months[tm->tm_mon]);
+                        break;
+                    case 'd': /* day of month */
+                    case 'e':
+                        i = nummatch(input, 1, 31);
+                        if (i < 0)
+                        {
+                            error ("error parsing day of month: '%.20s'\n", input);
+                            return NULL;
+                        }
+                        tm->tm_mday = i;
+                        debug ("TimestampConverter::scantime: day = %d\n", tm->tm_mday);
+                        break;
+                    case 'Y': /* year */
+                    case 'y':
+                        i = strtol(input, (char**)&input, 10);
+                        if (i < 100)
+                        { /* 2 digit year */
+                            if (century == -1) century = (i >= 69);
+                            tm->tm_year = i + century * 100; /* 0 = 1900 */
+                        }
+                        else
+                        { /* 4 digit year */
+                            tm->tm_year = i - 1900; /* 0 = 1900 */
+                        }
+                        debug ("TimestampConverter::scantime: year = %d\n", tm->tm_year + 1900);
+                        break;
+                    case 'C': /* century */
+                        i = nummatch(input, 0, 99);
+                        if (i < 0)
+                        {
+                            error ("error parsing century: '%.20s'\n", input);
+                            return NULL;
+                        }
+                        century = i - 19;
+                        tm->tm_year = tm->tm_year%100 + 100 * i; /* 0 = 1900 */
+                        debug ("TimestampConverter::scantime: year = %d\n", tm->tm_year + 1900);
+                        break;
+
+                /* time */
+                    case 'H': /* hour */
+                    case 'k':
+                    case 'I':
+                    case 'l':
+                        i = nummatch(input, 0, 23);
+                        if (i < 0)
+                        {
+                            error ("error parsing hour: '%.20s'\n", input);
+                            return NULL;
+                        }
+                        if ((pm == 0) && (i == 12)) i = 0;
+                        if ((pm == 1) && (i < 12)) i += 12;
+                        tm->tm_hour = i;
+                        debug ("TimestampConverter::scantime: hour = %d\n", tm->tm_hour);
+                        break;
+                    case 'P': /* AM / PM */
+                    case 'p':
+                        i = strmatch(input, ampm, 1);
+                        if (i < 0)
+                        {
+                            error ("error parsing am/pm: '%.20s'\n", input);
+                            return NULL;
+                        }
+                        pm = i;
+                        if ((pm == 0) && (tm->tm_hour == 12)) tm->tm_hour = 0;
+                        if ((pm == 1) && (tm->tm_hour < 12)) tm->tm_hour += 12;
+                        debug ("TimestampConverter::scantime: %s hour = %d\n", pm?"PM":"AM", tm->tm_hour);
+                        break;
+                    case 'M': /* minute */
+                        i = nummatch(input, 0, 59);
+                        if (i < 0)
+                        {
+                            error ("error parsing minute: '%.20s'\n", input);
+                            return NULL;
+                        }
+                        tm->tm_min = i;
+                        debug ("TimestampConverter::scantime: min = %d\n", tm->tm_min);
+                        break;
+                    case 'S': /* second */
+                        i = nummatch(input, 0, 60);
+                        if (i < 0)
+                        {
+                            error ("error parsing week second: '%.20s'\n", input);
+                            return NULL;
+                        }
+                        tm->tm_sec = i;
+                        debug ("TimestampConverter::scantime: sec = %d\n", tm->tm_sec);
+                        break;
+                    case 's': /* second since 1970 */
+                        i = strtol(input, (char**)&input, 10);
+                        tm->tm_sec = i;
+                        tm->tm_mon = -1;
+                        tm->tm_isdst = 0;
+                        debug ("TimestampConverter::scantime: sec = %d\n", tm->tm_sec);
+                        break;
+                    case '0': /* fractions of seconds like %09f */
+                        n = strtol(format-1, (char**)&format, 10);
+                        if (*format++ != 'f') return NULL;
+                        debug ("max %d digits fraction in '%s'\n", n, input);
+                        i = 0;
+                        while (n-- && isdigit(*input))
+                        {
+                            i *= 10;
+                            i += *input++ - '0';
+                        }
+                        while (i < 100000000) i *= 10;
+                        *ns = i;
+                        debug ("TimestampConverter::scantime: nanosec = %d, rest '%s'\n", i, input);
+                        break;
+                    case 'z': /* time zone offset */
+                        i = nummatch(input, -2400, 2400);
+                        if (i < -2400)
+                        {
+                            error ("error parsing time zone: '%.20s'\n", input);
+                            return NULL;
+                        }
+                        zone = i / 100 * 60 + i % 100;
+                        tm->tm_isdst = 0;
+                        debug ("TimestampConverter::scantime: zone = %d\n", zone);
+                        break;
+                    case '+': /* set time zone in format string */
+                    case '-':
+                        format--;
+                        i = nummatch(format, -2400, 2400);
+                        zone = i / 100 * 60 + i % 100;
+                        tm->tm_isdst = 0;
+                        debug ("TimestampConverter::scantime: zone = %d\n", zone);
+                        break;
+                /* shortcuts */
+                    case 'c':
+                        if ((input = scantime(input, "%a %b %d %H:%M:%S %Y", tm, ns)) == NULL)
+                            return NULL;
+                        break;
+                    case 'D':
+                        if ((input = scantime(input, "%m/%d/%y", tm, ns)) == NULL)
+                            return NULL;
+                        break;
+                    case 'F':
+                        if ((input = scantime(input, "%Y-%m-%d", tm, ns)) == NULL)
+                            return NULL;
+                        break;
+                    case 'R':
+                        if ((input = scantime(input, "%H:%M", tm, ns)) == NULL)
+                            return NULL;
+                        break;
+                    case 'T':
+                        if ((input = scantime(input, "%H:%M:%S", tm, ns)) == NULL)
+                            return NULL;
+                        break;
+                    case 'x':
+                        if ((input = scantime(input, "%m/%d/%y", tm, ns)) == NULL)
+                            return NULL;
+                        break;
+                    case 'X':
+                    case 'r':
+                        if ((input = scantime(input, "%I:%M:%S %p", tm, ns)) == NULL)
+                            return NULL;
+                        break;
+                    default:
+                        error ("unknown time format %%%s\n", --format);
+                        return NULL;
+                }
+                break;
+            case ' ':
+                format++;
+                while (isspace(*input)) input++;
+                break;
+            default:
+                if (*format++ != *input++)
+                {
+                    error("input '%.20s' does not match constant '%.20s'\n", --input, --format);
+                    return NULL;
+                }
+        }
+    }
+    zone -= timezone/60;
+    tm->tm_min += zone;
+    tm->tm_hour += tm->tm_min / 60;
+    tm->tm_min %= 60;
+    if (tm->tm_min < 0)
+    {
+        tm->tm_min += 60;
+        tm->tm_hour -= 1;
+    }
+    tm->tm_mday -= tm->tm_hour / 24;
+    tm->tm_hour %= 24;
+    if (tm->tm_hour < 0)
+    {
+        tm->tm_min += 24;
+        tm->tm_mday -= 1;
+    }
+    return input;
+}
+
+
+
+int TimestampConverter::
+scanDouble(const StreamFormat& format, const char* input, double& value)
+{
+    struct tm brokenDownTime;
+    time_t seconds;
+    unsigned long nanoseconds;
+    const char* end;
+
+    /* Init time stamp with "today" */
+    time (&seconds);
+    localtime_r(&seconds, &brokenDownTime);
+    brokenDownTime.tm_sec = 0;
+    brokenDownTime.tm_min = 0;
+    brokenDownTime.tm_hour = 0;
+    brokenDownTime.tm_yday = 0;
+    brokenDownTime.tm_isdst = -1;
+    nanoseconds = 0;
+
+    end = scantime(input, format.info, &brokenDownTime, &nanoseconds);
+    if (end == NULL) {
+        error ("error parsing time\n");
+        return -1;
+    }
+    if (brokenDownTime.tm_mon == -1) {
+        seconds = brokenDownTime.tm_sec;
+    } else {
+        seconds = mktime(&brokenDownTime);
+        if (seconds == (time_t) -1 && brokenDownTime.tm_yday == 0)
+        {
+            error ("mktime failed for %02d/%02d/%04d %02d:%02d:%02d\n",
+                brokenDownTime.tm_mon+1,
+                brokenDownTime.tm_mday,
+                brokenDownTime.tm_year+1900,
+                brokenDownTime.tm_hour,
+                brokenDownTime.tm_min,
+                brokenDownTime.tm_sec);
+            return -1;
+        }
+    }
+    value = seconds + nanoseconds*1e-9;
+    return end-input;
+}
+
+RegisterConverter (TimestampConverter, "T");
--- a/src/devStream.h
+++ b/src/devStream.h
@ -22,7 +22,8 @@
 #define devStream_h

 #define STREAM_MAJOR 2
-#define STREAM_MINOR 4
+#define STREAM_MINOR 6
+#define STREAM_PATCHLEVEL 6

 #if defined(__vxworks) || defined(vxWorks)
 #include <vxWorks.h>
@ -40,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>
@ -55,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

@ -69,24 +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 streamScanSep(dbCommon *record);
-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 */
@ -99,7 +108,7 @@ long streamScanfN(dbCommon *record, format_t *format,
 #define devStreamGetIointInfo streamGetIointInfo
 #define devStreamPrintf streamPrintf
 #define devStreamPrintSep(record) (0)
-#define devStreamScanSep streamScanSep
+#define devStreamScanSep (0)
 #define devStreamScanf(record, format, value) \
    streamScanfN(record, format, value, MAX_STRING_SIZE)
 #define streamScanf(record, format, value) \
--- a/src/devaaiStream.c
+++ b/src/devaaiStream.c
@ -20,8 +20,9 @@

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

 static long readData (dbCommon *record, format_t *format)
@ -43,10 +44,10 @@ static long readData (dbCommon *record, format_t *format)
                switch (aai->ftvl)
                {
                    case DBF_DOUBLE:
-                        ((double *)aai->bptr)[aai->nord] = dval;
+                        ((epicsFloat64 *)aai->bptr)[aai->nord] = (epicsFloat64)dval;
                        break;
                    case DBF_FLOAT:
-                        ((float *)aai->bptr)[aai->nord] = (float)dval;
+                        ((epicsFloat32 *)aai->bptr)[aai->nord] = (epicsFloat32)dval;
                        break;
                    default:
                        errlogSevPrintf (errlogFatal,
@ -56,6 +57,7 @@ static long readData (dbCommon *record, format_t *format)
                }
                break;
            }
+            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
@ -66,23 +68,23 @@ static long readData (dbCommon *record, format_t *format)
                switch (aai->ftvl)
                {
                    case DBF_DOUBLE:
-                        ((double *)aai->bptr)[aai->nord] = lval;
+                        ((epicsFloat64 *)aai->bptr)[aai->nord] = (epicsFloat64)lval;
                        break;
                    case DBF_FLOAT:
-                        ((float *)aai->bptr)[aai->nord] = (float)lval;
+                        ((epicsFloat32 *)aai->bptr)[aai->nord] = (epicsFloat32)lval;
                        break;
                    case DBF_LONG:
                    case DBF_ULONG:
-                        ((long *)aai->bptr)[aai->nord] = lval;
+                        ((epicsInt32 *)aai->bptr)[aai->nord] = (epicsInt32)lval;
                        break;
                    case DBF_SHORT:
                    case DBF_USHORT:
                    case DBF_ENUM:
-                        ((short *)aai->bptr)[aai->nord] = (short)lval;
+                        ((epicsInt16 *)aai->bptr)[aai->nord] = (epicsInt16)lval;
                        break;
                    case DBF_CHAR:
                    case DBF_UCHAR:
-                        ((char *)aai->bptr)[aai->nord] = (char)lval;
+                        ((epicsInt8 *)aai->bptr)[aai->nord] = (epicsInt8)lval;
                        break;
                    default:
                        errlogSevPrintf (errlogFatal,
@ -156,29 +158,29 @@ static long writeData (dbCommon *record, format_t *format)
                switch (aai->ftvl)
                {
                    case DBF_DOUBLE:
-                        dval = ((double *)aai->bptr)[nowd];
+                        dval = ((epicsFloat64 *)aai->bptr)[nowd];
                        break;
                    case DBF_FLOAT:
-                        dval = ((float *)aai->bptr)[nowd];
+                        dval = ((epicsFloat32 *)aai->bptr)[nowd];
                        break;
                    case DBF_LONG:
-                        dval = ((long *)aai->bptr)[nowd];
+                        dval = ((epicsInt32 *)aai->bptr)[nowd];
                        break;
                    case DBF_ULONG:
-                        dval = ((unsigned long *)aai->bptr)[nowd];
+                        dval = ((epicsUInt32 *)aai->bptr)[nowd];
                        break;
                    case DBF_SHORT:
-                        dval = ((short *)aai->bptr)[nowd];
+                        dval = ((epicsInt16 *)aai->bptr)[nowd];
                        break;
                    case DBF_USHORT:
                    case DBF_ENUM:
-                        dval = ((unsigned short *)aai->bptr)[nowd];
+                        dval = ((epicsUInt16 *)aai->bptr)[nowd];
                        break;
                    case DBF_CHAR:
-                        dval = ((char *)aai->bptr)[nowd];
+                        dval = ((epicsInt8 *)aai->bptr)[nowd];
                        break;
                    case DBF_UCHAR:
-                        dval = ((unsigned char *)aai->bptr)[nowd];
+                        dval = ((epicsUInt8 *)aai->bptr)[nowd];
                        break;
                    default:
                        errlogSevPrintf (errlogFatal,
@ -190,27 +192,30 @@ static long writeData (dbCommon *record, format_t *format)
                    return ERROR;
                break;
            }
+            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
                switch (aai->ftvl)
                {
                    case DBF_LONG:
+                        lval = ((epicsInt32 *)aai->bptr)[nowd];
+                        break;
                    case DBF_ULONG:
-                        lval = ((long *)aai->bptr)[nowd];
+                        lval = ((epicsUInt32 *)aai->bptr)[nowd];
                        break;
                    case DBF_SHORT:
-                        lval = ((short *)aai->bptr)[nowd];
+                        lval = ((epicsInt16 *)aai->bptr)[nowd];
                        break;
                    case DBF_USHORT:
                    case DBF_ENUM:
-                        lval = ((unsigned short *)aai->bptr)[nowd];
+                        lval = ((epicsUInt16 *)aai->bptr)[nowd];
                        break;
                    case DBF_CHAR:
-                        lval = ((char *)aai->bptr)[nowd];
+                        lval = ((epicsInt8 *)aai->bptr)[nowd];
                        break;
                    case DBF_UCHAR:
-                        lval = ((unsigned char *)aai->bptr)[nowd];
+                        lval = ((epicsUInt8 *)aai->bptr)[nowd];
                        break;
                    default:
                        errlogSevPrintf (errlogFatal,
--- a/src/devaaoStream.c
+++ b/src/devaaoStream.c
@ -20,8 +20,9 @@

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

 static long readData (dbCommon *record, format_t *format)
@ -43,10 +44,10 @@ static long readData (dbCommon *record, format_t *format)
                switch (aao->ftvl)
                {
                    case DBF_DOUBLE:
-                        ((double *)aao->bptr)[aao->nord] = dval;
+                        ((epicsFloat64 *)aao->bptr)[aao->nord] = (epicsFloat64)dval;
                        break;
                    case DBF_FLOAT:
-                        ((float *)aao->bptr)[aao->nord] = (float)dval;
+                        ((epicsFloat32 *)aao->bptr)[aao->nord] = (epicsFloat32)dval;
                        break;
                    default:
                        errlogSevPrintf (errlogFatal,
@ -56,6 +57,7 @@ static long readData (dbCommon *record, format_t *format)
                }
                break;
            }
+            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
@ -66,23 +68,23 @@ static long readData (dbCommon *record, format_t *format)
                switch (aao->ftvl)
                {
                    case DBF_DOUBLE:
-                        ((double *)aao->bptr)[aao->nord] = lval;
+                        ((epicsFloat64 *)aao->bptr)[aao->nord] = (epicsFloat64)lval;
                        break;
                    case DBF_FLOAT:
-                        ((float *)aao->bptr)[aao->nord] = (float)lval;
+                        ((epicsFloat32 *)aao->bptr)[aao->nord] = (epicsFloat32)lval;
                        break;
                    case DBF_LONG:
                    case DBF_ULONG:
-                        ((long *)aao->bptr)[aao->nord] = lval;
+                        ((epicsInt32 *)aao->bptr)[aao->nord] = (epicsInt32)lval;
                        break;
                    case DBF_SHORT:
                    case DBF_USHORT:
                    case DBF_ENUM:
-                        ((short *)aao->bptr)[aao->nord] = (short)lval;
+                        ((epicsInt16 *)aao->bptr)[aao->nord] = (epicsInt16)lval;
                        break;
                    case DBF_CHAR:
                    case DBF_UCHAR:
-                        ((char *)aao->bptr)[aao->nord] = (char)lval;
+                        ((epicsInt8 *)aao->bptr)[aao->nord] = (epicsInt8)lval;
                        break;
                    default:
                        errlogSevPrintf (errlogFatal,
@ -156,29 +158,29 @@ static long writeData (dbCommon *record, format_t *format)
                switch (aao->ftvl)
                {
                    case DBF_DOUBLE:
-                        dval = ((double *)aao->bptr)[nowd];
+                        dval = ((epicsFloat64 *)aao->bptr)[nowd];
                        break;
                    case DBF_FLOAT:
-                        dval = ((float *)aao->bptr)[nowd];
+                        dval = ((epicsFloat32 *)aao->bptr)[nowd];
                        break;
                    case DBF_LONG:
-                        dval = ((long *)aao->bptr)[nowd];
+                        dval = ((epicsInt32 *)aao->bptr)[nowd];
                        break;
                    case DBF_ULONG:
-                        dval = ((unsigned long *)aao->bptr)[nowd];
+                        dval = ((epicsUInt32 *)aao->bptr)[nowd];
                        break;
                    case DBF_SHORT:
-                        dval = ((short *)aao->bptr)[nowd];
+                        dval = ((epicsInt16 *)aao->bptr)[nowd];
                        break;
                    case DBF_USHORT:
                    case DBF_ENUM:
-                        dval = ((unsigned short *)aao->bptr)[nowd];
+                        dval = ((epicsUInt16 *)aao->bptr)[nowd];
                        break;
                    case DBF_CHAR:
-                        dval = ((char *)aao->bptr)[nowd];
+                        dval = ((epicsInt8 *)aao->bptr)[nowd];
                        break;
                    case DBF_UCHAR:
-                        dval = ((unsigned char *)aao->bptr)[nowd];
+                        dval = ((epicsUInt8 *)aao->bptr)[nowd];
                        break;
                    default:
                        errlogSevPrintf (errlogFatal,
@ -190,27 +192,30 @@ static long writeData (dbCommon *record, format_t *format)
                    return ERROR;
                break;
            }
+            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
                switch (aao->ftvl)
                {
                    case DBF_LONG:
+                        lval = ((epicsInt32 *)aao->bptr)[nowd];
+                        break;
                    case DBF_ULONG:
-                        lval = ((long *)aao->bptr)[nowd];
+                        lval = ((epicsUInt32 *)aao->bptr)[nowd];
                        break;
                    case DBF_SHORT:
-                        lval = ((short *)aao->bptr)[nowd];
+                        lval = ((epicsInt16 *)aao->bptr)[nowd];
                        break;
                    case DBF_USHORT:
                    case DBF_ENUM:
-                        lval = ((unsigned short *)aao->bptr)[nowd];
+                        lval = ((epicsUInt16 *)aao->bptr)[nowd];
                        break;
                    case DBF_CHAR:
-                        lval = ((char *)aao->bptr)[nowd];
+                        lval = ((epicsInt8 *)aao->bptr)[nowd];
                        break;
                    case DBF_UCHAR:
-                        lval = ((unsigned char *)aao->bptr)[nowd];
+                        lval = ((epicsUInt8 *)aao->bptr)[nowd];
                        break;
                    default:
                        errlogSevPrintf (errlogFatal,
--- 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,9 +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)
@ -43,10 +44,10 @@ static long readData (dbCommon *record, format_t *format)
                switch (wf->ftvl)
                {
                    case DBF_DOUBLE:
-                        ((double *)wf->bptr)[wf->nord] = dval;
+                        ((epicsFloat64 *)wf->bptr)[wf->nord] = (epicsFloat64)dval;
                        break;
                    case DBF_FLOAT:
-                        ((float *)wf->bptr)[wf->nord] = (float)dval;
+                        ((epicsFloat32 *)wf->bptr)[wf->nord] = (epicsFloat32)dval;
                        break;
                    default:
                        errlogSevPrintf (errlogFatal,
@ -56,6 +57,7 @@ static long readData (dbCommon *record, format_t *format)
                }
                break;
            }
+            case DBF_ULONG:
            case DBF_LONG:
            case DBF_ENUM:
            {
@ -66,23 +68,23 @@ static long readData (dbCommon *record, format_t *format)
                switch (wf->ftvl)
                {
                    case DBF_DOUBLE:
-                        ((double *)wf->bptr)[wf->nord] = (double)lval;
+                        ((epicsFloat64 *)wf->bptr)[wf->nord] = (epicsFloat64)lval;
                        break;
                    case DBF_FLOAT:
-                        ((float *)wf->bptr)[wf->nord] = (float)lval;
+                        ((epicsFloat32 *)wf->bptr)[wf->nord] = (epicsFloat32)lval;
                        break;
                    case DBF_LONG:
                    case DBF_ULONG:
-                        ((long *)wf->bptr)[wf->nord] = lval;
+                        ((epicsInt32 *)wf->bptr)[wf->nord] = (epicsInt32)lval;
                        break;
                    case DBF_SHORT:
                    case DBF_USHORT:
                    case DBF_ENUM:
-                        ((short *)wf->bptr)[wf->nord] = (short)lval;
+                        ((epicsInt16 *)wf->bptr)[wf->nord] = (epicsInt16)lval;
                        break;
                    case DBF_CHAR:
                    case DBF_UCHAR:
-                        ((char *)wf->bptr)[wf->nord] = (char)lval;
+                        ((epicsInt8 *)wf->bptr)[wf->nord] = (epicsInt8)lval;
                        break;
                    default:
                        errlogSevPrintf (errlogFatal,
@ -156,29 +158,29 @@ static long writeData (dbCommon *record, format_t *format)
                switch (wf->ftvl)
                {
                    case DBF_DOUBLE:
-                        dval = ((double *)wf->bptr)[nowd];
+                        dval = ((epicsFloat64 *)wf->bptr)[nowd];
                        break;
                    case DBF_FLOAT:
-                        dval = ((float *)wf->bptr)[nowd];
+                        dval = ((epicsFloat32 *)wf->bptr)[nowd];
                        break;
                    case DBF_LONG:
-                        dval = ((long *)wf->bptr)[nowd];
+                        dval = ((epicsInt32 *)wf->bptr)[nowd];
                        break;
                    case DBF_ULONG:
-                        dval = ((unsigned long *)wf->bptr)[nowd];
+                        dval = ((epicsUInt32 *)wf->bptr)[nowd];
                        break;
                    case DBF_SHORT:
-                        dval = ((short *)wf->bptr)[nowd];
+                        dval = ((epicsInt16 *)wf->bptr)[nowd];
                        break;
                    case DBF_USHORT:
                    case DBF_ENUM:
-                        dval = ((unsigned short *)wf->bptr)[nowd];
+                        dval = ((epicsUInt16 *)wf->bptr)[nowd];
                        break;
                    case DBF_CHAR:
-                        dval = ((char *)wf->bptr)[nowd];
+                        dval = ((epicsInt8 *)wf->bptr)[nowd];
                        break;
                    case DBF_UCHAR:
-                        dval = ((unsigned char *)wf->bptr)[nowd];
+                        dval = ((epicsUInt8 *)wf->bptr)[nowd];
                        break;
                    default:
                        errlogSevPrintf (errlogFatal,
@ -196,21 +198,23 @@ static long writeData (dbCommon *record, format_t *format)
                switch (wf->ftvl)
                {
                    case DBF_LONG:
+                        lval = ((epicsInt32 *)wf->bptr)[nowd];
+                        break;
                    case DBF_ULONG:
-                        lval = ((long *)wf->bptr)[nowd];
+                        lval = ((epicsUInt32 *)wf->bptr)[nowd];
                        break;
                    case DBF_SHORT:
-                        lval = ((short *)wf->bptr)[nowd];
+                        lval = ((epicsInt16 *)wf->bptr)[nowd];
                        break;
                    case DBF_USHORT:
                    case DBF_ENUM:
-                        lval = ((unsigned short *)wf->bptr)[nowd];
+                        lval = ((epicsUInt16 *)wf->bptr)[nowd];
                        break;
                    case DBF_CHAR:
-                        lval = ((char *)wf->bptr)[nowd];
+                        lval = ((epicsInt8 *)wf->bptr)[nowd];
                        break;
                    case DBF_UCHAR:
-                        lval = ((unsigned char *)wf->bptr)[nowd];
+                        lval = ((epicsUInt8 *)wf->bptr)[nowd];
                        break;
                    default:
                        errlogSevPrintf (errlogFatal,
--- a/src/makedbd.pl
+++ b/src/makedbd.pl
@ -0,0 +1,10 @@
+if (@ARGV[0] == "-3.13") {
+    shift;
+} else {
+    print "variable(streamDebug, int)\n";
+    print "registrar(streamRegistrar)\n";
+}
+print "driver(stream)\n";
+for (@ARGV) {
+     print "device($_,INST_IO,dev${_}Stream,\"stream\")\n";
+}
--- a/src/makeref.pl
+++ b/src/makeref.pl
@ -0,0 +1,6 @@
+$t=@ARGV[0];
+shift;
+for (@ARGV) {
+     print "extern void* ref_${_}$t;\n";
+     print "void* p$_ = ref_${_}$t;\n";
+}
--- a/srcSynApps/Makefile
+++ b/srcSynApps/Makefile
@ -0,0 +1,23 @@
+TOP=../..
+
+include $(TOP)/configure/CONFIG
+
+-include ../src/CONFIG_STREAM
+-include ../../src/CONFIG_STREAM
+
+LIBRARY_DEFAULT = streamSynApps
+
+DBD += $(LIBRARY_DEFAULT).dbd
+
+ifeq ($(LOADABLE_MODULE),YES)
+SRCS += $(LIBRARY_DEFAULT)_registerRecordDeviceDriver.cpp
+endif 
+SRCS += $(SYNAPPS_RECORDS:%=dev%Stream.c)
+
+LIB_LIBS += stream $(EPICS_BASE_IOC_LIBS)
+
+include $(TOP)/configure/RULES
+
+# create streamSynApps.dbd from all SYNAPPS_RECORDS
+$(COMMON_DIR)/$(LIBRARY_DEFAULT).dbd: ../../src/CONFIG_STREAM
+	$(PERL) ../../src/makedbd.pl $(SYNAPPS_RECORDS) > $@
--- a/srcSynApps/devscalcoutStream.c
+++ b/srcSynApps/devscalcoutStream.c
@ -0,0 +1,108 @@
+/***************************************************************
+* Stream Device record interface for scalcout records          *
+*                                                              *
+* (C) 2006 Dirk Zimoch (dirk.zimoch@psi.ch)                    *
+*                                                              *
+* This is an EPICS record Interface for StreamDevice.          *
+* Please refer to the HTML files in ../doc/ for a detailed     *
+* documentation.                                               *
+*                                                              *
+* If you do any changes in this file, you are not allowed to   *
+* redistribute it any more. If there is a bug or a missing     *
+* feature, send me an email and/or your patch. If I accept     *
+* your changes, they will go to the next release.              *
+*                                                              *
+* DISCLAIMER: If this software breaks something or harms       *
+* someone, it's your problem.                                  *
+*                                                              *
+***************************************************************/
+
+#include <devStream.h>
+#include <sCalcoutRecord.h>
+#include <epicsExport.h>
+
+/* scalcout record has a bug: it never calls init_record
+   of the device support.
+   Fix: sCalcoutRecord.c, end of init_record() add
+  
+        if(pscalcoutDSET->init_record ) {
+	    return (*pscalcoutDSET->init_record)(pcalc);
+        }
+   The bug has been fixed in version 2-6-1.
+*/
+
+static long readData (dbCommon *record, format_t *format)
+{
+    scalcoutRecord *sco = (scalcoutRecord *) record;
+
+    switch (format->type)
+    {
+        case DBF_DOUBLE:
+        {
+            return streamScanf (record, format, &sco->val);
+        }
+        case DBF_LONG:
+        case DBF_ENUM:
+        {
+            long lval;
+
+            if (streamScanf (record, format, &lval)) return ERROR;
+            sco->val = lval;
+            return OK;
+        }
+        case DBF_STRING:
+        {
+            return (streamScanfN (record, format,
+                sco->sval, sizeof(sco->val)));
+        }
+    }
+    return ERROR;
+}
+
+static long writeData (dbCommon *record, format_t *format)
+{
+    scalcoutRecord *sco = (scalcoutRecord *) record;
+
+    switch (format->type)
+    {
+        case DBF_DOUBLE:
+        {
+            return streamPrintf (record, format, sco->oval);
+        }
+        case DBF_LONG:
+        case DBF_ENUM:
+        {
+            return streamPrintf (record, format, (long)sco->oval);
+        }
+        case DBF_STRING:
+        {
+            return streamPrintf (record, format, sco->osv);
+        }
+    }
+    return ERROR;
+}
+
+static long initRecord (dbCommon *record)
+{
+    scalcoutRecord *sco = (scalcoutRecord *) record;
+
+    return streamInitRecord (record, &sco->out, readData, writeData);
+}
+
+struct {
+    long number;
+    DEVSUPFUN report;
+    DEVSUPFUN init;
+    DEVSUPFUN init_record;
+    DEVSUPFUN get_ioint_info;
+    DEVSUPFUN write;
+} devscalcoutStream = {
+    5,
+    streamReport,
+    streamInit,
+    initRecord,
+    streamGetIointInfo,
+    streamWrite,
+};
+
+epicsExportAddress(dset,devscalcoutStream);
--- a/streamApp/.cvsignore
+++ b/streamApp/.cvsignore
@ -0,0 +1,4 @@
+StreamDebug.log
+streamApp
+streamApp.exe*
+TS.*
--- a/streamApp/Makefile
+++ b/streamApp/Makefile
@ -0,0 +1,80 @@
+TOP=../..
+
+# Look if we have EPICS R3.13 or R3.14
+ifeq ($(wildcard $(TOP)/configure),)
+# EPICS R3.13
+include $(TOP)/config/CONFIG_APP
+# The real work is in Makefile.Vx
+include $(TOP)/config/RULES_ARCHS
+else
+
+# EPICS R3.14
+include $(TOP)/configure/CONFIG
+
+#HOST_OPT = NO
+
+PROD = streamApp
+DBD  = streamApp.dbd
+
+streamApp_DBD += base.dbd
+
+# In 3.14.12 aaiRecord.dbd and aaoRecord.dbd are part of base.dbd
+# In earlier versions, these records are buggy and not included by default
+#streamApp_DBD += aaiRecord.dbd aaoRecord.dbd
+
+PROD_SRCS += streamApp_registerRecordDeviceDriver.cpp
+PROD_SRCS_DEFAULT = streamAppMain.cc
+PROD_SRCS_vxWorks = -nil-
+
+PROD_LIBS = stream
+
+ifdef ASYN
+# 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)
+# With synApps scalcout record
+streamApp_DBD += calcSupport.dbd
+streamApp_DBD += streamSynApps.dbd
+PROD_LIBS += calc
+# older calc versions require sscan
+#PROD_LIBS += sscan
+PROD_LIBS_DEFAULT += streamSynApps
+endif
+
+streamApp_DBD += stream.dbd
+
+ifdef PCRE
+PROD_LIBS += pcre
+else
+ifneq ($(words $(PCRE_LIB) $(PCRE_INCLUDE)),0)
+PROD_SYS_LIBS_DEFAULT += pcre
+PROD_SYS_LIBS_WIN32 += $(PCRE_LIB)\\pcre
+SHRLIB_DEPLIB_DIRS += $(PCRE_LIB)
+endif
+endif
+
+PROD_LIBS += $(EPICS_BASE_IOC_LIBS)
+
+# Write StreamDevice debug output to this file
+# If unset output goes to stdout
+CPPFLAGS += -DDEBUGFILE=StreamDebug.log
+
+include $(TOP)/configure/RULES
+
+ifeq ($(BASE_3_14), YES)
+clean:: myclean
+else
+clean: myclean
+endif
+
+myclean:
+	$(RM) core* StreamDebug.log
+
+endif
--- a/streamApp/Makefile.Host
+++ b/streamApp/Makefile.Host
@ -0,0 +1,8 @@
+TOP = ../../..
+
+include $(TOP)/config/CONFIG_APP
+
+DBDEXPAND = streamAppInclude-3-13.dbd
+DBDNAME = streamApp.dbd
+
+include $(TOP)/config/RULES.Host
--- a/streamApp/Makefile.Vx
+++ b/streamApp/Makefile.Vx
@ -0,0 +1,20 @@
+TOP = ../../..
+
+include $(TOP)/config/CONFIG_APP
+
+LIBNAME = streamApp
+
+LDLIBS += $(COMPAT_BIN)/compatLib
+LDLIBS += $(ASYN_BIN)/asynLib
+LDLIBS += $(INSTALL_BIN)/streamLib
+
+include ../base-3-13LIBOBJS
+
+# Write StreamDevice debug output to this file
+CPPFLAGS += -DDEBUGFILE=StreamDebug.log
+
+include $(TOP)/config/RULES.Vx
+include $(TOP)/config/RULES.munch
+
+# Rebuild when  LIBOBJS change
+$(LIBNAME): ../base-3-13LIBOBJS
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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
zimoch	0e76ba6464	reading web pages	2012-05-16 15:53:06 +00:00
zimoch	fcb44ec845	anchor for redirections	2012-05-16 15:52:43 +00:00
zimoch	cec8195e5e	always escape special chars and bytes	2012-05-16 14:24:21 +00:00
zimoch	6c0eb32d75	Print helpful message when matching string is too long	2012-05-16 14:23:43 +00:00
zimoch	9ae5f1d583	Use disconnect by server as a regular terminator (e.g. web pages)	2012-05-16 14:23:15 +00:00
zimoch	3b60bb9420	put patchlevel into version string	2012-05-16 09:59:48 +00:00
zimoch	db50c35ad6	get correct version of stream library	2012-05-15 15:52:29 +00:00
zimoch	4f05d4e254	added constant "%" test	2012-05-15 15:51:47 +00:00
zimoch	c5a17b217d	high PRIO for command records	2012-05-15 15:50:59 +00:00
zimoch	fdccb0c5a9	add "binary" command, update help, GUI with exit button.	2012-05-15 15:49:41 +00:00
zimoch	ccbafef55a	rework number parsing. make sure '%' in any numeric format gets escaped.	2012-05-15 15:37:21 +00:00
zimoch	c594134317	more debug	2012-05-15 13:58:03 +00:00
zimoch	11cfaf44ee	use perl script instead of bash commands to create dbd file	2012-05-15 13:37:19 +00:00
zimoch	a34678cbcc	for 3.13 don't create variable and registrar entries	2012-05-15 13:36:14 +00:00
zimoch	26fd99823c	use a StreamBuffer to hold format string for later error and debug messages	2012-05-15 11:44:41 +00:00
zimoch	42c305c79b	Skip leading whitespaces only if neither 0 nor 1 are whitespaces.	2012-05-15 09:20:22 +00:00
zimoch	9585506644	debug messages improved	2012-05-15 09:14:34 +00:00
zimoch	4317ae0f75	forgot to update minot version	2012-03-21 08:45:31 +00:00
zimoch	6e6c79f5ea	implement decimal checksum output	2012-02-17 10:28:02 +00:00
zimoch	8da0014091	need to rename StreamBuffer method printf to print because on cris architecture printf is a macro.	2012-01-04 15:49:53 +00:00
zimoch	60d292b3ea	calcout support was missing	2011-10-18 14:54:35 +00:00
zimoch	5ce9b737cf	remove compiler warning	2011-10-13 15:42:00 +00:00
zimoch	7bcb494044	allow checksums in decimal ascii	2011-10-13 15:39:41 +00:00
zimoch	13758eb08e	bugfix: too high array index	2011-10-13 15:37:28 +00:00
zimoch	b9c26cb6f8	problem with connection handling workaround	2011-09-22 10:01:25 +00:00
zimoch	e3dd0a319a	updates	2011-09-19 09:30:00 +00:00
zimoch	80b7ceea2d	make stream.dbd in O directories	2011-09-19 08:35:58 +00:00
zimoch	eabcce156a	not needed	2011-09-19 08:30:02 +00:00
zimoch	615beb7d02	ignore stream.dbd	2011-09-19 08:10:56 +00:00
zimoch	78e6c9355c	use perl scripts to generate files	2011-09-19 08:06:54 +00:00
zimoch	20129ea341	build autimatically	2011-09-16 15:30:57 +00:00
zimoch	388f950559	put in aai and aao, they are now standard parts in 3.14.12	2011-09-16 15:25:07 +00:00
zimoch	96c93714a4	Modifications for new versions of base, asyn, calc	2011-09-16 15:23:19 +00:00
zimoch	252eb44959	use perl script instead of shell script to allow for windows	2011-09-16 15:22:06 +00:00
zimoch	0442e2ae4f	dependency stuff added for 3.14.12	2011-09-16 15:16:40 +00:00
zimoch	31dae22428	fix for 64 bit machines	2011-09-14 09:08:17 +00:00
zimoch	1d5c7adb61	typo	2011-09-14 08:38:47 +00:00
zimoch	c138442a95	fixes for 64 bit machines	2011-09-14 08:33:08 +00:00
zimoch	a672ab1234	Improve re-connection handling in unexpectedly disconnecting IP ports.	2011-09-13 15:58:00 +00:00
zimoch	c550cc01be	bugfix: this could hang up the record in PACT=1 state	2011-09-13 15:52:24 +00:00
zimoch	7db71589d8	no portable way to test this	2011-09-13 14:00:37 +00:00
zimoch	910cf77d97	unfortunately we have to link PCRE here because otherwise static builds fail	2011-09-12 09:54:29 +00:00
zimoch	807fe825d6	exit command added	2011-09-12 09:52:48 +00:00
zimoch	ff46c9a4a7	fixes for 64 bit machines	2011-09-12 08:55:23 +00:00
zimoch	a42fbc9c6c	use correct delete operator	2011-09-12 08:46:58 +00:00
zimoch	74d950ab2d	Workaround for strange bug on xscale_be	2011-08-30 11:44:27 +00:00
zimoch	9049baf730	report protocol name with original case	2011-07-28 12:39:11 +00:00
zimoch	050a165a82	bugfix: had stale fieldAddress under some circumstances	2011-07-28 12:08:39 +00:00
zimoch	1428b85a34	must find a way to generate this	2011-07-20 08:33:19 +00:00
zimoch	e4f8a6ed40	fix endless loop when port does not support EOS	2011-07-20 08:32:09 +00:00
zimoch	5a5b42cb67	test reserve()	2011-07-20 08:31:10 +00:00
zimoch	e62553eca6	input tests added	2011-07-20 08:30:38 +00:00
zimoch	0846c1dd5b	don't link to PCRE here, that has been done in stream library already.	2011-05-06 12:17:02 +00:00
zimoch	774e88241a	compatibility problem with shell on solaris	2011-05-06 12:15:45 +00:00
zimoch	03a04a51b6	* empty log message *	2011-05-06 12:15:20 +00:00
zimoch	103e74be03	compatibility problem with "inf" and "Inf" on different archs	2011-05-06 12:15:01 +00:00
zimoch	129cc61759	compatibility problem with old tcl version on solaris	2011-05-06 12:14:23 +00:00
zimoch	70073e1b69	test to check locking and priorities	2011-03-29 15:18:07 +00:00
zimoch	c94c1a1e70	Fixes for windows Don't have a bash here so use perl. Need to give the full path for PCRE (strange)	2011-03-29 12:36:42 +00:00
zimoch	07026b03ae	port locking sometimes deadlocks when used together with syncronous software and sometimes crashes the timer queue	2011-03-29 12:34:50 +00:00
zimoch	5a6d293a5f	windows patch	2011-03-10 10:13:52 +00:00
zimoch	d51d6648e0	avoid compiler warnings	2011-03-10 10:13:36 +00:00
zimoch	f521da8606	explicit cast to avoid compiler warning	2011-03-10 10:12:53 +00:00
zimoch	b64d486925	xmodem alias added	2011-03-07 14:42:12 +00:00
zimoch	7f1f1c1e65	Bugfix: escaped % in format did not work	2011-02-24 16:12:43 +00:00
zimoch	2dc0918926	Bugfix: allow out formats in exec	2011-02-24 16:12:08 +00:00
zimoch	37d412108a	Add dummy interface	2011-02-24 16:11:21 +00:00
zimoch	f03af416eb	* empty log message *	2011-02-24 16:10:11 +00:00
zimoch	82066af0e0	non-asyn interface without I/O	2011-02-24 14:29:19 +00:00
zimoch	9c18afb178	Buggy old Tornado compiler (cygnus-2.7.2). Comment out some debug messages.	2011-02-08 13:59:30 +00:00
zimoch	04c6cb50d7	allow record name without .VAL in redirection	2011-02-04 15:31:40 +00:00
zimoch	382784526c	make markbit small enough to be inlined on solaris	2011-02-04 15:11:57 +00:00
zimoch	a91496884c	don't mention unused parameters to avoid compiler warning	2011-02-04 15:07:02 +00:00
zimoch	7cdec03dcb	memguard shell fuction removed from here (may go to a separate file)	2011-02-03 16:39:10 +00:00
zimoch	3e5e4b8375	avoid strange gcc warning	2011-02-03 16:28:17 +00:00
zimoch	f8b944f325	I/O Intr bugfix: lines where lost when not read in one chunk	2011-02-03 16:27:14 +00:00
zimoch	c7e7878d9e	no memguard	2010-12-09 15:41:35 +00:00
zimoch	5717dd6345	add NP byte code as alias for FF	2010-12-09 11:03:23 +00:00
zimoch	2fe3b5c68d	Bugfix: Infinite recursion with multi-line input and I/O Intr records	2010-12-07 17:02:52 +00:00
zimoch	db88081fd7	print single space for "arbitrary whitespace" and nothing for "skip"	2010-12-07 13:23:46 +00:00
zimoch	1230c01646	use _ to match arbitrary whitespace	2010-12-07 12:49:48 +00:00
zimoch	8142dd27eb	New special char: "_" means arbitrary amount of whitespace	2010-12-07 10:13:21 +00:00
zimoch	19279b208a	Separator re-work did not work	2010-12-07 10:12:17 +00:00
zimoch	9619c359c1	separator pre-parsing did not work as expected. Problems with whitespace separators. Back to old soluton	2010-12-07 10:07:58 +00:00
zimoch	6b948abc2d	Fix for RTEMS	2010-12-03 08:18:39 +00:00
zimoch	2c7391602a	Bugfixes: escaped quotes in strings and multi-line format strings	2010-12-02 16:04:15 +00:00
zimoch	fd0fccda46	* empty log message *	2010-12-02 16:03:19 +00:00
zimoch	1164413bd2	fixes for new TCL version	2010-11-29 15:54:38 +00:00
zimoch	7e1e038ecd	* empty log message *	2010-11-29 15:53:41 +00:00
zimoch	2a8b0aed56	wrong sign in time zone calculation	2010-11-29 15:50:20 +00:00
zimoch	c856dec6dd	Space handling in separartors and literal input: Any amount of whitespace matches space character in litrals and if space is first character of a separator.	2010-11-29 15:30:59 +00:00
zimoch	53bb235ff1	several bugfixes: time zone, windows, shortcut formats	2010-11-29 15:28:24 +00:00
zimoch	29ac760f0e	sscanf removed from %c and %[]	2010-11-29 15:26:05 +00:00
zimoch	7836af6423	obsolete separator function removed	2010-11-29 15:24:18 +00:00
zimoch	1af9c6ea55	fixes for new asyn version	2010-11-29 15:22:50 +00:00
zimoch	8c619d3350	* empty log message *	2010-11-29 15:21:34 +00:00
zimoch	0155d5ab69	handle new asyn status codes for asyn 4.11	2010-11-05 12:31:30 +00:00
zimoch	8252b629f5	diamond version of port locking because of probplems with tpmac driver	2010-10-27 11:38:25 +00:00
zimoch	494661c0e7	sscanf removed from %s	2010-10-27 11:36:07 +00:00
zimoch	5b652abd25	re-work separator parsing. Now first byte of separator is replaced with a 0x00 byte to allow e.g. simple %s parsing for an element (instead of e.g. %[^,] )	2010-10-20 13:23:50 +00:00
zimoch	a3e68d7f7d	ugly goto removed	2010-10-20 13:21:28 +00:00
zimoch	7cc19d2614	allow for negative length (meaning left of start) in expand	2010-10-20 13:21:05 +00:00
zimoch	318d0e389b	changed from scanf to strto* for parsing	2010-10-15 09:47:21 +00:00
zimoch	8dbe3abcdb	sscans removed from integer and double scanning because of bad performance	2010-10-15 09:46:30 +00:00
zimoch	649d775cd3	Preset buffer size removed (It was not the performance killer) Bugfix: InTerminator search: distinguisch between long input line and multi-line input StreamBuffer::equals renamed to startswith	2010-10-14 12:18:48 +00:00
zimoch	a941061a29	StreamBuffer::equals renamed to startswith	2010-10-14 12:16:27 +00:00
zimoch	100b7d4543	bugfix: reserve returned wrong pointer optimized implementation to append 1 char operator += aliases for append with 1 argument equals renamed to startswith	2010-10-14 12:15:44 +00:00
zimoch	1eb8a25432	bugfix: local buffer was not set to 0 at initialization	2010-10-14 12:13:51 +00:00
zimoch	9b6f8b3386	test empty string enum choice	2010-10-12 08:49:53 +00:00
zimoch	cc1bb004f2	allow SLS style module loading	2010-10-12 08:49:17 +00:00
zimoch	ab6a6b730d	%f default precision changed to 6 because of limited precision of a double.	2010-10-12 08:47:08 +00:00
zimoch	3d928c49a0	Performance bug fixed: search for terminator was O(n^2)	2010-10-12 08:33:35 +00:00
zimoch	8fe70f2e39	errlog.h required for epics 3.14.11	2010-10-12 08:32:14 +00:00
zimoch	862686aeef	made grow() public to allow to set initial buffer size	2010-09-29 07:21:44 +00:00
zimoch	2fa54cdfb1	Initial buffer size added	2010-09-29 07:21:14 +00:00
zimoch	d987a9abb9	crc16 xmodem added	2010-09-22 12:05:26 +00:00
zimoch	d37c142d36	copy from other repository	2010-09-02 14:52:17 +00:00
zimoch	35768cbfbb	latest features added and bugs fixed: compare %= timestamp converter %T error and debug messages	2010-09-02 14:50:33 +00:00
zimoch	5494aae1ba	have both, makebaseapp Makefile and PSI makefile	2010-09-02 14:19:11 +00:00
zimoch	18ba904d6c	timestamp converter added	2010-09-02 13:20:04 +00:00