hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
diff-tree 785adba9f3725db46bc3decfbaeb7eb29c04a26f (from baccb9df5c7f65d237a83990074e5e3c8437b19e)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Sep 11 19:55:12 2007 +0200

    fixed entry for Samsung YP-F1
    
    Fixed entry for Samsung YP-F1, the player plays also WAV and record
    WAV instead of MP3.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index a27aa70..130e4ae 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -169,16 +169,16 @@
             <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, YP-F1 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x5021;0x502b">
+	  <!-- Samsung Yepp YP-ST5 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x5021">
 	    <merge key="portable_audio_player.type" type="string">generic</merge>
 	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
 	    <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-MT6V, YP-U1, YP-U2Z -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x5026;0x503b;0x5050">
+	  <!-- Samsung YP-MT6V, YP-F1,YP-U1, YP-U2Z -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x5026;0x502b;0x503b;0x5050">
 	    <merge key="portable_audio_player.type" type="string">generic</merge>
 	    <merge key="portable_audio_player.access_method" type="string">storage</merge>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>