hal-info: Branch 'master' - 18 commits

Danny Kukawka dkukawka at kemper.freedesktop.org
Thu Aug 6 14:26:36 PDT 2009 

Rebased ref, commits from common ancestor:
commit eba65779cd95716706912707db297d389fecf8e5
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Sun Aug 2 19:49:27 2009 +0200

    add keymap for a HP Pavillion dv6315ea
    
    Added keymap for a HP Pavillion dv6315ea with empty
    system.hardware.* keys.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 8df6185..3bc4eb1 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -56,6 +56,15 @@
             <append key="input.keymap.data" type="strlist">e059:f23</append>    <!-- touchpad on  -->
 	  </match>
 
+	  <match key="/org/freedesktop/Hal/devices/computer:system.board.vendor" string="Quanta">
+	    <!-- HP Pavillion dv6315ea with empty system.hardware.* keys fd.o#19936 -->
+	    <match key="/org/freedesktop/Hal/devices/computer:system.board.product" string="30B7">
+	      <match key="/org/freedesktop/Hal/devices/computer:system.board.version" string="65.2B">
+                <append key="input.keymap.data" type="strlist">e008:media</append> <!-- FIXME: quick play -->
+	      </match>
+	     </match>
+	  </match>
+
       	</match>
       </match>
     </match>
commit f2f880f21b07e67ac3f27e6d60116c700a1e7f58
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Sat Aug 1 16:34:48 2009 +0200

    fix commit 04214ee0
    
    Fixed typo in commit 04214ee0.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 8313552..27501e6 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -9,9 +9,9 @@
         <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>
-          <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</addset>
-          <addset key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-          <addset key="portable_audio_player.output_formats" type="strlist">audio/x-aiff</append>
+          <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+          <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          <append key="portable_audio_player.output_formats" type="strlist">audio/x-aiff</append>
           <merge key="storage.requires_eject" type="bool">true</merge>
           <!-- iPods with video -->
           <match key="@storage.originating_device:usb.product_id" int_outof="0x1261;0x1262">
commit c462fd0b0f0f141979255b671083c79e743a674f
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Sat Aug 1 16:28:56 2009 +0200

    add suspend quirk for a Asus P4B266 mainboard
    
    Added adopted/extended version of a patch from
    Olivier Berger <oberger at ouvaton.org> to add suspend quirk for a
    Asus P4B266 mainboard (matching also the primary video card).
    
      system.hardware.primary_video.product = 18790  (0x4966)  (int)
      system.hardware.primary_video.vendor = 4098  (0x1002)  (int)
      system.hardware.product = 'System Name'  (string)
      system.hardware.serial = 'SYS-1234567890'  (string)
      system.hardware.uuid = ''  (string)
      system.hardware.vendor = 'System Manufacturer'  (string)
      system.hardware.version = 'System Version'  (string)
      system.firmware.release_date = '08/06/2002'  (string)
      system.firmware.vendor = 'Award Software, Inc.'  (string)
      system.firmware.version = 'ASUS P4B266 ACPI BIOS Revision 1010'  (string)

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
index 4022c67..fe29d1b 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-asus.fdi
@@ -106,6 +106,17 @@
       </match>
     </match>
     
+    <match key="system.firmware.version" prefix="ASUS P4B266 ACPI BIOS Revision">
+      <match key="system.firmware.version" contains=" 1010">
+	<match key="system.hardware.primary_video.vendor" int="0x1002">	
+	  <match key="system.hardware.primary_video.product" int="0x4966">	
+	    <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+	    <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+          </match>
+        </match>
+      </match>
+    </match>
+
     <!-- another ASUS Mainboard, this need no quirk -->
     <match key="system.firmware.version" prefix_outof="ASUS M2N-E ACPI BIOS Revision;ASUS Striker ACPI BIOS Revision;ASUS A7V ACPI BIOS Revision">
       <merge key="power_management.quirk.none" type="bool">true</merge>
