hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 0011a3c481acd835432fc08244e7889b4dec299a (from c0430118b551ff22e90825192561b44bf8f804f6)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 6 17:40:47 2007 +0200

    add support for Thomson PDP9512FM entry from fd.o #10901
    
    Applied slightly adopted patch from Lukáš Lalinský <lalinsky at gmail.com>
    (from fd.o #10901) to add support for Thomson PDP9512FM USB mp3 player.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 40ab86c..4b5f75b 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -422,6 +422,14 @@
             <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>
+          <!-- Thomson PDP9512FM -->
+          <match key="@storage.originating_device:usb.product_id" int="0x76b">
+            <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">audio/x-wav</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+          </match>
 	</match>
 
 	<!-- SanDisk -->