Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Split fujbp(4) and fujhk(4) to separate instances from fujit...
details: https://anonhg.NetBSD.org/src/rev/4f2b64a27d53
branches: trunk
changeset: 762382:4f2b64a27d53
user: jruoho <jruoho%NetBSD.org@localhost>
date: Sun Feb 20 08:31:46 2011 +0000
description:
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@.
diffstat:
distrib/sets/lists/man/mi | 8 +-
share/man/man4/Makefile | 6 +-
share/man/man4/fujbp.4 | 94 +++
share/man/man4/fujitsu.4 | 91 ---
sys/dev/acpi/files.acpi | 9 +-
sys/dev/acpi/fujbp_acpi.c | 694 +++++++++++++++++++++++++
sys/dev/acpi/fujhk_acpi.c | 558 ++++++++++++++++++++
sys/dev/acpi/fujitsu_acpi.c | 1178 -------------------------------------------
8 files changed, 1359 insertions(+), 1279 deletions(-)
diffs (truncated from 2724 to 300 lines):
diff -r 2c313f2f6418 -r 4f2b64a27d53 distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Sun Feb 20 08:27:32 2011 +0000
+++ b/distrib/sets/lists/man/mi Sun Feb 20 08:31:46 2011 +0000
@@ -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
diff -r 2c313f2f6418 -r 4f2b64a27d53 share/man/man4/Makefile
--- a/share/man/man4/Makefile Sun Feb 20 08:27:32 2011 +0000
+++ b/share/man/man4/Makefile Sun Feb 20 08:31:46 2011 +0000
@@ -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
diff -r 2c313f2f6418 -r 4f2b64a27d53 share/man/man4/fujbp.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/fujbp.4 Sun Feb 20 08:31:46 2011 +0000
@@ -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 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 2c313f2f6418 -r 4f2b64a27d53 share/man/man4/fujitsu.4
--- a/share/man/man4/fujitsu.4 Sun Feb 20 08:27:32 2011 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-.\" $NetBSD: fujitsu.4,v 1.4 2010/11/05 14:43:56 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 5, 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):
-.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
-.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 2c313f2f6418 -r 4f2b64a27d53 sys/dev/acpi/files.acpi
--- a/sys/dev/acpi/files.acpi Sun Feb 20 08:27:32 2011 +0000
+++ b/sys/dev/acpi/files.acpi Sun Feb 20 08:31:46 2011 +0000
@@ -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"
diff -r 2c313f2f6418 -r 4f2b64a27d53 sys/dev/acpi/fujbp_acpi.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/acpi/fujbp_acpi.c Sun Feb 20 08:31:46 2011 +0000
@@ -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.
Home |
Main Index |
Thread Index |
Old Index