--- backend/snapscan.c.bak	Sun Dec  9 22:51:01 2001

+++ backend/snapscan.c	Sun Dec  9 22:51:01 2001

@@ -1016,7 +1016,11 @@

     vendor[0] = model[0] = '\0';

+#if defined( __FreeBSD__ )

+    if(strstr (name, "uscanner"))

+#else /* __FreeBSD__ */

     if((strstr (name, "usb")) || (strstr (name, "USB")))

+#endif /* __FreeBSD__ */

     {

         DBG (DL_VERBOSE, "%s: Detected (kind of) an USB device\n", me);

@@ -3540,3 +3544,4 @@

  * Revision 1.1  1997/10/13  02:25:54  charter

  * Initial revision

  * */

+

--- sanei/sanei_usb.c.bak	Sun Dec  9 22:40:14 2001

+++ sanei/sanei_usb.c	Sun Dec  9 22:49:04 2001

@@ -112,6 +112,9 @@

 			      SANE_Word * product)

 {

   SANE_Word vendorID, productID;

+#if defined( __FreeBSD__ )

+  u_int32_t vendorproductID;

+#endif /* __FreeBSD__ */

 #if defined (__linux__)

 #define IOCTL_SCANNER_VENDOR _IOR('U', 0x20, int)

@@ -145,8 +148,24 @@

   if (product)

     *product = productID;

 #else /* not defined (__linux__) */

+#if defined( __FreeBSD__ )

+#define USB_GET_DEVICE_ID _IOR('U', 140, int)

+  /* read the vendo and product IDs via the IOCTLs */

+  if( ioctl( fd, USB_GET_DEVICE_ID, &vendorproductID ) == -1 )

+  {

+    DBG( 3, "sanei_usb_get_vendor_product: ioctl( productid ) of fd %d "

+            "failed: %s\n", fd, strerror( errno ) );

+  }

+  productID = vendorproductID & 0xffff;

+  vendorID = ( vendorproductID >> 16 ) & 0xffff;

+  if( vendor )

+    *vendor = vendorID;

+  if( product )

+    *product = productID;

+#else /* __FreeBSD__ */

   vendorID = 0;

   productID = 0;

+#endif /* __FreeBSD__ */

 #endif /* not defined (__linux__) */

   if (!vendorID || !productID)

@@ -309,3 +328,4 @@

   *size = write_size;

   return SANE_STATUS_GOOD;

 }

+