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

Merge branch 'master' of https://github.com/shadowguy/StreamDevice into shadowguy-master

Browse Source
This commit is contained in:
zimoch
2018-08-21 09:21:49 +02:00
parent 1b0e890ddd 26c5b012a7
commit 047f18d113
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/index.html
View File

@ -96,11 +96,11 @@ come in a predictible order to be parsable by <em>StreamDevice</em>.
<h2>Recommended Readings</h2> <h2>Recommended Readings</h2>
<p> <p>
IOC Application Developer's Guide: IOC Application Developer's Guide:
<a href="https://www.aps.anl.gov/epics/base/R3-14/12-docs/AppDevGuide" <a href="https://epics.anl.gov/base/R3-14/12-docs/AppDevGuide/"
target="ex">R3.14.12</a>, target="ex">R3.14.12</a>,
<a href="https://www.aps.anl.gov/epics/base/R3-16/1-docs/AppDevGuide" <a href="https://epics.anl.gov/base/R3-15/5-docs/AppDevGuide/AppDevGuide.html"
target="ex">R3.15.5</a>, target="ex">R3.15.5</a>,
<a href="https://www.aps.anl.gov/epics/base/R3-15/5-docs/AppDevGuide" <a href="https://epics.anl.gov/base/R3-16/1-docs/AppDevGuide/AppDevGuide.html"
target="ex">R3.16.1</a> target="ex">R3.16.1</a>
</p> </p>
<p> <p>

2
docs/setup.html
View File

@ -388,7 +388,7 @@ The <code>INP</code> or <code>OUT</code> link has the form
<code>"@<var>filename&nbsp;protocol</var>[(<var>arg1</var>,<var>arg2</var>,...)]&nbsp;</var>bus</var>&nbsp;[<var>address</var>&nbsp;[<var>parameters</var>]]"</code>. <code>"@<var>filename&nbsp;protocol</var>[(<var>arg1</var>,<var>arg2</var>,...)]&nbsp;</var>bus</var>&nbsp;[<var>address</var>&nbsp;[<var>parameters</var>]]"</code>.
</p> </p>
<p> <p>
(Elements in <code>[]</code> are optional. To not type the <code>[]</code>). (Elements in <code>[]</code> are optional. Do not type the <code>[]</code>).
</p> </p>
<p> <p>
Here, <code><var>filename</var></code> is the name of the protocol file and Here, <code><var>filename</var></code> is the name of the protocol file and

3
src/StreamEpics.cc
View File

@ -729,13 +729,12 @@ parseLink(const struct link *ioLink, char* filename,
if (ioLink->value.instio.string[n1] == '(') if (ioLink->value.instio.string[n1] == '(')
{ {
strcat(protocol, "("); strcat(protocol, "(");
n1++;
sscanf(ioLink->value.instio.string+n1, " %[^)] %n", protocol+strlen(protocol), &n2); sscanf(ioLink->value.instio.string+n1, " %[^)] %n", protocol+strlen(protocol), &n2);
n1+=n2; n1+=n2;
if (ioLink->value.instio.string[n1++] != ')') if (ioLink->value.instio.string[n1++] != ')')
{ {
error("%s: Missing ')' after protocol '%s': '%s'\n" error("%s: Missing ')' after protocol '%s': '%s'\n"
" expect \"@file protocol(args) bus [addr] [params]\"\n" " expect \"@file protocol[(args)] bus [addr] [params]\"\n"
" in \"@%s\"\n", name(), protocol, ioLink->value.instio.string+n1-1, " in \"@%s\"\n", name(), protocol, ioLink->value.instio.string+n1-1,
ioLink->value.instio.string); ioLink->value.instio.string);
return S_dev_badInitRet; return S_dev_badInitRet;