summaryrefslogtreecommitdiff
path: root/backend/epsonds-io.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:29:05 +0200
commit324a8a71bb7d9e4f8bc49b6bc47efaf9fb58282e (patch)
treebd2d48a139bfbe869f4f49359b63097931a45e7b /backend/epsonds-io.c
parent2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
parent1edb02101a9306fc711cd422ed507d18165b1691 (diff)
Merge branch 'release/experimental/1.0.27-1_experimental1'experimental/1.0.27-1_experimental1
Diffstat (limited to 'backend/epsonds-io.c')
-rw-r--r--backend/epsonds-io.c35
1 files changed, 24 insertions, 11 deletions
diff --git a/backend/epsonds-io.c b/backend/epsonds-io.c
index 28bacfc..e153ad4 100644
--- a/backend/epsonds-io.c
+++ b/backend/epsonds-io.c
@@ -16,11 +16,19 @@
#include "sane/config.h"
#include <ctype.h>
#include <unistd.h> /* sleep */
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
#include "epsonds.h"
#include "epsonds-io.h"
+#include "epsonds-net.h"
-size_t eds_send(epsonds_scanner *s, void *buf, size_t length, SANE_Status *status)
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+
+size_t eds_send(epsonds_scanner *s, void *buf, size_t length, SANE_Status *status, size_t reply_len)
{
DBG(32, "%s: size = %lu\n", __func__, (u_long) length);
@@ -36,7 +44,9 @@ size_t eds_send(epsonds_scanner *s, void *buf, size_t length, SANE_Status *statu
}
if (s->hw->connection == SANE_EPSONDS_NET) {
- /* XXX */
+
+ return epsonds_net_write(s, 0x2000, buf, length, reply_len, status);
+
} else if (s->hw->connection == SANE_EPSONDS_USB) {
size_t n = length;
@@ -55,21 +65,23 @@ size_t eds_send(epsonds_scanner *s, void *buf, size_t length, SANE_Status *statu
size_t eds_recv(epsonds_scanner *s, void *buf, size_t length, SANE_Status *status)
{
- size_t n = 0;
+ size_t n = length; /* network interface needs to read header back even data is 0.*/
DBG(30, "%s: size = %ld, buf = %p\n", __func__, (long) length, buf);
+ *status = SANE_STATUS_GOOD;
+
if (s->hw->connection == SANE_EPSONDS_NET) {
- /* XXX */
+ n = epsonds_net_read(s, buf, length, status);
} else if (s->hw->connection == SANE_EPSONDS_USB) {
/* !!! only report an error if we don't read anything */
-
- n = length;
- *status = sanei_usb_read_bulk(s->fd, (SANE_Byte *)buf,
- (size_t *) &n);
- if (n > 0)
- *status = SANE_STATUS_GOOD;
+ if (n) {
+ *status = sanei_usb_read_bulk(s->fd, (SANE_Byte *)buf,
+ (size_t *) &n);
+ if (n > 0)
+ *status = SANE_STATUS_GOOD;
+ }
}
if (n < length) {
@@ -90,7 +102,7 @@ SANE_Status eds_txrx(epsonds_scanner* s, char *txbuf, size_t txlen,
SANE_Status status;
size_t done;
- done = eds_send(s, txbuf, txlen, &status);
+ done = eds_send(s, txbuf, txlen, &status, rxlen);
if (status != SANE_STATUS_GOOD) {
DBG(1, "%s: tx err, %s\n", __func__, sane_strstatus(status));
return status;
@@ -147,6 +159,7 @@ SANE_Status eds_fsy(epsonds_scanner *s)
SANE_Status eds_fsx(epsonds_scanner *s)
{
+// SANE_Status status = eds_control(s, "\x1CZ", 2);
SANE_Status status = eds_control(s, "\x1CX", 2);
if (status == SANE_STATUS_GOOD) {
s->locked = 1;