Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Remove aiboost(4) as obsolete and redundant since the introd...
details: https://anonhg.NetBSD.org/src/rev/994bf1db7504
branches: trunk
changeset: 753166:994bf1db7504
user: cnst <cnst%NetBSD.org@localhost>
date: Fri Mar 19 04:04:27 2010 +0000
description:
Remove aiboost(4) as obsolete and redundant since the introduction of aibs(4).
http://mail-index.netbsd.org/tech-kern/2010/03/06/msg007458.html
Reviewed by <pgoyette>, <cegger>, <jruoho>, <tech-kern>.
diffstat:
share/man/man4/Makefile | 5 +-
share/man/man4/acpi.4 | 6 +-
share/man/man4/aiboost.4 | 84 --------
sys/arch/i386/conf/ALL | 5 +-
sys/dev/DEVNAMES | 3 +-
sys/dev/acpi/aiboost.c | 450 ---------------------------------------------
sys/dev/acpi/files.acpi | 7 +-
usr.sbin/envstat/envstat.8 | 3 +-
8 files changed, 9 insertions(+), 554 deletions(-)
diffs (truncated from 682 to 300 lines):
diff -r b621003833b0 -r 994bf1db7504 share/man/man4/Makefile
--- a/share/man/man4/Makefile Fri Mar 19 02:20:44 2010 +0000
+++ b/share/man/man4/Makefile Fri Mar 19 04:04:27 2010 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.511 2010/03/11 10:38:37 enami Exp $
+# $NetBSD: Makefile,v 1.512 2010/03/19 04:04:27 cnst Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 acpidalb.4 \
adbbt.4 adbkbd.4 adbms.4 \
adc.4 admtemp.4 adv.4 adw.4 age.4 agp.4 agr.4 ahb.4 ahc.4 \
ahcisata.4 ahd.4 \
- aiboost.4 aibs.4 ale.4 alipm.4 altmem.4 amdpm.4 amdtemp.4 amhphy.4 \
+ aibs.4 ale.4 alipm.4 altmem.4 amdpm.4 amdtemp.4 amhphy.4 \
amr.4 aps.4 \
an.4 arcmsr.4 aria.4 artsata.4 ata.4 atalk.4 ataraid.4 \
ath.4 atphy.4 atppc.4 attimer.4 atw.4 \
@@ -144,6 +144,7 @@
MLINKS+=drm.4 viadrm.4
MLINKS+=acpiec.4 acpiecdt.4
+MLINKS+=aibs.4 aiboost.4
MLINKS+=ata.4 atabus.4
MLINKS+=audio.4 audioctl.4
MLINKS+=audio.4 mixer.4
diff -r b621003833b0 -r 994bf1db7504 share/man/man4/acpi.4
--- a/share/man/man4/acpi.4 Fri Mar 19 02:20:44 2010 +0000
+++ b/share/man/man4/acpi.4 Fri Mar 19 04:04:27 2010 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: acpi.4,v 1.42 2010/03/06 06:25:51 jruoho Exp $
+.\" $NetBSD: acpi.4,v 1.43 2010/03/19 04:04:27 cnst Exp $
.\"
.\" Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -41,7 +41,6 @@
.Cd "acpilid* at acpi?"
.Cd "acpismbus* at acpi?"
.Cd "acpitz* at acpi?"
-.Cd "aiboost* at acpi?"
.Cd "aibs* at acpi?"
.Cd "asus* at acpi?"
.Cd "attimer* at acpi?"
@@ -200,8 +199,6 @@
.It acpitz
.Tn ACPI
thermal zones.
-.It aiboost
-ASUS AI Booster Hardware monitor.
.It aibs
ASUSTeK AI Booster ACPI ATK0110 voltage, temperature and fan sensor.
.It asus
@@ -394,7 +391,6 @@
.Xr acpilid 4 ,
.Xr acpismbus 4 ,
.Xr acpitz 4 ,
-.Xr aiboost 4 ,
.Xr aibs 4 ,
.Xr apm 4 ,
.Xr attimer 4 ,
diff -r b621003833b0 -r 994bf1db7504 share/man/man4/aiboost.4
--- a/share/man/man4/aiboost.4 Fri Mar 19 02:20:44 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-.\" $NetBSD: aiboost.4,v 1.2 2007/03/14 07:10:51 wiz Exp $
-.\"
-.\" Copyright (c) 2007 Juan Romero Pardines
-.\" 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 AUTHOR ``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 AUTHOR 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 March 14, 2007
-.Dt AIBOOST 4
-.Os
-.Sh NAME
-.Nm aiboost
-.Nd ASUS AI Booster hardware monitor
-.Sh SYNOPSIS
-.Cd "aiboost* at acpi?"
-.Sh DESCRIPTION
-The
-.Nm
-driver provides support for monitoring the hardware sensors in recent
-.Tn ASUS
-motherboards.
-The driver uses ACPI as the backend to fetch sensor values and
-descriptions and provides its data via the
-.Xr envsys 4
-interface.
-.Pp
-The
-.Nm
-driver typically has 7 sensors, depending on the motherboard and
-chipset:
-.Bl -column "Sensor" "Units" "Typical" -offset indent
-.It Sy "Sensor" Ta Sy "Units" Ta Sy "Typical Use"
-.It Li "CPU" Ta "uK" Ta "CPU Temperature"
-.It Li "MB" Ta "uK" Ta "MB Temperature"
-.It Li "VCC" Ta "uV DC" Ta "Core Voltage"
-.It Li "+3.3V" Ta "uV DC" Ta "+3.3 Voltage"
-.It Li "+5V" Ta "uV DC" Ta "+5 Voltage"
-.It Li "+12V" Ta "uV DC" Ta "+12 Voltage"
-.It Li "CPU" Ta "RPM" Ta "CPU Fan"
-.El
-.Sh SEE ALSO
-.Xr envsys 4 ,
-.Xr envstat 8
-.Sh HISTORY
-The
-.Nm
-driver first appeared in
-.Fx
-and then it was ported to
-.Nx 5.0 .
-.Sh AUTHORS
-.An -nosplit
-The
-.Nm
-driver was written by
-.An Takanori Watanabe
-and
-.An Juan Romero Pardines ,
-who adapted the code for
-.Nx .
-.Sh BUGS
-It's possible to modify voltages via the ACPI methods in the DSDT,
-but for now the driver only reports the sensors' values.
-CPU Q-Fan is another thing that is typically specified in the ACPI
-namespace, and in the future we should handle this feature (to
-enable or disable automatic/manual fan mode).
diff -r b621003833b0 -r 994bf1db7504 sys/arch/i386/conf/ALL
--- a/sys/arch/i386/conf/ALL Fri Mar 19 02:20:44 2010 +0000
+++ b/sys/arch/i386/conf/ALL Fri Mar 19 04:04:27 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.249 2010/03/06 21:12:04 plunky Exp $
+# $NetBSD: ALL,v 1.250 2010/03/19 04:04:27 cnst 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.249 $"
+#ident "ALL-$Revision: 1.250 $"
maxusers 64 # estimated number of users
@@ -374,7 +374,6 @@
acpiwmi* at acpi? # ACPI WMI Mapper
# Mainboard devices
-aiboost* at acpi? # ASUS AI Booster Hardware Monitor
aibs* at acpi? # ASUSTeK AI Booster hardware monitor
asus* at acpi? # ASUS hotkeys
attimer* at acpi? # AT Timer
diff -r b621003833b0 -r 994bf1db7504 sys/dev/DEVNAMES
--- a/sys/dev/DEVNAMES Fri Mar 19 02:20:44 2010 +0000
+++ b/sys/dev/DEVNAMES Fri Mar 19 04:04:27 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DEVNAMES,v 1.258 2010/03/11 10:38:37 enami Exp $
+# $NetBSD: DEVNAMES,v 1.259 2010/03/19 04:04:27 cnst Exp $
#
# This file contains all used device names and defined attributes in
# alphabetical order. New devices added to the system somewhere should first
@@ -61,7 +61,6 @@
ahsc amiga
ahsc amigappc
ai MI
-aiboost MI
aibs MI
aic MI
akbd mac68k
diff -r b621003833b0 -r 994bf1db7504 sys/dev/acpi/aiboost.c
--- a/sys/dev/acpi/aiboost.c Fri Mar 19 02:20:44 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,450 +0,0 @@
-/* $NetBSD: aiboost.c,v 1.30 2010/03/05 14:00:17 jruoho Exp $ */
-
-/*-
- * Copyright (c) 2007 Juan Romero Pardines
- * Copyright (c) 2006 Takanori Watanabe
- * 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 AUTHOR 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 AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aiboost.c,v 1.30 2010/03/05 14:00:17 jruoho Exp $");
-
-#include <sys/param.h>
-#include <sys/device.h>
-#include <sys/mutex.h>
-#include <sys/kmem.h>
-#include <sys/systm.h>
-
-#include <dev/acpi/acpireg.h>
-#include <dev/acpi/acpivar.h>
-
-#define _COMPONENT ACPI_RESOURCE_COMPONENT
-ACPI_MODULE_NAME ("aiboost")
-
-#ifdef AIBOOST_DEBUG
-#define DPRINTF(x) do { printf x; } while (/* CONSTCOND */ 0)
-#else
-#define DPRINTF(x)
-#endif
-
-struct aiboost_elem {
- ACPI_HANDLE h;
- UINT32 id;
- char desc[256];
-};
-
-struct aiboost_comp {
- unsigned int num;
- struct aiboost_elem elem[1];
-};
-
-struct aiboost_softc {
- struct acpi_devnode *sc_node; /* ACPI devnode */
- struct aiboost_comp *sc_aitemp, *sc_aivolt, *sc_aifan;
- struct sysmon_envsys *sc_sme;
- envsys_data_t *sc_sensor;
- kmutex_t sc_mtx;
-};
-
-static ACPI_STATUS aiboost_getcomp(ACPI_HANDLE *,
- const char *,
- struct aiboost_comp **);
-static int aiboost_get_value(ACPI_HANDLE, const char *, UINT32);
-
-/* sysmon_envsys(9) glue */
-static void aiboost_setup_sensors(struct aiboost_softc *);
-static void aiboost_refresh_sensors(struct sysmon_envsys *,
- envsys_data_t *);
-
-/* autoconf(9) glue */
-static int aiboost_acpi_match(device_t, cfdata_t, void *);
-static void aiboost_acpi_attach(device_t, device_t, void *);
-
-CFATTACH_DECL_NEW(aiboost, sizeof(struct aiboost_softc), aiboost_acpi_match,
- aiboost_acpi_attach, NULL, NULL);
-
-/*
- * Supported device IDs
- */
-
-static const char * const aiboost_acpi_ids[] = {
- "ATK0110",
- NULL
-};
-
-static int
-aiboost_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, aiboost_acpi_ids);
-}
-
Home |
Main Index |
Thread Index |
Old Index