hal/fdi/information/10freedesktop 10-wireless-mice.fdi, NONE, 1.1 Makefile.am, 1.3, 1.4

[David Zeuthen]

Update of /cvs/hal/hal/fdi/information/10freedesktop
In directory gabe:/tmp/cvs-serv26125/fdi/information/10freedesktop

Modified Files:
	Makefile.am 
Added Files:
	10-wireless-mice.fdi 
Log Message:
2005-03-23  David Zeuthen  <davidz at redhat.com>

	Patch from Sergey Udaltsov <sergey.udaltsov at gmail.com>, slightly
	tweaked to be in line with the spec

	* hald/linux2/addons/addon-usb-csr.c: New file

	* fdi/information/10freedesktop/10-wireless-mice.fdi: New file

	* doc/spec/hal-spec.xml.in: Add keyboard_mouse as allowed value for
	battery.type



--- NEW FILE: 10-wireless-mice.fdi ---
<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
<deviceinfo version="0.2">
  <device>
    <match key="info.bus" string="usb_device">
      <match key="usb_device.vendor_id" int="0x046d"> <!-- Logitech, Inc. -->

        <match key="usb_device.product_id" int="0xc50e"> <!-- Receiver for MX1000 Laser -->
          <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">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 Coordless Keyboard + Mouse combo -->
        <match key="usb_device.product_id" int="0xc512"> 
          <append key="info.addons" type="strlist">hald-addon-usb-csr</append>
          <merge key="battery.type" type="string">keyboard_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>
      </match>
    </match>
  </device>
</deviceinfo>

Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	26 Feb 2005 23:18:50 -0000	1.3
+++ Makefile.am	24 Mar 2005 01:15:31 -0000	1.4
@@ -3,7 +3,8 @@
 
 dist_fdi_DATA = 10-usb-card-readers.fdi    \
 		10-usb-music-players.fdi   \
-	        10-usb-zip-drives.fdi
+	        10-usb-zip-drives.fdi      \
+		10-wireless-mice.fdi