hal: Branch 'master'

[David Zeuthen]

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

New commits:
diff-tree 0bf91810a2e904ec0e4ff9df5d7a68b390e1b731 (from f4b7cdba4aeefca32c59532c3ec14249a778db9a)
Author: Steven Walter <stevenrwalter at gmail.com>
Date:   Wed May 23 13:07:51 2007 -0400

    add support for Sandisk Sansa m240

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 7ac70aa..02fd962 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -374,6 +374,18 @@
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
           </match>
+          <!-- Sandisk Corp. Sansa m230 (maybe others as well) -->
+          <match key="@storage.physical_device:usb.product_id" int="0x7431">
+            <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/x-ms-wma</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/x-ms-wma</append>
+          </match>
           <!-- Sansa e270 (maybe others as well) -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x7421">
             <merge key="portable_audio_player.type" type="string">generic</merge>