3 files changed, 10 insertions, 24 deletions

diff --git a/Makefile b/Makefile
index 2b7bb21..fd7bac8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-ADDONS  = hald-addon-generic-backlight
+ADDONS  = hald-addon-generic-lcd-backlight
 FDIS    = 10-nvidia-bl.fdi
 
 TFDI    = $(addprefix fdi/,$(FDIS))
diff --git a/fdi/10-nvidia-bl.fdi b/fdi/10-nvidia-bl.fdi
index 89f0014..f9357f3 100644
--- a/fdi/10-nvidia-bl.fdi
+++ b/fdi/10-nvidia-bl.fdi
@@ -3,33 +3,19 @@
 <deviceinfo version="0.2">
 
   <device>
-    <match key="platform.id" contains="applesmc">
-     <spawn udi="/org/freedesktop/Hal/devices/applesmc_keyboard_backlight"/>
-     <spawn udi="/org/freedesktop/Hal/devices/applesmc_light_sensor"/>
+    <match key="platform.id" contains="mbp_nvidia_bl">
+     <spawn udi="/org/freedesktop/Hal/devices/nvidia_laptop_panel"/>
     </match>
   </device>
 
   <device>
-    <match key="info.udi" string="/org/freedesktop/Hal/devices/applesmc_keyboard_backlight">
-      <append key="info.capabilities" type="strlist">keyboard_backlight</append>
-      <merge key="info.product" type="string">Applesmc Keyboard Backlight</merge>
-      <merge key="keyboard_backlight.num_levels" type="int">256</merge>
-      <merge key="keyboard_backlight.access_method" type="string">custom</merge>
-      <merge key="linux.sysfs_path" type="string">/sys/class/leds/smc::kbd_backlight</merge>
-      <append key="info.addons" type="strlist">hald-addon-generic-kbd-backlight</append>
-    </match>
-  </device>
-
-  <device>
-    <match key="info.udi" string="/org/freedesktop/Hal/devices/applesmc_light_sensor">
-      <append key="info.capabilities" type="strlist">light_sensor</append>
-      <merge key="info.product" type="string">Applesmc Light Sensor</merge>
-      <merge key="light_sensor.num_sensors" type="int">1</merge>
-      <merge key="light_sensor.num_levels" type="int">256</merge>
-      <append key="light_sensor.sensor_locations" type="strlist">left</append>
-      <merge key="light_sensor.access_method" type="string">custom</merge>
-      <merge key="linux.sysfs_path" type="string">/sys/devices/platform/applesmc.768/light</merge>
-      <append key="info.addons" type="strlist">hald-addon-generic-light-sensor</append>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/nvidia_laptop_panel">
+      <append key="info.capabilities" type="strlist">laptop_panel</append>
+      <merge key="info.product" type="string">Nvidia Backlight Interface</merge>
+      <merge key="laptop_panel.num_levels" type="int">16</merge>
+      <merge key="laptop_panel.access_method" type="string">custom</merge>
+      <merge key="linux.sysfs_path" type="string">/sys/class/backlight/mbp_backlight</merge>
+      <append key="info.addons" type="strlist">hald-addon-generic-lcd-backlight</append>
     </match>
   </device>
 
diff --git a/hald-addon-generic-backlight.c b/hald-addon-generic-lcd-backlight.c
index 09ab668..09ab668 100644
--- a/hald-addon-generic-backlight.c
+++ b/hald-addon-generic-lcd-backlight.c