hal: Branch 'origin' - 2 commits

[Richard Hughes]

 fdi/information/10freedesktop/10-usb-music-players.fdi   |   12 ++++++++++++
 fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi |   12 ++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)

New commits:
diff-tree 2c52f1eb30d72910dbf26f2b7d01852295994389 (from 0bf91810a2e904ec0e4ff9df5d7a68b390e1b731)
Author: Frederic Crozat <fcrozat at mandriva.com>
Date:   Wed May 23 13:16:08 2007 -0400

    merge two samsung entries which were independent before

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
index 659010d..9294183 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-misc.fdi
@@ -48,14 +48,6 @@
       </match>
     </match>
   </device>
-  <device>
-    <match key="system.hardware.vendor" string="Samsung">
-      <match key="system.hardware.product" string="SQ10">
-        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
-        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
-      </match>
-    </match>
-  </device>
   <!-- VIA EPIA M Mini-ITX Motherboard with onboard gfx -->
   <device>
     <match key="system.hardware.vendor" prefix="VIA">
@@ -70,6 +62,10 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <match key="system.hardware.product" string="SQ10">
+        <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+        <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+      </match>
     </match>
   </device>
 
diff-tree 0bf91810a2e904ec0e4ff9df5d7a68b390e1b731 (from f4b7cdba4aeefca32c59532c3ec14249a778db9a)
Author: Steven Walter <stevenrwalter at gmail.com>
Date:   Wed May 23 13:07:51 2007 -0400

    add support for Sandisk Sansa m240

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 7ac70aa..02fd962 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -374,6 +374,18 @@
             <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>
           </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>
+            <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>
+          </match>
           <!-- Sansa e270 (maybe others as well) -->
 	  <match key="@storage.originating_device:usb.product_id" int="0x7421">
             <merge key="portable_audio_player.type" type="string">generic</merge>