hal: Branch 'origin' - 2 commits

[Danny Kukawka]

 fdi/policy/10osvendor/10-usbcsr-mice.fdi |  123 -------------------------------
 1 files changed, 2 insertions(+), 121 deletions(-)

New commits:
diff-tree 754066cd7a0929c19cd9a0faf30844c8c9047bb9 (from parents)
Merge: eaacc2c59a021d144abe6ac7d6f826f9a54dd2a7 17304fb8a816c1818ff2f524b9019ae9c7370a6f
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Nov 14 17:37:39 2006 +0000

    Merge branch 'master' of git+ssh://hughsient@git.freedesktop.org/git/hal

diff-tree eaacc2c59a021d144abe6ac7d6f826f9a54dd2a7 (from cb2d58efd6283e92edb12067b15358c44de3c99f)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Nov 14 17:33:47 2006 +0000

    split the logitec csr mice detection vids-pids into hal info

diff --git a/fdi/policy/10osvendor/10-usbcsr-mice.fdi b/fdi/policy/10osvendor/10-usbcsr-mice.fdi
index 4a7f3ed..7336fd5 100644
--- a/fdi/policy/10osvendor/10-usbcsr-mice.fdi
+++ b/fdi/policy/10osvendor/10-usbcsr-mice.fdi
@@ -1,127 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deviceinfo version="0.2">
   <device>
-    <match key="info.bus" string="usb_device">
-      <match key="usb_device.vendor_id" int="0x046d"> <!-- Logitech, Inc. -->
-
-        <!-- Receiver for MX1000 Laser -->
-        <match key="usb_device.product_id" int="0xc50e">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="info.product" type="string">MX1000 Laser Mouse</merge>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-	  <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">false</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-        <!-- Receiver for Cordless Click! -->
-        <match key="usb_device.product_id" int="0xc510"> 
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="info.product" type="string">Cordless Click Mouse</merge>
-          <merge key="battery.type" type="string">mouse</merge>
-	  <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">false</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-	<!-- Receiver for Cordless Keyboard + Mouse combo -->
-        <match key="usb_device.product_id" int="0xc512"> 
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="info.product" type="string">Cordless Keyboard+Mouse Receiver</merge>
-          <merge key="battery.type" type="string">keyboard</merge>
-	  <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">false</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-        <!-- Logitech, Inc. Cordless Mouse+Keyboard Receiver -->
-        <match key="usb_device.product_id" int="0xc505"> 
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="info.product" type="string">Cordless Mouse+Keyboard Receiver</merge>
-          <merge key="battery.type" type="string">keyboard</merge>
-	  <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">false</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-        <!-- Mouse Receiver -->
-        <match key="usb_device.product_id" int="0xc501">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="info.product" type="string">Mouse Receiver</merge>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-          <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">false</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-        <!-- Dual Receiver -->
-        <match key="usb_device.product_id" int="0xc502">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="info.product" type="string">Logitech Dual Receiver</merge>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-          <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">false</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">true</merge>
-        </match>
-
-        <!-- Receiver for Cordless Freedom Optical -->
-        <match key="usb_device.product_id" int="0xc504">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="info.product" type="string">Cordless Freedom Optical Mouse</merge>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-          <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">false</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">true</merge>
-        </match>
-
-        <!-- Receiver for MX700 Optical Mouse -->
-        <match key="usb_device.product_id" int="0xc506">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="info.product" type="string">MX700 Optical Mouse</merge>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-          <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">false</merge>
-          <merge key="battery.csr.has_sms" type="bool">true</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-        <!-- Receiver for Cordless Optical TrackMan -->
-        <match key="usb_device.product_id" int="0xc508">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="info.product" type="string">Cordless Optical TrackMan</merge>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-          <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">false</merge>
-          <merge key="battery.csr.has_sms" type="bool">true</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-        <!-- Receiver for Cordless Presenter -->
-        <match key="usb_device.product_id" int="0xc702">
-          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
-          <merge key="info.product" type="string">Cordless Presenter</merge>
-          <merge key="battery.type" type="string">mouse</merge>
-          <merge key="battery.is_rechargeable" type="bool">true</merge>
-          <!-- proprietary properties defining the behavior -->
-          <merge key="battery.csr.has_res" type="bool">false</merge>
-          <merge key="battery.csr.has_sms" type="bool">false</merge>
-          <merge key="battery.csr.is_dual" type="bool">false</merge>
-        </match>
-
-      </match>
+    <match key="battery.type" string="mouse">
+      <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
     </match>
   </device>
 </deviceinfo>