Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Merge ACPI Fujitsu Driver. Provides support for hotkeys and...
details: https://anonhg.NetBSD.org/src/rev/5c0fed4538ce
branches: trunk
changeset: 758461:5c0fed4538ce
user: gsutre <gsutre%NetBSD.org@localhost>
date: Fri Nov 05 10:28:20 2010 +0000
description:
Merge ACPI Fujitsu Driver. Provides support for hotkeys and other
built-in components through vendor-specific ACPI devices.
ok jruoho@
diffstat:
distrib/sets/lists/man/mi | 11 +-
share/man/man4/Makefile | 5 +-
share/man/man4/fujitsu.4 | 92 +++
sys/arch/amd64/conf/GENERIC | 6 +-
sys/arch/i386/conf/ALL | 6 +-
sys/arch/i386/conf/GENERIC | 6 +-
sys/dev/acpi/files.acpi | 9 +-
sys/dev/acpi/fujitsu_acpi.c | 1179 +++++++++++++++++++++++++++++++++++++++++++
8 files changed, 1304 insertions(+), 10 deletions(-)
diffs (truncated from 1446 to 300 lines):
diff -r 9df15bcef305 -r 5c0fed4538ce distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Fri Nov 05 10:04:25 2010 +0000
+++ b/distrib/sets/lists/man/mi Fri Nov 05 10:28:20 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1246 2010/11/03 18:57:33 christos Exp $
+# $NetBSD: mi,v 1.1247 2010/11/05 10:28:22 gsutre Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -950,6 +950,9 @@
./usr/share/man/cat4/fss.0 man-sys-catman .cat
./usr/share/man/cat4/fssbs.0 man-obsolete obsolete
./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/fwhrng.0 man-obsolete obsolete
./usr/share/man/cat4/fwip.0 man-sys-catman .cat
./usr/share/man/cat4/fwiso.0 man-obsolete obsolete
@@ -3642,6 +3645,9 @@
./usr/share/man/html4/fss.html man-sys-htmlman html
./usr/share/man/html4/fssbs.html man-obsolete obsolete
./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/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
@@ -6112,6 +6118,9 @@
./usr/share/man/man4/fss.4 man-sys-man .man
./usr/share/man/man4/fssbs.4 man-obsolete obsolete
./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/fwhrng.4 man-obsolete obsolete
./usr/share/man/man4/fwip.4 man-sys-man .man
./usr/share/man/man4/fwiso.4 man-obsolete obsolete
diff -r 9df15bcef305 -r 5c0fed4538ce share/man/man4/Makefile
--- a/share/man/man4/Makefile Fri Nov 05 10:04:25 2010 +0000
+++ b/share/man/man4/Makefile Fri Nov 05 10:28:20 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.530 2010/11/03 18:57:57 christos Exp $
+# $NetBSD: Makefile,v 1.531 2010/11/05 10:28:22 gsutre 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 etherip.4 exphy.4 \
- fast_ipsec.4 fd.4 finsio.4 fpa.4 fms.4 fss.4 fxp.4 \
+ fast_ipsec.4 fd.4 finsio.4 fpa.4 fms.4 fss.4 fujitsu.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 \
@@ -174,6 +174,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+=hdaudio.4 hdafg.4
MLINKS+=hdaudio.4 hdaudiobus.4
MLINKS+=icp.4 icpsp.4
diff -r 9df15bcef305 -r 5c0fed4538ce share/man/man4/fujitsu.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/fujitsu.4 Fri Nov 05 10:28:20 2010 +0000
@@ -0,0 +1,92 @@
+.\" $NetBSD: fujitsu.4,v 1.1 2010/11/05 10:28:22 gsutre Exp $
+.\"
+.\" Copyright (c) 2010 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 November 3, 2010
+.Dt FUJITSU 4
+.Os
+.Sh NAME
+.Nm fujitsu
+.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
+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):
+.Pp
+.Bl -tag -width 28u -compact
+.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
+.Nm
+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
+drivers appeared in
+.Nx 6.0 .
+.Sh AUTHORS
+.An Gr\('egoire Sutre
+.Aq gsutre%NetBSD.org@localhost
+.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.
diff -r 9df15bcef305 -r 5c0fed4538ce sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Fri Nov 05 10:04:25 2010 +0000
+++ b/sys/arch/amd64/conf/GENERIC Fri Nov 05 10:28:20 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.288 2010/11/03 20:09:09 christos Exp $
+# $NetBSD: GENERIC,v 1.289 2010/11/05 10:28:21 gsutre Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.288 $"
+#ident "GENERIC-$Revision: 1.289 $"
maxusers 64 # estimated number of users
@@ -294,6 +294,8 @@
attimer* at acpi? # AT Timer
#com* at acpi? # Serial communications interface
#fdc* at acpi? # Floppy disk controller
+fujbp* at acpi? # Fujitsu Brightness & Pointer
+fujhk* at acpi? # Fujitsu Hotkeys
hpqlb* at acpi? # HP Quick Launch Buttons
hpet* at acpi? # High Precision Event Timer
joy* at acpi? # Joystick/Game port
diff -r 9df15bcef305 -r 5c0fed4538ce sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Fri Nov 05 10:04:25 2010 +0000
+++ b/sys/arch/i386/conf/ALL Fri Nov 05 10:28:20 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.273 2010/11/05 01:34:51 rmind Exp $
+# $NetBSD: ALL,v 1.274 2010/11/05 10:28:21 gsutre Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.273 $"
+#ident "ALL-$Revision: 1.274 $"
maxusers 64 # estimated number of users
@@ -385,6 +385,8 @@
attimer* at acpi? # AT Timer
com* at acpi? # Serial communications interface
fdc* at acpi? # Floppy disk controller
+fujbp* at acpi? # Fujitsu Brightness & Pointer
+fujhk* at acpi? # Fujitsu Hotkeys
hpqlb* at acpi? # HP Quick Launch Buttons
hpet* at acpi? # High Precision Event Timer
joy* at acpi? # Joystick/Game port
diff -r 9df15bcef305 -r 5c0fed4538ce sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Fri Nov 05 10:04:25 2010 +0000
+++ b/sys/arch/i386/conf/GENERIC Fri Nov 05 10:28:20 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.996 2010/11/03 20:10:00 christos Exp $
+# $NetBSD: GENERIC,v 1.997 2010/11/05 10:28:21 gsutre Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.996 $"
+#ident "GENERIC-$Revision: 1.997 $"
maxusers 64 # estimated number of users
@@ -374,6 +374,8 @@
attimer* at acpi? # AT Timer
#com* at acpi? # Serial communications interface
#fdc* at acpi? # Floppy disk controller
+fujbp* at acpi? # Fujitsu Brightness & Pointer
+fujhk* at acpi? # Fujitsu Hotkeys
hpqlb* at acpi? # HP Quick Launch Buttons
hpet* at acpi? # High Precision Event Timer
joy* at acpi? # Joystick/Game port
diff -r 9df15bcef305 -r 5c0fed4538ce sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi Fri Nov 05 10:04:25 2010 +0000
+++ b/sys/dev/acpi/files.acpi Fri Nov 05 10:28:20 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.acpi,v 1.81 2010/10/12 19:10:50 gsutre Exp $
+# $NetBSD: files.acpi,v 1.82 2010/11/05 10:28:20 gsutre Exp $
include "dev/acpi/acpica/files.acpica"
@@ -182,4 +182,11 @@
attach acpismbus at acpinodebus
file dev/acpi/smbus_acpi.c acpismbus
+# Fujitsu Brightness, Pointer and Hotkeys
+device fujbp
+attach fujbp at acpinodebus
+device fujhk: sysmon_power
+attach fujhk at acpinodebus
+file dev/acpi/fujitsu_acpi.c fujbp|fujhk
+
include "dev/acpi/wmi/files.wmi"
diff -r 9df15bcef305 -r 5c0fed4538ce sys/dev/acpi/fujitsu_acpi.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/acpi/fujitsu_acpi.c Fri Nov 05 10:28:20 2010 +0000
@@ -0,0 +1,1179 @@
+/* XXX REMOVE ME $Id: fujitsu_acpi.c,v 1.1 2010/11/05 10:28:21 gsutre Exp $ */
+/* $NetBSD: fujitsu_acpi.c,v 1.1 2010/11/05 10:28:21 gsutre Exp $ */
+
+/*-
+ * Copyright (c) 2010 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.
+ */
+
+/*
Home |
Main Index |
Thread Index |
Old Index