Module Name:    src
Committed By:   jruoho
Date:           Sat Apr 10 17:55:26 UTC 2010

Modified Files:
        src/distrib/sets/lists/man: mi
        src/share/man/man4: Makefile
        src/share/man/man4/man4.i386: Makefile
        src/sys/arch/i386/conf: GENERIC files.i386
        src/sys/dev/acpi: files.acpi
Added Files:
        src/share/man/man4: vald.4
        src/sys/dev/acpi: vald_acpi.c
Removed Files:
        src/share/man/man4/man4.i386: vald.4
        src/sys/arch/i386/acpi: vald_acpi.c

Log Message:
Move vald(4) to sys/dev/acpi. This is MI and should work also on amd64.

ok jmcneill@

XXX:    This is broken: it calls methods with absolute pathnames (almost
        guaranteed not to be portable across models), it accesses methods
        that are in the domain of other drivers, it walks the namespace on
        its own, it contains plenty of magic constants, it does not
        integrate with existing KPIs, etc. Summa summarum: this should be
        rewritten as a more generic toshiba_acpi(4).


To generate a diff of this commit:
cvs rdiff -u -r1.1201 -r1.1202 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.515 -r1.516 src/share/man/man4/Makefile
cvs rdiff -u -r0 -r1.1 src/share/man/man4/vald.4
cvs rdiff -u -r1.72 -r1.73 src/share/man/man4/man4.i386/Makefile
cvs rdiff -u -r1.8 -r0 src/share/man/man4/man4.i386/vald.4
cvs rdiff -u -r1.33 -r0 src/sys/arch/i386/acpi/vald_acpi.c
cvs rdiff -u -r1.978 -r1.979 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.353 -r1.354 src/sys/arch/i386/conf/files.i386
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/acpi/files.acpi
cvs rdiff -u -r0 -r1.1 src/sys/dev/acpi/vald_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.1201 src/distrib/sets/lists/man/mi:1.1202
--- src/distrib/sets/lists/man/mi:1.1201	Sat Apr 10 04:29:39 2010
+++ src/distrib/sets/lists/man/mi	Sat Apr 10 17:55:25 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1201 2010/04/10 04:29:39 jruoho Exp $
+# $NetBSD: mi,v 1.1202 2010/04/10 17:55:25 jruoho Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1074,7 +1074,6 @@
 ./usr/share/man/cat4/i386/sony.0		man-obsolete		obsolete
 ./usr/share/man/cat4/i386/speaker.0		man-obsolete		obsolete
 ./usr/share/man/cat4/i386/spic.0		man-sys-catman		.cat
-./usr/share/man/cat4/i386/vald.0		man-sys-catman		.cat
 ./usr/share/man/cat4/i386/vesafb.0		man-obsolete		obsolete
 ./usr/share/man/cat4/i4b.0			man-obsolete		obsolete
 ./usr/share/man/cat4/i4bctl.0			man-obsolete		obsolete
@@ -1618,6 +1617,7 @@
 ./usr/share/man/cat4/uvscom.0			man-sys-catman		.cat
 ./usr/share/man/cat4/uyap.0			man-sys-catman		.cat
 ./usr/share/man/cat4/uyurex.0			man-sys-catman		.cat
+./usr/share/man/cat4/vald.0			man-sys-catman		.cat
 ./usr/share/man/cat4/vax/acc.0			man-sys-catman		.cat
 ./usr/share/man/cat4/vax/ad.0			man-sys-catman		.cat
 ./usr/share/man/cat4/vax/asc.0			man-sys-catman		.cat
@@ -3707,7 +3707,6 @@
 ./usr/share/man/html4/i386/pcibios.html		man-sys-htmlman		html
 ./usr/share/man/html4/i386/pnpbios.html		man-sys-htmlman		html
 ./usr/share/man/html4/i386/spic.html		man-sys-htmlman		html
-./usr/share/man/html4/i386/vald.html		man-sys-htmlman		html
 ./usr/share/man/html4/i386/vesafb.html		man-obsolete		obsolete
 ./usr/share/man/html4/i915drm.html		man-sys-htmlman		html
 ./usr/share/man/html4/iavc.html			man-sys-htmlman		html
@@ -4197,6 +4196,7 @@
 ./usr/share/man/html4/uvscom.html		man-sys-htmlman		html
 ./usr/share/man/html4/uyap.html			man-sys-htmlman		html
 ./usr/share/man/html4/uyurex.html		man-sys-htmlman		html
+./usr/share/man/html4/vald.html			man-sys-htmlman		html
 ./usr/share/man/html4/vax/acc.html		man-sys-htmlman		html
 ./usr/share/man/html4/vax/ad.html		man-sys-htmlman		html
 ./usr/share/man/html4/vax/asc.html		man-sys-htmlman		html
