hal: Branch 'master'
Danny Kukawka
dkukawka at kemper.freedesktop.org
Wed Aug 29 06:14:13 PDT 2007
fdi/information/10freedesktop/10-usb-pda.fdi | 59 +++++++----------------
fdi/information/10freedesktop/10-usbcsr-mice.fdi | 12 ----
2 files changed, 21 insertions(+), 50 deletions(-)
New commits:
diff-tree b262d07a12245fb02be2bf4330bf025cfea43946 (from ac078c9dff93cd86b7d263c6bc73104ca1a00ef2)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Wed Aug 29 15:13:45 2007 +0200
cleaned up some fdi files in information/10freedesktop/
Cleaned up:
- 10-usb-pda.fdi: regroup matches together for the same kernel driver
- 10-usbcsr-mice.fdi: use int_outof to consolidate a entry with
the same properties and values
diff --git a/fdi/information/10freedesktop/10-usb-pda.fdi b/fdi/information/10freedesktop/10-usb-pda.fdi
index 5de823a..b813896 100644
--- a/fdi/information/10freedesktop/10-usb-pda.fdi
+++ b/fdi/information/10freedesktop/10-usb-pda.fdi
@@ -2,31 +2,29 @@
<deviceinfo version="0.2">
- <!-- Pocket PC PDAs -->
<device>
<match key="info.capabilities" contains="serial">
+ <!-- Pocket PC PDAs -->
<match key="@serial.originating_device:info.linux.driver" string="ipaq">
<append key="info.capabilities" type="strlist">pda</append>
<merge key="pda.platform" type="string">pocketpc</merge>
<merge key="info.product" type="string">Pocket PC PDA</merge>
<merge key="pda.pocketpc.hotsync_interface" type="copy_property">serial.device</merge>
</match>
- </match>
- </device>
- <!--
- on Sony Clie 3.5 devices we need to mark port 0 instead of port 1. For
- this reason, we mark the usb interface with port number to use (FIXME: is
- there a better solution?). However, we should also do this for clies that
- have been upgraded to a later version of OS, but I'm not sure if those have
- the same product id - in that case this would not work for them. The driver
- doumentation however advertises that the information about what port should
- be used is written to syslog, perhaps we can somehow get that information
- from the driver directly?)
- -->
- <device>
- <match key="info.capabilities" contains="serial">
+ <!-- PDAs via Linux 'visor' kernel driver -->
<match key="@serial.originating_device:info.linux.driver" string="visor">
+
+ <!--
+ on Sony Clie 3.5 devices we need to mark port 0 instead of port 1. For
+ this reason, we mark the usb interface with port number to use (FIXME: is
+ there a better solution?). However, we should also do this for clies that
+ have been upgraded to a later version of OS, but I'm not sure if those have
+ the same product id - in that case this would not work for them. The driver
+ doumentation however advertises that the information about what port should
+ be used is written to syslog, perhaps we can somehow get that information
+ from the driver directly?)
+ -->
<match key="@serial.originating_device:usb.vendor_id" int="0x054c">
<!-- Sony Clie 3.5 -->
<match key="@serial.originating_device:usb.product_id" int="0x0038">
@@ -45,14 +43,8 @@
</match>
</match>
</match>
- </match>
- </match>
- </device>
-
- <!-- Handspring -->
- <device>
- <match key="info.capabilities" contains="serial">
- <match key="@serial.originating_device:info.linux.driver" string="visor">
+
+ <!-- Handspring -->
<match key="@serial.originating_device:usb.vendor_id" int="0x082d">
<!-- Visor -->
<match key="@serial.originating_device:usb.product_id" int="0x0100">
@@ -63,14 +55,8 @@
</match>
</match>
</match>
- </match>
- </match>
- </device>
-
- <!-- Known Palm PDAs from Palm, Inc. -->
- <device>
- <match key="info.capabilities" contains="serial">
- <match key="@serial.originating_device:info.linux.driver" string="visor">
+
+ <!-- Known Palm PDAs from Palm, Inc. -->
<match key="@serial.originating_device:usb.vendor_id" int="0x0830">
<!-- Palm m130 -->
<match key="@serial.originating_device:usb.product_id" int="0x0050">
@@ -89,14 +75,8 @@
</match>
</match>
</match>
- </match>
- </match>
- </device>
-
- <!-- All the other PalmOS PDAs as fallback -->
- <device>
- <match key="info.capabilities" contains="serial">
- <match key="@serial.originating_device:info.linux.driver" string="visor">
+
+ <!-- All the other PalmOS PDAs as fallback -->
<match key="pda.platform" exists="false">
<match key="serial.port" int="0">
<append key="info.capabilities" type="strlist">pda</append>
@@ -109,6 +89,7 @@
<merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
</match>
</match>
+
</match>
</match>
</device>
diff --git a/fdi/information/10freedesktop/10-usbcsr-mice.fdi b/fdi/information/10freedesktop/10-usbcsr-mice.fdi
index ae0f25e..43650be 100644
--- a/fdi/information/10freedesktop/10-usbcsr-mice.fdi
+++ b/fdi/information/10freedesktop/10-usbcsr-mice.fdi
@@ -26,7 +26,7 @@
</match>
<!-- Receiver for Cordless Keyboard + Mouse combo -->
- <match key="usb_device.product_id" int="0xc512">
+ <match key="usb_device.product_id" int_outof="0xc512;0xc505">
<merge key="info.product" type="string">Cordless Keyboard+Mouse Receiver</merge>
<merge key="battery.type" type="string">keyboard</merge>
<!-- proprietary properties defining the behavior -->
@@ -35,16 +35,6 @@
<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">
- <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">
<merge key="info.product" type="string">Mouse Receiver</merge>
More information about the hal-commit
mailing list