hal: Branch 'master'

[Richard Hughes]

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

New commits:
diff-tree 4e6f2c6c565374ad22cc9e0ba1d44479d020a86b (from 10333cf444c0f57257b693c3a433b5dcb11a860e)
Author: Steven Walter <stevenrwalter at gmail.com>
Date:   Tue Oct 10 18:26:55 2006 +0100

    Add match for Creative Zen Nano USB music player

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 5194982..5860ac8 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -83,6 +83,15 @@
 	    <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 -->
+          <match key="@storage.physical_device:usb.product_id" int="0x412c">
+	    <append key="info.capabilities" type="strlist">portable_audio_player</append>
+            <merge key="info.category" type="string">portable_audio_player</merge>
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/mpeg</append>
+          </match>
 	  <!-- NOMAD Jukebox Zen Xtra -->
 	  <match key="@storage.physical_device:usb.product_id" int="0x4128">
 	    <append key="info.capabilities" type="strlist">portable_audio_player</append>