hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree eaceb3f57e8869deb3ab4b74da79e64782854194 (from 2f989a01fc0529861bca7bba3a742dd00f2ad796)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Feb 21 16:57:11 2007 +0100

    added RCA Lyra RD1072 and a Transcend T.SONIC USB mp3 player, cleanup
    
    Applied slightly adopted patch from Javier Aravena <phrodo.00 at gmail.com>
    to support RCA Lyra RD1072 and a Transcend T.SONIC USB mp3 player
    (fd.o bug #8523).
    
    Move a player to correct vendor to avoid multiple vendor matches/sections.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index ff81940..3aa4e59 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -369,6 +369,17 @@
     	    <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>
+          <!--Transcend (T.Sonic ??? White) -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x821f">
+	    <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>
           <!-- Jens of Sweeden (JoS) MP-120 -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x82d4">
             <append key="info.capabilities" type="strlist">portable_audio_player</append>
@@ -381,10 +392,34 @@
             <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>
+	  <!-- TrekStor i.Beat jump MP3 Player -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x835d">
+	    <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>
 
 	<!-- RCA -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0x69b">
+	  <!-- Lyra RD1072-->
+	  <match key="@storage.originating_device:usb.product_id" int="0x713">
+	    <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>
 	  <!-- Lyra RD2212 -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x718">
 	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
@@ -963,20 +998,6 @@
         </match>
       </match>
 
-      <!-- TrekStor i.Beat jump MP3 Player -->
-      <match key="@storage.originating_device:usb.vendor_id" int="0x066f">
-        <match key="@storage.originating_device:usb.product_id" int="0x835d">
-          <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>
-
       <!-- Nexia NX58XX (including Super*Talent MegaScreen) -->
       <match key="@storage.originating_device:usb.vendor_id" int="0x1718">
         <match key="@storage.originating_device:usb.product_id" int="0x1013">