hal/fdi/information/10freedesktop 10-wireless-mice.fdi,1.4,1.5
Richard Hughes
hughsient at kemper.freedesktop.org
Mon Apr 24 14:58:14 PDT 2006
Update of /cvs/hal/hal/fdi/information/10freedesktop
In directory kemper:/tmp/cvs-serv22069/fdi/information/10freedesktop
Modified Files:
10-wireless-mice.fdi
Log Message:
2006-04-24 Richard Hughes <richard at hughsie.com>
* fdi/information/10freedesktop/10-wireless-mice.fdi: Update the patch from http://bugs.freedesktop.org/show_bug.cgi?id=6397 as we are trying to detect wired mice here as well. Also add the proper product names, giving a nicer name in hal-device-manager.
Index: 10-wireless-mice.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-wireless-mice.fdi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 10-wireless-mice.fdi 16 Apr 2006 21:43:16 -0000 1.4
+++ 10-wireless-mice.fdi 24 Apr 2006 21:58:12 -0000 1.5
@@ -7,6 +7,7 @@
<!-- 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 -->
@@ -15,9 +16,10 @@
<merge key="battery.csr.is_dual" type="bool">false</merge>
</match>
- <!-- Receiver for Coordless Click! -->
+ <!-- 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>
@@ -25,9 +27,10 @@
<merge key="battery.csr.is_dual" type="bool">false</merge>
</match>
- <!-- Receiver for Coordless Keyboard + Mouse combo -->
+ <!-- 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>
@@ -38,6 +41,7 @@
<!-- 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>
@@ -45,75 +49,10 @@
<merge key="battery.csr.is_dual" type="bool">false</merge>
</match>
- <!-- Wheel Mouse Optical -->
- <match key="usb_device.product_id" int="0xc00e">
- <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
- <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">true</merge>
- <merge key="battery.csr.has_sms" type="bool">false</merge>
- <merge key="battery.csr.is_dual" type="bool">false</merge>
- </match>
-
- <!-- MouseMan Traveler -->
- <match key="usb_device.product_id" int="0xc00f">
- <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
- <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">true</merge>
- <merge key="battery.csr.has_sms" type="bool">false</merge>
- <merge key="battery.csr.is_dual" type="bool">false</merge>
- </match>
-
- <!-- MouseMan Dual Optical -->
- <match key="usb_device.product_id" int="0xc012">
- <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
- <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">true</merge>
- <merge key="battery.csr.has_sms" type="bool">false</merge>
- <merge key="battery.csr.is_dual" type="bool">false</merge>
- </match>
-
- <!-- MX300 Optical Mouse -->
- <match key="usb_device.product_id" int="0xc024">
- <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
- <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">true</merge>
- <merge key="battery.csr.has_sms" type="bool">false</merge>
- <merge key="battery.csr.is_dual" type="bool">false</merge>
- </match>
-
- <!-- MX500 Optical Mouse -->
- <match key="usb_device.product_id" int="0xc025">
- <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
- <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">true</merge>
- <merge key="battery.csr.has_sms" type="bool">true</merge>
- <merge key="battery.csr.is_dual" type="bool">false</merge>
- </match>
-
- <!-- iFeel Mouse (silver) -->
- <match key="usb_device.product_id" int="0xc031">
- <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
- <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">true</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 -->
@@ -125,6 +64,7 @@
<!-- 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 -->
@@ -136,6 +76,7 @@
<!-- 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 -->
@@ -147,6 +88,7 @@
<!-- 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 -->
@@ -158,6 +100,7 @@
<!-- 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 -->
@@ -169,6 +112,7 @@
<!-- 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 -->
More information about the hal-commit
mailing list