111 lines
4.8 KiB
Diff
111 lines
4.8 KiB
Diff
diff -up sane-backends-1.0.19/tools/sane-desc.c.policykit sane-backends-1.0.19/tools/sane-desc.c
|
|
--- sane-backends-1.0.19/tools/sane-desc.c.policykit 2007-07-29 20:39:54.000000000 +0200
|
|
+++ sane-backends-1.0.19/tools/sane-desc.c 2008-03-26 16:57:49.000000000 +0100
|
|
@@ -3226,7 +3226,7 @@ print_udev (void)
|
|
}
|
|
}
|
|
printf ("\n");
|
|
- printf ("SYSFS{idVendor}==\"%s\", SYSFS{idProduct}==\"%s\", MODE=\"0664\", GROUP=\"scanner\", ENV{libsane_matched}=\"yes\"\n",
|
|
+ printf ("SYSFS{idVendor}==\"%s\", SYSFS{idProduct}==\"%s\", MODE=\"0664\", ENV{libsane_matched}=\"yes\"\n",
|
|
usbid->usb_vendor_id + 2, usbid->usb_product_id + 2);
|
|
usbid = usbid->next;
|
|
}
|
|
@@ -3272,40 +3272,77 @@ print_plist (void)
|
|
|
|
|
|
static void
|
|
-print_hal (void)
|
|
+print_hal_entries (usbid_type *usbid)
|
|
{
|
|
- int i;
|
|
- usbid_type *usbid = create_usbids_table ();
|
|
- printf ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
|
|
- printf ("<deviceinfo version=\"0.2\">\n");
|
|
- printf (" <device>\n");
|
|
- printf (" <match key=\"info.bus\" string=\"usb\">\n");
|
|
while (usbid)
|
|
{
|
|
manufacturer_model_type * name = usbid->name;
|
|
+ int i = 0;
|
|
|
|
- i = 0;
|
|
printf (" <!-- ");
|
|
while (name)
|
|
- {
|
|
- if ((name != usbid->name) && (i > 0))
|
|
- printf (" | ");
|
|
- printf ("%s", name->name);
|
|
- name = name->next;
|
|
- i++;
|
|
- }
|
|
+ {
|
|
+ if ((name != usbid->name) && (i > 0))
|
|
+ printf (" | ");
|
|
+ printf ("%s", name->name);
|
|
+ name = name->next;
|
|
+ i++;
|
|
+ }
|
|
printf (" -->\n");
|
|
- printf (" <match key=\"usb.vendor_id\" int=\"%s\">\n", usbid->usb_vendor_id);
|
|
- printf (" <match key=\"usb.product_id\" int=\"%s\">\n", usbid->usb_product_id);
|
|
- printf (" <append key=\"info.capabilities\" type=\"strlist\">scanner</append>\n");
|
|
- printf (" <merge key=\"scanner.access_method\" type=\"string\">proprietary</merge>\n");
|
|
+ printf (" <match key=\"usb_device.vendor_id\" int=\"%s\">\n", usbid->usb_vendor_id);
|
|
+ printf (" <match key=\"usb_device.product_id\" int=\"%s\">\n", usbid->usb_product_id);
|
|
+ printf (" <append key=\"info.capabilities\" type=\"strlist\">access_control</append>\n");
|
|
+ printf (" <merge key=\"access_control.file\" type=\"copy_property\">linux.device_file</merge>\n");
|
|
+ printf (" <merge key=\"access_control.type\" type=\"string\">scanner</merge>\n");
|
|
+ printf (" <append key=\"info.callouts.add\" type=\"strlist\">hal-usb-scanner-add</append>\n");
|
|
printf (" </match>\n");
|
|
printf (" </match>\n");
|
|
usbid = usbid->next;
|
|
}
|
|
+}
|
|
|
|
+static void
|
|
+print_hal (void)
|
|
+{
|
|
+ usbid_type *usbid_first = create_usbids_table ();
|
|
+
|
|
+ printf ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
|
|
+ printf ("<deviceinfo version=\"0.2\">\n");
|
|
+ printf (" <device>\n\n");
|
|
+ printf (" <!-- old HAL versions have info.bus -->\n");
|
|
+ printf (" <!-- SCSI scanners -->\n");
|
|
+ printf (" <match key=\"@info.parent:info.bus\" string=\"scsi\">\n");
|
|
+ printf (" <match key=\"@info.parent:scsi.type\" string=\"scanner\">\n");
|
|
+ printf (" <match key=\"info.category\" string=\"scsi_generic\">\n");
|
|
+ printf (" <append key=\"info.capabilities\" type=\"strlist\">access_control</append>\n");
|
|
+ printf (" <merge key=\"access_control.file\" type=\"copy_property\">linux.device_file</merge>\n");
|
|
+ printf (" <merge key=\"access_control.type\" type=\"string\">scanner</merge>\n");
|
|
+ printf (" </match>\n");
|
|
+ printf (" </match>\n");
|
|
+ printf (" </match>\n\n");
|
|
+
|
|
+ printf (" <!-- USB scanners -->\n");
|
|
+ printf (" <match key=\"info.bus\" string=\"usb_device\">\n");
|
|
+ print_hal_entries (usbid_first);
|
|
+ printf (" </match>\n\n");
|
|
+
|
|
+ printf (" <!-- new HAL versions have info.subsystem -->\n");
|
|
+ printf (" <!-- SCSI scanners -->\n");
|
|
+ printf (" <match key=\"@info.parent:info.subsystem\" string=\"scsi\">\n");
|
|
+ printf (" <match key=\"@info.parent:scsi.type\" string=\"scanner\">\n");
|
|
+ printf (" <match key=\"info.category\" string=\"scsi_generic\">\n");
|
|
+ printf (" <append key=\"info.capabilities\" type=\"strlist\">access_control</append>\n");
|
|
+ printf (" <merge key=\"access_control.file\" type=\"copy_property\">linux.device_file</merge>\n");
|
|
+ printf (" <merge key=\"access_control.type\" type=\"string\">scanner</merge>\n");
|
|
+ printf (" </match>\n");
|
|
+ printf (" </match>\n");
|
|
+ printf (" </match>\n\n");
|
|
+
|
|
+ printf (" <!-- USB scanners -->\n");
|
|
+ printf (" <match key=\"info.subsystem\" string=\"usb_device\">\n");
|
|
+ print_hal_entries (usbid_first);
|
|
+ printf (" </match>\n\n");
|
|
|
|
- printf (" </match>\n");
|
|
printf (" </device>\n");
|
|
printf ("</deviceinfo>\n");
|
|
}
|