 @@ -1,14 +1,14 @@
-/* $NetBSD: thinkpad_acpi.c,v 1.51 2021/05/29 16:49:49 riastradh Exp $ */
+/* $NetBSD: thinkpad_acpi.c,v 1.52 2021/05/29 16:49:57 riastradh Exp $ */
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -17,27 +17,27 @@
  * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.51 2021/05/29 16:49:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: thinkpad_acpi.c,v 1.52 2021/05/29 16:49:57 riastradh Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <sys/sdt.h>
 #include <sys/systm.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/acpi_ecvar.h>
 #include <dev/acpi/acpi_power.h>
 #include <dev/isa/isareg.h>
 @@ -66,27 +66,31 @@ typedef struct thinkpad_softc {
 #define	TP_PSW_VENDOR_BUTTON	7	/* ThinkVantage */
 #define	TP_PSW_FNF1_BUTTON	8	/* FnF1 */
 #define	TP_PSW_WIRELESS_BUTTON	9	/* FnF5 */
 #define	TP_PSW_WWAN_BUTTON	10	/* FnF6 */
 #define	TP_PSW_POINTER_BUTTON	11	/* FnF8 */
 #define	TP_PSW_FNF10_BUTTON	12	/* FnF10 */
 #define	TP_PSW_FNF11_BUTTON	13	/* FnF11 */
 #define	TP_PSW_BRIGHTNESS_UP	14
 #define	TP_PSW_BRIGHTNESS_DOWN	15
 #define	TP_PSW_THINKLIGHT	16
 #define	TP_PSW_VOLUME_UP	17
 #define	TP_PSW_VOLUME_DOWN	18
 #define	TP_PSW_VOLUME_MUTE	19
-#define	TP_PSW_LAST		20
+#define	TP_PSW_STAR_BUTTON	20
 #define	TP_PSW_SCISSORS_BUTTON	21
 #define	TP_PSW_BLUETOOTH_BUTTON	22
 #define	TP_PSW_KEYBOARD_BUTTON	23
 #define	TP_PSW_LAST		24
 	struct sysmon_pswitch	sc_smpsw[TP_PSW_LAST];
 	bool			sc_smpsw_valid;
 	struct sysmon_envsys	*sc_sme;
 	envsys_data_t		sc_sensor[THINKPAD_NSENSORS];
 	int			sc_display_state;
 } thinkpad_softc_t;
 /* Hotkey events */
 #define	THINKPAD_NOTIFY_FnF1		0x001
 #define	THINKPAD_NOTIFY_LockScreen	0x002
 @@ -98,26 +102,30 @@ typedef struct thinkpad_softc {
 #define	THINKPAD_NOTIFY_PointerSwitch	0x008
 #define	THINKPAD_NOTIFY_EjectButton	0x009
 #define	THINKPAD_NOTIFY_FnF10		0x00a	/* XXX: Not seen on T61 */
 #define	THINKPAD_NOTIFY_FnF11		0x00b
 #define	THINKPAD_NOTIFY_HibernateButton	0x00c
 #define	THINKPAD_NOTIFY_BrightnessUp	0x010
 #define	THINKPAD_NOTIFY_BrightnessDown	0x011
 #define	THINKPAD_NOTIFY_ThinkLight	0x012
 #define	THINKPAD_NOTIFY_Zoom		0x014
 #define	THINKPAD_NOTIFY_VolumeUp	0x015	/* XXX: Not seen on T61 */
 #define	THINKPAD_NOTIFY_VolumeDown	0x016	/* XXX: Not seen on T61 */
 #define	THINKPAD_NOTIFY_VolumeMute	0x017	/* XXX: Not seen on T61 */
 #define	THINKPAD_NOTIFY_ThinkVantage	0x018
 #define	THINKPAD_NOTIFY_Star		0x311
 #define	THINKPAD_NOTIFY_Scissors	0x312
 #define	THINKPAD_NOTIFY_Bluetooth	0x314
 #define	THINKPAD_NOTIFY_Keyboard	0x315
 #define	THINKPAD_CMOS_BRIGHTNESS_UP	0x04
 #define	THINKPAD_CMOS_BRIGHTNESS_DOWN	0x05
 #define	THINKPAD_HKEY_VERSION_1		0x0100
 #define	THINKPAD_HKEY_VERSION_2		0x0200
 #define	THINKPAD_DISPLAY_LCD		0x01
 #define	THINKPAD_DISPLAY_CRT		0x02
 #define	THINKPAD_DISPLAY_DVI		0x08
 #define	THINKPAD_DISPLAY_ALL \
 	(THINKPAD_DISPLAY_LCD | THINKPAD_DISPLAY_CRT | THINKPAD_DISPLAY_DVI)
 @@ -285,26 +293,30 @@ thinkpad_attach(device_t parent, device_
 #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;
 	psw[TP_PSW_POINTER_BUTTON].smpsw_name  = PSWITCH_HK_POINTER_BUTTON;
 	psw[TP_PSW_FNF10_BUTTON].smpsw_name    = PSWITCH_HK_FNF10_BUTTON;
 	psw[TP_PSW_FNF11_BUTTON].smpsw_name    = PSWITCH_HK_FNF11_BUTTON;
 	psw[TP_PSW_BRIGHTNESS_UP].smpsw_name   = PSWITCH_HK_BRIGHTNESS_UP;
 	psw[TP_PSW_BRIGHTNESS_DOWN].smpsw_name = PSWITCH_HK_BRIGHTNESS_DOWN;
 	psw[TP_PSW_THINKLIGHT].smpsw_name      = PSWITCH_HK_THINKLIGHT;
 	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;
 	psw[TP_PSW_STAR_BUTTON].smpsw_name     = PSWITCH_HK_STAR_BUTTON;
 	psw[TP_PSW_SCISSORS_BUTTON].smpsw_name = PSWITCH_HK_SCISSORS_BUTTON;
 	psw[TP_PSW_BLUETOOTH_BUTTON].smpsw_name = PSWITCH_HK_BLUETOOTH_BUTTON;
 	psw[TP_PSW_KEYBOARD_BUTTON].smpsw_name = PSWITCH_HK_KEYBOARD_BUTTON;
 #endif /* THINKPAD_NORMAL_HOTKEYS */
 	for (i = 0; i < TP_PSW_LAST; i++) {
 		/* not supported yet */
 		if (i == TP_PSW_HIBERNATE)
 			continue;
 		if (sysmon_pswitch_register(&sc->sc_smpsw[i]) != 0) {
 			aprint_error_dev(self,
 			    "couldn't register with sysmon\n");
 			sc->sc_smpsw_valid = false;
 			break;
+		}
+	}
 @@ -416,26 +428,35 @@ thinkpad_get_hotkeys(void *opaque)
 #endif
 			break;
 		case THINKPAD_NOTIFY_WirelessSwitch:
 			thinkpad_uwb_toggle(sc);
 			thinkpad_wwan_toggle(sc);
 			thinkpad_bluetooth_toggle(sc);
 #ifndef THINKPAD_NORMAL_HOTKEYS
 			if (sc->sc_smpsw_valid == false)
 				break;
 			sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_WIRELESS_BUTTON],
 			    PSWITCH_EVENT_PRESSED);
 #endif
 			break;
 		case THINKPAD_NOTIFY_Bluetooth:
 			thinkpad_bluetooth_toggle(sc);
 #ifndef THINKPAD_NORMAL_HOTKEYS
 			if (sc->sc_smpsw_valid == false)
 				break;
 			sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_BLUETOOTH_BUTTON],
 			    PSWITCH_EVENT_PRESSED);
 #endif
 			break;
 		case THINKPAD_NOTIFY_wWANSwitch:
 			thinkpad_wwan_toggle(sc);
 #ifndef THINKPAD_NORMAL_HOTKEYS
 			if (sc->sc_smpsw_valid == false)
 				break;
 			sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_WWAN_BUTTON],
 			    PSWITCH_EVENT_PRESSED);
 #endif
 			break;
 		case THINKPAD_NOTIFY_SleepButton:
 			if (sc->sc_smpsw_valid == false)
 				break;
 			sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_SLEEP],
 @@ -533,35 +554,56 @@ thinkpad_get_hotkeys(void *opaque)
 			break;
 		case THINKPAD_NOTIFY_VolumeDown:
 			if (sc->sc_smpsw_valid == false)
 				break;
 			sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_VOLUME_DOWN],
 			    PSWITCH_EVENT_PRESSED);
 			break;
 		case THINKPAD_NOTIFY_VolumeMute:
 			if (sc->sc_smpsw_valid == false)
 				break;
 			sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_VOLUME_MUTE],
 			    PSWITCH_EVENT_PRESSED);
 			break;
 		case THINKPAD_NOTIFY_Star:
 			if (sc->sc_smpsw_valid == false)
 				break;
 			sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_STAR_BUTTON],
 			    PSWITCH_EVENT_PRESSED);
 			break;
 		case THINKPAD_NOTIFY_Scissors:
 			if (sc->sc_smpsw_valid == false)
 				break;
 			sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_SCISSORS_BUTTON],
 			    PSWITCH_EVENT_PRESSED);
 			break;
 		case THINKPAD_NOTIFY_Keyboard:
 			if (sc->sc_smpsw_valid == false)
 				break;
 			sysmon_pswitch_event(&sc->sc_smpsw[TP_PSW_KEYBOARD_BUTTON],
 			    PSWITCH_EVENT_PRESSED);
 			break;
 #else
 		case THINKPAD_NOTIFY_FnF1:
 		case THINKPAD_NOTIFY_PointerSwitch:
 		case THINKPAD_NOTIFY_FnF10:
 		case THINKPAD_NOTIFY_FnF11:
 		case THINKPAD_NOTIFY_ThinkLight:
 		case THINKPAD_NOTIFY_VolumeUp:
 		case THINKPAD_NOTIFY_VolumeDown:
 		case THINKPAD_NOTIFY_VolumeMute:
 		case THINKPAD_NOTIFY_Star:
 		case THINKPAD_NOTIFY_Scissors:
 		case THINKPAD_NOTIFY_Keyboard:
 			/* XXXJDM we should deliver hotkeys as keycodes */
 			break;
 #endif /* THINKPAD_NORMAL_HOTKEYS */
 		default:
 			aprint_debug_dev(self, "notify event 0x%03x\n", event);
 			break;