@@ -6162,7 +6162,6 @@
 ./usr/share/man/man4/i386/sony.4		man-obsolete		obsolete
 ./usr/share/man/man4/i386/speaker.4		man-obsolete		obsolete
 ./usr/share/man/man4/i386/spic.4		man-sys-man		.man
-./usr/share/man/man4/i386/vald.4		man-sys-man		.man
 ./usr/share/man/man4/i386/vesafb.4		man-obsolete		obsolete
 ./usr/share/man/man4/i4b.4			man-obsolete		obsolete
 ./usr/share/man/man4/i4bctl.4			man-obsolete		obsolete
@@ -6706,6 +6705,7 @@
 ./usr/share/man/man4/uvscom.4			man-sys-man		.man
 ./usr/share/man/man4/uyap.4			man-sys-man		.man
 ./usr/share/man/man4/uyurex.4			man-sys-man		.man
+./usr/share/man/man4/vald.4			man-sys-man		.man
 ./usr/share/man/man4/vax/acc.4			man-sys-man		.man
 ./usr/share/man/man4/vax/ad.4			man-sys-man		.man
 ./usr/share/man/man4/vax/asc.4			man-sys-man		.man

Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.515 src/share/man/man4/Makefile:1.516
--- src/share/man/man4/Makefile:1.515	Thu Apr  8 18:20:46 2010
+++ src/share/man/man4/Makefile	Sat Apr 10 17:55:25 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.515 2010/04/08 18:20:46 jruoho Exp $
+#	$NetBSD: Makefile,v 1.516 2010/04/10 17:55:25 jruoho Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/18/93
 
 MAN=	aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -57,7 +57,7 @@
 	ti.4 tl.4 tlp.4 tlphy.4 \
 	tp.4 tr.4 tra.4 trm.4 tty.4 tun.4 tqphy.4 twa.4 twe.4 txp.4 \
 	ubsec.4 udp.4 uep.4 ug.4 uha.4 uk.4 ukphy.4 unix.4 userconf.4 \
-	veriexec.4 vga.4 vge.4 viaide.4 video.4 vlan.4 vmmon.4 vmnet.4 \
+	vald.4 veriexec.4 vga.4 vge.4 viaide.4 video.4 vlan.4 vmmon.4 vmnet.4 \
 	vnd.4 vr.4 \
 	wapbl.4 wb.4 wbsio.4 wd.4 wdc.4 wi.4 wm.4 wpi.4 \
 	wscons.4 wsdisplay.4 wsfont.4 wskbd.4 wsmouse.4 wsmux.4 \

Index: src/share/man/man4/man4.i386/Makefile
diff -u src/share/man/man4/man4.i386/Makefile:1.72 src/share/man/man4/man4.i386/Makefile:1.73
--- src/share/man/man4/man4.i386/Makefile:1.72	Thu Feb 19 00:57:10 2009
+++ src/share/man/man4/man4.i386/Makefile	Sat Apr 10 17:55:25 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.72 2009/02/19 00:57:10 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.73 2010/04/10 17:55:25 jruoho Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/5/93
 
 MAN=	apm.4 autoconf.4 \
@@ -7,7 +7,7 @@
 	fdc.4 \
 	gcscide.4 gcscpcib.4 geodewdog.4 geodecntr.4 glxsb.4 gscpcib.4 \
 	intro.4 io.4 lms.4 lpt.4 mem.4 mms.4 npx.4 ndis.4 \
-	pcibios.4 pnpbios.4 spic.4 vald.4
+	pcibios.4 pnpbios.4 spic.4
 MLINKS=	mem.4 kmem.4
 MLINKS+=lpt.4 lpa.4
 MLINKS+=pcibios.4 PCIBIOS.4

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.978 src/sys/arch/i386/conf/GENERIC:1.979
--- src/sys/arch/i386/conf/GENERIC:1.978	Fri Apr  9 14:02:05 2010
+++ src/sys/arch/i386/conf/GENERIC	Sat Apr 10 17:55:25 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.978 2010/04/09 14:02:05 ahoka Exp $
+# $NetBSD: GENERIC,v 1.979 2010/04/10 17:55:25 jruoho Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.978 $"
+#ident 		"GENERIC-$Revision: 1.979 $"
 
 maxusers	64		# estimated number of users
 
@@ -376,8 +376,10 @@
 npx*		at acpi?		# Math coprocessor
 pckbc*		at acpi?		# PC keyboard controller
 pcppi*		at acpi?                # AT-style speaker sound
+sony*		at acpi?		# Sony Miscellaneous Controller
 thinkpad*	at acpi?		# IBM/Lenovo Thinkpad hotkeys
 ug*		at acpi?		# Abit uGuru Hardware monitor
+vald*		at acpi?		# Toshiba Libretto hotkeys
 wb*		at acpi?		# Winbond W83L518D SD/MMC reader
 sdmmc*		at wb?			# SD/MMC bus
 wmidell*	at acpiwmibus?		# Dell WMI mappings
