hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit ee829a040a61df4ece4fcf0ae18b1f43f242b635
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Sep 11 17:37:51 2008 +0200

    add Blackberry devices as USB music players
    
    Added an adopted patch from Aaron Bockover <abockover at novell.com>
    to add some Blackberry devices as USB music players.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 1122e6b..d0670dc 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -551,6 +551,18 @@
 	  </match>
         </match>
 
+        <!-- RIM -->
+        <match key="@storage.originating_device:usb.vendor_id" int="0x0fca">
+          <!-- Blackberry 8100 (Pearl), 8000 (Curve), 9000 (Bold) -->
+          <match key="@storage.originating_device:usb.product_id" int_outof="0x4;0x6;0x8004">
+            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+          </match>
+        </match>
+
 	<!-- Sony Ericsson -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0xfce">
 	  <!-- K750i mobile phone -->