hal/fdi/information/10freedesktop 10-usb-pda.fdi,1.1,1.2

[David Zeuthen]

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

Modified Files:
	10-usb-pda.fdi 
Log Message:
2005-03-30  David Zeuthen  <davidz at redhat.com>

	* fdi/information/10freedesktop/10-usb-pda.fdi: Update from
	Andrei Yurkevich <urruru at ru.ru>; slightly tweaked by me



Index: 10-usb-pda.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-usb-pda.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 10-usb-pda.fdi	29 Mar 2005 20:25:13 -0000	1.1
+++ 10-usb-pda.fdi	30 Mar 2005 19:36:31 -0000	1.2
@@ -1,17 +1,61 @@
 <?xml version="1.0" encoding="UTF-8"?> <!-- -*- SGML -*- --> 
 
 <deviceinfo version="0.2">
-  <device>
 
-    <!-- PDA's use the visor driver are all PalmOS devices -->
-    <match key="@serial.physical_device:info.linux.driver" string="visor">
-      <match key="serial.port" int="1">
+  <!-- Pocket PC PDAs -->
+  <device>
+    <match key="info.bus" string="serial">
+      <match key="@serial.physical_device:info.linux.driver" string="ipaq">
 	<append key="info.capabilities" type="strlist">pda</append>
-	<merge key="pda.platform" type="string">palmos</merge>
-	<merge key="pda.serial_device" type="copy_property">serial.device</merge>
+	<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.bus" string="serial">
+      <match key="@serial.physical_device:info.linux.driver" string="visor">
+	<match key="@serial.physical_device:usb.vendor_id" int="0x054c">
+          <match key="@serial.physical_device:usb.product_id" int="0x0038">
+            <match key="serial.port" int="0">
+              <append key="info.capabilities" type="strlist">pda</append>
+              <merge key="pda.platform" type="string">palm</merge>
+              <merge key="info.product" type="string">PalmOS PDA</merge>
+              <merge key="pda.palm.hotsync_interface" type="copy_property">serial_device</merge>
+            </match>
+          </match>
+	</match>
+      </match>
+    </match>
+  </device>
+  
+  <!-- All the other PalmOS PDAs -->
+  <device>
+    <match key="info.bus" string="serial">
+      <match key="@serial.physical_device:info.linux.driver" string="visor">
+	<match key="pda.platform" exists="false">
+          <match key="serial.port" int="1">
+            <append key="info.capabilities" type="strlist">pda</append>
+            <merge key="pda.platform" type="string">palm</merge>
+            <merge key="info.product" type="string">PalmOS PDA</merge>
+            <merge key="pda.palm.hotsync_interface" type="copy_property">serial_device</merge>
+          </match>
+	</match>
+      </match>
+    </match>
   </device>
+  
 </deviceinfo>