hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree cdd641dc9133cdc43ca351cde1b15775cedd4905 (from 381d55fe8238efed31459bc21d8623215f81cc97)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Aug 10 17:58:28 2007 +0200

    add support for M-Cody M20 USB mp3 player
    
    Applied adopted patch from Doug Goldstein <cardoe at gentoo.org> to
    add support for a M-Cody M20 USB mp3 player.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 4b5f75b..28a17bb 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -844,8 +844,19 @@
           </match>
         </match>
 
-        <!-- Maxfield -->
+        <!-- Maxfield, M-Cody -->
         <match key="@storage.originating_device:usb.vendor_id" int="0x1890">
+  	  <!-- M-Cody M20 -->
+          <match key="@storage.originating_device:usb.product_id" int="0x0001">
+	    <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/x-wav</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">voice/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">fm/</append>
+          </match>
           <!-- Maxfield MAX-SIN TOUCH -->
           <match key="@storage.originating_device:usb.product_id" int="0x0110">
             <merge key="portable_audio_player.type" type="string">generic</merge>