summaryrefslogtreecommitdiff
path: root/backend/s9036.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2019-07-31 17:00:58 +0200
commitd087d778ffb62e2713cb848540bcc819470365bd (patch)
treed69692a274dd1c7d0672e6bb7155a0fc106f9d49 /backend/s9036.c
parentc8bd2513ecba169cff44c09c8058c36987357b18 (diff)
parent3759ce55ba79b8d3b9d8ed247a252273ee7dade3 (diff)
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'backend/s9036.c')
-rw-r--r--backend/s9036.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/backend/s9036.c b/backend/s9036.c
index 1b97f80..aa18df7 100644
--- a/backend/s9036.c
+++ b/backend/s9036.c
@@ -51,7 +51,7 @@ static S9036_Device *s9036_devices;
/* sets loc_s bytes long value at offset loc in scsi command to value size */
-static void
+static void
set_size (Byte * loc, int loc_s, size_t size)
{
int i;
@@ -62,7 +62,7 @@ set_size (Byte * loc, int loc_s, size_t size)
}
}
-static long
+static long
reserve_unit (int fd)
{
const Byte scsi_reserve[] =
@@ -73,7 +73,7 @@ reserve_unit (int fd)
return sanei_scsi_cmd (fd, scsi_reserve, sizeof (scsi_reserve), 0, 0);
}
-static long
+static long
release_unit (int fd)
{
const Byte scsi_release[] =
@@ -654,9 +654,9 @@ init_options (S9036_Scanner * s)
static const SANE_Range percentage_range =
{
- -100 << SANE_FIXED_SCALE_SHIFT, /* minimum */
- 100 << SANE_FIXED_SCALE_SHIFT, /* maximum */
- 1 << SANE_FIXED_SCALE_SHIFT /* quantization */
+ SANE_FIX(-100), /* minimum */
+ SANE_FIX(100), /* maximum */
+ SANE_FIX(1) /* quantization */
};
static const SANE_Range automatic_adjust_range =
@@ -871,7 +871,7 @@ sane_exit (void)
sane_close (dev->handle);
free (dev);
}
-
+
if (devlist)
free (devlist);
}
@@ -881,7 +881,7 @@ sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
{
S9036_Device *dev;
int i;
-
+
local_only = local_only; /* silence compilation warnings */
if (devlist)
@@ -1237,7 +1237,7 @@ sane_start (SANE_Handle handle)
return SANE_STATUS_GOOD;
}
-static void
+static void
copy_buffer (S9036_Scanner * s, SANE_Byte ** buf, SANE_Int * max_len,
SANE_Int * len)
{
@@ -1327,7 +1327,7 @@ SANE_Status
sane_set_io_mode (SANE_Handle handle, SANE_Bool non_blocking)
{
handle = handle; /* silence compilation warnings */
-
+
DBG (1, "sane_set_io_mode(%d)\n", non_blocking);
return (non_blocking == SANE_TRUE) ?