 @@ -1,14 +1,14 @@
-/*	$NetBSD: wmi_dell.c,v 1.10 2017/12/03 17:40:48 bouyer Exp $ */
+/*	$NetBSD: wmi_dell.c,v 1.11 2017/12/03 23:43:00 christos Exp $ */
 /*-
  * Copyright (c) 2009, 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jukka Ruohonen.
+ *
  * 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
 @@ -21,27 +21,27 @@
  * 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 AUTHOR 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: wmi_dell.c,v 1.10 2017/12/03 17:40:48 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wmi_dell.c,v 1.11 2017/12/03 23:43:00 christos Exp $");
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <dev/acpi/acpireg.h>
 #include <dev/acpi/acpivar.h>
 #include <dev/acpi/wmi/wmi_acpivar.h>
 #include <dev/sysmon/sysmonvar.h>
 #ifdef WMI_DEBUG
 #define DPRINTF(x)	printf x
 @@ -154,28 +154,30 @@ wmi_dell_attach(device_t parent, device_
 	if (obj->Type != ACPI_TYPE_BUFFER) {
 		aprint_error(": wrong type %d for WMI descriptor\n", obj->Type);
 		return;
+	}
 	if (obj->Buffer.Length != 128) {
 		aprint_error(": wrong len %d for WMI descriptor",
 		    obj->Buffer.Length);
 		if (obj->Buffer.Length < 16) {
 			aprint_error("\n");
 			return;
+		}
+	}
 	data = (uint32_t *)obj->Buffer.Pointer;
-	if (data[0] != 0x4C4C4544 || data[1] != 0x494D5720) {
+#define WMI_LLED 	0x4C4C4544
-		aprint_error(": wrong WMI descriptor signature 0x%x 0x%x",
+#define WMI_IMWsp	0x494D5720
 	if (data[0] != WMI_LLED || data[1] != WMI_IMWsp) {
 		aprint_error(": wrong WMI descriptor signature %#x %#x",
 		    data[0], data[1]);
+	}
 	sc->sc_version = data[2];
 	aprint_naive("\n");
 	aprint_normal(": Dell WMI mappings version %d\n", sc->sc_version);
 	sc->sc_smpsw[WMI_DELL_PSW_DISPLAY_CYCLE].smpsw_name =
 	    PSWITCH_HK_DISPLAY_CYCLE;
 	sc->sc_smpsw[WMI_DELL_PSW_DISPLAY_CYCLE].smpsw_type =
 	    PSWITCH_TYPE_HOTKEY;
 	e = sysmon_pswitch_register(&sc->sc_smpsw[WMI_DELL_PSW_DISPLAY_CYCLE]);
 @@ -220,57 +222,55 @@ static bool
 wmi_dell_resume(device_t self, const pmf_qual_t *qual)
+{
 	struct wmi_dell_softc *sc = device_private(self);
 	device_t parent = sc->sc_parent;
 	(void)acpi_wmi_event_register(parent, wmi_dell_notify_handler);
 	return true;
+}
 static void
 wmi_dell_action(struct wmi_dell_softc *sc, uint16_t *data, int len)
+{
-	int i;
+	size_t i;
 	for (i = 0; i < __arraycount(wmi_dell_actions); i++) {
 		const struct wmi_dell_actions *wda = &wmi_dell_actions[i];
 		if (wda->wda_type == data[0] &&
 		    wda->wda_subtype == data[1]) {
 			switch(wda->wda_action) {
 			case WMI_DELLA_IGN:
 				DPRINTF((" ignored"));
 				return;
 			case WMI_DELLA_PMF:
-				DPRINTF((" pmf %d",
+				DPRINTF((" pmf %d", wda->wda_data));
-				    wda->wda_data));
+				pmf_event_inject(NULL, wda->wda_data);
 				pmf_event_inject(NULL,
 				    wda->wda_data);
 				return;
 			case WMI_DELLA_PSW:
-				DPRINTF((" psw %d",
+				DPRINTF((" psw %d", wda->wda_data));
 				    wda->wda_data));
 				sysmon_pswitch_event(
 				    &sc->sc_smpsw[wda->wda_data],
 				    PSWITCH_EVENT_PRESSED);
 				return;
 			default:
-				printf("unknown dell wmi action %d\n",
+				aprint_debug_dev(sc->sc_dev,
 				    "unknown dell wmi action %d\n",
 				    wda->wda_action);
 				return;
+			}
+		}
+	}
-	aprint_debug_dev(sc->sc_dev, "unkown event 0x%4X 0x%4X\n",
+	aprint_debug_dev(sc->sc_dev, "unknown event %#4X %#4X\n",
 	    data[0], data[1]);
+}
 static void
 wmi_dell_notify_handler(ACPI_HANDLE hdl, uint32_t evt, void *aux)
+{
 	struct wmi_dell_softc *sc;
 	device_t self = aux;
 	ACPI_OBJECT *obj;
 	ACPI_BUFFER buf;
 	ACPI_STATUS rv;
 	uint16_t *data, *end;
 	int i, len;
 @@ -302,71 +302,68 @@ wmi_dell_notify_handler(ACPI_HANDLE hdl,
 			break;
+		}
 		len = data[0] + 1;
 		if (&data[len] >= end) {
 			DPRINTF(("\n"));
 			break;
+		}
 		if (len < 2) {
 			DPRINTF(("\n"));
 			continue;
+		}
 		for (i = 1; i < len; i++)
-			DPRINTF((" 0x%04X", data[i]));
+			DPRINTF((" %#04X", data[i]));
 		wmi_dell_action(sc, &data[1], len - 1);
 		DPRINTF(("\n"));
 		data = &data[len];
 		/*
 		 * WMI interface version 0 don't clear the buffer from previous
 		 * event, so if the current event is smaller than the previous
 		 * one there will be garbage after the current event.
 		 * workaround by processing only the first event
 		 */
 		if (sc->sc_version == 0)
 			break;
+	}
 out:
 	if (buf.Pointer != NULL)
 		ACPI_FREE(buf.Pointer);
 	if (ACPI_FAILURE(rv))
 		aprint_error_dev(sc->sc_dev, "failed to get data for "
-		    "event 0x%02X: %s\n", evt, AcpiFormatException(rv));
+		    "event %#02X: %s\n", evt, AcpiFormatException(rv));
+}
 MODULE(MODULE_CLASS_DRIVER, wmidell, "acpiwmi,sysmon_power");
 #ifdef _MODULE
 #include "ioconf.c"
 #endif
 static int
 wmidell_modcmd(modcmd_t cmd, void *aux)
+{
 	int rv = 0;
 	switch (cmd) {
 	case MODULE_CMD_INIT:
 #ifdef _MODULE
 		rv = config_init_component(cfdriver_ioconf_wmidell,
 		    cfattach_ioconf_wmidell, cfdata_ioconf_wmidell);
 #endif
 		break;
 	case MODULE_CMD_FINI:
 #ifdef _MODULE
 		rv = config_fini_component(cfdriver_ioconf_wmidell,
 		    cfattach_ioconf_wmidell, cfdata_ioconf_wmidell);
 #endif
 		break;
 	default:
 		rv = ENOTTY;
+	}
 	return rv;
+}