[Debian-eeepc-commits] [SCM] Maintenance of eeepc-acpi-scripts debian package branch, master, updated. 1.1.5-74-g83c9b5c

[Ben Armstrong]

The following commit has been merged in the master branch:
commit c4aee0b46ea054ca9216af28ee7ab3358b2333dd
Author: Luca Niccoli <lultimouomo at gmail.com>
Date:   Mon Jul 12 11:54:23 2010 +0200

    Don't deal with brightness events, they are managed by the bios and we don't show the OSD anymore.
    
    Signed-off-by: Luca Niccoli <lultimouomo at gmail.com>

diff --git a/eeepc-acpi-scripts/hotkey.sh b/eeepc-acpi-scripts/hotkey.sh
index 4c200d5..67b940e 100755
--- a/eeepc-acpi-scripts/hotkey.sh
+++ b/eeepc-acpi-scripts/hotkey.sh
@@ -106,14 +106,6 @@ handle_camera_toggle() {
     fi
 }
 
-show_brightness() {
-    # final digit of ACPI code is brightness level in hex
-    level=$(($value & 0xF))
-    # convert hex digit to percent
-    percent=$(((100 * $level + 8) / 15))
-    notify brightness "Brightness $percent%" fast
-}
-
 handle_shengine() {
     . $PKG_DIR/lib/shengine.sh
     handle_shengine "$@"
@@ -192,15 +184,6 @@ case $code in
 	fi
 	;;
 
-    # F3/F5 - decrease brightness
-    # F4/F6 - increase brightness
-    0000002?|BRTDN|BRTUP)
-	# actual brightness change is handled in hardware
-	if [ "x$ENABLE_OSD_BRIGHTNESS" != "xno" ]; then
-	  show_brightness
-	fi
-	;;
-
     # --/F7 - backlight off
     00000016)
 	if [ "${FnF_BACKLIGHTOFF}" != 'NONE' ]; then
diff --git a/etc/acpi/events/asus-eee-hotkey b/etc/acpi/events/asus-eee-hotkey
index 5ceec53..4226a8e 100644
--- a/etc/acpi/events/asus-eee-hotkey
+++ b/etc/acpi/events/asus-eee-hotkey
@@ -1,2 +1,2 @@
-event=hotkey ATKD (0000001[0123456abcd]|0000002?|0000003[012789])
+event=hotkey ATKD (0000001[0123456abcd]|0000003[012789])
 action=/usr/share/acpi-support/eeepc-acpi-scripts/hotkey.sh %e
diff --git a/etc/acpi/events/asus-eee-hotkey-netlink b/etc/acpi/events/asus-eee-hotkey-netlink
index 38dbf51..6b7e24a 100644
--- a/etc/acpi/events/asus-eee-hotkey-netlink
+++ b/etc/acpi/events/asus-eee-hotkey-netlink
@@ -1,2 +1,2 @@
-event=hotkey ASUS010:00 (0000001[0123456abcd]|0000002?|0000003[012789])
+event=hotkey ASUS010:00 (0000001[0123456abcd]|0000003[012789])
 action=/usr/share/acpi-support/eeepc-acpi-scripts/hotkey.sh %e
diff --git a/etc/acpi/events/asus-eee-hotkey-video b/etc/acpi/events/asus-eee-hotkey-video
index b298cb4..bde1e9b 100644
--- a/etc/acpi/events/asus-eee-hotkey-video
+++ b/etc/acpi/events/asus-eee-hotkey-video
@@ -1,2 +1,2 @@
-event=video/(brightness|switchmode)
+event=video/switchmode
 action=/usr/share/acpi-support/eeepc-acpi-scripts/hotkey.sh - %e

-- 
Maintenance of eeepc-acpi-scripts debian package