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

pixma: replace if/else/else with switch

pixma-axis-driver^2
Ondrej Zary 2020-05-05 13:20:57 +02:00
rodzic 72802d9519
commit 48d2f18833
1 zmienionych plików z 28 dodań i 31 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

59
backend/pixma/pixma_io_sanei.c
Wyświetl plik

@ -542,22 +542,21 @@ pixma_write (pixma_io_t * io, const void *cmd, unsigned len)
size_t count = len; size_t count = len;
int error; int error;
if (io->interface == INT_BJNP) switch (io->interface)
{
sanei_bjnp_set_timeout (io->dev, PIXMA_BULKOUT_TIMEOUT);
error = map_error (sanei_bjnp_write_bulk (io->dev, cmd, &count));
}
else if (io->interface == INT_AXIS)
{
sanei_axis_set_timeout (io->dev, PIXMA_BULKOUT_TIMEOUT);
error = map_error (sanei_axis_write_bulk (io->dev, cmd, &count));
}
else
{ {
case INT_BJNP:
sanei_bjnp_set_timeout (io->dev, PIXMA_BULKOUT_TIMEOUT);
error = map_error (sanei_bjnp_write_bulk (io->dev, cmd, &count));
break;
case INT_AXIS:
sanei_axis_set_timeout (io->dev, PIXMA_BULKOUT_TIMEOUT);
error = map_error (sanei_axis_write_bulk (io->dev, cmd, &count));
break;
default:
#ifdef HAVE_SANEI_USB_SET_TIMEOUT #ifdef HAVE_SANEI_USB_SET_TIMEOUT
sanei_usb_set_timeout (PIXMA_BULKOUT_TIMEOUT); sanei_usb_set_timeout (PIXMA_BULKOUT_TIMEOUT);
#endif #endif
error = map_error (sanei_usb_write_bulk (io->dev, cmd, &count)); error = map_error (sanei_usb_write_bulk (io->dev, cmd, &count));
} }
if (error == PIXMA_EIO) if (error == PIXMA_EIO)
error = PIXMA_ETIMEDOUT; /* FIXME: SANE doesn't have ETIMEDOUT!! */ error = PIXMA_ETIMEDOUT; /* FIXME: SANE doesn't have ETIMEDOUT!! */
@ -579,18 +578,17 @@ pixma_read (pixma_io_t * io, void *buf, unsigned size)
size_t count = size; size_t count = size;
int error; int error;
if (io-> interface == INT_BJNP) switch (io->interface)
{
sanei_bjnp_set_timeout (io->dev, PIXMA_BULKIN_TIMEOUT);
error = map_error (sanei_bjnp_read_bulk (io->dev, buf, &count));
}
else if (io-> interface == INT_AXIS)
{
sanei_axis_set_timeout (io->dev, PIXMA_BULKIN_TIMEOUT);
error = map_error (sanei_axis_read_bulk (io->dev, buf, &count));
}
else
{ {
case INT_BJNP:
sanei_bjnp_set_timeout (io->dev, PIXMA_BULKIN_TIMEOUT);
error = map_error (sanei_bjnp_read_bulk (io->dev, buf, &count));
break;
case INT_AXIS:
sanei_axis_set_timeout (io->dev, PIXMA_BULKIN_TIMEOUT);
error = map_error (sanei_axis_read_bulk (io->dev, buf, &count));
break;
default:
#ifdef HAVE_SANEI_USB_SET_TIMEOUT #ifdef HAVE_SANEI_USB_SET_TIMEOUT
sanei_usb_set_timeout (PIXMA_BULKIN_TIMEOUT); sanei_usb_set_timeout (PIXMA_BULKIN_TIMEOUT);
#endif #endif
@ -616,18 +614,17 @@ pixma_wait_interrupt (pixma_io_t * io, void *buf, unsigned size, int timeout)
timeout = INT_MAX; timeout = INT_MAX;
else if (timeout < 100) else if (timeout < 100)
timeout = 100; timeout = 100;
if (io-> interface == INT_BJNP) switch (io->interface)
{ {
case INT_BJNP:
sanei_bjnp_set_timeout (io->dev, timeout); sanei_bjnp_set_timeout (io->dev, timeout);
error = map_error (sanei_bjnp_read_int (io->dev, buf, &count)); error = map_error (sanei_bjnp_read_int (io->dev, buf, &count));
} break;
else if (io-> interface == INT_AXIS) case INT_AXIS:
{
sanei_axis_set_timeout (io->dev, timeout); sanei_axis_set_timeout (io->dev, timeout);
error = map_error (sanei_axis_read_int (io->dev, buf, &count)); error = map_error (sanei_axis_read_int (io->dev, buf, &count));
} break;
else default:
{
#ifdef HAVE_SANEI_USB_SET_TIMEOUT #ifdef HAVE_SANEI_USB_SET_TIMEOUT
sanei_usb_set_timeout (timeout); sanei_usb_set_timeout (timeout);
#endif #endif