commit e6389d9fab81ed6591b4a5de4f56d8f18784f55c
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Fri Jul 31 14:58:43 2009 +0200

    add keymapping for a HP 2230s
    
    Added keymapping for a HP 2230s as reported in fd.o#21527.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 60e48fd..8df6185 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -43,7 +43,7 @@
             <append key="input.keymap.data" type="strlist">e059:f23</append>    <!-- touchpad on  -->
           </match>
 
-	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="Compaq;EliteBook">
+	  <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="Compaq;EliteBook;2230s">
             <!-- Business and enterprise machines -->
             <append key="input.keymap.data" type="strlist">e008:presentation</append>   <!-- Presentation -->
             <append key="input.keymap.data" type="strlist">e059:help</append>   <!-- I key (high keycode: "info") -->
commit bd0680dcd128badb03dcb731099e564aa653a570
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jul 30 19:06:15 2009 +0200

    fix commit 3041b9e0c01: mark microSD as sd_mmc
    
    Fixed commit 3041b9e0c01: mark microSD as sd_mmc

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index 2974020..166410d 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -77,12 +77,9 @@
         <match key="storage.model" contains="Compact Flash">
           <merge key="storage.drive_type" type="string">compact_flash</merge>
         </match>
-        <match key="storage.model" contains="SD/MMC">
+        <match key="storage.model" contains_outof="SD/MMC;microSD">
           <merge key="storage.drive_type" type="string">sd_mmc</merge>
         </match>
-        <match key="storage.model" contains="microSD">
-          <merge key="storage.drive_type" type="string">micro_sd</merge>
-        </match>
         <match key="storage.model" contains="MS/MS-PRO">
           <merge key="storage.drive_type" type="string">memory_stick</merge>
         </match>
commit 3041b9e0c01488941f4f2d736b5a9ed258b72393
Author: Karl Relton <karllinuxtest.relton at ntlworld.com>
Date:   Thu Jul 30 19:04:31 2009 +0200

    add a multi card reader
    
    Added a multi card reader (Jessops branded, usb vendor
    string is 'Transcend Communication, Inc.')

diff --git a/fdi/information/10freedesktop/10-usb-card-readers.fdi b/fdi/information/10freedesktop/10-usb-card-readers.fdi
index 6711cb1..2974020 100644
--- a/fdi/information/10freedesktop/10-usb-card-readers.fdi
+++ b/fdi/information/10freedesktop/10-usb-card-readers.fdi
@@ -72,6 +72,25 @@
         </match>
       </match>
 
+      <!-- Transcend Information Inc multi-card Readers -->
+      <match key="info.category" string="storage">
+        <match key="storage.model" contains="Compact Flash">
+          <merge key="storage.drive_type" type="string">compact_flash</merge>
+        </match>
+        <match key="storage.model" contains="SD/MMC">
+          <merge key="storage.drive_type" type="string">sd_mmc</merge>
+        </match>
+        <match key="storage.model" contains="microSD">
+          <merge key="storage.drive_type" type="string">micro_sd</merge>
+        </match>
+        <match key="storage.model" contains="MS/MS-PRO">
+          <merge key="storage.drive_type" type="string">memory_stick</merge>
+        </match>
+        <match key="storage.model" contains="SM/xD-Picture">
+          <merge key="storage.drive_type" type="string">smart_media</merge>
+        </match>
+      </match>
+
       <!-- Noname multi-card Readers (vendor: Genesys Logic) -->
       <match key="@storage.originating_device:usb.vendor_id" int="0x05e3">
 	<match key="@storage.originating_device:usb.product_id" int_outof="0x070e;0x0760;0x927">
commit d81abfe02a97d5e4ae88bb4bd402966b69478f5e
Author: Daniel Kiracofe <drkiraco at purdue.edu>
Date:   Thu Jul 30 18:58:19 2009 +0200

    add suspend quirks for a Lenovo ThinkPad T500
    
    Added suspend quirks for a Lenovo ThinkPad T500.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
index 72d58ac..a45d169 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-lenovo.fdi
@@ -58,6 +58,14 @@
 	<merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
 
