82 lines
2.5 KiB
Diff
82 lines
2.5 KiB
Diff
|
From 9792fb4ac11443553771d4f311a985333b503594 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Nils Philippsen <nils@redhat.com>
|
||
|
|
Date: Tue, 10 May 2011 10:22:02 +0200
|
||
|
|
Subject: [PATCH] patch: xerox_mfp-fix-usb-devices
|
||
|
|
|
||
|
|
Squashed commit of the following:
|
||
|
|
|
||
|
|
commit 962a5a657b750f99b274d58763667bd199f5cb5d
|
||
|
|
Author: Alex Belkin <abc@telekom.ru>
|
||
|
|
Date: Tue Mar 8 17:57:19 2011 +0300
|
||
|
|
|
||
|
|
keep usb device by default (correct for bug introduced by tcp sub-backend
|
||
|
|
(cherry picked from commit 5ea227caeacd504b64eef301e83fa63e0a25b3f7)
|
||
|
|
---
|
||
|
|
backend/xerox_mfp.c | 27 +++++++++++----------------
|
||
|
|
1 files changed, 11 insertions(+), 16 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/backend/xerox_mfp.c b/backend/xerox_mfp.c
|
||
|
|
index e08b50f..d4672a7 100644
|
||
|
|
--- a/backend/xerox_mfp.c
|
||
|
|
+++ b/backend/xerox_mfp.c
|
||
|
|
@@ -37,10 +37,10 @@
|
||
|
|
static const SANE_Device **devlist = NULL; /* sane_get_devices array */
|
||
|
|
static struct device *devices_head = NULL; /* sane_get_devices list */
|
||
|
|
|
||
|
|
-transport available_transports[] = {
|
||
|
|
+enum { TRANSPORT_USB, TRANSPORT_TCP, TRANSPORTS_MAX };
|
||
|
|
+transport available_transports[TRANSPORTS_MAX] = {
|
||
|
|
{ "usb", usb_dev_request, usb_dev_open, usb_dev_close, usb_configure_device },
|
||
|
|
{ "tcp", tcp_dev_request, tcp_dev_open, tcp_dev_close, tcp_configure_device },
|
||
|
|
- { 0 }
|
||
|
|
};
|
||
|
|
|
||
|
|
static int resolv_state(int state)
|
||
|
|
@@ -824,7 +824,13 @@ free_devices (void)
|
||
|
|
devices_head = NULL;
|
||
|
|
}
|
||
|
|
|
||
|
|
-/* SANE API ignores return code of this callback */
|
||
|
|
+static transport *tr_from_devname(SANE_String_Const devname)
|
||
|
|
+{
|
||
|
|
+ if (strncmp("tcp", devname, 3) == 0)
|
||
|
|
+ return &available_transports[TRANSPORT_TCP];
|
||
|
|
+ return &available_transports[TRANSPORT_USB];
|
||
|
|
+}
|
||
|
|
+
|
||
|
|
static SANE_Status
|
||
|
|
list_one_device (SANE_String_Const devname)
|
||
|
|
{
|
||
|
|
@@ -839,12 +845,7 @@ list_one_device (SANE_String_Const devname)
|
||
|
|
return SANE_STATUS_GOOD;
|
||
|
|
}
|
||
|
|
|
||
|
|
- for (tr = available_transports; tr->ttype; tr++) {
|
||
|
|
- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
|
||
|
|
- break;
|
||
|
|
- }
|
||
|
|
- if (!tr->ttype)
|
||
|
|
- return SANE_STATUS_INVAL;
|
||
|
|
+ tr = tr_from_devname(devname);
|
||
|
|
|
||
|
|
dev = calloc (1, sizeof (struct device));
|
||
|
|
if (dev == NULL)
|
||
|
|
@@ -878,13 +879,7 @@ list_one_device (SANE_String_Const devname)
|
||
|
|
static SANE_Status
|
||
|
|
list_conf_devices (UNUSED (SANEI_Config * config), const char *devname)
|
||
|
|
{
|
||
|
|
- transport *tr;
|
||
|
|
-
|
||
|
|
- for (tr = available_transports; tr->ttype; tr++) {
|
||
|
|
- if (!strncmp (devname, tr->ttype, strlen(tr->ttype)))
|
||
|
|
- return tr->configure_device(devname, list_one_device);
|
||
|
|
- }
|
||
|
|
- return SANE_STATUS_INVAL;
|
||
|
|
+ return tr_from_devname(devname)->configure_device(devname, list_one_device);
|
||
|
|
}
|
||
|
|
|
||
|
|
SANE_Status
|
||
|
|
--
|
||
|
|
1.7.5.1
|
||
|
|
|