hal: Branch 'master'

Richard Hughes hughsient at kemper.freedesktop.org
Mon Nov 6 15:57:02 PST 2006


 fdi/information/.gitignore                             |    4 
 fdi/information/10freedesktop/.gitignore               |    4 
 fdi/information/10freedesktop/10-camera-ptp.fdi        |   17 
 fdi/information/10freedesktop/10-cd-dvd-burner.fdi     |   31 
 fdi/information/10freedesktop/10-usb-card-readers.fdi  |  127 --
 fdi/information/10freedesktop/10-usb-music-players.fdi | 1034 -----------------
 fdi/information/10freedesktop/10-usb-pda.fdi           |  117 -
 fdi/information/10freedesktop/10-usb-zip-drives.fdi    |   19 
 fdi/information/10freedesktop/Makefile.am              |   25 
 fdi/information/20thirdparty/.gitignore                |    4 
 fdi/information/20thirdparty/Makefile.am               |    7 
 fdi/information/30user/.gitignore                      |    4 
 fdi/information/30user/Makefile.am                     |    7 
 fdi/information/Makefile.am                            |    3 
 14 files changed, 1403 deletions(-)

New commits:
diff-tree cd33ada3027bd96f4292d316fd0c346a55914b2f (from 87c1c4b9b078b007836c658f251e9ce6ce2891bf)
Author: Richard Hughes <hughsie at hughsie-laptop.(none)>
Date:   Mon Nov 6 23:56:54 2006 +0000

    move the information scripts to hal-info
    
    Move the information fdi files to hal-info. Really this time.
    YOU NOW NEED TO PACKAGE AND INSTALL HAL-INFO AS WELL AS HAL.

