hal: Branch 'master'

[David Zeuthen]

 hald/linux/addons/addon-keyboard.c |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletion(-)

New commits:
diff-tree a3bfaa588eb369c8595b16284e11231af1295c5b (from bb1e42fd42b1cfa7551564c7636708434502b47b)
Author: Matthew Garrett <mjg59 at srcf.ucam.org>
Date:   Wed Jan 31 20:18:54 2007 -0500

    add new battery, bluetooth, wireless key events
    
    This patch adds support for three new hotkeys - battery, bluetooth and
    wireless. battery is used by g-p-m to display a battery info popup, and
    I'm planning to add wireless hotkey support to network-manager.

diff --git a/hald/linux/addons/addon-keyboard.c b/hald/linux/addons/addon-keyboard.c
index 13f4fd5..644da4f 100644
--- a/hald/linux/addons/addon-keyboard.c
+++ b/hald/linux/addons/addon-keyboard.c
@@ -153,7 +153,19 @@ static char *key_name[KEY_MAX + 1] = {
 #ifndef KEY_KBDILLUMUP
 #define KEY_KBDILLUMUP		230
 #endif
-	[KEY_KBDILLUMUP] = "kbd-illum-up"
+	[KEY_KBDILLUMUP] = "kbd-illum-up",
+#ifndef KEY_BATTERY
+#define KEY_BATTERY 236
+#endif
+	[KEY_BATTERY] = "battery",
+#ifndef KEY_BLUETOOTH
+#define KEY_BLUETOOTH 237
+#endif
+	[KEY_BLUETOOTH] = "bluetooth",
+#ifndef KEY_WLAN
+#define KEY_WLAN 238
+#endif
+	[KEY_WLAN] = "wlan"
 };
 
 static void