CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Fri Mar 5 08:30:48 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_ecvar.h acpi_madt.h acpi_osd.h acpi_pci.h acpi_slit.h acpi_srat.h acpi_timer.h acpi_wakedev.h acpica.h acpireg.h acpivar.h fdc_acpireg.h wmi_acpivar.h Log Message: Protect all header files against multiple inclusions. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/acpi_ecvar.h \ src/sys/dev/acpi/acpi_wakedev.h src/sys/dev/acpi/fdc_acpireg.h cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/acpi_madt.h cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_osd.h \ src/sys/dev/acpi/acpi_pci.h src/sys/dev/acpi/acpi_slit.h \ src/sys/dev/acpi/acpi_srat.h src/sys/dev/acpi/acpi_timer.h cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpica.h cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/acpireg.h \ src/sys/dev/acpi/wmi_acpivar.h cvs rdiff -u -r1.40 -r1.41 src/sys/dev/acpi/acpivar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Fri Mar 5 08:30:48 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_ecvar.h acpi_madt.h acpi_osd.h acpi_pci.h
acpi_slit.h acpi_srat.h acpi_timer.h acpi_wakedev.h acpica.h
acpireg.h acpivar.h fdc_acpireg.h wmi_acpivar.h
Log Message:
Protect all header files against multiple inclusions.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/acpi_ecvar.h \
src/sys/dev/acpi/acpi_wakedev.h src/sys/dev/acpi/fdc_acpireg.h
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/acpi_madt.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_osd.h \
src/sys/dev/acpi/acpi_pci.h src/sys/dev/acpi/acpi_slit.h \
src/sys/dev/acpi/acpi_srat.h src/sys/dev/acpi/acpi_timer.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpica.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/acpireg.h \
src/sys/dev/acpi/wmi_acpivar.h
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/acpi/acpivar.h
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_ecvar.h
diff -u src/sys/dev/acpi/acpi_ecvar.h:1.1 src/sys/dev/acpi/acpi_ecvar.h:1.2
--- src/sys/dev/acpi/acpi_ecvar.h:1.1 Fri Dec 21 21:22:54 2007
+++ src/sys/dev/acpi/acpi_ecvar.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_ecvar.h,v 1.1 2007/12/21 21:22:54 jmcneill Exp $ */
+/* $NetBSD: acpi_ecvar.h,v 1.2 2010/03/05 08:30:48 jruoho Exp $ */
/*-
* Copyright (c) 2007 Joerg Sonnenberger jo...@netbsd.org.
@@ -29,11 +29,11 @@
* SUCH DAMAGE.
*/
-#ifndef _HAVE_DEV_ACPI_ACPI_ECVAR_H
-#define _HAVE_DEV_ACPI_ACPI_ECVAR_H
+#ifndef _SYS_DEV_ACPI_ACPI_ECVAR_H
+#define _SYS_DEV_ACPI_ACPI_ECVAR_H
ACPI_STATUS acpiec_bus_read(device_t, u_int, ACPI_INTEGER *, int);
ACPI_STATUS acpiec_bus_write(device_t, u_int, ACPI_INTEGER, int);
ACPI_HANDLE acpiec_get_handle(device_t);
-#endif /* !_HAVE_DEV_ACPI_ACPI_ECVAR_H */
+#endif /* !_SYS_DEV_ACPI_ACPI_ECVAR_H */
Index: src/sys/dev/acpi/acpi_wakedev.h
diff -u src/sys/dev/acpi/acpi_wakedev.h:1.1 src/sys/dev/acpi/acpi_wakedev.h:1.2
--- src/sys/dev/acpi/acpi_wakedev.h:1.1 Tue Aug 4 14:20:40 2009
+++ src/sys/dev/acpi/acpi_wakedev.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.h,v 1.1 2009/08/04 14:20:40 jmcneill Exp $ */
+/* $NetBSD: acpi_wakedev.h,v 1.2 2010/03/05 08:30:48 jruoho Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca
@@ -32,4 +32,4 @@
int acpi_wakedev_scan(struct acpi_softc *);
void acpi_wakedev_commit(struct acpi_softc *);
-#endif /* !_SYS_DEV_ACPI_ACPI_WAKEDEV_H */
+#endif /* !_SYS_DEV_ACPI_ACPI_WAKEDEV_H */
Index: src/sys/dev/acpi/fdc_acpireg.h
diff -u src/sys/dev/acpi/fdc_acpireg.h:1.1 src/sys/dev/acpi/fdc_acpireg.h:1.2
--- src/sys/dev/acpi/fdc_acpireg.h:1.1 Thu Jan 9 00:22:39 2003
+++ src/sys/dev/acpi/fdc_acpireg.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fdc_acpireg.h,v 1.1 2003/01/09 00:22:39 jmcneill Exp $ */
+/* $NetBSD: fdc_acpireg.h,v 1.2 2010/03/05 08:30:48 jruoho Exp $ */
/*
* Copyright (c) 2003 Jared D. McNeill jmcne...@invisible.ca
@@ -25,6 +25,9 @@
* SUCH DAMAGE.
*/
+#ifndef _SYS_DEV_ACPI_FDC_ACPIREG_H
+#define _SYS_DEV_ACPI_FDC_ACPIREG_H
+
/*
* The ACPI floppy disk interface is similar to the i386 BIOS. Definitions
* from arch/i386/isa/nvram.h
@@ -54,3 +57,5 @@
{ 9, 2, 18, 2, 0xff, 0xdf, 0x2a, 0x50, 40, 720, 2, FDC_250KBPS,
0xf6, 1, 360KB/x }, /* 320KB in 720KB drive */
};
+
+#endif /* !_SYS_DEV_ACPI_FDC_ACPIREG_H */
Index: src/sys/dev/acpi/acpi_madt.h
diff -u src/sys/dev/acpi/acpi_madt.h:1.7 src/sys/dev/acpi/acpi_madt.h:1.8
--- src/sys/dev/acpi/acpi_madt.h:1.7 Sun Dec 9 20:27:53 2007
+++ src/sys/dev/acpi/acpi_madt.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_madt.h,v 1.7 2007/12/09 20:27:53 jmcneill Exp $ */
+/* $NetBSD: acpi_madt.h,v 1.8 2010/03/05 08:30:48 jruoho Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -35,6 +35,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _SYS_DEV_ACPI_ACPI_MADT_H
+#define _SYS_DEV_ACPI_ACPI_MADT_H
+
#define ACPI_PLATFORM_INT_PMI 1
#define ACPI_PLATFORM_INT_INIT 2
#define ACPI_PLATFORM_INT_CERR 3
@@ -42,3 +45,5 @@
ACPI_STATUS acpi_madt_map(void);
void acpi_madt_unmap(void);
void acpi_madt_walk(ACPI_STATUS (*)(ACPI_SUBTABLE_HEADER *, void *), void *);
+
+#endif /* !_SYS_DEV_ACPI_ACPI_MADT_H */
Index: src/sys/dev/acpi/acpi_osd.h
diff -u src/sys/dev/acpi/acpi_osd.h:1.2 src/sys/dev/acpi/acpi_osd.h:1.3
--- src/sys/dev/acpi/acpi_osd.h:1.2 Sun Aug 23 15:16:16 2009
+++ src/sys/dev/acpi/acpi_osd.h Fri Mar 5 08:30:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_osd.h,v 1.2 2009/08/23 15:16:16 jmcneill Exp $ */
+/* $NetBSD: acpi_osd.h,v 1.3 2010/03/05 08:30:48 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -35,6 +35,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _SYS_DEV_ACPI_ACPI_OSD_H
+#define _SYS_DEV_ACPI_ACPI_OSD_H
+
/*
* Operating
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Fri Mar 5 09:00:26 UTC 2010 Modified Files: src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c Log Message: regen (for lfs syscalls #ifdef removal). To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.40 -r1.41 src/sys/rump/librump/rumpkern/rump_syscalls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Mar 5 09:00:26 UTC 2010
Modified Files:
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
Log Message:
regen (for lfs syscalls #ifdef removal).
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.40 -r1.41 src/sys/rump/librump/rumpkern/rump_syscalls.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/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.19 src/sys/rump/include/rump/rump_syscalls.h:1.20
--- src/sys/rump/include/rump/rump_syscalls.h:1.19 Thu Nov 26 17:24:36 2009
+++ src/sys/rump/include/rump/rump_syscalls.h Fri Mar 5 09:00:26 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.19 2009/11/26 17:24:36 pooka Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.20 2010/03/05 09:00:26 pooka Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.231 2009/11/26 17:20:20 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.232 2010/03/02 19:34:26 pooka Exp
*/
#ifdef _RUMPKERNEL
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.40 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.41
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.40 Thu Nov 26 17:24:36 2009
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Fri Mar 5 09:00:26 2010
@@ -1,14 +1,14 @@
-/* $NetBSD: rump_syscalls.c,v 1.40 2009/11/26 17:24:36 pooka Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.41 2010/03/05 09:00:26 pooka Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.231 2009/11/26 17:20:20 pooka Exp
+ * created from NetBSD: syscalls.master,v 1.232 2010/03/02 19:34:26 pooka Exp
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.40 2009/11/26 17:24:36 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump_syscalls.c,v 1.41 2010/03/05 09:00:26 pooka Exp $);
#include sys/types.h
#include sys/param.h
@@ -2857,7 +2857,6 @@
(sy_call_t *)rump_enosys }, /* 182 = unrumped */
{ 0, 0, 0,
(sy_call_t *)rump_enosys }, /* 183 = unrumped */
-#if defined(LFS) || !defined(_KERNEL)
{ 0, 0, 0,
(sy_call_t *)rump_enosys }, /* 184 = unrumped */
{ 0, 0, 0,
@@ -2866,16 +2865,6 @@
(sy_call_t *)rump_enosys }, /* 186 = unrumped */
{ 0, 0, 0,
(sy_call_t *)rump_enosys }, /* 187 = unrumped */
-#else
- { 0, 0, 0,
- (sy_call_t *)rump_enosys }, /* 184 = excluded lfs_bmapv */
- { 0, 0, 0,
- (sy_call_t *)rump_enosys }, /* 185 = excluded lfs_markv */
- { 0, 0, 0,
- (sy_call_t *)rump_enosys }, /* 186 = excluded lfs_segclean */
- { 0, 0, 0,
- (sy_call_t *)rump_enosys }, /* 187 = excluded lfs_segwait */
-#endif
{ 0, 0, 0,
(sy_call_t *)rump_enosys }, /* 188 = unrumped */
{ 0, 0, 0,
@@ -3392,13 +3381,8 @@
(sy_call_t *)sys___utimes50 }, /* 420 = __utimes50 */
{ 0, 0, 0,
(sy_call_t *)rump_enosys }, /* 421 = unrumped */
-#if defined(LFS) || !defined(_KERNEL)
{ 0, 0, 0,
(sy_call_t *)rump_enosys }, /* 422 = unrumped */
-#else
- { 0, 0, 0,
- (sy_call_t *)rump_enosys }, /* 422 = excluded __lfs_segwait50 */
-#endif
{ ns(struct sys___futimes50_args), 0,
(sy_call_t *)sys___futimes50 }, /* 423 = __futimes50 */
{ ns(struct sys___lutimes50_args), 0,
CVS commit: src/sbin/modstat
Module Name:src Committed By: pooka Date: Fri Mar 5 10:27:16 UTC 2010 Modified Files: src/sbin/modstat: main.c Log Message: Use 8k buffer, since 4k is too short for the default list (might save one round of modctl()). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sbin/modstat/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/modstat
Module Name:src
Committed By: pooka
Date: Fri Mar 5 10:27:16 UTC 2010
Modified Files:
src/sbin/modstat: main.c
Log Message:
Use 8k buffer, since 4k is too short for the default list (might
save one round of modctl()).
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/modstat/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/modstat/main.c
diff -u src/sbin/modstat/main.c:1.8 src/sbin/modstat/main.c:1.9
--- src/sbin/modstat/main.c:1.8 Sat Oct 3 02:27:43 2009
+++ src/sbin/modstat/main.c Fri Mar 5 10:27:16 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.8 2009/10/03 02:27:43 elad Exp $ */
+/* $NetBSD: main.c,v 1.9 2010/03/05 10:27:16 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: main.c,v 1.8 2009/10/03 02:27:43 elad Exp $);
+__RCSID($NetBSD: main.c,v 1.9 2010/03/05 10:27:16 pooka Exp $);
#endif /* !lint */
#include sys/module.h
@@ -86,7 +86,7 @@
if (argc != 0)
usage();
- for (len = 4096;;) {
+ for (len = 8192;;) {
iov.iov_base = malloc(len);
iov.iov_len = len;
if (modctl(MODCTL_STAT, iov)) {
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: pgoyette Date: Fri Mar 5 12:44:16 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_tz.c Log Message: As pointed out by Rhialto, degrees Kelvin is redundant. So fix a couple of comments related to converstion between Kelvin and degC. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/dev/acpi/acpi_tz.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: pgoyette Date: Fri Mar 5 12:44:16 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_tz.c Log Message: As pointed out by Rhialto, degrees Kelvin is redundant. So fix a couple of comments related to converstion between Kelvin and degC. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/dev/acpi/acpi_tz.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_tz.c diff -u src/sys/dev/acpi/acpi_tz.c:1.59 src/sys/dev/acpi/acpi_tz.c:1.60 --- src/sys/dev/acpi/acpi_tz.c:1.59 Thu Feb 18 14:10:15 2010 +++ src/sys/dev/acpi/acpi_tz.c Fri Mar 5 12:44:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_tz.c,v 1.59 2010/02/18 14:10:15 pgoyette Exp $ */ +/* $NetBSD: acpi_tz.c,v 1.60 2010/03/05 12:44:16 pgoyette Exp $ */ /* * Copyright (c) 2003 Jared D. McNeill jmcne...@invisible.ca @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_tz.c,v 1.59 2010/02/18 14:10:15 pgoyette Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_tz.c,v 1.60 2010/03/05 12:44:16 pgoyette Exp $); #include sys/param.h #include sys/systm.h @@ -63,7 +63,7 @@ /* constants */ #define ATZ_TZP_RATE 300 /* default if no _TZP CM present (30 secs) */ #define ATZ_NLEVELS 10 /* number of cooling levels, from ACPI spec */ -#define ATZ_ZEROC 2732 /* 0C in tenths degrees Kelvin */ +#define ATZ_ZEROC 2732 /* 0C, measured in 0.1 Kelvin */ #define ATZ_TMP_INVALID 0x /* invalid temperature */ #define ATZ_ZONE_EXPIRE 9000 /* zone info refetch interval (15min) */ @@ -75,8 +75,8 @@ /* * ACPI Temperature Zone information. Note all temperatures are reported - * in tenths of degrees Kelvin, and that the ACPI specification assumes - * that K = C + 273.2 rather than the nominal 273.15 used by envsys(4). + * in 0.1 Kelvin, and that the ACPI specification assumes that + * K = C + 273.2 rather than the nominal 273.15 used by envsys(4). * So define an appropriate conversion. */
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Fri Mar 5 14:00:17 UTC 2010 Modified Files: src/sys/dev/acpi: acpi.c acpi_acad.c acpi_apm.c acpi_bat.c acpi_button.c acpi_ec.c acpi_lid.c acpi_madt.c acpi_pci.c acpi_pci_link.c acpi_powerres.c acpi_quirks.c acpi_resource.c acpi_slit.c acpi_srat.c acpi_timer.c acpi_tz.c acpi_wakedev.c aiboost.c asus_acpi.c atk0110.c atppc_acpi.c attimer_acpi.c com_acpi.c dalb_acpi.c fdc_acpi.c hpet_acpi.c hpqlb_acpi.c joy_acpi.c lpt_acpi.c mpu_acpi.c pckbc_acpi.c pcppi_acpi.c smbus_acpi.c sony_acpi.c spic_acpi.c thinkpad_acpi.c ug_acpi.c wb_acpi.c wmi_acpi.c wss_acpi.c ym_acpi.c Log Message: Remove dev/acpi/acpica.h from all files. It is included from dev/acpi/acpivar.h. Ditto for dev/sysmon/sysmonvar.h, sys/bus.h, dev/pci/pcivar.h, and dev/isa/isavar.h. Also nuke a lot of unused and invalid headers. Some of these are audibly provided by standard headers (namely sys/param.h and sys/device.h), some have nothing to do with ACPI devices (e.g. sys/syslog.h), and some are nonexistent local includes (e.g. mpu_ym.h). Moreoever, try to group the includes into their respective blocks. Tested with GENERIC and ALL (i386). No functional change. To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/dev/acpi/acpi.c cvs rdiff -u -r1.41 -r1.42 src/sys/dev/acpi/acpi_acad.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpi_apm.c \ src/sys/dev/acpi/acpi_timer.c src/sys/dev/acpi/sony_acpi.c \ src/sys/dev/acpi/wmi_acpi.c cvs rdiff -u -r1.83 -r1.84 src/sys/dev/acpi/acpi_bat.c cvs rdiff -u -r1.33 -r1.34 src/sys/dev/acpi/acpi_button.c cvs rdiff -u -r1.61 -r1.62 src/sys/dev/acpi/acpi_ec.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/acpi/acpi_lid.c cvs rdiff -u -r1.20 -r1.21 src/sys/dev/acpi/acpi_madt.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_pci.c \ src/sys/dev/acpi/acpi_slit.c src/sys/dev/acpi/acpi_srat.c \ src/sys/dev/acpi/acpi_wakedev.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/acpi_pci_link.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/acpi_powerres.c \ src/sys/dev/acpi/acpi_quirks.c src/sys/dev/acpi/ym_acpi.c cvs rdiff -u -r1.31 -r1.32 src/sys/dev/acpi/acpi_resource.c cvs rdiff -u -r1.60 -r1.61 src/sys/dev/acpi/acpi_tz.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/acpi/aiboost.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/acpi/asus_acpi.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/acpi/atk0110.c \ src/sys/dev/acpi/dalb_acpi.c src/sys/dev/acpi/smbus_acpi.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/acpi/atppc_acpi.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/attimer_acpi.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/acpi/com_acpi.c cvs rdiff -u -r1.37 -r1.38 src/sys/dev/acpi/fdc_acpi.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/hpet_acpi.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/hpqlb_acpi.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/joy_acpi.c \ src/sys/dev/acpi/mpu_acpi.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/lpt_acpi.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/acpi/pckbc_acpi.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/pcppi_acpi.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/spic_acpi.c \ src/sys/dev/acpi/ug_acpi.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/acpi/thinkpad_acpi.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/wb_acpi.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/acpi/wss_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Fri Mar 5 14:00:17 UTC 2010 Modified Files: src/sys/dev/acpi: acpi.c acpi_acad.c acpi_apm.c acpi_bat.c acpi_button.c acpi_ec.c acpi_lid.c acpi_madt.c acpi_pci.c acpi_pci_link.c acpi_powerres.c acpi_quirks.c acpi_resource.c acpi_slit.c acpi_srat.c acpi_timer.c acpi_tz.c acpi_wakedev.c aiboost.c asus_acpi.c atk0110.c atppc_acpi.c attimer_acpi.c com_acpi.c dalb_acpi.c fdc_acpi.c hpet_acpi.c hpqlb_acpi.c joy_acpi.c lpt_acpi.c mpu_acpi.c pckbc_acpi.c pcppi_acpi.c smbus_acpi.c sony_acpi.c spic_acpi.c thinkpad_acpi.c ug_acpi.c wb_acpi.c wmi_acpi.c wss_acpi.c ym_acpi.c Log Message: Remove dev/acpi/acpica.h from all files. It is included from dev/acpi/acpivar.h. Ditto for dev/sysmon/sysmonvar.h, sys/bus.h, dev/pci/pcivar.h, and dev/isa/isavar.h. Also nuke a lot of unused and invalid headers. Some of these are audibly provided by standard headers (namely sys/param.h and sys/device.h), some have nothing to do with ACPI devices (e.g. sys/syslog.h), and some are nonexistent local includes (e.g. mpu_ym.h). Moreoever, try to group the includes into their respective blocks. Tested with GENERIC and ALL (i386). No functional change. To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/dev/acpi/acpi.c cvs rdiff -u -r1.41 -r1.42 src/sys/dev/acpi/acpi_acad.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/acpi/acpi_apm.c \ src/sys/dev/acpi/acpi_timer.c src/sys/dev/acpi/sony_acpi.c \ src/sys/dev/acpi/wmi_acpi.c cvs rdiff -u -r1.83 -r1.84 src/sys/dev/acpi/acpi_bat.c cvs rdiff -u -r1.33 -r1.34 src/sys/dev/acpi/acpi_button.c cvs rdiff -u -r1.61 -r1.62 src/sys/dev/acpi/acpi_ec.c cvs rdiff -u -r1.35 -r1.36 src/sys/dev/acpi/acpi_lid.c cvs rdiff -u -r1.20 -r1.21 src/sys/dev/acpi/acpi_madt.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_pci.c \ src/sys/dev/acpi/acpi_slit.c src/sys/dev/acpi/acpi_srat.c \ src/sys/dev/acpi/acpi_wakedev.c cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/acpi_pci_link.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/acpi/acpi_powerres.c \ src/sys/dev/acpi/acpi_quirks.c src/sys/dev/acpi/ym_acpi.c cvs rdiff -u -r1.31 -r1.32 src/sys/dev/acpi/acpi_resource.c cvs rdiff -u -r1.60 -r1.61 src/sys/dev/acpi/acpi_tz.c cvs rdiff -u -r1.29 -r1.30 src/sys/dev/acpi/aiboost.c cvs rdiff -u -r1.17 -r1.18 src/sys/dev/acpi/asus_acpi.c cvs rdiff -u -r1.8 -r1.9 src/sys/dev/acpi/atk0110.c \ src/sys/dev/acpi/dalb_acpi.c src/sys/dev/acpi/smbus_acpi.c cvs rdiff -u -r1.16 -r1.17 src/sys/dev/acpi/atppc_acpi.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/attimer_acpi.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/acpi/com_acpi.c cvs rdiff -u -r1.37 -r1.38 src/sys/dev/acpi/fdc_acpi.c cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/hpet_acpi.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/acpi/hpqlb_acpi.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/acpi/joy_acpi.c \ src/sys/dev/acpi/mpu_acpi.c cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/lpt_acpi.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/acpi/pckbc_acpi.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/acpi/pcppi_acpi.c cvs rdiff -u -r1.5 -r1.6 src/sys/dev/acpi/spic_acpi.c \ src/sys/dev/acpi/ug_acpi.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/acpi/thinkpad_acpi.c cvs rdiff -u -r1.1 -r1.2 src/sys/dev/acpi/wb_acpi.c cvs rdiff -u -r1.25 -r1.26 src/sys/dev/acpi/wss_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.c diff -u src/sys/dev/acpi/acpi.c:1.154 src/sys/dev/acpi/acpi.c:1.155 --- src/sys/dev/acpi/acpi.c:1.154 Thu Mar 4 23:25:07 2010 +++ src/sys/dev/acpi/acpi.c Fri Mar 5 14:00:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi.c,v 1.154 2010/03/04 23:25:07 jruoho Exp $ */ +/* $NetBSD: acpi.c,v 1.155 2010/03/05 14:00:16 jruoho Exp $ */ /*- * Copyright (c) 2003, 2007 The NetBSD Foundation, Inc. @@ -70,27 +70,26 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.154 2010/03/04 23:25:07 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.155 2010/03/05 14:00:16 jruoho Exp $); #include opt_acpi.h #include opt_pcifixup.h #include sys/param.h -#include sys/systm.h #include sys/device.h +#include sys/kernel.h #include sys/malloc.h #include sys/mutex.h -#include sys/kernel.h -#include sys/proc.h #include sys/sysctl.h +#include sys/systm.h -#include dev/acpi/acpica.h #include dev/acpi/acpireg.h #include dev/acpi/acpivar.h #include dev/acpi/acpi_osd.h +#include dev/acpi/acpi_pci.h #include dev/acpi/acpi_timer.h #include dev/acpi/acpi_wakedev.h -#include dev/acpi/acpi_pci.h + #ifdef ACPIVERBOSE #include dev/acpi/acpidevs_data.h #endif Index: src/sys/dev/acpi/acpi_acad.c diff -u src/sys/dev/acpi/acpi_acad.c:1.41 src/sys/dev/acpi/acpi_acad.c:1.42 --- src/sys/dev/acpi/acpi_acad.c:1.41 Sun Feb 28 17:22:41 2010 +++ src/sys/dev/acpi/acpi_acad.c Fri Mar 5 14:00:16 2010 @@ -1,4 +1,4 @@ -/*
CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Fri Mar 5 16:30:05 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: keyring.c netpgp.c Log Message: clean up some lint that crept in. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 \ src/crypto/external/bsd/netpgp/dist/src/lib/keyring.c cvs rdiff -u -r1.41 -r1.42 \ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Fri Mar 5 17:04:26 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_timer.c acpi_timer.h Log Message: Add missing license. ok drochner@ To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/acpi_timer.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpi_timer.h 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_timer.c diff -u src/sys/dev/acpi/acpi_timer.c:1.15 src/sys/dev/acpi/acpi_timer.c:1.16 --- src/sys/dev/acpi/acpi_timer.c:1.15 Fri Mar 5 14:00:17 2010 +++ src/sys/dev/acpi/acpi_timer.c Fri Mar 5 17:04:26 2010 @@ -1,7 +1,33 @@ -/* $NetBSD: acpi_timer.c,v 1.15 2010/03/05 14:00:17 jruoho Exp $ */ +/* $NetBSD: acpi_timer.c,v 1.16 2010/03/05 17:04:26 jruoho Exp $ */ + +/*- + * Copyright (c) 2006 Matthias Drochner droch...@netbsd.org + * 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. + */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_timer.c,v 1.15 2010/03/05 14:00:17 jruoho Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_timer.c,v 1.16 2010/03/05 17:04:26 jruoho Exp $); #include sys/types.h #include sys/systm.h Index: src/sys/dev/acpi/acpi_timer.h diff -u src/sys/dev/acpi/acpi_timer.h:1.3 src/sys/dev/acpi/acpi_timer.h:1.4 --- src/sys/dev/acpi/acpi_timer.h:1.3 Fri Mar 5 08:30:48 2010 +++ src/sys/dev/acpi/acpi_timer.h Fri Mar 5 17:04:26 2010 @@ -1,4 +1,30 @@ -/* $NetBSD: acpi_timer.h,v 1.3 2010/03/05 08:30:48 jruoho Exp $ */ +/* $NetBSD: acpi_timer.h,v 1.4 2010/03/05 17:04:26 jruoho Exp $ */ + +/*- + * Copyright (c) 2006 Matthias Drochner droch...@netbsd.org + * 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. + */ #ifndef _SYS_DEV_ACPI_ACPI_TIMER_H #define _SYS_DEV_ACPI_ACPI_TIMER_H
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Fri Mar 5 17:04:26 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_timer.c acpi_timer.h Log Message: Add missing license. ok drochner@ To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/dev/acpi/acpi_timer.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpi_timer.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amigappc/amigappc
Module Name:src Committed By: phx Date: Fri Mar 5 17:55:42 UTC 2010 Modified Files: src/sys/arch/amigappc/amigappc: locore.S Log Message: Removed useless code. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amigappc/amigappc/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amigappc/amigappc
Module Name:src
Committed By: phx
Date: Fri Mar 5 17:56:46 UTC 2010
Modified Files:
src/sys/arch/amigappc/amigappc: machdep.c
Log Message:
A1200 (BPPC) BAT init.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amigappc/amigappc/machdep.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/arch/amigappc/amigappc/machdep.c
diff -u src/sys/arch/amigappc/amigappc/machdep.c:1.41 src/sys/arch/amigappc/amigappc/machdep.c:1.42
--- src/sys/arch/amigappc/amigappc/machdep.c:1.41 Fri Feb 5 12:05:25 2010
+++ src/sys/arch/amigappc/amigappc/machdep.c Fri Mar 5 17:56:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.41 2010/02/05 12:05:25 phx Exp $ */
+/* $NetBSD: machdep.c,v 1.42 2010/03/05 17:56:46 phx Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.41 2010/02/05 12:05:25 phx Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.42 2010/03/05 17:56:46 phx Exp $);
#include opt_ddb.h
#include opt_ipkdb.h
@@ -547,18 +547,30 @@
/*
* Initialize BAT tables.
+ * The CSPPC RAM (A3000/A4000) always starts at 0x0800 and is
+ * up to 128MB big.
+ * The BPPC RAM (A1200) can be up to 256MB and may start at nearly
+ * any address between 0x4000 and 0x8000 depending on which
+ * RAM module of which size was inserted into which bank:
+ * The RAM module in bank 1 is located from 0x?800 downwards.
+ * The RAM module in bank 2 is located from 0x?800 upwards.
+ * Whether '?' is 4, 5, 6 or 7 probably depends on the size.
+ * So we have to use the 'startkernel' symbol for BAT-mapping
+ * our RAM.
*/
- if (!is_a1200()) {
+ if (is_a1200()) {
+ amigappc_batinit(0x, BAT_BL_16M, BAT_I|BAT_G,
+ (startkernel 0xf000), BAT_BL_256M, 0,
+ 0xfff0, BAT_BL_512K, 0,
+ ~0);
+ } else {
/* A3000 or A4000 */
amigappc_batinit(0x, BAT_BL_16M, BAT_I|BAT_G,
- 0x0800, BAT_BL_128M, 0,
+ (startkernel 0xf800), BAT_BL_128M, 0,
0xfff0, BAT_BL_512K, 0,
0x4000, BAT_BL_256M, BAT_I|BAT_G,
~0);
}
- else {
- panic(A1200 BPPC batinit?);
- }
/*
* Set up trap vectors and interrupt handler
CVS commit: src/sys/arch/amigappc/amigappc
Module Name:src Committed By: phx Date: Fri Mar 5 17:56:46 UTC 2010 Modified Files: src/sys/arch/amigappc/amigappc: machdep.c Log Message: A1200 (BPPC) BAT init. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/sys/arch/amigappc/amigappc/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amigappc/conf
Module Name:src Committed By: phx Date: Fri Mar 5 17:58:15 UTC 2010 Modified Files: src/sys/arch/amigappc/conf: std.amigappc Log Message: Link the kernel with -q option to be able to relocate it with the boot loader. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amigappc/conf/std.amigappc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amigappc/conf/std.amigappc diff -u src/sys/arch/amigappc/conf/std.amigappc:1.7 src/sys/arch/amigappc/conf/std.amigappc:1.8 --- src/sys/arch/amigappc/conf/std.amigappc:1.7 Tue Jul 21 09:49:15 2009 +++ src/sys/arch/amigappc/conf/std.amigappc Fri Mar 5 17:58:15 2010 @@ -1,4 +1,4 @@ -# $NetBSD: std.amigappc,v 1.7 2009/07/21 09:49:15 phx Exp $ +# $NetBSD: std.amigappc,v 1.8 2010/03/05 17:58:15 phx Exp $ # # standard, required NetBSD/amigappc 'options' @@ -17,4 +17,6 @@ options MSGBUFADDR=0xfff7 options MSGBUFSIZE=0x1 +# The kernel has to be relocated by the boot loader makeoptions TEXTADDR=0x0800 +makeoptions EXTRA_LINKFLAGS=-q
CVS commit: src/sys/arch/amigappc/conf
Module Name:src Committed By: phx Date: Fri Mar 5 17:58:15 UTC 2010 Modified Files: src/sys/arch/amigappc/conf: std.amigappc Log Message: Link the kernel with -q option to be able to relocate it with the boot loader. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amigappc/conf/std.amigappc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: pooka Date: Fri Mar 5 18:35:02 UTC 2010 Modified Files: src/sys/kern: kern_module.c sys_module.c src/sys/sys: module.h Log Message: Move builtin modules to a list in init and load them from there instead of using linksets directly. This has two implications: 1) It is now possible to unload a builtin module provided it is not busy. This is useful e.g. to disable a kernel feature as an immediate workaround to a security problem. To re-initialize the module, modload -f name is required. 2) It is possible to use builtin modules which were linked at runtime with an external linker (dlopen + rump). To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/sys/kern/kern_module.c cvs rdiff -u -r1.10 -r1.11 src/sys/kern/sys_module.c cvs rdiff -u -r1.18 -r1.19 src/sys/sys/module.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Fri Mar 5 18:35:02 UTC 2010
Modified Files:
src/sys/kern: kern_module.c sys_module.c
src/sys/sys: module.h
Log Message:
Move builtin modules to a list in init and load them from there
instead of using linksets directly. This has two implications:
1) It is now possible to unload a builtin module provided it is
not busy. This is useful e.g. to disable a kernel feature as
an immediate workaround to a security problem. To re-initialize
the module, modload -f name is required.
2) It is possible to use builtin modules which were linked at
runtime with an external linker (dlopen + rump).
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/kern/kern_module.c
cvs rdiff -u -r1.10 -r1.11 src/sys/kern/sys_module.c
cvs rdiff -u -r1.18 -r1.19 src/sys/sys/module.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.58 src/sys/kern/kern_module.c:1.59
--- src/sys/kern/kern_module.c:1.58 Wed Mar 3 17:58:36 2010
+++ src/sys/kern/kern_module.c Fri Mar 5 18:35:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.58 2010/03/03 17:58:36 pooka Exp $ */
+/* $NetBSD: kern_module.c,v 1.59 2010/03/05 18:35:01 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.58 2010/03/03 17:58:36 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.59 2010/03/05 18:35:01 pooka Exp $);
#define _MODULE_INTERNAL
@@ -63,12 +63,15 @@
struct vm_map *module_map;
char module_base[MODULE_BASE_SIZE];
-struct modlist module_list = TAILQ_HEAD_INITIALIZER(module_list);
-struct modlist module_bootlist = TAILQ_HEAD_INITIALIZER(module_bootlist);
+struct modlistmodule_list = TAILQ_HEAD_INITIALIZER(module_list);
+struct modlistmodule_builtins = TAILQ_HEAD_INITIALIZER(module_builtins);
+static struct modlist module_bootlist = TAILQ_HEAD_INITIALIZER(module_bootlist);
+
static module_t *module_active;
static int module_verbose_on;
static int module_autoload_on = 1;
u_int module_count;
+u_int module_builtinlist;
kmutex_t module_lock;
u_int module_autotime = 10;
u_int module_gen = 1;
@@ -155,6 +158,141 @@
}
/*
+ * Add modules to the builtin list. This can done at boottime or
+ * at runtime if the module is linked into the kernel with an
+ * external linker. All or none of the input will be handled.
+ * Optionally, the modules can be initialized. If they are not
+ * initialized, module_init_class() or module_load() can be used
+ * later, but these are not guaranteed to give atomic results.
+ */
+int
+module_builtin_add(modinfo_t *const *mip, size_t nmodinfo, bool init)
+{
+ struct module **modp = NULL, *mod_iter;
+ int rv = 0, i, mipskip;
+
+ if (init) {
+ rv = kauth_authorize_system(kauth_cred_get(),
+ KAUTH_SYSTEM_MODULE, 0, (void *)(uintptr_t)MODCTL_LOAD,
+ (void *)(uintptr_t)1, NULL);
+ if (rv) {
+ return rv;
+ }
+ }
+
+ for (i = 0, mipskip = 0; i nmodinfo; i++) {
+ if (mip[i] == module_dummy) {
+ KASSERT(nmodinfo 0);
+ nmodinfo--;
+ }
+ }
+ if (nmodinfo == 0)
+ return 0;
+
+ modp = kmem_zalloc(sizeof(*modp) * nmodinfo, KM_SLEEP);
+ for (i = 0, mipskip = 0; i nmodinfo; i++) {
+ if (mip[i+mipskip] == module_dummy) {
+ mipskip++;
+ continue;
+ }
+ modp[i] = kmem_zalloc(sizeof(*modp[i]), KM_SLEEP);
+ modp[i]-mod_info = mip[i+mipskip];
+ modp[i]-mod_source = MODULE_SOURCE_KERNEL;
+ }
+ mutex_enter(module_lock);
+
+ /* do this in three stages for error recovery and atomicity */
+
+ /* first check for presence */
+ for (i = 0; i nmodinfo; i++) {
+ TAILQ_FOREACH(mod_iter, module_builtins, mod_chain) {
+ if (strcmp(mod_iter-mod_info-mi_name,
+ modp[i]-mod_info-mi_name) == 0)
+break;
+ }
+ if (mod_iter) {
+ rv = EEXIST;
+ goto out;
+ }
+
+ if (module_lookup(modp[i]-mod_info-mi_name) != NULL) {
+ rv = EEXIST;
+ goto out;
+ }
+ }
+
+ /* then add to list */
+ for (i = 0; i nmodinfo; i++) {
+ TAILQ_INSERT_TAIL(module_builtins, modp[i], mod_chain);
+ module_builtinlist++;
+ }
+
+ /* finally, init (if required) */
+ if (init) {
+ for (i = 0; i nmodinfo; i++) {
+ rv = module_do_builtin(modp[i]-mod_info-mi_name,NULL);
+ /* throw in the towel, recovery hard not worth it */
+ if (rv)
+panic(builtin module \%s\ init failed: %d,
+modp[i]-mod_info-mi_name, rv);
+ }
+ }
+
+ out:
+ mutex_exit(module_lock);
+ if (rv != 0) {
+ for (i = 0; i nmodinfo; i++) {
+ if (modp[i])
+kmem_free(modp[i], sizeof(*modp[i]));
+ }
+ }
+ kmem_free(modp, sizeof(*modp) * nmodinfo);
+ return rv;
+}
+
+/*
+ * Optionally fini and remove builtin module from the kernel.
+ * Note: the module will now be unreachable except via mi builtin_add.
+ */
+int
+module_builtin_remove(modinfo_t *mi, bool fini)
CVS commit: src/sys/arch/hp700/dev
Module Name:src Committed By: skrll Date: Fri Mar 5 18:41:29 UTC 2010 Modified Files: src/sys/arch/hp700/dev: com_ssio.c Log Message: Fix console attach. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hp700/dev/com_ssio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hp700/dev
Module Name:src
Committed By: skrll
Date: Fri Mar 5 18:41:29 UTC 2010
Modified Files:
src/sys/arch/hp700/dev: com_ssio.c
Log Message:
Fix console attach.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hp700/dev/com_ssio.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/arch/hp700/dev/com_ssio.c
diff -u src/sys/arch/hp700/dev/com_ssio.c:1.1 src/sys/arch/hp700/dev/com_ssio.c:1.2
--- src/sys/arch/hp700/dev/com_ssio.c:1.1 Thu May 28 08:41:29 2009
+++ src/sys/arch/hp700/dev/com_ssio.c Fri Mar 5 18:41:29 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: com_ssio.c,v 1.1 2009/05/28 08:41:29 skrll Exp $ */
+/* $NetBSD: com_ssio.c,v 1.2 2010/03/05 18:41:29 skrll Exp $ */
/* $OpenBSD: com_ssio.c,v 1.2 2007/06/24 16:28:39 kettenis Exp $ */
@@ -85,9 +85,10 @@
return;
}
+/* Test if this is the console. */
pagezero_cookie = hp700_pagezero_map();
if (PAGE0-mem_cons.pz_class == PCL_DUPLEX
- PAGE0-mem_cons.pz_hpa == (struct iomod *)iobase) {
+ PAGE0-mem_cons.pz_hpa == (struct iomod *)ioh) {
bus_space_unmap(iot, ioh, COM_NPORTS);
if (comcnattach(iot, iobase, B9600, COM_SSIO_FREQ,
COM_TYPE_NORMAL,
CVS commit: src/sys/rump/librump
Module Name:src Committed By: pooka Date: Fri Mar 5 18:41:46 UTC 2010 Modified Files: src/sys/rump/librump/rumpkern: rump.c rumpkern.ifspec src/sys/rump/librump/rumpvfs: rump_vfs.c Log Message: Use improved kernel module interfaces: instead of adding + loading modules in bootstrap, just add them. Load them later the same way as the kernel does: module_init_class(). Change the signature of rump_module_init() to take a vector instead of just one module. All modules in a DSO should be init'd at the same time because they might depend on each other, and code outside the rump kernel cannot know which way. (binary kernel modules are still loaded with rump_sys_modctl() the usual way). To generate a diff of this commit: cvs rdiff -u -r1.154 -r1.155 src/sys/rump/librump/rumpkern/rump.c cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpkern/rumpkern.ifspec cvs rdiff -u -r1.42 -r1.43 src/sys/rump/librump/rumpvfs/rump_vfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump/librump
Module Name:src
Committed By: pooka
Date: Fri Mar 5 18:41:46 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: rump.c rumpkern.ifspec
src/sys/rump/librump/rumpvfs: rump_vfs.c
Log Message:
Use improved kernel module interfaces: instead of adding + loading
modules in bootstrap, just add them. Load them later the same way
as the kernel does: module_init_class().
Change the signature of rump_module_init() to take a vector instead
of just one module. All modules in a DSO should be init'd at the
same time because they might depend on each other, and code outside
the rump kernel cannot know which way. (binary kernel modules are
still loaded with rump_sys_modctl() the usual way).
To generate a diff of this commit:
cvs rdiff -u -r1.154 -r1.155 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpkern/rumpkern.ifspec
cvs rdiff -u -r1.42 -r1.43 src/sys/rump/librump/rumpvfs/rump_vfs.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/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.154 src/sys/rump/librump/rumpkern/rump.c:1.155
--- src/sys/rump/librump/rumpkern/rump.c:1.154 Mon Mar 1 13:12:20 2010
+++ src/sys/rump/librump/rumpkern/rump.c Fri Mar 5 18:41:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.154 2010/03/01 13:12:20 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.155 2010/03/05 18:41:46 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.154 2010/03/01 13:12:20 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.155 2010/03/05 18:41:46 pooka Exp $);
#include sys/param.h
#include sys/atomic.h
@@ -145,6 +145,8 @@
rump_proc_vfs_init_fn rump_proc_vfs_init;
rump_proc_vfs_release_fn rump_proc_vfs_release;
+static void add_linkedin_modules(const struct modinfo *const *, size_t);
+
static void __noinline
messthestack(void)
{
@@ -284,6 +286,8 @@
devsw_init();
pipe_init();
+ rumpuser_dl_bootstrap(add_linkedin_modules, rump_kernelfsym_load);
+
/* these do nothing if not present */
rump_vfs_init();
rump_net_init();
@@ -299,7 +303,7 @@
sysctl_finalize();
- rumpuser_dl_bootstrap(rump_module_init, rump_kernelfsym_load);
+ module_init_class(MODULE_CLASS_ANY);
rumpuser_gethostname(hostname, MAXHOSTNAMELEN, error);
hostnamelen = strlen(hostname);
@@ -612,48 +616,37 @@
rumpuser_dl_component_init(type, rump_component_init_cb);
}
-#define ERROUT(err) do { rv = err; goto out; } while (/*CONSTCOND*/0)
+/*
+ * Initialize a module which has already been loaded and linked
+ * with dlopen(). This is fundamentally the same as a builtin module.
+ */
int
-rump_module_init(struct modinfo *mi, prop_dictionary_t props)
+rump_module_init(const struct modinfo * const *mip, size_t nmodinfo)
{
- struct module *mod;
- int rv;
- /* module_dummy */
- if (mi-mi_name == NULL)
- return EINVAL;
-
- mutex_enter(module_lock);
- if (module_lookup(mi-mi_name))
- ERROUT(EEXIST);
-
- if (!module_compatible(mi-mi_version, __NetBSD_Version__))
- ERROUT(EPROGMISMATCH);
-
- rv = mi-mi_modcmd(MODULE_CMD_INIT, props);
- if (rv == 0) {
- mod = kmem_zalloc(sizeof(*mod), KM_SLEEP);
- mod-mod_info = mi;
- module_enqueue(mod);
- if (mi-mi_class == MODULE_CLASS_SECMODEL)
- secmodel_register();
- }
-
- out:
- mutex_exit(module_lock);
- return rv;
+ return module_builtin_add(mip, nmodinfo, true);
}
+/*
+ * Finish module (flawless victory, fatality!).
+ */
int
-rump_module_fini(struct modinfo *mi)
+rump_module_fini(const struct modinfo *mi)
{
- int rv;
- rv = mi-mi_modcmd(MODULE_CMD_FINI, NULL);
- if (rv == 0 mi-mi_class == MODULE_CLASS_SECMODEL)
- secmodel_deregister();
+ return module_builtin_remove(mi, true);
+}
- return rv;
+/*
+ * Add loaded and linked module to the builtin list. It will
+ * later be initialized with module_init_class().
+ */
+
+static void
+add_linkedin_modules(const struct modinfo * const *mip, size_t nmodinfo)
+{
+
+ module_builtin_add(mip, nmodinfo, false);
}
int
Index: src/sys/rump/librump/rumpkern/rumpkern.ifspec
diff -u src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.3 src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.4
--- src/sys/rump/librump/rumpkern/rumpkern.ifspec:1.3 Thu Nov 26 09:20:07 2009
+++ src/sys/rump/librump/rumpkern/rumpkern.ifspec Fri Mar 5 18:41:46 2010
@@ -1,4 +1,4 @@
-; $NetBSD: rumpkern.ifspec,v 1.3 2009/11/26 09:20:07 pooka Exp $
+; $NetBSD: rumpkern.ifspec,v 1.4 2010/03/05 18:41:46 pooka Exp $
NAME|kern
PUBHDR|include/rump/rumpkern_if_pub.h
@@ -11,8 +11,8 @@
void |reboot |int
int |getversion |void
-int |module_init |struct modinfo *, prop_dictionary_t
-int |module_fini |struct modinfo *
+int |module_init |const struct modinfo * const *, size_t
+int |module_fini |const struct modinfo *
int |kernelfsym_load|void *, uint64_t, char *,
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Fri Mar 5 18:43:59 UTC 2010 Modified Files: src/sys/rump/include/rump: rumpkern_if_pub.h src/sys/rump/librump/rumpkern: rumpkern_if_priv.h rumpkern_if_wrappers.c Log Message: regen for rump_module interface change To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/rump/include/rump/rumpkern_if_pub.h cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h \ src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/rump
Module Name:src
Committed By: pooka
Date: Fri Mar 5 18:43:59 UTC 2010
Modified Files:
src/sys/rump/include/rump: rumpkern_if_pub.h
src/sys/rump/librump/rumpkern: rumpkern_if_priv.h
rumpkern_if_wrappers.c
Log Message:
regen for rump_module interface change
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/include/rump/rumpkern_if_pub.h
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h \
src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.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/rump/include/rump/rumpkern_if_pub.h
diff -u src/sys/rump/include/rump/rumpkern_if_pub.h:1.5 src/sys/rump/include/rump/rumpkern_if_pub.h:1.6
--- src/sys/rump/include/rump/rumpkern_if_pub.h:1.5 Thu Nov 26 09:21:16 2009
+++ src/sys/rump/include/rump/rumpkern_if_pub.h Fri Mar 5 18:43:58 2010
@@ -1,15 +1,15 @@
-/* $NetBSD: rumpkern_if_pub.h,v 1.5 2009/11/26 09:21:16 pooka Exp $ */
+/* $NetBSD: rumpkern_if_pub.h,v 1.6 2010/03/05 18:43:58 pooka Exp $ */
/*
* Automatically generated. DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.3 2009/11/26 09:20:07 pooka Exp
+ * from: NetBSD: rumpkern.ifspec,v 1.4 2010/03/05 18:41:46 pooka Exp
* by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp
*/
void rump_pub_reboot(int);
int rump_pub_getversion(void);
-int rump_pub_module_init(struct modinfo *, prop_dictionary_t);
-int rump_pub_module_fini(struct modinfo *);
+int rump_pub_module_init(const struct modinfo * const *, size_t);
+int rump_pub_module_fini(const struct modinfo *);
int rump_pub_kernelfsym_load(void *, uint64_t, char *, uint64_t);
struct uio * rump_pub_uio_setup(void *, size_t, off_t, enum rump_uiorw);
size_t rump_pub_uio_getresid(struct uio *);
Index: src/sys/rump/librump/rumpkern/rumpkern_if_priv.h
diff -u src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.5 src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.6
--- src/sys/rump/librump/rumpkern/rumpkern_if_priv.h:1.5 Thu Nov 26 09:21:16 2009
+++ src/sys/rump/librump/rumpkern/rumpkern_if_priv.h Fri Mar 5 18:43:59 2010
@@ -1,15 +1,15 @@
-/* $NetBSD: rumpkern_if_priv.h,v 1.5 2009/11/26 09:21:16 pooka Exp $ */
+/* $NetBSD: rumpkern_if_priv.h,v 1.6 2010/03/05 18:43:59 pooka Exp $ */
/*
* Automatically generated. DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.3 2009/11/26 09:20:07 pooka Exp
+ * from: NetBSD: rumpkern.ifspec,v 1.4 2010/03/05 18:41:46 pooka Exp
* by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp
*/
void rump_reboot(int);
int rump_getversion(void);
-int rump_module_init(struct modinfo *, prop_dictionary_t);
-int rump_module_fini(struct modinfo *);
+int rump_module_init(const struct modinfo * const *, size_t);
+int rump_module_fini(const struct modinfo *);
int rump_kernelfsym_load(void *, uint64_t, char *, uint64_t);
struct uio * rump_uio_setup(void *, size_t, off_t, enum rump_uiorw);
size_t rump_uio_getresid(struct uio *);
Index: src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c
diff -u src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.5 src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.6
--- src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c:1.5 Thu Nov 26 09:21:16 2009
+++ src/sys/rump/librump/rumpkern/rumpkern_if_wrappers.c Fri Mar 5 18:43:59 2010
@@ -1,8 +1,8 @@
-/* $NetBSD: rumpkern_if_wrappers.c,v 1.5 2009/11/26 09:21:16 pooka Exp $ */
+/* $NetBSD: rumpkern_if_wrappers.c,v 1.6 2010/03/05 18:43:59 pooka Exp $ */
/*
* Automatically generated. DO NOT EDIT.
- * from: NetBSD: rumpkern.ifspec,v 1.3 2009/11/26 09:20:07 pooka Exp
+ * from: NetBSD: rumpkern.ifspec,v 1.4 2010/03/05 18:41:46 pooka Exp
* by: NetBSD: makerumpif.sh,v 1.4 2009/10/15 00:29:19 pooka Exp
*/
@@ -45,7 +45,7 @@
}
int
-rump_pub_module_init(struct modinfo *arg1, prop_dictionary_t arg2)
+rump_pub_module_init(const struct modinfo * const *arg1, size_t arg2)
{
int rv;
@@ -57,7 +57,7 @@
}
int
-rump_pub_module_fini(struct modinfo *arg1)
+rump_pub_module_fini(const struct modinfo *arg1)
{
int rv;
CVS commit: src
Module Name:src
Committed By: pooka
Date: Fri Mar 5 18:47:50 UTC 2010
Modified Files:
src/lib/librumpuser: rumpuser_dl.c
src/sys/rump/include/rump: rumpuser.h
Log Message:
During bootstrap, process all modinfos in a DSO in one go. Get
rid of dependency tricks, since they are no longer necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/librumpuser/rumpuser_dl.c
cvs rdiff -u -r1.37 -r1.38 src/sys/rump/include/rump/rumpuser.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librumpuser/rumpuser_dl.c
diff -u src/lib/librumpuser/rumpuser_dl.c:1.2 src/lib/librumpuser/rumpuser_dl.c:1.3
--- src/lib/librumpuser/rumpuser_dl.c:1.2 Mon Mar 1 13:13:48 2010
+++ src/lib/librumpuser/rumpuser_dl.c Fri Mar 5 18:47:50 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser_dl.c,v 1.2 2010/03/01 13:13:48 pooka Exp $ */
+/* $NetBSD: rumpuser_dl.c,v 1.3 2010/03/05 18:47:50 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: rumpuser_dl.c,v 1.2 2010/03/01 13:13:48 pooka Exp $);
+__RCSID($NetBSD: rumpuser_dl.c,v 1.3 2010/03/05 18:47:50 pooka Exp $);
#include sys/types.h
#include sys/time.h
@@ -296,35 +296,30 @@
return 0;
}
-static int
+static void
process(const char *soname, rump_modinit_fn domodinit)
{
void *handle;
- struct modinfo **mi, **mi_end;
- int loaded = 0;
+ const struct modinfo *const *mi_start, *const *mi_end;
if (strstr(soname, librump) == NULL)
- return 0;
+ return;
handle = dlopen(soname, RTLD_LAZY);
if (handle == NULL)
- return 0;
+ return;
- mi = dlsym(handle, __start_link_set_modules);
- if (!mi)
+ mi_start = dlsym(handle, __start_link_set_modules);
+ if (!mi_start)
goto out;
mi_end = dlsym(handle, __stop_link_set_modules);
if (!mi_end)
goto out;
- for (; mi mi_end; mi++)
- if (domodinit(*mi, NULL) == 0)
- loaded = 1;
- assert(mi == mi_end);
+ domodinit(mi_start, (size_t)(mi_end-mi_start));
out:
dlclose(handle);
- return loaded;
}
/*
@@ -336,7 +331,6 @@
rump_symload_fn symload)
{
struct link_map *map, *origmap;
- int couldload;
int error;
if (dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, origmap) == -1) {
@@ -394,13 +388,8 @@
/*
* Next, load modules from dynlibs.
*/
- do {
- couldload = 0;
- map = origmap;
- for (; map; map = map-l_prev)
- if (process(map-l_name, domodinit))
-couldload = 1;
- } while (couldload);
+ for (map = origmap; map; map = map-l_prev)
+ process(map-l_name, domodinit);
}
void
Index: src/sys/rump/include/rump/rumpuser.h
diff -u src/sys/rump/include/rump/rumpuser.h:1.37 src/sys/rump/include/rump/rumpuser.h:1.38
--- src/sys/rump/include/rump/rumpuser.h:1.37 Mon Mar 1 13:12:20 2010
+++ src/sys/rump/include/rump/rumpuser.h Fri Mar 5 18:47:49 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.h,v 1.37 2010/03/01 13:12:20 pooka Exp $ */
+/* $NetBSD: rumpuser.h,v 1.38 2010/03/05 18:47:49 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -187,19 +187,9 @@
/* rumpuser dynloader */
-/* XXX: go _t, go */
-#ifdef __NetBSD__
-#include prop/proplib.h
-#else
-#ifndef HAVE_PROP_DICTIONARY_T
-#define HAVE_PROP_DICTIONARY_T
-typedef struct prop_dictionary *prop_dictionary_t;
-#endif
-#endif
-
struct modinfo;
struct rump_component;
-typedef int (*rump_modinit_fn)(struct modinfo *, prop_dictionary_t);
+typedef void (*rump_modinit_fn)(const struct modinfo *const *, size_t);
typedef int (*rump_symload_fn)(void *, uint64_t, char *, uint64_t);
typedef void (*rump_component_init_fn)(struct rump_component *, int);
void rumpuser_dl_bootstrap(rump_modinit_fn, rump_symload_fn);
CVS commit: src
Module Name:src Committed By: pooka Date: Fri Mar 5 18:47:50 UTC 2010 Modified Files: src/lib/librumpuser: rumpuser_dl.c src/sys/rump/include/rump: rumpuser.h Log Message: During bootstrap, process all modinfos in a DSO in one go. Get rid of dependency tricks, since they are no longer necessary. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/librumpuser/rumpuser_dl.c cvs rdiff -u -r1.37 -r1.38 src/sys/rump/include/rump/rumpuser.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/lib/libfsu_mount
Module Name:othersrc
Committed By: stacktic
Date: Fri Mar 5 19:37:42 UTC 2010
Modified Files:
othersrc/lib/libfsu_mount: fsu_mount.c
Log Message:
Set env vars before returning from fsu_mount
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 othersrc/lib/libfsu_mount/fsu_mount.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/lib/libfsu_mount/fsu_mount.c
diff -u othersrc/lib/libfsu_mount/fsu_mount.c:1.18 othersrc/lib/libfsu_mount/fsu_mount.c:1.19
--- othersrc/lib/libfsu_mount/fsu_mount.c:1.18 Sun Dec 13 20:57:25 2009
+++ othersrc/lib/libfsu_mount/fsu_mount.c Fri Mar 5 19:37:41 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fsu_mount.c,v 1.18 2009/12/13 20:57:25 pooka Exp $ */
+/* $NetBSD: fsu_mount.c,v 1.19 2010/03/05 19:37:41 stacktic Exp $ */
/*
* Copyright (c) 2008,2009 Arnaud Ysmal. All Rights Reserved.
@@ -119,16 +119,14 @@
#endif
alias = NULL;
- puffsexec = specopts = mntopts = NULL;
+ fsdevice = fstype = mntopts = puffsexec = specopts = NULL;
fst = NULL;
ukfs = NULL;
- fstype = fsdevice = NULL;
fflag = 0;
memset(mntd, 0, sizeof(mntd));
ukfs_init();
ukfs_modload_dir(RUMP_LIBDIR);
-
/*
* [-o mnt_args] [-t fstype] [-p puffsexec] fsdevice
*/
@@ -198,7 +196,7 @@
}
if (fstype == NULL)
- fstype = getenv(FSU_FSTYPE);
+ fstype = getenv(FSU_TYPE);
if (fstype != NULL fst == NULL) {
for (fst = fslist; fst-fs_name != NULL; ++fst)
@@ -243,6 +241,7 @@
}
free(mntd.mntd_argv);
+ mntd.mntd_argv = NULL;
mntd.mntd_argv_size = 0;
if (ukfs == NULL)
@@ -274,6 +273,9 @@
#ifndef __linux__
optreset = 1;
#endif
+ setenv(FSU_DEVICE, fsdevice, 1);
+ setenv(FSU_TYPE, mntd.mntd_fs-fs_name, 1);
+ setenv(FSU_CWD, path != NULL ? path : /, 1);
return ukfs;
}
CVS commit: othersrc/lib/libfsu_mount
Module Name:othersrc Committed By: stacktic Date: Fri Mar 5 19:37:42 UTC 2010 Modified Files: othersrc/lib/libfsu_mount: fsu_mount.c Log Message: Set env vars before returning from fsu_mount To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 othersrc/lib/libfsu_mount/fsu_mount.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: pooka Date: Fri Mar 5 19:53:37 UTC 2010 Modified Files: src/sbin/mount_nfs: Makefile src/usr.bin/nfsstat: Makefile Log Message: Remove no longer used -DNFS. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sbin/mount_nfs/Makefile cvs rdiff -u -r1.7 -r1.8 src/usr.bin/nfsstat/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: pooka
Date: Fri Mar 5 19:53:37 UTC 2010
Modified Files:
src/sbin/mount_nfs: Makefile
src/usr.bin/nfsstat: Makefile
Log Message:
Remove no longer used -DNFS.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sbin/mount_nfs/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/nfsstat/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/mount_nfs/Makefile
diff -u src/sbin/mount_nfs/Makefile:1.22 src/sbin/mount_nfs/Makefile:1.23
--- src/sbin/mount_nfs/Makefile:1.22 Thu Oct 16 09:12:54 2008
+++ src/sbin/mount_nfs/Makefile Fri Mar 5 19:53:37 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2008/10/16 09:12:54 pooka Exp $
+# $NetBSD: Makefile,v 1.23 2010/03/05 19:53:37 pooka Exp $
# @(#)Makefile 8.2 (Berkeley) 3/27/94
.include bsd.own.mk
@@ -24,8 +24,6 @@
CPPFLAGS+= -DNO_PMAP_CACHE
.endif
-CPPFLAGS+= -DNFS
-
.if (${USE_INET6} != no)
CPPFLAGS+= -DINET6
.endif
Index: src/usr.bin/nfsstat/Makefile
diff -u src/usr.bin/nfsstat/Makefile:1.7 src/usr.bin/nfsstat/Makefile:1.8
--- src/usr.bin/nfsstat/Makefile:1.7 Tue Jun 13 12:39:43 2000
+++ src/usr.bin/nfsstat/Makefile Fri Mar 5 19:53:37 2010
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2000/06/13 12:39:43 simonb Exp $
+# $NetBSD: Makefile,v 1.8 2010/03/05 19:53:37 pooka Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= nfsstat
-CPPFLAGS+=-DNFS
DPADD= ${LIBKVM}
LDADD= -lkvm
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Fri Mar 5 19:58:39 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist: TODO configure configure.ac src/crypto/external/bsd/netpgp/dist/src/lib: fastctype.h types.h version.h src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile verify.c Log Message: Changes to 1.99.21/20100305 + clean up some lint + the obligatory ''build on mac os x fixes'' - inttypes.h header file To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/netpgp/dist/TODO cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/netpgp/dist/configure cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/netpgp/dist/configure.ac cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/src/lib/fastctype.h cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/netpgp/dist/src/lib/types.h cvs rdiff -u -r1.27 -r1.28 \ src/crypto/external/bsd/netpgp/dist/src/lib/version.h cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/TODO diff -u src/crypto/external/bsd/netpgp/dist/TODO:1.32 src/crypto/external/bsd/netpgp/dist/TODO:1.33 --- src/crypto/external/bsd/netpgp/dist/TODO:1.32 Fri Mar 5 16:01:09 2010 +++ src/crypto/external/bsd/netpgp/dist/TODO Fri Mar 5 19:58:38 2010 @@ -3,10 +3,10 @@ agent agentctl trust subpackets +make netpgpkeys work - add, import, commit, update, sign, passphrase convert to and from ascii armored sigs gpgme compat lib --list-sigs - these come out in __ops_check_subkey_sig() -make netpgpkeys work - add, import, commit, update, sign, passphrase return userids from successful verify, and then print id out if required is get_passphrase_cb needed? error logging Index: src/crypto/external/bsd/netpgp/dist/configure diff -u src/crypto/external/bsd/netpgp/dist/configure:1.24 src/crypto/external/bsd/netpgp/dist/configure:1.25 --- src/crypto/external/bsd/netpgp/dist/configure:1.24 Fri Mar 5 16:01:09 2010 +++ src/crypto/external/bsd/netpgp/dist/configure Fri Mar 5 19:58:38 2010 @@ -1,7 +1,7 @@ #! /bin/sh -# From configure.ac Revision: 1.24 . +# From configure.ac Revision: 1.25 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for netpgp 20100304. +# Generated by GNU Autoconf 2.63 for netpgp 20100305. # # Report bugs to Alistair Crooks a...@netbsd.org c0596823. # @@ -751,8 +751,8 @@ # Identity of this package. PACKAGE_NAME='netpgp' PACKAGE_TARNAME='netpgp' -PACKAGE_VERSION='20100304' -PACKAGE_STRING='netpgp 20100304' +PACKAGE_VERSION='20100305' +PACKAGE_STRING='netpgp 20100305' PACKAGE_BUGREPORT='Alistair Crooks a...@netbsd.org c0596823' ac_unique_file=src/netpgp/netpgp.c @@ -1483,7 +1483,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat _ACEOF -\`configure' configures netpgp 20100304 to adapt to many kinds of systems. +\`configure' configures netpgp 20100305 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1553,7 +1553,7 @@ if test -n $ac_init_help; then case $ac_init_help in - short | recursive ) echo Configuration of netpgp 20100304:;; + short | recursive ) echo Configuration of netpgp 20100305:;; esac cat \_ACEOF @@ -1660,7 +1660,7 @@ test -n $ac_init_help exit $ac_status if $ac_init_version; then cat \_ACEOF -netpgp configure 20100304 +netpgp configure 20100305 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1674,7 +1674,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by netpgp $as_me 20100304, which was +It was created by netpgp $as_me 20100305, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2561,7 +2561,7 @@ # Define the identity of the package. PACKAGE='netpgp' - VERSION='20100304' + VERSION='20100305' cat confdefs.h _ACEOF @@ -22306,7 +22306,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log= -This file was extended by netpgp $as_me 20100304, which was +This file was extended by netpgp $as_me 20100305, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES= $CONFIG_FILES @@ -22369,7 +22369,7 @@ _ACEOF cat $CONFIG_STATUS _ACEOF || ac_write_fail=1 ac_cs_version=\\ -netpgp
CVS commit: src/crypto/external/bsd/netpgp/dist
Module Name:src Committed By: agc Date: Fri Mar 5 19:58:39 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist: TODO configure configure.ac src/crypto/external/bsd/netpgp/dist/src/lib: fastctype.h types.h version.h src/crypto/external/bsd/netpgp/dist/src/netpgp: Makefile src/crypto/external/bsd/netpgp/dist/src/netpgpverify: Makefile verify.c Log Message: Changes to 1.99.21/20100305 + clean up some lint + the obligatory ''build on mac os x fixes'' - inttypes.h header file To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/crypto/external/bsd/netpgp/dist/TODO cvs rdiff -u -r1.24 -r1.25 src/crypto/external/bsd/netpgp/dist/configure cvs rdiff -u -r1.25 -r1.26 src/crypto/external/bsd/netpgp/dist/configure.ac cvs rdiff -u -r1.2 -r1.3 \ src/crypto/external/bsd/netpgp/dist/src/lib/fastctype.h cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/netpgp/dist/src/lib/types.h cvs rdiff -u -r1.27 -r1.28 \ src/crypto/external/bsd/netpgp/dist/src/lib/version.h cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/netpgp/dist/src/netpgp/Makefile cvs rdiff -u -r1.8 -r1.9 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/Makefile cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/netpgp/dist/src/netpgpverify/verify.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Fri Mar 5 20:10:05 UTC 2010
Modified Files:
src/sys/kern: kern_module.c
src/sys/sys: module.h
Log Message:
Make module_{lookup,enqueue}() static now that it's possible again
(effectively reverts my kern_module rev. 1.53 from some months ago)
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/kern/kern_module.c
cvs rdiff -u -r1.19 -r1.20 src/sys/sys/module.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.59 src/sys/kern/kern_module.c:1.60
--- src/sys/kern/kern_module.c:1.59 Fri Mar 5 18:35:01 2010
+++ src/sys/kern/kern_module.c Fri Mar 5 20:10:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.59 2010/03/05 18:35:01 pooka Exp $ */
+/* $NetBSD: kern_module.c,v 1.60 2010/03/05 20:10:05 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.59 2010/03/05 18:35:01 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_module.c,v 1.60 2010/03/05 20:10:05 pooka Exp $);
#define _MODULE_INTERNAL
@@ -92,6 +92,9 @@
static int module_fetch_info(module_t *);
static void module_thread(void *);
+static module_t *module_lookup(const char *);
+static void module_enqueue(module_t *);
+
static bool module_merge_dicts(prop_dictionary_t, const prop_dictionary_t);
int module_eopnotsupp(void);
Index: src/sys/sys/module.h
diff -u src/sys/sys/module.h:1.19 src/sys/sys/module.h:1.20
--- src/sys/sys/module.h:1.19 Fri Mar 5 18:35:01 2010
+++ src/sys/sys/module.h Fri Mar 5 20:10:05 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: module.h,v 1.19 2010/03/05 18:35:01 pooka Exp $ */
+/* $NetBSD: module.h,v 1.20 2010/03/05 20:10:05 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -134,9 +134,6 @@
int module_find_section(const char *, void **, size_t *);
void module_thread_kick(void);
-void module_enqueue(module_t *);
-module_t * module_lookup(const char *);
-
void module_whatis(uintptr_t, void (*)(const char *, ...));
void module_print_list(void (*)(const char *, ...));
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Fri Mar 5 20:10:05 UTC 2010
Modified Files:
src/sys/kern: kern_module.c
src/sys/sys: module.h
Log Message:
Make module_{lookup,enqueue}() static now that it's possible again
(effectively reverts my kern_module rev. 1.53 from some months ago)
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/kern/kern_module.c
cvs rdiff -u -r1.19 -r1.20 src/sys/sys/module.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Fri Mar 5 21:01:44 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi.c acpi_lid.c acpi_wakedev.c acpi_wakedev.h
Log Message:
Preparing a device for wakeup involves:
(a) turning on all power resources required by the device; and
(b) executing _DSW (or _PSW) control method.
This implements (b). Ok jmcne...@.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/sys/dev/acpi/acpi.c
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/acpi/acpi_lid.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpi_wakedev.c
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_wakedev.h
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.155 src/sys/dev/acpi/acpi.c:1.156
--- src/sys/dev/acpi/acpi.c:1.155 Fri Mar 5 14:00:16 2010
+++ src/sys/dev/acpi/acpi.c Fri Mar 5 21:01:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi.c,v 1.155 2010/03/05 14:00:16 jruoho Exp $ */
+/* $NetBSD: acpi.c,v 1.156 2010/03/05 21:01:44 jruoho 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.155 2010/03/05 14:00:16 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi.c,v 1.156 2010/03/05 21:01:44 jruoho Exp $);
#include opt_acpi.h
#include opt_pcifixup.h
@@ -1519,7 +1519,7 @@
break;
}
- acpi_wakedev_commit(sc);
+ acpi_wakedev_commit(sc, state);
if (state != ACPI_STATE_S1 !pmf_system_suspend(PMF_Q_NONE)) {
aprint_error_dev(sc-sc_dev, aborting suspend\n);
Index: src/sys/dev/acpi/acpi_lid.c
diff -u src/sys/dev/acpi/acpi_lid.c:1.36 src/sys/dev/acpi/acpi_lid.c:1.37
--- src/sys/dev/acpi/acpi_lid.c:1.36 Fri Mar 5 14:00:16 2010
+++ src/sys/dev/acpi/acpi_lid.c Fri Mar 5 21:01:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_lid.c,v 1.36 2010/03/05 14:00:16 jruoho Exp $ */
+/* $NetBSD: acpi_lid.c,v 1.37 2010/03/05 21:01:44 jruoho Exp $ */
/*
* Copyright 2001, 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_lid.c,v 1.36 2010/03/05 14:00:16 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_lid.c,v 1.37 2010/03/05 21:01:44 jruoho Exp $);
#include sys/param.h
#include sys/device.h
@@ -69,8 +69,6 @@
static int acpilid_detach(device_t, int);
static void acpilid_status_changed(void *);
static void acpilid_notify_handler(ACPI_HANDLE, UINT32, void *);
-static void acpilid_wake_event(device_t, bool);
-static bool acpilid_suspend(device_t, const pmf_qual_t *);
CFATTACH_DECL_NEW(acpilid, sizeof(struct acpilid_softc),
acpilid_match, acpilid_attach, acpilid_detach, NULL);
@@ -111,8 +109,8 @@
sc-sc_smpsw.smpsw_name = device_xname(self);
sc-sc_smpsw.smpsw_type = PSWITCH_TYPE_LID;
+ (void)pmf_device_register(self, NULL, NULL);
(void)sysmon_pswitch_register(sc-sc_smpsw);
- (void)pmf_device_register(self, acpilid_suspend, NULL);
rv = AcpiInstallNotifyHandler(sc-sc_node-ad_handle,
ACPI_DEVICE_NOTIFY, acpilid_notify_handler, self);
@@ -139,47 +137,6 @@
return 0;
}
-static void
-acpilid_wake_event(device_t dv, bool enable)
-{
- struct acpilid_softc *sc = device_private(dv);
- ACPI_OBJECT_LIST arg;
- ACPI_OBJECT obj[3];
- ACPI_STATUS rv;
-
- /*
- * First try to call the Device Sleep Wake control method, _DSW.
- * Only if this is not available, resort to to the Power State
- * Wake control method, _PSW, which was deprecated in ACPI 3.0.
- */
- obj[0].Integer.Value = enable ? 1 : 0;
- obj[1].Integer.Value = obj[2].Integer.Value = 0;
- obj[0].Type = obj[1].Type = obj[2].Type = ACPI_TYPE_INTEGER;
-
- arg.Count = 3;
- arg.Pointer = obj;
-
- rv = AcpiEvaluateObject(sc-sc_node-ad_handle, _DSW, arg, NULL);
-
- if (ACPI_SUCCESS(rv))
- return;
-
- if (rv != AE_NOT_FOUND)
- goto fail;
-
- rv = acpi_eval_set_integer(sc-sc_node-ad_handle, _PSW,
- enable ? 1 : 0);
-
- if (ACPI_FAILURE(rv) rv != AE_NOT_FOUND)
- goto fail;
-
- return;
-
-fail:
- aprint_error_dev(dv, unable to evaluate wake control method: %s\n,
- AcpiFormatException(rv));
-}
-
/*
* acpilid_status_changed:
*
@@ -223,16 +180,6 @@
}
}
-static bool
-acpilid_suspend(device_t dv, const pmf_qual_t *qual)
-{
- struct acpilid_softc *sc = device_private(dv);
-
- acpilid_wake_event(dv, sc-sc_status == 0);
-
- return true;
-}
-
#ifdef _MODULE
MODULE(MODULE_CLASS_DRIVER, acpilid, NULL);
Index: src/sys/dev/acpi/acpi_wakedev.c
diff -u src/sys/dev/acpi/acpi_wakedev.c:1.3 src/sys/dev/acpi/acpi_wakedev.c:1.4
--- src/sys/dev/acpi/acpi_wakedev.c:1.3 Fri Mar 5 14:00:17 2010
+++ src/sys/dev/acpi/acpi_wakedev.c Fri Mar 5 21:01:44 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.c,v 1.3 2010/03/05 14:00:17 jruoho Exp $ */
+/* $NetBSD: acpi_wakedev.c,v 1.4 2010/03/05 21:01:44 jruoho Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Fri Mar 5 21:01:44 UTC 2010 Modified Files: src/sys/dev/acpi: acpi.c acpi_lid.c acpi_wakedev.c acpi_wakedev.h Log Message: Preparing a device for wakeup involves: (a) turning on all power resources required by the device; and (b) executing _DSW (or _PSW) control method. This implements (b). Ok jmcne...@. To generate a diff of this commit: cvs rdiff -u -r1.155 -r1.156 src/sys/dev/acpi/acpi.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/acpi/acpi_lid.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpi_wakedev.c cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/acpi_wakedev.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jruoho
Date: Fri Mar 5 22:00:11 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_wakedev.c
Log Message:
Add the _COMPONENT definition and missing prototypes. Some related cosmetics.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpi_wakedev.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_wakedev.c
diff -u src/sys/dev/acpi/acpi_wakedev.c:1.4 src/sys/dev/acpi/acpi_wakedev.c:1.5
--- src/sys/dev/acpi/acpi_wakedev.c:1.4 Fri Mar 5 21:01:44 2010
+++ src/sys/dev/acpi/acpi_wakedev.c Fri Mar 5 22:00:11 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakedev.c,v 1.4 2010/03/05 21:01:44 jruoho Exp $ */
+/* $NetBSD: acpi_wakedev.c,v 1.5 2010/03/05 22:00:11 jruoho Exp $ */
/*-
* Copyright (c) 2009 Jared D. McNeill jmcne...@invisible.ca
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: acpi_wakedev.c,v 1.4 2010/03/05 21:01:44 jruoho Exp $);
+__KERNEL_RCSID(0, $NetBSD: acpi_wakedev.c,v 1.5 2010/03/05 22:00:11 jruoho Exp $);
#include sys/param.h
#include sys/device.h
@@ -40,20 +40,22 @@
#include dev/acpi/acpivar.h
#include dev/acpi/acpi_wakedev.h
-static void acpi_wakedev_prepare(struct acpi_devnode *, int, int);
+#define _COMPONENT ACPI_BUS_COMPONENT
+ACPI_MODULE_NAME (acpi_wakedev)
+
+struct acpi_wakedev {
+ struct acpi_devnode *aw_node;
+ struct sysctllog *aw_sysctllog;
+ int aw_enabled;
+
+ TAILQ_ENTRY(acpi_wakedev) aw_list;
+};
struct acpi_wakedev;
+static int acpi_wakedev_node = -1;
static TAILQ_HEAD(, acpi_wakedev) acpi_wakedevlist =
TAILQ_HEAD_INITIALIZER(acpi_wakedevlist);
-static int acpi_wakedev_node = -1;
-
-struct acpi_wakedev {
- struct acpi_devnode *aw_node;
- int aw_enabled;
- struct sysctllog *aw_sysctllog;
- TAILQ_ENTRY(acpi_wakedev) aw_list;
-};
static const char * const acpi_wakedev_default[] = {
PNP0C0C, /* power button */
@@ -63,6 +65,11 @@
NULL,
};
+static void acpi_wakedev_sysctl_add(struct acpi_wakedev *);
+static bool acpi_wakedev_add(struct acpi_softc *, struct acpi_devnode *);
+static void acpi_wakedev_print(struct acpi_wakedev *);
+static void acpi_wakedev_prepare(struct acpi_devnode *, int, int);
+
SYSCTL_SETUP(sysctl_acpi_wakedev_setup, sysctl hw.wake subtree setup)
{
const struct sysctlnode *rnode;
@@ -97,9 +104,8 @@
NULL, NULL, 0, aw-aw_enabled, 0,
CTL_HW, acpi_wakedev_node, CTL_CREATE, CTL_EOL);
if (err)
- printf(acpi_wakedev_sysctl_add:
- sysctl_createv(hw.wake.%s) failed. (%d)\n,
- aw-aw_node-ad_name, err);
+ aprint_error(%s: sysctl_createv(hw.wake.%s) failed (%d)\n,
+ __func__, aw-aw_node-ad_name, err);
}
static bool
@@ -113,7 +119,7 @@
aw = kmem_alloc(sizeof(*aw), KM_SLEEP);
if (aw == NULL) {
- aprint_error(acpi_wakedev_add: kmem_alloc failed\n);
+ aprint_error(%s: kmem_alloc failed\n, __func__);
return false;
}
aw-aw_node = ad;
@@ -254,4 +260,3 @@
aprint_error_dev(ad-ad_device, failed to evaluate wake
control method: %s\n, AcpiFormatException(rv));
}
-
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: jruoho Date: Fri Mar 5 22:00:11 UTC 2010 Modified Files: src/sys/dev/acpi: acpi_wakedev.c Log Message: Add the _COMPONENT definition and missing prototypes. Some related cosmetics. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpi_wakedev.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: pettai Date: Fri Mar 5 22:18:33 UTC 2010 Modified Files: src/distrib/notes/common: main Log Message: Added myself To generate a diff of this commit: cvs rdiff -u -r1.459 -r1.460 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: pettai Date: Fri Mar 5 22:18:33 UTC 2010 Modified Files: src/distrib/notes/common: main Log Message: Added myself To generate a diff of this commit: cvs rdiff -u -r1.459 -r1.460 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.459 src/distrib/notes/common/main:1.460 --- src/distrib/notes/common/main:1.459 Fri Feb 26 21:52:22 2010 +++ src/distrib/notes/common/main Fri Mar 5 22:18:33 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.459 2010/02/26 21:52:22 morr Exp $ +.\ $NetBSD: main,v 1.460 2010/03/05 22:18:33 pettai Exp $ .\ .\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1307,6 +1307,7 @@ .It Ta Rui Paulo Ta Mt rpa...@netbsd.org .It Ta Jonathan Perkin Ta Mt ske...@netbsd.org .It Ta Andrey Petrov Ta Mt pet...@netbsd.org +.It Ta Fredrik Pettai Ta Mt pet...@netbsd.org .It Ta Herb Peyerl Ta Mt hpey...@netbsd.org .It Ta Matthias Pfaller Ta Mt matth...@netbsd.org .It Ta Chris Pinnock Ta Mt c...@netbsd.org
CVS commit: src/sys/dev/cardbus
Module Name:src
Committed By: dyoung
Date: Fri Mar 5 22:47:03 UTC 2010
Modified Files:
src/sys/dev/cardbus: rbus_ppb.c
Log Message:
Remove dead code (it is commented out).
Delete the detach routine, it's obviously not finished.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/cardbus/rbus_ppb.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/cardbus/rbus_ppb.c
diff -u src/sys/dev/cardbus/rbus_ppb.c:1.38 src/sys/dev/cardbus/rbus_ppb.c:1.39
--- src/sys/dev/cardbus/rbus_ppb.c:1.38 Thu Mar 4 18:49:14 2010
+++ src/sys/dev/cardbus/rbus_ppb.c Fri Mar 5 22:47:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_ppb.c,v 1.38 2010/03/04 18:49:14 dyoung Exp $ */
+/* $NetBSD: rbus_ppb.c,v 1.39 2010/03/05 22:47:03 dyoung Exp $ */
/*
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rbus_ppb.c,v 1.38 2010/03/04 18:49:14 dyoung Exp $);
+__KERNEL_RCSID(0, $NetBSD: rbus_ppb.c,v 1.39 2010/03/05 22:47:03 dyoung Exp $);
#include sys/param.h
#include sys/systm.h
@@ -78,7 +78,6 @@
static int ppb_cardbus_match(device_t, cfdata_t, void *);
static void ppb_cardbus_attach(device_t, device_t, void *);
-static int ppb_cardbus_detach(device_t self, int flags);
static int ppb_activate(device_t, enum devact);
int rppbprint(void *, const char *);
int rbus_intr_fixup(pci_chipset_tag_t, int, int, int);
@@ -104,7 +103,7 @@
};
CFATTACH_DECL_NEW(rbus_ppb, sizeof(struct ppb_cardbus_softc),
-ppb_cardbus_match, ppb_cardbus_attach, ppb_cardbus_detach, ppb_activate);
+ppb_cardbus_match, ppb_cardbus_attach, NULL, ppb_activate);
#ifdef CBB_DEBUG
int rbus_ppb_debug = 0; /* hack with kdb */
@@ -509,8 +508,6 @@
int bus, device, function, command;
struct rbus_pci_addr_fixup_context *rct =
(struct rbus_pci_addr_fixup_context *)context;
- //cardbus_chipset_tag_t ct = rct-ct;
- // struct cardbus_softc *sc = rct-sc;
pci_decompose_tag(pc, tag, bus, device, function);
@@ -731,45 +728,6 @@
config_found_ia(self, pcibus, pba, rppbprint);
}
-static int
-ppb_cardbus_detach(device_t self, int flags)
-{
- /* struct ppb_softc *sc = device_private(self);*/
- struct ppb_cardbus_softc *csc = device_private(self);
-
-#if 0
- struct cardbus_devfunc *ct = csc-ct;
- int rv, reg;
-
-#ifdef DIAGNOSTIC
- if (ct == NULL)
- panic(%s: data structure lacks, device_xname(sc-sc_dev));
-#endif
-
- rv = fxp_detach(sc);
- if (rv == 0) {
- /*
- * Unhook the interrupt handler.
- */
- Cardbus_intr_disestablish(ct, sc-sc_ih);
-
- /*
- * release bus space and close window
- */
- if (csc-base0_reg)
- reg = PCI_BAR0;
- else
- reg = PCI_BAR1;
- Cardbus_mapreg_unmap(ct, reg, sc-sc_st, sc-sc_sh, csc-size);
- }
- return (rv);
-
-#endif
- csc-foo=1;
- return 0;
-
-}
-
int
ppb_activate(device_t self, enum devact act)
{
CVS commit: src/sys/dev/cardbus
Module Name:src Committed By: dyoung Date: Fri Mar 5 22:47:03 UTC 2010 Modified Files: src/sys/dev/cardbus: rbus_ppb.c Log Message: Remove dead code (it is commented out). Delete the detach routine, it's obviously not finished. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/dev/cardbus/rbus_ppb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src Committed By: njoly Date: Fri Mar 5 23:06:49 UTC 2010 Modified Files: src/sys/conf: Makefile.kern.inc Log Message: Use 'a b ...' contructs for running multiple commands on a single line in Makefiles, to properly detect/report failures. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/sys/conf/Makefile.kern.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/conf
Module Name:src
Committed By: njoly
Date: Fri Mar 5 23:06:49 UTC 2010
Modified Files:
src/sys/conf: Makefile.kern.inc
Log Message:
Use 'a b ...' contructs for running multiple commands on a single line
in Makefiles, to properly detect/report failures.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/conf/Makefile.kern.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.126 src/sys/conf/Makefile.kern.inc:1.127
--- src/sys/conf/Makefile.kern.inc:1.126 Mon Mar 1 21:10:14 2010
+++ src/sys/conf/Makefile.kern.inc Fri Mar 5 23:06:49 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.126 2010/03/01 21:10:14 darran Exp $
+# $NetBSD: Makefile.kern.inc,v 1.127 2010/03/05 23:06:49 njoly Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -123,7 +123,7 @@
# Add CTF sections for DTrace
.if defined(CTFCONVERT)
COMPILE_CTFCONVERT= ${_MKSHECHO}\
- ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}; \
+ ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} \
${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
.else
COMPILE_CTFCONVERT= ${_MKSHECHO}
@@ -131,19 +131,19 @@
# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
# NOPROF and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
-NORMAL_C?= @${_MKSHMSG} compile ${.CURDIR:T}/${.TARGET}; \
+NORMAL_C?= @${_MKSHMSG} compile ${.CURDIR:T}/${.TARGET} \
${_MKSHECHO}\
- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $; \
- ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $; \
+ ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $ \
+ ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $ \
${COMPILE_CTFCONVERT}
-NOPROF_C?= @${_MKSHMSG} compile ${.CURDIR:T}/${.TARGET}; \
+NOPROF_C?= @${_MKSHMSG} compile ${.CURDIR:T}/${.TARGET} \
${_MKSHECHO}\
- ${CC} ${CFLAGS} ${CPPFLAGS} -c $; \
- ${CC} ${CFLAGS} ${CPPFLAGS} -c $; \
+ ${CC} ${CFLAGS} ${CPPFLAGS} -c $ \
+ ${CC} ${CFLAGS} ${CPPFLAGS} -c $ \
${COMPILE_CTFCONVERT}
-NORMAL_S?= @${_MKSHMSG} compile ${.CURDIR:T}/${.TARGET}; \
+NORMAL_S?= @${_MKSHMSG} compile ${.CURDIR:T}/${.TARGET} \
${_MKSHECHO}\
- ${CC} ${AFLAGS} ${CPPFLAGS} -c $; \
+ ${CC} ${AFLAGS} ${CPPFLAGS} -c $ \
${CC} ${AFLAGS} ${CPPFLAGS} -c $
##
CVS commit: src/share/man/man9
Module Name:src Committed By: dsieger Date: Fri Mar 5 23:08:18 UTC 2010 Modified Files: src/share/man/man9: sched_4bsd.9 Log Message: Minor wording correction. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/sched_4bsd.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/sched_4bsd.9 diff -u src/share/man/man9/sched_4bsd.9:1.3 src/share/man/man9/sched_4bsd.9:1.4 --- src/share/man/man9/sched_4bsd.9:1.3 Wed Apr 30 13:10:58 2008 +++ src/share/man/man9/sched_4bsd.9 Fri Mar 5 23:08:18 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: sched_4bsd.9,v 1.3 2008/04/30 13:10:58 martin Exp $ +.\ $NetBSD: sched_4bsd.9,v 1.4 2010/03/05 23:08:18 dsieger Exp $ .\ .\ Copyright (c) 2002 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -48,9 +48,7 @@ .Ft void .Fn updatepri lwp_t *l .Sh DESCRIPTION -The -.Nx -thread scheduling sub-system employs a +The traditional 4.4BSD scheduler employs a .Dq multilevel feedback queues algorithm, favouring interactive, short-running threads to CPU-bound ones.
CVS commit: src/share/man/man9
Module Name:src Committed By: dsieger Date: Fri Mar 5 23:08:18 UTC 2010 Modified Files: src/share/man/man9: sched_4bsd.9 Log Message: Minor wording correction. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/man/man9/sched_4bsd.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/fsck
Module Name:src
Committed By: christos
Date: Sat Mar 6 00:30:54 UTC 2010
Modified Files:
src/sbin/fsck: partutil.c
Log Message:
- use warn/err properly
- wrap long lines
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sbin/fsck/partutil.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck/partutil.c
diff -u src/sbin/fsck/partutil.c:1.9 src/sbin/fsck/partutil.c:1.10
--- src/sbin/fsck/partutil.c:1.9 Thu Jul 16 19:50:32 2009
+++ src/sbin/fsck/partutil.c Fri Mar 5 19:30:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: partutil.c,v 1.9 2009/07/16 23:50:32 dyoung Exp $ */
+/* $NetBSD: partutil.c,v 1.10 2010/03/06 00:30:54 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: partutil.c,v 1.9 2009/07/16 23:50:32 dyoung Exp $);
+__RCSID($NetBSD: partutil.c,v 1.10 2010/03/06 00:30:54 christos Exp $);
#include sys/types.h
#include sys/disklabel.h
@@ -76,12 +76,16 @@
static void
dict2geom(struct disk_geom *geo, prop_dictionary_t dict)
{
- memset(geo, 0, sizeof(struct disk_geom));
- prop_dictionary_get_int64(dict, sectors-per-unit, geo-dg_secperunit);
+ (void)memset(geo, 0, sizeof(struct disk_geom));
+ prop_dictionary_get_int64(dict, sectors-per-unit,
+ geo-dg_secperunit);
prop_dictionary_get_uint32(dict, sector-size, geo-dg_secsize);
- prop_dictionary_get_uint32(dict, sectors-per-track, geo-dg_nsectors);
- prop_dictionary_get_uint32(dict, tracks-per-cylinder, geo-dg_ntracks);
- prop_dictionary_get_uint32(dict, cylinders-per-unit, geo-dg_ncylinders);
+ prop_dictionary_get_uint32(dict, sectors-per-track,
+ geo-dg_nsectors);
+ prop_dictionary_get_uint32(dict, tracks-per-cylinder,
+ geo-dg_ntracks);
+ prop_dictionary_get_uint32(dict, cylinders-per-unit,
+ geo-dg_ncylinders);
}
@@ -159,7 +163,7 @@
if (dt) {
lp = getdiskbyname(dt);
if (lp == NULL)
- errx(1, %s: unknown disk type, dt);
+ errx(1, unknown disk type `%s', dt);
}
/* Get disk description dictionary */
@@ -171,7 +175,7 @@
* cgd, ccd pseudo disk drives doesn't support DIOCGDDISKINFO
*/
if (ioctl(fd, DIOCGDINFO, lp) == -1) {
- printf(DIOCGDINFO on %s failed\n, s);
+ warn(DIOCGDINFO on %s failed, s);
return -1;
}
label2geom(geo, lp);
@@ -183,8 +187,8 @@
/* Get info about partition/wedge */
if (ioctl(fd, DIOCGWEDGEINFO, dkw) == -1) {
if (ioctl(fd, DIOCGDINFO, lp) == -1)
- errx(errno, Please implement DIOCGWEDGEINFO or
- DIOCGDINFO for disk device %s\n, s);
+ err(1, Please implement DIOCGWEDGEINFO or
+ DIOCGDINFO for disk device %s, s);
part2wedge(dkw, lp, s);
}
CVS commit: src/sys/arch
Module Name:src Committed By: cnst Date: Sat Mar 6 04:28:54 UTC 2010 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 src/sys/arch/i386/conf: GENERIC Log Message: remove aiboost(4) from GENERICs, since it cannot win in autoconf(9) over aibs(4); ok pgoyette To generate a diff of this commit: cvs rdiff -u -r1.269 -r1.270 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.971 -r1.972 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: cnst Date: Sat Mar 6 04:28:54 UTC 2010 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 src/sys/arch/i386/conf: GENERIC Log Message: remove aiboost(4) from GENERICs, since it cannot win in autoconf(9) over aibs(4); ok pgoyette To generate a diff of this commit: cvs rdiff -u -r1.269 -r1.270 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.971 -r1.972 src/sys/arch/i386/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.269 src/sys/arch/amd64/conf/GENERIC:1.270 --- src/sys/arch/amd64/conf/GENERIC:1.269 Mon Feb 22 13:42:04 2010 +++ src/sys/arch/amd64/conf/GENERIC Sat Mar 6 04:28:53 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.269 2010/02/22 13:42:04 pgoyette Exp $ +# $NetBSD: GENERIC,v 1.270 2010/03/06 04:28:53 cnst Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.269 $ +#ident GENERIC-$Revision: 1.270 $ maxusers 64 # estimated number of users @@ -285,7 +285,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 Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.50 src/sys/arch/amd64/conf/XEN3_DOM0:1.51 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.50 Sun Feb 21 05:16:29 2010 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Sat Mar 6 04:28:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.50 2010/02/21 05:16:29 cnst Exp $ +# $NetBSD: XEN3_DOM0,v 1.51 2010/03/06 04:28:54 cnst Exp $ include arch/amd64/conf/std.xen @@ -224,7 +224,6 @@ acpiec* at acpi? # ACPI Embedded Controller acpilid* at acpi? # ACPI Lid Switch acpitz* at acpi? # ACPI Thermal Zone -aiboost* at acpi? # ASUS AI Booster Hardware monitor aibs* at acpi? # ASUSTeK AI Booster hardware monitor hpqlb* at acpi? # HP Quick Launch Buttons pckbc* at acpi? # PC keyboard controller Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.971 src/sys/arch/i386/conf/GENERIC:1.972 --- src/sys/arch/i386/conf/GENERIC:1.971 Mon Feb 22 17:27:04 2010 +++ src/sys/arch/i386/conf/GENERIC Sat Mar 6 04:28:53 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.971 2010/02/22 17:27:04 pgoyette Exp $ +# $NetBSD: GENERIC,v 1.972 2010/03/06 04:28:53 cnst Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.971 $ +#ident GENERIC-$Revision: 1.972 $ maxusers 64 # estimated number of users @@ -363,7 +363,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
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: cnst Date: Sat Mar 6 04:33:24 UTC 2010 Modified Files: src/sys/arch/i386/conf: XEN3_DOM0 Log Message: no reason to be excluding aibs(4) from i386 XEN3_DOM0 if we include it in amd64; ok pgoyette To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.29 src/sys/arch/i386/conf/XEN3_DOM0:1.30 --- src/sys/arch/i386/conf/XEN3_DOM0:1.29 Sun Feb 21 05:16:29 2010 +++ src/sys/arch/i386/conf/XEN3_DOM0 Sat Mar 6 04:33:24 2010 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.29 2010/02/21 05:16:29 cnst Exp $ +# $NetBSD: XEN3_DOM0,v 1.30 2010/03/06 04:33:24 cnst Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -837,5 +837,5 @@ acpiec* at acpi? # ACPI Embedded Controller (late binding) acpiecdt* at acpi? # ACPI Embedded Controller (early binding) acpilid* at acpi? # ACPI Lid Switch +aibs* at acpi? # ASUSTeK AI Booster hardware monitor hpqlb* at acpi? # HP Quick Launch Buttons -
CVS commit: src/sys/dev/usb
Module Name:src Committed By: cnst Date: Sat Mar 6 04:39:16 UTC 2010 Modified Files: src/sys/dev/usb: uthum.c Log Message: fix the relative humidity sensor To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/uthum.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/usb/uthum.c diff -u src/sys/dev/usb/uthum.c:1.2 src/sys/dev/usb/uthum.c:1.3 --- src/sys/dev/usb/uthum.c:1.2 Wed Feb 24 17:34:56 2010 +++ src/sys/dev/usb/uthum.c Sat Mar 6 04:39:16 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: uthum.c,v 1.2 2010/02/24 17:34:56 plunky Exp $ */ +/* $NetBSD: uthum.c,v 1.3 2010/03/06 04:39:16 cnst Exp $ */ /* $OpenBSD: uthum.c,v 1.6 2010/01/03 18:43:02 deraadt Exp $ */ /* @@ -167,7 +167,8 @@ sc-sc_sensor[UTHUM_TEMP].units = ENVSYS_STEMP; sc-sc_sensor[UTHUM_TEMP].state = ENVSYS_SINVALID; - (void)strlcpy(sc-sc_sensor[UTHUM_HUMIDITY].desc, humidity, + (void)strlcpy(sc-sc_sensor[UTHUM_HUMIDITY].desc, + relative humidity, sizeof(sc-sc_sensor[UTHUM_HUMIDITY].desc)); sc-sc_sensor[UTHUM_HUMIDITY].units = ENVSYS_INTEGER; sc-sc_sensor[UTHUM_HUMIDITY].value_cur = 0; @@ -346,7 +347,7 @@ temp = uthum_sht1x_temp(temp_tick); rh = uthum_sht1x_rh(humidity_tick, temp); - sc-sc_sensor[UTHUM_HUMIDITY].value_cur = rh; + sc-sc_sensor[UTHUM_HUMIDITY].value_cur = rh / 1000; sc-sc_sensor[UTHUM_HUMIDITY].state = ENVSYS_SVALID; break; case UTHUM_TYPE_TEMPER:
CVS commit: src/sys/dev/usb
Module Name:src Committed By: cnst Date: Sat Mar 6 04:39:16 UTC 2010 Modified Files: src/sys/dev/usb: uthum.c Log Message: fix the relative humidity sensor To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/uthum.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev
Module Name:src Committed By: cnst Date: Sat Mar 6 05:58:56 UTC 2010 Modified Files: src/sys/dev: DEVNAMES Log Message: add acpismbus(4), aibs(4), uthum(4) and wbsio(4) to DEVNAMES To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 src/sys/dev/DEVNAMES 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/DEVNAMES diff -u src/sys/dev/DEVNAMES:1.255 src/sys/dev/DEVNAMES:1.256 --- src/sys/dev/DEVNAMES:1.255 Fri Jan 15 20:57:13 2010 +++ src/sys/dev/DEVNAMES Sat Mar 6 05:58:56 2010 @@ -1,4 +1,4 @@ -# $NetBSD: DEVNAMES,v 1.255 2010/01/15 20:57:13 bouyer Exp $ +# $NetBSD: DEVNAMES,v 1.256 2010/03/06 05:58:56 cnst Exp $ # # This file contains all used device names and defined attributes in # alphabetical order. New devices added to the system somewhere should first @@ -29,6 +29,7 @@ acpibut MI acpiec MI acpilid MI +acpismbus MI acpitz MI ad vax ad1848 MI Attribute @@ -61,6 +62,7 @@ ahsc amigappc ai MI aiboost MI +aibs MI aic MI akbd mac68k akbd macppc @@ -1368,6 +1370,7 @@ usscanner MI ustir MI ut vax +uthum MI utoppy MI uu vax uvisor MI @@ -1412,6 +1415,7 @@ vt i386 vtpbc algor vz vax +wbsio MI wd MI wd33c93 MI Attribute wdc MI
CVS commit: src/sys/dev
Module Name:src Committed By: cnst Date: Sat Mar 6 05:58:56 UTC 2010 Modified Files: src/sys/dev: DEVNAMES Log Message: add acpismbus(4), aibs(4), uthum(4) and wbsio(4) to DEVNAMES To generate a diff of this commit: cvs rdiff -u -r1.255 -r1.256 src/sys/dev/DEVNAMES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Sat Mar 6 06:25:52 UTC 2010 Modified Files: src/share/man/man4: acpi.4 Log Message: Refer to sysctl(8) instead of sysctl(7) when appropriate. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/share/man/man4/acpi.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: jruoho Date: Sat Mar 6 06:25:52 UTC 2010 Modified Files: src/share/man/man4: acpi.4 Log Message: Refer to sysctl(8) instead of sysctl(7) when appropriate. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/share/man/man4/acpi.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/acpi.4 diff -u src/share/man/man4/acpi.4:1.41 src/share/man/man4/acpi.4:1.42 --- src/share/man/man4/acpi.4:1.41 Sat Feb 27 21:12:58 2010 +++ src/share/man/man4/acpi.4 Sat Mar 6 06:25:51 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: acpi.4,v 1.41 2010/02/27 21:12:58 wiz Exp $ +.\ $NetBSD: acpi.4,v 1.42 2010/03/06 06:25:51 jruoho Exp $ .\ .\ Copyright (c) 2002, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -256,7 +256,7 @@ To ease the use of these, .Nx provides two -.Xr sysctl 7 +.Xr sysctl 8 variables that control the debug output at runtime. These are only available if the running kernel has been compiled with the .Tn ACPI_DEBUG @@ -270,7 +270,7 @@ .Ic hw.acpi.debug_level controls the debug level. Both -.Xr sysctl 7 +.Xr sysctl 8 variables are string literals. The possible values are: .Bl -column -offset indent \ @@ -382,7 +382,7 @@ implementation uses the prefix .Dv ACPI_DB , whereas the debug level -.Xr sysctl 7 +.Xr sysctl 8 variable is always specified with the prefix .Dv ACPI_LV . .Sh SEE ALSO
