hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 4d8b0bde1fef59c99ff6b58d00d7167b27fc2a08 (from 7287d133a326d7c2c33567da36a015358d82e8a2)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed May 30 11:29:44 2007 +0200

    fixed USB music player entries
    
    fixed several music player entries:
    - don't use deprecated physical_device*
    - cleanup Sansa m230 entrie to respect current structure of the file

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 346eb6b..2fd141e 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -128,11 +128,11 @@
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
           </match>
           <!-- Nokia E60 -->
-          <match key="@storage.physical_device:usb.product_id" int="0x0434">
+          <match key="@storage.originating_device:usb.product_id" int="0x0434">
             <merge key="storage.requires_eject" type="bool">true</merge>
           </match>
           <!-- Nokia E70 -->
-	  <match key="@storage.physical_device:usb.product_id" int="0x0433">
+	  <match key="@storage.originating_device:usb.product_id" int="0x0433">
 	    <merge key="storage.requires_eject" type="bool">true</merge>
 	  </match>
         </match>
@@ -396,13 +396,9 @@
             <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>
+          <match key="@storage.originating_device:usb.product_id" int="0x7431">
             <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>