hal-info: Branch 'master'

[Martin Pitt]

 fdi/information/10freedesktop/10-usb-music-players.fdi |    7 +++++++
 fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi       |   12 ++++++++++++
 2 files changed, 19 insertions(+)

New commits:
commit 2150dbcd1561fc0ad65165d64bff9663be297a8b
Author: Achim Frase <achim.frase at googlemail.com>
Date:   Thu Feb 26 10:52:15 2009 +0100

    add Samsung YP S5 music player
    
    Add Samsung YP S5 music player. The YP-S5 has two partitions, the
    first is for music and other data, the second is a system partition
    which should be ignored. Reported in https://launchpad.net/bugs/332913

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 7c662b6..f4b0ab3 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -293,6 +293,13 @@
 	    <append key="portable_audio_player.playlist_formats" type="strlist">audio/x-mpegurl</append>
 	    <append key="portable_audio_player.playlist_path" type="string">PLAYLISTS/%File</append>
 	  </match>
+	  <!-- Samsung YP-S5 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x508c">
+	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+	    <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+	  </match>
 	</match>
  	
 	<!-- Sony -->
diff --git a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
index 5e56980..6335123 100644
--- a/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
+++ b/fdi/preprobe/10osvendor/20-broken-usb-sticks.fdi
@@ -40,6 +40,18 @@
          <merge key="info.ignore" type="bool">true</merge>
        </match>
      </match>
+
+     <!-- Ignore the system partition on the Samsung YP S5 music player; the
+          first one is the interesting one with the music, etc. LP #332913 -->
+     <match key="@info.parent:storage.vendor" contains="Samsung">
+       <match key="@info.parent:storage.model" contains="YP-S5">
+         <match key="volume.label" string="S5">
+           <match key="volume.partition.number" int="2">
+             <merge key="volume.ignore" type="bool">true</merge>
+           </match>
+         </match>
+       </match>
+     </match>
    </match>
   </device>
 </deviceinfo>