+      <!-- T500 -->
+      <match key="system.hardware.product" string ="2242CTO">
+	<match key="system.hardware.version" string = "ThinkPad T500">
+	  <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+	  <merge key="power_management.quirk.vbestate_restore" type="bool">true</merge>
+	</match>
+      </match>
+
       <!-- These Thinkpads don't need a quirk: 6459 (T61p), 7664 (T60) see s2ram -->
       <match key="system.hardware.product" prefix_outof="6459;7664;8918">
         <merge key="power_management.quirk.none" type="bool">true</merge>
commit e336b04f02877eafbbd235f6ec639131ac11a566
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jul 30 18:53:31 2009 +0200

    fix entry for Novatel MC950D
    
    Fixed entry for the Novatel MC950D. It was wrong identified
    as CDMA, it's a GMS modem.
    
    See http://lists.freedesktop.org/archives/hal/2009-May/013307.html

diff --git a/fdi/information/10freedesktop/10-modem.fdi b/fdi/information/10freedesktop/10-modem.fdi
index c2d37af..c32e360 100644
--- a/fdi/information/10freedesktop/10-modem.fdi
+++ b/fdi/information/10freedesktop/10-modem.fdi
@@ -292,13 +292,13 @@
       <!-- Novatel -->
       <match key="@info.parent:usb.vendor_id" int="0x1410">
         <!-- Merlin XS620/S640,S620,EX720,S720,EV620 CDMA/EV-DO,ES620/Merlin ES720/Ovation U720,ES620 SM Bus,U727 -->
-        <match key="@info.parent:usb.product_id" int_outof="0x1100;0x1110;0x1410;0x1120;0x1130;0x2100;0x2110;0x2130;0x4100;0x5010">
+        <match key="@info.parent:usb.product_id" int_outof="0x1100;0x1110;0x1410;0x1120;0x1130;0x2100;0x2110;0x2130;0x4100">
           <match key="@info.parent:usb.interface.number" int="0">
             <append key="modem.command_sets" type="strlist">IS-707-A</append>
           </match>
         </match>
-        <!-- U730,U740,EU870,XU870 HSDPA/3G,EU740,EU870D,MC950 -->
-        <match key="@info.parent:usb.product_id" int_outof="0x1400;0x1410;0x1420;0x1430;0x2410;0x2420;0x4400">
+        <!-- U730,U740,EU870,XU870 HSDPA/3G,EU740,EU870D,MC950,MC950D -->
+        <match key="@info.parent:usb.product_id" int_outof="0x1400;0x1410;0x1420;0x1430;0x2410;0x2420;0x4400;0x5010">
           <match key="@info.parent:usb.interface.number" int="0">
             <append key="modem.command_sets" type="strlist">GSM-07.07</append>
             <append key="modem.command_sets" type="strlist">GSM-07.05</append>
commit b84bd545988c30296209b80a60f33782254a8f56
Author: Arian Sanusi <arian at sanusi.de>
Date:   Thu Jul 30 18:40:03 2009 +0200

    add suspend quirks for HP tc4400, nc4400, tc4200
    
    Added suspend quirks for HP tc4400, nc4400, tc4200. They all
    need vbe-post.

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
index cd8f41e..4a3016c 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-hp.fdi
@@ -121,7 +121,7 @@
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
       </match>
-      <match key="system.hardware.product" contains_outof="nx6120;nc4200;HP 530 Notebook PC">
+      <match key="system.hardware.product" contains_outof="tc4400;nc4400;tc4200;nx6120;nc4200;HP 530 Notebook PC">
         <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
       </match>
 
commit 970c705b54ce1d8bcb1b470858c0d0a1d3d6f71e
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jul 30 18:27:58 2009 +0200

    add suspend quirk for a Acer Travelmate 4002 wlmi
    
    Added suspend quirk for a Acer Travelmate 4002 wlmi as reported
    in fd.o#21059 by freedesktop at diaboflo.de

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
index f120a4c..91ad85c 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-acer.fdi
@@ -33,6 +33,17 @@
           <merge key="power_management.quirk.none" type="bool">true</merge>
         </match>
 
