hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 2f989a01fc0529861bca7bba3a742dd00f2ad796 (from e8fe5376cb79e428a6c13695b44b5c315486bb5a)
Author: Dan Williams <dcbw at redhat.com>
Date:   Wed Feb 21 16:28:10 2007 +0100

    added support for Sidekick 3 USB musicplayer devices
    
    Applied slightly adopted patch from Dan Williams <dcbw at redhat.com> to
    support Sidekick 3 USB musicplayer devices (fd.o bug #8752).

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 3a129e9..ff81940 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -434,6 +434,20 @@
           </match>
         </match>
         
+	<!-- Danger Research -->
+	<match key="@storage.originating_device:usb.vendor_id" int="0x0da0">
+	  <!-- Hiptop/Sidekick 3 -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x1001">
+	    <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>
+	    <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+	  </match>
+	</match>
+
 	<!-- Cowon -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
 	  <!-- iAudio M3 -->