hal-info: Branch 'master'

[Danny Kukawka]

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

New commits:
commit d4b53c3b59df581bb891a4beb24983ffb123f0c5
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Oct 2 17:45:45 2008 +0200

    removed deprecated keys from 10-usb-music-players.fdi
    
    Removed deprecated and outdated (2008-05-03) keys from
    10-usb-music-players.fdi:
    - portable_audio_player.access_method
    - portable_audio_player.type
    
    Fixed some iPod related entries for Motorola.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index fee75dd..55194cf 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -9,8 +9,6 @@
         <match key="storage.model" contains="iPod">
           <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
           <addset key="portable_audio_player.access_method.protocols" type="strlist">ipod</addset>
-          <!-- portable_audio_player.type is deprecated and get removed in the future -->
-          <merge key="portable_audio_player.type" type="string">ipod</merge>
           <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</addset>
           <merge key="storage.requires_eject" type="bool">true</merge>
         </match>
@@ -814,11 +812,11 @@
 	    <merge key="storage.model" type="string">V3 series</merge>
 	    <match key="@storage.originating_device:@info.parent:usb_device.product" contains="Motorola Phone (V3i)">
                <merge key="storage.model" type="string">Motorola Phone (V3i)</merge>
-               <merge key="portable_audio_player.type" type="string">ipod</merge>
+               <addset key="portable_audio_player.access_method.protocols" type="strlist">ipod</addset>
             </match>
 	    <match key="@storage.originating_device:@info.parent:usb_device.product" contains_ncase="iTunes">
                <merge key="storage.model" type="string">Motorola iTunes Phone</merge>
-               <merge key="portable_audio_player.type" type="string">ipod</merge>
+               <addset key="portable_audio_player.access_method.protocols" type="strlist">ipod</addset>
             </match>
 	    <merge key="storage.vendor" type="string">Motorola</merge>
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
@@ -871,10 +869,6 @@
     <!-- Set common keys for detected audio player if you have special cases add the player below this match -->
     <match key="portable_audio_player.access_method.protocols" exists="true">
       <match key="portable_audio_player.access_method.protocols" contains="storage">
-        <!-- NOTE: for backward compatibility until key get removed finally -->
-        <merge key="portable_audio_player.access_method" type="string">storage</merge>
-        <!-- NOTE: for backward compatibility until key get removed finally -->
-        <merge key="portable_audio_player.type" type="string">generic</merge>
 	<merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
       </match>
       <append key="info.capabilities" type="strlist">portable_audio_player</append>
@@ -891,10 +885,7 @@
         <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>
-          <!-- 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>