From e91aa6d32b6eeba311b37b4139f6bf3eaf20cf26 Mon Sep 17 00:00:00 2001 From: Henrik Rydberg Date: Mon, 24 Nov 2008 11:06:26 +0100 Subject: Adapting code copy to work with the right dbus (laptop_panel) interface Signed-off-by: Henrik Rydberg --- hald-addon-generic-backlight.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'hald-addon-generic-backlight.c') diff --git a/hald-addon-generic-backlight.c b/hald-addon-generic-backlight.c index 537ab69..09ab668 100644 --- a/hald-addon-generic-backlight.c +++ b/hald-addon-generic-backlight.c @@ -1,9 +1,9 @@ /*************************************************************************** * - * addon-generic-kbd-backlight.c: + * addon-generic-backlight.c: * Copyright (C) 2008 Henrik Rydberg * - * Based on addon-generic-backlight.c: + * Based on upstream addon-generic-backlight.c: * Copyright (C) 2008 Danny Kukawka * * Licensed under the Academic Free License version 2.1 @@ -36,7 +36,7 @@ #include "dbus-abi.h" #include "hal-abi.h" -#define HAL_PROPERTY "org.freedesktop.Hal.Device.KeyboardBacklight" +#define HAL_PROPERTY "org.freedesktop.Hal.Device.LaptopPanel" static const char prop_name[] = HAL_PROPERTY; static const char prop_invalid[] = HAL_PROPERTY ".Invalid"; @@ -51,14 +51,14 @@ static char sysfs_path[512]; static int levels; /** - * Get keyboard backlight level + * Get LCD backlight level * * Tries to read from the specified sysfs device, and if successful, - * updates the internal keyboard backlight state. Warns if the device + * updates the internal LCD backlight state. Warns if the device * cannot be opened or be read from. Always returns the last succesful * read. */ -static int get_kbd_backlight() +static int get_lcd_backlight() { static int level; int fd; @@ -81,12 +81,12 @@ static int get_kbd_backlight() } /** - * Set keyboard backlight level + * Set LCD backlight level * * Warns if the device cannot be opened or be written to. * Returns bytes written on success, negative value on failure. */ -static int set_kbd_backlight(int level) +static int set_lcd_backlight(int level) { int fd, ret; char buf[64]; @@ -107,8 +107,8 @@ static int set_kbd_backlight(int level) return ret; } -/* DBus set keyboard backlight level */ -static struct DBusMessage *dbus_get_kbd_backlight(struct DBusMessage *msg) +/* DBus set LCD backlight level */ +static struct DBusMessage *dbus_get_lcd_backlight(struct DBusMessage *msg) { struct DBusError err; struct DBusMessage *reply; @@ -119,7 +119,7 @@ static struct DBusMessage *dbus_get_kbd_backlight(struct DBusMessage *msg) return dbus_message_new_error(msg, prop_invalid, "Invalid message"); - level = get_kbd_backlight(); + level = get_lcd_backlight(); reply = dbus_message_new_method_return(msg); if (reply) @@ -129,8 +129,8 @@ static struct DBusMessage *dbus_get_kbd_backlight(struct DBusMessage *msg) return reply; } -/* DBus set keyboard backlight level */ -static struct DBusMessage *dbus_set_kbd_backlight(struct DBusMessage *msg) +/* DBus set LCD backlight level */ +static struct DBusMessage *dbus_set_lcd_backlight(struct DBusMessage *msg) { struct DBusError err; int level; @@ -145,7 +145,7 @@ static struct DBusMessage *dbus_set_kbd_backlight(struct DBusMessage *msg) return dbus_message_new_error(msg, prop_invalid, "Brightness level is invalid"); - set_kbd_backlight(level); + set_lcd_backlight(level); return dbus_message_new_method_return(msg); } @@ -158,9 +158,9 @@ static DBusHandlerResult filter_function(struct DBusConnection *connection, struct DBusMessage *reply = NULL; if (dbus_message_is_method_call(message, prop_name, prop_get)) - reply = dbus_get_kbd_backlight(message); + reply = dbus_get_lcd_backlight(message); else if (dbus_message_is_method_call(message, prop_name, prop_set)) - reply = dbus_set_kbd_backlight(message); + reply = dbus_set_lcd_backlight(message); if (reply) { dbus_connection_send(connection, reply, NULL); @@ -177,7 +177,7 @@ int main(int argc, char *argv[]) char *udi = getenv("UDI"); char *path = getenv("HAL_PROP_LINUX_SYSFS_PATH"); - char *level_str = getenv("HAL_PROP_KEYBOARD_BACKLIGHT_NUM_LEVELS"); + char *level_str = getenv("HAL_PROP_LAPTOP_PANEL_NUM_LEVELS"); setup_logger(); @@ -190,7 +190,7 @@ int main(int argc, char *argv[]) return -2; } if (level_str == NULL) { - HAL_ERROR(("No keyboard_backlight.num_levels defined")); + HAL_ERROR(("No laptop_panel.num_levels defined")); return -2; } -- cgit v1.2.3