Module Name:    src
Committed By:   jruoho
Date:           Sun Feb 20 08:31:47 UTC 2011

Modified Files:
        src/distrib/sets/lists/man: mi
        src/share/man/man4: Makefile
        src/sys/dev/acpi: files.acpi
Added Files:
        src/share/man/man4: fujbp.4
        src/sys/dev/acpi: fujbp_acpi.c fujhk_acpi.c
Removed Files:
        src/share/man/man4: fujitsu.4
        src/sys/dev/acpi: fujitsu_acpi.c

Log Message:
Split fujbp(4) and fujhk(4) to separate instances from fujitsu(4). Allows
modularization and takes care of tsutsui@'s justified concern over the too
generic name "fujitsu". Ok gsutre@.


To generate a diff of this commit:
cvs rdiff -u -r1.1289 -r1.1290 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.551 -r1.552 src/share/man/man4/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man4/fujbp.4
cvs rdiff -u -r1.4 -r0 src/share/man/man4/fujitsu.4
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/acpi/files.acpi
cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/fujbp_acpi.c \
    src/sys/dev/acpi/fujhk_acpi.c
cvs rdiff -u -r1.2 -r0 src/sys/dev/acpi/fujitsu_acpi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1289 src/distrib/sets/lists/man/mi:1.1290
--- src/distrib/sets/lists/man/mi:1.1289	Wed Feb 16 07:30:27 2011
+++ src/distrib/sets/lists/man/mi	Sun Feb 20 08:31:46 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1289 2011/02/16 07:30:27 jruoho Exp $
+# $NetBSD: mi,v 1.1290 2011/02/20 08:31:46 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -974,7 +974,7 @@
 ./usr/share/man/cat4/fta.0			man-sys-catman		.cat
 ./usr/share/man/cat4/fujbp.0			man-sys-catman		.cat
 ./usr/share/man/cat4/fujhk.0			man-sys-catman		.cat
-./usr/share/man/cat4/fujitsu.0			man-sys-catman		.cat
+./usr/share/man/cat4/fujitsu.0			man-obsolete		obsolete
 ./usr/share/man/cat4/fwhrng.0			man-obsolete		obsolete
 ./usr/share/man/cat4/fwip.0			man-sys-catman		.cat
 ./usr/share/man/cat4/fwiso.0			man-obsolete		obsolete
@@ -3736,7 +3736,7 @@
 ./usr/share/man/html4/fta.html			man-sys-htmlman		html
 ./usr/share/man/html4/fujbp.html		man-sys-htmlman		html
 ./usr/share/man/html4/fujhk.html		man-sys-htmlman		html
-./usr/share/man/html4/fujitsu.html		man-sys-htmlman		html
+./usr/share/man/html4/fujitsu.html		man-obsolete		obsolete
 ./usr/share/man/html4/fwhrng.html		man-obsolete		obsolete
 ./usr/share/man/html4/fwip.html			man-sys-htmlman		html
 ./usr/share/man/html4/fwohci.html		man-sys-htmlman		html
@@ -6273,7 +6273,7 @@
 ./usr/share/man/man4/fta.4			man-sys-man		.man
 ./usr/share/man/man4/fujbp.4			man-sys-man		.man
 ./usr/share/man/man4/fujhk.4			man-sys-man		.man
-./usr/share/man/man4/fujitsu.4			man-sys-man		.man
+./usr/share/man/man4/fujitsu.4			man-obsolete		obsolete
 ./usr/share/man/man4/fwhrng.4			man-obsolete		obsolete
 ./usr/share/man/man4/fwip.4			man-sys-man		.man
 ./usr/share/man/man4/fwiso.4			man-obsolete		obsolete

Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.551 src/share/man/man4/Makefile:1.552
--- src/share/man/man4/Makefile:1.551	Wed Feb 16 07:30:26 2011
+++ src/share/man/man4/Makefile	Sun Feb 20 08:31:46 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.551 2011/02/16 07:30:26 jruoho Exp $
+#	$NetBSD: Makefile,v 1.552 2011/02/20 08:31:46 jruoho Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -24,7 +24,7 @@
 	dmphy.4 dpt.4 dpti.4 drm.4 drum.4 \
 	eap.4 ebus.4 edc.4 elmc.4 emuxki.4 en.4 envsys.4 ep.4 esh.4 esis.4 \
 	esa.4 esiop.4 esm.4 eso.4 et.4 etherip.4 etphy.4 exphy.4 \
-	fast_ipsec.4 fd.4 finsio.4 fpa.4 fms.4 fss.4 fujitsu.4 fxp.4 \
+	fast_ipsec.4 fd.4 finsio.4 fpa.4 fms.4 fss.4 fujbp.4 fxp.4 \
 	gcscaudio.4 gem.4 genfb.4 gentbi.4 geodeide.4 \
 	glxtphy.4 gpib.4 gpio.4 gpiolock.4 gpiosim.4 gre.4 gphyter.4 gsip.4 \
 	hdaudio.4 hifn.4 hme.4 hpqlb.4 hptide.4 \
@@ -181,7 +181,7 @@
 MLINKS+=dbcool.4 adt7476.4
 MLINKS+=fd.4 stderr.4 fd.4 stdin.4 fd.4 stdout.4
 MLINKS+=fpa.4 fea.4 fpa.4 fta.4
-MLINKS+=fujitsu.4 fujbp.4 fujitsu.4 fujhk.4
+MLINKS+=fujbp.4 fujhk.4
 MLINKS+=hdaudio.4 hdafg.4
 MLINKS+=hdaudio.4 hdaudiobus.4
 MLINKS+=icp.4 icpsp.4

Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.86 src/sys/dev/acpi/files.acpi:1.87
--- src/sys/dev/acpi/files.acpi:1.86	Mon Jan 17 15:55:24 2011
+++ src/sys/dev/acpi/files.acpi	Sun Feb 20 08:31:46 2011
@@ -1,4 +1,4 @@
-#	$NetBSD: files.acpi,v 1.86 2011/01/17 15:55:24 jmcneill Exp $
+#	$NetBSD: files.acpi,v 1.87 2011/02/20 08:31:46 jruoho Exp $
 
 include "dev/acpi/acpica/files.acpica"
 
@@ -198,11 +198,14 @@
 attach	acpismbus at acpinodebus
 file	dev/acpi/smbus_acpi.c		acpismbus
 
-# Fujitsu Brightness, Pointer and Hotkeys
+# Fujitsu Brightness & Pointer
 device	fujbp
 attach	fujbp at acpinodebus
+file	dev/acpi/fujbp_acpi.c		fujbp
+
+# Fujitsu Hotkeys
 device	fujhk: sysmon_power
 attach	fujhk at acpinodebus
-file	dev/acpi/fujitsu_acpi.c		fujbp|fujhk
+file	dev/acpi/fujhk_acpi.c		fujhk
 
 include	"dev/acpi/wmi/files.wmi"

Added files:

