CVS commit: src/libexec/ld.elf_so/arch
Module Name:src
Committed By: jmmv
Date: Sat Aug 29 13:46:55 UTC 2009
Modified Files:
src/libexec/ld.elf_so/arch/alpha: alpha_reloc.c
src/libexec/ld.elf_so/arch/arm: mdreloc.c
src/libexec/ld.elf_so/arch/hppa: hppa_reloc.c
src/libexec/ld.elf_so/arch/i386: mdreloc.c
src/libexec/ld.elf_so/arch/m68k: mdreloc.c
src/libexec/ld.elf_so/arch/mips: mips_reloc.c
src/libexec/ld.elf_so/arch/powerpc: ppc_reloc.c
src/libexec/ld.elf_so/arch/sh3: mdreloc.c
src/libexec/ld.elf_so/arch/vax: mdreloc.c
src/libexec/ld.elf_so/arch/x86_64: mdreloc.c
Log Message:
Remove trailing \n in calls to _rtld_error: a newline is automatically
added by a call to the function.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
cvs rdiff -u -r1.29 -r1.30 src/libexec/ld.elf_so/arch/arm/mdreloc.c
cvs rdiff -u -r1.28 -r1.29 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c
cvs rdiff -u -r1.27 -r1.28 src/libexec/ld.elf_so/arch/i386/mdreloc.c
cvs rdiff -u -r1.23 -r1.24 src/libexec/ld.elf_so/arch/m68k/mdreloc.c
cvs rdiff -u -r1.54 -r1.55 src/libexec/ld.elf_so/arch/mips/mips_reloc.c
cvs rdiff -u -r1.42 -r1.43 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c
cvs rdiff -u -r1.25 -r1.26 src/libexec/ld.elf_so/arch/sh3/mdreloc.c
cvs rdiff -u -r1.24 -r1.25 src/libexec/ld.elf_so/arch/vax/mdreloc.c
cvs rdiff -u -r1.34 -r1.35 src/libexec/ld.elf_so/arch/x86_64/mdreloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
diff -u src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.32 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.33
--- src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.32 Sun May 24 18:29:03 2009
+++ src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c Sat Aug 29 13:46:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha_reloc.c,v 1.32 2009/05/24 18:29:03 he Exp $ */
+/* $NetBSD: alpha_reloc.c,v 1.33 2009/08/29 13:46:54 jmmv Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -62,7 +62,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: alpha_reloc.c,v 1.32 2009/05/24 18:29:03 he Exp $");
+__RCSID("$NetBSD: alpha_reloc.c,v 1.33 2009/08/29 13:46:54 jmmv Exp $");
#endif /* not lint */
#include
@@ -270,7 +270,7 @@
(void *)load_ptr(where),
obj->strtab + obj->symtab[symnum].st_name));
_rtld_error("%s: Unsupported relocation type %ld "
- "in non-PLT relocations\n",
+ "in non-PLT relocations",
obj->path, (u_long) ELF_R_TYPE(rela->r_info));
return -1;
}
Index: src/libexec/ld.elf_so/arch/arm/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.29 src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.30
--- src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.29 Mon Mar 16 02:46:47 2009
+++ src/libexec/ld.elf_so/arch/arm/mdreloc.c Sat Aug 29 13:46:54 2009
@@ -1,8 +1,8 @@
-/* $NetBSD: mdreloc.c,v 1.29 2009/03/16 02:46:47 lukem Exp $ */
+/* $NetBSD: mdreloc.c,v 1.30 2009/08/29 13:46:54 jmmv Exp $ */
#include
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.29 2009/03/16 02:46:47 lukem Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.30 2009/08/29 13:46:54 jmmv Exp $");
#endif /* not lint */
#include
@@ -188,7 +188,7 @@
(void *)rel->r_offset, (void *)load_ptr(where),
obj->strtab + obj->symtab[symnum].st_name));
_rtld_error("%s: Unsupported relocation type %ld "
- "in non-PLT relocations\n",
+ "in non-PLT relocations",
obj->path, (u_long) ELF_R_TYPE(rel->r_info));
return -1;
}
Index: src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c
diff -u src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.28 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.29
--- src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.28 Sat May 23 17:50:34 2009
+++ src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c Sat Aug 29 13:46:54 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hppa_reloc.c,v 1.28 2009/05/23 17:50:34 mjf Exp $ */
+/* $NetBSD: hppa_reloc.c,v 1.29 2009/08/29 13:46:54 jmmv Exp $ */
/*-
* Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: hppa_reloc.c,v 1.28 2009/05/23 17:50:34 mjf Exp $");
+__RCSID("$NetBSD: hppa_reloc.c,v 1.29 2009/08/29 13:46:54 jmmv Exp $");
#endif /* not lint */
#include
@@ -483,7 +483,7 @@
(void *)load_ptr(where),
obj->strtab + obj->symtab[symnum].st_name));
_rtld_error("%s: Unsupported relocation type %ld "
- "in non-PLT relocations\n",
+ "in non-PLT relocations",
obj->path, (u_long) ELF_R_TYPE(rela->r_info));
return -1;
}
Index: src/libexec/ld.elf_so/arch/i386/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.27 src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.28
--- src/libexec/ld.elf_so/arch/i386/mdreloc.c:1.27 Mon Mar 16 02:44:47 2009
+++ src/libexec/ld.elf_so/arch/i386/mdreloc.c Sat Aug 29 13:46:54 2
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: tsutsui
Date: Sat Aug 29 13:55:29 UTC 2009
Modified Files:
src/sys/dev/pci: pucdata.c
Log Message:
Add support for Oxford Semiconductor OXmPCI952 2 port UARTs.
Also update URL of Oxford UART chips.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/pci/pucdata.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/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.56 src/sys/dev/pci/pucdata.c:1.57
--- src/sys/dev/pci/pucdata.c:1.56 Mon Dec 8 19:32:39 2008
+++ src/sys/dev/pci/pucdata.c Sat Aug 29 13:55:29 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.56 2008/12/08 19:32:39 dyoung Exp $ */
+/* $NetBSD: pucdata.c,v 1.57 2009/08/29 13:55:29 tsutsui Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.56 2008/12/08 19:32:39 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.57 2009/08/29 13:55:29 tsutsui Exp $");
#include
#include
@@ -894,12 +894,22 @@
* Boards with an Oxford Semiconductor chip.
*
* Oxford Semiconductor provides documentation for their chip at:
- * http://www.oxsemi.com/products/uarts/index.html>
+ * http://www.plxtech.com/products/uart>
*
* As sold by Kouwell http://www.kouwell.com/>.
* I/O Flex PCI I/O Card Model-223 with 4 serial and 1 parallel ports.
*/
+ /* Oxford Semiconductor OXmPCI952 PCI UARTs */
+ { "Oxford Semiconductor OXmPCI952 UARTs",
+ { 0x1415, 0x950a, 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 10 },
+ { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 10 },
+ },
+ },
+
/* Oxford Semiconductor OX16PCI952 PCI `950 UARTs - 128 byte FIFOs */
{ "Oxford Semiconductor OX16PCI952 UARTs",
{ 0x1415, 0x9521, 0, 0 },
CVS commit: src/sys/dev/ic
Module Name:src Committed By: tsutsui Date: Sat Aug 29 14:06:23 UTC 2009 Modified Files: src/sys/dev/ic: rtl8169.c Log Message: - no need to include "vlan.h" since no NVLAN reference - whitespace in comment To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/sys/dev/ic/rtl8169.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/ic/rtl8169.c diff -u src/sys/dev/ic/rtl8169.c:1.122 src/sys/dev/ic/rtl8169.c:1.123 --- src/sys/dev/ic/rtl8169.c:1.122 Thu Aug 27 16:02:26 2009 +++ src/sys/dev/ic/rtl8169.c Sat Aug 29 14:06:22 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: rtl8169.c,v 1.122 2009/08/27 16:02:26 tsutsui Exp $ */ +/* $NetBSD: rtl8169.c,v 1.123 2009/08/29 14:06:22 tsutsui Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.122 2009/08/27 16:02:26 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rtl8169.c,v 1.123 2009/08/29 14:06:22 tsutsui Exp $"); /* $FreeBSD: /repoman/r/ncvs/src/sys/dev/re/if_re.c,v 1.20 2004/04/11 20:34:08 ru Exp $ */ /* @@ -112,7 +112,6 @@ */ #include "bpfilter.h" -#include "vlan.h" #include #include @@ -1389,7 +1388,7 @@ struct rtk_softc *sc = arg; int s; - /*XXX: just return for 8169S/8110S with rev 2 or newer phy */ + /* XXX: just return for 8169S/8110S with rev 2 or newer phy */ s = splnet(); mii_tick(&sc->mii);
CVS commit: src/sys/dev
Module Name:src Committed By: tsutsui Date: Sat Aug 29 14:18:34 UTC 2009 Modified Files: src/sys/dev/cardbus: if_re_cardbus.c src/sys/dev/pci: if_re_pci.c Log Message: Remove unnecessary #includes. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/dev/cardbus/if_re_cardbus.c cvs rdiff -u -r1.36 -r1.37 src/sys/dev/pci/if_re_pci.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/if_re_cardbus.c diff -u src/sys/dev/cardbus/if_re_cardbus.c:1.18 src/sys/dev/cardbus/if_re_cardbus.c:1.19 --- src/sys/dev/cardbus/if_re_cardbus.c:1.18 Tue Jun 24 19:44:52 2008 +++ src/sys/dev/cardbus/if_re_cardbus.c Sat Aug 29 14:18:34 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_re_cardbus.c,v 1.18 2008/06/24 19:44:52 drochner Exp $ */ +/* $NetBSD: if_re_cardbus.c,v 1.19 2009/08/29 14:18:34 tsutsui Exp $ */ /* * Copyright (c) 2004 Jonathan Stone @@ -36,38 +36,15 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.18 2008/06/24 19:44:52 drochner Exp $"); - -#include "opt_inet.h" -#include "bpfilter.h" -#include "rnd.h" +__KERNEL_RCSID(0, "$NetBSD: if_re_cardbus.c,v 1.19 2009/08/29 14:18:34 tsutsui Exp $"); #include #include -#include #include -#include -#include -#include -#include -#include #include -#include #include -#include #include -#ifdef INET -#include -#include -#endif - -#if NBPFILTER > 0 -#include -#endif -#if NRND > 0 -#include -#endif #include @@ -76,7 +53,6 @@ #include #include -#include #include #include Index: src/sys/dev/pci/if_re_pci.c diff -u src/sys/dev/pci/if_re_pci.c:1.36 src/sys/dev/pci/if_re_pci.c:1.37 --- src/sys/dev/pci/if_re_pci.c:1.36 Sat Apr 25 06:16:12 2009 +++ src/sys/dev/pci/if_re_pci.c Sat Aug 29 14:18:34 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_re_pci.c,v 1.36 2009/04/25 06:16:12 tsutsui Exp $ */ +/* $NetBSD: if_re_pci.c,v 1.37 2009/08/29 14:18:34 tsutsui Exp $ */ /* * Copyright (c) 1997, 1998-2003 @@ -46,29 +46,17 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.36 2009/04/25 06:16:12 tsutsui Exp $"); - -#include "bpfilter.h" -#include "vlan.h" +__KERNEL_RCSID(0, "$NetBSD: if_re_pci.c,v 1.37 2009/08/29 14:18:34 tsutsui Exp $"); #include #include -#include #include -#include -#include -#include -#include -#include #include #include -#include -#include #include #include -#include #include
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: jmcneill
Date: Sat Aug 29 19:17:44 UTC 2009
Modified Files:
src/sys/dev/acpi: pckbc_acpi.c
Log Message:
PR# port-i386/39671: panic while booting with an acpi kernel on a 790GX board
If the firmware describes duplicate keyboard controller nodes, don't panic
when the driver fails to map registers.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/acpi/pckbc_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/pckbc_acpi.c
diff -u src/sys/dev/acpi/pckbc_acpi.c:1.31 src/sys/dev/acpi/pckbc_acpi.c:1.32
--- src/sys/dev/acpi/pckbc_acpi.c:1.31 Tue Feb 17 12:46:01 2009
+++ src/sys/dev/acpi/pckbc_acpi.c Sat Aug 29 19:17:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: pckbc_acpi.c,v 1.31 2009/02/17 12:46:01 jmcneill Exp $ */
+/* $NetBSD: pckbc_acpi.c,v 1.32 2009/08/29 19:17:44 jmcneill Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.31 2009/02/17 12:46:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pckbc_acpi.c,v 1.32 2009/08/29 19:17:44 jmcneill Exp $");
#include
#include
@@ -206,8 +206,11 @@
if (bus_space_map(aa->aa_iot, io0->ar_base,
io0->ar_length, 0, &ioh_d) ||
bus_space_map(aa->aa_iot, io1->ar_base,
- io1->ar_length, 0, &ioh_c))
-panic("pckbc_acpi_attach: couldn't map");
+ io1->ar_length, 0, &ioh_c)) {
+aprint_error_dev(self,
+"unable to map registers\n");
+goto out;
+ }
t = malloc(sizeof(struct pckbc_internal),
M_DEVBUF, M_WAITOK|M_ZERO);
@@ -228,9 +231,11 @@
first->sc_pckbc.intr_establish = pckbc_acpi_intr_establish;
config_defer(first->sc_pckbc.sc_dv, pckbc_acpi_finish_attach);
- } else if (!pmf_device_register(self, NULL, NULL))
+ }
+
+out:
+ if (!pmf_device_register(self, NULL, NULL))
aprint_error_dev(self, "couldn't establish power handler\n");
- out:
acpi_resource_cleanup(&res);
}
CVS commit: src
Module Name:src
Committed By: dyoung
Date: Sun Aug 30 01:49:43 UTC 2009
Modified Files:
src: Makefile
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: module.ad.arm module.ad.hppa
module.ad.m68k module.ad.mipseb module.ad.mipsel module.ad.powerpc
module.ad.sh3 module.alpha module.amd64 module.i386 module.mi
module.sparc module.sparc64 module.vax
src/share/mk: bsd.own.mk
Log Message:
Let us use MKKMOD=yes to leave the kernel modules out of the
distribution.
To generate a diff of this commit:
cvs rdiff -u -r1.272 -r1.273 src/Makefile
cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/sets.subr
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/base/module.ad.arm \
src/distrib/sets/lists/base/module.ad.hppa \
src/distrib/sets/lists/base/module.ad.m68k \
src/distrib/sets/lists/base/module.ad.mipseb \
src/distrib/sets/lists/base/module.ad.mipsel \
src/distrib/sets/lists/base/module.ad.powerpc \
src/distrib/sets/lists/base/module.ad.sh3 \
src/distrib/sets/lists/base/module.sparc \
src/distrib/sets/lists/base/module.vax
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/base/module.alpha \
src/distrib/sets/lists/base/module.amd64 \
src/distrib/sets/lists/base/module.i386 \
src/distrib/sets/lists/base/module.sparc64
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/base/module.mi
cvs rdiff -u -r1.569 -r1.570 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/Makefile
diff -u src/Makefile:1.272 src/Makefile:1.273
--- src/Makefile:1.272 Fri Jul 3 22:20:27 2009
+++ src/Makefile Sun Aug 30 01:49:42 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.272 2009/07/03 22:20:27 pooka Exp $
+# $NetBSD: Makefile,v 1.273 2009/08/30 01:49:42 dyoung Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -237,7 +237,7 @@
.endif
BUILDTARGETS+= do-lib-libc
BUILDTARGETS+= do-lib do-gnu-lib do-external-lib
-.if (${MACHINE} != "evbppc")
+.if (${MACHINE} != "evbppc") && ${MKKMOD} != "no"
BUILDTARGETS+= do-sys-modules
.endif
BUILDTARGETS+= do-sys-rump-fs-lib do-sys-rump-net-lib
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.84 src/distrib/sets/sets.subr:1.85
--- src/distrib/sets/sets.subr:1.84 Thu Jun 18 21:05:35 2009
+++ src/distrib/sets/sets.subr Sun Aug 30 01:49:41 2009
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.84 2009/06/18 21:05:35 mrg Exp $
+# $NetBSD: sets.subr,v 1.85 2009/08/30 01:49:41 dyoung Exp $
#
#
@@ -44,6 +44,7 @@
MKIPFILTER \
MKISCSI \
MKKERBEROS \
+ MKKMOD \
MKLDAP \
MKLINT \
MKLVM \
@@ -228,7 +229,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.84 2009/06/18 21:05:35 mrg Exp $
+# # $NetBSD: sets.subr,v 1.85 2009/08/30 01:49:41 dyoung Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -270,6 +271,7 @@
# ipfilter ${MKIPFILTER} != no
# iscsi ${MKISCSI} != no
# kerberos ${MKKERBEROS} != no
+# kmod ${MKKMOD} != no
# ldap ${MKLDAP} != no
# lint ${MKLINT} != no
# lvm ${MKLVM} != no
Index: src/distrib/sets/lists/base/module.ad.arm
diff -u src/distrib/sets/lists/base/module.ad.arm:1.1 src/distrib/sets/lists/base/module.ad.arm:1.2
--- src/distrib/sets/lists/base/module.ad.arm:1.1 Sat Nov 29 17:57:34 2008
+++ src/distrib/sets/lists/base/module.ad.arm Sun Aug 30 01:49:42 2009
@@ -1,4 +1,4 @@
-# $NetBSD: module.ad.arm,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
+# $NetBSD: module.ad.arm,v 1.2 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/base/module.ad.hppa
diff -u src/distrib/sets/lists/base/module.ad.hppa:1.1 src/distrib/sets/lists/base/module.ad.hppa:1.2
--- src/distrib/sets/lists/base/module.ad.hppa:1.1 Sat Nov 29 17:57:34 2008
+++ src/distrib/sets/lists/base/module.ad.hppa Sun Aug 30 01:49:42 2009
@@ -1,3 +1,3 @@
-# $NetBSD: module.ad.hppa,v 1.1 2008/11/29 17:57:34 tsutsui Exp $
-./@MODULEDIR@/exec_elf32 base-kernel-modules
-./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules
+# $NetBSD: module.ad.hppa,v 1.2 2009/08/30 01:49:42 dyoung Exp $
+./@MODULEDIR@/exec_elf32 base-kernel-modules kmod
+./@MODULEDIR@/exec_elf32/exec_elf32.kmod base-kernel-modules kmod
Index: src/distrib/sets/lists/base/module.ad.m68k
diff -u src/distrib/sets/lists/base/module.ad.m68k:1.1 src/distrib/sets/lists/base/module.ad.m68k:1.2
--- src/distrib/sets/lists/base/module.ad.m68k:1.1 Sat Nov 29 17:57:34 2008
+++ src/distrib/sets/lists/base/module.ad.m68k Sun Aug 30 01:49:42 2009
@@ -1,3 +1,3 @@
-# $NetBSD: module.ad.m68k,v 1
CVS commit: src/doc
Module Name:src Committed By: dyoung Date: Sun Aug 30 01:54:33 UTC 2009 Modified Files: src/doc: RESPONSIBLE Log Message: Take responsibility for a few drivers and programs. Take myself off the list for wpa_supplicant. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/doc/RESPONSIBLE Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/RESPONSIBLE diff -u src/doc/RESPONSIBLE:1.90 src/doc/RESPONSIBLE:1.91 --- src/doc/RESPONSIBLE:1.90 Sat Aug 15 08:35:22 2009 +++ src/doc/RESPONSIBLE Sun Aug 30 01:54:33 2009 @@ -1,4 +1,4 @@ -# $NetBSD: RESPONSIBLE,v 1.90 2009/08/15 08:35:22 mbalmer Exp $ +# $NetBSD: RESPONSIBLE,v 1.91 2009/08/30 01:54:33 dyoung Exp $ List of sections of the system, and who is responsible for them (or at least considered an expert on them). @@ -27,6 +27,7 @@ grep simonb, wiz groff wiz gzip mrg, atatat +ifconfig dyoung hostapd none installboot(mi) core kerberos lha, joda @@ -56,8 +57,7 @@ user agc vi aymeric wake mbalmer -wpa_supplicant scw, dyoung - +wpa_supplicant scw Userland Libraries: @@ -157,6 +157,12 @@ spc tsutsui trm tsutsui +system controller device drivers: + +elansc dyoung +elanpar dyoung +elanpex dyoung + file systems: coda gdt
CVS commit: src/sys/arch/i386
Module Name:src
Committed By: dyoung
Date: Sun Aug 30 02:00:56 UTC 2009
Modified Files:
src/sys/arch/i386: Makefile
Log Message:
Compute tags for sys/external/intel-public/acpica/dist/ instead of
for sys/dist/acpica/.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/Makefile
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/Makefile
diff -u src/sys/arch/i386/Makefile:1.37 src/sys/arch/i386/Makefile:1.38
--- src/sys/arch/i386/Makefile:1.37 Thu May 28 18:13:46 2009
+++ src/sys/arch/i386/Makefile Sun Aug 30 02:00:56 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2009/05/28 18:13:46 dyoung Exp $
+# $NetBSD: Makefile,v 1.38 2009/08/30 02:00:56 dyoung Exp $
# Makefile for i386 tags file and boot blocks
@@ -13,8 +13,7 @@
${SYSDIR}/arch/i386/pnpbios/*.[ch] \
${SYSDIR}/external/isc/atheros_hal/dist/*.[ch] \
${SYSDIR}/external/isc/atheros_hal/dist/*/*.[ch] \
- ${SYSDIR}/external/isc/atheros_hal/ic/*.[ch] \
- ${SYSDIR}/dist/acpica/*.[ch]
+ ${SYSDIR}/external/isc/atheros_hal/ic/*.[ch]
SI386+= ${SYSDIR}/arch/x86/x86/*.[ch] \
${SYSDIR}/arch/x86/acpi/*.[ch] \
${SYSDIR}/arch/x86/include/*.h \
@@ -30,6 +29,8 @@
tags:
-rm -f ${TI386}
-echo ${SI386} | xargs ctags -wadtf ${TI386}
+ -find -H ${SYSDIR}/external/intel-public/acpica/dist/ -name '*.[ch]' | \
+ sort -t / -u | xargs ctags -wadtf ${TI386}
-${FINDCOMM} | xargs ctags -wadtf ${TI386}
egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AI386} | \
${TOOL_SED} -e \
CVS commit: src/sys/netinet
Module Name:src
Committed By: dyoung
Date: Sun Aug 30 02:03:59 UTC 2009
Modified Files:
src/sys/netinet: in_selsrc.c
Log Message:
Stop the admin from creating nodes under net.inet.ip.interfaces or
net.inet.ip.interfaces..
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/netinet/in_selsrc.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/netinet/in_selsrc.c
diff -u src/sys/netinet/in_selsrc.c:1.6 src/sys/netinet/in_selsrc.c:1.7
--- src/sys/netinet/in_selsrc.c:1.6 Tue Dec 4 10:33:11 2007
+++ src/sys/netinet/in_selsrc.c Sun Aug 30 02:03:58 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: in_selsrc.c,v 1.6 2007/12/04 10:33:11 dyoung Exp $ */
+/* $NetBSD: in_selsrc.c,v 1.7 2009/08/30 02:03:58 dyoung Exp $ */
/*-
* Copyright (c) 2005 David Young. All rights reserved.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in_selsrc.c,v 1.6 2007/12/04 10:33:11 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_selsrc.c,v 1.7 2009/08/30 02:03:58 dyoung Exp $");
#include "opt_inet.h"
#include "opt_inet_conf.h"
@@ -508,7 +508,7 @@
const struct sysctlnode *rnode;
if ((rc = sysctl_createv(&isc->isc_log, 0, NULL, &rnode,
- CTLFLAG_READWRITE, CTLTYPE_NODE,
+ CTLFLAG_READONLY, CTLTYPE_NODE,
"interfaces", NULL,
NULL, 0, NULL, 0,
CTL_NET, PF_INET, IPPROTO_IP, CTL_CREATE,
@@ -518,7 +518,7 @@
return NULL;
}
if ((rc = sysctl_createv(&isc->isc_log, 0, &rnode, &rnode,
- CTLFLAG_READWRITE, CTLTYPE_NODE,
+ CTLFLAG_READONLY, CTLTYPE_NODE,
isc->isc_ifp->if_xname,
SYSCTL_DESCR("interface ip options"),
NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0) {
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: tsutsui
Date: Sun Aug 30 02:07:06 UTC 2009
Modified Files:
src/sys/dev/ic: hd44780_subr.c hd44780reg.h hd44780var.h
Log Message:
Misc KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/ic/hd44780_subr.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/hd44780reg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/hd44780var.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/ic/hd44780_subr.c
diff -u src/sys/dev/ic/hd44780_subr.c:1.19 src/sys/dev/ic/hd44780_subr.c:1.20
--- src/sys/dev/ic/hd44780_subr.c:1.19 Mon Mar 16 23:11:15 2009
+++ src/sys/dev/ic/hd44780_subr.c Sun Aug 30 02:07:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: hd44780_subr.c,v 1.19 2009/03/16 23:11:15 dsl Exp $ */
+/* $NetBSD: hd44780_subr.c,v 1.20 2009/08/30 02:07:05 tsutsui Exp $ */
/*
* Copyright (c) 2002 Dennis I. Chernoivanov
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.19 2009/03/16 23:11:15 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hd44780_subr.c,v 1.20 2009/08/30 02:07:05 tsutsui Exp $");
#include
#include
@@ -118,12 +118,13 @@
static int
hlcd_mapchar(void *id, int uni, unsigned int *index)
{
+
if (uni < 256) {
*index = uni;
- return (5);
+ return 5;
}
*index = ' ';
- return (0);
+ return 0;
}
static void
@@ -202,6 +203,7 @@
static int
hlcd_allocattr(void *id, int fg, int bg, int flags, long *attrp)
{
+
*attrp = flags;
return 0;
}
@@ -231,11 +233,13 @@
static paddr_t
hlcd_mmap(void *v, void *vs, off_t offset, int prot)
{
+
return -1;
}
static int
-hlcd_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep, int *curxp, int *curyp, long *defattrp)
+hlcd_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep,
+int *curxp, int *curyp, long *defattrp)
{
struct hlcd_screen *hdscr = v, *new;
@@ -254,13 +258,14 @@
}
static int
-hlcd_show_screen(void *v, void *cookie, int waitok, void (*cb)(void *, int, int), void *cbarg)
+hlcd_show_screen(void *v, void *cookie, int waitok,
+void (*cb)(void *, int, int), void *cbarg)
{
struct hlcd_screen *hdscr = v;
hdscr->hlcd_sc->sc_curscr = cookie;
callout_schedule(&hdscr->hlcd_sc->redraw, 1);
- return (0);
+ return 0;
}
static void
@@ -288,7 +293,7 @@
struct hd44780_chip *sc = arg;
int len, crsridx, startidx, x, y;
int old_en, new_en;
- u_char *img, *curimg;
+ uint8_t *img, *curimg;
if (sc->sc_curscr == NULL)
return;
@@ -361,6 +366,7 @@
hd44780_attach_subr(struct hd44780_chip *sc)
{
int err = 0;
+
/* Putc/getc are supposed to be set by platform-dependent code. */
if ((sc->sc_writereg == NULL) || (sc->sc_readreg == NULL))
sc->sc_dev_ok = 0;
@@ -375,8 +381,8 @@
if ((sc->sc_flags & HD_UP) == 0)
err = hd44780_init(sc);
if (err != 0)
- aprint_error_dev(sc->sc_dev, "LCD not responding or unconnected\n");
-
+ aprint_error_dev(sc->sc_dev,
+ "LCD not responding or unconnected\n");
}
sc->sc_screen.hlcd_sc = sc;
@@ -389,23 +395,24 @@
callout_setfunc(&sc->redraw, hlcd_redraw, sc);
}
-int hd44780_init(sc)
- struct hd44780_chip *sc;
+int hd44780_init(struct hd44780_chip *sc)
{
int ret;
ret = hd44780_chipinit(sc, 0);
- if (ret != 0 || !(sc->sc_flags & HD_MULTICHIP)) return ret;
- else return hd44780_chipinit(sc, 1);
+ if (ret != 0 || !(sc->sc_flags & HD_MULTICHIP))
+ return ret;
+ else
+ return hd44780_chipinit(sc, 1);
}
/*
* Initialize 4-bit or 8-bit connected device.
*/
int
-hd44780_chipinit(struct hd44780_chip *sc, u_int32_t en)
+hd44780_chipinit(struct hd44780_chip *sc, uint32_t en)
{
- u_int8_t cmd, dat;
+ uint8_t cmd, dat;
sc->sc_flags &= ~(HD_TIMEDOUT|HD_UP);
sc->sc_dev_ok = 1;
@@ -460,131 +467,131 @@
int
hd44780_ioctl_subr(struct hd44780_chip *sc, u_long cmd, void *data)
{
- u_int8_t tmp;
+ uint8_t tmp;
int error = 0;
- u_int32_t en = sc->sc_curchip;
+ uint32_t en = sc->sc_curchip;
#define hd44780_io() ((struct hd44780_io *)data)
-#define hd44780_info() ((struct hd44780_info*)data)
-#define hd44780_ctrl() ((struct hd44780_dispctl*)data)
+#define hd44780_info() ((struct hd44780_info *)data)
+#define hd44780_ctrl() ((struct hd44780_dispctl *)data)
switch (cmd) {
+ case HLCD_CLEAR:
/* Clear the LCD. */
- case HLCD_CLEAR:
- hd44780_ir_write(sc, en, cmd_clear());
- break;
+ hd44780_ir_write(sc, en, cmd_clear());
+ break;
+ case HLCD_CURSOR_LEFT:
/* Move the cursor one position to the left. */
- case HLCD_CURSOR_LEFT:
- hd44780_ir_write(sc, en, cmd_shift(0, 0));
+ hd44780_ir_write(sc, en, cmd_shift(0, 0));
break;
+ case HLCD_CURSOR_RIGHT:
/* Move the cursor one position to the right. */
- case HLCD_CURSOR_RIGHT:
- hd44780_ir_write(sc, en, cmd_shift(0, 1));
- break;
+ hd44780_ir_write(sc, en, cmd_shift(0, 1));
+ break;
+ case HLCD_DISPCTL:
/* Control the LCD. */
- case HL
CVS commit: [netbsd-5-0] src/etc/ssh
Module Name:src Committed By: snj Date: Sun Aug 30 02:47:08 UTC 2009 Modified Files: src/etc/ssh [netbsd-5-0]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by spz in ticket #930): etc/ssh/ssh_known_hosts: revision 1.5 add morden, mollari, pkgbuild and build adjust function names' keys add the proper names of hosts too in preparation of their function moving To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.30.1 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.4 src/etc/ssh/ssh_known_hosts:1.4.30.1 --- src/etc/ssh/ssh_known_hosts:1.4 Tue Sep 26 21:57:06 2006 +++ src/etc/ssh/ssh_known_hosts Sun Aug 30 02:47:07 2009 @@ -1,12 +1,27 @@ -# $NetBSD: ssh_known_hosts,v 1.4 2006/09/26 21:57:06 tron Exp $ +# $NetBSD: ssh_known_hosts,v 1.4.30.1 2009/08/30 02:47:07 snj Exp $ # -anoncvs.netbsd.org 1024 33 124527836847225907702134616704062642655823674633646867489991942489052722003567896405835432181052901730304969527126160762854542328265293874791858398238222787853274712973179184350617008506840396224723739301126809289775083202762136105883911120059428253653584248682397589937086051061126544879545951581690785060623 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= -cvs.netbsd.org,cvs4.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= +cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= -ftp.netbsd.org,ftp4.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEApDHT2kauEY8RhFXgB5/QIlg3vbdLWvXSfofAvZQ6Ks5y3xKXYiMqKG/WEm5kkycpFMI4QBCA/wzi1/IiTFA2f2ZosxZlTVOhGPoyB6oEQPPHmLEjS3vzkc2Dwo59qF+6VGkRH+Yd2Q03gbxXKqEY7ck2GFsSpIzdA0fm3jwmb+E= +ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM= www.netbsd.org,www4.netbsd.org,gnats.netbsd.org,releng.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s= + +pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0= + +build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc= + +blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0= + +mollari.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0= + +garibaldi.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA7CW/T6MxwXi2qAQSGnSRXqwlwhrKsKVj3VKbsPpFf3fg28259fpqBYHgE4qWlhxg/wEtHoMaxRee1H3KaQwj88ez4fYMgDRkDgFY+NlwII/vgeFFKvjZvzsmfLP75uXC9YS/AlagHmIeubu4ymlgQ29fpwacKmrgCLTrEIXMHPc= + +babylon5.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEApDHT2kauEY8RhFXgB5/QIlg3vbdLWvXSfofAvZQ6Ks5y3xKXYiMqKG/WEm5kkycpFMI4QBCA/wzi1/IiTFA2f2ZosxZlTVOhGPoyB6oEQPPHmLEjS3vzkc2Dwo59qF+6VGkRH+Yd2Q03gbxXKqEY7ck2GFsSpIzdA0fm3jwmb+E= + +morden.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= + +narn.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
CVS commit: [netbsd-5] src/etc/ssh
Module Name:src Committed By: snj Date: Sun Aug 30 02:49:08 UTC 2009 Modified Files: src/etc/ssh [netbsd-5]: ssh_known_hosts Log Message: Pull up following revision(s) (requested by spz in ticket #930): etc/ssh/ssh_known_hosts: revision 1.5 add morden, mollari, pkgbuild and build adjust function names' keys add the proper names of hosts too in preparation of their function moving To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.26.1 src/etc/ssh/ssh_known_hosts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/ssh/ssh_known_hosts diff -u src/etc/ssh/ssh_known_hosts:1.4 src/etc/ssh/ssh_known_hosts:1.4.26.1 --- src/etc/ssh/ssh_known_hosts:1.4 Tue Sep 26 21:57:06 2006 +++ src/etc/ssh/ssh_known_hosts Sun Aug 30 02:49:08 2009 @@ -1,12 +1,27 @@ -# $NetBSD: ssh_known_hosts,v 1.4 2006/09/26 21:57:06 tron Exp $ +# $NetBSD: ssh_known_hosts,v 1.4.26.1 2009/08/30 02:49:08 snj Exp $ # -anoncvs.netbsd.org 1024 33 124527836847225907702134616704062642655823674633646867489991942489052722003567896405835432181052901730304969527126160762854542328265293874791858398238222787853274712973179184350617008506840396224723739301126809289775083202762136105883911120059428253653584248682397589937086051061126544879545951581690785060623 anoncvs.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA3QiBl8leG9fqIJpKeNov0PKq5YryFFiroMWOPUv4hDFn8R0jC07YVaR/OSBrr37CTmGX5AFceXPzoFnLlwCqWR7rXg4NR75FTlTp9CG9EBAEtU8mee27KDrUFBTZdfVl2+aRYoAI5fTXA+0vpIO68Cq843vRWUZCcwinS4cNLUU= -cvs.netbsd.org,cvs4.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= +cvs.netbsd.org,cvs4.netbsd.org,cvs6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA1b7MS3j0v6NzPr/Snh8OJTILvGLD9OA/zdrTfzQdq3doJjkLKJhD4WYj8SonaauEKuqzdJa1KVilj44GCrJBnjwbWg2BdJWLzB5YFmNgvmXwoqrl9kRyzMVk47UOxeREIipXldKajkCTc/nwa1mGrsCwVlC+TwAhWIyjyza6MOk= -ftp.netbsd.org,ftp4.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEApDHT2kauEY8RhFXgB5/QIlg3vbdLWvXSfofAvZQ6Ks5y3xKXYiMqKG/WEm5kkycpFMI4QBCA/wzi1/IiTFA2f2ZosxZlTVOhGPoyB6oEQPPHmLEjS3vzkc2Dwo59qF+6VGkRH+Yd2Q03gbxXKqEY7ck2GFsSpIzdA0fm3jwmb+E= +ftp.netbsd.org,ftp4.netbsd.org,ftp6.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= mail.netbsd.org,homeworld.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAt8UJLhW8iou8Ack7V5XrzfCgzOkdK75+xDZePMBPg+CYDLnHbP1+KQaSrvfnvDzCvgOUXHOkGji1jbrtzDYwv7Itw0hRUo7TxR99c3bTomb9U0vWV5k4FDIyz4xJXWBJMVkKseAWAXgnc5FSdB6V/e21TAISJBl9dolhqOGVsxM= www.netbsd.org,www4.netbsd.org,gnats.netbsd.org,releng.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s= + +pkgbuild.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAz2c3dFuPdL75gpvwiYinwQ5jiRlfe3HvbXbMkTvpZxLFBQWTVkcDr/yd+vCiWcqVKVENX2tIvT91gPM9/iw7Wl82rxZ54jjaL0pWPL0yjSVhSFxff9pH+as5hgX4l1HjmXLB6v+MWyYVmOSpB01NfVVV2Z9+BGp3Y7i+U5pCdf0= + +build.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAzmmcuzoX0D/qDFdDJDyRgQGkUaNTEu7GdruMg1N+ajqvEoKQHQEEBrMdDbeYqCUYacHyhTRMrP6vZ27iX90rl9iS1lR2iPHp/mbnf+iV/BzdWROPvJWxp9/Am/DrYL+Idah5AYNnkC7fon9n+BeMqPDXYGYl/U+dAzp+8GHPhRc= + +blog.netbsd.org,rt.netbsd.org,monitor.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0= + +mollari.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEArWf/facPOPEDY9ZfTpiNHK0HQFv05VtvR/LzgBAXnugAD87VdlkSKTj97UGkEjxIVFDMc2Wfh5THeCNvl38sScY9JGtKaE1VSCdmmVyG2d1Ky4XjARS3l4/ZYiBbZRNGm34+ZlpxgXOGSgNB72RrBVK6upAweXpR7egY6fpiwi0= + +garibaldi.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEA7CW/T6MxwXi2qAQSGnSRXqwlwhrKsKVj3VKbsPpFf3fg28259fpqBYHgE4qWlhxg/wEtHoMaxRee1H3KaQwj88ez4fYMgDRkDgFY+NlwII/vgeFFKvjZvzsmfLP75uXC9YS/AlagHmIeubu4ymlgQ29fpwacKmrgCLTrEIXMHPc= + +babylon5.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEApDHT2kauEY8RhFXgB5/QIlg3vbdLWvXSfofAvZQ6Ks5y3xKXYiMqKG/WEm5kkycpFMI4QBCA/wzi1/IiTFA2f2ZosxZlTVOhGPoyB6oEQPPHmLEjS3vzkc2Dwo59qF+6VGkRH+Yd2Q03gbxXKqEY7ck2GFsSpIzdA0fm3jwmb+E= + +morden.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAv+tO1aHHsW1McwHgnJ28qsXn8gH8z/61yopJzmOKuHH07zBYOnhenAcni6E0+BRavSXXIuuTDdyxEyWcTqXoR0LEVShTzAFmZS3RyzTVl7A+Fp644lNnRaJh1380H+20uZjcKSPU0IudG5J7QllMbJY9RnIBFjGLzTb4vrC8GIc= + +narn.netbsd.org ssh-rsa B3NzaC1yc2EBIwAAAIEAyBrlCbbZ2lQxWt7c9Ru0byoOktalLWKJ4t0kzWp6C2oVa+Ll1c1TO2FJb34DCZqULfSHaMmKgq647d75npk9GeXXLk8QwcX6kNl7QFnHo7GUHnHtiZAjTMbYmYOaNLi1PjwyQH+9yeRQYsGW7xejTsyK0yuRKROdCl/QU9gkB3s=
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: snj Date: Sun Aug 30 02:51:25 UTC 2009 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.2 Log Message: Ticket 930. To generate a diff of this commit: cvs rdiff -u -r1.1.2.7 -r1.1.2.8 src/doc/CHANGES-5.0.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.0.2 diff -u src/doc/CHANGES-5.0.2:1.1.2.7 src/doc/CHANGES-5.0.2:1.1.2.8 --- src/doc/CHANGES-5.0.2:1.1.2.7 Tue Aug 25 19:11:24 2009 +++ src/doc/CHANGES-5.0.2 Sun Aug 30 02:51:25 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.2,v 1.1.2.7 2009/08/25 19:11:24 snj Exp $ +# $NetBSD: CHANGES-5.0.2,v 1.1.2.8 2009/08/30 02:51:25 snj Exp $ A complete list of changes from the NetBSD 5.0.1 release to the NetBSD 5.0.2 release: @@ -183,3 +183,8 @@ as a bluetooth device [plunky, ticket #926] +etc/ssh/ssh_known_hosts1.5 + + Update and add some TNF ssh keys. + [spz, ticket #930] +
CVS commit: [netbsd-5] src/sys/external/bsd/drm/dist/bsd-core
Module Name:src
Committed By: snj
Date: Sun Aug 30 02:52:31 UTC 2009
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core [netbsd-5]: drm_drv.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #927):
sys/external/bsd/drm/dist/bsd-core/drm_drv.c: revision 1.15
on netbsd with the single final close() action, make sure we clean up
all the files attached to dev->files. we check for one per "open_count"
that is above 1. could perhaps assert() that we are empty afterwards.
this fixes restarting X + drm after actually using drm.
To generate a diff of this commit:
cvs rdiff -u -r1.10.10.1 -r1.10.10.2 \
src/sys/external/bsd/drm/dist/bsd-core/drm_drv.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/external/bsd/drm/dist/bsd-core/drm_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.10.10.1 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.10.10.2
--- src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.10.10.1 Sat Jun 20 23:36:59 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c Sun Aug 30 02:52:31 2009
@@ -932,7 +932,17 @@
#if defined(__NetBSD__)
/* On NetBSD, close will only be called once */
DRM_DEBUG("setting open_count %d to 1\n", (int)dev->open_count);
- dev->open_count = 1;
+ while (dev->open_count != 1) {
+ /*
+ * XXXMRG probably should assert that we are freeing
+ * one of these each time. i think.
+ */
+ if (!TAILQ_EMPTY(&dev->files)) {
+ file_priv = TAILQ_FIRST(&dev->files);
+ TAILQ_REMOVE(&dev->files, file_priv, link);
+ }
+ dev->open_count--;
+ }
#endif
if (--dev->open_count == 0) {
retcode = drm_lastclose(dev);
CVS commit: [netbsd-5] src/sys/external/bsd/drm/dist/bsd-core
Module Name:src
Committed By: snj
Date: Sun Aug 30 02:55:07 UTC 2009
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core [netbsd-5]: drm_drv.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #935):
sys/external/bsd/drm/dist/bsd-core/drm_drv.c: revision 1.16
introduce an ugly but simple hack to work around external software
requirements: set the drm pci "domain" to the pci bus unit number.
this matches what libpciaccess does for netbsd and now drm is much
happier again.
To generate a diff of this commit:
cvs rdiff -u -r1.10.10.2 -r1.10.10.3 \
src/sys/external/bsd/drm/dist/bsd-core/drm_drv.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/external/bsd/drm/dist/bsd-core/drm_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.10.10.2 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.10.10.3
--- src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.10.10.2 Sun Aug 30 02:52:31 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c Sun Aug 30 02:55:07 2009
@@ -334,14 +334,27 @@
void
drm_attach(device_t kdev, struct pci_attach_args *pa, drm_pci_id_list_t *idlist)
{
+ device_t parent_dev;
struct drm_device *dev;
- int unit;
+ int unit, parent_unit;
unit = device_unit(kdev);
if (unit < 0 || unit >= DRM_MAXUNITS)
- panic("drm_attach: device unit %d invalid", unit);
+ panic("drm_attach: device unit %d invalid", unit);
if (drm_units[unit] != NULL)
- panic("drm_attach: unit %d already attached", unit);
+ panic("drm_attach: unit %d already attached", unit);
+
+ /*
+ * this is kind of ugly but we fake up the pci "domain" by using
+ * our pci unit number, so, find our parent pci device's unit...
+ */
+ parent_dev = kdev;
+ do {
+ parent_dev = device_parent(parent_dev);
+ } while (parent_dev && !device_is_a(parent_dev, "pci"));
+ parent_unit = device_unit(parent_dev);
+ if (parent_unit < 0)
+ panic("drm_attach: device parent_unit %d invalid", parent_unit);
dev = device_private(kdev);
dev->device = kdev;
@@ -389,8 +402,7 @@
memcpy(&dev->pa, pa, sizeof(dev->pa));
dev->irq = pa->pa_intrline;
- /* XXX this needs to be deal with for other platforms, e.g. alpha */
- dev->pci_domain = 0;
+ dev->pci_domain = parent_unit;
dev->pci_bus = pa->pa_bus;
dev->pci_slot = pa->pa_device;
dev->pci_func = pa->pa_function;
CVS commit: [netbsd-5] src/sys/external/bsd/drm/dist/bsd-core
Module Name:src
Committed By: snj
Date: Sun Aug 30 02:57:21 UTC 2009
Modified Files:
src/sys/external/bsd/drm/dist/bsd-core [netbsd-5]: drm_drv.c
Log Message:
Pull up following revision(s) (requested by mrg in ticket #936):
sys/external/bsd/drm/dist/bsd-core/drm_drv.c: revision 1.14
convert a DRM_ERROR() to DRM_DEBUG(). its failure is not fatal
and it tends to trigger on almost all cards.
To generate a diff of this commit:
cvs rdiff -u -r1.10.10.3 -r1.10.10.4 \
src/sys/external/bsd/drm/dist/bsd-core/drm_drv.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/external/bsd/drm/dist/bsd-core/drm_drv.c
diff -u src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.10.10.3 src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.10.10.4
--- src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c:1.10.10.3 Sun Aug 30 02:55:07 2009
+++ src/sys/external/bsd/drm/dist/bsd-core/drm_drv.c Sun Aug 30 02:57:21 2009
@@ -373,7 +373,7 @@
&(dev->pci_map_data[unit].size),
&(dev->pci_map_data[unit].flags)))
{
- DRM_ERROR("pci_mapreg info for %d failed\n",
+ DRM_DEBUG("pci_mapreg info for %d failed\n",
PCI_MAPREG_START + unit*4);
dev->pci_map_data[unit].base = 0;
dev->pci_map_data[unit].size = 0;
CVS commit: [netbsd-5] src/sys/dev/acpi
Module Name:src
Committed By: snj
Date: Sun Aug 30 03:01:26 UTC 2009
Modified Files:
src/sys/dev/acpi [netbsd-5]: asus_acpi.c files.acpi
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #891):
sys/dev/acpi/asus_acpi.c: revision 1.7
sys/dev/acpi/files.acpi: revision 1.54
- add experimental cpu fan/voltage switching support (sysctl hw.asus0.*)
- add fan sensor
- rename asus_softc_t -> struct asus_softc
- add detach method
- update copyright for 2009
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.4.1 src/sys/dev/acpi/asus_acpi.c
cvs rdiff -u -r1.52 -r1.52.8.1 src/sys/dev/acpi/files.acpi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.6 src/sys/dev/acpi/asus_acpi.c:1.6.4.1
--- src/sys/dev/acpi/asus_acpi.c:1.6 Sun Sep 21 21:15:28 2008
+++ src/sys/dev/acpi/asus_acpi.c Sun Aug 30 03:01:26 2009
@@ -1,7 +1,7 @@
-/* $NetBSD: asus_acpi.c,v 1.6 2008/09/21 21:15:28 jmcneill Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.6.4.1 2009/08/30 03:01:26 snj Exp $ */
/*-
- * Copyright (c) 2007, 2008 Jared D. McNeill
+ * Copyright (c) 2007, 2008, 2009 Jared D. McNeill
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.6 2008/09/21 21:15:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.6.4.1 2009/08/30 03:01:26 snj Exp $");
#include
#include
@@ -36,11 +36,11 @@
#include
#include
#include
-#include
+#include
#include
-typedef struct asus_softc {
+struct asus_softc {
device_t sc_dev;
struct acpi_devnode *sc_node;
@@ -49,8 +49,18 @@
struct sysmon_pswitch sc_smpsw[ASUS_PSW_LAST];
bool sc_smpsw_valid;
+ struct sysmon_envsys *sc_sme;
+#define ASUS_SENSOR_FAN 0
+#define ASUS_SENSOR_LAST 1
+ envsys_data_t sc_sensor[ASUS_SENSOR_LAST];
+
ACPI_INTEGER sc_brightness;
-} asus_softc_t;
+ ACPI_INTEGER sc_cfvnum;
+
+ struct sysctllog *sc_log;
+ int sc_cfv_mib;
+ int sc_cfvnum_mib;
+};
#define ASUS_NOTIFY_WirelessSwitch 0x10
#define ASUS_NOTIFY_BrightnessLow 0x20
@@ -70,9 +80,15 @@
(ASUS_SDSP_LCD | ASUS_SDSP_CRT | ASUS_SDSP_TV | ASUS_SDSP_DVI)
#define ASUS_METHOD_PBLG "PBLG"
#define ASUS_METHOD_PBLS "PBLS"
+#define ASUS_METHOD_CFVS "CFVS"
+#define ASUS_METHOD_CFVG "CFVG"
+
+#define ASUS_EC_METHOD_FAN_RPMH "\\_SB.PCI0.SBRG.EC0.SC05"
+#define ASUS_EC_METHOD_FAN_RPML "\\_SB.PCI0.SBRG.EC0.SC06"
static int asus_match(device_t, cfdata_t, void *);
static void asus_attach(device_t, device_t, void *);
+static int asus_detach(device_t, int);
static void asus_notify_handler(ACPI_HANDLE, UINT32, void *);
@@ -80,8 +96,13 @@
static bool asus_suspend(device_t PMF_FN_PROTO);
static bool asus_resume(device_t PMF_FN_PROTO);
-CFATTACH_DECL_NEW(asus, sizeof(asus_softc_t),
-asus_match, asus_attach, NULL, NULL);
+static void asus_sysctl_setup(struct asus_softc *);
+
+static void asus_sensors_refresh(struct sysmon_envsys *, envsys_data_t *);
+static bool asus_get_fan_speed(struct asus_softc *, uint32_t *);
+
+CFATTACH_DECL_NEW(asus, sizeof(struct asus_softc),
+asus_match, asus_attach, asus_detach, NULL);
static const char * const asus_ids[] = {
"ASUS010",
@@ -102,7 +123,7 @@
static void
asus_attach(device_t parent, device_t self, void *opaque)
{
- asus_softc_t *sc = device_private(self);
+ struct asus_softc *sc = device_private(self);
struct acpi_attach_args *aa = opaque;
ACPI_STATUS rv;
@@ -124,6 +145,27 @@
sc->sc_smpsw_valid = false;
}
+ if (asus_get_fan_speed(sc, NULL) == false)
+ goto nosensors;
+
+ sc->sc_sme = sysmon_envsys_create();
+
+ strcpy(sc->sc_sensor[ASUS_SENSOR_FAN].desc, "fan");
+ sc->sc_sensor[ASUS_SENSOR_FAN].units = ENVSYS_SFANRPM;
+ sysmon_envsys_sensor_attach(sc->sc_sme,
+ &sc->sc_sensor[ASUS_SENSOR_FAN]);
+
+ sc->sc_sme->sme_name = device_xname(self);
+ sc->sc_sme->sme_cookie = sc;
+ sc->sc_sme->sme_refresh = asus_sensors_refresh;
+
+ if (sysmon_envsys_register(sc->sc_sme)) {
+ aprint_error_dev(self, "couldn't register with envsys\n");
+ sysmon_envsys_destroy(sc->sc_sme);
+ sc->sc_sme = NULL;
+ }
+nosensors:
+
rv = AcpiInstallNotifyHandler(sc->sc_node->ad_handle, ACPI_ALL_NOTIFY,
asus_notify_handler, sc);
if (ACPI_FAILURE(rv))
@@ -134,10 +176,29 @@
aprint_error_dev(self, "couldn't establish power handler\n");
}
+static int
+asus_detach(device_t self, int flags)
+{
+ struct asus_softc *sc = device_private(self);
+ int i;
+
+ if (sc->sc_smpsw_valid)
+ for (i = 0; i < ASUS_PSW_LAST; i++)
+ sysmon_pswitch_unregister(&sc->sc_smpsw[i]);
+
+ if (sc->sc_sme)
+ sysmon_envsys_unregister(sc->sc_sme);
+ if (sc->sc_log)
+ sysctl_teardown(&sc->sc_log);
+ pmf_device_deregister(self);
+
+ return 0;
+}
+
static void
asus_notify_handler(ACPI_HANDLE hdl, UINT32 not
CVS commit: [netbsd-5] src/sys/dev/acpi
Module Name:src Committed By: snj Date: Sun Aug 30 03:02:32 UTC 2009 Modified Files: src/sys/dev/acpi [netbsd-5]: asus_acpi.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #891): sys/dev/acpi/asus_acpi.c: revision 1.8 add missing return, silences 'failed to add sysctl nodes. (0)' message when setup was successful To generate a diff of this commit: cvs rdiff -u -r1.6.4.1 -r1.6.4.2 src/sys/dev/acpi/asus_acpi.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/acpi/asus_acpi.c diff -u src/sys/dev/acpi/asus_acpi.c:1.6.4.1 src/sys/dev/acpi/asus_acpi.c:1.6.4.2 --- src/sys/dev/acpi/asus_acpi.c:1.6.4.1 Sun Aug 30 03:01:26 2009 +++ src/sys/dev/acpi/asus_acpi.c Sun Aug 30 03:02:32 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: asus_acpi.c,v 1.6.4.1 2009/08/30 03:01:26 snj Exp $ */ +/* $NetBSD: asus_acpi.c,v 1.6.4.2 2009/08/30 03:02:32 snj Exp $ */ /*- * Copyright (c) 2007, 2008, 2009 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.6.4.1 2009/08/30 03:01:26 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.6.4.2 2009/08/30 03:02:32 snj Exp $"); #include #include @@ -391,6 +391,7 @@ goto sysctl_err; sc->sc_cfv_mib = node_cfv->sysctl_num; + return; sysctl_err: aprint_error_dev(sc->sc_dev, "failed to add sysctl nodes. (%d)\n", err); }
CVS commit: [netbsd-5] src/sys/dev/acpi
Module Name:src
Committed By: snj
Date: Sun Aug 30 03:03:33 UTC 2009
Modified Files:
src/sys/dev/acpi [netbsd-5]: asus_acpi.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #891):
sys/dev/acpi/asus_acpi.c: revision 1.9
don't call asus_sysctl_setup from asus_init because that is called from
the resume handler, instead call it directly from asus_attach
To generate a diff of this commit:
cvs rdiff -u -r1.6.4.2 -r1.6.4.3 src/sys/dev/acpi/asus_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.6.4.2 src/sys/dev/acpi/asus_acpi.c:1.6.4.3
--- src/sys/dev/acpi/asus_acpi.c:1.6.4.2 Sun Aug 30 03:02:32 2009
+++ src/sys/dev/acpi/asus_acpi.c Sun Aug 30 03:03:33 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: asus_acpi.c,v 1.6.4.2 2009/08/30 03:02:32 snj Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.6.4.3 2009/08/30 03:03:33 snj Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.6.4.2 2009/08/30 03:02:32 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.6.4.3 2009/08/30 03:03:33 snj Exp $");
#include
#include
@@ -134,6 +134,7 @@
aprint_normal("\n");
asus_init(self);
+ asus_sysctl_setup(sc);
sc->sc_smpsw_valid = true;
sc->sc_smpsw[ASUS_PSW_DISPLAY_CYCLE].smpsw_name =
@@ -263,8 +264,6 @@
return;
sc->sc_cfvnum = (cfv >> 8) & 0xff;
-
- asus_sysctl_setup(sc);
}
static bool
CVS commit: [netbsd-5] src/sys/dev/acpi
Module Name:src
Committed By: snj
Date: Sun Aug 30 03:05:19 UTC 2009
Modified Files:
src/sys/dev/acpi [netbsd-5]: asus_acpi.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #891):
sys/dev/acpi/asus_acpi.c: revision 1.10
Reading the fan speed is expensive, so set the undocumented SME_POLL_ONLY
flag on this sensor to ensure that the data is only refreshed on demand.
To generate a diff of this commit:
cvs rdiff -u -r1.6.4.3 -r1.6.4.4 src/sys/dev/acpi/asus_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/asus_acpi.c
diff -u src/sys/dev/acpi/asus_acpi.c:1.6.4.3 src/sys/dev/acpi/asus_acpi.c:1.6.4.4
--- src/sys/dev/acpi/asus_acpi.c:1.6.4.3 Sun Aug 30 03:03:33 2009
+++ src/sys/dev/acpi/asus_acpi.c Sun Aug 30 03:05:19 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: asus_acpi.c,v 1.6.4.3 2009/08/30 03:03:33 snj Exp $ */
+/* $NetBSD: asus_acpi.c,v 1.6.4.4 2009/08/30 03:05:19 snj Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.6.4.3 2009/08/30 03:03:33 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: asus_acpi.c,v 1.6.4.4 2009/08/30 03:05:19 snj Exp $");
#include
#include
@@ -159,6 +159,7 @@
sc->sc_sme->sme_name = device_xname(self);
sc->sc_sme->sme_cookie = sc;
sc->sc_sme->sme_refresh = asus_sensors_refresh;
+ sc->sc_sme->sme_flags = SME_POLL_ONLY;
if (sysmon_envsys_register(sc->sc_sme)) {
aprint_error_dev(self, "couldn't register with envsys\n");
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: snj Date: Sun Aug 30 03:08:11 UTC 2009 Modified Files: src/doc [netbsd-5]: CHANGES-5.1 Log Message: Tickets 891, 927, 930, 935, and 936. To generate a diff of this commit: cvs rdiff -u -r1.1.2.62 -r1.1.2.63 src/doc/CHANGES-5.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1 diff -u src/doc/CHANGES-5.1:1.1.2.62 src/doc/CHANGES-5.1:1.1.2.63 --- src/doc/CHANGES-5.1:1.1.2.62 Tue Aug 25 19:12:43 2009 +++ src/doc/CHANGES-5.1 Sun Aug 30 03:08:11 2009 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1,v 1.1.2.62 2009/08/25 19:12:43 snj Exp $ +# $NetBSD: CHANGES-5.1,v 1.1.2.63 2009/08/30 03:08:11 snj Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -2249,3 +2249,40 @@ as a bluetooth device [plunky, ticket #926] +etc/ssh/ssh_known_hosts1.5 + + Update and add some TNF ssh keys. + [spz, ticket #930] + +sys/external/bsd/drm/dist/bsd-core/drm_drv.c 1.15 + + On netbsd with the single final close() action, make sure we + clean up all the files attached to dev->files. we check for + one per "open_count" that is above 1. This fixes restarting + X + drm after actually using drm. + [mrg, ticket #927] + +sys/external/bsd/drm/dist/bsd-core/drm_drv.c 1.16 + + Introduce an ugly but simple hack to work around external + software requirements: set the drm pci "domain" to the pci bus + unit number. this matches what libpciaccess does for netbsd and + now drm is much happier again. + [mrg, ticket #935] + +sys/external/bsd/drm/dist/bsd-core/drm_drv.c 1.14 + + Convert a DRM_ERROR() to DRM_DEBUG(). Its failure is not fatal + and it tends to trigger on almost all cards. + [mrg, ticket #936] + +sys/dev/acpi/asus_acpi.c 1.7-1.10 +sys/dev/acpi/files.acpi1.54 + + - Add experimental cpu fan/voltage switching support + (sysctl hw.asus0.*) + - Add fan sensor + - Rename asus_softc_t -> struct asus_softc + - Add detach method + [jmcneill, ticket #891] +
