CVS commit: src/tests/ipf
Module Name:src Committed By: martin Date: Tue Feb 14 09:17:22 UTC 2012 Modified Files: src/tests/ipf: t_nat_exec.sh Log Message: Comment out test n3_6 - the data files are missing To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/ipf/t_nat_exec.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/ipf/t_nat_exec.sh diff -u src/tests/ipf/t_nat_exec.sh:1.4 src/tests/ipf/t_nat_exec.sh:1.5 --- src/tests/ipf/t_nat_exec.sh:1.4 Mon Feb 13 18:52:53 2012 +++ src/tests/ipf/t_nat_exec.sh Tue Feb 14 09:17:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_nat_exec.sh,v 1.4 2012/02/13 18:52:53 darrenr Exp $ +# $NetBSD: t_nat_exec.sh,v 1.5 2012/02/14 09:17:22 martin Exp $ # # Copyright (c) 2008, 2010 The NetBSD Foundation, Inc. # All rights reserved. @@ -129,7 +129,7 @@ atf_init_test_cases() atf_add_test_case n1_6 atf_add_test_case n2_6 - atf_add_test_case n3_6 +# atf_add_test_case n3_6 atf_add_test_case n4_6 atf_add_test_case n5_6 atf_add_test_case n6_6
CVS commit: othersrc/usr.bin/protoz
Module Name:othersrc Committed By: wiz Date: Tue Feb 14 10:50:34 UTC 2012 Modified Files: othersrc/usr.bin/protoz: protoz Log Message: Add missing word in comment. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 othersrc/usr.bin/protoz/protoz Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/protoz/protoz diff -u othersrc/usr.bin/protoz/protoz:1.2 othersrc/usr.bin/protoz/protoz:1.3 --- othersrc/usr.bin/protoz/protoz:1.2 Mon Feb 13 15:04:49 2012 +++ othersrc/usr.bin/protoz/protoz Tue Feb 14 10:50:34 2012 @@ -1,5 +1,5 @@ #! /bin/sh -# $NetBSD: protoz,v 1.2 2012/02/13 15:04:49 apb Exp $ +# $NetBSD: protoz,v 1.3 2012/02/14 10:50:34 wiz Exp $ # # Copyright (c) 2009,2012 The NetBSD Foundation, Inc. # All rights reserved. @@ -35,7 +35,7 @@ # # When run with args, it expects them to be file or directory names. # Each file is edited regardless of its name. Each directory -# is searched for *.c files that could benefit from edited. +# is searched for *.c files that could benefit from being edited. # # BUGS: # Dpesn't handle functions with no arguments
CVS commit: src/sbin/wsconsctl
Module Name:src Committed By: wiz Date: Tue Feb 14 11:05:32 UTC 2012 Modified Files: src/sbin/wsconsctl: wsconsctl.8 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sbin/wsconsctl/wsconsctl.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/wsconsctl/wsconsctl.8 diff -u src/sbin/wsconsctl/wsconsctl.8:1.27 src/sbin/wsconsctl/wsconsctl.8:1.28 --- src/sbin/wsconsctl/wsconsctl.8:1.27 Tue Jun 9 19:46:32 2009 +++ src/sbin/wsconsctl/wsconsctl.8 Tue Feb 14 11:05:32 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: wsconsctl.8,v 1.27 2009/06/09 19:46:32 snj Exp $ +.\ $NetBSD: wsconsctl.8,v 1.28 2012/02/14 11:05:32 wiz Exp $ .\ .\ Copyright (c) 1998, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -118,7 +118,7 @@ emulation and graphics (mapped) modes. In addition to British, US, and US-Dvorak keyboard encodings, support currently exists for the following languages: Belgian, Danish, Finnish, French, German, Greek, Hungarian, Italian, Japanese, Norwegian, Polish, -Portugese, Russian, Spanish, Swedish, Swiss, and Ukrainian. +Portuguese, Russian, Spanish, Swedish, Swiss, and Ukrainian. Additionally, a user-defined encoding is supported. .Sh FILES .Bl -tag -width /dev/wsmouse
CVS commit: src/external/gpl3/gcc/dist/gcc/config/sparc
Module Name:src Committed By: nakayama Date: Tue Feb 14 11:25:05 UTC 2012 Modified Files: src/external/gpl3/gcc/dist/gcc/config/sparc: netbsd-elf.h Log Message: The default configuration for TLS support is supposed to use Sun as, but we use GNU as. So in this case it generates wrong relocations in non-PIC mode. This change fixes lib/libc/tls/t_tls_dynamic test failure on 32-bit sparc as described in PR toolchain/45985. Approved by releng. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h diff -u src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.3 src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.4 --- src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h:1.3 Fri Jul 1 01:24:04 2011 +++ src/external/gpl3/gcc/dist/gcc/config/sparc/netbsd-elf.h Tue Feb 14 11:25:05 2012 @@ -266,6 +266,13 @@ along with GCC; see the file COPYING3. #endif /* SPARC_BI_ARCH */ +#ifdef HAVE_AS_TLS +#undef TARGET_SUN_TLS +#undef TARGET_GNU_TLS +#define TARGET_SUN_TLS 0 +#define TARGET_GNU_TLS 1 +#endif + /* We use GNU ld so undefine this so that attribute((init_priority)) works. */ #undef CTORS_SECTION_ASM_OP #undef DTORS_SECTION_ASM_OP
CVS commit: src/sys/arch/bebox/stand/boot
Module Name:src Committed By: kiyohara Date: Tue Feb 14 11:44:47 UTC 2012 Modified Files: src/sys/arch/bebox/stand/boot: siop.c Log Message: Remove unused a valiable 'siopdbg'. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/bebox/stand/boot/siop.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/bebox/stand/boot/siop.c diff -u src/sys/arch/bebox/stand/boot/siop.c:1.1 src/sys/arch/bebox/stand/boot/siop.c:1.2 --- src/sys/arch/bebox/stand/boot/siop.c:1.1 Thu Oct 14 06:58:22 2010 +++ src/sys/arch/bebox/stand/boot/siop.c Tue Feb 14 11:44:47 2012 @@ -1,5 +1,4 @@ -int siopdbg = 0; -/* $NetBSD: siop.c,v 1.1 2010/10/14 06:58:22 kiyohara Exp $ */ +/* $NetBSD: siop.c,v 1.2 2012/02/14 11:44:47 kiyohara Exp $ */ /* * Copyright (c) 2010 KIYOHARA Takashi * All rights reserved.
CVS commit: src/sys/arch/arm/iomd
Module Name:src Committed By: skrll Date: Tue Feb 14 13:04:52 UTC 2012 Modified Files: src/sys/arch/arm/iomd: vidcvideo.c Log Message: Pass RI_NO_AUTO to rasops_init so that rasops doesn't attempt to allocate memory as we're too early in kernel startup for this. My A7000 boots now. OK releng. ack 3 nak 0. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/arm/iomd/vidcvideo.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/arm/iomd/vidcvideo.c diff -u src/sys/arch/arm/iomd/vidcvideo.c:1.39 src/sys/arch/arm/iomd/vidcvideo.c:1.40 --- src/sys/arch/arm/iomd/vidcvideo.c:1.39 Fri Jul 1 20:26:35 2011 +++ src/sys/arch/arm/iomd/vidcvideo.c Tue Feb 14 13:04:51 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: vidcvideo.c,v 1.39 2011/07/01 20:26:35 dyoung Exp $ */ +/* $NetBSD: vidcvideo.c,v 1.40 2012/02/14 13:04:51 skrll Exp $ */ /* * Copyright (c) 2001 Reinoud Zandijk @@ -30,7 +30,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: vidcvideo.c,v 1.39 2011/07/01 20:26:35 dyoung Exp $); +__KERNEL_RCSID(0, $NetBSD: vidcvideo.c,v 1.40 2012/02/14 13:04:51 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -267,7 +267,7 @@ vidcvideoinit_screen(void *cookie, struc if ((scr == dc-dc_console) (dc-dc_vd.active != NULL)) return; - ri-ri_flg= 0; /* RI_CENTER | RI_FULLCLEAR; */ + ri-ri_flg= RI_NO_AUTO ; /* RI_CENTER | RI_FULLCLEAR; */ ri-ri_depth = dc-dc_depth; ri-ri_bits = (void *) dc-dc_videobase; ri-ri_width = dc-dc_width;
CVS commit: src/sys/dev/pcmcia
Module Name:src Committed By: drochner Date: Tue Feb 14 13:51:20 UTC 2012 Modified Files: src/sys/dev/pcmcia: xirc.c Log Message: fix incomplete device_t/softc split which led to crash on attachment, closes PR kern/45874 by Hauke Fath approved by releng To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pcmcia/xirc.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/pcmcia/xirc.c diff -u src/sys/dev/pcmcia/xirc.c:1.32 src/sys/dev/pcmcia/xirc.c:1.33 --- src/sys/dev/pcmcia/xirc.c:1.32 Tue Jan 19 22:07:43 2010 +++ src/sys/dev/pcmcia/xirc.c Tue Feb 14 13:51:19 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: xirc.c,v 1.32 2010/01/19 22:07:43 pooka Exp $ */ +/* $NetBSD: xirc.c,v 1.33 2012/02/14 13:51:19 drochner Exp $ */ /*- * Copyright (c) 1999, 2000, 2004 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xirc.c,v 1.32 2010/01/19 22:07:43 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: xirc.c,v 1.33 2012/02/14 13:51:19 drochner Exp $); #include opt_inet.h @@ -602,7 +602,7 @@ int xi_xirc_match(device_t, cfdata_t, vo void xi_xirc_attach(device_t, device_t, void *); /* No xirc-specific goo in the softc; it's all in the parent. */ -CFATTACH_DECL(xi_xirc, sizeof(struct xi_softc), +CFATTACH_DECL_NEW(xi_xirc, sizeof(struct xi_softc), xi_xirc_match, xi_xirc_attach, xi_detach, NULL); int xi_xirc_enable(struct xi_softc *);
CVS commit: src
Module Name:src Committed By: wiz Date: Tue Feb 14 14:03:35 UTC 2012 Modified Files: src/distrib/sets/lists/base: mi src/etc: man.conf src/etc/mtree: NetBSD.dist.base Log Message: Obsolete /usr/share/man/cat3f that never contained any files, nor will it. To generate a diff of this commit: cvs rdiff -u -r1.983 -r1.984 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.28 -r1.29 src/etc/man.conf cvs rdiff -u -r1.96 -r1.97 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.983 src/distrib/sets/lists/base/mi:1.984 --- src/distrib/sets/lists/base/mi:1.983 Mon Feb 13 01:43:22 2012 +++ src/distrib/sets/lists/base/mi Tue Feb 14 14:03:34 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.983 2012/02/13 01:43:22 dholland Exp $ +# $NetBSD: mi,v 1.984 2012/02/14 14:03:34 wiz Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -3371,7 +3371,7 @@ ./usr/share/man/cat2base-man-share ./usr/share/man/cat3base-man-share ./usr/share/man/cat3/atari base-obsolete obsolete -./usr/share/man/cat3fbase-man-share +./usr/share/man/cat3fbase-obsolete obsolete ./usr/share/man/cat4base-man-share ./usr/share/man/cat4/acorn26 base-man-share ./usr/share/man/cat4/acorn32 base-man-share Index: src/etc/man.conf diff -u src/etc/man.conf:1.28 src/etc/man.conf:1.29 --- src/etc/man.conf:1.28 Tue Feb 7 23:15:33 2012 +++ src/etc/man.conf Tue Feb 14 14:03:35 2012 @@ -1,4 +1,4 @@ -# $NetBSD: man.conf,v 1.28 2012/02/07 23:15:33 joerg Exp $ +# $NetBSD: man.conf,v 1.29 2012/02/14 14:03:35 wiz Exp $ # Sheer, raging paranoia... _version BSD.2 @@ -11,7 +11,7 @@ _whatdb /usr/pkg/man/whatis.db _whatdb /usr/local/man/whatis.db # Subdirectories for paths ending in '/', IN SEARCH ORDER. -_subdir cat1 man1 cat8 man8 cat6 man6 cat2 man2 cat3 man3 cat4 man4 cat5 man5 cat7 man7 cat3f man3f cat9 man9 catn mann catl manl +_subdir cat1 man1 cat8 man8 cat6 man6 cat2 man2 cat3 man3 cat4 man4 cat5 man5 cat7 man7 man3f cat9 man9 catn mann catl manl # Files typed by suffix and their commands. # Note the order, .Z must come after .[1-9].Z, or it will match first. Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.96 src/etc/mtree/NetBSD.dist.base:1.97 --- src/etc/mtree/NetBSD.dist.base:1.96 Sat Jan 28 05:32:49 2012 +++ src/etc/mtree/NetBSD.dist.base Tue Feb 14 14:03:35 2012 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.96 2012/01/28 05:32:49 pgoyette Exp $ +# $NetBSD: NetBSD.dist.base,v 1.97 2012/02/14 14:03:35 wiz Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -717,7 +717,6 @@ ./usr/share/man/cat1/x68k ./usr/share/man/cat2 ./usr/share/man/cat3 -./usr/share/man/cat3f ./usr/share/man/cat4 ./usr/share/man/cat4/acorn26 ./usr/share/man/cat4/acorn32
CVS commit: src/sys/arch/arm/iomd
Module Name:src Committed By: skrll Date: Tue Feb 14 14:33:54 UTC 2012 Modified Files: src/sys/arch/arm/iomd: vidcvideo.c Log Message: Whitespace in previous. Ride previous releng OK. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/arm/iomd/vidcvideo.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/arm/iomd/vidcvideo.c diff -u src/sys/arch/arm/iomd/vidcvideo.c:1.40 src/sys/arch/arm/iomd/vidcvideo.c:1.41 --- src/sys/arch/arm/iomd/vidcvideo.c:1.40 Tue Feb 14 13:04:51 2012 +++ src/sys/arch/arm/iomd/vidcvideo.c Tue Feb 14 14:33:53 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: vidcvideo.c,v 1.40 2012/02/14 13:04:51 skrll Exp $ */ +/* $NetBSD: vidcvideo.c,v 1.41 2012/02/14 14:33:53 skrll Exp $ */ /* * Copyright (c) 2001 Reinoud Zandijk @@ -30,7 +30,7 @@ #include sys/cdefs.h /* RCS ID Copyright macro defns */ -__KERNEL_RCSID(0, $NetBSD: vidcvideo.c,v 1.40 2012/02/14 13:04:51 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: vidcvideo.c,v 1.41 2012/02/14 14:33:53 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -267,7 +267,7 @@ vidcvideoinit_screen(void *cookie, struc if ((scr == dc-dc_console) (dc-dc_vd.active != NULL)) return; - ri-ri_flg= RI_NO_AUTO ; /* RI_CENTER | RI_FULLCLEAR; */ + ri-ri_flg= RI_NO_AUTO; /* RI_CENTER | RI_FULLCLEAR; */ ri-ri_depth = dc-dc_depth; ri-ri_bits = (void *) dc-dc_videobase; ri-ri_width = dc-dc_width;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: pgoyette
Date: Tue Feb 14 15:08:07 UTC 2012
Modified Files:
src/sys/dev/pci: amdpm_smbus.c amdpmvar.h ichsmb.c nfsmb.c piixpm.c
Log Message:
/home/paul/COMMIT
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/amdpm_smbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/pci/amdpmvar.h
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/pci/ichsmb.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/nfsmb.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/pci/piixpm.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/amdpm_smbus.c
diff -u src/sys/dev/pci/amdpm_smbus.c:1.17 src/sys/dev/pci/amdpm_smbus.c:1.18
--- src/sys/dev/pci/amdpm_smbus.c:1.17 Sat Nov 19 02:39:14 2011
+++ src/sys/dev/pci/amdpm_smbus.c Tue Feb 14 15:08:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: amdpm_smbus.c,v 1.17 2011/11/19 02:39:14 christos Exp $ */
+/* $NetBSD: amdpm_smbus.c,v 1.18 2012/02/14 15:08:07 pgoyette Exp $ */
/*
* Copyright (c) 2005 Anil Gopinath (anil_pub...@yahoo.com)
@@ -32,14 +32,14 @@
* AMD-8111 HyperTransport I/O Hub
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amdpm_smbus.c,v 1.17 2011/11/19 02:39:14 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: amdpm_smbus.c,v 1.18 2012/02/14 15:08:07 pgoyette Exp $);
#include sys/param.h
#include sys/systm.h
#include sys/kernel.h
#include sys/device.h
#include sys/rnd.h
-#include sys/rwlock.h
+#include sys/mutex.h
#include dev/pci/pcireg.h
#include dev/pci/pcivar.h
@@ -83,7 +83,7 @@ amdpm_smbus_attach(struct amdpm_softc *s
sc-sc_i2c.ic_write_byte = NULL;
sc-sc_i2c.ic_exec = amdpm_smbus_exec;
- rw_init(sc-sc_rwlock);
+ mutex_init(sc-sc_mutex, MUTEX_DEFAULT, IPL_NONE);
iba.iba_tag = sc-sc_i2c;
(void)config_found_ia(sc-sc_dev, i2cbus, iba, iicbus_print);
@@ -94,7 +94,7 @@ amdpm_smbus_acquire_bus(void *cookie, in
{
struct amdpm_softc *sc = cookie;
- rw_enter(sc-sc_rwlock, RW_WRITER);
+ mutex_enter(sc-sc_mutex);
return 0;
}
@@ -103,7 +103,7 @@ amdpm_smbus_release_bus(void *cookie, in
{
struct amdpm_softc *sc = cookie;
- rw_exit(sc-sc_rwlock);
+ mutex_exit(sc-sc_mutex);
}
static int
Index: src/sys/dev/pci/amdpmvar.h
diff -u src/sys/dev/pci/amdpmvar.h:1.7 src/sys/dev/pci/amdpmvar.h:1.8
--- src/sys/dev/pci/amdpmvar.h:1.7 Sat Nov 19 22:51:23 2011
+++ src/sys/dev/pci/amdpmvar.h Tue Feb 14 15:08:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: amdpmvar.h,v 1.7 2011/11/19 22:51:23 tls Exp $ */
+/* $NetBSD: amdpmvar.h,v 1.8 2012/02/14 15:08:07 pgoyette Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#ifndef _DEV_PCI_AMDPMVAR_H_
#define _DEV_PCI_AMDPMVAR_H_
-#include sys/rwlock.h
+#include sys/mutex.h
struct amdpm_softc {
struct device sc_dev;
@@ -47,7 +47,7 @@ struct amdpm_softc {
i2c_addr_t sc_smbus_slaveaddr; /* address of smbus slave */
struct i2c_controller sc_i2c; /* i2c controller info */
- krwlock_t sc_rwlock;
+ kmutex_t sc_mutex;
void *sc_ih;
Index: src/sys/dev/pci/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.26 src/sys/dev/pci/ichsmb.c:1.27
--- src/sys/dev/pci/ichsmb.c:1.26 Mon Jan 30 19:41:19 2012
+++ src/sys/dev/pci/ichsmb.c Tue Feb 14 15:08:07 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.26 2012/01/30 19:41:19 drochner Exp $ */
+/* $NetBSD: ichsmb.c,v 1.27 2012/02/14 15:08:07 pgoyette Exp $ */
/* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */
/*
@@ -22,13 +22,13 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ichsmb.c,v 1.26 2012/01/30 19:41:19 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: ichsmb.c,v 1.27 2012/02/14 15:08:07 pgoyette Exp $);
#include sys/param.h
#include sys/device.h
#include sys/errno.h
#include sys/kernel.h
-#include sys/rwlock.h
+#include sys/mutex.h
#include sys/proc.h
#include sys/bus.h
@@ -59,7 +59,7 @@ struct ichsmb_softc {
int sc_poll;
struct i2c_controller sc_i2c_tag;
- krwlock_t sc_i2c_rwlock;
+ kmutex_t sc_i2c_mutex;
struct {
i2c_op_t op;
void * buf;
@@ -166,7 +166,7 @@ ichsmb_attach(device_t parent, device_t
}
/* Attach I2C bus */
- rw_init(sc-sc_i2c_rwlock);
+ mutex_init(sc-sc_i2c_mutex, MUTEX_DEFAULT, IPL_NONE);
sc-sc_i2c_tag.ic_cookie = sc;
sc-sc_i2c_tag.ic_acquire_bus = ichsmb_i2c_acquire_bus;
sc-sc_i2c_tag.ic_release_bus = ichsmb_i2c_release_bus;
@@ -186,10 +186,10 @@ ichsmb_i2c_acquire_bus(void *cookie, int
{
struct ichsmb_softc *sc = cookie;
- if (cold || sc-sc_poll || (flags I2C_F_POLL))
+ if (cold)
return 0;
- rw_enter(sc-sc_i2c_rwlock, RW_WRITER);
+ mutex_enter(sc-sc_i2c_mutex);
return 0;
}
@@ -198,10 +198,10 @@ ichsmb_i2c_release_bus(void *cookie, int
{
struct ichsmb_softc *sc = cookie;
- if (cold || sc-sc_poll || (flags I2C_F_POLL))
+ if (cold)
return;
- rw_exit(sc-sc_i2c_rwlock);
+ mutex_exit(sc-sc_i2c_mutex);
}
static int
Index: src/sys/dev/pci/nfsmb.c
diff -u
CVS commit: src
Module Name:src
Committed By: jakllsch
Date: Tue Feb 14 15:09:03 UTC 2012
Modified Files:
src/distrib/notes/common: contents
src/etc/etc.evbarm: Makefile.inc
src/sys/arch/evbarm/conf: MV2120
Added Files:
src/sys/arch/evbarm/conf: MV2120_INSTALL
Log Message:
Bump MV2120 SYMTAB_SPACE.
Add kernels variants for root on the primary partitions of Drive 1.
Add MV2120 to evbarm release.
To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/distrib/notes/common/contents
cvs rdiff -u -r1.26 -r1.27 src/etc/etc.evbarm/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/MV2120
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/MV2120_INSTALL
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/contents
diff -u src/distrib/notes/common/contents:1.169 src/distrib/notes/common/contents:1.170
--- src/distrib/notes/common/contents:1.169 Mon Nov 28 06:16:40 2011
+++ src/distrib/notes/common/contents Tue Feb 14 15:09:02 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: contents,v 1.169 2011/11/28 06:16:40 sekiya Exp $
+.\ $NetBSD: contents,v 1.170 2012/02/14 15:09:02 jakllsch Exp $
.\
.\ Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -575,6 +575,8 @@ install the kernel that matches your har
(see below)
.It Sy kern-IQ80321
(see below)
+.It Sy kern-MV2120
+(see below)
.It Sy kern-SHEEVAPLUG
(see below)
.It Sy kern-TEAMASA_NPWR
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.26 src/etc/etc.evbarm/Makefile.inc:1.27
--- src/etc/etc.evbarm/Makefile.inc:1.26 Mon Jan 30 09:48:11 2012
+++ src/etc/etc.evbarm/Makefile.inc Tue Feb 14 15:09:02 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.26 2012/01/30 09:48:11 nisimura Exp $
+# $NetBSD: Makefile.inc,v 1.27 2012/02/14 15:09:02 jakllsch Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -9,7 +9,7 @@
.if ${MACHINE_ARCH} == arm
# Little endian platforms
EVBARM_BOARDS= ADI_BRH CP3100 GEMINI GUMSTIX INTEGRATOR \
- IQ80310 IQ80321 SHEEVAPLUG MINI2440 SMDK2410 \
+ IQ80310 IQ80321 SHEEVAPLUG MINI2440 MV2120 SMDK2410 \
SMDK2800 TEAMASA_NPWR TISDP2420 TS7200 TWINTAIL
.else
# Big endian platforms
Index: src/sys/arch/evbarm/conf/MV2120
diff -u src/sys/arch/evbarm/conf/MV2120:1.4 src/sys/arch/evbarm/conf/MV2120:1.5
--- src/sys/arch/evbarm/conf/MV2120:1.4 Sun Dec 18 05:49:26 2011
+++ src/sys/arch/evbarm/conf/MV2120 Tue Feb 14 15:09:03 2012
@@ -1,11 +1,11 @@
-# $NetBSD: MV2120,v 1.4 2011/12/18 05:49:26 dholland Exp $
+# $NetBSD: MV2120,v 1.5 2012/02/14 15:09:03 jakllsch Exp $
#
# This configuration supports for HP MV2120/MV5140/MV5150.
include arch/evbarm/conf/std.mv2120
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-options SYMTAB_SPACE=(1024 * 900)
+options SYMTAB_SPACE=(1024 * 908)
makeoptions DEBUG=-g
@@ -157,7 +157,10 @@ options USERCONF # userconf(4) support
config netbsd root on ? type ?
config netbsd-mvgbe0 root on mvgbe0 type nfs
-#config netbsd-wd0g root on wd0g type ffs
+config netbsd-wd0e root on wd0e type ?
+config netbsd-wd0f root on wd0f type ?
+config netbsd-wd0g root on wd0g type ?
+config netbsd-wd0h root on wd0h type ?
# The main bus device
mainbus0 at root
Added files:
Index: src/sys/arch/evbarm/conf/MV2120_INSTALL
diff -u /dev/null src/sys/arch/evbarm/conf/MV2120_INSTALL:1.1
--- /dev/null Tue Feb 14 15:09:03 2012
+++ src/sys/arch/evbarm/conf/MV2120_INSTALL Tue Feb 14 15:09:03 2012
@@ -0,0 +1,10 @@
+# $NetBSD: MV2120_INSTALL,v 1.1 2012/02/14 15:09:03 jakllsch Exp $
+#
+# MV2120_INSTALL -- MV2120 kernel with installation-sized
+# ramdisk
+#
+
+include arch/evbarm/conf/MV2120
+include arch/evbarm/conf/INSTALL
+
+options BOOTHOWTO=RB_SINGLE
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: njoly Date: Tue Feb 14 17:29:51 UTC 2012 Modified Files: src/distrib/sets/lists/misc: mi src/distrib/sets/lists/tests: mi src/distrib/sets/lists/xcomp: md.sparc Log Message: Kill dup lines. To generate a diff of this commit: cvs rdiff -u -r1.175 -r1.176 src/distrib/sets/lists/misc/mi cvs rdiff -u -r1.437 -r1.438 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xcomp/md.sparc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/misc/mi diff -u src/distrib/sets/lists/misc/mi:1.175 src/distrib/sets/lists/misc/mi:1.176 --- src/distrib/sets/lists/misc/mi:1.175 Sat Nov 12 01:20:05 2011 +++ src/distrib/sets/lists/misc/mi Tue Feb 14 17:29:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.175 2011/11/12 01:20:05 jmmv Exp $ +# $NetBSD: mi,v 1.176 2012/02/14 17:29:51 njoly Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -318,7 +318,6 @@ ./usr/share/doc/html/postfix/SMTPD_ACCESS_README.html misc-postfix-htmldoc postfix,doc ./usr/share/doc/html/postfix/SMTPD_POLICY_README.html misc-postfix-htmldoc postfix,doc ./usr/share/doc/html/postfix/SMTPD_PROXY_README.html misc-postfix-htmldoc postfix,doc -./usr/share/doc/html/postfix/SMTPD_PROXY_README.html misc-postfix-htmldoc postfix,doc ./usr/share/doc/html/postfix/SOHO_README.html misc-postfix-htmldoc postfix,doc ./usr/share/doc/html/postfix/SQLITE_README.html misc-postfix-htmldoc postfix,doc ./usr/share/doc/html/postfix/STANDARD_CONFIGURATION_README.html misc-postfix-htmldoc postfix,doc Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.437 src/distrib/sets/lists/tests/mi:1.438 --- src/distrib/sets/lists/tests/mi:1.437 Tue Feb 14 00:39:08 2012 +++ src/distrib/sets/lists/tests/mi Tue Feb 14 17:29:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.437 2012/02/14 00:39:08 riz Exp $ +# $NetBSD: mi,v 1.438 2012/02/14 17:29:51 njoly Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -383,7 +383,6 @@ ./usr/libdata/debug/usr/tests/lib/libc/gen/t_fpsetmask.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_fpsetround.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_ftok.debug tests-lib-debug debug,atf -./usr/libdata/debug/usr/tests/lib/libc/gen/t_fmtcheck.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_getcwd.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_getgrent.debug tests-lib-debug debug,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/t_glob.debug tests-lib-debug debug,atf @@ -2905,7 +2904,6 @@ ./usr/tests/usr.bin/rump_server tests-util-tests ./usr/tests/usr.bin/rump_server/Atffile tests-util-tests atf ./usr/tests/usr.bin/rump_server/t_disk tests-util-tests atf -./usr/tests/usr.bintests-util-tests ./usr/tests/usr.bin/shmif_dumpbus tests-util-tests ./usr/tests/usr.bin/shmif_dumpbus/Atffile tests-util-tests atf ./usr/tests/usr.bin/shmif_dumpbus/d_pcap.out tests-obsolete obsolete Index: src/distrib/sets/lists/xcomp/md.sparc diff -u src/distrib/sets/lists/xcomp/md.sparc:1.10 src/distrib/sets/lists/xcomp/md.sparc:1.11 --- src/distrib/sets/lists/xcomp/md.sparc:1.10 Sun Nov 20 21:50:38 2011 +++ src/distrib/sets/lists/xcomp/md.sparc Tue Feb 14 17:29:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc,v 1.10 2011/11/20 21:50:38 njoly Exp $ +# $NetBSD: md.sparc,v 1.11 2012/02/14 17:29:51 njoly Exp $ ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/Xvfb.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- debug,xorg @@ -45,41 +45,3 @@ ./usr/libdata/debug/usr/X11R7/lib/modules/libvbe.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmach64_dri.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmga_dri.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr128_dri.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr200_dri.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr300_dri.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr600_dri.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/dri/libradeon_dri.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libag10e_drv.so.0.debug -unknown- xorg,debug -./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libati_drv.so.6.debug -unknown- xorg,debug
CVS commit: src/lib/libc/arch/arm/sys
Module Name:src
Committed By: matt
Date: Tue Feb 14 17:32:43 UTC 2012
Modified Files:
src/lib/libc/arch/arm/sys: __aeabi_read_tp.S
Log Message:
Add workaround for ARM cores that don't properly implement the MRC instruction
used for reading the thread pointer. This is the corresponding change which
was made to arm/mcontext.h
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/arch/arm/sys/__aeabi_read_tp.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/arch/arm/sys/__aeabi_read_tp.S
diff -u src/lib/libc/arch/arm/sys/__aeabi_read_tp.S:1.1 src/lib/libc/arch/arm/sys/__aeabi_read_tp.S:1.2
--- src/lib/libc/arch/arm/sys/__aeabi_read_tp.S:1.1 Fri Nov 18 16:10:02 2011
+++ src/lib/libc/arch/arm/sys/__aeabi_read_tp.S Tue Feb 14 17:32:43 2012
@@ -2,4 +2,12 @@
ENTRY(__aeabi_read_tp)
mrc p15, 0, r0, c13, c0, 3
+#ifndef _ARM_ARCH_6
+ cmp r0, #0 /* was it zero? */
+ RETc(ne) /* return it's not zero */
+ push {r1} /* syscall zeroes r1 */
+ SYSTRAP(_lwp_getprivate) /* can't fail */
+ pop {r1} /* restore r1 */
+#endif
RET
+_END(__aeabi_read_tp)
CVS commit: src/usr.sbin/quotarestore
Module Name:src
Committed By: joerg
Date: Tue Feb 14 17:33:38 UTC 2012
Modified Files:
src/usr.sbin/quotarestore: quotarestore.c
Log Message:
Mark usage as __dead.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/quotarestore/quotarestore.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/quotarestore/quotarestore.c
diff -u src/usr.sbin/quotarestore/quotarestore.c:1.1 src/usr.sbin/quotarestore/quotarestore.c:1.2
--- src/usr.sbin/quotarestore/quotarestore.c:1.1 Mon Feb 13 01:35:09 2012
+++ src/usr.sbin/quotarestore/quotarestore.c Tue Feb 14 17:33:38 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: quotarestore.c,v 1.1 2012/02/13 01:35:09 dholland Exp $ */
+/* $NetBSD: quotarestore.c,v 1.2 2012/02/14 17:33:38 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: quotarestore.c,v 1.1 2012/02/13 01:35:09 dholland Exp $);
+__RCSID($NetBSD: quotarestore.c,v 1.2 2012/02/14 17:33:38 joerg Exp $);
#include stdio.h
#include stdlib.h
@@ -499,7 +499,7 @@ readdumpfile(struct quotahandle *qh, FIL
// top level control logic
-static void
+__dead static void
usage(void)
{
fprintf(stderr, usage: %s [-d] volume [dump-file]\n,
CVS commit: src/share/man/man4
Module Name:src Committed By: plunky Date: Tue Feb 14 17:34:21 UTC 2012 Added Files: src/share/man/man4: aubtfwl.4 Log Message: a manual page for aubtfwl(4), detailing where to find a firmware file and where to put it To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/share/man/man4/aubtfwl.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/share/man/man4/aubtfwl.4 diff -u /dev/null src/share/man/man4/aubtfwl.4:1.1 --- /dev/null Tue Feb 14 17:34:21 2012 +++ src/share/man/man4/aubtfwl.4 Tue Feb 14 17:34:21 2012 @@ -0,0 +1,62 @@ +.\ $NetBSD: aubtfwl.4,v 1.1 2012/02/14 17:34:21 plunky Exp $ +.\ +.\ Copyright (c) 2012 The NetBSD Foundation +.\ All rights reserved. +.\ +.\ Redistribution and use in source and binary forms, with or without +.\ modification, are permitted provided that the following conditions +.\ are met: +.\ 1. Redistributions of source code must retain the above copyright +.\notice, this list of conditions and the following disclaimer. +.\ 2. Redistributions in binary form must reproduce the above copyright +.\notice, this list of conditions and the following disclaimer in the +.\documentation and/or other materials provided with the distribution. +.\ +.\ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +.\ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +.\ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +.\ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +.\ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +.\ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +.\ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +.\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +.\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +.\ +.Dd February 14, 2012 +.Dt AUBTFWL 4 +.Os +.Sh NAME +.Nm aubtfwl +.Nd Atheros AR3011 Firmware Loader +.Sh SYNOPSIS +.Cd aubtfwl* at uhub? +.Sh DESCRIPTION +The +.Nm +driver manages automatic loading of firmware on the Atheros AR3011 +Bluetooth chipset. +The firmware file +.Pa ath3k-1.fw +should be obtained and placed in a +.Pa ubt/ +directory in the search path of the +.Xr firmload 9 +kernel subsystem. +Upon attachment, the +.Nm +driver will load this firmware file and the device will detach +and reattach as a generic Bluetooth device using the +.Xr ubt 4 +driver. +.Pp +The firmware file can be obtained from the Linux firmware +git repository at +.Pa http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git . +.Sh FILES +.Pa ath3k-1.fw +.Sh SEE ALSO +.Xr bluetooth 4 , +.Xr ubt 4 , +.Xr uhub 4 , +.Xr firmload 9
CVS commit: src
Module Name:src Committed By: plunky Date: Tue Feb 14 17:35:12 UTC 2012 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man4: Makefile Log Message: add aubtfwl.4 to the build To generate a diff of this commit: cvs rdiff -u -r1.1378 -r1.1379 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.580 -r1.581 src/share/man/man4/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1378 src/distrib/sets/lists/man/mi:1.1379 --- src/distrib/sets/lists/man/mi:1.1378 Mon Feb 13 01:43:24 2012 +++ src/distrib/sets/lists/man/mi Tue Feb 14 17:35:11 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1378 2012/02/13 01:43:24 dholland Exp $ +# $NetBSD: mi,v 1.1379 2012/02/14 17:35:11 plunky Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -824,6 +824,7 @@ ./usr/share/man/cat4/atw.0 man-sys-catman .cat ./usr/share/man/cat4/au8522.0 man-sys-catman .cat ./usr/share/man/cat4/auacer.0 man-sys-catman .cat +./usr/share/man/cat4/aubtfwl.0 man-sys-catman .cat ./usr/share/man/cat4/audio.0 man-sys-catman .cat ./usr/share/man/cat4/audiocs.0 man-sys-catman .cat ./usr/share/man/cat4/audioctl.0 man-sys-catman .cat @@ -3692,6 +3693,7 @@ ./usr/share/man/html4/atw.html man-sys-htmlman html ./usr/share/man/html4/au8522.html man-sys-htmlman html ./usr/share/man/html4/auacer.html man-sys-htmlman html +./usr/share/man/html4/aubtfwl.html man-sys-htmlman html ./usr/share/man/html4/audio.html man-sys-htmlman html ./usr/share/man/html4/audiocs.html man-sys-htmlman html ./usr/share/man/html4/audioctl.html man-sys-htmlman html @@ -6329,6 +6331,7 @@ ./usr/share/man/man4/atw.4 man-sys-man .man ./usr/share/man/man4/au8522.4 man-sys-man .man ./usr/share/man/man4/auacer.4 man-sys-man .man +./usr/share/man/man4/aubtfwl.4 man-sys-man .man ./usr/share/man/man4/audio.4 man-sys-man .man ./usr/share/man/man4/audiocs.4 man-sys-man .man ./usr/share/man/man4/audioctl.4 man-sys-man .man Index: src/share/man/man4/Makefile diff -u src/share/man/man4/Makefile:1.580 src/share/man/man4/Makefile:1.581 --- src/share/man/man4/Makefile:1.580 Sun Jan 22 06:44:31 2012 +++ src/share/man/man4/Makefile Tue Feb 14 17:35:11 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.580 2012/01/22 06:44:31 christos Exp $ +# $NetBSD: Makefile,v 1.581 2012/02/14 17:35:11 plunky Exp $ # @(#)Makefile 8.1 (Berkeley) 6/18/93 MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \ @@ -70,7 +70,7 @@ MAN= aac.4 ac97.4 acardide.4 aceride.4 a zero.4 zstty.4 zyd.4 # USB devices -MAN+= atu.4 aue.4 axe.4 cdce.4 cue.4 ehci.4 kue.4 ohci.4 slhci.4 \ +MAN+= atu.4 aubtfwl.4 aue.4 axe.4 cdce.4 cue.4 ehci.4 kue.4 ohci.4 slhci.4 \ stuirda.4 u3g.4 uaudio.4 uberry.4 ubsa.4 ubt.4 uchcom.4 ucom.4 \ ucycom.4 udav.4 udsbr.4 uftdi.4 ugen.4 ugensa.4 uhci.4 uhid.4 \ uhidev.4 uhmodem.4 uhso.4 uipaq.4 uirda.4 ukbd.4 ukyopon.4 ulpt.4 \
CVS commit: src/sys/lib/libkern
Module Name:src
Committed By: njoly
Date: Tue Feb 14 18:57:35 UTC 2012
Modified Files:
src/sys/lib/libkern: arc4random.c
Log Message:
void function _arc4randbytes cannot return a value.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/lib/libkern/arc4random.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/lib/libkern/arc4random.c
diff -u src/sys/lib/libkern/arc4random.c:1.30 src/sys/lib/libkern/arc4random.c:1.31
--- src/sys/lib/libkern/arc4random.c:1.30 Thu Feb 2 19:43:07 2012
+++ src/sys/lib/libkern/arc4random.c Tue Feb 14 18:57:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: arc4random.c,v 1.30 2012/02/02 19:43:07 tls Exp $ */
+/* $NetBSD: arc4random.c,v 1.31 2012/02/14 18:57:35 njoly Exp $ */
/*-
* Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -302,7 +302,8 @@ _arc4randbytes(void *p, size_t len)
if (!arc4_initialized) {
arc4_init();
/* avoid conditionalizing locking */
- return arc4randbytes_unlocked(p, len);
+ arc4randbytes_unlocked(p, len);
+ return;
}
mutex_spin_enter(arc4_mtx);
arc4randbytes_unlocked(p, len);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mrg
Date: Tue Feb 14 19:28:23 UTC 2012
Modified Files:
src/sys/dev/usb: umidi.c umidivar.h
Log Message:
since we have to drop locks to call into the usb code, we need to make
sure that only one caller ends up doing something in close_out_jack().
add a closing member that is set when closing and error out in various
places.
with this in place i can read and write from umidi without triggering
any locking or other obvious issues, though the writing is currently
broken (it worked in 5.99.60-era.) it runs the correct time, but no
output occurs no the synth itself. more work needed here.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/usb/umidi.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/usb/umidivar.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/usb/umidi.c
diff -u src/sys/dev/usb/umidi.c:1.58 src/sys/dev/usb/umidi.c:1.59
--- src/sys/dev/usb/umidi.c:1.58 Mon Feb 13 17:36:18 2012
+++ src/sys/dev/usb/umidi.c Tue Feb 14 19:28:22 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: umidi.c,v 1.58 2012/02/13 17:36:18 mrg Exp $ */
+/* $NetBSD: umidi.c,v 1.59 2012/02/14 19:28:22 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umidi.c,v 1.58 2012/02/13 17:36:18 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: umidi.c,v 1.59 2012/02/14 19:28:22 mrg Exp $);
#include sys/types.h
#include sys/param.h
@@ -341,6 +341,7 @@ umidi_open(void *addr,
return EIO;
mididev-opened = 1;
+ mididev-closing = 0;
mididev-flags = flags;
if ((mididev-flags FWRITE) mididev-out_jack) {
err = open_out_jack(mididev-out_jack, arg, ointr);
@@ -367,6 +368,8 @@ umidi_close(void *addr)
struct umidi_mididev *mididev = addr;
/* XXX SMP */
+ mididev-closing = 1;
+
KERNEL_LOCK(1, curlwp);
mutex_spin_exit(mididev-sc-sc_lock);
@@ -374,11 +377,12 @@ umidi_close(void *addr)
close_out_jack(mididev-out_jack);
if ((mididev-flags FREAD) mididev-in_jack)
close_in_jack(mididev-in_jack);
- mididev-opened = 0;
/* XXX SMP */
mutex_spin_enter(mididev-sc-sc_lock);
KERNEL_UNLOCK_ONE(curlwp);
+
+ mididev-opened = 0;
}
int
@@ -387,7 +391,7 @@ umidi_channelmsg(void *addr, int status,
{
struct umidi_mididev *mididev = addr;
- if (!mididev-out_jack || !mididev-opened)
+ if (!mididev-out_jack || !mididev-opened || !mididev-closing)
return EIO;
return out_jack_output(mididev-out_jack, msg, len, (status4)0xf);
@@ -399,7 +403,7 @@ umidi_commonmsg(void *addr, int status,
struct umidi_mididev *mididev = addr;
int cin;
- if (!mididev-out_jack || !mididev-opened)
+ if (!mididev-out_jack || !mididev-opened || !mididev-closing)
return EIO;
switch ( len ) {
@@ -418,7 +422,7 @@ umidi_sysex(void *addr, u_char *msg, int
struct umidi_mididev *mididev = addr;
int cin;
- if (!mididev-out_jack || !mididev-opened)
+ if (!mididev-out_jack || !mididev-opened || !mididev-closing)
return EIO;
switch ( len ) {
@@ -437,7 +441,7 @@ umidi_rtmsg(void *addr, int d)
struct umidi_mididev *mididev = addr;
u_char msg = d;
- if (!mididev-out_jack || !mididev-opened)
+ if (!mididev-out_jack || !mididev-opened || !mididev-closing)
return EIO;
return out_jack_output(mididev-out_jack, msg, 1, 0xf);
@@ -1154,11 +1158,10 @@ close_out_jack(struct umidi_jack *jack)
u_int16_t mask;
int err;
-
if (jack-opened) {
ep = jack-endpoint;
sc = ep-sc;
- KASSERT(mutex_owned(sc-sc_lock));
+ mutex_spin_enter(sc-sc_lock);
mask = 1 (jack-cable_number);
while (mask (ep-this_schedule | ep-next_schedule)) {
err = cv_timedwait_sig(sc-sc_cv, sc-sc_lock,
@@ -1166,10 +1169,17 @@ close_out_jack(struct umidi_jack *jack)
if (err)
break;
}
- jack-opened = 0;
- jack-endpoint-num_open--;
- ep-this_schedule = ~mask;
- ep-next_schedule = ~mask;
+ /*
+ * We can re-enter this function from both close() and
+ * detach(). Make sure only one of them does this part.
+ */
+ if (jack-opened) {
+ jack-opened = 0;
+ jack-endpoint-num_open--;
+ ep-this_schedule = ~mask;
+ ep-next_schedule = ~mask;
+ }
+ mutex_spin_exit(sc-sc_lock);
}
}
@@ -1179,7 +1189,7 @@ close_in_jack(struct umidi_jack *jack)
if (jack-opened) {
jack-opened = 0;
if (--jack-endpoint-num_open == 0) {
- usbd_abort_pipe(jack-endpoint-pipe);
+ usbd_abort_pipe(jack-endpoint-pipe);
}
}
}
Index: src/sys/dev/usb/umidivar.h
diff -u src/sys/dev/usb/umidivar.h:1.17 src/sys/dev/usb/umidivar.h:1.18
--- src/sys/dev/usb/umidivar.h:1.17 Sat Nov 26 13:22:09 2011
+++ src/sys/dev/usb/umidivar.h Tue Feb 14 19:28:23 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: umidivar.h,v 1.17 2011/11/26 13:22:09 mrg Exp $ */
+/* $NetBSD: umidivar.h,v 1.18 2012/02/14 19:28:23 mrg Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
* All rights
CVS commit: src/distrib
Module Name:src
Committed By: joerg
Date: Tue Feb 14 19:39:37 UTC 2012
Modified Files:
src/distrib: Makefile
Log Message:
Build release notes if groff is present (MKGROFF!=no), not if man pages
are requested (MKMAN!=no).
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/distrib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/Makefile
diff -u src/distrib/Makefile:1.18 src/distrib/Makefile:1.19
--- src/distrib/Makefile:1.18 Sun Jan 22 03:53:32 2012
+++ src/distrib/Makefile Tue Feb 14 19:39:37 2012
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2012/01/22 03:53:32 tsutsui Exp $
+# $NetBSD: Makefile,v 1.19 2012/02/14 19:39:37 joerg Exp $
.include bsd.own.mk
-.if ${MKMAN} != no
+.if ${MKGROFF} != no
SUBDIR= notes .WAIT
.endif
CVS commit: src/doc
Module Name:src Committed By: apb Date: Tue Feb 14 21:19:19 UTC 2012 Modified Files: src/doc: BUILDING.mdoc Log Message: Document build.sh live-image and install-image targets. These were documented in revision 1.97 of src/BUILDING, but were not documented in src/doc/BUILDING.sh. The original log message was: revision 1.97 date: 2012/01/22 03:53:32; author: tsutsui; state: Exp; lines: +39 -0 Add live-image and install-image target support to build.sh. live-image target builds pre-installed disk images that can be used on emulators or boot from USB memory sticks to try NetBSD without installation. Currently amd64, i386, pmax, sparc, sparc64, sun2, sun3, and vax (which have working emulators and don't require extra tools like preparing msdosfs or partitioning MD label structures) support this target. install-image target builds an bootable installation disk image that can be used as an install CD but burned into USB memory sticks etc. Current only amd64 and i386 (which would support USB boot) have this target. For more details (and known issue) see following posts on netbsd-bugs@: http://mail-index.NetBSD.org/netbsd-bugs/2011/08/06/msg023639.html http://mail-index.NetBSD.org/netbsd-bugs/2011/09/23/msg024207.html http://mail-index.NetBSD.org/netbsd-bugs/2011/12/07/msg025166.html http://mail-index.NetBSD.org/netbsd-bugs/2011/12/08/msg025178.html No particular comments about implementation, and go ahead comments from mrg@, riz@ and christos@. Closes PR toolchain/45153 and PR misc/45155. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.85 src/doc/BUILDING.mdoc:1.86 --- src/doc/BUILDING.mdoc:1.85 Fri Sep 9 18:48:34 2011 +++ src/doc/BUILDING.mdoc Tue Feb 14 21:19:19 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: BUILDING.mdoc,v 1.85 2011/09/09 18:48:34 apb Exp $ +.\ $NetBSD: BUILDING.mdoc,v 1.86 2012/02/14 21:19:19 apb Exp $ .\ .\ Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1153,6 +1153,68 @@ utility, which is not part of but which can be installed from .Pa pkgsrc/sysutils/cdrtools . . +.It Sy install-image +Create a bootable +.Nx +installation disk image in the +.Sy RELEASEDIR/RELEASEMACHINEDIR Ns Pa /installation/installimage +directory. +The bootable installation disk image is +suitable to USB flash memory sticks etc. for machines which +may support boot from such USB devices. +File system in the bootable disk image will have a layout +as described in +.Xr release 7 . +.Pp +The installation image is bootable, and will automatically +run the +.Xr sysinst 8 +menu-based installation program, which can be used to install or upgrade a +.Nx +system. +Bootable installation images also contain tools that may be +useful in repairing a damaged +.Nx +installation. +.Pp +Before +.Dq make install-image +is attempted, RELEASEDIR must be populated by +.Dq make release +or equivalent +and RELEASEDIR binaries must be built with +.Sy MKUNPRIVED=yes +to refer permission information from specfiles. +. +.It live-image +Create +.Nx +live images in the +.Sy RELEASEDIR/RELEASEMACHINEDIR Ns Pa /installation/liveimage +directory. +The live image contains all necessary files +to boot +.Nx +upto multi user mode, including all files +which should be extracted during installation, +.Nx +disklabel, and bootloaders etc. +.Pp +The live image is suitable for misc emulators like QEMU, +and also usuful to try +.Nx +on real machines with USB +flash memory sticks without installation. +.Pp +Before +.Dq make live-image +is attempted, RELEASEDIR must be populated by +.Dq make release +or equivalent +and RELEASEDIR binaries must be built with +.Sy MKUNPRIVED=yes +to refer permission information from specfiles. +. .It Sy regression-tests Can only be run after building the regression tests in the directory .Dq regress . @@ -1388,6 +1450,14 @@ Perform Perform .Dq make iso-image-source . . +.It Sy install-image +Perform +.Dq make install-image . +. +.It Sy live-image +Perform +.Dq make live-image . +. .El . .Pp
CVS commit: src/doc
Module Name:src Committed By: apb Date: Tue Feb 14 21:32:07 UTC 2012 Modified Files: src/doc: BUILDING.mdoc Log Message: Minor changes to wording in the documentation for build.sh install-image and live-image. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.87 src/doc/BUILDING.mdoc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BUILDING.mdoc diff -u src/doc/BUILDING.mdoc:1.86 src/doc/BUILDING.mdoc:1.87 --- src/doc/BUILDING.mdoc:1.86 Tue Feb 14 21:19:19 2012 +++ src/doc/BUILDING.mdoc Tue Feb 14 21:32:07 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: BUILDING.mdoc,v 1.86 2012/02/14 21:19:19 apb Exp $ +.\ $NetBSD: BUILDING.mdoc,v 1.87 2012/02/14 21:32:07 apb Exp $ .\ .\ Copyright (c) 2001-2011 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1159,10 +1159,10 @@ Create a bootable installation disk image in the .Sy RELEASEDIR/RELEASEMACHINEDIR Ns Pa /installation/installimage directory. -The bootable installation disk image is -suitable to USB flash memory sticks etc. for machines which -may support boot from such USB devices. -File system in the bootable disk image will have a layout +The installation disk image is suitable for copying to +bootable USB flash memory sticks, etc., for machines which +are able to boot from such devices. +The file system in the bootable disk image will have a layout as described in .Xr release 7 . .Pp @@ -1172,19 +1172,24 @@ run the menu-based installation program, which can be used to install or upgrade a .Nx system. -Bootable installation images also contain tools that may be +The image also contains tools that may be useful in repairing a damaged .Nx installation. .Pp Before .Dq make install-image -is attempted, RELEASEDIR must be populated by +is attempted, +.Sy RELEASEDIR +must be populated by .Dq make release -or equivalent -and RELEASEDIR binaries must be built with -.Sy MKUNPRIVED=yes -to refer permission information from specfiles. +or equivalent. +The build must have been performed with +.Sy MKUNPRIVED=yes +because +.Dq make install-image +relies on information in +.Sy DESTDIR Ns Pa /METALOG . . .It live-image Create @@ -1195,25 +1200,29 @@ directory. The live image contains all necessary files to boot .Nx -upto multi user mode, including all files +up to multi-user mode, including all files which should be extracted during installation, .Nx -disklabel, and bootloaders etc. +disklabel, bootloaders, etc. .Pp -The live image is suitable for misc emulators like QEMU, -and also usuful to try +The live image is suitable for use as a disk image in +virtual machine environments such as QEMU, +and also useful to boot .Nx -on real machines with USB -flash memory sticks without installation. +from a USB flash memory stick +on a real machine, without the need for installation. .Pp Before .Dq make live-image is attempted, RELEASEDIR must be populated by .Dq make release or equivalent -and RELEASEDIR binaries must be built with -.Sy MKUNPRIVED=yes -to refer permission information from specfiles. +The build must have been performed with +.Sy MKUNPRIVED=yes +because +.Dq make install-image +relies on information in +.Sy DESTDIR Ns Pa /METALOG . . .It Sy regression-tests Can only be run after building the regression tests in the directory
CVS commit: src
Module Name:src Committed By: apb Date: Tue Feb 14 21:33:03 UTC 2012 Modified Files: src: BUILDING Log Message: Regen from revision 1.87 of doc/BUILDING.mdoc. To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/BUILDING Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/BUILDING diff -u src/BUILDING:1.97 src/BUILDING:1.98 --- src/BUILDING:1.97 Sun Jan 22 03:53:32 2012 +++ src/BUILDING Tue Feb 14 21:33:02 2012 @@ -627,40 +627,42 @@ BUILDING ity, which is not part of NetBSD, but which can be installed from pkgsrc/sysutils/cdrtools. - install-image Create a bootable NetBSD installation disk image in the + install-image + Create a bootable NetBSD installation disk image in the RELEASEDIR/RELEASEMACHINEDIR/installation/installimage - directory. The bootable installation disk image is - suitable to USB flash memory sticks etc. for machines which - may support boot from such USB devices. File system in the - bootable disk image will have a layout as described in - release(7). + directory. The installation disk image is suitable for + copying to bootable USB flash memory sticks, etc., for + machines which are able to boot from such devices. The + file system in the bootable disk image will have a layout + as described in release(7). The installation image is bootable, and will automatically run the sysinst(8) menu-based installation program, which - can be used to install or upgrade a NetBSD system. - Bootable installation images also contain tools that may be - useful in repairing a damaged NetBSD installation. + can be used to install or upgrade a NetBSD system. The + image also contains tools that may be useful in repairing a + damaged NetBSD installation. Before ``make install-image'' is attempted, RELEASEDIR must - be populated by ``make release'' or equivalent and - RELEASEDIR binaries must be built with ``MKUNPRIVED=yes'' - to refer permission information from specfiles. + be populated by ``make release'' or equivalent. The build + must have been performed with MKUNPRIVED=yes because ``make + install-image'' relies on information in DESTDIR/METALOG. live-imageCreate NetBSD live images in the - RELEASEDIR/RELEASEMACHINEDIR/installation/liveimage - directory. The live image contains all necessary files - to boot NetBSD upto multi user mode, including all files - which should be extracted during installation, NetBSD - disklabel, and bootloaders etc. - - The live image is suitable for misc emulators like QEMU, - and also usuful to try NetBSD on real machines with USB - flash memory sticks without installation. + RELEASEDIR/RELEASEMACHINEDIR/installation/liveimage direc- + tory. The live image contains all necessary files to boot + NetBSD up to multi-user mode, including all files which + should be extracted during installation, NetBSD disklabel, + bootloaders, etc. + + The live image is suitable for use as a disk image in vir- + tual machine environments such as QEMU, and also useful to + boot NetBSD from a USB flash memory stick on a real + machine, without the need for installation. Before ``make live-image'' is attempted, RELEASEDIR must be - populated by ``make release'' or equivalent and RELEASEDIR - binaries must be built with ``MKUNPRIVED=yes'' to refer - permission information from specfiles. + populated by ``make release'' or equivalent The build must + have been performed with MKUNPRIVED=yes because ``make + install-image'' relies on information in DESTDIR/METALOG. regression-tests Can only be run after building the regression tests in the @@ -773,7 +775,8 @@ BUILDING iso-image-source Perform ``make iso-image-source''. - install-image Perform ``make install-image''. + install-image + Perform ``make install-image''. live-imagePerform ``make live-image''.
CVS commit: src/sys/arch/evbmips/loongson
Module Name:src
Committed By: christos
Date: Tue Feb 14 21:34:46 UTC 2012
Modified Files:
src/sys/arch/evbmips/loongson: gdium_machdep.c
Log Message:
add prototypes.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/loongson/gdium_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/evbmips/loongson/gdium_machdep.c
diff -u src/sys/arch/evbmips/loongson/gdium_machdep.c:1.3 src/sys/arch/evbmips/loongson/gdium_machdep.c:1.4
--- src/sys/arch/evbmips/loongson/gdium_machdep.c:1.3 Tue Sep 20 01:57:11 2011
+++ src/sys/arch/evbmips/loongson/gdium_machdep.c Tue Feb 14 16:34:46 2012
@@ -307,7 +307,7 @@ advance:
}
void
-gdium_powerdown()
+gdium_powerdown(void)
{
REGVAL(BONITO_GPIODATA) |= 0x0002;
REGVAL(BONITO_GPIOIE) = ~0x0002;
@@ -316,7 +316,7 @@ gdium_powerdown()
}
void
-gdium_reset()
+gdium_reset(void)
{
REGVAL(BONITO_GPIODATA) = ~0x0002;
REGVAL(BONITO_GPIOIE) = ~0x0002;
CVS commit: src/sys/arch/evbmips/loongson
Module Name:src
Committed By: christos
Date: Tue Feb 14 21:41:02 UTC 2012
Modified Files:
src/sys/arch/evbmips/loongson: generic2e_machdep.c
Log Message:
fix proto
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/loongson/generic2e_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/evbmips/loongson/generic2e_machdep.c
diff -u src/sys/arch/evbmips/loongson/generic2e_machdep.c:1.1 src/sys/arch/evbmips/loongson/generic2e_machdep.c:1.2
--- src/sys/arch/evbmips/loongson/generic2e_machdep.c:1.1 Sat Aug 27 09:42:44 2011
+++ src/sys/arch/evbmips/loongson/generic2e_machdep.c Tue Feb 14 16:41:02 2012
@@ -48,7 +48,7 @@
* Generic Loongson 2E code and configuration data.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: generic2e_machdep.c,v 1.1 2011/08/27 13:42:44 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: generic2e_machdep.c,v 1.2 2012/02/14 21:41:02 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -355,7 +355,7 @@ generic2e_isa_intr(int ipl, vaddr_t pc,
*/
void
-generic2e_reset()
+generic2e_reset(void)
{
REGVAL(BONITO_BONGENCFG) = ~BONITO_BONGENCFG_CPUSELFRESET;
REGVAL(BONITO_BONGENCFG) |= BONITO_BONGENCFG_CPUSELFRESET;
CVS commit: src/sys/arch/evbmips/loongson
Module Name:src
Committed By: christos
Date: Tue Feb 14 21:42:22 UTC 2012
Modified Files:
src/sys/arch/evbmips/loongson: yeeloong_machdep.c
Log Message:
prototypes
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/loongson/yeeloong_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/evbmips/loongson/yeeloong_machdep.c
diff -u src/sys/arch/evbmips/loongson/yeeloong_machdep.c:1.1 src/sys/arch/evbmips/loongson/yeeloong_machdep.c:1.2
--- src/sys/arch/evbmips/loongson/yeeloong_machdep.c:1.1 Sat Aug 27 09:42:45 2011
+++ src/sys/arch/evbmips/loongson/yeeloong_machdep.c Tue Feb 14 16:42:22 2012
@@ -474,7 +474,7 @@ lemote_isa_intr(int ipl, vaddr_t pc, uin
}
uint
-lemote_get_isa_imr()
+lemote_get_isa_imr(void)
{
uint imr1, imr2;
@@ -486,7 +486,7 @@ lemote_get_isa_imr()
}
uint
-lemote_get_isa_isr()
+lemote_get_isa_isr(void)
{
uint isr1, isr2 = 0;
@@ -502,7 +502,7 @@ lemote_get_isa_isr()
*/
void
-fuloong_powerdown()
+fuloong_powerdown(void)
{
vaddr_t gpiobase;
@@ -514,14 +514,14 @@ fuloong_powerdown()
}
void
-yeeloong_powerdown()
+yeeloong_powerdown(void)
{
REGVAL(BONITO_GPIODATA) = ~0x0001;
REGVAL(BONITO_GPIOIE) = ~0x0001;
}
void
-lemote_reset()
+lemote_reset(void)
{
wrmsr(GCSC_GLCP_SYS_RST, rdmsr(GCSC_GLCP_SYS_RST) | 1);
}
CVS commit: src/sys/arch/evbmips/loongson/dev
Module Name:src
Committed By: macallan
Date: Tue Feb 14 22:22:45 UTC 2012
Modified Files:
src/sys/arch/evbmips/loongson/dev: glx.c
Log Message:
fix 'old style function definition' warning:
blah() - blah(void)
ok riz
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbmips/loongson/dev/glx.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/evbmips/loongson/dev/glx.c
diff -u src/sys/arch/evbmips/loongson/dev/glx.c:1.1 src/sys/arch/evbmips/loongson/dev/glx.c:1.2
--- src/sys/arch/evbmips/loongson/dev/glx.c:1.1 Sat Aug 27 13:42:45 2011
+++ src/sys/arch/evbmips/loongson/dev/glx.c Tue Feb 14 22:22:45 2012
@@ -21,7 +21,7 @@
* XXX too many hardcoded numbers... need to expand glxreg.h
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: glx.c,v 1.1 2011/08/27 13:42:45 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: glx.c,v 1.2 2012/02/14 22:22:45 macallan Exp $);
#include sys/param.h
@@ -295,7 +295,7 @@ glx_pci_write_hook(void *v, pcitag_t tag
}
pcireg_t
-glx_get_status()
+glx_get_status(void)
{
uint64_t msr;
pcireg_t data;
CVS commit: src/sys/dev/pci/voyager
Module Name:src
Committed By: macallan
Date: Tue Feb 14 22:27:20 UTC 2012
Modified Files:
src/sys/dev/pci/voyager: pwmclock.c
Log Message:
another blah() - blah(void)
ok riz
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/pci/voyager/pwmclock.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/voyager/pwmclock.c
diff -u src/sys/dev/pci/voyager/pwmclock.c:1.2 src/sys/dev/pci/voyager/pwmclock.c:1.3
--- src/sys/dev/pci/voyager/pwmclock.c:1.2 Tue Dec 13 14:46:07 2011
+++ src/sys/dev/pci/voyager/pwmclock.c Tue Feb 14 22:27:20 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pwmclock.c,v 1.2 2011/12/13 14:46:07 macallan Exp $ */
+/* $NetBSD: pwmclock.c,v 1.3 2012/02/14 22:27:20 macallan Exp $ */
/*
* Copyright (c) 2011 Michael Lorenz
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pwmclock.c,v 1.2 2011/12/13 14:46:07 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: pwmclock.c,v 1.3 2012/02/14 22:27:20 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -276,7 +276,7 @@ pwmclock_intr(void *cookie)
}
static void
-pwmclock_start()
+pwmclock_start(void)
{
struct pwmclock_softc *sc = pwmclock;
sc-sc_count = 0;
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jakllsch Date: Wed Feb 15 01:38:46 UTC 2012 Modified Files: src/sys/arch/evbarm/conf: MV2120 Log Message: Add 4KiB more of SYMTAB_SPACE to fix MV2120_INSTALL build. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/MV2120 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/evbarm/conf/MV2120 diff -u src/sys/arch/evbarm/conf/MV2120:1.5 src/sys/arch/evbarm/conf/MV2120:1.6 --- src/sys/arch/evbarm/conf/MV2120:1.5 Tue Feb 14 15:09:03 2012 +++ src/sys/arch/evbarm/conf/MV2120 Wed Feb 15 01:38:46 2012 @@ -1,11 +1,11 @@ -# $NetBSD: MV2120,v 1.5 2012/02/14 15:09:03 jakllsch Exp $ +# $NetBSD: MV2120,v 1.6 2012/02/15 01:38:46 jakllsch Exp $ # # This configuration supports for HP MV2120/MV5140/MV5150. include arch/evbarm/conf/std.mv2120 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -options SYMTAB_SPACE=(1024 * 908) +options SYMTAB_SPACE=(1024 * 912) makeoptions DEBUG=-g
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src
Committed By: matt
Date: Wed Feb 15 01:46:42 UTC 2012
Modified Files:
src/sys/arch/powerpc/include/oea: bat.h
Log Message:
When making BATU, use (BAT_XBL|BAT_BL) for the extended bat lengths.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/include/oea/bat.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/arch/powerpc/include/oea/bat.h
diff -u src/sys/arch/powerpc/include/oea/bat.h:1.15 src/sys/arch/powerpc/include/oea/bat.h:1.16
--- src/sys/arch/powerpc/include/oea/bat.h:1.15 Wed Feb 1 05:25:57 2012
+++ src/sys/arch/powerpc/include/oea/bat.h Wed Feb 15 01:46:42 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bat.h,v 1.15 2012/02/01 05:25:57 matt Exp $ */
+/* $NetBSD: bat.h,v 1.16 2012/02/15 01:46:42 matt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -129,7 +129,7 @@ struct bat {
#define BAT_BL_TO_SIZE(bl) (((bl)+4) 15)
#define BATU(va, len, v) \
- (((va) BAT_EPI) | ((len) BAT_BL) | ((v) BAT_V))
+ (((va) BAT_EPI) | ((len) (BAT_BL|BAT_XBL)) | ((v) BAT_V))
#define BATL(pa, wimg, pp) \
(((pa) BAT_RPN) | (wimg) | (pp))
CVS commit: src/sys/arch/powerpc/oea
Module Name:src
Committed By: macallan
Date: Wed Feb 15 01:56:58 UTC 2012
Modified Files:
src/sys/arch/powerpc/oea: oea_machdep.c ofwoea_machdep.c
Log Message:
fix crash during early startup - we can't call OpenFirmware between zapping
the BATs and complete setting them up again
ok releng
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/powerpc/oea/oea_machdep.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/oea/ofwoea_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/powerpc/oea/oea_machdep.c
diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.62 src/sys/arch/powerpc/oea/oea_machdep.c:1.63
--- src/sys/arch/powerpc/oea/oea_machdep.c:1.62 Wed Feb 1 09:54:03 2012
+++ src/sys/arch/powerpc/oea/oea_machdep.c Wed Feb 15 01:56:57 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: oea_machdep.c,v 1.62 2012/02/01 09:54:03 matt Exp $ */
+/* $NetBSD: oea_machdep.c,v 1.63 2012/02/15 01:56:57 macallan Exp $ */
/*
* Copyright (C) 2002 Matt Thomas
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: oea_machdep.c,v 1.62 2012/02/01 09:54:03 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: oea_machdep.c,v 1.63 2012/02/15 01:56:57 macallan Exp $);
#include opt_ppcarch.h
#include opt_compat_netbsd.h
@@ -600,6 +600,10 @@ oea_batinit(paddr_t pa, ...)
va_list ap;
cpuvers = mfpvr() 16;
+ /*
+ * we need to call this before zapping BATs so OF calls work
+ */
+ mem_regions(allmem, availmem);
/*
* Initialize BAT registers to unmapped to not generate
@@ -698,7 +702,7 @@ oea_batinit(paddr_t pa, ...)
r(battable[0x0180 23].batu));
}
#endif /* PPC_OEA601 */
-
+
/*
* Now setup other fixed bat registers
*
@@ -733,9 +737,7 @@ oea_batinit(paddr_t pa, ...)
/*
* Set up battable to map all RAM regions.
- * This is here because mem_regions() call needs bat0 set up.
*/
- mem_regions(allmem, availmem);
#ifdef PPC_OEA601
if (cpuvers == MPC601) {
for (mp = allmem; mp-size; mp++) {
Index: src/sys/arch/powerpc/oea/ofwoea_machdep.c
diff -u src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.26 src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.27
--- src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.26 Thu Aug 4 20:02:48 2011
+++ src/sys/arch/powerpc/oea/ofwoea_machdep.c Wed Feb 15 01:56:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.26 2011/08/04 20:02:48 phx Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.27 2012/02/15 01:56:58 macallan Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ofwoea_machdep.c,v 1.26 2011/08/04 20:02:48 phx Exp $);
+__KERNEL_RCSID(0, $NetBSD: ofwoea_machdep.c,v 1.27 2012/02/15 01:56:58 macallan Exp $);
#include opt_ppcarch.h
#include opt_compat_netbsd.h
@@ -166,6 +166,7 @@ ofwoea_initppc(u_int startkernel, u_int
sizeof(model_name));
model_init();
}
+
/* Initialize bus_space */
ofwoea_bus_space_init();
@@ -363,7 +364,7 @@ restore_ofmap(struct ofw_translations *m
/*
* Scan the device tree for ranges, and return them as bitmap 0..15
*/
-
+#ifndef macppc
static u_int16_t
ranges_bitmap(int node, u_int16_t bitmap)
{
@@ -404,22 +405,33 @@ noranges:
}
return bitmap;
}
+#endif /* !macppc */
void
ofwoea_batinit(void)
{
#if defined (PPC_OEA)
+
+#ifdef macppc
+ /*
+ * cover PCI and register space but not the firmware ROM
+ */
+ oea_batinit(0x8000, BAT_BL_256M,
+ 0x9000, BAT_BL_256M,
+ 0xa000, BAT_BL_256M,
+ 0xb000, BAT_BL_256M,
+ 0xf000, BAT_BL_128M,
+ 0xf800, BAT_BL_64M,
+ 0);
+#else
u_int16_t bitmap;
int node, i;
node = OF_finddevice(/);
+
bitmap = ranges_bitmap(node, 0);
oea_batinit(0);
-#ifdef macppc
- /* XXX this is a macppc-specific hack */
- bitmap = 0x8f00;
-#endif
for (i=1; i 0x10; i++) {
/* skip the three vital SR regions */
if (i == USER_SR || i == KERNEL_SR || i == KERNEL2_SR)
@@ -429,6 +441,7 @@ ofwoea_batinit(void)
DPRINTF(Batmapped 256M at 0x%x\n, 0x1000 * i);
}
}
+#endif
#endif /* OEA */
}
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src
Committed By: macallan
Date: Wed Feb 15 04:33:19 UTC 2012
Modified Files:
src/sys/arch/powerpc/include/oea: bat.h
Log Message:
make BATs 256MB work, now macppc works again on 745x CPUs as well
ok riz
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/include/oea/bat.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/arch/powerpc/include/oea/bat.h
diff -u src/sys/arch/powerpc/include/oea/bat.h:1.16 src/sys/arch/powerpc/include/oea/bat.h:1.17
--- src/sys/arch/powerpc/include/oea/bat.h:1.16 Wed Feb 15 01:46:42 2012
+++ src/sys/arch/powerpc/include/oea/bat.h Wed Feb 15 04:33:19 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: bat.h,v 1.16 2012/02/15 01:46:42 matt Exp $ */
+/* $NetBSD: bat.h,v 1.17 2012/02/15 04:33:19 macallan Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -135,10 +135,10 @@ struct bat {
(((pa) BAT_RPN) | (wimg) | (pp))
#define BAT_VA_MATCH_P(batu,va) \
- (((~(((batu)BAT_BL)15))(va)BAT_EPI)==((batu)BAT_EPI))
+ (((~(((batu)(BAT_BL|BAT_XBL))15))(va)BAT_EPI)==((batu)BAT_EPI))
#define BAT_PA_MATCH_P(batu,batl,pa) \
- (((~(((batu)BAT_BL)15))(pa)BAT_RPN)==((batl)BAT_RPN))
+ (((~(((batu)(BAT_BL|BAT_XBL))15))(pa)BAT_RPN)==((batl)BAT_RPN))
#define BAT_VALID_P(batu, msr) \
(((msr)PSL_PR)?(((batu)BAT_Vu)==BAT_Vu):(((batu)BAT_Vs)==BAT_Vs))
CVS commit: othersrc/external/bsd/httpdev
Module Name:othersrc Committed By: agc Date: Wed Feb 15 04:38:06 UTC 2012 Update of /cvsroot/othersrc/external/bsd/httpdev In directory ivanova.netbsd.org:/tmp/cvs-serv2020 Log Message: httpdev is a (very) small utility which allows a remote file to appear as a local one, just like iscsi-initiator(8). However, unlike iSCSI, httpdev uses HTTP as a transport, so the remote end only requires a web server. The local end just requires the ability to issue partial-range HTTP commands and read responses. To do that, I wrote a minimalist HTTP client library, although any such library could be used. Again, in contrast to iSCSI, no special protocol is used, there is no encapsulation of SCSI commands, and no framing of blocks, and no needless synthesis of SCSI commands in the initiator, or interpretation of SCSI commands in the target. Discovery requires no login - either one can access a file on a webserver, or one can't. To illustrate its use, the following commands should show how to use the daily ISO images on nyftp to be read as an ISO image on the local machine. # httpdev http://nyftp.netbsd.org/pub/NetBSD-daily/HEAD/201202061530Z/iso/NetBSD-5.99.64-amd64.iso /mnt # ls -al /mnt/nyftp.netbsd.org/ total 18 drwxr-xr-x 2 agc agc 1024 Feb 14 05:51 . drwxr-xr-x 2 root wheel 0 Dec 31 1969 .. lrw-r--r-- 1 agc agc 12 Feb 14 05:51 address - 128.59.23.63 lrw-r--r-- 1 agc agc 16 Feb 14 05:51 hostname - nyftp.netbsd.org lrw-r--r-- 1 agc agc4 Feb 14 05:51 port - http lrw-r--r-- 1 agc agc 14 Feb 14 05:51 product - NetBSD httpdev -rw-r--r-- 1 agc agc356603904 Feb 14 05:51 storage lrw-r--r-- 1 agc agc 16 Feb 14 05:51 targetname - nyftp.netbsd.org lrw-r--r-- 1 agc agc6 Feb 14 05:51 vendor - NetBSD lrw-r--r-- 1 agc agc 18 Feb 14 05:51 version - bozohttpd-20100920 # file /mnt/nyftp.netbsd.org/storage /mnt/nyftp.netbsd.org/storage: # ISO 9660 CD-ROM filesystem data 'NETBSD_59964 ' (bootable) # vnconfig vnd0 /mnt/nyftp.netbsd.org/storage # mount -rt cd9660 /dev/vnd0a /cdrom # ls -al /cdrom total 6467 drwxr-xr-x 17 611 wheel 4096 Dec 31 1969 . drwxr-xr-x 23 root wheel 512 Jan 2 19:53 .. drwxr-xr-x 4 611 wheel 2048 Feb 6 09:21 amd64 drwxr-xr-x 2 611 wheel 6144 Feb 6 09:04 bin -r--r--r-- 1 611 wheel75120 Feb 6 09:25 boot -rw-r--r-- 1 611 wheel 555 Feb 6 09:25 boot.cfg drwxr-xr-x 2 611 wheel 2048 Feb 6 09:25 dev drwxr-xr-x 26 611 wheel12288 Feb 6 09:25 etc -r-xr-xr-x 1 611 wheel 3082 Feb 6 09:25 install.sh drwxr-xr-x 2 611 wheel10240 Feb 6 09:05 lib drwxr-xr-x 3 611 wheel 2048 Feb 6 08:41 libdata drwxr-xr-x 4 611 wheel 2048 Feb 6 09:25 libexec drwxr-xr-x 2 611 wheel 2048 Feb 6 08:41 mnt drwxr-xr-x 2 611 wheel 2048 Feb 6 09:25 mnt2 -rw-r--r-- 1 611 wheel 6175009 Feb 6 09:25 netbsd drwxr-xr-x 2 611 wheel18432 Feb 6 09:05 sbin drwxr-xr-x 3 611 wheel 2048 Feb 6 08:49 stand -rwxr-xr-x 1 611 wheel 180679 Feb 6 09:25 sysinst -rwxr-xr-x 1 611 wheel29983 Feb 6 09:25 sysinstmsgs.de -rwxr-xr-x 1 611 wheel28954 Feb 6 09:25 sysinstmsgs.es -rwxr-xr-x 1 611 wheel29458 Feb 6 09:25 sysinstmsgs.fr -rwxr-xr-x 1 611 wheel25761 Feb 6 09:25 sysinstmsgs.pl drwxr-xr-x 2 611 wheel 2048 Feb 6 09:25 targetroot drwxr-xr-x 2 611 wheel 2048 Feb 6 08:41 tmp drwxr-xr-x 8 611 wheel 2048 Feb 6 09:25 usr drwxr-xr-x 2 611 wheel 2048 Feb 6 09:25 var # httpdev uses refuse(3) and the virtdir(3) routines, and a small http client library I wrote. If that was replaced with libcurl, then httpdev could also take advantage of https (assuming we trust the CAs...) As for size: % size ./httpdev text databss dec hex filename 15065 1328 1128 17521 0x4471 ./httpdev % If someone were wanting to distribute a new release of an operating system, httpdev could be very useful for accessing ISO images on a central webserver, for example. Just saying... Status: Vendor Tag: CROOKS Release Tags: httpdev-base N othersrc/external/bsd/httpdev/Makefile N othersrc/external/bsd/httpdev/dist/httpdev.8 N othersrc/external/bsd/httpdev/dist/Makefile N othersrc/external/bsd/httpdev/dist/http.c N othersrc/external/bsd/httpdev/dist/http.h N othersrc/external/bsd/httpdev/dist/virtdir.c N othersrc/external/bsd/httpdev/dist/virtdir.h N othersrc/external/bsd/httpdev/dist/main.c N othersrc/external/bsd/httpdev/sbin/Makefile No conflicts created by this import
