CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: dholland Date: Mon Aug 27 03:18:13 UTC 2012 Modified Files: src/sys/arch/amd64/conf: GENERIC Log Message: whitespace To generate a diff of this commit: cvs rdiff -u -r1.360 -r1.361 src/sys/arch/amd64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.360 src/sys/arch/amd64/conf/GENERIC:1.361 --- src/sys/arch/amd64/conf/GENERIC:1.360 Fri Aug 24 05:59:01 2012 +++ src/sys/arch/amd64/conf/GENERIC Mon Aug 27 03:18:12 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.360 2012/08/24 05:59:01 dholland Exp $ +# $NetBSD: GENERIC,v 1.361 2012/08/27 03:18:12 dholland Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.360 $" +#ident "GENERIC-$Revision: 1.361 $" maxusers 64 # estimated number of users @@ -714,7 +714,7 @@ hme* at pci? dev ? function ? # Sun Micr le* at pci? dev ? function ? # PCnet-PCI Ethernet lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3 -malo* at pci? dev ? function ?# Marvell Libertas Wireless +malo* at pci? dev ? function ? # Marvell Libertas Wireless mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet
CVS commit: src/lib/libkvm
Module Name:src Committed By: martin Date: Sun Aug 26 23:09:42 UTC 2012 Modified Files: src/lib/libkvm: kvm.c Log Message: Do not fail kvm_dump_mkheader without setting an error message To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/lib/libkvm/kvm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libkvm/kvm.c diff -u src/lib/libkvm/kvm.c:1.99 src/lib/libkvm/kvm.c:1.100 --- src/lib/libkvm/kvm.c:1.99 Sat Oct 15 21:08:53 2011 +++ src/lib/libkvm/kvm.c Sun Aug 26 23:09:42 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: kvm.c,v 1.99 2011/10/15 21:08:53 christos Exp $ */ +/* $NetBSD: kvm.c,v 1.100 2012/08/26 23:09:42 martin Exp $ */ /*- * Copyright (c) 1989, 1992, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)kvm.c 8.2 (Berkeley) 2/13/94"; #else -__RCSID("$NetBSD: kvm.c,v 1.99 2011/10/15 21:08:53 christos Exp $"); +__RCSID("$NetBSD: kvm.c,v 1.100 2012/08/26 23:09:42 martin Exp $"); #endif #endif /* LIBC_SCCS and not lint */ @@ -515,8 +515,12 @@ kvm_dump_mkheader(kvm_t *kd, off_t dump_ * Validate new format crash dump */ sz = Pread(kd, kd->pmfd, &cpu_hdr, sizeof(cpu_hdr), dump_off); - if (sz != sizeof(cpu_hdr)) + if (sz != sizeof(cpu_hdr)) { + _kvm_err(kd, 0, "read %zx bytes at offset %"PRIx64 + " for cpu_hdr instead of requested %zu", + sz, dump_off, sizeof(cpu_hdr)); return (-1); + } if ((CORE_GETMAGIC(cpu_hdr) != KCORE_MAGIC) || (CORE_GETMID(cpu_hdr) != MID_MACHINE)) { _kvm_err(kd, 0, "invalid magic in cpu_hdr"); @@ -529,27 +533,37 @@ kvm_dump_mkheader(kvm_t *kd, off_t dump_ */ kd->cpu_dsize = cpu_hdr.c_size; kd->cpu_data = _kvm_malloc(kd, kd->cpu_dsize); - if (kd->cpu_data == NULL) + if (kd->cpu_data == NULL) { + _kvm_err(kd, kd->program, "no cpu_data"); goto fail; + } sz = Pread(kd, kd->pmfd, kd->cpu_data, cpu_hdr.c_size, dump_off + hdr_size); - if (sz != cpu_hdr.c_size) + if (sz != cpu_hdr.c_size) { + _kvm_err(kd, kd->program, "size %zu != cpu_hdr.csize %"PRIu32, + sz, cpu_hdr.c_size); goto fail; + } hdr_size += kd->cpu_dsize; /* * Leave phys mem pointer at beginning of memory data */ kd->dump_off = dump_off + hdr_size; - if (Lseek(kd, kd->pmfd, kd->dump_off, SEEK_SET) == -1) + if (Lseek(kd, kd->pmfd, kd->dump_off, SEEK_SET) == -1) { + _kvm_err(kd, kd->program, "failed to seek to %" PRId64, + (int64_t)kd->dump_off); goto fail; + } /* * Create a kcore_hdr. */ kd->kcore_hdr = _kvm_malloc(kd, sizeof(kcore_hdr_t)); - if (kd->kcore_hdr == NULL) + if (kd->kcore_hdr == NULL) { + _kvm_err(kd, kd->program, "failed to allocate header"); goto fail; + } kd->kcore_hdr->c_hdrsize= ALIGN(sizeof(kcore_hdr_t)); kd->kcore_hdr->c_seghdrsize = ALIGN(sizeof(kcore_seg_t));
CVS commit: src
Module Name:src Committed By: jmmv Date: Sun Aug 26 23:03:22 UTC 2012 Modified Files: src/distrib/sets/lists/tests: mi src/doc: CHANGES src/etc/mtree: NetBSD.dist.tests src/tests: Makefile Added Files: src/tests/share: Makefile src/tests/share/mk: Makefile common.subr t_lib.sh t_own.sh t_prog.sh t_test.sh Log Message: Add placeholder test programs for share/mk files. The main goal of this change is to simplify the further addition of test cases for the share/mk infrastructure by adding a few placeholder test programs to the tests tree. To not leave these test programs empty, I have added a bunch of extremely simple test cases to them. To generate a diff of this commit: cvs rdiff -u -r1.489 -r1.490 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.1739 -r1.1740 src/doc/CHANGES cvs rdiff -u -r1.82 -r1.83 src/etc/mtree/NetBSD.dist.tests cvs rdiff -u -r1.38 -r1.39 src/tests/Makefile cvs rdiff -u -r0 -r1.1 src/tests/share/Makefile cvs rdiff -u -r0 -r1.1 src/tests/share/mk/Makefile \ src/tests/share/mk/common.subr src/tests/share/mk/t_lib.sh \ src/tests/share/mk/t_own.sh src/tests/share/mk/t_prog.sh \ src/tests/share/mk/t_test.sh 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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.489 src/distrib/sets/lists/tests/mi:1.490 --- src/distrib/sets/lists/tests/mi:1.489 Fri Aug 24 20:24:39 2012 +++ src/distrib/sets/lists/tests/mi Sun Aug 26 23:03:21 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.489 2012/08/24 20:24:39 jmmv Exp $ +# $NetBSD: mi,v 1.490 2012/08/26 23:03:21 jmmv Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2931,6 +2931,14 @@ ./usr/tests/sbin/sysctl/Atffile tests-sbin-tests atf ./usr/tests/sbin/sysctl/t_perm tests-sbin-tests atf ./usr/tests/sbin/sysctl/t_sysctl tests-sbin-tests atf +./usr/tests/sharetests-sys-tests +./usr/tests/share/Atffile tests-sys-tests atf +./usr/tests/share/mktests-mk-tests +./usr/tests/share/mk/Atffile tests-mk-tests atf +./usr/tests/share/mk/t_lib tests-mk-tests atf +./usr/tests/share/mk/t_own tests-mk-tests atf +./usr/tests/share/mk/t_prog tests-mk-tests atf +./usr/tests/share/mk/t_test tests-mk-tests atf ./usr/tests/sys tests-sys-tests ./usr/tests/sys/Atffiletests-sys-tests atf ./usr/tests/sys/rctests-sys-tests Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1739 src/doc/CHANGES:1.1740 --- src/doc/CHANGES:1.1739 Sun Aug 26 22:37:19 2012 +++ src/doc/CHANGES Sun Aug 26 23:03:20 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1739 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1740 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -107,3 +107,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: mfi(8): Added support for LSI SAS2208-based controllers. [bouyer 20120823] mkdep(1): Add -P option. [jmmv 20120826] + share/mk: Add placeholder test programs (with some very basic test + cases within) for common bsd.*.mk modules. [jmmv 20120826] Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.82 src/etc/mtree/NetBSD.dist.tests:1.83 --- src/etc/mtree/NetBSD.dist.tests:1.82 Tue Aug 14 19:13:54 2012 +++ src/etc/mtree/NetBSD.dist.tests Sun Aug 26 23:03:22 2012 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.82 2012/08/14 19:13:54 alnsn Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.83 2012/08/26 23:03:22 jmmv Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -269,6 +269,8 @@ ./usr/tests/sbin/resize_ffs ./usr/tests/sbin/route ./usr/tests/sbin/sysctl +./usr/tests/share +./usr/tests/share/mk ./usr/tests/sys ./usr/tests/sys/rc ./usr/tests/usr.bin Index: src/tests/Makefile diff -u src/tests/Makefile:1.38 src/tests/Makefile:1.39 --- src/tests/Makefile:1.38 Wed Aug 8 13:57:05 2012 +++ src/tests/Makefile Sun Aug 26 23:03:20 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2012/08/08 13:57:05 christos Exp $ +# $NetBSD: Makefile,v 1.39 2012/08/26 23:03:20 jmmv Exp $ .include @@ -26,6 +26,10 @@ SUBDIR+= crypto SUBDIR+= ipf . endif +. if ${MKSHARE} != "no" +SUBDIR+= share +. endif + .include .else Added files: Index: src/tests/share/Makefile diff -u /dev/null src/tests/share/Makefile:1.1 --- /dev/null Sun Aug 26 23:03:22 2012 +++ src/tests/share/Makefile Sun Aug 26 23:03:21 2012 @@ -0,0 +1,9 @@ +# $NetBSD: Makefile,v 1.1 2012/08/26 23:03:21 jmmv Exp $ + +.include + +TESTSDIR= ${TESTSBASE}/share + +TESTS_SUBDIRS= mk + +.include Index: src/tests/share/mk/Makefile diff -u /dev/null src/tests/share/mk/Makefile:1.1 --- /dev/null Sun Aug 26 23:03:22 2012 +++ src/tests/share/mk/Makefile Sun Aug 26 23:03:21 2012 @@ -0,0 +1,12 @@ +# $NetBSD: Makefile,v 1.1 2012/08/26 23:03:2
CVS commit: src
Module Name:src Committed By: jmmv Date: Sun Aug 26 22:37:19 UTC 2012 Modified Files: src/doc: CHANGES src/tests/usr.bin/mkdep: t_mkdep.sh src/tools/host-mkdep: host-mkdep.in src/usr.bin/mkdep: mkdep.1 mkdep.c Log Message: Add a new "-P prefix" option to mkdep(1). This option prepends the string given in prefix to every target filename. This is useful for programs that have source files in multiple subdirectories and a single Makefile that references all of them explicitly (without using the VPATH functionality because there can be files with the same name in each subdirectory). To generate a diff of this commit: cvs rdiff -u -r1.1738 -r1.1739 src/doc/CHANGES cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/mkdep/t_mkdep.sh cvs rdiff -u -r1.20 -r1.21 src/tools/host-mkdep/host-mkdep.in cvs rdiff -u -r1.16 -r1.17 src/usr.bin/mkdep/mkdep.1 cvs rdiff -u -r1.40 -r1.41 src/usr.bin/mkdep/mkdep.c 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 diff -u src/doc/CHANGES:1.1738 src/doc/CHANGES:1.1739 --- src/doc/CHANGES:1.1738 Sun Aug 26 12:30:33 2012 +++ src/doc/CHANGES Sun Aug 26 22:37:19 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1738 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1739 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -106,3 +106,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: mfi(8): Added tagged queuing support. [bouyer 20120823] mfi(8): Added support for LSI SAS2208-based controllers. [bouyer 20120823] + mkdep(1): Add -P option. [jmmv 20120826] Index: src/tests/usr.bin/mkdep/t_mkdep.sh diff -u src/tests/usr.bin/mkdep/t_mkdep.sh:1.3 src/tests/usr.bin/mkdep/t_mkdep.sh:1.4 --- src/tests/usr.bin/mkdep/t_mkdep.sh:1.3 Tue Jun 14 11:44:25 2011 +++ src/tests/usr.bin/mkdep/t_mkdep.sh Sun Aug 26 22:37:19 2012 @@ -1,4 +1,4 @@ -# $NetBSD: t_mkdep.sh,v 1.3 2011/06/14 11:44:25 njoly Exp $ +# $NetBSD: t_mkdep.sh,v 1.4 2012/08/26 22:37:19 jmmv Exp $ # # Copyright (c) 2011 The NetBSD Foundation, Inc. # All rights reserved. @@ -28,12 +28,24 @@ # POSSIBILITY OF SUCH DAMAGE. # +atf_test_case prefix +prefix_head() { + atf_set "descr" "Test adding a prefix to a single target" + atf_set "require.progs" "mkdep cc" +} +prefix_body() { + + atf_check touch sample.c + + atf_check mkdep -f sample.d -P some/path/ sample.c + atf_check -o ignore grep '^some/path/sample.o:' sample.d +} + atf_test_case suffixes suffixes_head() { atf_set "descr" "Test suffixes list" atf_set "require.progs" "mkdep cc" } - suffixes_body() { atf_check touch sample.c @@ -51,6 +63,21 @@ suffixes_body() { atf_check -o ignore grep '^sample:' sample.d } +atf_test_case prefix_and_suffixes +prefix_and_suffixes_head() { + atf_set "descr" "Test the combination of a prefix and suffixes" + atf_set "require.progs" "mkdep cc" +} +prefix_and_suffixes_body() { + + atf_check touch sample.c + + atf_check mkdep -f sample.d -s '.a .b' -P c/d sample.c + atf_check -o ignore grep '^c/dsample.b c/dsample.a:' sample.d +} + atf_init_test_cases() { + atf_add_test_case prefix atf_add_test_case suffixes + atf_add_test_case prefix_and_suffixes } Index: src/tools/host-mkdep/host-mkdep.in diff -u src/tools/host-mkdep/host-mkdep.in:1.20 src/tools/host-mkdep/host-mkdep.in:1.21 --- src/tools/host-mkdep/host-mkdep.in:1.20 Thu Jun 30 20:09:41 2011 +++ src/tools/host-mkdep/host-mkdep.in Sun Aug 26 22:37:19 2012 @@ -1,6 +1,6 @@ #!@BSHELL@ - # -# $NetBSD: host-mkdep.in,v 1.20 2011/06/30 20:09:41 wiz Exp $ +# $NetBSD: host-mkdep.in,v 1.21 2012/08/26 22:37:19 jmmv Exp $ # # Copyright (c) 1991, 1993 # The Regents of the University of California. All rights reserved. @@ -43,6 +43,7 @@ AWK_OPTIONAL= QUIET=false CPPFLAGS= NEWEXT=.o +PREFIX= OUTFILE=.depend SRCS= @@ -61,10 +62,10 @@ set_objlist() IFS="$oifs" objlist= for suf in "$@"; do - objlist="$objlist${objlist:+ }$file$suf" + objlist="$objlist${objlist:+ }$PREFIX$file$suf" done else - objlist="$file" + objlist="$PREFIX$file" fi } @@ -84,7 +85,7 @@ while [ $# -gt 0 ]; do -p) NEWEXT=;; -q) QUIET=true;; - -[fs]) # Options with arguments + -[fPs]) # Options with arguments [ -z "$optarg" ] && { [ $# = 1 ] && usage shift @@ -92,6 +93,7 @@ while [ $# -gt 0 ]; do } case "-$option" in -f) OUTFILE="$optarg";; + -P) PREFIX="$optarg";; -s) NEWEXT="$optarg";; esac optarg= Index: src/usr.bin/mkdep/mkdep.1 diff -u src/usr.bin/mkdep/mkdep.1:1.16 src/usr.bin/mkdep/mkdep.1:1.17 --- src/usr.bin/mkde
CVS commit: src/sys/dev/ic
Module Name:src Committed By: bouyer Date: Sun Aug 26 16:22:32 UTC 2012 Modified Files: src/sys/dev/ic: mfi.c Log Message: Make MFI_DEBUG build on i386. Report BBU state changes with aprint_normal(), it seems that sysmon_envsys() doens't report changes for ENVSYS_INDICATOR as it does for ENVSYS_DRIVE. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/dev/ic/mfi.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/mfi.c diff -u src/sys/dev/ic/mfi.c:1.45 src/sys/dev/ic/mfi.c:1.46 --- src/sys/dev/ic/mfi.c:1.45 Sun Aug 26 16:05:29 2012 +++ src/sys/dev/ic/mfi.c Sun Aug 26 16:22:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mfi.c,v 1.45 2012/08/26 16:05:29 bouyer Exp $ */ +/* $NetBSD: mfi.c,v 1.46 2012/08/26 16:22:32 bouyer Exp $ */ /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */ /* @@ -73,7 +73,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.45 2012/08/26 16:05:29 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.46 2012/08/26 16:22:32 bouyer Exp $"); #include "bio.h" @@ -789,7 +789,7 @@ mfi_get_info(struct mfi_softc *sc) sc->sc_info.mci_host.mih_port_count); for (i = 0; i < 8; i++) - printf("%.0lx ", sc->sc_info.mci_host.mih_port_addr[i]); + printf("%.0" PRIx64 " ", sc->sc_info.mci_host.mih_port_addr[i]); printf("\n"); printf("%s: type %.x port_count %d port_addr ", @@ -797,8 +797,10 @@ mfi_get_info(struct mfi_softc *sc) sc->sc_info.mci_device.mid_type, sc->sc_info.mci_device.mid_port_count); - for (i = 0; i < 8; i++) - printf("%.0lx ", sc->sc_info.mci_device.mid_port_addr[i]); + for (i = 0; i < 8; i++) { + printf("%.0" PRIx64 " ", + sc->sc_info.mci_device.mid_port_addr[i]); + } printf("\n"); #endif /* MFI_DEBUG */ @@ -2582,11 +2584,17 @@ mfi_sensor_refresh(struct sysmon_envsys case MFI_BBU_GOOD: edata->value_cur = 1; edata->state = ENVSYS_SVALID; + if (!sc->sc_bbuok) +aprint_normal_dev(sc->sc_dev, +"BBU state changed to good\n"); sc->sc_bbuok = true; break; case MFI_BBU_BAD: edata->value_cur = 0; edata->state = ENVSYS_SCRITICAL; + if (sc->sc_bbuok) +aprint_normal_dev(sc->sc_dev, +"BBU state changed to bad\n"); sc->sc_bbuok = false; break; case MFI_BBU_UNKNOWN:
CVS commit: src/sys/dev/ic
Module Name:src Committed By: bouyer Date: Sun Aug 26 16:05:29 UTC 2012 Modified Files: src/sys/dev/ic: mfi.c mfireg.h mfivar.h Log Message: After discussion on tech-kern@, fix performance issue related to cache flush commands from WAPBL, by skipping the cache flush if the BBU is present and considered good. Users which still want the write back cache with a non-working BBU can set vfs.wapbl.flush_disk_cache to 0. - add commands to monitor the BBU state. Add a boolean BBU sensor to monitor the BBU state via sysmon_envsys(9). - if the BBU is considered good, turn SCSI_SYNCHRONIZE_CACHE_10 and SCSI_SYNCHRONIZE_CACHE_16 commands from upper layer into NOOPs. While there, handle SCSI_SYNCHRONIZE_CACHE_16 in addition to SCSI_SYNCHRONIZE_CACHE_10. - Add a shutdown pmf(9) handler, which flushes the cache and shutdown the firmware - on detach, also flush cache and shutdown firmware. - on attach, print the firmware-provided name, and the BBU state Tested on a LSI MegaRAID SAS 9265-8i and a PERC 5/i Integrated To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/dev/ic/mfi.c cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/mfireg.h cvs rdiff -u -r1.18 -r1.19 src/sys/dev/ic/mfivar.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/mfi.c diff -u src/sys/dev/ic/mfi.c:1.44 src/sys/dev/ic/mfi.c:1.45 --- src/sys/dev/ic/mfi.c:1.44 Thu Aug 23 12:24:33 2012 +++ src/sys/dev/ic/mfi.c Sun Aug 26 16:05:29 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: mfi.c,v 1.44 2012/08/23 12:24:33 bouyer Exp $ */ +/* $NetBSD: mfi.c,v 1.45 2012/08/26 16:05:29 bouyer Exp $ */ /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */ /* @@ -73,7 +73,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.44 2012/08/23 12:24:33 bouyer Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.45 2012/08/26 16:05:29 bouyer Exp $"); #include "bio.h" @@ -133,6 +133,12 @@ static void mfi_freemem(struct mfi_soft static int mfi_transition_firmware(struct mfi_softc *); static int mfi_initialize_firmware(struct mfi_softc *); static int mfi_get_info(struct mfi_softc *); +static int mfi_get_bbu(struct mfi_softc *, + struct mfi_bbu_status *); +/* return codes for mfi_get_bbu */ +#define MFI_BBU_GOOD 0 +#define MFI_BBU_BAD 1 +#define MFI_BBU_UNKNOWN 2 static uint32_t mfi_read(struct mfi_softc *, bus_size_t); static void mfi_write(struct mfi_softc *, bus_size_t, uint32_t); static int mfi_poll(struct mfi_ccb *); @@ -144,8 +150,8 @@ static int mfi_scsi_ld_io(struct mfi_cc uint64_t, uint32_t); static void mfi_scsi_ld_done(struct mfi_ccb *); static void mfi_scsi_xs_done(struct mfi_ccb *, int, int); -static int mfi_mgmt_internal(struct mfi_softc *, - uint32_t, uint32_t, uint32_t, void *, uint8_t *); +static int mfi_mgmt_internal(struct mfi_softc *, uint32_t, + uint32_t, uint32_t, void *, uint8_t *, bool); static int mfi_mgmt(struct mfi_ccb *,struct scsipi_xfer *, uint32_t, uint32_t, uint32_t, void *, uint8_t *); static void mfi_mgmt_done(struct mfi_ccb *); @@ -167,6 +173,9 @@ static int mfi_destroy_sensors(struct m static void mfi_sensor_refresh(struct sysmon_envsys *, envsys_data_t *); #endif /* NBIO > 0 */ +static bool mfi_shutdown(device_t, int); +static bool mfi_suspend(device_t, const pmf_qual_t *); +static bool mfi_resume(device_t, const pmf_qual_t *); static uint32_t mfi_xscale_fw_state(struct mfi_softc *sc); static void mfi_xscale_intr_ena(struct mfi_softc *sc); @@ -274,7 +283,7 @@ mfi_get_ccb(struct mfi_softc *sc) splx(s); DNPRINTF(MFI_D_CCB, "%s: mfi_get_ccb: %p\n", DEVNAME(sc), ccb); - if (ccb == NULL) + if (__predict_false(ccb == NULL && sc->sc_running)) aprint_error_dev(sc->sc_dev, "out of ccb\n"); return ccb; @@ -646,7 +655,7 @@ mfi_get_info(struct mfi_softc *sc) DNPRINTF(MFI_D_MISC, "%s: mfi_get_info\n", DEVNAME(sc)); if (mfi_mgmt_internal(sc, MR_DCMD_CTRL_GET_INFO, MFI_DATA_IN, - sizeof(sc->sc_info), &sc->sc_info, NULL)) + sizeof(sc->sc_info), &sc->sc_info, NULL, cold ? true : false)) return 1; #ifdef MFI_DEBUG @@ -796,6 +805,63 @@ mfi_get_info(struct mfi_softc *sc) return 0; } +static int +mfi_get_bbu(struct mfi_softc *sc, struct mfi_bbu_status *stat) +{ + DNPRINTF(MFI_D_MISC, "%s: mfi_get_bbu\n", DEVNAME(sc)); + + if (mfi_mgmt_internal(sc, MR_DCMD_BBU_GET_STATUS, MFI_DATA_IN, + sizeof(*stat), stat, NULL, cold ? true : false)) + return MFI_BBU_UNKNOWN; +#ifdef MFI_DEBUG + printf("bbu type %d, voltage %d, current %d, temperature %d, " + "status 0x%x\n", stat->battery_type, stat->voltage, stat->current, + stat->temperature, stat->fw_status); + printf("details: "); + switch(stat->battery_type) { + case MFI_BBU_TYPE_IBBU: + printf("guage %d relative charge %d charger state %d " + "charger ctrl %d\n", stat->detail.ibbu.gas_guage_status, + stat->detail.ibbu.relative_charge , +
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Aug 26 15:41:01 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: Add descriptions of fields, especially to document the difference between "Version" (in NetBSD) and "Current Vers" (available upstream). To generate a diff of this commit: cvs rdiff -u -r1.962 -r1.963 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.962 src/doc/3RDPARTY:1.963 --- src/doc/3RDPARTY:1.962 Sun Aug 26 14:23:21 2012 +++ src/doc/3RDPARTY Sun Aug 26 15:41:01 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.962 2012/08/26 14:23:21 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.963 2012/08/26 15:41:01 apb Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -23,6 +23,21 @@ # should be repeated on each line, except: # 5.) The Notes: field tag should appear on a line by itself; all # remaining lines until the end of the record are notes. +# +# Package: name or brief description (required, must be first) +# Version: version that is included with NetBSD (required) +# Current Vers: version that is available upstream (required) +# Maintainer: name and/or email address of upstream maintainer (required) +# Archive Site: URL to archive of upstream releases +# Home Page: URL to web page for upstream project +# Mailing List: email address or URL related to upstream mailing list +# License: description of license +# Responsible: comma-separated list of NetBSD developers +# Location: comma-separated list of subdirectories in the NetBSD src tree +# Notes: +# Multiple lines of free-form text, +# Must be last. +# Package: acpica Version: 20110623
CVS commit: src/usr.sbin/mountd
Module Name:src Committed By: wiz Date: Sun Aug 26 14:50:45 UTC 2012 Modified Files: src/usr.sbin/mountd: exports.5 Log Message: Dots as macro arguments need quoting. Bug reported by Paul Goyette. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/usr.sbin/mountd/exports.5 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/mountd/exports.5 diff -u src/usr.sbin/mountd/exports.5:1.30 src/usr.sbin/mountd/exports.5:1.31 --- src/usr.sbin/mountd/exports.5:1.30 Mon Oct 9 21:36:18 2006 +++ src/usr.sbin/mountd/exports.5 Sun Aug 26 14:50:45 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: exports.5,v 1.30 2006/10/09 21:36:18 wiz Exp $ +.\" $NetBSD: exports.5,v 1.31 2012/08/26 14:50:45 wiz Exp $ .\" .\" Copyright (c) 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -92,7 +92,7 @@ can still access the whole filesystem vi wanted to, even if just one subdirectory has been mounted. The pathnames must not have any symbolic links in them and should not have any -.Dq . +.Dq \&. or .Dq .. components.
CVS commit: src/bin/sh
Module Name:src Committed By: wiz Date: Sun Aug 26 14:30:38 UTC 2012 Modified Files: src/bin/sh: sh.1 Log Message: - improve punctuation; - improve (create more consistency in) spelling; - remove unnecessary (and in part ignored) macros, as well as an unnecessary argument to `.Bl' (fixes mandoc(1) warnings); - improve wording; - bump date. Patch from Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.107 -r1.108 src/bin/sh/sh.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/sh/sh.1 diff -u src/bin/sh/sh.1:1.107 src/bin/sh/sh.1:1.108 --- src/bin/sh/sh.1:1.107 Mon Jun 11 18:28:10 2012 +++ src/bin/sh/sh.1 Sun Aug 26 14:30:38 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: sh.1,v 1.107 2012/06/11 18:28:10 njoly Exp $ +.\" $NetBSD: sh.1,v 1.108 2012/08/26 14:30:38 wiz Exp $ .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. .\" @@ -31,7 +31,7 @@ .\" .\" @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" -.Dd June 11, 2012 +.Dd August 26, 2012 .Dt SH 1 .Os .Sh NAME @@ -233,7 +233,7 @@ explicitly tested if the command is used .Ic elif , .Ic while , or -.Ic until ; +.Ic until , or if the command is the left hand operand of an .Dq \*[Am]\*[Am] or @@ -345,7 +345,7 @@ is treated as a line continuation. .Ss Single Quotes Enclosing characters in single quotes preserves the literal meaning of all the characters (except single quotes, making it impossible to put -single-quotes in a single-quoted string). +single quotes in a single-quoted string). .Ss Double Quotes Enclosing characters within double quotes preserves the literal meaning of all characters except dollar sign @@ -755,7 +755,6 @@ Built-in commands grouped into a (list) The second form does not fork another shell so is slightly more efficient. Grouping commands together this way allows you to redirect their output as though they were one program: -.Pp .Bd -literal -offset indent { echo -n \*q hello \*q ; echo \*q world" ; } \*[Gt] greeting .Ed @@ -849,7 +848,7 @@ if is unset. .It @ Expands to the positional parameters, starting from one. -When the expansion occurs within double-quotes, each positional +When the expansion occurs within double quotes, each positional parameter expands as a separate argument. If there are no positional parameters, the expansion of @ generates zero arguments, even when @ is @@ -896,7 +895,7 @@ single field. It is only field splitting or pathname expansion that can create multiple fields from a single word. The single exception to this -rule is the expansion of the special parameter @ within double-quotes, as +rule is the expansion of the special parameter @ within double quotes, as was described above. .Pp The order of word expansion is: @@ -954,7 +953,7 @@ The parameter name or symbol can be encl optional except for positional parameters with more than one digit or when parameter is followed by a character that could be interpreted as part of the name. -If a parameter expansion occurs inside double-quotes: +If a parameter expansion occurs inside double quotes: .Bl -enum .It Pathname expansion is not performed on the results of the expansion. @@ -992,9 +991,6 @@ An interactive shell need not exit. Use Alternative Value. If parameter is unset or null, null is substituted; otherwise, the expansion of word is substituted. -.El -.Pp -.Bl -tag -width aaparameterworda .It ${#parameter} String Length. The length in characters of the value of parameter. @@ -1006,7 +1002,7 @@ In each case, pattern matching notation .Sx Shell Patterns ) , rather than regular expression notation, is used to evaluate the patterns. If parameter is * or @, the result of the expansion is unspecified. -Enclosing the full parameter expansion string in double-quotes does not +Enclosing the full parameter expansion string in double quotes does not cause the following four varieties of pattern characters to be quoted, whereas quoting characters within the braces has this effect. .Bl -tag -width aaparameterworda @@ -1067,8 +1063,8 @@ The format for arithmetic expansion is a .Pp .Dl $((expression)) .Pp -The expression is treated as if it were in double-quotes, except -that a double-quote inside the expression is not treated specially. +The expression is treated as if it were in double quotes, except +that a double quote inside the expression is not treated specially. The shell expands all tokens in the expression for parameter expansion, command substitution, and quote removal. .Pp @@ -1090,7 +1086,7 @@ sign. .Ss White Space Splitting (Field Splitting) After parameter expansion, command substitution, and arithmetic expansion the shell scans the results of -expansions and substitutions that did not occur in double-quotes for +expansions and substitutions that did not occur in double quotes for field splitting and multiple fields can re
CVS commit: src/usr.bin/find
Module Name:src Committed By: wiz Date: Sun Aug 26 14:26:37 UTC 2012 Modified Files: src/usr.bin/find: function.c Log Message: Make order of words in comment consistent with that within other comments (helps with search actions). Patch from Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 src/usr.bin/find/function.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.bin/find/function.c diff -u src/usr.bin/find/function.c:1.70 src/usr.bin/find/function.c:1.71 --- src/usr.bin/find/function.c:1.70 Sat May 5 21:16:16 2012 +++ src/usr.bin/find/function.c Sun Aug 26 14:26:37 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: function.c,v 1.70 2012/05/05 21:16:16 dholland Exp $ */ +/* $NetBSD: function.c,v 1.71 2012/08/26 14:26:37 wiz Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -37,7 +37,7 @@ #if 0 static char sccsid[] = "from: @(#)function.c 8.10 (Berkeley) 5/4/95"; #else -__RCSID("$NetBSD: function.c,v 1.70 2012/05/05 21:16:16 dholland Exp $"); +__RCSID("$NetBSD: function.c,v 1.71 2012/08/26 14:26:37 wiz Exp $"); #endif #endif /* not lint */ @@ -355,7 +355,7 @@ c_ctime(char ***argvp, int isok) /* * -delete functions -- * - * True always. Makes its best shot and continues on regardless. + * Always true. Makes its best shot and continues on regardless. */ int f_delete(PLAN *plan __unused, FTSENT *entry)
CVS commit: src/usr.bin/find
Module Name:src Committed By: wiz Date: Sun Aug 26 14:26:07 UTC 2012 Modified Files: src/usr.bin/find: find.1 Log Message: - improve spelling; - improve wording; - complement list of primaries that prevent `-print' from being used implicitly; - bump date. Patch from Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/usr.bin/find/find.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/find/find.1 diff -u src/usr.bin/find/find.1:1.77 src/usr.bin/find/find.1:1.78 --- src/usr.bin/find/find.1:1.77 Thu Aug 16 13:34:10 2012 +++ src/usr.bin/find/find.1 Sun Aug 26 14:26:07 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: find.1,v 1.77 2012/08/16 13:34:10 wiz Exp $ +.\" $NetBSD: find.1,v 1.78 2012/08/26 14:26:07 wiz Exp $ .\" .\" Copyright (c) 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\" .\" from: @(#)find.1 8.7 (Berkeley) 5/9/95 .\" -.Dd August 16, 2012 +.Dd August 26, 2012 .Dt FIND 1 .Os .Sh NAME @@ -212,7 +212,7 @@ was started, rounded up to the next full .Pp .It Ic -delete Delete found files, symbolic links and directories. -Always returns True. +Always returns true. This executes from the current working directory as .Nm recurses down the tree. @@ -223,7 +223,7 @@ returns that contain a .Xr ( fts 3 should not return such pathnames). Depth-first traversal processing is implied by this option. -This can also be invoked as +This primary can also be invoked as .Ic -rm . .Pp .It Ic -empty @@ -444,7 +444,7 @@ True if the file has links. .Pp .It Ic -rm -This is an alias for +This primary is an alias for .Ic -delete . .Pp .It Ic -ls @@ -589,14 +589,17 @@ This primary always evaluates to true. It prints the pathname of the current file to standard output, followed by a newline character. If none of +.Ic -delete , .Ic -exec , +.Ic -execdir , .Ic -exit , .Ic -fprint , .Ic -ls , .Ic -ok , .Ic -print0 , +.Ic -printx , nor -.Ic -printx +.Ic -rm is specified, the given expression shall be effectively replaced by .Cm \&( Ns Ar given\& expression Ns Cm \&) .Ic -print .
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Sun Aug 26 14:23:21 UTC 2012 Modified Files: src/doc: 3RDPARTY Log Message: Update entries for: - bind; - libbind; - bsd-family-tree; - m4; - tre (the `Mailing List' URL here gives a 404). Patch from Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.961 -r1.962 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.961 src/doc/3RDPARTY:1.962 --- src/doc/3RDPARTY:1.961 Sat Aug 25 11:14:58 2012 +++ src/doc/3RDPARTY Sun Aug 26 14:23:21 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.961 2012/08/25 11:14:58 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.962 2012/08/26 14:23:21 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -77,7 +77,7 @@ Archive Site: none Home Page: none Mailing List: none Responsible: sam, alc -License: BSD-like (2 clause), ISC +License: BSD-like (2-clause), ISC Location: sys/external/isc/atheros_hal/dist Notes: @@ -95,12 +95,13 @@ Notes: bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.9.1-P1 -Current Vers: 9.9.1-P1 +Version: 9.9.1-P2 +Current Vers: 9.9.1-P2 Maintainer: Paul Vixie Archive Site: ftp://ftp.isc.org/isc/bind9/ -Home Page: http://www.isc.org/sw/bind/ -Mailing List: +Home Page: http://www.isc.org/software/bind/ +Mailing List: https://lists.isc.org/mailman/listinfo/bind-announce +Mailing List: https://lists.isc.org/mailman/listinfo/bind-users Responsible: vixie, christos License: BSD-like (2-clause) Location: external/bsd/bind/dist @@ -113,11 +114,11 @@ The libc and include parts of the resolv Package: libbind [libc resolver and includes] Version: libbind-6.0-rc1 -Current Vers: libbind-6.0-rc1 +Current Vers: libbind-6.0 Maintainer: Paul Vixie Archive Site: ftp://ftp.isc.org/isc/libbind/ -Home Page: http://www.isc.org/sw/bind/ -Mailing List: +Home Page: http://www.isc.org/software/libbind/ +Mailing List: https://lists.isc.org/mailman/listinfo/bind-workers Responsible: vixie, christos License: BSD-like (2-clause) Location: external/bsd/libbind/dist @@ -162,14 +163,14 @@ Notes: Delete "queue.h" from the distribution. Package: bsd-family-tree -Version: 1.116 -Current Vers: 1.116 -Maintainer: n/a -Archive Site: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -Home Page: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree +Version: 1.151 +Current Vers: 1.156 +Maintainer: The FreeBSD Project +Archive Site: http://www.freebsd.org/cgi/cvsweb.cgi/src/share/misc/bsd-family-tree +Home Page: http://www.freebsd.org/cgi/cvsweb.cgi/src/share/misc/bsd-family-tree Mailing List: Responsible: -License: See URL above. +License: BSD (2-clause) (see http://www.freebsd.org/cgi/cvsweb.cgi/src/COPYRIGHT) Location: share/misc/bsd-family-tree Notes: @@ -665,9 +666,9 @@ working directory '.' to avoid potential Package: m4 Version: 20091026 Current Vers: 20091026 -Maintainer: OpenBSD +Maintainer: The OpenBSD Project Archive Site: http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/m4 -Home Page: http://openbsd.org +Home Page: http://www.openbsd.org/ Mailing List: License: BSD 3-clause like (dns-sd) Responsible: christos @@ -1323,9 +1324,9 @@ Current Vers: 0.8.0 Maintainer: http://laurikari.net/tre Archive Site: http://laurikari.net/tre Home Page: http://laurikari.net/tre -Mailing List: http://laurikari.net/mailman/listinfo/tre-general +Mailing List: Responsible: agc, christos -License: BSD +License: BSD (2-clause) Location: external/bsd/tre/dist Notes: Need to feed back local changes
CVS commit: src/usr.bin/uniq
Module Name:src Committed By: wiz Date: Sun Aug 26 14:14:16 UTC 2012 Modified Files: src/usr.bin/uniq: uniq.c Log Message: - synchronize `usage' message with man page. Patch from Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.bin/uniq/uniq.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.bin/uniq/uniq.c diff -u src/usr.bin/uniq/uniq.c:1.17 src/usr.bin/uniq/uniq.c:1.18 --- src/usr.bin/uniq/uniq.c:1.17 Wed Oct 6 07:59:18 2010 +++ src/usr.bin/uniq/uniq.c Sun Aug 26 14:14:16 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: uniq.c,v 1.17 2010/10/06 07:59:18 wiz Exp $ */ +/* $NetBSD: uniq.c,v 1.18 2012/08/26 14:14:16 wiz Exp $ */ /* * Copyright (c) 1989, 1993 @@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19 #if 0 static char sccsid[] = "@(#)uniq.c 8.3 (Berkeley) 5/4/95"; #endif -__RCSID("$NetBSD: uniq.c,v 1.17 2010/10/06 07:59:18 wiz Exp $"); +__RCSID("$NetBSD: uniq.c,v 1.18 2012/08/26 14:14:16 wiz Exp $"); #endif /* not lint */ #include @@ -251,7 +251,7 @@ obsolete(char *argv[]) static void usage(void) { - (void)fprintf(stderr, "Usage: %s [-cdu] [-f fields] [-s chars] " - "[input [output]]\n", getprogname()); + (void)fprintf(stderr, "usage: %s [-cdu] [-f fields] [-s chars] " + "[input_file [output_file]]\n", getprogname()); exit(1); }
CVS commit: src/usr.bin/uniq
Module Name:src Committed By: wiz Date: Sun Aug 26 14:13:50 UTC 2012 Modified Files: src/usr.bin/uniq: uniq.1 Log Message: - improve punctuation; - improve wording (explicitly mention the name of the optional additional arguments within the text, using macros as well); - create separate section, and use `.Ex' macro, for exit status information; - bump date. Patch from Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/usr.bin/uniq/uniq.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/uniq/uniq.1 diff -u src/usr.bin/uniq/uniq.1:1.12 src/usr.bin/uniq/uniq.1:1.13 --- src/usr.bin/uniq/uniq.1:1.12 Wed Oct 6 06:43:26 2010 +++ src/usr.bin/uniq/uniq.1 Sun Aug 26 14:13:50 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: uniq.1,v 1.12 2010/10/06 06:43:26 dholland Exp $ +.\" $NetBSD: uniq.1,v 1.13 2012/08/26 14:13:50 wiz Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\" .\" @(#)uniq.1 8.1 (Berkeley) 6/6/93 .\" -.Dd January 6, 2007 +.Dd August 26, 2012 .Dt UNIQ 1 .Os .Sh NAME @@ -70,7 +70,7 @@ Ignore the first in each input line when doing comparisons. A field is a string of non-blank characters separated from adjacent fields by blanks. -Field numbers are one based, i.e. the first field is field one. +Field numbers are one based, i.e., the first field is field one. .It Fl s Ar chars Ignore the first .Ar chars @@ -82,7 +82,7 @@ option, the first characters after the first .Ar fields fields will be ignored. -Character numbers are one based, i.e. the first character is character one. +Character numbers are one based, i.e., the first character is character one. .It Fl u Don't output lines that are repeated in the input. .\".It Fl Ns Ar n @@ -105,13 +105,15 @@ Don't output lines that are repeated in .\"number. .El .Pp -If additional arguments are specified on the command line, the first -such argument is used as the name of an input file, the second is used -as the name of an output file. -.Pp -The -.Nm -utility exits 0 on success, and \*[Gt]0 if an error occurs. +Additional arguments +.Ar input_file +and +.Ar output_file +may be specified on the command line, +where the former is then used as the name of an input file, +and the latter as the name of an output file. +.Sh EXIT STATUS +.Ex -std .Sh COMPATIBILITY The historic .Cm \&\(pl Ns Ar number
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Aug 26 12:30:33 UTC 2012 Modified Files: src/doc: CHANGES CHANGES.prev Log Message: Move tzdata2012d and tzdata2012e lines from CHANGES to CHANGES.prev. To generate a diff of this commit: cvs rdiff -u -r1.1737 -r1.1738 src/doc/CHANGES cvs rdiff -u -r1.114 -r1.115 src/doc/CHANGES.prev 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 diff -u src/doc/CHANGES:1.1737 src/doc/CHANGES:1.1738 --- src/doc/CHANGES:1.1737 Sun Aug 26 12:28:19 2012 +++ src/doc/CHANGES Sun Aug 26 12:30:33 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1737 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1738 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -89,7 +89,6 @@ Changes from NetBSD 6.0 to NetBSD 7.0: "device_t". [matt 20120722] pr(1): Add support for POSIX -f and -p options. [ginsbach 20120724] powerpc: Add support for FPU emulation on BookE. [matt 20120722] - zoneinfo: Import tzdata2012d. [apb 20120722] OpenSSL: Imported 1.0.1c [christos 20120726] kernel: safepri is dead; replaced by macro IPL_SAFEPRI. [matt 20120727] kernel: Add malo(4), a driver for Marvell Libertas IEEE 802.11b/g @@ -101,7 +100,6 @@ Changes from NetBSD 6.0 to NetBSD 7.0: can be loaded. [jnemeth 20120803] modstat(8): Add -A, -a, and -e options for testing module loadability. [jnemeth 20120803] - zoneinfo: Import tzdata2012e. [apb 20120808] libc: Update to tzcode2012e. [christos 20120809] arm: Add support for BEAGLEBOARDXM (TI DM37XX cpus) boards. [matt 20120822] Index: src/doc/CHANGES.prev diff -u src/doc/CHANGES.prev:1.114 src/doc/CHANGES.prev:1.115 --- src/doc/CHANGES.prev:1.114 Tue Aug 14 15:17:53 2012 +++ src/doc/CHANGES.prev Sun Aug 26 12:30:33 2012 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.114 $> +LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.115 $> Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -11197,8 +11197,10 @@ Changes from NetBSD 5.0 to NetBSD 6.0: rasops(9) APIs instead of deprecated rcons(4). This allows "options FONT_foo" in kernel config files. [tsutsui 20120720] + zoneinfo: Import tzdata2012d. [apb 20120722] luna68k: Fix hangup after reboot(2) problem. [tsutsui 20120723] evbarm: Add initial support for the RaspberryPi. [skrll 20120726] luna68k: Handle bootarg strings passed from firmware prompt properly on LUNA-II. [tsutsui 20120728] + zoneinfo: Import tzdata2012e. [apb 20120808] postfix(1): Import version 2.8.12 [tron 20120810]
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Aug 26 12:28:19 UTC 2012 Modified Files: src/doc: CHANGES Log Message: Wrap a line that was longer than 80 columns. To generate a diff of this commit: cvs rdiff -u -r1.1736 -r1.1737 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.1736 src/doc/CHANGES:1.1737 --- src/doc/CHANGES:1.1736 Sun Aug 26 12:27:05 2012 +++ src/doc/CHANGES Sun Aug 26 12:28:19 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1736 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1737 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -103,7 +103,8 @@ Changes from NetBSD 6.0 to NetBSD 7.0: [jnemeth 20120803] zoneinfo: Import tzdata2012e. [apb 20120808] libc: Update to tzcode2012e. [christos 20120809] - arm: Add support for BEAGLEBOARDXM (TI DM37XX cpus) boards. [matt 20120822] + arm: Add support for BEAGLEBOARDXM (TI DM37XX cpus) boards. + [matt 20120822] mfi(8): Added tagged queuing support. [bouyer 20120823] mfi(8): Added support for LSI SAS2208-based controllers. [bouyer 20120823]
CVS commit: src/doc
Module Name:src Committed By: apb Date: Sun Aug 26 12:27:06 UTC 2012 Modified Files: src/doc: CHANGES Log Message: zoneinfo: Import tzdata2012e. [apb 20120808] libc: Update to tzcode2012e. [christos 20120809] To generate a diff of this commit: cvs rdiff -u -r1.1735 -r1.1736 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.1735 src/doc/CHANGES:1.1736 --- src/doc/CHANGES:1.1735 Thu Aug 23 10:00:55 2012 +++ src/doc/CHANGES Sun Aug 26 12:27:05 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1735 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1736 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -101,6 +101,8 @@ Changes from NetBSD 6.0 to NetBSD 7.0: can be loaded. [jnemeth 20120803] modstat(8): Add -A, -a, and -e options for testing module loadability. [jnemeth 20120803] + zoneinfo: Import tzdata2012e. [apb 20120808] + libc: Update to tzcode2012e. [christos 20120809] arm: Add support for BEAGLEBOARDXM (TI DM37XX cpus) boards. [matt 20120822] mfi(8): Added tagged queuing support. [bouyer 20120823] mfi(8): Added support for LSI SAS2208-based controllers.
CVS commit: src/sbin/fsck_ffs
Module Name:src Committed By: dholland Date: Sun Aug 26 09:34:43 UTC 2012 Modified Files: src/sbin/fsck_ffs: quota2.c Log Message: stdlib.h, not malloc.h To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sbin/fsck_ffs/quota2.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck_ffs/quota2.c diff -u src/sbin/fsck_ffs/quota2.c:1.5 src/sbin/fsck_ffs/quota2.c:1.6 --- src/sbin/fsck_ffs/quota2.c:1.5 Tue Mar 20 18:50:31 2012 +++ src/sbin/fsck_ffs/quota2.c Sun Aug 26 09:34:42 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: quota2.c,v 1.5 2012/03/20 18:50:31 matt Exp $ */ +/* $NetBSD: quota2.c,v 1.6 2012/08/26 09:34:42 dholland Exp $ */ /*- * Copyright (c) 2010 Manuel Bouyer * All rights reserved. @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include "fsutil.h"
CVS commit: src/sbin/fsck_ffs
Module Name:src Committed By: dholland Date: Sun Aug 26 09:34:17 UTC 2012 Modified Files: src/sbin/fsck_ffs: pass6.c Log Message: stdlib.h, not malloc.h To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sbin/fsck_ffs/pass6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck_ffs/pass6.c diff -u src/sbin/fsck_ffs/pass6.c:1.3 src/sbin/fsck_ffs/pass6.c:1.4 --- src/sbin/fsck_ffs/pass6.c:1.3 Tue Jun 7 14:56:12 2011 +++ src/sbin/fsck_ffs/pass6.c Sun Aug 26 09:34:17 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pass6.c,v 1.3 2011/06/07 14:56:12 bouyer Exp $ */ +/* $NetBSD: pass6.c,v 1.4 2012/08/26 09:34:17 dholland Exp $ */ /*- * Copyright (c) 2010 Manuel Bouyer * All rights reserved. @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include "fsutil.h"
CVS commit: src/sbin/fsck_ffs
Module Name:src Committed By: dholland Date: Sun Aug 26 09:33:42 UTC 2012 Modified Files: src/sbin/fsck_ffs: pass5.c Log Message: stdlib.h, not malloc.h To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sbin/fsck_ffs/pass5.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck_ffs/pass5.c diff -u src/sbin/fsck_ffs/pass5.c:1.49 src/sbin/fsck_ffs/pass5.c:1.50 --- src/sbin/fsck_ffs/pass5.c:1.49 Sun Aug 14 12:32:01 2011 +++ src/sbin/fsck_ffs/pass5.c Sun Aug 26 09:33:42 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pass5.c,v 1.49 2011/08/14 12:32:01 christos Exp $ */ +/* $NetBSD: pass5.c,v 1.50 2012/08/26 09:33:42 dholland Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pass5.c 8.9 (Berkeley) 4/28/95"; #else -__RCSID("$NetBSD: pass5.c,v 1.49 2011/08/14 12:32:01 christos Exp $"); +__RCSID("$NetBSD: pass5.c,v 1.50 2012/08/26 09:33:42 dholland Exp $"); #endif #endif /* not lint */ @@ -48,7 +48,7 @@ __RCSID("$NetBSD: pass5.c,v 1.49 2011/08 #include #include -#include +#include #include "fsutil.h" #include "fsck.h"
CVS commit: src/sbin/fsck_ext2fs
Module Name:src Committed By: dholland Date: Sun Aug 26 09:33:19 UTC 2012 Modified Files: src/sbin/fsck_ext2fs: pass5.c Log Message: stdlib.h, not malloc.h To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sbin/fsck_ext2fs/pass5.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck_ext2fs/pass5.c diff -u src/sbin/fsck_ext2fs/pass5.c:1.19 src/sbin/fsck_ext2fs/pass5.c:1.20 --- src/sbin/fsck_ext2fs/pass5.c:1.19 Sat Aug 6 16:42:41 2011 +++ src/sbin/fsck_ext2fs/pass5.c Sun Aug 26 09:33:18 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: pass5.c,v 1.19 2011/08/06 16:42:41 dholland Exp $ */ +/* $NetBSD: pass5.c,v 1.20 2012/08/26 09:33:18 dholland Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -58,7 +58,7 @@ #if 0 static char sccsid[] = "@(#)pass5.c 8.6 (Berkeley) 11/30/94"; #else -__RCSID("$NetBSD: pass5.c,v 1.19 2011/08/06 16:42:41 dholland Exp $"); +__RCSID("$NetBSD: pass5.c,v 1.20 2012/08/26 09:33:18 dholland Exp $"); #endif #endif /* not lint */ @@ -69,7 +69,7 @@ __RCSID("$NetBSD: pass5.c,v 1.19 2011/08 #include #include #include -#include +#include #include #include "fsutil.h"