hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree aee9db6892551a86c1da0f31ba2a1c776dd8419a (from e3699bad5e8da3a986a585c7ff448fdfc90403b9)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Mar 5 21:17:31 2007 +0100

    moved Nokia devices into existing structure/logic
    
    Moved the NOkia N770 and N800 entries for USB music players into the
    existing structure to avoid unneeded entries.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index b6524f6..9b94bb5 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -88,6 +88,25 @@
 	  </match>
 	</match>
 	
+        <match key="@storage.originating_device:usb.vendor_id" int="0x421">
+  	  <!-- Nokia 770 -->
+          <match key="@storage.originating_device:usb.product_id" int="0x431">
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+            <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>
+          </match>
+          <!-- Nokia N800 -->
+          <match key="@storage.originating_device:usb.product_id" int="0x4c3">
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+            <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>
+          </match>
+        </match>
+
 	<!-- SONICblue -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0x045a">
 	  <!-- Rio Forge -->
@@ -903,33 +922,7 @@
           <merge key="storage.drive_type" type="string">memory_stick</merge>
         </match>
       </match>
-      <match key="@storage.originating_device:usb.vendor_id" int="0x421">
-	<!-- Nokia 770 -->
-        <match key="@storage.originating_device:usb.product_id" int="0x431">
-          <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">generic</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>
-          <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>
-        </match>
-        <!-- Nokia N800 -->
-        <match key="@storage.originating_device:usb.product_id" int="0x4c3">
-          <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">generic</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>
-          <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>
-        </match>
-      </match>
     </match>
-
+    
   </device>
 </deviceinfo>