hal: Branch 'master' - 2 commits

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi  |   10 ++++++++++
 fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi |    5 +++++
 2 files changed, 15 insertions(+)

New commits:
commit 7d998936ad6ccb681d89c4097112276b703eeedf
Author: Damien Collard <rork at free.fr>
Date:   Tue Dec 11 12:53:08 2007 +0100

    add portable music player Samsung YP-T7F
    
    Here is a patch (against the latest 10-usb-music-players.fdi on
    freedesktop.org) that adds support for Samsung's YP-T7F portable music
    player. With this patch applied, the player is properly recognized by
    (for example) Banshee.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index fb83db0..190a2eb 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -198,6 +198,16 @@
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
 	  </match>
+          <!-- Samsung YP-T7F -->
+          <match key="@storage.originating_device:usb.product_id" int="0x503d">
+            <merge key="portable_audio_player.type" type="string">generic</merge>
+            <merge key="portable_audio_player.access_method" type="string">storage</merge>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+            <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
+            <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+            <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+            <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+          </match>
           <!-- Samsung YP-Z5 -->
           <match key="@storage.originating_device:usb.product_id" int="0x5041">
             <merge key="portable_audio_player.type" type="string">generic</merge>
commit d54b3529f156ea78b6e04317ea99c0ff895e585c
Author: Terry Barnaby <terry at beam.ltd.uk>
Date:   Tue Dec 11 12:47:15 2007 +0100

    video suspend quirk for IBM ThinkPad R52 with ATI
    
    Enclosed is a patch to fix the suspend on an IBM R52 with ATI graphics.
    It uses the product number.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 535a5f3..98d1a1b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -48,6 +48,11 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
+      <!-- R52 ATI Mobility Radeon X300 -->
+      <match key="system.hardware.product" prefix_outof="1846">
+          <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+          <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+      </match>
       <!-- T41 -->
       <match key="system.hardware.version" string="ThinkPad T41">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>