summaryrefslogtreecommitdiff
path: root/tools/sane-find-scanner.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:25:39 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-07-15 11:25:39 +0200
commit1edb02101a9306fc711cd422ed507d18165b1691 (patch)
treebd2d48a139bfbe869f4f49359b63097931a45e7b /tools/sane-find-scanner.c
parent2ca8a81bd0d99fe4d75c229d0e988d8ef710285f (diff)
move from support/1.0.27 to feature/1.0.27
Diffstat (limited to 'tools/sane-find-scanner.c')
-rw-r--r--tools/sane-find-scanner.c36
1 files changed, 18 insertions, 18 deletions
diff --git a/tools/sane-find-scanner.c b/tools/sane-find-scanner.c
index ae0e116..04f19d9 100644
--- a/tools/sane-find-scanner.c
+++ b/tools/sane-find-scanner.c
@@ -46,7 +46,7 @@
#include "../include/sane/sanei_pa4s2.h"
#include "../include/sane/sanei_config.h"
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
#ifdef HAVE_LUSB0_USB_H
#include <lusb0_usb.h>
#else
@@ -55,7 +55,7 @@
extern char * check_usb_chip (struct usb_device *dev, int verbosity, SANE_Bool from_file);
#endif
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
#include <libusb.h>
extern char * check_usb_chip (int verbosity,
struct libusb_device_descriptor desc,
@@ -76,7 +76,7 @@ static SANE_Bool device_found = SANE_FALSE;
static SANE_Bool libusb_device_found = SANE_FALSE;
static SANE_Bool unknown_found = SANE_FALSE;
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
libusb_context *sfs_usb_ctx;
#endif
@@ -115,7 +115,7 @@ usage (char *msg)
fprintf (stderr, "\t-f: force opening devname as SCSI even if it looks "
"like USB\n");
fprintf (stderr, "\t-p: enable scanning for parallel port devices\n");
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
fprintf (stderr, "\t-F file: try to detect chipset from given "
"/proc/bus/usb/devices file\n");
#endif
@@ -403,7 +403,7 @@ check_usb_file (char *file_name)
}
}
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
static char *
get_libusb_string_descriptor (struct usb_device *dev, int index)
@@ -701,10 +701,10 @@ check_libusb_device (struct usb_device *dev, SANE_Bool from_file)
if (product)
free (product);
}
-#endif /* HAVE_LIBUSB */
+#endif /* HAVE_LIBUSB_LEGACY */
-#ifdef HAVE_LIBUSB_1_0
+#ifdef HAVE_LIBUSB
static char *
sfs_libusb_strerror (int errcode)
{
@@ -1095,7 +1095,7 @@ check_libusb_device (libusb_device *dev, SANE_Bool from_file)
if (product)
free (product);
}
-#endif /* HAVE_LIBUSB_1_0 */
+#endif /* HAVE_LIBUSB */
static DIR *
@@ -1355,7 +1355,7 @@ check_mustek_pp_device (void)
return (found > 0 || scsi > 0);
}
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
static SANE_Bool
parse_num (char* search, const char* line, int base, long int * number)
{
@@ -1596,9 +1596,9 @@ main (int argc, char **argv)
break;
case 'F':
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
parse_file ((char *) (*(++ap)));
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
printf ("option -F not implemented with libusb-1.0\n");
#else
printf ("libusb not available: option -F can't be used\n");
@@ -1797,7 +1797,7 @@ main (int argc, char **argv)
"/dev/scanner", "/dev/scanner0", "/dev/scanner1",
"/dev/pass0", "/dev/pass1", "/dev/pass2", "/dev/pass3",
"/dev/pass4", "/dev/pass5", "/dev/pass6", "/dev/pass7",
-#elif defined(__FreeBSD__)
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
"/dev/uk0", "/dev/uk1", "/dev/uk2", "/dev/uk3", "/dev/uk4",
"/dev/uk5", "/dev/uk6",
#elif defined(__NetBSD__)
@@ -1948,7 +1948,7 @@ main (int argc, char **argv)
check_usb_file (dev_name);
}
}
-#ifdef HAVE_LIBUSB
+#ifdef HAVE_LIBUSB_LEGACY
/* Now the libusb devices */
{
struct usb_bus *bus;
@@ -1973,7 +1973,7 @@ main (int argc, char **argv)
} /* for (bus) */
}
}
-#elif defined(HAVE_LIBUSB_1_0)
+#elif defined(HAVE_LIBUSB)
/* Now the libusb-1.0 devices */
{
if (ap < argv + argc)
@@ -2026,10 +2026,10 @@ main (int argc, char **argv)
; /* init failed, jumping here */
}
}
-#else /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#else /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
if (verbose > 1)
printf ("libusb not available\n");
-#endif /* not HAVE_LIBUSB && not HAVE_LIBUSB_1_0 */
+#endif /* not HAVE_LIBUSB_LEGACY && not HAVE_LIBUSB */
if (device_found)
{
@@ -2062,7 +2062,7 @@ main (int argc, char **argv)
"make sure that\n # you have loaded a kernel driver for your USB host "
"controller and have setup\n # the USB system correctly. "
"See man sane-usb for details.\n");
-#if !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUSB_1_0)
+#if !defined(HAVE_LIBUSB_LEGACY) && !defined(HAVE_LIBUSB)
if (verbose > 0)
printf (" # SANE has been built without libusb support. This may be a "
"reason\n # for not detecting USB scanners. Read README for "
@@ -2074,7 +2074,7 @@ main (int argc, char **argv)
if (!check_mustek_pp_device() && verbose > 0)
printf ("\n # No Mustek parallel port scanners found. If you expected"
" something\n # different, make sure the scanner is correctly"
- " connected to your computer\n # and you have apropriate"
+ " connected to your computer\n # and you have appropriate"
" access rights.\n");
}
else if (verbose > 0)