hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit df367f4b4fdbf7cfa5bf3ba2d17ee8cd4d43289c
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Mar 11 19:39:38 2008 +0100

    port PSP as musicplayer correctly
    
    Port PSP as musicplayer correctly and provide some comments and the old
    deprecated key portable_audio_player.access_method=storage for now until
    key get removed finally.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index f25cfc5..9996f2a 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -863,8 +863,11 @@
       <match key="storage.vendor" string="Sony">
         <match key="storage.model" string="PSP">
           <append key="info.capabilities" type="strlist">portable_audio_player</append>
+          <!-- NOTE: for backward compatibility until key get removed finally -->
+	  <merge key="portable_audio_player.access_method" type="string">storage</merge>
           <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-          <merge key="portable_audio_player.type" type="string">psp</merge>
+          <!-- NOTE: for backward compatibility until key get removed finally -->
+	  <merge key="portable_audio_player.type" type="string">psp</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/vnd.sony.atrac3</append>