+	<!-- Acer TravalMate 4002 Wlmi with ATI RadeOn Mobility 9700. mashine suspends, wakes up, but "vbetool post" hangs -->
+        <match key="system.hardware.product" contains="4000">
+	  <match key="system.hardware.primary_video.product" int="20048">
+            <match key="system.hardware.primary_video.vendor" int="4098"> 
+	      <merge key="power_management.quirk.vbe_post" type="bool">true</merge>
+	      <merge key="power_management.quirk.vbemode_restore" type="bool">true</merge>
+	      <merge key="power_management.quirk.dpms_on" type="bool">true</merge>
+            </match>
+          </match>
+        </match>
+
 	<!-- these need the full name to prevent mixes with other machines
              NOTE: HAL removes whitespaces at the end of the sysfs and dmidecode output,
                    we need to do exact string matches.
commit 24d1a48b4e70ee7ac60d800d7407eec672999f95
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jul 30 18:18:50 2009 +0200

    fix audio folder naming for a BlackBerry 8100
    
    Fixed audio folder naming for a BlackBerry 8100 as
    pointed out by maddentim at gmail.com in fd.o#20582.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 0e755c0..8313552 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -666,8 +666,14 @@
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mp4</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
+	    <match key="@storage.originating_device:usb.product_id" int_outof="0x6;0x8004">
+              <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/music/</append>
+              <append key="portable_audio_player.audio_folders" type="strlist">BlackBerry/videos/</append>
+            </match>
+	    <match key="@storage.originating_device:usb.product_id" int="0x4">
+              <append key="portable_audio_player.audio_folders" type="strlist">blackberry/music/</append>
+              <append key="portable_audio_player.audio_folders" type="strlist">blackberry/videos/</append>
+            </match>
           </match>
 	  <match key="@storage.originating_device:usb.product_id" int="0x8004">
             <append key="portable_audio_player.audio_folders" type="strlist">home/user/music/</append>
