hal: Branch 'master'

[Richard Hughes]

 fdi/information/10freedesktop/10-laptop-panel-hardware.fdi |   31 +++++++++++++
 fdi/information/10freedesktop/Makefile.am                  |    1 
 2 files changed, 32 insertions(+)

New commits:
diff-tree cb5f84b604fac2d74f6ab291fcdf501de7cdb034 (from 5f372201ec57515d514a5e46531f4187c1d346f4)
Author: Richard Hughes <richard at hughsie.com>
Date:   Tue Feb 6 01:00:40 2007 +0000

    move laptop_panel.brightness_in_hardware data to hal-info
    
    In fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi we have lots of
    laptop_panel.brightness_in_hardware data.
    This data is going to be updated quite frequently as new models are released.
    Move to hal-info.

diff --git a/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
new file mode 100644
index 0000000..5f30680
--- /dev/null
+++ b/fdi/information/10freedesktop/10-laptop-panel-hardware.fdi
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- --> 
+<deviceinfo version="0.2">
+  <!-- On some broken laptops, the brightness control is all done in hardware
+       but the hardware also synthesizes keypresses when the brightness is
+       changed. This gives power manager software problems as the brightness
+       can get into a feedback state so the panel flashes uncontrollably.
+       This is a hardware "feature" seen on some IBM and Lenovo laptops. -->
+  <device>
+    <match key="info.category" string="laptop_panel">
+      <match key="/org/freedesktop/Hal/devices/computer:smbios.system.manufacturer" string="IBM">
+        <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad X31">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
+      </match>
+      <match key="/org/freedesktop/Hal/devices/computer:smbios.system.manufacturer" string="LENOVO">
+        <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad Z31t">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
+        <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad T60">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
+        <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad X60">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
+        <match key="/org/freedesktop/Hal/devices/computer:smbios.system.version" string="ThinkPad X60s">
+          <merge key="laptop_panel.brightness_in_hardware" type="bool">true</merge>
+        </match>
+      </match>
+    </match>
+  </device>
+</deviceinfo>
diff --git a/fdi/information/10freedesktop/Makefile.am b/fdi/information/10freedesktop/Makefile.am
index 1114edb..8fac4ca 100644
--- a/fdi/information/10freedesktop/Makefile.am
+++ b/fdi/information/10freedesktop/Makefile.am
@@ -7,6 +7,7 @@ dist_fdi_DATA = 10-usb-card-readers.fdi	
 		10-camera-ptp.fdi		\
 		10-usb-pda.fdi			\
 		10-usbcsr-mice.fdi		\
+		10-laptop-panel-hardware.fdi	\
 		10-cd-dvd-burner.fdi
 
 if BUILD_RECALL