hal: Branch 'origin'

[Richard Hughes]

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

New commits:
diff-tree 2a8453efcb35630edd780d220cb25e464ee008b6 (from 52407a01c05d18211c6097fac4aae710d14302f5)
Author: Thomas J. Baker <tjb at unh.edu>
Date:   Wed May 23 16:36:44 2007 -0400

    add Creative Zen Stone
    
    From https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=240875

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 7d22983..d74ec24 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -86,6 +86,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>
+          <!-- Zen Stone -->
+          <match key="@storage.originating_device:usb.product_id" int="0x4154">
+            <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/audible</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>
+            <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+          </match>
 	</match>
 
 	<!-- Nokia -->