hal: Branch 'master' - 2 commits

[Danny Kukawka]

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

New commits:
diff-tree defc0819bb691d3adad05b1b61df080e4db0f726 (from 7d31690fb77e55dc62d2209b35c659e93650814a)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Feb 21 17:54:27 2007 +0100

    amend entries for SE W800i and Motorola V360
    
    Applied slightly adopted parts of a patch from Adam Williamson
    <awilliamson at mandriva.com> to amend the entries for the SE W800i and
    Motorola V360 with folder and name information (fd.o bug #8510).

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 216ff4b..35a7d45 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -730,6 +730,8 @@
 	    <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>
+	    <append key="portable_audio_player.audio_folders" type="strlist">MP3/</append>
+	    <append key="portable_audio_player.audio_folders" type="strlist">MSSEMC/Media files/audio/</append>
 	  </match>
 	</match>
 
@@ -864,14 +866,18 @@
         <match key="@storage.originating_device:usb.vendor_id" int="0x22b8">
           <!-- Motorola iTunes enabled phone -->
           <match key="@storage.originating_device:usb.product_id" int="0x4810">
+	    <merge key="storage.model" type="string">V360</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.access_method" type="string">storage</merge>
             <merge key="portable_audio_player.type" type="string">ipod</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>
-            <merge key="storage.requires_eject" type="bool">true</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>
+	    <append key="portable_audio_player.audio_folders" type="strlist">mobile/audio/</append>
+	    <merge key="storage.requires_eject" type="bool">true</merge>
           </match>
           <!-- ROKR e2 Memory Card mode -->
           <match key="@storage.originating_device:usb.product_id" int="0x608d">
diff-tree 7d31690fb77e55dc62d2209b35c659e93650814a (from e02d63eb700f798f913f2af59fb5cb0e0b428464)
Author: Jakub Steiner <jimmac at novell.com>
Date:   Wed Feb 21 17:27:18 2007 +0100

    specify location for mp3s on a PSP in the FDI file
    
    Fixed FDI file to get music copied to a location where the Playstation
    Portable (PSP) finds it.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index ab40d2e..216ff4b 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -27,6 +27,7 @@
           <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/vnd.sony.atrac3</append>
+	  <append key="portable_audio_player.audio_folders" type="strlist">PSP/MUSIC/</append>
           <merge key="storage.drive_type" type="string">memory_stick</merge>
         </match>
       </match>