From b0412bfdaa33c9876893e529cec5b9f3ea176022 Mon Sep 17 00:00:00 2001
From: Matt Colyer
Date: Fri, 12 Dec 2008 21:05:17 -0800
Subject: Added more product ids to the FDI file.

---
 data/30-ifuse.fdi | 84 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

diff --git a/data/30-ifuse.fdi b/data/30-ifuse.fdi
index 55740dc..51ea028 100644
--- a/data/30-ifuse.fdi
+++ b/data/30-ifuse.fdi
@@ -2,49 +2,53 @@
 <deviceinfo version="0.2">
   <device>
       <match key="usb_device.vendor_id" int="0x5ac">
-	      <match key="usb_device.product_id" int="0x1290">
-		   <append key="info.capabilities" type="strlist">block</append>
-		   <append key="info.capabilities" type="strlist">storage</append>
-		   <merge key="info.callouts.add" type="strlist">hal-iphone-setup</merge>
-		   <merge key="info.category" type="string">storage</merge>
-		   <merge key="storage.bus" type="string">usb</merge>
-		   <merge key="storage.drive_type" type="string">disk</merge>
-		   <merge key="storage.removable" type="bool">true</merge>
-		   <merge key="storage.removable.media_available" type="bool">true</merge>
-		   <merge key="storage.requires_eject" type="bool">false</merge>
-		   <merge key="storage.hotpluggable" type="bool">false</merge>
-		   <merge key="storage.media_check_enabled" type="bool">false</merge>
-		   <merge key="storage.automount_enabled_hint" type="bool">true</merge>
-		   <merge key="storage.no_partitions_hint" type="bool">true</merge>
-		   <merge key="storage.model" type="string">iPhone</merge>
-		   <merge key="storage.vendor" type="string">Apple Computer, Inc.</merge>
-		   <merge key="storage.orginating_device" type="copy_property">/org/freedesktop/Hal/devices/computer</merge>
-		   <append key="block.device" type="copy_property">@info.udi:linux.device_file</append>
-		   <merge key="block.storage_device" type="copy_property">@info.parent:info.udi</merge>
-	      </match>
+        <match key="usb.product_id" compare_ge="0x1290">
+          <match key="usb.product_id" compare_le="0x1293">
+	    <append key="info.capabilities" type="strlist">block</append>
+	    <append key="info.capabilities" type="strlist">storage</append>
+	    <merge key="info.callouts.add" type="strlist">hal-iphone-setup</merge>
+	    <merge key="info.category" type="string">storage</merge>
+	    <merge key="storage.bus" type="string">usb</merge>
+	    <merge key="storage.drive_type" type="string">disk</merge>
+	    <merge key="storage.removable" type="bool">true</merge>
+	    <merge key="storage.removable.media_available" type="bool">true</merge>
+	    <merge key="storage.requires_eject" type="bool">false</merge>
+	    <merge key="storage.hotpluggable" type="bool">false</merge>
+	    <merge key="storage.media_check_enabled" type="bool">false</merge>
+	    <merge key="storage.automount_enabled_hint" type="bool">true</merge>
+	    <merge key="storage.no_partitions_hint" type="bool">true</merge>
+	    <merge key="storage.model" type="string">iPhone</merge>
+	    <merge key="storage.vendor" type="string">Apple Computer, Inc.</merge>
+	    <merge key="storage.orginating_device" type="copy_property">/org/freedesktop/Hal/devices/computer</merge>
+	    <append key="block.device" type="copy_property">@info.udi:linux.device_file</append>
+	    <merge key="block.storage_device" type="copy_property">@info.parent:info.udi</merge>
+          </match>
+        </match>
       </match>
     <match key="info.subsystem" string="usb">
       <match key="usb.vendor_id" int="0x5ac">
-         <match key="usb.product_id" int="0x1290">
-	 <match key="usb.interface.number" int="0x1">
-           <remove key="info.capabilities" type="strlist">camera</remove>
-           <append key="info.capabilities" type="strlist">block</append>
-           <append key="info.capabilities" type="strlist">volume</append>
-           <merge key="info.category" type="string">volume</merge>
-           <merge key="info.callouts.add" type="strlist">hal-iphone-setup</merge>
-	   <append key="block.device" type="copy_property">@info.parent:linux.device_file</append>
-	   <merge key="block.storage_device" type="copy_property">@info.parent:info.udi</merge>
-           <merge key="block.is_volume" type="bool">true</merge>
-           <merge key="block.no_partitions" type="bool">true</merge>
-           <merge key="block.have_scanned" type="bool">false</merge>
-           <append key="volume.fstype" type="string">fuse.ifuse</append>
-	   <merge key="volume.mount.valid_options" type="strlist">allow_other</merge>
-	   <append key="volume.fsusage" type="string">filesystem</append>
-           <append key="volume.label" type="string">iPhone</append>
-           <append key="volume.uuid" type="string"></append>
-	   </match>
-       </match>
-     </match>
+        <match key="usb.product_id" compare_ge="0x1290">
+          <match key="usb.product_id" compare_le="0x1293">
+	    <match key="usb.interface.number" int="0x1">
+              <remove key="info.capabilities" type="strlist">camera</remove>
+              <append key="info.capabilities" type="strlist">block</append>
+              <append key="info.capabilities" type="strlist">volume</append>
+              <merge key="info.category" type="string">volume</merge>
+              <merge key="info.callouts.add" type="strlist">hal-iphone-setup</merge>
+	      <append key="block.device" type="copy_property">@info.parent:linux.device_file</append>
+	      <merge key="block.storage_device" type="copy_property">@info.parent:info.udi</merge>
+              <merge key="block.is_volume" type="bool">true</merge>
+              <merge key="block.no_partitions" type="bool">true</merge>
+              <merge key="block.have_scanned" type="bool">false</merge>
+              <append key="volume.fstype" type="string">fuse.ifuse</append>
+	      <merge key="volume.mount.valid_options" type="strlist">allow_other</merge>
+	      <append key="volume.fsusage" type="string">filesystem</append>
+              <append key="volume.label" type="string">iPhone</append>
+              <append key="volume.uuid" type="string"></append>
+	    </match>
+          </match>
+        </match>
+      </match>
     </match>
   </device>
 </deviceinfo>
-- 
cgit v1.1-32-gdbae