Index: src/share/man/man4/fujbp.4
diff -u /dev/null src/share/man/man4/fujbp.4:1.1
--- /dev/null	Sun Feb 20 08:31:47 2011
+++ src/share/man/man4/fujbp.4	Sun Feb 20 08:31:46 2011
@@ -0,0 +1,94 @@
+.\" $NetBSD: fujbp.4,v 1.1 2011/02/20 08:31:46 jruoho Exp $
+.\"
+.\" Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
+.\" 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.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``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.
+.\"
+.Dd February 20, 2011
+.Dt FUJBP 4
+.Os
+.Sh NAME
+.Nm fujbp ,
+.Nm fujhk
+.Nd Fujitsu Brightness, Pointer, and Hotkeys
+.Sh SYNOPSIS
+.Cd "fujbp* at acpi?"
+.Cd "fujhk* at acpi?"
+.Sh DESCRIPTION
+Some Fujitsu laptops come with vendor-specific
+.Tn ACPI
+devices to manage the laptop hotkeys (such as the
+.Sq Eco
+button), and to control various built-in components (such as the display,
+the touchpad, and the speakers).
+The
+.Nm
+and
+.Ic fujhk
+drivers provide support, through these
+.Tn ACPI
+devices, for hotkeys, backlight on/off switch, brightness level control, and
+pointer on/off switch.
+.Pp
+The following
+.Xr sysctl 8
+read/write variables are provided (when hardware support is available):
+.Bl -tag -width hw.acpi.fujbp0.brightness -offset indent
+.It Va hw.acpi.fujbp0.brightness
+Brightness level (integer).
+.It Va hw.acpi.fujbp0.pointer
+Pointer switch state (boolean).
+.It Va hw.acpi.fujhk0.backlight
+Backlight switch state (boolean).
+.El
+.Pp
+Please note, however, that future versions of the drivers may remove these
+.Xr sysctl 8
+variables without prior notice.
+.Sh SEE ALSO
+.Xr acpi 4 ,
+.Xr acpivga 4 ,
+.Xr sysctl 8 ,
+.Xr pmf 9 ,
+.Xr sysmon_pswitch 9
+.Sh HISTORY
+The
+.Nm
+and
+.Ic fujhk
+drivers appeared in
+.Nx 6.0 .
+.Sh AUTHORS
+.An Gr\('egoire Sutre
+.Aq gsu...@netbsd.org
+.Sh CAVEATS
+Brightness level and backlight switch state should be controlled via
+.Xr wsconsctl 8
+instead of
+.Xr sysctl 8 .
+.Pp
+The
+.Xr sysctl 8
+variable
+.Va hw.acpi.fujbp0.pointer
+should be replaced by a platform-independent userland control.

Index: src/sys/dev/acpi/fujbp_acpi.c
diff -u /dev/null src/sys/dev/acpi/fujbp_acpi.c:1.1
--- /dev/null	Sun Feb 20 08:31:47 2011
+++ src/sys/dev/acpi/fujbp_acpi.c	Sun Feb 20 08:31:46 2011
@@ -0,0 +1,694 @@
+/*	$NetBSD: fujbp_acpi.c,v 1.1 2011/02/20 08:31:46 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Gregoire Sutre.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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.
+ */
+
+/*
+ * ACPI Fujitsu Driver.
+ *
+ * Together with fujhk(4), this driver provides support for the ACPI devices
+ * FUJ02B1 and FUJ02E3 that are commonly found in Fujitsu LifeBooks. The
+ * driver does not support all features of these devices, in particular
+ * volume control is not implemented.
+ *
+ * Information regarding the behavior of these devices was obtained from the
+ * source code of the Linux and FreeBSD drivers, as well as from experiments on
+ * a Fujitsu LifeBook P7120.
+ *
+ * The FUJ02B1 device is used to control the brightness level of the internal
+ * display, the state (on/off) of the internal pointer, and the volume level of
+ * the internal speakers or headphones.
+ *
+ * The FUJ02B1 device provides the following methods (or only a subset):
+ *
+ *	GSIF		supported hotkey status bits (bitmask for GHKS)
+ *	GHKS		active hotkeys (bit field)
+ *	{G,S}BLL	get/set the brightness level of the internal display
+ *	{G,S}VOL	get/set the volume level of the internal speakers
+ *	{G,S}MOU	get/set the switch state of the internal pointer
+ *	RBLL		brightness radix (number of brightness levels)
+ *	RVOL		volume radix (number of volume levels)
+ *
+ * Notifications are delivered to the FUJ02B1 device when functions hotkeys
+ * (brightness, pointer) are released.  However, these notifications seem to be
+ * purely informative: the BIOS already made the hardware changes corresponding
+ * to the hotkey.
+ *
+ * Each bit in the value returned by GHKS remains set until the corresponding
+ * get method (GBLL, GMOU or GVOL) is called.
+ *
+ * The FUJ02E3 device manages the laptop hotkeys (such as the `Eco' button) and
+ * provides additional services (such as backlight on/off control) through the
+ * FUNC method.
+ *
+ * The FUJ02E3 device provides the following methods (or only a subset):
+ *
+ *	GIRB		get next hotkey code from buffer
+ *	FUNC		general-purpose method (four arguments)
+ *
+ * Notifications are delivered to the FUJ02E3 device when hotkeys are pressed
+ * and when they are released.  The BIOS stores the corresponding codes in a
+ * FIFO buffer, that can be read with the GIRB method.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: fujbp_acpi.c,v 1.1 2011/02/20 08:31:46 jruoho Exp $");
+
+#include <sys/param.h>
+#include <sys/device.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/sysctl.h>
+
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+
+#define _COMPONENT			ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME			("fujbp_acpi")
+
+/*
+ * Notification value, bits returned by the GHKS method, and
+ * modification status bits (from GBLL, GMOU, GIRB), respectively.
+ */
+#define FUJITSU_BP_NOTIFY		0x80
+#define FUJITSU_BP_HKS_BRIGHTNESS	__BIT(0)
+#define FUJITSU_BP_HKS_POINTER		__BIT(3)
+#define FUJITSU_BP_MODMASK		0xc0000000
+
+/*
+ * ACPI Fujitsu brightness & pointer controller capabilities (methods).
+ */
+#define FUJITSU_BP_CAP_GHKS		__BIT(0)
+#define FUJITSU_BP_CAP_RBLL		__BIT(1)
+#define FUJITSU_BP_CAP_GBLL		__BIT(2)
+#define FUJITSU_BP_CAP_SBLL		__BIT(3)
+#define FUJITSU_BP_CAP_GMOU		__BIT(4)
+#define FUJITSU_BP_CAP_SMOU		__BIT(5)
+
+/*
+ * fujitsu_bp_softc:
+ *
+ *	Software state of an ACPI Fujitsu brightness & pointer controller.
+ *	Valid brightness levels range from 0 to (sc_brightness_nlevels - 1).
+ */
+struct fujitsu_bp_softc {
+	device_t		 sc_dev;
+	struct acpi_devnode	*sc_node;
+	struct sysctllog	*sc_log;
+	kmutex_t		 sc_mtx;
+	uint16_t		 sc_caps;
+	uint8_t			 sc_brightness_nlevels;
+};
+
+static const char * const fujitsu_bp_hid[] = {
+	"FUJ02B1",
+	NULL
+};
+
+static int	fujitsu_bp_match(device_t, cfdata_t, void *);
+static void	fujitsu_bp_attach(device_t, device_t, void *);
+static int	fujitsu_bp_detach(device_t, int);
+static bool	fujitsu_bp_suspend(device_t, const pmf_qual_t *);
+static bool	fujitsu_bp_resume(device_t, const pmf_qual_t *);
+static void	fujitsu_bp_brightness_up(device_t);
+static void	fujitsu_bp_brightness_down(device_t);
+static uint16_t	fujitsu_bp_capabilities(const struct acpi_devnode *);
+static void	fujitsu_bp_notify_handler(ACPI_HANDLE, uint32_t, void *);
+static void	fujitsu_bp_event_callback(void *);
+static void	fujitsu_bp_sysctl_setup(struct fujitsu_bp_softc *);
+static int	fujitsu_bp_sysctl_brightness(SYSCTLFN_PROTO);
+static int	fujitsu_bp_sysctl_pointer(SYSCTLFN_PROTO);
+static int	fujitsu_bp_get_hks(struct fujitsu_bp_softc *, uint32_t *);
+static int	fujitsu_bp_init_brightness(struct fujitsu_bp_softc *,uint8_t*);
+static int	fujitsu_bp_get_brightness(struct fujitsu_bp_softc *,uint8_t *);
+static int	fujitsu_bp_set_brightness(struct fujitsu_bp_softc *, uint8_t);
+static int	fujitsu_bp_get_pointer(struct fujitsu_bp_softc *, bool *);
+static int	fujitsu_bp_set_pointer(struct fujitsu_bp_softc *, bool);
+static bool	fujitsu_bp_cap(ACPI_HANDLE, const char *, ACPI_OBJECT_TYPE);
+
+CFATTACH_DECL_NEW(fujbp, sizeof(struct fujitsu_bp_softc),
+    fujitsu_bp_match, fujitsu_bp_attach, fujitsu_bp_detach, NULL);
+
+static int
+fujitsu_bp_match(device_t parent, cfdata_t match, void *aux)
+{
+	struct acpi_attach_args *aa = aux;
+
+	if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
+		return 0;
+
+	return acpi_match_hid(aa->aa_node->ad_devinfo, fujitsu_bp_hid);
+}
+
+static void
+fujitsu_bp_attach(device_t parent, device_t self, void *aux)
+{
+	struct fujitsu_bp_softc *sc = device_private(self);
+	struct acpi_attach_args *aa = aux;
+	struct acpi_devnode *ad = aa->aa_node;
+
+	aprint_naive(": Fujitsu Brightness & Pointer\n");
+	aprint_normal(": Fujitsu Brightness & Pointer\n");
+
+	sc->sc_dev = self;
+	sc->sc_node = ad;
+	sc->sc_log = NULL;
+	sc->sc_caps = fujitsu_bp_capabilities(ad);
+
+	mutex_init(&sc->sc_mtx, MUTEX_DEFAULT, IPL_NONE);
+
+	if (fujitsu_bp_init_brightness(sc, &sc->sc_brightness_nlevels))
+		sc->sc_brightness_nlevels = 0;
+
+	(void)acpi_register_notify(sc->sc_node, fujitsu_bp_notify_handler);
+	(void)pmf_device_register(self, fujitsu_bp_suspend, fujitsu_bp_resume);
+
+	fujitsu_bp_sysctl_setup(sc);
+
+	(void)pmf_event_register(self, PMFE_DISPLAY_BRIGHTNESS_UP,
+	    fujitsu_bp_brightness_up, true);
+
+	(void)pmf_event_register(self, PMFE_DISPLAY_BRIGHTNESS_DOWN,
+	    fujitsu_bp_brightness_down, true);
+}
+
+static int
+fujitsu_bp_detach(device_t self, int flags)
+{
+	struct fujitsu_bp_softc *sc = device_private(self);
+
+	pmf_event_deregister(self, PMFE_DISPLAY_BRIGHTNESS_DOWN,
+	    fujitsu_bp_brightness_down, true);
+
+	pmf_event_deregister(self, PMFE_DISPLAY_BRIGHTNESS_UP,
+	    fujitsu_bp_brightness_up, true);
+
+	pmf_device_deregister(self);
+
+	if (sc->sc_log != NULL)
+		sysctl_teardown(&sc->sc_log);
+
+	acpi_deregister_notify(sc->sc_node);
+	mutex_destroy(&sc->sc_mtx);
+
+	return 0;
+}
+
+/*
+ * On some LifeBook models, a call to the SMOU method is required to make the
+ * internal pointer work after resume.  On the P7120, the internal pointer is
+ * always enabled after resume.  If it was disabled before suspend, the BIOS
+ * apparently believes that it is still disabled after resume.
+ *
+ * To prevent these problems, we disable the internal pointer on suspend and
+ * enable it on resume.
+ */
+static bool
+fujitsu_bp_suspend(device_t self, const pmf_qual_t *qual)
+{
+	struct fujitsu_bp_softc *sc = device_private(self);
+
+	mutex_enter(&sc->sc_mtx);
+	(void)fujitsu_bp_set_pointer(sc, false);
+	mutex_exit(&sc->sc_mtx);
+
+	return true;
+}
+
+static bool
+fujitsu_bp_resume(device_t self, const pmf_qual_t *qual)
+{
+	struct fujitsu_bp_softc *sc = device_private(self);
+
+	mutex_enter(&sc->sc_mtx);
+	(void)fujitsu_bp_set_pointer(sc, true);
+	mutex_exit(&sc->sc_mtx);
+
+	return true;
+}
+
+static void
+fujitsu_bp_brightness_up(device_t self)
+{
+	struct fujitsu_bp_softc *sc = device_private(self);
+	uint8_t level;
+
+	mutex_enter(&sc->sc_mtx);
+
+	if (fujitsu_bp_get_brightness(sc, &level) == 0 &&
+	    level < (uint8_t)(sc->sc_brightness_nlevels - 1))
+		(void)fujitsu_bp_set_brightness(sc, level + 1);
+
+	mutex_exit(&sc->sc_mtx);
+}
+
+static void
+fujitsu_bp_brightness_down(device_t self)
+{
+	struct fujitsu_bp_softc *sc = device_private(self);
+	uint8_t level;
+
+	mutex_enter(&sc->sc_mtx);
+
+	if (fujitsu_bp_get_brightness(sc, &level) == 0 && level > 0)
+		(void)fujitsu_bp_set_brightness(sc, level - 1);
+
+	mutex_exit(&sc->sc_mtx);
+}
+
+static uint16_t
+fujitsu_bp_capabilities(const struct acpi_devnode *ad)
+{
+	uint16_t caps;
+
+	caps = 0;
+
+	if (fujitsu_bp_cap(ad->ad_handle, "GHKS", ACPI_TYPE_INTEGER))
+		caps |= FUJITSU_BP_CAP_GHKS;
+
+	if (fujitsu_bp_cap(ad->ad_handle, "RBLL", ACPI_TYPE_INTEGER))
+		caps |= FUJITSU_BP_CAP_RBLL;
+
+	if (fujitsu_bp_cap(ad->ad_handle, "GBLL", ACPI_TYPE_INTEGER))
+		caps |= FUJITSU_BP_CAP_GBLL;
+
+	if (fujitsu_bp_cap(ad->ad_handle, "SBLL", ACPI_TYPE_METHOD))
+		caps |= FUJITSU_BP_CAP_SBLL;
+
+	if (fujitsu_bp_cap(ad->ad_handle, "GMOU", ACPI_TYPE_INTEGER))
+		caps |= FUJITSU_BP_CAP_GMOU;
+
+	if (fujitsu_bp_cap(ad->ad_handle, "SMOU", ACPI_TYPE_METHOD))
+		caps |= FUJITSU_BP_CAP_SMOU;
+
+	return caps;
+}
+
+static void
+fujitsu_bp_notify_handler(ACPI_HANDLE handle, uint32_t evt, void *context)
+{
+	struct fujitsu_bp_softc *sc = device_private(context);
+	static const int handler = OSL_NOTIFY_HANDLER;
+
+	switch (evt) {
+
+	case FUJITSU_BP_NOTIFY:
+		(void)AcpiOsExecute(handler, fujitsu_bp_event_callback, sc);
+		break;
+
+	default:
+		aprint_debug_dev(sc->sc_dev, "unknown notify 0x%02X\n", evt);
+	}
+}
+
+static void
+fujitsu_bp_event_callback(void *arg)
+{
+	struct fujitsu_bp_softc *sc = arg;
+	int error;
+	uint32_t hks;
+	uint8_t level;
+	bool state;
+
+	if (fujitsu_bp_get_hks(sc, &hks))
+		return;
+
+	if (hks & FUJITSU_BP_HKS_BRIGHTNESS) {
+		mutex_enter(&sc->sc_mtx);
+		error = fujitsu_bp_get_brightness(sc, &level);
+		mutex_exit(&sc->sc_mtx);
+		if (!error)
+			aprint_verbose_dev(sc->sc_dev,
+			    "brightness level is now: %"PRIu8"\n", level);
+	}
+
+	if (hks & FUJITSU_BP_HKS_POINTER) {
+		mutex_enter(&sc->sc_mtx);
+		error = fujitsu_bp_get_pointer(sc, &state);
+		mutex_exit(&sc->sc_mtx);
+		if (!error)
+			aprint_verbose_dev(sc->sc_dev,
+			    "internal pointer is now: %s\n",
+			    state ? "enabled" : "disabled");
+	}
+}
+
+static void
+fujitsu_bp_sysctl_setup(struct fujitsu_bp_softc *sc)
+{
+	const struct sysctlnode *rnode;
+	int access;
+	uint8_t dummy_level;
+	bool dummy_state;
+	bool brightness, pointer;
+
+	brightness = (fujitsu_bp_get_brightness(sc, &dummy_level) == 0);
+	pointer = (fujitsu_bp_get_pointer(sc, &dummy_state) == 0);
+
+	if (brightness || pointer) {
+		if ((sysctl_createv(&sc->sc_log, 0, NULL, &rnode,
+		    0, CTLTYPE_NODE, "hw", NULL,
+		    NULL, 0, NULL, 0,
+		    CTL_HW, CTL_EOL)) != 0)
+			goto fail;
+
+		if ((sysctl_createv(&sc->sc_log, 0, &rnode, &rnode,
+		    0, CTLTYPE_NODE, "acpi", NULL,
+		    NULL, 0, NULL, 0,
+		    CTL_CREATE, CTL_EOL)) != 0)
+			goto fail;
+
+		if ((sysctl_createv(&sc->sc_log, 0, &rnode, &rnode,
+		    0, CTLTYPE_NODE, device_xname(sc->sc_dev),
+		    SYSCTL_DESCR("Fujitsu brightness & pointer controls"),
+		    NULL, 0, NULL, 0,
+		    CTL_CREATE, CTL_EOL)) != 0)
+			goto fail;
+	}
+
+	if (brightness) {
+		if (sc->sc_caps & FUJITSU_BP_CAP_SBLL)
+			access = CTLFLAG_READWRITE;
+		else
+			access = CTLFLAG_READONLY;
+
+		(void)sysctl_createv(&sc->sc_log, 0, &rnode, NULL,
+		    access, CTLTYPE_INT, "brightness",
+		    SYSCTL_DESCR("Internal DFP brightness level"),
+		    fujitsu_bp_sysctl_brightness, 0, sc, 0,
+		    CTL_CREATE, CTL_EOL);
+	}
+
+	if (pointer) {
+		if (sc->sc_caps & FUJITSU_BP_CAP_SMOU)
+			access = CTLFLAG_READWRITE;
+		else
+			access = CTLFLAG_READONLY;
+
+		(void)sysctl_createv(&sc->sc_log, 0, &rnode, NULL,
+		    access, CTLTYPE_BOOL, "pointer",
+		    SYSCTL_DESCR("Internal pointer switch state"),
+		    fujitsu_bp_sysctl_pointer, 0, sc, 0,
+		    CTL_CREATE, CTL_EOL);
+	}
+
+	return;
+
+ fail:
+	aprint_error_dev(sc->sc_dev, "couldn't add sysctl nodes\n");
+}
+
+static int
+fujitsu_bp_sysctl_brightness(SYSCTLFN_ARGS)
+{
+	struct sysctlnode node;
+	struct fujitsu_bp_softc *sc;
+	int val, error;
+	uint8_t level;
+
+	node = *rnode;
+	sc = node.sysctl_data;
+
+	mutex_enter(&sc->sc_mtx);
+	error = fujitsu_bp_get_brightness(sc, &level);
+	val = (int)level;
+	mutex_exit(&sc->sc_mtx);
+
+	if (error)
+		return error;
+
+	node.sysctl_data = &val;
+	error = sysctl_lookup(SYSCTLFN_CALL(&node));
+	if (error || newp == NULL)
+		return error;
+
+	if (val < 0 || val > (uint8_t)(sc->sc_brightness_nlevels - 1))
+		return EINVAL;
+
+	mutex_enter(&sc->sc_mtx);
+	error = fujitsu_bp_set_brightness(sc, (uint8_t)val);
+	mutex_exit(&sc->sc_mtx);
+
+	return error;
+}
+
+static int
+fujitsu_bp_sysctl_pointer(SYSCTLFN_ARGS)
+{
+	struct sysctlnode node;
+	struct fujitsu_bp_softc *sc;
+	bool val;
+	int error;
+
+	node = *rnode;
+	sc = node.sysctl_data;
+
+	mutex_enter(&sc->sc_mtx);
+	error = fujitsu_bp_get_pointer(sc, &val);
+	mutex_exit(&sc->sc_mtx);
+
+	if (error)
+		return error;
+
+	node.sysctl_data = &val;
+	error = sysctl_lookup(SYSCTLFN_CALL(&node));
+	if (error || newp == NULL)
+		return error;
+
+	mutex_enter(&sc->sc_mtx);
+	error = fujitsu_bp_set_pointer(sc, val);
+	mutex_exit(&sc->sc_mtx);
+
+	return error;
+}
+
+static int
+fujitsu_bp_get_hks(struct fujitsu_bp_softc *sc, uint32_t *valuep)
+{
+	ACPI_HANDLE hdl = sc->sc_node->ad_handle;
+	ACPI_INTEGER val;
+	ACPI_STATUS rv;
+
+	if (!(sc->sc_caps & FUJITSU_BP_CAP_GHKS))
+		return ENODEV;
+
+	rv = acpi_eval_integer(hdl, "GHKS", &val);
+	if (ACPI_FAILURE(rv)) {
+		aprint_error_dev(sc->sc_dev, "failed to evaluate %s.%s: %s\n",
+		    acpi_name(hdl), "GHKS", AcpiFormatException(rv));
+		return EIO;
+	}
+
+	*valuep = (uint32_t)val;
+
+	return 0;
+}
+
+static int
+fujitsu_bp_init_brightness(struct fujitsu_bp_softc *sc, uint8_t *valuep)
+{
+	ACPI_HANDLE hdl = sc->sc_node->ad_handle;
+	ACPI_INTEGER val;
+	ACPI_STATUS rv;
+
+	if (!(sc->sc_caps & FUJITSU_BP_CAP_RBLL))
+		return ENODEV;
+
+	rv = acpi_eval_integer(hdl, "RBLL", &val);
+	if (ACPI_FAILURE(rv)) {
+		aprint_error_dev(sc->sc_dev, "failed to evaluate %s.%s: %s\n",
+		    acpi_name(hdl), "RBLL", AcpiFormatException(rv));
+		return EIO;
+	}
+
+	if (val > UINT8_MAX)
+		return ERANGE;
+
+	*valuep = (uint8_t)val;
+
+	return 0;
+}
+
+static int
+fujitsu_bp_get_brightness(struct fujitsu_bp_softc *sc, uint8_t *valuep)
+{
+	ACPI_HANDLE hdl = sc->sc_node->ad_handle;
+	ACPI_INTEGER val;
+	ACPI_STATUS rv;
+
+	if (!(sc->sc_caps & FUJITSU_BP_CAP_GBLL))
+		return ENODEV;
+
+	rv = acpi_eval_integer(hdl, "GBLL", &val);
+	if (ACPI_FAILURE(rv)) {
+		aprint_error_dev(sc->sc_dev, "failed to evaluate %s.%s: %s\n",
+		    acpi_name(hdl), "GBLL", AcpiFormatException(rv));
+		return EIO;
+	}
+
+	/* Clear modification bits. */
+	val &= ~FUJITSU_BP_MODMASK;
+
+	if (val > UINT8_MAX)
+		return ERANGE;
+
+	*valuep = (uint8_t)val;
+
+	return 0;
+}
+
+static int
+fujitsu_bp_set_brightness(struct fujitsu_bp_softc *sc, uint8_t val)
+{
+	ACPI_HANDLE hdl = sc->sc_node->ad_handle;
+	ACPI_STATUS rv;
+
+	if (!(sc->sc_caps & FUJITSU_BP_CAP_SBLL))
+		return ENODEV;
+
+	rv = acpi_eval_set_integer(hdl, "SBLL", val);
+
+	if (ACPI_FAILURE(rv)) {
+		aprint_error_dev(sc->sc_dev, "failed to evaluate %s.%s: %s\n",
+		    acpi_name(hdl), "SBLL", AcpiFormatException(rv));
+		return EIO;
+	}
+
+	return 0;
+}
+
+static int
+fujitsu_bp_get_pointer(struct fujitsu_bp_softc *sc, bool *valuep)
+{
+	ACPI_HANDLE hdl = sc->sc_node->ad_handle;
+	ACPI_INTEGER val;
+	ACPI_STATUS rv;
+
+	if (!(sc->sc_caps & FUJITSU_BP_CAP_GMOU))
+		return ENODEV;
+
+	rv = acpi_eval_integer(hdl, "GMOU", &val);
+	if (ACPI_FAILURE(rv)) {
+		aprint_error_dev(sc->sc_dev, "failed to evaluate %s.%s: %s\n",
+		    acpi_name(hdl), "GMOU", AcpiFormatException(rv));
+		return EIO;
+	}
+
+	/* Clear modification bits. */
+	val &= ~FUJITSU_BP_MODMASK;
+
+	if (val > 1)
+		return ERANGE;
+
+	*valuep = (bool)val;
+
+	return 0;
+}
+
+static int
+fujitsu_bp_set_pointer(struct fujitsu_bp_softc *sc, bool val)
+{
+	ACPI_HANDLE hdl = sc->sc_node->ad_handle;
+	ACPI_STATUS rv;
+
+	if (!(sc->sc_caps & FUJITSU_BP_CAP_SMOU))
+		return ENODEV;
+
+	rv = acpi_eval_set_integer(hdl, "SMOU", val);
+
+	if (ACPI_FAILURE(rv)) {
+		aprint_error_dev(sc->sc_dev, "failed to evaluate %s.%s: %s\n",
+		    acpi_name(hdl), "SMOU", AcpiFormatException(rv));
+		return EIO;
+	}
+
+	return 0;
+}
+
+/*
+ * fujitusu_bp_cap:
+ *
+ *	Returns true if and only if (a) the object handle.path exists and
+ *	(b) this object is a method or has the given type.
+ */
+static bool
+fujitsu_bp_cap(ACPI_HANDLE handle, const char *path, ACPI_OBJECT_TYPE type)
+{
+	ACPI_HANDLE hdl;
+	ACPI_OBJECT_TYPE typ;
+
+	KASSERT(handle != NULL);
+
+	if (ACPI_FAILURE(AcpiGetHandle(handle, path, &hdl)))
+		return false;
+
+	if (ACPI_FAILURE(AcpiGetType(hdl, &typ)))
+		return false;
+
+	if (typ != ACPI_TYPE_METHOD && typ != type)
+		return false;
+
+	return true;
+}
+
+MODULE(MODULE_CLASS_DRIVER, fujbp, NULL);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+fujbp_modcmd(modcmd_t cmd, void *aux)
+{
+	int rv = 0;
+
+	switch (cmd) {
+
+	case MODULE_CMD_INIT:
+
+#ifdef _MODULE
+		rv = config_init_component(cfdriver_ioconf_fujbp,
+		    cfattach_ioconf_fujbp, cfdata_ioconf_fujbp);
+#endif
+		break;
+
+	case MODULE_CMD_FINI:
+
+#ifdef _MODULE
+		rv = config_fini_component(cfdriver_ioconf_fujbp,
+		    cfattach_ioconf_fujbp, cfdata_ioconf_fujbp);
+#endif
+		break;
+
+	default:
+		rv = ENOTTY;
+	}
+
+	return rv;
+}
Index: src/sys/dev/acpi/fujhk_acpi.c
diff -u /dev/null src/sys/dev/acpi/fujhk_acpi.c:1.1
--- /dev/null	Sun Feb 20 08:31:47 2011
+++ src/sys/dev/acpi/fujhk_acpi.c	Sun Feb 20 08:31:46 2011
@@ -0,0 +1,558 @@
+/*	$NetBSD: fujhk_acpi.c,v 1.1 2011/02/20 08:31:46 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Gregoire Sutre.
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``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: fujhk_acpi.c,v 1.1 2011/02/20 08:31:46 jruoho Exp $");
+
+#include <sys/param.h>
+#include <sys/device.h>
+#include <sys/module.h>
+#include <sys/mutex.h>
+#include <sys/sysctl.h>
+
+#include <dev/sysmon/sysmonvar.h>
+
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+
+#define _COMPONENT			ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME			("fujhk_acpi")
+
+#define FUJITSU_HK_NOTIFY		0x80
+#define FUJITSU_HK_MODMASK		0xc0000000
+
+/* Values returned by the GIRB method. */
+#define FUJITSU_HK_IRB_HOTKEY_RELEASE	0x0
+#define FUJITSU_HK_IRB_HOTKEY_PRESS(x)	(0x410 | x)
+
+/* Hotkey index of a value returned by the GIRB method. */
+#define FUJITSU_HK_IRB_HOTKEY_INDEX(x)	(x & 0x3)
+
+/* Values for the first argument of the FUNC method. */
+#define FUJITSU_FUNC_TARGET_BACKLIGHT	0x1004
+
+/* Values for the second argument of the FUNC method. */
+#define FUJITSU_FUNC_COMMAND_SET	0x1
+#define FUJITSU_FUNC_COMMAND_GET	0x2
+
+/* Backlight values for the FUNC method. */
+#define FUJITSU_FUNC_BACKLIGHT_ON	0x0
+#define FUJITSU_FUNC_BACKLIGHT_REDUCED	0x2
+#define FUJITSU_FUNC_BACKLIGHT_OFF	0x3
+
+/* Value returned by FUNC on invalid arguments. */
+#define FUJITSU_FUNC_INVALID_ARGS	0x80000000
+
+/* ACPI Fujitsu hotkeys controller capabilities (methods). */
+#define FUJITSU_HK_CAP_GIRB	__BIT(0)
+#define FUJITSU_HK_CAP_FUNC	__BIT(1)
+
+struct fujitsu_hk_softc {
+	device_t		 sc_dev;
+	struct acpi_devnode	*sc_node;
+	struct sysctllog	*sc_log;
+	kmutex_t		 sc_mtx;
+	uint16_t		 sc_caps;
+#define	FUJITSU_HK_PSW_COUNT	4
+	struct sysmon_pswitch	 sc_smpsw[FUJITSU_HK_PSW_COUNT];
+	char			 sc_smpsw_name[FUJITSU_HK_PSW_COUNT][16];
+};
+
+static const char * const fujitsu_hk_hid[] = {
+	"FUJ02E3",
+	NULL
+};
+
+static int	fujitsu_hk_match(device_t, cfdata_t, void *);
+static void	fujitsu_hk_attach(device_t, device_t, void *);
+static int	fujitsu_hk_detach(device_t, int);
+static bool	fujitsu_hk_suspend(device_t, const pmf_qual_t *);
+static bool	fujitsu_hk_resume(device_t, const pmf_qual_t *);
+static uint16_t	fujitsu_hk_capabilities(const struct acpi_devnode *);
+static void	fujitsu_hk_notify_handler(ACPI_HANDLE, uint32_t, void *);
+static void	fujitsu_hk_event_callback(void *);
+static void	fujitsu_hk_sysctl_setup(struct fujitsu_hk_softc *);
+static int	fujitsu_hk_sysctl_backlight(SYSCTLFN_PROTO);
+static int	fujitsu_hk_get_irb(struct fujitsu_hk_softc *, uint32_t *);
+static int	fujitsu_hk_get_backlight(struct fujitsu_hk_softc *, bool *);
+static int	fujitsu_hk_set_backlight(struct fujitsu_hk_softc *, bool);
+static bool	fujitsu_hk_cap(ACPI_HANDLE, const char *, ACPI_OBJECT_TYPE);
+static ACPI_STATUS fujitsu_hk_eval_nary_integer(ACPI_HANDLE,
+				const char *, const
+				ACPI_INTEGER *, uint8_t, ACPI_INTEGER *);
+
+CFATTACH_DECL_NEW(fujhk, sizeof(struct fujitsu_hk_softc),
+    fujitsu_hk_match, fujitsu_hk_attach, fujitsu_hk_detach, NULL);
+
+static int
+fujitsu_hk_match(device_t parent, cfdata_t match, void *aux)
+{
+	struct acpi_attach_args *aa = aux;
+
+	if (aa->aa_node->ad_type != ACPI_TYPE_DEVICE)
+		return 0;
+
+	return acpi_match_hid(aa->aa_node->ad_devinfo, fujitsu_hk_hid);
+}
+
+static void
+fujitsu_hk_attach(device_t parent, device_t self, void *aux)
+{
+	struct fujitsu_hk_softc *sc = device_private(self);
+	struct acpi_attach_args *aa = aux;
+	struct acpi_devnode *ad = aa->aa_node;
+	int i;
+
+	aprint_naive(": Fujitsu Hotkeys\n");
+	aprint_normal(": Fujitsu Hotkeys\n");
+
+	sc->sc_dev = self;
+	sc->sc_node = ad;
+	sc->sc_log = NULL;
+	sc->sc_caps = fujitsu_hk_capabilities(ad);
+
+	mutex_init(&sc->sc_mtx, MUTEX_DEFAULT, IPL_NONE);
+
+	for (i = 0; i < FUJITSU_HK_PSW_COUNT; i++) {
+		(void)snprintf(sc->sc_smpsw_name[i],
+		    sizeof(sc->sc_smpsw_name[i]), "%s-%d",
+		    device_xname(self), i);
+		sc->sc_smpsw[i].smpsw_name = sc->sc_smpsw_name[i];
+		sc->sc_smpsw[i].smpsw_type = PSWITCH_TYPE_HOTKEY;
+		(void)sysmon_pswitch_register(&sc->sc_smpsw[i]);
+	}
+
+	fujitsu_hk_sysctl_setup(sc);
+
+	(void)pmf_device_register(self, fujitsu_hk_suspend, fujitsu_hk_resume);
+	(void)acpi_register_notify(sc->sc_node, fujitsu_hk_notify_handler);
+}
+
+static int
+fujitsu_hk_detach(device_t self, int flags)
+{
+	struct fujitsu_hk_softc *sc = device_private(self);
+	int i;
+
+	pmf_device_deregister(self);
+
+	if (sc->sc_log != NULL)
+		sysctl_teardown(&sc->sc_log);
+
+	acpi_deregister_notify(sc->sc_node);
+
+	for (i = 0; i < FUJITSU_HK_PSW_COUNT; i++)
+		sysmon_pswitch_unregister(&sc->sc_smpsw[i]);
+
+	mutex_destroy(&sc->sc_mtx);
+
+	return 0;
+}
+
+/*
+ * On the P7120, the backlight needs to be enabled after resume, since the
+ * laptop wakes up with the backlight off (even if it was on before suspend).
+ */
+static bool
+fujitsu_hk_suspend(device_t self, const pmf_qual_t *qual)
+{
+	struct fujitsu_hk_softc *sc = device_private(self);
+
+	mutex_enter(&sc->sc_mtx);
+	(void)fujitsu_hk_set_backlight(sc, false);
+	mutex_exit(&sc->sc_mtx);
+
+	return true;
+}
+
+static bool
+fujitsu_hk_resume(device_t self, const pmf_qual_t *qual)
+{
+	struct fujitsu_hk_softc *sc = device_private(self);
+
+	mutex_enter(&sc->sc_mtx);
+	(void)fujitsu_hk_set_backlight(sc, true);
+	mutex_exit(&sc->sc_mtx);
+
+	return true;
+}
+
+static uint16_t
+fujitsu_hk_capabilities(const struct acpi_devnode *ad)
+{
+	uint16_t caps;
+
+	caps = 0;
+
+	if (fujitsu_hk_cap(ad->ad_handle, "GIRB", ACPI_TYPE_INTEGER))
+		caps |= FUJITSU_HK_CAP_GIRB;
+
+	if (fujitsu_hk_cap(ad->ad_handle, "FUNC", ACPI_TYPE_METHOD))
+		caps |= FUJITSU_HK_CAP_FUNC;
+
+	return caps;
+}
+
+static void
+fujitsu_hk_notify_handler(ACPI_HANDLE handle, uint32_t evt, void *context)
+{
+	struct fujitsu_hk_softc *sc = device_private(context);
+	static const int handler = OSL_NOTIFY_HANDLER;
+
+	switch (evt) {
+
+	case FUJITSU_HK_NOTIFY:
+		(void)AcpiOsExecute(handler, fujitsu_hk_event_callback, sc);
+		break;
+
+	default:
+		aprint_debug_dev(sc->sc_dev, "unknown notify 0x%02X\n", evt);
+	}
+}
+
+static void
+fujitsu_hk_event_callback(void *arg)
+{
+	struct fujitsu_hk_softc *sc = arg;
+	const int max_irb_buffer_size = 100;
+	uint32_t irb;
+	int i, index;
+
+	for (i = 0; i < max_irb_buffer_size; i++) {
+		if (fujitsu_hk_get_irb(sc, &irb) || irb == 0)
+			return;
+
+		switch (irb & ~FUJITSU_HK_MODMASK) {
+		case FUJITSU_HK_IRB_HOTKEY_RELEASE:
+			/* Hotkey button release event (nothing to do). */
+			break;
+		case FUJITSU_HK_IRB_HOTKEY_PRESS(0):
+		case FUJITSU_HK_IRB_HOTKEY_PRESS(1):
+		case FUJITSU_HK_IRB_HOTKEY_PRESS(2):
+		case FUJITSU_HK_IRB_HOTKEY_PRESS(3):
+			/* Hotkey button press event. */
+			index = FUJITSU_HK_IRB_HOTKEY_INDEX(irb);
+			sysmon_pswitch_event(&sc->sc_smpsw[index],
+			    PSWITCH_EVENT_PRESSED);
+			break;
+		default:
+			aprint_error_dev(sc->sc_dev,
+			    "unknown GIRB result: 0x%"PRIx32"\n", irb);
+			break;
+		}
+	}
+}
+
+static void
+fujitsu_hk_sysctl_setup(struct fujitsu_hk_softc *sc)
+{
+	const struct sysctlnode *rnode;
+	bool dummy_state;
+
+	if (fujitsu_hk_get_backlight(sc, &dummy_state) == 0) {
+		if ((sysctl_createv(&sc->sc_log, 0, NULL, &rnode,
+		    0, CTLTYPE_NODE, "hw", NULL,
+		    NULL, 0, NULL, 0,
+		    CTL_HW, CTL_EOL)) != 0)
+			goto fail;
+
+		if ((sysctl_createv(&sc->sc_log, 0, &rnode, &rnode,
+		    0, CTLTYPE_NODE, "acpi", NULL,
+		    NULL, 0, NULL, 0,
+		    CTL_CREATE, CTL_EOL)) != 0)
+			goto fail;
+
+		if ((sysctl_createv(&sc->sc_log, 0, &rnode, &rnode,
+		    0, CTLTYPE_NODE, device_xname(sc->sc_dev),
+		    SYSCTL_DESCR("Fujitsu hotkeys controls"),
+		    NULL, 0, NULL, 0,
+		    CTL_CREATE, CTL_EOL)) != 0)
+			goto fail;
+
+		(void)sysctl_createv(&sc->sc_log, 0, &rnode, NULL,
+		    CTLFLAG_READWRITE, CTLTYPE_BOOL, "backlight",
+		    SYSCTL_DESCR("Internal DFP backlight switch state"),
+		    fujitsu_hk_sysctl_backlight, 0, sc, 0,
+		    CTL_CREATE, CTL_EOL);
+	}
+
+	return;
+
+ fail:
+	aprint_error_dev(sc->sc_dev, "couldn't add sysctl nodes\n");
+}
+
+static int
+fujitsu_hk_sysctl_backlight(SYSCTLFN_ARGS)
+{
+	struct sysctlnode node;
+	struct fujitsu_hk_softc *sc;
+	bool val;
+	int error;
+
+	node = *rnode;
+	sc = node.sysctl_data;
+
+	mutex_enter(&sc->sc_mtx);
+	error = fujitsu_hk_get_backlight(sc, &val);
+	mutex_exit(&sc->sc_mtx);
+
+	if (error)
+		return error;
+
+	node.sysctl_data = &val;
+	error = sysctl_lookup(SYSCTLFN_CALL(&node));
+	if (error || newp == NULL)
+		return error;
+
+	mutex_enter(&sc->sc_mtx);
+	error = fujitsu_hk_set_backlight(sc, val);
+	mutex_exit(&sc->sc_mtx);
+
+	return error;
+}
+
+static int
+fujitsu_hk_get_irb(struct fujitsu_hk_softc *sc, uint32_t *valuep)
+{
+	ACPI_HANDLE hdl = sc->sc_node->ad_handle;
+	ACPI_INTEGER val;
+	ACPI_STATUS rv;
+
+	if (!(sc->sc_caps & FUJITSU_HK_CAP_GIRB))
+		return ENODEV;
+
+	rv = acpi_eval_integer(hdl, "GIRB", &val);
+	if (ACPI_FAILURE(rv)) {
+		aprint_error_dev(sc->sc_dev, "failed to evaluate %s.%s: %s\n",
+		    acpi_name(hdl), "GIRB", AcpiFormatException(rv));
+		return EIO;
+	}
+
+	*valuep = (uint32_t)val;
+
+	return 0;
+}
+
+static int
+fujitsu_hk_get_backlight(struct fujitsu_hk_softc *sc, bool *valuep)
+{
+	ACPI_HANDLE hdl = sc->sc_node->ad_handle;
+	ACPI_INTEGER args[] = {
+		FUJITSU_FUNC_TARGET_BACKLIGHT,
+		FUJITSU_FUNC_COMMAND_GET,
+		0x4,
+		0x0
+	};
+	ACPI_INTEGER val;
+	ACPI_STATUS rv;
+
+	if (!(sc->sc_caps & FUJITSU_HK_CAP_FUNC))
+		return ENODEV;
+
+	rv = fujitsu_hk_eval_nary_integer(hdl, "FUNC", args, 4, &val);
+	if (ACPI_FAILURE(rv)) {
+		aprint_error_dev(sc->sc_dev, "failed to evaluate %s.%s: %s\n",
+		    acpi_name(hdl), "FUNC", AcpiFormatException(rv));
+		return EIO;
+	}
+
+	if (val == FUJITSU_FUNC_INVALID_ARGS)
+		return ENODEV;
+
+	if (val == FUJITSU_FUNC_BACKLIGHT_ON)
+		*valuep = true;
+	else if (val == FUJITSU_FUNC_BACKLIGHT_OFF)
+		*valuep = false;
+	else
+		return ERANGE;
+
+	return 0;
+}
+
+static int
+fujitsu_hk_set_backlight(struct fujitsu_hk_softc *sc, bool value)
+{
+	ACPI_HANDLE hdl = sc->sc_node->ad_handle;
+	ACPI_INTEGER args[] = {
+		FUJITSU_FUNC_TARGET_BACKLIGHT,
+		FUJITSU_FUNC_COMMAND_SET,
+		0x4,
+		0x0
+	};
+	ACPI_INTEGER val;
+	ACPI_STATUS rv;
+
+	if (!(sc->sc_caps & FUJITSU_HK_CAP_FUNC))
+		return ENODEV;
+
+	if (value)
+		args[3] = FUJITSU_FUNC_BACKLIGHT_ON;
+	else
+		args[3] = FUJITSU_FUNC_BACKLIGHT_OFF;
+
+	rv = fujitsu_hk_eval_nary_integer(hdl, "FUNC", args, 4, &val);
+	if (ACPI_FAILURE(rv)) {
+		aprint_error_dev(sc->sc_dev, "failed to evaluate %s.%s: %s\n",
+		    acpi_name(hdl), "FUNC", AcpiFormatException(rv));
+		return EIO;
+	}
+
+	if (val == FUJITSU_FUNC_INVALID_ARGS)
+		return ENODEV;
+
+	return 0;
+}
+
+/*
+ * fujitsu_hk_cap:
+ *
+ *	Returns true if and only if (a) the object handle.path exists and
+ *	(b) this object is a method or has the given type.
+ */
+static bool
+fujitsu_hk_cap(ACPI_HANDLE handle, const char *path, ACPI_OBJECT_TYPE type)
+{
+	ACPI_HANDLE hdl;
+	ACPI_OBJECT_TYPE typ;
+
+	KASSERT(handle != NULL);
+
+	if (ACPI_FAILURE(AcpiGetHandle(handle, path, &hdl)))
+		return false;
+
+	if (ACPI_FAILURE(AcpiGetType(hdl, &typ)))
+		return false;
+
+	if (typ != ACPI_TYPE_METHOD && typ != type)
+		return false;
+
+	return true;
+}
+
+/*
+ * fujitsu_hk_eval_nary_integer:
+ *
+ *	Evaluate an object that takes as input an arbitrary (possible null)
+ *	number of integer parameters.  If res is not NULL, then *res is filled
+ *	with the result of the evaluation, and AE_NULL_OBJECT is returned if
+ *	the evaluation produced no result.
+ */
+static ACPI_STATUS
+fujitsu_hk_eval_nary_integer(ACPI_HANDLE handle, const char *path, const
+    ACPI_INTEGER *args, uint8_t count, ACPI_INTEGER *res)
+{
+	ACPI_OBJECT_LIST paramlist;
+	ACPI_OBJECT retobj, objpool[4], *argobjs;
+	ACPI_BUFFER buf;
+	ACPI_STATUS rv;
+	uint8_t i;
+
+	/* Require that (args == NULL) if and only if (count == 0). */
+	KASSERT((args != NULL || count == 0) && (args == NULL || count != 0));
+
+	/* The object pool should be large enough for our callers. */
+	KASSERT(count <= __arraycount(objpool));
+
+	if (handle == NULL)
+		handle = ACPI_ROOT_OBJECT;
+
+	/* Convert the given array args into an array of ACPI objects. */
+	argobjs = objpool;
+	for (i = 0; i < count; i++) {
+		argobjs[i].Type = ACPI_TYPE_INTEGER;
+		argobjs[i].Integer.Value = args[i];
+	}
+
+	paramlist.Count = count;
+	paramlist.Pointer = argobjs;
+
+	(void)memset(&retobj, 0, sizeof(retobj));
+	buf.Pointer = &retobj;
+	buf.Length = sizeof(retobj);
+
+	rv = AcpiEvaluateObject(handle, path, &paramlist, &buf);
+
+	if (ACPI_FAILURE(rv))
+		return rv;
+
+	/*
+	 * If a return value is expected and desired (i.e. res != NULL),
+	 * then copy the result into *res.
+	 */
+	if (res != NULL) {
+		if (buf.Length == 0)
+			return AE_NULL_OBJECT;
+
+		if (retobj.Type != ACPI_TYPE_INTEGER)
+			return AE_TYPE;
+
+		*res = retobj.Integer.Value;
+	}
+
+	return AE_OK;
+}
+
+MODULE(MODULE_CLASS_DRIVER, fujhk, NULL);
+
+#ifdef _MODULE
+#include "ioconf.c"
+#endif
+
+static int
+fujhk_modcmd(modcmd_t cmd, void *aux)
+{
+	int rv = 0;
+
+	switch (cmd) {
+
+	case MODULE_CMD_INIT:
+
+#ifdef _MODULE
+		rv = config_init_component(cfdriver_ioconf_fujhk,
+		    cfattach_ioconf_fujhk, cfdata_ioconf_fujhk);
+#endif
+		break;
+
+	case MODULE_CMD_FINI:
+
+#ifdef _MODULE
+		rv = config_fini_component(cfdriver_ioconf_fujhk,
+		    cfattach_ioconf_fujhk, cfdata_ioconf_fujhk);
+#endif
+		break;
+
+	default:
+		rv = ENOTTY;
+	}
+
+	return rv;
+}

Reply via email to