hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 004d59ead4d2cc0217ff4c48ffae382d5fb95011 (from f743c790e816c5613cc4ddfe711bca92296faa84)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 6 14:09:29 2007 +0200

    add support for Zen Nano Plus from fd.o #11756
    
    Added slightly adopted patch from fd.o #11756 send/reported by
    Claudio Saavedra <csaavedra at alumnos.utalca.cl> to add support for
    Zen Nano Plus.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 9efb2e8..e93f1d5 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -98,6 +98,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>
+          <!-- Zen Nano Plus-->
+          <match key="@storage.originating_device:usb.product_id" int="0x4139">
+            <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/mpeg</append>
+          </match>
           <!-- Zen Stone -->
           <match key="@storage.originating_device:usb.product_id" int="0x4154">
             <merge key="portable_audio_player.type" type="string">generic</merge>