pixma: made backend obey local_only setting in sane_get_devices

backend/pixma.c

@@ -242,12 +242,12 @@ cleanup_device_list (void)
 }
 
 static void
-find_scanners (void)
+find_scanners (SANE_Bool local_only)
 {
   unsigned i, nscanners;
 
   cleanup_device_list ();
-  nscanners = pixma_find_scanners (conf_devices);
+  nscanners = pixma_find_scanners (conf_devices, local_only);
   PDBG (pixma_dbg (3, "pixma_find_scanners() found %u devices\n", nscanners));
   dev_list =
     (const SANE_Device **) calloc (nscanners + 1, sizeof (*dev_list));
@@ -1602,11 +1602,9 @@ sane_exit (void)
 SANE_Status
 sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only)
 {
-  UNUSED (local_only);
-
   if (!device_list)
     return SANE_STATUS_INVAL;
-  find_scanners ();
+  find_scanners (local_only);
   *device_list = dev_list;
   return (dev_list) ? SANE_STATUS_GOOD : SANE_STATUS_NO_MEM;
 }
@@ -1623,7 +1621,7 @@ sane_open (SANE_String_Const name, SANE_Handle * h)
     return SANE_STATUS_INVAL;
 
   *h = NULL;
-  nscanners = pixma_find_scanners (conf_devices);
+  nscanners = pixma_find_scanners (conf_devices, SANE_FALSE);
   if (nscanners == 0)
     return SANE_STATUS_INVAL;
   if (name[0] == '\0')

backend/pixma.h

@@ -45,6 +45,9 @@
 #ifndef PIXMA_H
 #define PIXMA_H
 
+#include "../include/sane/sane.h"
+
+
 /*!
  * \mainpage Scanner driver for Canon PIXMA MP series
  * \section example Sample code for application
@@ -404,7 +407,7 @@ void pixma_set_debug_level (int level);
  *
  *  \return The number of scanners found currently. The return value is
  *  guaranteed to be valid until the next call to pixma_find_scanners(). */
-int pixma_find_scanners (const char **conf_devices);
+int pixma_find_scanners (const char **conf_devices, SANE_Bool local_only);
 
 /** Return the model name of the device \a devnr. */
 const char *pixma_get_device_model (unsigned devnr);

backend/pixma_common.c

@@ -58,7 +58,7 @@
 #include "pixma_io.h"
 
 #include "../include/sane/sanei_usb.h"
-
+#include "../include/sane/sane.h"
 
 #ifdef __GNUC__
 # define UNUSED(v) (void) v
@@ -1164,9 +1164,9 @@ pixma_fill_gamma_table (double gamma, uint8_t * table, unsigned n)
 }
 
 int
-pixma_find_scanners (const char **conf_devices)
+pixma_find_scanners (const char **conf_devices, SANE_Bool local_only)
 {
-  return pixma_collect_devices (conf_devices, pixma_devices);
+  return pixma_collect_devices (conf_devices, pixma_devices, local_only);
 }
 
 const char *

backend/pixma_io.h

@@ -93,7 +93,7 @@ void pixma_io_cleanup (void);
  *  \return Number of devices found */
 unsigned pixma_collect_devices (const char ** conf_devices,
                                 const struct pixma_config_t *const
-				pixma_devices[]);
+				pixma_devices[], SANE_Bool local_only);
 
 /** Get device configuration. */
 const struct pixma_config_t *pixma_get_device_config (unsigned devnr);

backend/pixma_io_sanei.c

@@ -55,6 +55,7 @@
 #include "pixma_bjnp.h"
 
 #include "../include/sane/sanei_usb.h"
+#include "../include/sane/sane.h"
 
 
 #ifdef __GNUC__
@@ -349,7 +350,7 @@ pixma_io_cleanup (void)
 
 unsigned
 pixma_collect_devices (const char **conf_devices,
-                       const struct pixma_config_t *const pixma_devices[])
+                       const struct pixma_config_t *const pixma_devices[], SANE_Bool local_only)
 {
   unsigned i, j;
   struct scanner_info_t *si;
@@ -374,7 +375,9 @@ pixma_collect_devices (const char **conf_devices,
             }
         }
     }
-  sanei_bjnp_find_devices(conf_devices, attach_bjnp, pixma_devices);
+  if (! local_only)
+    sanei_bjnp_find_devices(conf_devices, attach_bjnp, pixma_devices);
+
   si = first_scanner;
   while (j < nscanners)
     {