diff --git a/doc/sane-find-scanner.man b/doc/sane-find-scanner.man index d26d77d49..eb1e84c07 100644 --- a/doc/sane-find-scanner.man +++ b/doc/sane-find-scanner.man @@ -1,4 +1,4 @@ -.TH sane-find-scanner 1 "11 Aug 2001" +.TH sane-find-scanner 1 "16 Aug 2001" .IX sane-find-scanner .SH NAME sane-find-scanner - find SCSI and USB scanners and their device files @@ -19,8 +19,8 @@ device type of "scanner" or "processor" (some old HP scanners seem to send supported by any SANE backend. For USB devices, the corresponding files are opened and the vendor and device ids are determined if the operating system supports this feature. Currently USB scanners are only found if they are -supported by the Linux scanner module (or a similar system on other -platforms). sane-find-scanner won't find parallel port scanners, or scanners +supported by the Linux scanner module or the FreeBSD uscanner +driver. sane-find-scanner won't find parallel port scanners, or scanners connected to proprietary ports. .SH OPTIONS @@ -46,7 +46,9 @@ Look for a scanner (only) at /dev/scanner and print the result. sane(7), sane-scsi(5), sane-usb(5), scanimage(1), xscanimage(1), xsane(1), sane-"backendname"(5) .SH AUTHOR -Oliver Rauch and others. Manual page by Henning Meier-Geinitz. +Oliver Rauch, Henning Meier-Geinitz and others. Manual page by Henning +Meier-Geinitz. .SH BUGS No support for parallel port scanners yet. USB support should be extended to -other platforms and scanners. +other platforms and scanners. Detection of USB vendor/device ids should be +extended, if possible. diff --git a/doc/sane-usb.man b/doc/sane-usb.man index 4556023c1..2da85be5b 100644 --- a/doc/sane-usb.man +++ b/doc/sane-usb.man @@ -1,4 +1,4 @@ -.TH sane-scsi 5 "11 Aug 2001" +.TH sane-scsi 5 "16 Aug 2001" .IX sane-usb .SH NAME sane-usb - USB configuration tips for SANE @@ -23,8 +23,7 @@ This manual page describes the access of USB scanners over the sanei_usb interface. For point 1 and three of this list have a look at the backend's manual page for details. .PP -Currently USB access is only tested for Linux. It may work on FreeBSD but it's -not tested. +Currently USB access is only tested for Linux and FreeBSD. .PP For scanners with a USB interface, it may be necessary to edit the appropriate backend configuration file before using SANE for the first time. @@ -33,7 +32,9 @@ device file that the scanner is connected to (e.g., under Linux, .B /dev/usb/scanner0 or .B /dev/usbscanner0 -is such a USB device). Do +is such a USB device, the device file for FreeBSD is e.g. +.BR /dev/uscanner0 ). +Do .I not create a symlink from .B /dev/scanner diff --git a/sanei/sanei_usb.c b/sanei/sanei_usb.c index 8222f5955..211392bb8 100644 --- a/sanei/sanei_usb.c +++ b/sanei/sanei_usb.c @@ -143,9 +143,14 @@ sanei_usb_find_devices (SANE_Int vendor, SANE_Int product, SANE_Status (*attach) (SANE_String_Const dev)) { SANE_String *prefix; - SANE_String prefixlist[] = {"/dev/usbscanner", - "/dev/usb/scanner", - 0}; + SANE_String prefixlist[] = { +#if defined(__linux__) + "/dev/usbscanner", + "/dev/usb/scanner", +#elif defined(__FreeBSD__) + "/dev/uscanner", +#endif + 0}; SANE_Char devname[30]; int devcount; diff --git a/tools/sane-find-scanner.c b/tools/sane-find-scanner.c index 1d60c42ce..a4a45f076 100644 --- a/tools/sane-find-scanner.c +++ b/tools/sane-find-scanner.c @@ -411,6 +411,7 @@ main (int argc, char **argv) }; static char *usb_default_dev_list[] = { +#if defined(__linux__) "/dev/usb/scanner", "/dev/usb/scanner0", "/dev/usb/scanner1", "/dev/usb/scanner2", "/dev/usb/scanner3", @@ -429,6 +430,17 @@ main (int argc, char **argv) "/dev/usbscanner10", "/dev/usbscanner11", "/dev/usbscanner12", "/dev/usbscanner13", "/dev/usbscanner14", "/dev/usbscanner15", +#elif defined(__FreeBSD__) + "/dev/uscanner", + "/dev/uscanner0", "/dev/uscanner1", + "/dev/uscanner2", "/dev/uscanner3", + "/dev/uscanner4", "/dev/uscanner5", + "/dev/uscanner6", "/dev/uscanner7", + "/dev/uscanner8", "/dev/uscanner9", + "/dev/uscanner10", "/dev/uscanner11", + "/dev/uscanner12", "/dev/uscanner13", + "/dev/uscanner14", "/dev/uscanner15", +#endif 0 };