Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reverse the polarity of the extra key option, always enabling them.

Browse Source
This commit is contained in:
christos 2013-03-30 19:05:20 +00:00
parent bf2739ea2c
commit 9b9040ce5f
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/dev/acpi/thinkpad_acpi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: thinkpad_acpi.c,v 1.43 2013/03/30 03:09:44 christos Exp $ */
/* $NetBSD: thinkpad_acpi.c,v 1.44 2013/03/30 19:05:20 christos Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.43 2013/03/30 03:09:44 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.44 2013/03/30 19:05:20 christos Exp $");
#include <sys/param.h>
#include <sys/device.h>
@ -258,7 +258,7 @@ thinkpad_attach(device_t parent, device_t self, void *opaque)
psw[TP_PSW_EJECT_BUTTON].smpsw_name = PSWITCH_HK_EJECT_BUTTON;
psw[TP_PSW_ZOOM_BUTTON].smpsw_name = PSWITCH_HK_ZOOM_BUTTON;
psw[TP_PSW_VENDOR_BUTTON].smpsw_name = PSWITCH_HK_VENDOR_BUTTON;
#ifdef THINKPAD_EXTENDED_HOTKEYS
#ifndef THINKPAD_NORMAL_HOTKEYS
psw[TP_PSW_FNF1_BUTTON].smpsw_name = PSWITCH_HK_FNF1_BUTTON;
psw[TP_PSW_WIRELESS_BUTTON].smpsw_name = PSWITCH_HK_WIRELESS_BUTTON;
psw[TP_PSW_WWAN_BUTTON].smpsw_name = PSWITCH_HK_WWAN_BUTTON;
@ -271,7 +271,7 @@ thinkpad_attach(device_t parent, device_t self, void *opaque)
psw[TP_PSW_VOLUME_UP].smpsw_name = PSWITCH_HK_VOLUME_UP;
psw[TP_PSW_VOLUME_DOWN].smpsw_name = PSWITCH_HK_VOLUME_DOWN;
psw[TP_PSW_VOLUME_MUTE].smpsw_name = PSWITCH_HK_VOLUME_MUTE;
#endif /* THINKPAD_EXTENDED_HOTKEYS */
#endif /* THINKPAD_NORMAL_HOTKEYS */
for (i = 0; i < TP_PSW_LAST; i++) {
/* not supported yet */
@ -370,7 +370,7 @@ thinkpad_get_hotkeys(void *opaque)
switch (event) {
case THINKPAD_NOTIFY_BrightnessUp:
thinkpad_brightness_up(self);
#ifdef THINKPAD_EXTENDED_HOTKEYS
#ifndef THINKPAD_NORMAL_HOTKEYS
if (sc->sc_smpsw_valid == false)
break;
sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_BRIGHTNESS_UP],
@ -379,7 +379,7 @@ thinkpad_get_hotkeys(void *opaque)
break;
case THINKPAD_NOTIFY_BrightnessDown:
thinkpad_brightness_down(self);
#ifdef THINKPAD_EXTENDED_HOTKEYS
#ifndef THINKPAD_NORMAL_HOTKEYS
if (sc->sc_smpsw_valid == false)
break;
sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_BRIGHTNESS_DOWN],
@ -388,7 +388,7 @@ thinkpad_get_hotkeys(void *opaque)
break;
case THINKPAD_NOTIFY_WirelessSwitch:
thinkpad_wireless_toggle(sc);
#ifdef THINKPAD_EXTENDED_HOTKEYS
#ifndef THINKPAD_NORMAL_HOTKEYS
if (sc->sc_smpsw_valid == false)
break;
sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_WIRELESS_BUTTON],
@ -397,7 +397,7 @@ thinkpad_get_hotkeys(void *opaque)
break;
case THINKPAD_NOTIFY_wWANSwitch:
thinkpad_wwan_toggle(sc);
#ifdef THINKPAD_EXTENDED_HOTKEYS
#ifndef THINKPAD_NORMAL_HOTKEYS
if (sc->sc_smpsw_valid == false)
break;
sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_WWAN_BUTTON],
@ -460,7 +460,7 @@ thinkpad_get_hotkeys(void *opaque)
&sc->sc_smpsw[TP_PSW_VENDOR_BUTTON],
PSWITCH_EVENT_PRESSED);
break;
#ifdef THINKPAD_EXTENDED_HOTKEYS
#ifndef THINKPAD_NORMAL_HOTKEYS
case THINKPAD_NOTIFY_FnF1:
if (sc->sc_smpsw_valid == false)
break;
@ -523,7 +523,7 @@ thinkpad_get_hotkeys(void *opaque)
case THINKPAD_NOTIFY_VolumeMute:
/* XXXJDM we should deliver hotkeys as keycodes */
break;
#endif /* THINKPAD_EXTENDED_HOTKEYS */
#endif /* THINKPAD_NORMAL_HOTKEYS */
default:
aprint_debug_dev(self, "notify event 0x%03x\n", event);
break;

6
sys/sys/power.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: power.h,v 1.18 2013/03/30 03:09:44 christos Exp $ */
/* $NetBSD: power.h,v 1.19 2013/03/30 19:05:20 christos Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@ -97,7 +97,7 @@
#define PSWITCH_HK_EJECT_BUTTON "eject-button"
#define PSWITCH_HK_ZOOM_BUTTON "zoom-button"
#define PSWITCH_HK_VENDOR_BUTTON "vendor-button"
#ifdef THINKPAD_EXTENDED_HOTKEYS
#ifndef THINKPAD_NORMAL_HOTKEYS
#define PSWITCH_HK_FNF1_BUTTON "fnf1-button"
#define PSWITCH_HK_WIRELESS_BUTTON "wireless-button"
#define PSWITCH_HK_WWAN_BUTTON "wWAN-button"
@ -110,7 +110,7 @@
#define PSWITCH_HK_VOLUME_UP "volume-up"
#define PSWITCH_HK_VOLUME_DOWN "volume-down"
#define PSWITCH_HK_VOLUME_MUTE "volume-mute"
#endif /* THINKPAD_EXTENDED_HOTKEYS */
#endif /* THINKPAD_NORMAL_HOTKEYS */
#define PSWITCH_EVENT_PRESSED 0 /* button pressed, lid closed, AC off */
#define PSWITCH_EVENT_RELEASED 1 /* button released, lid open, AC on */