diff --git a/fdi/information/.gitignore b/fdi/information/.gitignore
deleted file mode 100644
index 35e3b27..0000000
--- a/fdi/information/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-*.o
-*~
diff --git a/fdi/information/10freedesktop/.gitignore b/fdi/information/10freedesktop/.gitignore
deleted file mode 100644
index 35e3b27..0000000
--- a/fdi/information/10freedesktop/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-*.o
-*~
diff --git a/fdi/information/10freedesktop/10-camera-ptp.fdi b/fdi/information/10freedesktop/10-camera-ptp.fdi
deleted file mode 100644
index 9879725..0000000
--- a/fdi/information/10freedesktop/10-camera-ptp.fdi
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
-  <device>
-    <match key="info.bus" string="usb">
-      <match key="usb.interface.class" int="0x06">
-        <match key="usb.interface.subclass" int="0x01">
-          <match key="usb.interface.protocol" int="0x01">
-            <merge key="info.category" type="string">camera</merge>
-	    <append key="info.capabilities" type="strlist">camera</append>
-            <merge key="camera.access_method" type="string">ptp</merge>
-          </match>
-        </match>
-      </match>
-    </match>
-  </device>
-</deviceinfo>
diff --git a/fdi/information/10freedesktop/10-cd-dvd-burner.fdi b/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
deleted file mode 100644
index 0cb920f..0000000
--- a/fdi/information/10freedesktop/10-cd-dvd-burner.fdi
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
-
-  <device>
-
-    <!-- Handle broken CD/DVD burner which reports from capabilities. 
-	 Taken from nautilus-cd-burner-2.12. (fd.o Bug #3036) -->
-      <match key="storage.model" string="IOMEGA - CDRW9602EXT-B">
-        <merge key="storage.cdrom.cdr" type="bool">true</merge>
-        <merge key="storage.cdrom.cdrw" type="bool">true</merge>
-        <merge key="storage.cdrom.dvdr" type="bool">false</merge>
-        <merge key="storage.cdrom.dvdram" type="bool">false</merge>
-      </match>
-      <match key="storage.model" string="SONY - CD-R   CDU948S">
-        <merge key="storage.cdrom.cdr" type="bool">true</merge>
-        <merge key="storage.cdrom.cdrw" type="bool">false</merge>
-        <merge key="storage.cdrom.dvdr" type="bool">false</merge>
-        <merge key="storage.cdrom.dvdram" type="bool">false</merge>
-      </match>
-      
-    <!-- Handle TEAC CD-R55S, taken from :
-         http://lists.freedesktop.org/archives/hal/2005-November/003925.html -->
-      <match key="storage.vendor" string="TEAC">
-        <match key="storage.model" string="CD-R55S">
-          <merge key="storage.cdrom.cdr" type="bool">true</merge>
-        </match>
-      </match>
-
-  </device>
-</deviceinfo>
diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
deleted file mode 100644
index 5802445..0000000
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?> <!-- -*- xml -*- --> 
-
-<deviceinfo version="0.2">
-  <device>
-
-    <!-- Should probably move to separate file for pcmcia devices -->
-    <match key="storage.bus" string="pcmcia">
-      <match key="storage.model" contains="FLASH">
-        <merge key="storage.drive_type" type="string">compact_flash</merge>
-      </match>
-    </match>
-
-    <!-- Should probably move to separate file for firewire devices -->
-    <match key="storage.bus" string="ieee1394">
-      <match key="storage.model" string="FWIRE CF READER">
-        <merge key="storage.drive_type" type="string">compact_flash</merge>
-      </match>
-    </match>
-
-    <!-- Generic catch all -->
-    <match key="storage.bus" string="usb">
-      <match key="storage.model" contains="HS-CF">
-        <merge key="storage.drive_type" type="string">compact_flash</merge>
-      </match>      
-      <match key="storage.model" contains="HS-MS">
-        <merge key="storage.drive_type" type="string">memory_stick</merge>
-      </match>      
-      <match key="storage.model" contains="HS-SM">
-        <merge key="storage.drive_type" type="string">smart_media</merge>
-      </match>      
-      <match key="storage.model" contains="HS-SD/MMC">
-        <merge key="storage.drive_type" type="string">sd_mmc</merge>
-      </match>      
-
-      <!-- Another common theme -->
-      <match key="storage.model" contains="USB CF Reader">
-        <merge key="storage.drive_type" type="string">compact_flash</merge>
-      </match>      
-      <match key="storage.model" contains="USB MS Reader">
-        <merge key="storage.drive_type" type="string">memory_stick</merge>
-      </match>      
-      <match key="storage.model" contains="USB SM Reader">
-        <merge key="storage.drive_type" type="string">smart_media</merge>
-      </match>      
-      <match key="storage.model" contains="USB SD Reader">
-        <merge key="storage.drive_type" type="string">sd_mmc</merge>
-      </match>      
-
-      <!-- Yet another common theme -->
-      <match key="storage.model" contains="Reader-CF">
-        <merge key="storage.drive_type" type="string">compact_flash</merge>
-      </match>
-      <match key="storage.model" contains="Reader-MS">
-        <merge key="storage.drive_type" type="string">memory_stick</merge>
-      </match>
-      <match key="storage.model" contains="Reader-SM">
-        <merge key="storage.drive_type" type="string">smart_media</merge>
-      </match>
-      <match key="storage.model" contains="Reader-SD">
-        <merge key="storage.drive_type" type="string">sd_mmc</merge>
-      </match>
-
-      <!-- Yet another common theme -->
-      <match key="storage.model" contains="Storage-CFC">
-        <merge key="storage.drive_type" type="string">compact_flash</merge>
-      </match>
-      <match key="storage.model" contains="Storage-MSC">
-        <merge key="storage.drive_type" type="string">memory_stick</merge>
-      </match>
-      <match key="storage.model" contains="Storage-SMC">
-        <merge key="storage.drive_type" type="string">smart_media</merge>
-      </match>
-      <match key="storage.model" contains="Storage-MMC">
-        <merge key="storage.drive_type" type="string">sd_mmc</merge>
-      </match>
-      <match key="storage.model" contains="Storage-SDC">
-        <merge key="storage.drive_type" type="string">sd_mmc</merge>
-      </match>
-
-      <!-- Some noname USB2.0 Card Reader -->
-      <match key="storage.model" string="IC1210        CF">
-        <merge key="storage.drive_type" type="string">compact_flash</merge>
-      </match>
-      <match key="storage.model" string="IC1210        MS">
-        <merge key="storage.drive_type" type="string">memory_stick</merge>
-      </match>
-      <match key="storage.model" string="IC1210        SM">
-        <merge key="storage.drive_type" type="string">smart_media</merge>
-      </match>
-      <match key="storage.model" string="IC1210    MMC/SD">
-        <merge key="storage.drive_type" type="string">sd_mmc</merge>
-      </match>
-
-      <!-- Lexar CF Reader -->
-      <match key="@storage.physical_device:usb.vendor_id" int="0x05dc">
-        <match key="@storage.physical_device:usb.product_id" int="0x0002">
-          <merge key="storage.drive_type" type="string">compact_flash</merge>
-        </match>
-      </match>
-
-      <!-- SanDisk ImageMate II CF Reader -->
-      <match key="@storage.physical_device:usb.vendor_id" int="0x0781">
-        <match key="@storage.physical_device:usb.product_id" int="0x0002">
-          <merge key="storage.drive_type" type="string">compact_flash</merge>
-        </match>
-      </match>
-
-      <!-- Sony Ericsson Handys with Memory Stick (Duo) -->
-      <match key="@storage.physical_device:usb.vendor_id" int="0xfce">
-        <!-- K750i -->
-	<match key="@storage.physical_device:usb.product_id" int="0xd016">
-          <merge key="storage.drive_type" type="string">memory_stick</merge>
-          <merge key="info.vendor" type="copy_property">@storage.physical_device:usb.vendor</merge>
-          <merge key="storage.vendor" type="copy_property">@storage.physical_device:usb.vendor</merge>
-	</match>
-	<!-- General match-->
-	<match key="storage.model" contains="Memory Stick">
-          <merge key="storage.drive_type" type="string">memory_stick</merge>
-          <merge key="info.vendor" type="copy_property">@storage.physical_device:usb.vendor</merge>
-          <merge key="storage.vendor" type="copy_property">@storage.physical_device:usb.vendor</merge>
-	</match>
-      </match>
-
-    </match>
-
-  </device>
-</deviceinfo>
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
deleted file mode 100644
index 5860ac8..0000000
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ /dev/null
@@ -1,1034 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
-  <device>
-
-    <match key="info.category" string="storage">
-      <!-- Apple iPod - TODO: use USB ids to determine exact output formats  -->
-      <match key="storage.vendor" contains="Apple">
-	<match key="storage.model" contains="iPod">
-	  <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.access_method" type="string">storage</merge>
-          <merge key="portable_audio_player.type" type="string">ipod</merge>
-          <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
-          <merge key="storage.requires_eject" type="bool">true</merge>
-	</match>
-      </match>
-
-      <!-- Sony PSP (PlayStation Portable) -->
-      <match key="storage.vendor" string="Sony">
-        <match key="storage.model" string="PSP">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="portable_audio_player.access_method" type="string">storage</merge>
-          <merge key="portable_audio_player.type" type="string">psp</merge>
-          <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.sony.atrac3</append>
-          <merge key="storage.drive_type" type="string">memory_stick</merge>
-        </match>
-      </match>
-
-      <!-- USB Mass Storage devices that are music players -->
-      
-      <match key="@storage.physical_device:info.bus" string="usb">
-        <!-- Creative -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x41e">
-	  <!-- MuVo NX -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x4115">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	  <!-- MuVo2 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x4116">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	  <!-- Creative MuVo TX -->
-          <match key="@storage.physical_device:usb.product_id" int="0x4117">
-            <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-          </match>
-	  <!-- Zen Micro -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x411e">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	  <!-- Zen Nano -->
-          <match key="@storage.physical_device:usb.product_id" int="0x412c">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          </match>
-	  <!-- NOMAD Jukebox Zen Xtra -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x4128">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	  <!-- MuVo V200 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x4129">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	  <!-- MuVo N200 (MuVo Micro) -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x412b">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	  <!-- Zen Micro -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x4130">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	</match>
-	
-	<!-- SONICblue -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x045a">
-	  <!-- Rio Forge -->
-          <match key="@storage.physical_device:usb.product_id" int="0x5042">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/audible</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-            <match key="storage.lun" int="1">
-            	<merge key="storage.drive_type" type="string">sd_mmc</merge>
-            </match>
-          </match>
-	  <!-- Rio Karma -->
-          <match key="@storage.physical_device:usb.product_id" int="0x5210">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-          </match>
-	  <!-- Rio Carbon -->
-          <match key="@storage.physical_device:usb.product_id" int="0x5224">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-          </match>
-        </match>
-
- 	<!--Panasonic -->
-        <match key="@storage.physical_deviceusb.vendor_id" int="0x4da">
-	  <!--Panasonic SV-MP31V-->
-	  <match key="@storage.physical_deviceusb.product_id" int="0x3701">
-            <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">PLAYER/</append>
-          </match>
-        </match>
-
-        <!-- Samsung -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x04e8">
-	  <!-- Samsung Yepp YP-35 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x5010">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>	
-	  <!-- Samsung Yepp YP-ST5 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x5021">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	  </match>	
-	  <!-- YP-F1 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x502b">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	  </match>
-          <!-- Samsung YP-U1 -->
-          <match key="@storage.physical_device:usb.product_id" int="0x503b">
-            <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-          </match>  
-          <!-- Samsung YP-Z5 -->
-          <match key="@storage.physical_device:usb.product_id" int="0x5041">
-            <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
-	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
-	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-scpls</append>
-	    <append key="portable_audio_player.playlist_path" type="strlist">Playlists/</append>
-          </match>  
-	  <!-- Samsung YP-U2Z -->
-          <match key="@storage.physical_device:usb.product_id" int="0x5050">
-            <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-          </match>
-	</match>
- 
-	<!-- Sony -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x54c">
-          <!-- Sony Network Walkman -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x1fb">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/vnd.sony.atrac3</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-	</match>
-	
-	<!-- Jetflash MP3 Player, AKA NAPA LCD-HD, AKA Medion, AKA Tevion -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x066f">
-          <match key="@storage.physical_device:usb.product_id" int="0x8000">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-          </match>
-	  <!-- EXATEL i-BEAD100 Player -->
-          <match key="@storage.physical_device:usb.product_id" int="0x8008">
-            <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-          </match>
-	  <!-- Traxdata Digital Audio Player -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x8038">
-            <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-            <match key="storage.lun" int="1">
-                <merge key="storage.drive_type" type="string">sd_mmc</merge>
-            </match>
-          </match>
-	  <!-- TrekStor i.Beat 115 -->
-          <match key="@storage.physical_device:usb.product_id" int="0x829c">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-          </match>
-	  <!-- Medion MD41512 / Tevion 41512 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x8206">
-    	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-    	    <merge key="portable_audio_player.type" type="string">generic</merge>
-    	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-    	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-    	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-    	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-    	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-          </match>
-          <!-- Jens of Sweeden (JoS) MP-120 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x82d4">
-            <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-        </match>
-
-	<!-- RCA -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x69b">
-	  <!-- Lyra RD2212 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x718">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/audible</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	</match>
-
-	<!-- SanDisk -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x781">
-	  <!-- Sansa e130 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x7301">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/audible</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	</match>
-
-	<!-- Peak Digital Audio Player -->
-        <match key="@storage.physical_device:usb.vendor_id" int="0xd7d">
-          <match key="@storage.physical_device:usb.product_id" int="0x1651">
-            <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-            <match key="storage.lun" int="1">
-                <merge key="storage.drive_type" type="string">sd_mmc</merge>
-            </match>
-          </match>
-        </match>
-        
-	<!-- Cowon -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0xe21">
-	  <!-- iAudio M3 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x500">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
-	    <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
-	  </match>
-	  <!-- iAudio X5 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x510">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
-	    <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
-	  </match>
-	  <!-- iAudio M5 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x520">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
-	    <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
-	  </match>
-	  <!-- iAudio G3 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x601">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
-	    <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
-	  </match>
-	  <!-- iAudio 5 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x602">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	  </match>
-	  <!-- iAudio G2 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x604">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	  </match>
-	  <!-- iAudio U3 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x700">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/flac</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">VOICE</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORD</append>
-	    <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
-	    <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE</append>
-	  </match>
-	</match>
-
-	<!-- Archos -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0xe79">
-	  <!-- Archos GMini 400 -->
-          <match key="@storage.physical_device:usb.product_id" int="0x1109">
-            <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
-            <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
-            <append key="portable_audio_player.playlist_path" type="strlist">Playlist/</append>
-          </match>
-	  <!-- Archos XS 100 -->
-          <match key="@storage.physical_device:usb.product_id" int="0x1205">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-          </match>
-        </match>
-
-	<!-- Sony Ericsson -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0xfce">
-	  <!-- K750i mobile phone -->
-	  <match key="@storage.physical_device:usb.product_id" int="0xd016">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-
-	  <!-- W800 Walkman Phone -->
-	  <!-- media files go in mp3/$ARTIST/$ALBUM/$TRACKNAME -->
-	  <match key="@storage.physical_device:usb.product_id" int="0xd028">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	</match>
-
-	<match key="@storage.physical_device:usb.vendor_id" int="0x1006">
-          <!-- iGP 100 -->
-          <match key="@storage.physical_device:usb.product_id" int="0x2001">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-          <!-- iHP-100,115 -->
-          <match key="@storage.physical_device:usb.product_id" int="0x3001">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-          <!-- HP-120,140 -->
-          <match key="@storage.physical_device:usb.product_id" int="0x3002">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-          <!-- H320, H340 -->
-          <match key="@storage.physical_device:usb.product_id" int="0x3003">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-	</match>
-
-	<!-- TouchStone/WaveX -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x10c7">
-	  <!-- TS-300 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0xc000">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	</match>
-     
-	<!-- Foston -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x10d6">
-	  <!-- Foston 256MB -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x1100">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	</match>
-
-        <!-- Jens of Sweden -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x1332">
-	  <!-- MP-130 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x1325">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	</match>
-
-	<!-- MSI -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x1462">
-	  <!-- MegaStick-1 Flash Stick -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x5512">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-	    <merge key="portable_audio_player.type" type="string">generic</merge>
-	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
-	    <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  </match>
-	</match>
-
-        <!-- Motorola -->
-        <match key="@storage.physical_device:usb.vendor_id" int="0x22b8">
-          <!-- ROKR e2 Memory Card mode -->
-          <match key="@storage.physical_device:usb.product_id" int="0x608d">
-            <merge key="storage.model" type="string">ROKR e2</merge>
-            <merge key="storage.vendor" type="string">Motorola</merge>
-            <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-          </match>
-        </match>
-
-	<!-- iRiver -->
-	<match key="@storage.physical_device:usb.vendor_id" int="0x4102">
-	  <!-- T30 UMS -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x1018">
-            <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-          <!-- iFP 100 UMS (supports application/ogg only after firmware upgrade)-->
-	  <match key="@storage.physical_device:usb.product_id" int="0x1101">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-	  <!-- iFP 300 UMS (supports application/ogg only after firmware upgrade)-->
-	  <match key="@storage.physical_device:usb.product_id" int="0x1103">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-	  <!-- iFP 500 UMS (supports application/ogg only after firmware upgrade)-->
-	  <match key="@storage.physical_device:usb.product_id" int="0x1105">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-	    <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-          <!-- iFP 700 UMS-->
-	  <match key="@storage.physical_device:usb.product_id" int="0x1107">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-          <!-- iFP 800 UMS-->
-          <match key="@storage.physical_device:usb.product_id" int="0x1108">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-          <!-- iFP 900 UMS-->
-          <match key="@storage.physical_device:usb.product_id" int="0x1109">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-          <!-- iFP 1000 UMS-->
-          <match key="@storage.physical_device:usb.product_id" int="0x1110">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-          <!-- N10 UMS-->
-          <match key="@storage.physical_device:usb.product_id" int="0x1111">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-          <!-- H10 20GB UMS-->
-          <match key="@storage.physical_device:usb.product_id" int="0x2001">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-          <!-- H10 5GB UMS-->
-          <match key="@storage.physical_device:usb.product_id" int="0x2002">
-	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
-            <merge key="info.category" type="string">portable_audio_player</merge>
-            <merge key="portable_audio_player.type" type="string">generic</merge>
-            <merge key="portable_audio_player.access_method" type="string">storage</merge>
-            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          </match>
-
-	</match>
-      </match>
-    </match>      
-
-    <!-- USB devices that are music players but uses a user-space library -->
-
-    <match key="info.bus" string="usb">
-      <!-- Archos -->
-      <match key="usb.vendor_id" int="0xe79">
-        <!-- GMini 120 -->
-        <match key="usb.product_id" int="0x1201">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	</match>
-        <!-- GMini XS202 -->
-        <match key="usb.product_id" int="0x1206">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-	  <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
-	  <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
-	  <append key="portable_audio_player.playlist_path" type="strlist">Playlists/%File</append>
-        </match>
-      </match>
-
-      <match key="usb.vendor_id" int="0x1006">
-	<!-- iDP 100 UMS-->
-	<match key="usb.product_id" int="0x0001">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-        </match>
-      </match>
-      <match key="usb.vendor_id" int="0x4102">
-	<!-- iFP 100 IMM (supports application/ogg only after firmware upgrade)-->
-	<match key="usb.product_id" int="0x1001">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-        </match>
-	<!-- iFP 300 IMM (supports application/ogg only after firmware upgrade)-->
-	<match key="usb.product_id" int="0x1003">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-        </match>
-	<!-- iFP 500 IMM (supports application/ogg only after firmware upgrade)-->
-	<match key="usb.product_id" int="0x1005">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-        </match>
-        <!-- iFP 700 IMM-->
-	<match key="usb.product_id" int="0x1007">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-        </match>
-        <!-- iFP 800 IMM-->
-        <match key="usb.product_id" int="0x1008">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-        </match>
-        <!-- iFP 900 IMM-->
-        <match key="usb.product_id" int="0x1009">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-        </match>
-        <!-- iFP 1000 IMM-->
-        <match key="usb.product_id" int="0x1010">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-        </match>
-        <!-- N10 IMM-->
-        <match key="usb.product_id" int="0x1011">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-        </match>
-        <!-- H10 20GB MTP-->
-        <match key="usb.product_id" int="0x2101">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-        </match>
-        <!-- H10 5GB MTP-->
-        <match key="usb.product_id" int="0x2102">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-        </match>
-        <!-- H10 5,6GB MTP-->
-        <match key="usb.product_id" int="0x2105">
-          <append key="info.capabilities" type="strlist">portable_audio_player</append>
-          <merge key="info.category" type="string">portable_audio_player</merge>
-          <merge key="portable_audio_player.type" type="string">generic</merge>
-          <merge key="portable_audio_player.access_method" type="string">user</merge>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
-          <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
-          <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
-          <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-        </match>
-      </match>
-
-    </match>
-
-  </device>
-</deviceinfo>
diff --git a/fdi/information/10freedesktop/10-usb-pda.fdi b/fdi/information/10freedesktop/10-usb-pda.fdi
deleted file mode 100644
index 1133f5e..0000000
--- a/fdi/information/10freedesktop/10-usb-pda.fdi
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
-
-  <!-- Pocket PC PDAs -->
-  <device>
-    <match key="info.capabilities" contains="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">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">
-      <match key="@serial.physical_device:info.linux.driver" string="visor">
-	<match key="@serial.physical_device:usb.vendor_id" int="0x054c">
-  	  <!-- Sony Clie 3.5 -->
-          <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="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
-            </match>
-          </match>
-  	  <!-- Sony Clie SJ-22 -->
-          <match key="@serial.physical_device:usb.product_id" int="0x0066">
-            <match key="serial.port" int="0">
-              <append key="info.capabilities" type="strlist">pda</append>
-              <merge key="pda.platform" type="string">palm</merge>
-              <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
-            </match>
-          </match>
-	</match>
-      </match>
-    </match>
-  </device>
-  
-  <!-- Handspring -->
-  <device>
-    <match key="info.capabilities" contains="serial">
-      <match key="@serial.physical_device:info.linux.driver" string="visor">
-	<match key="@serial.physical_device:usb.vendor_id" int="0x082d">
-  	  <!-- Visor -->
-          <match key="@serial.physical_device:usb.product_id" int="0x0100">
-            <match key="serial.port" int="1">
-              <append key="info.capabilities" type="strlist">pda</append>
-              <merge key="pda.platform" type="string">palm</merge>
-              <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
-            </match>
-          </match>
-	</match>
-      </match>
-    </match>
-  </device>
-  
-  <!-- Known Palm PDAs from Palm, Inc. -->
-  <device>
-    <match key="info.capabilities" contains="serial">
-      <match key="@serial.physical_device:info.linux.driver" string="visor">
-	<match key="@serial.physical_device:usb.vendor_id" int="0x0830">
-  	  <!-- Palm m130 -->
-          <match key="@serial.physical_device:usb.product_id" int="0x0050">
-            <match key="serial.port" int="0">
-              <append key="info.capabilities" type="strlist">pda</append>
-              <merge key="pda.platform" type="string">palm</merge>
-              <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
-            </match>
-          </match>
-  	  <!-- Tungsten T5 -->
-          <match key="@serial.physical_device:usb.product_id" int="0x0061">
-            <match key="serial.port" int="1">
-              <append key="info.capabilities" type="strlist">pda</append>
-              <merge key="pda.platform" type="string">palm</merge>
-              <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
-            </match>
-          </match>
-	</match>
-      </match>
-    </match>
-  </device>
-  
-  <!-- All the other PalmOS PDAs as fallback -->
-  <device>
-    <match key="info.capabilities" contains="serial">
-      <match key="@serial.physical_device:info.linux.driver" string="visor">
-	<match key="pda.platform" exists="false">
-          <match key="serial.port" int="0">
-            <append key="info.capabilities" type="strlist">pda</append>
-            <merge key="pda.platform" type="string">palm</merge>
-            <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
-          </match>
-          <match key="serial.port" int="1">
-            <append key="info.capabilities" type="strlist">pda</append>
-            <merge key="pda.platform" type="string">palm</merge>
-            <merge key="pda.palm.hotsync_interface" type="copy_property">serial.device</merge>
-          </match>
-	</match>
-      </match>
-    </match>
-  </device>
-  
-</deviceinfo>
-
diff --git a/fdi/information/10freedesktop/10-usb-zip-drives.fdi b/fdi/information/10freedesktop/10-usb-zip-drives.fdi
deleted file mode 100644
index bf2f64c..0000000
--- a/fdi/information/10freedesktop/10-usb-zip-drives.fdi
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deviceinfo version="0.2">
-  <device>
-
-    <!-- USB Zip Drives -->
-    <match key="storage.bus" string="usb">
-      <match key="storage.drive_type" string="disk">
-	<match key="storage.vendor" string="IOMEGA">
-          <match key="storage.model" contains_ncase="ZIP">
-            <merge key="storage.drive_type" type="string">zip</merge>
-            <merge key="storage.requires_eject" type="bool">true</merge>
-          </match>
-	</match>
-      </match>
-    </match>
-
-  </device>
-</deviceinfo>
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
deleted file mode 100644
index e77f17a..0000000
--- a/fdi/information/10freedesktop/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-
-fdidir = $(datadir)/hal/fdi/information/10freedesktop
-
-dist_fdi_DATA = 10-usb-card-readers.fdi    \
-		10-usb-music-players.fdi   \
-		10-usb-zip-drives.fdi      \
-		10-camera-ptp.fdi	   \
-		10-usb-pda.fdi		   \
-		10-cd-dvd-burner.fdi
-
-check:
-	for f in $(dist_fdi_DATA); do \
-	    echo -n "Validate XML in $$f : "; \
-	    xmllint --noout --dtdvalid $(top_srcdir)/fdi/fdi.dtd $(srcdir)/$$f 2> xmllint.error; \
-	    if test -s xmllint.error; \
-	      then \
-		echo failed; \
-		cat xmllint.error; \
-		rm -f xmllint.error; \
-		exit 1; \
-	    else \
-		echo ok; \
-		rm -f xmllint.error; \
-	    fi; \
-        done; 
diff --git a/fdi/information/20thirdparty/.gitignore b/fdi/information/20thirdparty/.gitignore
deleted file mode 100644
index 35e3b27..0000000
--- a/fdi/information/20thirdparty/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-*.o
-*~
diff --git a/fdi/information/20thirdparty/Makefile.am b/fdi/information/20thirdparty/Makefile.am
deleted file mode 100644
index 095ffca..0000000
--- a/fdi/information/20thirdparty/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-fdidir = $(datadir)/hal/fdi/information/20thirdparty
-
-dist_fdi_DATA =
-
-
-
diff --git a/fdi/information/30user/.gitignore b/fdi/information/30user/.gitignore
deleted file mode 100644
index 35e3b27..0000000
--- a/fdi/information/30user/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-Makefile
-Makefile.in
-*.o
-*~
diff --git a/fdi/information/30user/Makefile.am b/fdi/information/30user/Makefile.am
deleted file mode 100644
index eef1e3d..0000000
--- a/fdi/information/30user/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-
-fdidir = $(sysconfdir)/hal/fdi/information
-
-dist_fdi_DATA =
-
-
-
diff --git a/fdi/information/Makefile.am b/fdi/information/Makefile.am
deleted file mode 100644
index 40ff1e5..0000000
--- a/fdi/information/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-
-SUBDIRS = 10freedesktop 20thirdparty 30user
-


More information about the hal-commit mailing list