diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-05-01 16:13:57 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-05-01 16:13:57 +0200 |
| commit | 094535c010320967639e8e86f974d878e80baa72 (patch) | |
| tree | efc3094b20355dcbeebb2c4ece4fcfc69bffedb5 /spectro/dtp41.c | |
| parent | c07d0c2d2f6f7b0eb6e92cc6204bf05037957e82 (diff) | |
Imported Upstream version 1.7.0upstream/1.7.0
Diffstat (limited to 'spectro/dtp41.c')
| -rw-r--r-- | spectro/dtp41.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/spectro/dtp41.c b/spectro/dtp41.c index 4717ed4..a2f7e83 100644 --- a/spectro/dtp41.c +++ b/spectro/dtp41.c @@ -115,7 +115,7 @@ int ntc, /* Number of terminating characters */ double to) { /* Timout in seconts */ int rv, se; - if ((se = p->icom->write_read(p->icom, in, out, bsize, tc, ntc, to)) != 0) { + if ((se = p->icom->write_read(p->icom, in, 0, out, bsize, NULL, tc, ntc, to)) != 0) { a1logd(p->log, 1, "dtp41_fcommand: serial i/o failure 0x%x on write_read '%s'\n",se,icoms_fix(in)); return icoms2dtp41_err(se); } @@ -126,7 +126,7 @@ double to) { /* Timout in seconts */ rv &= inst_imask; if (rv != DTP41_OK) { /* Clear the error */ char buf[MAX_MES_SIZE]; - p->icom->write_read(p->icom, "CE\r", buf, MAX_MES_SIZE, ">", 1, 0.5); + p->icom->write_read(p->icom, "CE\r", 0, buf, MAX_MES_SIZE, NULL, ">", 1, 0.5); } } } @@ -228,13 +228,13 @@ dtp41_init_coms(inst *pp, baud_rate br, flow_control fc, double tout) { return ev; /* Set the handshaking (cope with coms breakdown) */ - if ((se = p->icom->write_read(p->icom, fcc, buf, MAX_MES_SIZE, ">", 1, 1.5)) != 0) { + if ((se = p->icom->write_read(p->icom, fcc, 0, buf, MAX_MES_SIZE, NULL, ">", 1, 1.5)) != 0) { if (extract_ec(buf) != DTP41_OK) return inst_coms_fail; } /* Change the baud rate to the rate we've been told (cope with coms breakdown) */ - if ((se = p->icom->write_read(p->icom, brc[bi], buf, MAX_MES_SIZE, ">", 1, 1.5)) != 0) { + if ((se = p->icom->write_read(p->icom, brc[bi], 0, buf, MAX_MES_SIZE, NULL, ">", 1, 1.5)) != 0) { if (extract_ec(buf) != DTP41_OK) return inst_coms_fail; } @@ -247,7 +247,7 @@ dtp41_init_coms(inst *pp, baud_rate br, flow_control fc, double tout) { } /* Loose a character (not sure why) */ - p->icom->write_read(p->icom, "\r", buf, MAX_MES_SIZE, ">", 1, 0.5); + p->icom->write_read(p->icom, "\r", 0, buf, MAX_MES_SIZE, NULL, ">", 1, 0.5); /* Check instrument is responding */ if ((ev = dtp41_command(p, "\r", buf, MAX_MES_SIZE, 1.5)) != inst_ok) { |