commit 4a1ebf20c4d9d0916921f6b712a696348e32b122
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jul 30 17:56:24 2009 +0200

    add a Creative MuVo 100 as a USB music player
    
    Applied a fixed/slightly adopted version of a patch from
    Reinhard Jentsch <pinswats at yahoo.se> (fd.o#22243) to add a
    Creative MuVo 100 as a USB music player.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 55495f4..0e755c0 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -35,6 +35,11 @@
 
         <!-- Creative -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0x41e">
+	  <!-- MuVo V100 -->
+          <match key="@storage.originating_device:usb.product_id" int="0x200c">
+	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+	    <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
+	  </match>
 	  <!-- MuVo NX, MuVo2, MuVo TX, MuVo TX FM, Zen Micro,NOMAD Jukebox Zen Xtra, MuVo N200 (MuVo Micro), Zen Micro -->
 	  <match key="@storage.originating_device:usb.product_id" int_outof="0x4115;0x4116;0x4117;0x4120;0x411e;0x4128;0x412b;0x4130">
 	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
commit befce32ae86edc14ee43d9756c18c00162feffc0
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jul 30 17:52:48 2009 +0200

    add a Sony WALKMAN NWZ-S638F as a USB music player
    
    Applied a fixed/slightly adopted version of a patch from
    Bernd Schlapsi <brot at gmx.info> (fd.o#22712) to add a
    Sony WALKMAN NWZ-S638F as a USB music player.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 542eaa7..55495f4 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -372,6 +372,12 @@
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
             <append key="portable_audio_player.audio_folders" type="strlist">music/</append>
           </match>
+	  <!-- Sony Walkman NWZ-S638F -->
+	  <match key="@storage.originating_device:usb.product_id" int="0x38e">
+	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
+	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
+	    <append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
+	  </match>
 	</match>
 
 	<!-- Deactived entry. Looks as if this is a generic USB chip, since it matches
commit 04214ee0529222cccb269a351336408a2d65da63
Author: Justin Forest <justin.forest at gmail.com>
Date:   Thu Jul 30 17:46:47 2009 +0200

    add more formats to iPods
    
    audio/x-wav and audio/x-aiff for all iPods,
    video/mp4 for Classic and Nano.
    
    fd.o#20354

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 625f87f..542eaa7 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -10,7 +10,13 @@
           <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
           <addset key="portable_audio_player.access_method.protocols" type="strlist">ipod</addset>
           <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</addset>
+          <addset key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
+          <addset key="portable_audio_player.output_formats" type="strlist">audio/x-aiff</append>
           <merge key="storage.requires_eject" type="bool">true</merge>
+          <!-- iPods with video -->
+          <match key="@storage.originating_device:usb.product_id" int_outof="0x1261;0x1262">
+            <append key="portable_audio_player.output_formats" type="strlist">video/mp4</append>
+          </match>
         </match>
       </match>
 
commit 13d208c4ce0cb31b3037a16cf35591c894971c6a
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jul 30 17:43:29 2009 +0200

    add another suspend quirks for IBM machines
    
    Added another suspend quirks for IBM machines. Tested with
    kernel 2.6.27.19.
    
    from: bnc#488035

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 4d4a2b4..011d763 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -122,7 +122,7 @@
     </match>
 
     <match key="system.hardware.vendor" string="IBM CORPORATION">
-      <match key="system.hardware.product" string_outof="4800723;4800743;4800783">
+      <match key="system.hardware.product" string_outof="4800723;4800743;4800783;4800C43">
         <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
         <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
       </match>
commit 90e7d7108f342a8e622a5cb8324841dca9f29745
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jul 30 17:41:28 2009 +0200

    add some more suspend quirks for IBM machines
    
    Added some more suspend quirks for IBM machines. Tested with
    kernel 2.6.27.19.
    
    from. bnc#488035

diff --git a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
index 335310f..4d4a2b4 100644
--- a/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
+++ b/fdi/information/10freedesktop/20-video-quirk-pm-ibm.fdi
@@ -120,5 +120,12 @@
       </match>
 
     </match>
+
+    <match key="system.hardware.vendor" string="IBM CORPORATION">
+      <match key="system.hardware.product" string_outof="4800723;4800743;4800783">
+        <merge key="power_management.quirk.s3_bios" type="bool">true</merge>
+        <merge key="power_management.quirk.s3_mode" type="bool">true</merge>
+      </match>
+    </match>
   </device>
 </deviceinfo>
commit 8a8d78461c45456d89bbb39e47e5d6e366e79486
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jul 30 17:30:41 2009 +0200

    Revert "10-usb-music-players.fdi: Flatten product id tests"
    
    This reverts commit a24984bac808382951ed2fe3ee6a6700bf7e3839.
    
    Reverted this commit. It blows up the file size by ~3 KBytes
    it costed some work to reduce the file size and with this the
    size of the cache file. And since HAL is still used in the
    most distributions it should work as before.

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 9c3a2ff..625f87f 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -253,25 +253,19 @@
 	    <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">
+          <!-- Samsung YP-J70, YP-T7F -->
+          <match key="@storage.originating_device:usb.product_id" int_outof="0x5032;0x503d">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
             <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-J70 -->
-          <match key="@storage.originating_device:usb.product_id" int="0x5032">
-            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-            <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>
-            <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append>
-            <merge key="storage.requires_eject" type="bool">true</merge>
+            <match key="@storage.originating_device:usb.product_id" int="0x5032">
+              <append key="portable_audio_player.audio_folders" type="strlist">RECORDED/</append>
+              <merge key="storage.requires_eject" type="bool">true</merge>
+            </match>
           </match>
           <!-- Samsung YP-Z5 -->
           <match key="@storage.originating_device:usb.product_id" int="0x5041">
@@ -565,33 +559,8 @@
 
 	<!-- Cowon -->
 	<match key="@storage.originating_device:usb.vendor_id" int="0xe21">
-	  <!-- iAUDIO M3 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500">
-	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</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/flac</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
-	    <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
-	  </match>
-	  <!-- iAUDIO X5, M5, F2, 7 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750">
-	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</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/flac</append>
-	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
-	    <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
-	  </match>
-	  <!-- iAUDIO U3 -->
-	  <match key="@storage.originating_device:usb.product_id" int="0x700">
+	  <!-- iAUDIO M3, X5, M5, U3 , F2, 7-->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x500;0x510;0x520;0x700;0x710;0x730;0x750">
 	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
 	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
@@ -600,22 +569,21 @@
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
 	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
 	    <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
-	  </match>
-	  <!-- iAUDIO G3, 5 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x601;0x602;0x604">
-	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</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>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
-	    <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
+	    <!-- iAUDIO X5, M5, F2, 7 -->
+	    <match key="@storage.originating_device:usb.product_id" int_outof="0x510;0x520;0x710;0x730;0x750">
+	      <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+	    </match>
+	    <!-- iAUDIO U3 -->
+	    <match key="@storage.originating_device:usb.product_id" int="0x700">
+	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
+	    </match>
 	  </match>
-	  <!-- iAUDIO G2 -->
-	  <match key="@storage.originating_device:usb.product_id" int="0x760">
+	  <!-- iAUDIO G3, 5, G2 -->
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x601;0x602;0x604;0x760">
 	    <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
 	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
 	    <append key="portable_audio_player.output_formats" type="strlist">audio/x-ms-wma</append>
@@ -623,20 +591,23 @@
 	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
 	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</append>
 	    <append key="portable_audio_player.playlist_path" type="string">PLAYLIST/%File</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
-	  </match>
-	  <!-- iAUDIO U2 -->
-	  <match key="@storage.originating_device:usb.product_id" int="0x600">
-	    <append key="portable_audio_player.output_formats" type="strlist">application/ogg</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>
-	    <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
-	    <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
+	    <!-- iAUDIO G2 -->
+	    <match key="@storage.originating_device:usb.product_id" int="0x760">
+	      <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">RECORD/</append>
+              <append key="portable_audio_player.audio_folders" type="strlist">VOICE/</append>
+	    </match>
+	    <!-- iAUDIO U2 -->
+	    <match key="@storage.originating_device:usb.product_id" int="0x600">
+	      <append key="portable_audio_player.output_formats" type="strlist">application/ogg</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>
+	      <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/FM/</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/LINEIN/</append>
+	      <append key="portable_audio_player.audio_folders" type="strlist">RECORDS/VOICE/</append>
+	    </match>
 	  </match>
 	</match>
 
@@ -1008,24 +979,18 @@
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
 	  <!-- T30 UMS firmware v1.7 , S10 UMS firmware v1.05 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x1023">
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x1019;0x1023">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
             <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.input_formats" type="strlist">audio/mpeg</append>
 	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
 	    <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
-          </match>
-	  <!-- S10 UMS firmware v1.05 folder -->
-	  <match key="@storage.originating_device:usb.product_id" int="0x1023">
-            <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
-            <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.input_formats" type="strlist">audio/mpeg</append>
-	    <append key="portable_audio_player.playlist_format" type="strlist">audio/x-iriver-pla</append>
-	    <append key="portable_audio_player.playlist_path" type="string">Playlists/%File</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
-            <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append>
+	    <!-- S10 UMS firmware v1.05 folder -->
+	    <match key="@storage.originating_device:usb.product_id" int="0x1023">
+              <append key="portable_audio_player.audio_folders" type="strlist">Music/</append>
+              <append key="portable_audio_player.audio_folders" type="strlist">Recordings/</append>
+            </match>
           </match>
           <!-- iFP 100 UMS, 300 UMS, 500 UMS (supports application/ogg only after firmware upgrade),
                N10 UMS
commit 729348a66d3ad9d80f9dd7d866ec8e912c735853
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jul 30 17:29:49 2009 +0200

    Revert "fix iRiver T30 product ID"
    
    This reverts commit 0cf96f41652b4ec5cdbbda0d58e2ce089afbf51c.
    
    Needed to revert commit a24984bac808382951ed2fe3ee6a6700bf7e3839

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index 26257e7..9c3a2ff 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -1008,7 +1008,7 @@
             <append key="portable_audio_player.input_formats" type="strlist">audio/mpeg</append>
           </match>
 	  <!-- T30 UMS firmware v1.7 , S10 UMS firmware v1.05 -->
-	  <match key="@storage.originating_device:usb.product_id" int_outof="0x1019">
+	  <match key="@storage.originating_device:usb.product_id" int_outof="0x1023">
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
             <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>

More information about the hal-commit mailing list