mirror
/
sane-project-backends
kopia lustrzana https://gitlab.com/sane-project/backends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

keep usb device by default (correct for bug introduced by tcp sub-backend

merge-requests/1/head
Alex Belkin 2011-03-08 17:57:19 +03:00
rodzic f6b720cc0c
commit 5ea227caea
1 zmienionych plików z 11 dodań i 16 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

27
backend/xerox_mfp.c
Wyświetl plik

@ -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