hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree c0430118b551ff22e90825192561b44bf8f804f6 (from f5b9163235e8539ba0645eff4a31a5d6534cd8bc)
Author: Ilya Konstantinov <freedesktop-bugzilla at future.shiny.co.il>
Date:   Mon Aug 6 15:15:34 2007 +0200

    add support for MPMan USB mp3 player
    
    Applied patch from fd.o #11170:
    > Another variant of the good old MPMan which I've recently acquired
    > with PID 0x1101. Same abilities as the PID 0x1100 one.
    
    > Also updated the PID 0x1100 one with the proper folder_depth (tested
    > - 1 folder depth is supported, 2 folder depths are not).

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 73d3ec8..40ab86c 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -780,18 +780,26 @@
 	  </match>
 	</match>
      
-	<!-- Foston, MPMan -->
+	<!-- Foston, MPMan, Actions Semiconductor -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0x10d6">
 	  <!-- Foston 128/256MB / MPMan MP-Ki 128 Player -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x1100">
 	    <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.folder_depth" type="int">0</merge>
+            <merge key="portable_audio_player.folder_depth" type="int">1</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/x-wav</append>
+	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+	  </match>
+	  <!-- A similar 2GB MP3 Player -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x1101">
+	    <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.folder_depth" type="int">1</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/x-wav</append>
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
 	  </match>
-   
 	</match>
 
         <!-- Jens of Sweden -->