CVS commit: [netbsd-5] src/sys/dev/acpi

2009-10-05 Thread Stephen Borrill 
Module Name:src
Committed By:   sborrill
Date:   Mon Oct  5 10:11:34 UTC 2009

Modified Files:
src/sys/dev/acpi [netbsd-5]: acpi_bat.c

Log Message:
Pull up revision 1.74 (requested by jmcneill in ticket #1067)

If the driver thinks a battery is not present, poll for present status.
Workaround for firmware that doesn't report battery present status
immediately at boot and doesn't issue a subsequent notify when the
information becomes available.


To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.69.8.1 src/sys/dev/acpi/acpi_bat.c

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

Modified files:

Index: src/sys/dev/acpi/acpi_bat.c
diff -u src/sys/dev/acpi/acpi_bat.c:1.69 src/sys/dev/acpi/acpi_bat.c:1.69.8.1
--- src/sys/dev/acpi/acpi_bat.c:1.69	Tue Jun  3 15:02:31 2008
+++ src/sys/dev/acpi/acpi_bat.c	Mon Oct  5 10:11:34 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_bat.c,v 1.69 2008/06/03 15:02:31 jmcneill Exp $	*/
+/*	$NetBSD: acpi_bat.c,v 1.69.8.1 2009/10/05 10:11:34 sborrill Exp $	*/
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_bat.c,v 1.69 2008/06/03 15:02:31 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_bat.c,v 1.69.8.1 2009/10/05 10:11:34 sborrill Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -782,6 +782,9 @@
 	ACPI_STATUS rv;
 	struct timeval tv, tmp;
 
+	if (!ABAT_ISSET(sc, ABAT_F_PRESENT))
+		acpibat_battery_present(dv);
+
 	if (ABAT_ISSET(sc, ABAT_F_PRESENT)) {
 		tmp.tv_sec = 5;
 		tmp.tv_usec = 0;

CVS commit: [netbsd-5] src/sys/dev/acpi

2009-09-05 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sat Sep  5 11:34:26 UTC 2009

Modified Files:
src/sys/dev/acpi [netbsd-5]: acpi.c acpi_button.c acpi_lid.c files.acpi
Added Files:
src/sys/dev/acpi [netbsd-5]: acpi_wakedev.c acpi_wakedev.h

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #896):
sys/dev/acpi/acpi_button.c: revision 1.27 via patch
sys/dev/acpi/acpi_wakedev.h: revision 1.1 via patch
sys/dev/acpi/acpi_wakedev.c: revision 1.1 via patch
sys/dev/acpi/files.acpi: revision 1.55 via patch
sys/dev/acpi/acpi.c: revision 1.127 via patch
sys/dev/acpi/acpi_lid.c: revision 1.27 via patch
add hw.wake.* sysctl subtree for toggling which devices are allowed to
restore the system from sleep. set/clear wake GPEs as specified before
entering sleep.
by default, the following devices are enabled for wake:
 - sleep/power buttons
 - lid switch
 - pc kbd controller
reviewed by: joerg


To generate a diff of this commit:
cvs rdiff -u -r1.120.4.1 -r1.120.4.2 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.25 -r1.25.24.1 src/sys/dev/acpi/acpi_button.c
cvs rdiff -u -r1.26 -r1.26.4.1 src/sys/dev/acpi/acpi_lid.c
cvs rdiff -u -r0 -r1.2.4.2 src/sys/dev/acpi/acpi_wakedev.c
cvs rdiff -u -r0 -r1.1.4.2 src/sys/dev/acpi/acpi_wakedev.h
cvs rdiff -u -r1.52.8.1 -r1.52.8.2 src/sys/dev/acpi/files.acpi

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

Modified files:

Index: src/sys/dev/acpi/acpi.c
diff -u src/sys/dev/acpi/acpi.c:1.120.4.1 src/sys/dev/acpi/acpi.c:1.120.4.2
--- src/sys/dev/acpi/acpi.c:1.120.4.1	Mon Feb  2 20:37:34 2009
+++ src/sys/dev/acpi/acpi.c	Sat Sep  5 11:34:26 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi.c,v 1.120.4.1 2009/02/02 20:37:34 snj Exp $	*/
+/*	$NetBSD: acpi.c,v 1.120.4.2 2009/09/05 11:34:26 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.120.4.1 2009/02/02 20:37:34 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.120.4.2 2009/09/05 11:34:26 bouyer Exp $);
 
 #include opt_acpi.h
 #include opt_pcifixup.h
@@ -89,6 +89,7 @@
 #include dev/acpi/acpivar.h
 #include dev/acpi/acpi_osd.h
 #include dev/acpi/acpi_timer.h
+#include dev/acpi/acpi_wakedev.h
 #ifdef ACPIVERBOSE
 #include dev/acpi/acpidevs_data.h
 #endif
@@ -669,6 +670,8 @@
 			acpinodebus, aa, acpi_print);
 		}
 	}
+	acpi_wakedev_scan(sc);
+
 	config_found_ia(sc-sc_dev, acpiapmbus, NULL, NULL);
 }
 
@@ -1265,6 +1268,8 @@
 			break;
 		}
 
+		acpi_wakedev_commit(sc);
+
 		if (state != ACPI_STATE_S1  !pmf_system_suspend(PMF_F_NONE)) {
 			aprint_error_dev(sc-sc_dev, aborting suspend\n);
 			break;

Index: src/sys/dev/acpi/acpi_button.c
diff -u src/sys/dev/acpi/acpi_button.c:1.25 src/sys/dev/acpi/acpi_button.c:1.25.24.1
--- src/sys/dev/acpi/acpi_button.c:1.25	Sun Dec  9 20:27:52 2007
+++ src/sys/dev/acpi/acpi_button.c	Sat Sep  5 11:34:26 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_button.c,v 1.25 2007/12/09 20:27:52 jmcneill Exp $	*/
+/*	$NetBSD: acpi_button.c,v 1.25.24.1 2009/09/05 11:34:26 bouyer Exp $	*/
 
 /*
  * Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_button.c,v 1.25 2007/12/09 20:27:52 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_button.c,v 1.25.24.1 2009/09/05 11:34:26 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -145,8 +145,6 @@
 		return;
 	}
 
-	acpi_set_wake_gpe(sc-sc_node-ad_handle);
-
 #ifdef ACPI_BUT_DEBUG
 	/* Display the current state when it changes. */
 	sc-sc_flags = ACPIBUT_F_VERBOSE;

Index: src/sys/dev/acpi/acpi_lid.c
diff -u src/sys/dev/acpi/acpi_lid.c:1.26 src/sys/dev/acpi/acpi_lid.c:1.26.4.1
--- src/sys/dev/acpi/acpi_lid.c:1.26	Tue Jul 15 16:19:37 2008
+++ src/sys/dev/acpi/acpi_lid.c	Sat Sep  5 11:34:26 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_lid.c,v 1.26 2008/07/15 16:19:37 dyoung Exp $	*/
+/*	$NetBSD: acpi_lid.c,v 1.26.4.1 2009/09/05 11:34:26 bouyer Exp $	*/
 
 /*
  * Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_lid.c,v 1.26 2008/07/15 16:19:37 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_lid.c,v 1.26.4.1 2009/09/05 11:34:26 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -124,8 +124,6 @@
 		return;
 	}
 
-	acpi_set_wake_gpe(sc-sc_node-ad_handle);
-
 	if (!pmf_device_register(self, acpilid_suspend, NULL))
 		aprint_error_dev(self, couldn't establish power handler\n);
 }
@@ -136,8 +134,6 @@
 	struct acpilid_softc *sc = device_private(self);
 	ACPI_STATUS rv;
 
-	acpi_clear_wake_gpe(sc-sc_node-ad_handle);
-
 	rv = AcpiRemoveNotifyHandler(sc-sc_node-ad_handle,
 	ACPI_DEVICE_NOTIFY, acpilid_notify_handler);
 	if (ACPI_FAILURE(rv)) {

Index: src/sys/dev/acpi/files.acpi
diff -u src/sys/dev/acpi/files.acpi:1.52.8.1 src/sys/dev/acpi/files.acpi:1.52.8.2
---

CVS commit: [netbsd-5] src/sys/dev/acpi

2009-09-05 Thread Manuel Bouyer 
Module Name:src
Committed By:   bouyer
Date:   Sat Sep  5 13:10:03 UTC 2009

Modified Files:
src/sys/dev/acpi [netbsd-5]: pckbc_acpi.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #939):
sys/dev/acpi/pckbc_acpi.c: revision 1.32
PR# port-i386/39671: panic while booting with an acpi kernel on a 790GX board
If the firmware describes duplicate keyboard controller nodes, don't panic
when the driver fails to map registers.


To generate a diff of this commit:
cvs rdiff -u -r1.30.4.1 -r1.30.4.2 src/sys/dev/acpi/pckbc_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/sys/dev/acpi/pckbc_acpi.c
diff -u src/sys/dev/acpi/pckbc_acpi.c:1.30.4.1 src/sys/dev/acpi/pckbc_acpi.c:1.30.4.2
--- src/sys/dev/acpi/pckbc_acpi.c:1.30.4.1	Fri May  1 01:38:17 2009
+++ src/sys/dev/acpi/pckbc_acpi.c	Sat Sep  5 13:10:03 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: pckbc_acpi.c,v 1.30.4.1 2009/05/01 01:38:17 snj Exp $	*/
+/*	$NetBSD: pckbc_acpi.c,v 1.30.4.2 2009/09/05 13:10:03 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pckbc_acpi.c,v 1.30.4.1 2009/05/01 01:38:17 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: pckbc_acpi.c,v 1.30.4.2 2009/09/05 13:10:03 bouyer Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -206,8 +206,11 @@
 			if (bus_space_map(aa-aa_iot, io0-ar_base,
 	  io0-ar_length, 0, ioh_d) ||
 			bus_space_map(aa-aa_iot, io1-ar_base,
-	  io1-ar_length, 0, ioh_c))
-panic(pckbc_acpi_attach: couldn't map);
+	  io1-ar_length, 0, ioh_c)) {
+aprint_error_dev(self,
+unable to map registers\n);
+goto out;
+			}
 
 			t = malloc(sizeof(struct pckbc_internal),
 			M_DEVBUF, M_WAITOK|M_ZERO);
@@ -228,9 +231,11 @@
 
 		first-sc_pckbc.intr_establish = pckbc_acpi_intr_establish;
 		config_defer(first-sc_pckbc.sc_dv, pckbc_acpi_finish_attach);
-	} else if (!pmf_device_register(self, NULL, NULL))
+	}
+
+out:
+	if (!pmf_device_register(self, NULL, NULL))
 		aprint_error_dev(self, couldn't establish power handler\n);
- out:
 	acpi_resource_cleanup(res);
 }

CVS commit: [netbsd-5] src/sys/dev/acpi

2009-08-29 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Aug 30 03:01:26 UTC 2009

Modified Files:
src/sys/dev/acpi [netbsd-5]: asus_acpi.c files.acpi

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #891):
sys/dev/acpi/asus_acpi.c: revision 1.7
sys/dev/acpi/files.acpi: revision 1.54
- add experimental cpu fan/voltage switching support (sysctl hw.asus0.*)
- add fan sensor
- rename asus_softc_t - struct asus_softc
- add detach method
- update copyright for 2009


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/dev/acpi/asus_acpi.c
cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/dev/acpi/files.acpi

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

Modified files:

Index: src/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.6 src/sys/dev/acpi/asus_acpi.c:1.6.4.1
--- src/sys/dev/acpi/asus_acpi.c:1.6	Sun Sep 21 21:15:28 2008
+++ src/sys/dev/acpi/asus_acpi.c	Sun Aug 30 03:01:26 2009
@@ -1,7 +1,7 @@
-/* $NetBSD: asus_acpi.c,v 1.6 2008/09/21 21:15:28 jmcneill Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.6.4.1 2009/08/30 03:01:26 snj Exp $ */
 
 /*-
- * Copyright (c) 2007, 2008 Jared D. McNeill jmcne...@invisible.ca
+ * Copyright (c) 2007, 2008, 2009 Jared D. McNeill jmcne...@invisible.ca
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: asus_acpi.c,v 1.6 2008/09/21 21:15:28 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: asus_acpi.c,v 1.6.4.1 2009/08/30 03:01:26 snj Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -36,11 +36,11 @@
 #include sys/callout.h
 #include sys/kernel.h
 #include sys/device.h
-#include sys/pmf.h
+#include sys/sysctl.h
 
 #include dev/acpi/acpivar.h
 
-typedef struct asus_softc {
+struct asus_softc {
 	device_t		sc_dev;
 	struct acpi_devnode	*sc_node;
 
@@ -49,8 +49,18 @@
 	struct sysmon_pswitch	sc_smpsw[ASUS_PSW_LAST];
 	bool			sc_smpsw_valid;
 
+	struct sysmon_envsys	*sc_sme;
+#define	ASUS_SENSOR_FAN		0
+#define	ASUS_SENSOR_LAST	1
+	envsys_data_t		sc_sensor[ASUS_SENSOR_LAST];
+
 	ACPI_INTEGER		sc_brightness;
-} asus_softc_t;
+	ACPI_INTEGER		sc_cfvnum;
+
+	struct sysctllog	*sc_log;
+	int			sc_cfv_mib;
+	int			sc_cfvnum_mib;
+};
 
 #define ASUS_NOTIFY_WirelessSwitch	0x10
 #define ASUS_NOTIFY_BrightnessLow	0x20
@@ -70,9 +80,15 @@
 		(ASUS_SDSP_LCD | ASUS_SDSP_CRT | ASUS_SDSP_TV | ASUS_SDSP_DVI)
 #define ASUS_METHOD_PBLG	PBLG
 #define ASUS_METHOD_PBLS	PBLS
+#define	ASUS_METHOD_CFVS	CFVS
+#define	ASUS_METHOD_CFVG	CFVG
+
+#define	ASUS_EC_METHOD_FAN_RPMH	\\_SB.PCI0.SBRG.EC0.SC05
+#define	ASUS_EC_METHOD_FAN_RPML	\\_SB.PCI0.SBRG.EC0.SC06
 
 static int	asus_match(device_t, cfdata_t, void *);
 static void	asus_attach(device_t, device_t, void *);
+static int	asus_detach(device_t, int);
 
 static void	asus_notify_handler(ACPI_HANDLE, UINT32, void *);
 
@@ -80,8 +96,13 @@
 static bool	asus_suspend(device_t PMF_FN_PROTO);
 static bool	asus_resume(device_t PMF_FN_PROTO);
 
-CFATTACH_DECL_NEW(asus, sizeof(asus_softc_t),
-asus_match, asus_attach, NULL, NULL);
+static void	asus_sysctl_setup(struct asus_softc *);
+
+static void	asus_sensors_refresh(struct sysmon_envsys *, envsys_data_t *);
+static bool	asus_get_fan_speed(struct asus_softc *, uint32_t *);
+
+CFATTACH_DECL_NEW(asus, sizeof(struct asus_softc),
+asus_match, asus_attach, asus_detach, NULL);
 
 static const char * const asus_ids[] = {
 	ASUS010,
@@ -102,7 +123,7 @@
 static void
 asus_attach(device_t parent, device_t self, void *opaque)
 {
-	asus_softc_t *sc = device_private(self);
+	struct asus_softc *sc = device_private(self);
 	struct acpi_attach_args *aa = opaque;
 	ACPI_STATUS rv;
 
@@ -124,6 +145,27 @@
 		sc-sc_smpsw_valid = false;
 	}
 
+	if (asus_get_fan_speed(sc, NULL) == false)
+		goto nosensors;
+
+	sc-sc_sme = sysmon_envsys_create();
+
+	strcpy(sc-sc_sensor[ASUS_SENSOR_FAN].desc, fan);
+	sc-sc_sensor[ASUS_SENSOR_FAN].units = ENVSYS_SFANRPM;
+	sysmon_envsys_sensor_attach(sc-sc_sme,
+	sc-sc_sensor[ASUS_SENSOR_FAN]);
+
+	sc-sc_sme-sme_name = device_xname(self);
+	sc-sc_sme-sme_cookie = sc;
+	sc-sc_sme-sme_refresh = asus_sensors_refresh;
+
+	if (sysmon_envsys_register(sc-sc_sme)) {
+		aprint_error_dev(self, couldn't register with envsys\n);
+		sysmon_envsys_destroy(sc-sc_sme);
+		sc-sc_sme = NULL;
+	}
+nosensors:
+
 	rv = AcpiInstallNotifyHandler(sc-sc_node-ad_handle, ACPI_ALL_NOTIFY,
 	asus_notify_handler, sc);
 	if (ACPI_FAILURE(rv))
@@ -134,10 +176,29 @@
 		aprint_error_dev(self, couldn't establish power handler\n);
 }
 
+static int
+asus_detach(device_t self, int flags)
+{
+	struct asus_softc *sc = device_private(self);
+	int i;
+
+	if (sc-sc_smpsw_valid)
+		for (i = 0; i  ASUS_PSW_LAST; i++)
+			sysmon_pswitch_unregister(sc-sc_smpsw[i]);
+
+	if (sc-sc_sme)
+		sysmon_envsys_unregister(sc-sc_sme);
+	if (sc-sc_log)
+		sysctl_teardown(sc-sc_log);
+

CVS commit: [netbsd-5] src/sys/dev/acpi

2009-08-29 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Aug 30 03:02:32 UTC 2009

Modified Files:
src/sys/dev/acpi [netbsd-5]: asus_acpi.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #891):
sys/dev/acpi/asus_acpi.c: revision 1.8
add missing return, silences 'failed to add sysctl nodes. (0)' message when
setup was successful


To generate a diff of this commit:
cvs rdiff -u -r1.6.4.1 -r1.6.4.2 src/sys/dev/acpi/asus_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/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.6.4.1 src/sys/dev/acpi/asus_acpi.c:1.6.4.2
--- src/sys/dev/acpi/asus_acpi.c:1.6.4.1	Sun Aug 30 03:01:26 2009
+++ src/sys/dev/acpi/asus_acpi.c	Sun Aug 30 03:02:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: asus_acpi.c,v 1.6.4.1 2009/08/30 03:01:26 snj Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.6.4.2 2009/08/30 03:02:32 snj Exp $ */
 
 /*-
  * Copyright (c) 2007, 2008, 2009 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: asus_acpi.c,v 1.6.4.1 2009/08/30 03:01:26 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: asus_acpi.c,v 1.6.4.2 2009/08/30 03:02:32 snj Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -391,6 +391,7 @@
 		goto sysctl_err;
 	sc-sc_cfv_mib = node_cfv-sysctl_num;
 
+	return;
 sysctl_err:
 	aprint_error_dev(sc-sc_dev, failed to add sysctl nodes. (%d)\n, err);
 }

CVS commit: [netbsd-5] src/sys/dev/acpi

2009-08-29 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Aug 30 03:03:33 UTC 2009

Modified Files:
src/sys/dev/acpi [netbsd-5]: asus_acpi.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #891):
sys/dev/acpi/asus_acpi.c: revision 1.9
don't call asus_sysctl_setup from asus_init because that is called from
the resume handler, instead call it directly from asus_attach


To generate a diff of this commit:
cvs rdiff -u -r1.6.4.2 -r1.6.4.3 src/sys/dev/acpi/asus_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/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.6.4.2 src/sys/dev/acpi/asus_acpi.c:1.6.4.3
--- src/sys/dev/acpi/asus_acpi.c:1.6.4.2	Sun Aug 30 03:02:32 2009
+++ src/sys/dev/acpi/asus_acpi.c	Sun Aug 30 03:03:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: asus_acpi.c,v 1.6.4.2 2009/08/30 03:02:32 snj Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.6.4.3 2009/08/30 03:03:33 snj Exp $ */
 
 /*-
  * Copyright (c) 2007, 2008, 2009 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: asus_acpi.c,v 1.6.4.2 2009/08/30 03:02:32 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: asus_acpi.c,v 1.6.4.3 2009/08/30 03:03:33 snj Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -134,6 +134,7 @@
 	aprint_normal(\n);
 
 	asus_init(self);
+	asus_sysctl_setup(sc);
 
 	sc-sc_smpsw_valid = true;
 	sc-sc_smpsw[ASUS_PSW_DISPLAY_CYCLE].smpsw_name =
@@ -263,8 +264,6 @@
 		return;
 
 	sc-sc_cfvnum = (cfv  8)  0xff;
-
-	asus_sysctl_setup(sc);
 }
 
 static bool

CVS commit: [netbsd-5] src/sys/dev/acpi

2009-08-29 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Sun Aug 30 03:05:19 UTC 2009

Modified Files:
src/sys/dev/acpi [netbsd-5]: asus_acpi.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #891):
sys/dev/acpi/asus_acpi.c: revision 1.10
Reading the fan speed is expensive, so set the undocumented SME_POLL_ONLY
flag on this sensor to ensure that the data is only refreshed on demand.


To generate a diff of this commit:
cvs rdiff -u -r1.6.4.3 -r1.6.4.4 src/sys/dev/acpi/asus_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/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.6.4.3 src/sys/dev/acpi/asus_acpi.c:1.6.4.4
--- src/sys/dev/acpi/asus_acpi.c:1.6.4.3	Sun Aug 30 03:03:33 2009
+++ src/sys/dev/acpi/asus_acpi.c	Sun Aug 30 03:05:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: asus_acpi.c,v 1.6.4.3 2009/08/30 03:03:33 snj Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.6.4.4 2009/08/30 03:05:19 snj Exp $ */
 
 /*-
  * Copyright (c) 2007, 2008, 2009 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: asus_acpi.c,v 1.6.4.3 2009/08/30 03:03:33 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: asus_acpi.c,v 1.6.4.4 2009/08/30 03:05:19 snj Exp $);
 
 #include sys/types.h
 #include sys/param.h
@@ -159,6 +159,7 @@
 	sc-sc_sme-sme_name = device_xname(self);
 	sc-sc_sme-sme_cookie = sc;
 	sc-sc_sme-sme_refresh = asus_sensors_refresh;
+	sc-sc_sme-sme_flags = SME_POLL_ONLY;
 
 	if (sysmon_envsys_register(sc-sc_sme)) {
 		aprint_error_dev(self, couldn't register with envsys\n);

CVS commit: [netbsd-5] src/sys/dev/acpi

2009-04-30 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Fri May  1 01:38:17 UTC 2009

Modified Files:
src/sys/dev/acpi [netbsd-5]: acpi_ec.c acpi_resource.c atppc_acpi.c
attimer_acpi.c com_acpi.c fdc_acpi.c hpet_acpi.c joy_acpi.c
lpt_acpi.c mpu_acpi.c pckbc_acpi.c pcppi_acpi.c ug_acpi.c
wss_acpi.c ym_acpi.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #498):
sys/dev/acpi/acpi_ec.c: revision 1.53
sys/dev/acpi/acpi_resource.c: revision 1.27
sys/dev/acpi/atppc_acpi.c: revision 1.16
sys/dev/acpi/attimer_acpi.c: revision 1.12
sys/dev/acpi/com_acpi.c: revision 1.28
sys/dev/acpi/fdc_acpi.c: revision 1.35
sys/dev/acpi/hpet_acpi.c: revision 1.4
sys/dev/acpi/joy_acpi.c: revision 1.9
sys/dev/acpi/lpt_acpi.c: revision 1.18
sys/dev/acpi/mpu_acpi.c: revision 1.9
sys/dev/acpi/pckbc_acpi.c: revision 1.31
sys/dev/acpi/pcppi_acpi.c: revision 1.11
sys/dev/acpi/ug_acpi.c: revision 1.5
sys/dev/acpi/wss_acpi.c: revision 1.20
sys/dev/acpi/ym_acpi.c: revision 1.6
Cut the amount of spam from acpi devices in roughly half by printing
resources on the same line as autoconf messages. Things like:
  pcppi1 at acpi0 (SPKR, PNP0800)
  pcppi1: io 0x61
become:
  pcppi1 at acpi0 (SPKR, PNP0800): io 0x61


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/dev/acpi/acpi_ec.c
cvs rdiff -u -r1.26 -r1.26.14.1 src/sys/dev/acpi/acpi_resource.c
cvs rdiff -u -r1.14.10.1 -r1.14.10.2 src/sys/dev/acpi/atppc_acpi.c
cvs rdiff -u -r1.11 -r1.11.10.1 src/sys/dev/acpi/attimer_acpi.c
cvs rdiff -u -r1.27 -r1.27.14.1 src/sys/dev/acpi/com_acpi.c
cvs rdiff -u -r1.34 -r1.34.14.1 src/sys/dev/acpi/fdc_acpi.c
cvs rdiff -u -r1.3 -r1.3.14.1 src/sys/dev/acpi/hpet_acpi.c
cvs rdiff -u -r1.8 -r1.8.14.1 src/sys/dev/acpi/joy_acpi.c \
src/sys/dev/acpi/mpu_acpi.c
cvs rdiff -u -r1.17 -r1.17.8.1 src/sys/dev/acpi/lpt_acpi.c
cvs rdiff -u -r1.30 -r1.30.4.1 src/sys/dev/acpi/pckbc_acpi.c
cvs rdiff -u -r1.10 -r1.10.14.1 src/sys/dev/acpi/pcppi_acpi.c
cvs rdiff -u -r1.4 -r1.4.14.1 src/sys/dev/acpi/ug_acpi.c
cvs rdiff -u -r1.19 -r1.19.14.1 src/sys/dev/acpi/wss_acpi.c
cvs rdiff -u -r1.5 -r1.5.14.1 src/sys/dev/acpi/ym_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/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.52 src/sys/dev/acpi/acpi_ec.c:1.52.8.1
--- src/sys/dev/acpi/acpi_ec.c:1.52	Tue Jun  3 15:12:39 2008
+++ src/sys/dev/acpi/acpi_ec.c	Fri May  1 01:38:16 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_ec.c,v 1.52 2008/06/03 15:12:39 joerg Exp $	*/
+/*	$NetBSD: acpi_ec.c,v 1.52.8.1 2009/05/01 01:38:16 snj Exp $	*/
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger jo...@netbsd.org.
@@ -59,7 +59,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.52 2008/06/03 15:12:39 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.52.8.1 2009/05/01 01:38:16 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -228,7 +228,7 @@
 	if (!acpiecdt_find(parent, ec_handle, cmd_reg, data_reg, gpebit))
 		panic(ECDT disappeared);
 
-	aprint_naive(: ACPI Embedded Controller via ECDT\n);
+	aprint_naive(\n);
 	aprint_normal(: ACPI Embedded Controller via ECDT\n);
 
 	acpiec_common_attach(parent, self, ec_handle, cmd_reg, data_reg,
@@ -257,16 +257,13 @@
 	ACPI_STATUS rv;
 
 	if (ec_singleton != NULL) {
-		aprint_naive(: ACPI Embedded Controller (disabled)\n);
+		aprint_naive(: (disabled)\n);
 		aprint_normal(: ACPI Embedded Controller (disabled)\n);
 		if (!pmf_device_register(self, NULL, NULL))
 			aprint_error_dev(self, couldn't establish power handler\n);
 		return;
 	}
 
-	aprint_naive(: ACPI Embedded Controller\n);
-	aprint_normal(: ACPI Embedded Controller\n);
-
 	if (!acpiec_parse_gpe_package(self, aa-aa_node-ad_handle,
   gpe_handle, gpebit))
 		return;

Index: src/sys/dev/acpi/acpi_resource.c
diff -u src/sys/dev/acpi/acpi_resource.c:1.26 src/sys/dev/acpi/acpi_resource.c:1.26.14.1
--- src/sys/dev/acpi/acpi_resource.c:1.26	Mon Apr  7 10:16:59 2008
+++ src/sys/dev/acpi/acpi_resource.c	Fri May  1 01:38:16 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_resource.c,v 1.26 2008/04/07 10:16:59 jmcneill Exp $	*/
+/*	$NetBSD: acpi_resource.c,v 1.26.14.1 2009/05/01 01:38:16 snj Exp $	*/
 
 /*
  * Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_resource.c,v 1.26 2008/04/07 10:16:59 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_resource.c,v 1.26.14.1 2009/05/01 01:38:16 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -381,7 +381,7 @@
 	SIMPLEQ_EMPTY(res-ar_drq))
 		return;
 
-	aprint_normal(%s:, device_xname(dev));
+	aprint_normal(:);
 
 	if (SIMPLEQ_EMPTY(res-ar_io) == 0) {
 		struct acpi_io *ar;
@@ -438,6 +438,7 @@
 	}
 
 	aprint_normal(\n);
+	aprint_naive(\n);
 }
 
 /*

CVS commit: [netbsd-5] src/sys/dev/acpi

2009-04-30 Thread Soren Jacobsen 
Module Name:src
Committed By:   snj
Date:   Fri May  1 01:42:33 UTC 2009

Modified Files:
src/sys/dev/acpi [netbsd-5]: acpi_ec.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #535):
sys/dev/acpi/acpi_ec.c: revision 1.54
Change a confusing attach message; if the embedded controller was attached
via ECDT, we would print:
  acpiec0 at acpi0 (EC, PHP0C09-0): ACPI Embedded Controller (disabled)
The embedded controller isn't actually disabled, but instead this driver
instance, so change the message to read:
  acpiec0 at acpi0 (EC, PHP0C09-0): using acpiecdt0


To generate a diff of this commit:
cvs rdiff -u -r1.52.8.1 -r1.52.8.2 src/sys/dev/acpi/acpi_ec.c

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

Modified files:

Index: src/sys/dev/acpi/acpi_ec.c
diff -u src/sys/dev/acpi/acpi_ec.c:1.52.8.1 src/sys/dev/acpi/acpi_ec.c:1.52.8.2
--- src/sys/dev/acpi/acpi_ec.c:1.52.8.1	Fri May  1 01:38:16 2009
+++ src/sys/dev/acpi/acpi_ec.c	Fri May  1 01:42:33 2009
@@ -1,4 +1,4 @@
-/*	$NetBSD: acpi_ec.c,v 1.52.8.1 2009/05/01 01:38:16 snj Exp $	*/
+/*	$NetBSD: acpi_ec.c,v 1.52.8.2 2009/05/01 01:42:33 snj Exp $	*/
 
 /*-
  * Copyright (c) 2007 Joerg Sonnenberger jo...@netbsd.org.
@@ -59,7 +59,7 @@
  */
 
 #include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.52.8.1 2009/05/01 01:38:16 snj Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_ec.c,v 1.52.8.2 2009/05/01 01:42:33 snj Exp $);
 
 #include sys/param.h
 #include sys/systm.h
@@ -257,8 +257,8 @@
 	ACPI_STATUS rv;
 
 	if (ec_singleton != NULL) {
-		aprint_naive(: (disabled)\n);
-		aprint_normal(: ACPI Embedded Controller (disabled)\n);
+		aprint_naive(: using %s\n, device_xname(ec_singleton));
+		aprint_normal(: using %s\n, device_xname(ec_singleton));
 		if (!pmf_device_register(self, NULL, NULL))
 			aprint_error_dev(self, couldn't establish power handler\n);
 		return;