hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree bf7508ab3ff0d1139d79486a35beda94e1b0083b (from 3ee894062938f08ee7b54490dd8d4dbdcb4d0c61)
Author: Dan Williams <dcbw at redhat.com>
Date:   Thu Aug 31 23:06:19 2006 +0200

    Added ROKR e2 to USB Music Players
    
    Make the ROKR e2 look like an audio player device, which it actually is.
    (see fd.o bug #7879)

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index b660c4a..5194982 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -703,6 +703,23 @@
 	  </match>
 	</match>
 
+        <!-- Motorola -->
+        <match key="@storage.physical_device:usb.vendor_id" int="0x22b8">
+          <!-- ROKR e2 Memory Card mode -->
+          <match key="@storage.physical_device:usb.product_id" int="0x608d">
+            <merge key="storage.model" type="string">ROKR e2</merge>
+            <merge key="storage.vendor" type="string">Motorola</merge>
+            <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.output_formats" type="strlist">audio/aac</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+          </match>
+        </match>
+
 	<!-- iRiver -->
 	<match key="@storage.physical_device:usb.vendor_id" int="0x4102">
 	  <!-- T30 UMS -->