@@ -389,12 +391,6 @@
 spic*		at acpi?		# Sony Programmable I/O Controller
 wsmouse*	at spic?
 
-# Sony LCD brightness etc.
-sony* 		at acpi?		# Sony Miscellaneous Controller
-
-# Toshiba Libretto devices
-vald*		at acpi?
-
 # Plug-and-Play BIOS and attached devices
 
 #pnpbios*	at mainbus?

Index: src/sys/arch/i386/conf/files.i386
diff -u src/sys/arch/i386/conf/files.i386:1.353 src/sys/arch/i386/conf/files.i386:1.354
--- src/sys/arch/i386/conf/files.i386:1.353	Sun Jan  3 04:06:31 2010
+++ src/sys/arch/i386/conf/files.i386	Sat Apr 10 17:55:25 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: files.i386,v 1.353 2010/01/03 04:06:31 dholland Exp $
+#	$NetBSD: files.i386,v 1.354 2010/04/10 17:55:25 jruoho Exp $
 #
 # new style config file for i386 architecture
 #
@@ -481,11 +481,6 @@
 include "dev/acpi/files.acpi"
 file	arch/i386/acpi/acpi_wakeup_low.S	acpi
 
-# Toshiba VALD 
-device	vald
-attach	vald at acpinodebus with vald_acpi
-file	arch/i386/acpi/vald_acpi.c		vald_acpi
-
 # Numeric Processing Extension; Math Co-processor
 attach	npx at acpinodebus with npx_acpi
 file	arch/i386/acpi/npx_acpi.c		npx_acpi

Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.70 src/sys/dev/acpi/files.acpi:1.71
--- src/sys/dev/acpi/files.acpi:1.70	Thu Apr  8 12:14:19 2010
+++ src/sys/dev/acpi/files.acpi	Sat Apr 10 17:55:24 2010
@@ -1,4 +1,4 @@
-#	$NetBSD: files.acpi,v 1.70 2010/04/08 12:14:19 jruoho Exp $
+#	$NetBSD: files.acpi,v 1.71 2010/04/10 17:55:24 jruoho Exp $
 
 include "dev/acpi/acpica/files.acpica"
 
@@ -127,6 +127,11 @@
 attach	sony at acpinodebus with sony_acpi
 file	dev/acpi/sony_acpi.c		sony_acpi
 
+# Toshiba hotkeys
+device	vald
+attach	vald at acpinodebus with vald_acpi
+file	dev/acpi/vald_acpi.c		vald_acpi
+
 # Sony SPIC (jog dial etc.)
 attach	spic at acpinodebus with spic_acpi
 file	dev/acpi/spic_acpi.c		spic_acpi

Added files:

Index: src/share/man/man4/vald.4
diff -u /dev/null src/share/man/man4/vald.4:1.1
--- /dev/null	Sat Apr 10 17:55:26 2010
+++ src/share/man/man4/vald.4	Sat Apr 10 17:55:25 2010
@@ -0,0 +1,73 @@
+.\" $NetBSD: vald.4,v 1.1 2010/04/10 17:55:25 jruoho Exp $
+.\"
+.\" Copyright (c) 2004 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 January 25, 2008
+.Dt VALD 4 i386
+.Os
+.Sh NAME
+.Nm vald
+.Nd Toshiba Programmable I/O controller
+.Sh SYNOPSIS
+.Cd "vald* at acpi?"
+.Sh DESCRIPTION
+Some Toshiba computers have a special I/O controller that handles various
+interface devices.
+This special I/O controller is accessed by the
+.Dq GHCI
+ACPI method.
+The
+.Nm
+driver provides some support for it.
+.Pp
+The
+.Nm
+driver handles the following hot-keys:
+.Pp
+.Bl -tag -compact -offset indent -width "Fn+F5"
+.It Fn+F5
+Switch between LCD and External Video output.
+.It Fn+F6
+Decrease LCD brightness.
+.It Fn+F7
+Increase LCD brightness.
+.It Fn+F8
+Switch fan (ON/OFF).
+.El
+.Pp
+The
+.Nm
+driver has only been tested on the Libretto L3 and on the Portege 3440.
+.Sh SEE ALSO
+.Xr acpi 4
+.Sh HISTORY
+The
+.Nm
+driver appeared in
+.Nx 1.6 .
+.Sh BUGS
+.Nm
+may have problems with X11 when switching between LCD
+and External Video output.

