hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

New commits:
diff-tree e8fe5376cb79e428a6c13695b44b5c315486bb5a (from 061ea78e3575f71eb42d63f9b8f7e0b02f3d23ed)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Feb 21 16:16:49 2007 +0100

    added iRiver T10 UMS USB music player and fixed keys
    
    Added slightly adopted patch from Jon Lund Steffensen <jonlst at gmail.com>
    to add the iRiver T10 UMS USB music player (fd.o bug #8959).
    
    Fixed some keys from last commits (s/physical_device/originating_device/).

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 6b66287..3a129e9 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -226,7 +226,7 @@
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
 	  </match>	
 	  <!-- Samsung YP-MT6V -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x5026">
+	  <match key="@storage.originating_device:usb.product_id" int="0x5026">
 	    <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>
@@ -488,7 +488,7 @@
 	    <append key="portable_audio_player.playlist_path" type="strlist">PLAYLIST/%File</append>
 	  </match>
 	  <!-- iAudio U2 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x600">
+	  <match key="@storage.originating_device:usb.product_id" int="0x600">
 	    <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>
@@ -772,6 +772,18 @@
             <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>
+	  <!-- T10 UMS -->
+          <match key="@storage.originating_device:usb.product_id" int="0x1020">
+            <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.originating_device:usb.product_id" int="0x1101">
 	    <append key="info.capabilities" type="strlist">portable_audio_player</append>