hal: Branch 'master'

[David Zeuthen]

 fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi |   39 ---------------
 fdi/policy/10osvendor/10-macbookpro-utils.fdi         |   44 ++++++++++++++++++
 fdi/policy/10osvendor/Makefile.am                     |    3 +
 3 files changed, 47 insertions(+), 39 deletions(-)

New commits:
diff-tree c4e5774e86d9e63411a5ccd516903f6cc014bc01 (from f7906c5168fa5631c26cd1ca7a44bfb702f14ac5)
Author: David Zeuthen <davidz at redhat.com>
Date:   Sat Sep 23 19:28:04 2006 -0400

    split out Macbook Pro matching into separate fdi file

diff --git a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
index f59fbdd..65f3199 100644
--- a/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-laptop-panel-mgmt-policy.fdi
@@ -33,43 +33,4 @@
     </match>
   </device>
 
-  <!-- this is for Macbook Pro (LCD panel, light sensor, keyboard backlight) -->
-  <device>
-    <match key="system.kernel.name" string="Linux">
-      <match key="smbios.system.manufacturer" string="Apple Computer, Inc.">
-        <match key="smbios.system.product" string="MacBookPro1,1">
-          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
-          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
-          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
-        </match>
-      </match>
-    </match>
-  </device>
-  <device>
-    <match key="info.udi" string="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel">
-      <append key="info.capabilities" type="strlist">laptop_panel</append>
-      <merge key="info.product" type="string">MacBook Pro Laptop Panel</merge>
-      <merge key="laptop_panel.access_method" type="string">custom</merge>
-      <merge key="laptop_panel.num_levels" type="int">229</merge>
-      <append key="info.addons" type="strlist">hald-addon-macbookpro-backlight</append>
-    </match>
-  </device>
-  <device>
-    <match key="info.udi" string="/org/freedesktop/Hal/devices/macbook_pro_light_sensor">
-      <append key="info.capabilities" type="strlist">light_sensor</append>
-      <merge key="info.product" type="string">MacBook Pro Light Sensor</merge>
-      <merge key="light_sensor.num_sensors" type="int">2</merge>
-      <merge key="light_sensor.num_levels" type="int">256</merge>
-      <append key="light_sensor.sensor_locations" type="strlist">right</append>
-      <append key="light_sensor.sensor_locations" type="strlist">left</append>
-    </match>
-  </device>
-  <device>
-    <match key="info.udi" string="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight">
-      <append key="info.capabilities" type="strlist">keyboard_backlight</append>
-      <merge key="info.product" type="string">MacBook Pro Keyboard Backlight</merge>
-      <merge key="keyboard_backlight.num_levels" type="int">256</merge>
-    </match>
-  </device>
-
 </deviceinfo>
diff --git a/fdi/policy/10osvendor/10-macbookpro-utils.fdi b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
new file mode 100644
index 0000000..fa484c1
--- /dev/null
+++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<deviceinfo version="0.2">
+  <!-- this is for Macbook Pro (LCD panel, light sensor, keyboard backlight) -->
+  <device>
+    <match key="system.kernel.name" string="Linux">
+      <match key="smbios.system.manufacturer" string="Apple Computer, Inc.">
+        <match key="smbios.system.product" string="MacBookPro1,1">
+          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
+          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>
+          <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel"/>
+        </match>
+      </match>
+    </match>
+  </device>
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/macbook_pro_lcd_panel">
+      <append key="info.capabilities" type="strlist">laptop_panel</append>
+      <merge key="info.product" type="string">MacBook Pro Laptop Panel</merge>
+      <merge key="laptop_panel.access_method" type="string">custom</merge>
+      <merge key="laptop_panel.num_levels" type="int">229</merge>
+      <append key="info.addons" type="strlist">hald-addon-macbookpro-backlight</append>
+    </match>
+  </device>
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/macbook_pro_light_sensor">
+      <append key="info.capabilities" type="strlist">light_sensor</append>
+      <merge key="info.product" type="string">MacBook Pro Light Sensor</merge>
+      <merge key="light_sensor.num_sensors" type="int">2</merge>
+      <merge key="light_sensor.num_levels" type="int">256</merge>
+      <append key="light_sensor.sensor_locations" type="strlist">right</append>
+      <append key="light_sensor.sensor_locations" type="strlist">left</append>
+    </match>
+  </device>
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight">
+      <append key="info.capabilities" type="strlist">keyboard_backlight</append>
+      <merge key="info.product" type="string">MacBook Pro Keyboard Backlight</merge>
+      <merge key="keyboard_backlight.num_levels" type="int">256</merge>
+    </match>
+  </device>
+
+</deviceinfo>
diff --git a/fdi/policy/10osvendor/Makefile.am b/fdi/policy/10osvendor/Makefile.am
index 5cb1894..2454c3b 100644
--- a/fdi/policy/10osvendor/Makefile.am
+++ b/fdi/policy/10osvendor/Makefile.am
@@ -9,6 +9,9 @@ dist_fdi_DATA = 			\
 	15-storage-luks.fdi		\
 	20-storage-methods.fdi
 
+if BUILD_MACBOOKPRO
+dist_fdi_DATA += 10-macbookpro-utils.fdi
+endif
 if BUILD_CPUFREQ
 dist_fdi_DATA += 10-cpufreq.fdi
 endif