+		}
+	}
+}
 static ACPI_STATUS
 thinkpad_mask_init(thinkpad_softc_t *sc, uint32_t mask)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: power.h,v 1.21 2018/08/01 20:09:34 kre Exp $	*/
+/*	$NetBSD: power.h,v 1.22 2021/05/29 16:49:57 riastradh Exp $	*/
 /*
  * Copyright (c) 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe for Wasabi Systems, Inc.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -104,26 +104,30 @@
 #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"
 #define		PSWITCH_HK_POINTER_BUTTON	"pointer-button"
 #define		PSWITCH_HK_FNF10_BUTTON		"fnf10-button"
 #define		PSWITCH_HK_FNF11_BUTTON		"fnf11-button"
 #define		PSWITCH_HK_BRIGHTNESS_UP	"brightness-up"
 #define		PSWITCH_HK_BRIGHTNESS_DOWN	"brightness-down"
 #define		PSWITCH_HK_THINKLIGHT		"thinklight"
 #define		PSWITCH_HK_VOLUME_UP		"volume-up"
 #define		PSWITCH_HK_VOLUME_DOWN		"volume-down"
 #define		PSWITCH_HK_VOLUME_MUTE		"volume-mute"
 #define		PSWITCH_HK_STAR_BUTTON		"star-button"
 #define		PSWITCH_HK_SCISSORS_BUTTON	"scissors-button"
 #define		PSWITCH_HK_BLUETOOTH_BUTTON	"bluetooth-button"
 #define		PSWITCH_HK_KEYBOARD_BUTTON	"keyboard-button"
 #endif /* THINKPAD_NORMAL_HOTKEYS */
 #define	PSWITCH_TYPE_RADIO	6	/* radio switch */
 #define	PSWITCH_EVENT_PRESSED	0	/* button pressed, lid closed, AC off */
 #define	PSWITCH_EVENT_RELEASED	1	/* button released, lid open, AC on */
 /*
  * This structure describes the state of a power switch.
  */
 struct pswitch_state {
 	char	psws_name[16];		/* power switch name */
 	int32_t	psws_type;		/* type of switch (qualifier) */
 	int32_t	psws_state;		/* state of the switch/event */