Index: src/sys/dev/acpi/vald_acpi.c
diff -u /dev/null src/sys/dev/acpi/vald_acpi.c:1.1
--- /dev/null	Sat Apr 10 17:55:26 2010
+++ src/sys/dev/acpi/vald_acpi.c	Sat Apr 10 17:55:24 2010
@@ -0,0 +1,707 @@
+/*	$NetBSD: vald_acpi.c,v 1.1 2010/04/10 17:55:24 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Masanori Kanaoka.
+ *
+ * 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.
+ */
+
+/*
+ * Copyright 2001 Bill Sommerfeld.
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed for the NetBSD Project by
+ *	Wasabi Systems, Inc.
+ * 4. The name of Wasabi Systems, Inc. may not be used to endorse
+ *    or promote products derived from this software without specific prior
+ *    written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``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 WASABI SYSTEMS, INC
+ * 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 VALD Driver for Toshiba Libretto L3.
+ *	This driver is based on acpibat driver.
+ */
+
+/*
+ * Obtain information of Toshiba "GHCI" Method from next URL.
+ *           http://www.buzzard.org.uk/toshiba/docs.html
+ *           http://memebeam.org/toys/ToshibaAcpiDriver
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: vald_acpi.c,v 1.1 2010/04/10 17:55:24 jruoho Exp $");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+
+#include <dev/acpi/acpica.h>
+#include <dev/acpi/acpireg.h>
+#include <dev/acpi/acpivar.h>
+
+#define _COMPONENT          ACPI_RESOURCE_COMPONENT
+ACPI_MODULE_NAME            ("vald_acpi")
+
+#define GHCI_WORDS 6
+#define GHCI_FIFO_EMPTY  0x8c00
+#define GHCI_NOT_SUPPORT  0x8000
+
+#define GHCI_BACKLIGHT		0x0002
+#define GHCI_ACADAPTOR		0x0003
+#define GHCI_FAN		0x0004
+#define GHCI_SYSTEM_EVENT_FIFO	0x0016
+#define GHCI_DISPLAY_DEVICE	0x001C
+#define GHCI_HOTKEY_EVENT	0x001E
+
+#define GHCI_ON			0x0001
+#define GHCI_OFF		0x0000
+#define GHCI_ENABLE		0x0001
+#define GHCI_DISABLE		0x0000
+
+#define GHCI_CRT		0x0002
+#define GHCI_LCD		0x0001
+
+
+struct vald_acpi_softc {
+	device_t sc_dev;		/* base device glue */
+	struct acpi_devnode *sc_node;	/* our ACPI devnode */
+	int sc_flags;			/* see below */
+
+	ACPI_HANDLE lcd_handle;		/* lcd handle */
+	int *lcd_level;			/* lcd brightness table */
+	int lcd_num;			/* size of lcd brightness table */
+	int lcd_index;			/* index of lcd brightness table */
+
+	ACPI_INTEGER sc_ac_status;	/* AC adaptor status when attach */
+};
+
+static const char * const vald_acpi_hids[] = {
+	"TOS6200",
+	NULL
+};
+
+#define LIBRIGHT_HOLD	0x00
+#define LIBRIGHT_UP	0x01
+#define LIBRIGHT_DOWN	0x02
+
+static int	vald_acpi_match(device_t, cfdata_t, void *);
+static void	vald_acpi_attach(device_t, device_t, void *);
+
+static void	vald_acpi_event(void *);
+static void	vald_acpi_notify_handler(ACPI_HANDLE, UINT32, void *);
+
+#define ACPI_NOTIFY_ValdStatusChanged	0x80
+
+
+static ACPI_STATUS	vald_acpi_ghci_get(struct vald_acpi_softc *, UINT32,
+    UINT32 *, UINT32 *);
+static ACPI_STATUS	vald_acpi_ghci_set(struct vald_acpi_softc *, UINT32,
+    UINT32, UINT32 *);
+
+static ACPI_STATUS	vald_acpi_libright_get_bus(ACPI_HANDLE, UINT32, void *,
+    void **);
+static void		vald_acpi_libright_get(struct vald_acpi_softc *);
+static void		vald_acpi_libright_set(struct vald_acpi_softc *, int);
+
+static void		vald_acpi_video_switch(struct vald_acpi_softc *);
+static void		vald_acpi_fan_switch(struct vald_acpi_softc *);
+
+static ACPI_STATUS	vald_acpi_bcm_set(ACPI_HANDLE, UINT32);
+static ACPI_STATUS	vald_acpi_dssx_set(UINT32);
+
+CFATTACH_DECL_NEW(vald_acpi, sizeof(struct vald_acpi_softc),
+    vald_acpi_match, vald_acpi_attach, NULL, NULL);
+
+/*
+ * vald_acpi_match:
+ *
+ *	Autoconfiguration `match' routine.
+ */
+static int
+vald_acpi_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, vald_acpi_hids));
+}
+
+/*
+ * vald_acpi_attach:
+ *
+ *	Autoconfiguration `attach' routine.
+ */
+static void
+vald_acpi_attach(device_t parent, device_t self, void *aux)
+{
+	struct vald_acpi_softc *sc = device_private(self);
+	struct acpi_attach_args *aa = aux;
+	ACPI_STATUS rv;
+	UINT32 value, result;
+
+	aprint_naive(": Toshiba VALD\n");
+	aprint_normal(": Toshiba VALD\n");
+
+	sc->sc_node = aa->aa_node;
+	sc->sc_dev = self;
+
+	/* Get AC adaptor status via _PSR. */
+	rv = acpi_eval_integer(ACPI_ROOT_OBJECT, "\\_SB_.ADP1._PSR",
+	    &sc->sc_ac_status);
+	if (ACPI_FAILURE(rv))
+		aprint_error_dev(self, "Unable to evaluate _PSR: %s\n",
+		    AcpiFormatException(rv));
+	else
+		aprint_verbose_dev(self, "AC adaptor %sconnected\n",
+		    (sc->sc_ac_status == 0 ? "not ": ""));
+
+	/* Get LCD backlight status. */
+	rv = vald_acpi_ghci_get(sc, GHCI_BACKLIGHT, &value, &result);
+	if (ACPI_SUCCESS(rv)) {
+		if (result != 0)
+			aprint_error_dev(self, "can't get backlight status error=%d\n",
+			    result);
+		else
+			aprint_verbose_dev(self, "LCD backlight %s\n",
+			    ((value == GHCI_ON) ? "on" : "off"));
+	}
+
+	/* Enable SystemEventFIFO,HotkeyEvent */
+	rv = vald_acpi_ghci_set(sc, GHCI_SYSTEM_EVENT_FIFO, GHCI_ENABLE,
+	    &result);
+	if (ACPI_SUCCESS(rv) && result != 0)
+		aprint_error_dev(self, "can't enable SystemEventFIFO error=%d\n",
+		    result);
+
+	rv = vald_acpi_ghci_set(sc, GHCI_HOTKEY_EVENT, GHCI_ENABLE, &result);
+	if (ACPI_SUCCESS(rv) && result != 0)
+		aprint_error_dev(self, "can't enable HotkeyEvent error=%d\n",
+		    result);
+
+	/* Check SystemFIFO events. */
+	vald_acpi_event(sc);
+
+	/* Get LCD brightness level via _BCL. */
+	vald_acpi_libright_get(sc);
+
+	/* Set LCD brightness level via _BCM. */
+	vald_acpi_libright_set(sc, LIBRIGHT_HOLD);
+
+	/* enable vald notify */
+	AcpiEvaluateObject(sc->sc_node->ad_handle, "ENAB", NULL, NULL);
+	rv = AcpiInstallNotifyHandler(sc->sc_node->ad_handle,
+	    ACPI_DEVICE_NOTIFY, vald_acpi_notify_handler, sc);
+	if (ACPI_FAILURE(rv))
+		aprint_error_dev(self, "can't install DEVICE NOTIFY handler: %s\n",
+		    AcpiFormatException(rv));
+}
+
+/*
+ * vald_acpi_notify_handler:
+ *
+ *	Notify handler.
+ */
+static void
+vald_acpi_notify_handler(ACPI_HANDLE handle, UINT32 notify, void *context)
+{
+	struct vald_acpi_softc *sc = context;
+
+	switch (notify) {
+
+	case ACPI_NOTIFY_ValdStatusChanged:
+		(void)AcpiOsExecute(OSL_NOTIFY_HANDLER, vald_acpi_event, sc);
+		break;
+
+	default:
+		aprint_error_dev(sc->sc_dev,
+		    "unknown notify 0x%02X\n", notify);
+		break;
+	}
+}
+
+/*
+ * vald_acpi_event:
+ *
+ *	Check hotkey event and do it, if event occur.
+ */
+static void
+vald_acpi_event(void *arg)
+{
+	struct vald_acpi_softc *sc = arg;
+	ACPI_STATUS rv;
+	UINT32 value, result;
+
+	while(1) {
+		rv = vald_acpi_ghci_get(sc, GHCI_SYSTEM_EVENT_FIFO, &value,
+		    &result);
+		if (ACPI_SUCCESS(rv) && result == 0) {
+
+			switch (value) {
+			case 0x1c3: /* Fn + F9 */
+				break;
+			case 0x1c2: /* Fn + F8 */
+				vald_acpi_fan_switch(sc);
+				break;
+			case 0x1c1: /* Fn + F7 */
+				vald_acpi_libright_set(sc, LIBRIGHT_UP);
+				break;
+			case 0x1c0: /* Fn + F6 */
+				vald_acpi_libright_set(sc, LIBRIGHT_DOWN);
+				break;
+			case 0x1bf: /* Fn + F5 */
+				vald_acpi_video_switch(sc);
+				break;
+			default:
+				break;
+			}
+		}
+		if (ACPI_FAILURE(rv) || result == GHCI_FIFO_EMPTY)
+			break;
+	}
+}
+
+/*
+ * vald_acpi_ghci_get:
+ *
+ *	Get value via "GHCI" Method.
+ */
+static ACPI_STATUS
+vald_acpi_ghci_get(struct vald_acpi_softc *sc,
+    UINT32 reg, UINT32 *value, UINT32 *result)
+{
+	ACPI_STATUS rv;
+	ACPI_OBJECT Arg[GHCI_WORDS];
+	ACPI_OBJECT_LIST ArgList;
+	ACPI_OBJECT *param, *PrtElement;
+	ACPI_BUFFER buf;
+	int		i;
+
+	for (i = 0; i < GHCI_WORDS; i++) {
+		Arg[i].Type = ACPI_TYPE_INTEGER;
+		Arg[i].Integer.Value = 0;
+	}
+
+	Arg[0].Integer.Value = 0xfe00;
+	Arg[1].Integer.Value = reg;
+	Arg[2].Integer.Value = 0;
+
+	ArgList.Count = GHCI_WORDS;
+	ArgList.Pointer = Arg;
+
+	buf.Pointer = NULL;
+	buf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
+
+	rv = AcpiEvaluateObject(sc->sc_node->ad_handle,
+	    "GHCI", &ArgList, &buf);
+	if (ACPI_FAILURE(rv)) {
+		aprint_error_dev(sc->sc_dev, "failed to evaluate GHCI: %s\n",
+		    AcpiFormatException(rv));
+		return (rv);
+	}
+
+	*result = GHCI_NOT_SUPPORT;
+	*value = 0;
+	param = (ACPI_OBJECT *)buf.Pointer;
+	if (param->Type == ACPI_TYPE_PACKAGE) {
+		PrtElement = param->Package.Elements;
+		if (PrtElement->Type == ACPI_TYPE_INTEGER)
+			*result = PrtElement->Integer.Value;
+		PrtElement++;
+		PrtElement++;
+		if (PrtElement->Type == ACPI_TYPE_INTEGER)
+			*value = PrtElement->Integer.Value;
+	}
+
+	if (buf.Pointer)
+		ACPI_FREE(buf.Pointer);
+	return (rv);
+}
+
+/*
+ * vald_acpi_ghci_set:
+ *
+ *	Set value via "GHCI" Method.
+ */
+static ACPI_STATUS
+vald_acpi_ghci_set(struct vald_acpi_softc *sc,
+    UINT32 reg, UINT32 value, UINT32 *result)
+{
+	ACPI_STATUS rv;
+	ACPI_OBJECT Arg[GHCI_WORDS];
+	ACPI_OBJECT_LIST ArgList;
+	ACPI_OBJECT *param, *PrtElement;
+	ACPI_BUFFER buf;
+	int	i;
+
+
+	for (i = 0; i < GHCI_WORDS; i++) {
+		Arg[i].Type = ACPI_TYPE_INTEGER;
+		Arg[i].Integer.Value = 0;
+	}
+
+	Arg[0].Integer.Value = 0xff00;
+	Arg[1].Integer.Value = reg;
+	Arg[2].Integer.Value = value;
+
+	ArgList.Count = GHCI_WORDS;
+	ArgList.Pointer = Arg;
+
+	buf.Pointer = NULL;
+	buf.Length = ACPI_ALLOCATE_LOCAL_BUFFER;
+
+	rv = AcpiEvaluateObject(sc->sc_node->ad_handle,
+	    "GHCI", &ArgList, &buf);
+	if (ACPI_FAILURE(rv)) {
+		aprint_error_dev(sc->sc_dev, "failed to evaluate GHCI: %s\n",
+		    AcpiFormatException(rv));
+		return (rv);
+	}
+
+	*result = GHCI_NOT_SUPPORT;
+	param = (ACPI_OBJECT *)buf.Pointer;
+	if (param->Type == ACPI_TYPE_PACKAGE) {
+		PrtElement = param->Package.Elements;
+	    	if (PrtElement->Type == ACPI_TYPE_INTEGER)
+			*result = PrtElement->Integer.Value;
+	}
+
+	if (buf.Pointer)
+		ACPI_FREE(buf.Pointer);
+	return (rv);
+}
+
+/*
+ * vald_acpi_libright_get_bus:
+ *
+ *	Get LCD brightness level via "_BCL" Method,
+ *	and save this handle.
+ */
+static ACPI_STATUS
+vald_acpi_libright_get_bus(ACPI_HANDLE handle, UINT32 level,
+    void *context, void **status)
+{
+	struct vald_acpi_softc *sc = context;
+	ACPI_STATUS rv;
+	ACPI_BUFFER buf;
+	ACPI_OBJECT *param, *PrtElement;
+	int i, *pi;
+
+	rv = acpi_eval_struct(handle, "_BCL", &buf);
+	if (ACPI_FAILURE(rv))
+		return (AE_OK);
+
+	sc->lcd_handle = handle;
+	param = (ACPI_OBJECT *)buf.Pointer;
+	if (param->Type == ACPI_TYPE_PACKAGE) {
+		printf("_BCL retrun: %d packages\n", param->Package.Count);
+
+		sc->lcd_num = param->Package.Count;
+		sc->lcd_level = ACPI_ALLOCATE(sizeof(int) * sc->lcd_num);
+		if (sc->lcd_level == NULL) {
+			if (buf.Pointer)
+				ACPI_FREE(buf.Pointer);
+			return (AE_NO_MEMORY);
+		}
+
+		PrtElement = param->Package.Elements;
+		pi = sc->lcd_level;
+		for (i = 0; i < param->Package.Count; i++) {
+			if (PrtElement->Type == ACPI_TYPE_INTEGER) {
+				*pi = (unsigned)PrtElement->Integer.Value;
+				PrtElement++;
+				pi++;
+			}
+		}
+		if (sc->sc_ac_status == 1) /* AC adaptor on when attach */
+			sc->lcd_index = sc->lcd_num -1; /* MAX Brightness */
+		else
+			sc->lcd_index = 3;
+
+#ifdef ACPI_DEBUG
+		pi = sc->lcd_level;
+		printf("\t Full Power Level: %d\n", *pi);
+		printf("\t on Battery Level: %d\n", *(pi+1));
+		printf("\t Possible Level: ");
+		for (i = 2;i < sc->lcd_num; i++)
+			printf(" %d", *(pi+i));
+		printf("\n");
+#endif
+	}
+
+	if (buf.Pointer)
+		ACPI_FREE(buf.Pointer);
+	return (AE_OK);
+}
+
+/*
+ * vald_acpi_libright_get:
+ *
+ *	Search node that have "_BCL" Method.
+ */
+static void
+vald_acpi_libright_get(struct vald_acpi_softc *sc)
+{
+	ACPI_HANDLE parent;
+	ACPI_STATUS rv;
+
+	aprint_verbose_dev(sc->sc_dev, "get LCD brightness via _BCL\n");
+
+#ifdef ACPI_DEBUG
+	printf("acpi_libright_get: start\n");
+#endif
+	rv = AcpiGetHandle(ACPI_ROOT_OBJECT, "\\_SB_", &parent);
+	if (ACPI_FAILURE(rv))
+		return;
+
+	AcpiWalkNamespace(ACPI_TYPE_DEVICE, parent, 100,
+	    vald_acpi_libright_get_bus, NULL, sc, NULL);
+}
+
+/*
+ * vald_acpi_libright_set:
+ *
+ *	Figure up next status and set it.
+ */
+static void
+vald_acpi_libright_set(struct vald_acpi_softc *sc, int UpDown)
+{
+	ACPI_STATUS rv;
+	int *pi;
+	UINT32 backlight, backlight_new, result, bright;
+
+	/* Skip,if it does not support _BCL. */
+	if (sc->lcd_handle == NULL)
+		return;
+
+	/* Get LCD backlight status. */
+	rv = vald_acpi_ghci_get(sc, GHCI_BACKLIGHT, &backlight, &result);
+	if (ACPI_FAILURE(rv) || result != 0)
+		return;
+
+	/* Figure up next status. */
+	backlight_new = backlight;
+	if (UpDown == LIBRIGHT_UP) {
+		if (backlight == 1)
+			sc->lcd_index++;
+		else {
+			/* backlight on */
+			backlight_new = 1;
+			sc->lcd_index = 2;
+		}
+	} else if (UpDown == LIBRIGHT_DOWN) {
+		if ((backlight == 1) && (sc->lcd_index > 2))
+			sc->lcd_index--;
+		else {
+			/* backlight off */
+			backlight_new = 0;
+			sc->lcd_index = 2;
+		}
+	}
+
+	/* Check index value. */
+	if (sc->lcd_index < 2)
+		sc->lcd_index = 2; /* index Minium Value */
+	if (sc->lcd_index >= sc->lcd_num)
+		sc->lcd_index = sc->lcd_num - 1;
+
+	/* Set LCD backlight,if status is changed. */
+	if (backlight_new != backlight) {
+		rv = vald_acpi_ghci_set(sc, GHCI_BACKLIGHT, backlight_new,
+		    &result);
+		if (ACPI_SUCCESS(rv) && result != 0)
+			aprint_error_dev(sc->sc_dev, "can't set LCD backlight %s error=%x\n",
+			    ((backlight_new == 1) ? "on" : "off"), result);
+	}
+
+	if (backlight_new == 1) {
+
+		pi = sc->lcd_level;
+		bright = *(pi + sc->lcd_index);
+
+		rv = vald_acpi_bcm_set(sc->lcd_handle, bright);
+		if (ACPI_FAILURE(rv))
+			aprint_error_dev(sc->sc_dev, "unable to evaluate _BCM: %s\n",
+			    AcpiFormatException(rv));
+	} else {
+		bright = 0;
+	}
+#ifdef ACPI_DEBUG
+	printf("LCD bright");
+	printf(" %s", ((UpDown == LIBRIGHT_UP) ? "up":""));
+	printf("%s\n", ((UpDown == LIBRIGHT_DOWN) ? "down":""));
+	printf("\t acpi_libright_set: Set brightness to %d%%\n", bright);
+#endif
+}
+
+/*
+ * vald_acpi_video_switch:
+ *
+ *	Get video status(LCD/CRT) and set new video status.
+ */
+static void
+vald_acpi_video_switch(struct vald_acpi_softc *sc)
+{
+	ACPI_STATUS	rv;
+	UINT32		value, result;
+
+	/* Get video status. */
+	rv = vald_acpi_ghci_get(sc, GHCI_DISPLAY_DEVICE, &value, &result);
+	if (ACPI_FAILURE(rv))
+		return;
+	if (result != 0) {
+		aprint_error_dev(sc->sc_dev, "can't get video status  error=%x\n",
+		    result);
+		return;
+	}
+
+#ifdef ACPI_DEBUG
+	printf("Toggle LCD/CRT\n");
+	printf("\t Before switch, video status:   %s",
+	    (((value & GHCI_LCD) == GHCI_LCD) ? "LCD" : ""));
+	printf("%s\n", (((value & GHCI_CRT) == GHCI_CRT) ? "CRT": ""));
+#endif
+
+	/* Toggle LCD/CRT */
+	if (value & GHCI_LCD) {
+		value &= ~GHCI_LCD;
+		value |= GHCI_CRT;
+	} else if (value & GHCI_CRT){
+		value &= ~GHCI_CRT;
+		value |= GHCI_LCD;
+	}
+
+	rv = vald_acpi_dssx_set(value);
+	if (ACPI_FAILURE(rv))
+		aprint_error_dev(sc->sc_dev, "unable to evaluate DSSX: %s\n",
+		    AcpiFormatException(rv));
+
+}
+
+/*
+ * vald_acpi_bcm_set:
+ *
+ *	Set LCD brightness via "_BCM" Method.
+ */
+static ACPI_STATUS
+vald_acpi_bcm_set(ACPI_HANDLE handle, UINT32 bright)
+{
+	ACPI_STATUS rv;
+	ACPI_OBJECT Arg;
+	ACPI_OBJECT_LIST ArgList;
+
+	ArgList.Count = 1;
+	ArgList.Pointer = &Arg;
+
+	Arg.Type = ACPI_TYPE_INTEGER;
+	Arg.Integer.Value = bright;
+
+	rv = AcpiEvaluateObject(handle, "_BCM", &ArgList, NULL);
+	return (rv);
+}
+
+/*
+ * vald_acpi_dssx_set:
+ *
+ *	Set value via "\\_SB_.VALX.DSSX" Method.
+ */
+static ACPI_STATUS
+vald_acpi_dssx_set(UINT32 value)
+{
+	return acpi_eval_set_integer(NULL, "\\_SB_.VALX.DSSX", value);
+}
+
+/*
+ * vald_acpi_fan_switch:
+ *
+ *	Get FAN status and set new FAN status.
+ */
+static void
+vald_acpi_fan_switch(struct vald_acpi_softc *sc)
+{
+	ACPI_STATUS rv;
+	UINT32	value, result;
+
+	/* Get FAN status */
+	rv = vald_acpi_ghci_get(sc, GHCI_FAN, &value, &result);
+	if (ACPI_FAILURE(rv))
+		return;
+	if (result != 0) {
+		aprint_error_dev(sc->sc_dev, "can't get FAN status error=%d\n",
+		    result);
+		return;
+	}
+
+#ifdef ACPI_DEBUG
+	printf("Toggle FAN on/off\n");
+	printf("\t Before toggle, FAN status %s\n",
+	    (value == GHCI_OFF ? "off" : "on"));
+#endif
+
+	/* Toggle FAN on/off */
+	if (value == GHCI_OFF)
+		value = GHCI_ON;
+	else
+		value = GHCI_OFF;
+
+	/* Set FAN new status. */
+	rv = vald_acpi_ghci_set(sc, GHCI_FAN, value, &result);
+	if (ACPI_FAILURE(rv))
+		return;
+	if (result != 0) {
+		aprint_error_dev(sc->sc_dev, "can't set FAN status error=%d\n",
+		    result);
+		return;
+	}
+
+#ifdef ACPI_DEBUG
+	printf("\t After toggle, FAN status %s\n",
+	    (value == GHCI_OFF ? "off" : "on"));
+#endif
+}

Reply via email to