CVS commit: othersrc/external/bsd
Module Name:othersrc
Committed By: agc
Date: Tue May 3 06:28:22 UTC 2011
Modified Files:
othersrc/external/bsd/crc/dist: libcrc.h
othersrc/external/bsd/find2/dist: find2.h
othersrc/external/bsd/hmac/dist: hmac.h
othersrc/external/bsd/rs/dist: rs.h
Log Message:
use C calling conventions via BEGIN_DECLS/END_DECLS
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/crc/dist/libcrc.h
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/find2/dist/find2.h
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/hmac/dist/hmac.h
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/rs/dist/rs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/crc/dist/libcrc.h
diff -u othersrc/external/bsd/crc/dist/libcrc.h:1.1.1.1 othersrc/external/bsd/crc/dist/libcrc.h:1.2
--- othersrc/external/bsd/crc/dist/libcrc.h:1.1.1.1 Thu Apr 28 02:09:00 2011
+++ othersrc/external/bsd/crc/dist/libcrc.h Tue May 3 06:28:22 2011
@@ -45,6 +45,18 @@
#include
+#ifndef __BEGIN_DECLS
+# if defined(__cplusplus)
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS }
+# else
+# define __BEGIN_DECLS
+# define __END_DECLS
+# endif
+#endif
+
+__BEGIN_DECLS
+
/**/
#define CRC_DEF_WIDTH 4
@@ -78,4 +90,6 @@
unsigned CRC_tabentry(CRC_CTX */*ctx*/, int /*indx*/);
+__END_DECLS
+
#endif
Index: othersrc/external/bsd/find2/dist/find2.h
diff -u othersrc/external/bsd/find2/dist/find2.h:1.1.1.1 othersrc/external/bsd/find2/dist/find2.h:1.2
--- othersrc/external/bsd/find2/dist/find2.h:1.1.1.1 Sat Mar 19 04:44:51 2011
+++ othersrc/external/bsd/find2/dist/find2.h Tue May 3 06:28:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: find2.h,v 1.1.1.1 2011/03/19 04:44:51 agc Exp $ */
+/* $NetBSD: find2.h,v 1.2 2011/05/03 06:28:22 agc Exp $ */
/*-
* Copyright (c) 2005-2011 Alistair Crooks
@@ -33,6 +33,18 @@
#include
#include
+#ifndef __BEGIN_DECLS
+# if defined(__cplusplus)
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS }
+# else
+# define __BEGIN_DECLS
+# define __END_DECLS
+# endif
+#endif
+
+__BEGIN_DECLS
+
/* a phrase in an expression */
typedef struct f2phrase_t {
int name; /* token for name of var */
@@ -73,4 +85,6 @@
int find2_parse(find_t *, const char *);
int find2(find_t *, const char *, FILE *);
+__END_DECLS
+
#endif /* FIND2_H_ */
Index: othersrc/external/bsd/hmac/dist/hmac.h
diff -u othersrc/external/bsd/hmac/dist/hmac.h:1.1.1.1 othersrc/external/bsd/hmac/dist/hmac.h:1.2
--- othersrc/external/bsd/hmac/dist/hmac.h:1.1.1.1 Thu Apr 14 04:52:46 2011
+++ othersrc/external/bsd/hmac/dist/hmac.h Tue May 3 06:28:22 2011
@@ -27,6 +27,19 @@
#include
+#ifndef __BEGIN_DECLS
+# if defined(__cplusplus)
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS }
+# else
+# define __BEGIN_DECLS
+# define __END_DECLS
+# endif
+#endif
+
+__BEGIN_DECLS
+
+
int hmac(const char *, uint8_t *, size_t, const uint8_t *, size_t, uint8_t *, size_t);
size_t hmac_bin2str(uint8_t *, size_t, char *, size_t);
size_t hmac_str2bin(uint8_t *, size_t, uint8_t *, size_t);
@@ -36,4 +49,6 @@
HMAC_MAX_STRING_SIZE = (HMAC_MAX_DIGEST_SIZE * 2) + 1
};
+__END_DECLS
+
#endif
Index: othersrc/external/bsd/rs/dist/rs.h
diff -u othersrc/external/bsd/rs/dist/rs.h:1.3 othersrc/external/bsd/rs/dist/rs.h:1.4
--- othersrc/external/bsd/rs/dist/rs.h:1.3 Tue Apr 26 15:41:26 2011
+++ othersrc/external/bsd/rs/dist/rs.h Tue May 3 06:28:21 2011
@@ -35,6 +35,18 @@
#include
+#ifndef __BEGIN_DECLS
+# if defined(__cplusplus)
+# define __BEGIN_DECLS extern "C" {
+# define __END_DECLS }
+# else
+# define __BEGIN_DECLS
+# define __END_DECLS
+# endif
+#endif
+
+__BEGIN_DECLS
+
typedef struct rs_header_t {
char magic[4]; /* magic number */
uint32_t poly; /* polynomial used */
@@ -82,4 +94,6 @@
ssize_t rs_get_header(rs_t *, const void *, size_t);
ssize_t rs_put_header(rs_t *, void *, size_t);
+__END_DECLS
+
#endif
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Tue May 3 06:13:06 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/sbin: Makefile
Added Files:
src/tests/sbin/ifconfig: Makefile t_nonexistent.sh
Log Message:
Add a test for non-critical/low PR bin/43141.
To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.41 -r1.42 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.2 -r1.3 src/tests/sbin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/sbin/ifconfig/Makefile \
src/tests/sbin/ifconfig/t_nonexistent.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.321 src/distrib/sets/lists/tests/mi:1.322
--- src/distrib/sets/lists/tests/mi:1.321 Tue May 3 04:50:30 2011
+++ src/distrib/sets/lists/tests/mi Tue May 3 06:13:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.321 2011/05/03 04:50:30 jruoho Exp $
+# $NetBSD: mi,v 1.322 2011/05/03 06:13:06 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2258,6 +2258,9 @@
./usr/tests/sbin/fsck_ffs/Atffile tests-sbin-tests atf
./usr/tests/sbin/fsck_ffs/t_check_quotas tests-sbin-tests atf
./usr/tests/sbin/fsck_ffs/t_enable_quotas tests-sbin-tests atf
+./usr/tests/sbin/ifconfig tests-sbin-tests
+./usr/tests/sbin/ifconfig/Atffile tests-sbin-tests atf
+./usr/tests/sbin/ifconfig/t_nonexistent tests-sbin-tests atf
./usr/tests/sbin/newfstests-sbin-tests
./usr/tests/sbin/newfs/Atffile tests-sbin-tests atf
./usr/tests/sbin/newfs/t_enable_quotas tests-sbin-tests atf
Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.41 src/etc/mtree/NetBSD.dist.tests:1.42
--- src/etc/mtree/NetBSD.dist.tests:1.41 Mon May 2 11:55:15 2011
+++ src/etc/mtree/NetBSD.dist.tests Tue May 3 06:13:06 2011
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.tests,v 1.41 2011/05/02 11:55:15 njoly Exp $
+# $NetBSD: NetBSD.dist.tests,v 1.42 2011/05/03 06:13:06 jruoho Exp $
./usr/libdata/debug/usr/tests
./usr/libdata/debug/usr/tests/atf
@@ -228,6 +228,7 @@
./usr/tests/rump/rumpvfs
./usr/tests/sbin
./usr/tests/sbin/fsck_ffs
+./usr/tests/sbin/ifconfig
./usr/tests/sbin/newfs
./usr/tests/sbin/resize_ffs
./usr/tests/sys
Index: src/tests/sbin/Makefile
diff -u src/tests/sbin/Makefile:1.2 src/tests/sbin/Makefile:1.3
--- src/tests/sbin/Makefile:1.2 Sun Mar 6 17:08:41 2011
+++ src/tests/sbin/Makefile Tue May 3 06:13:06 2011
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2011/03/06 17:08:41 bouyer Exp $
+# $NetBSD: Makefile,v 1.3 2011/05/03 06:13:06 jruoho Exp $
#
.include
TESTSDIR= ${TESTSBASE}/sbin
-TESTS_SUBDIRS+= fsck_ffs newfs resize_ffs
+TESTS_SUBDIRS+= fsck_ffs ifconfig newfs resize_ffs
.include
Added files:
Index: src/tests/sbin/ifconfig/Makefile
diff -u /dev/null src/tests/sbin/ifconfig/Makefile:1.1
--- /dev/null Tue May 3 06:13:06 2011
+++ src/tests/sbin/ifconfig/Makefile Tue May 3 06:13:06 2011
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2011/05/03 06:13:06 jruoho Exp $
+
+.include
+
+TESTSDIR= ${TESTSBASE}/sbin/ifconfig
+
+TESTS_SH= t_nonexistent
+
+.include
Index: src/tests/sbin/ifconfig/t_nonexistent.sh
diff -u /dev/null src/tests/sbin/ifconfig/t_nonexistent.sh:1.1
--- /dev/null Tue May 3 06:13:06 2011
+++ src/tests/sbin/ifconfig/t_nonexistent.sh Tue May 3 06:13:06 2011
@@ -0,0 +1,47 @@
+#! /usr/bin/atf-sh
+#
+# $NetBSD: t_nonexistent.sh,v 1.1 2011/05/03 06:13:06 jruoho Exp $
+#
+# Copyright (c) 2011 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Jukka Ruohonen.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLU
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Tue May 3 04:50:31 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/include: Makefile
Added Files:
src/tests/include: t_bswap.c
Log Message:
Some naive tests for the bswap(3) family.
To generate a diff of this commit:
cvs rdiff -u -r1.320 -r1.321 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.6 -r1.7 src/tests/include/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/include/t_bswap.c
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.320 src/distrib/sets/lists/tests/mi:1.321
--- src/distrib/sets/lists/tests/mi:1.320 Mon May 2 17:26:23 2011
+++ src/distrib/sets/lists/tests/mi Tue May 3 04:50:30 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.320 2011/05/02 17:26:23 jruoho Exp $
+# $NetBSD: mi,v 1.321 2011/05/03 04:50:30 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -284,6 +284,7 @@
./usr/libdata/debug/usr/tests/include/sys/t_bitops.debug tests-ipf-tests debug,atf
./usr/libdata/debug/usr/tests/include/sys/t_bootblock.debug tests-ipf-tests debug,atf
./usr/libdata/debug/usr/tests/include/t_bitstring.debug tests-ipf-tests debug,atf
+./usr/libdata/debug/usr/tests/include/t_bswap.debug tests-ipf-tests debug,atf
./usr/libdata/debug/usr/tests/include/t_errno.debug tests-ipf-tests debug,atf
./usr/libdata/debug/usr/tests/include/t_glob.debug tests-ipf-tests debug,atf
./usr/libdata/debug/usr/tests/include/t_inttypes.debug tests-ipf-tests debug,atf
@@ -1384,6 +1385,7 @@
./usr/tests/include/sys/t_bitops tests-include-tests atf
./usr/tests/include/sys/t_bootblock tests-include-tests atf
./usr/tests/include/t_bitstring tests-include-tests atf
+./usr/tests/include/t_bswap tests-include-tests atf
./usr/tests/include/t_errno tests-include-tests atf
./usr/tests/include/t_glob tests-include-tests atf
./usr/tests/include/t_inttypes tests-include-tests atf
Index: src/tests/include/Makefile
diff -u src/tests/include/Makefile:1.6 src/tests/include/Makefile:1.7
--- src/tests/include/Makefile:1.6 Sun May 1 17:07:06 2011
+++ src/tests/include/Makefile Tue May 3 04:50:31 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/05/01 17:07:06 jruoho Exp $
+# $NetBSD: Makefile,v 1.7 2011/05/03 04:50:31 jruoho Exp $
NOMAN= # defined
@@ -8,6 +8,7 @@
TESTS_SUBDIRS= sys
TESTS_C= t_bitstring
+TESTS_C+= t_bswap
TESTS_C+= t_errno
TESTS_C+= t_glob
TESTS_C+= t_inttypes
Added files:
Index: src/tests/include/t_bswap.c
diff -u /dev/null src/tests/include/t_bswap.c:1.1
--- /dev/null Tue May 3 04:50:31 2011
+++ src/tests/include/t_bswap.c Tue May 3 04:50:31 2011
@@ -0,0 +1,178 @@
+/* $NetBSD: t_bswap.c,v 1.1 2011/05/03 04:50:31 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include
+__RCSID("$NetBSD: t_bswap.c,v 1.1 2011/05/03 04:50:31 jruoho Exp $");
+
+#include
+#include
+
+#include
+
+static uint16_t x16;
+static uint32_t x32;
+static uint64_t x64;
+
+static uint16_t unconst16(uint16_t);
+static uint32_t unconst32(uint32_t);
+static uint64_t unconst64(uint64_t);
+
+/*
+ * Given the use of __builtin_constant_p(3),
+ * these functions try to avoid gcc(1) from
+ * treating the arguments as constants.
+ */
+static uint16_t
+unconst16(uint16_t val)
+{
+ return val + x16;
+}
+
+static uint32_t
+unconst32(uint32_t val)
+{
+ retur
CVS commit: src/sys/dev/isa
Module Name:src
Committed By: mrg
Date: Tue May 3 04:27:13 UTC 2011
Modified Files:
src/sys/dev/isa: pcppi.c pcppivar.h
Log Message:
convert a lockless + spltty() combo to a IPL_VM mutex and cv.
hopefully this will avoid the beep-didn't-stop problem i had recently
that i was able to fix by calling wakeup() on pcppi's softc from ddb.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/isa/pcppi.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/isa/pcppivar.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/isa/pcppi.c
diff -u src/sys/dev/isa/pcppi.c:1.35 src/sys/dev/isa/pcppi.c:1.36
--- src/sys/dev/isa/pcppi.c:1.35 Fri Apr 17 20:46:37 2009
+++ src/sys/dev/isa/pcppi.c Tue May 3 04:27:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppi.c,v 1.35 2009/04/17 20:46:37 dyoung Exp $ */
+/* $NetBSD: pcppi.c,v 1.36 2011/05/03 04:27:13 mrg Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.35 2009/04/17 20:46:37 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.36 2011/05/03 04:27:13 mrg Exp $");
#include "attimer.h"
@@ -39,8 +39,9 @@
#include
#include
#include
-
#include
+#include
+#include
#include
@@ -199,6 +200,10 @@
callout_stop(&sc->sc_bell_ch);
callout_destroy(&sc->sc_bell_ch);
bus_space_unmap(sc->sc_iot, sc->sc_ppi_ioh, sc->sc_size);
+
+ mutex_destroy(&sc->sc_lock);
+ cv_destroy(&sc->sc_stop_cv);
+
return 0;
}
@@ -212,6 +217,9 @@
sc->sc_bellactive = sc->sc_bellpitch = sc->sc_slp = 0;
+ mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_VM);
+ cv_init(&sc->sc_stop_cv, "bell");
+
#if NPCKBD > 0
/* Provide a beeper for the PC Keyboard, if there isn't one already. */
pckbd_hookup_bell(pcppi_pckbd_bell, sc);
@@ -266,21 +274,20 @@
pcppi_bell(pcppi_tag_t self, int pitch, int period, int slp)
{
struct pcppi_softc *sc = self;
- int s;
- s = spltty(); /* ??? */
+ mutex_enter(&sc->sc_lock);
if (sc->sc_bellactive) {
if (sc->sc_timeout) {
sc->sc_timeout = 0;
callout_stop(&sc->sc_bell_ch);
}
if (sc->sc_slp)
- wakeup(pcppi_bell_stop);
+ cv_broadcast(&sc->sc_stop_cv);
}
if (pitch == 0 || period == 0) {
pcppi_bell_stop(sc);
sc->sc_bellpitch = 0;
- splx(s);
+ mutex_exit(&sc->sc_lock);
return;
}
if (!sc->sc_bellactive || sc->sc_bellpitch != pitch) {
@@ -304,20 +311,19 @@
callout_reset(&sc->sc_bell_ch, period, pcppi_bell_stop, sc);
if (slp & PCPPI_BELL_SLEEP) {
sc->sc_slp = 1;
- tsleep(pcppi_bell_stop, PCPPIPRI | PCATCH, "bell", 0);
+ cv_wait_sig(&sc->sc_stop_cv, &sc->sc_lock);
sc->sc_slp = 0;
}
}
- splx(s);
+ mutex_exit(&sc->sc_lock);
}
static void
pcppi_bell_stop(void *arg)
{
struct pcppi_softc *sc = arg;
- int s;
- s = spltty(); /* ??? */
+ mutex_enter(&sc->sc_lock);
sc->sc_timeout = 0;
/* disable bell */
@@ -326,8 +332,8 @@
& ~PIT_SPKR);
sc->sc_bellactive = 0;
if (sc->sc_slp)
- wakeup(pcppi_bell_stop);
- splx(s);
+ cv_broadcast(&sc->sc_stop_cv);
+ mutex_exit(&sc->sc_lock);
}
#if NPCKBD > 0
Index: src/sys/dev/isa/pcppivar.h
diff -u src/sys/dev/isa/pcppivar.h:1.9 src/sys/dev/isa/pcppivar.h:1.10
--- src/sys/dev/isa/pcppivar.h:1.9 Tue Mar 4 16:35:19 2008
+++ src/sys/dev/isa/pcppivar.h Tue May 3 04:27:13 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pcppivar.h,v 1.9 2008/03/04 16:35:19 cube Exp $ */
+/* $NetBSD: pcppivar.h,v 1.10 2011/05/03 04:27:13 mrg Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -37,18 +37,21 @@
};
struct pcppi_softc {
-device_t sc_dv;
+ device_t sc_dv;
-bus_space_tag_t sc_iot;
-bus_space_handle_t sc_ppi_ioh;
-bus_size_t sc_size;
-device_t sc_timer;
+ bus_space_tag_t sc_iot;
+ bus_space_handle_t sc_ppi_ioh;
+ bus_size_t sc_size;
+ device_t sc_timer;
-struct callout sc_bell_ch;
+ struct callout sc_bell_ch;
-int sc_bellactive, sc_bellpitch;
-int sc_slp;
-int sc_timeout;
+ int sc_bellactive, sc_bellpitch;
+ int sc_slp;
+ int sc_timeout;
+
+ kmutex_t sc_lock;
+ kcondvar_t sc_stop_cv;
};
void pcppi_attach(struct pcppi_softc *);
CVS commit: src/lib/libc/net
Module Name:src Committed By: jruoho Date: Tue May 3 04:07:39 UTC 2011 Modified Files: src/lib/libc/net: byteorder.3 Log Message: Xref bswap(3). Simplify STANDARDS. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/net/byteorder.3 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/net/byteorder.3 diff -u src/lib/libc/net/byteorder.3:1.14 src/lib/libc/net/byteorder.3:1.15 --- src/lib/libc/net/byteorder.3:1.14 Sat Feb 4 22:47:28 2006 +++ src/lib/libc/net/byteorder.3 Tue May 3 04:07:39 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: byteorder.3,v 1.14 2006/02/04 22:47:28 uwe Exp $ +.\" $NetBSD: byteorder.3,v 1.15 2011/05/03 04:07:39 jruoho Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)byteorder.3 8.1 (Berkeley) 6/4/93 .\" -.Dd June 10, 2004 +.Dd May 3, 2011 .Dt BYTEORDER 3 .Os .Sh NAME @@ -64,23 +64,12 @@ and .Xr getservent 3 . .Sh SEE ALSO +.Xr bswap 3 , .Xr gethostbyname 3 , .Xr getservent 3 .Sh STANDARDS -The -.Fn htonl , -.Fn htons , -.Fn ntohl , -and -.Fn ntohs -functions conform to +The described functions conform to .St -p1003.1-2001 . -Their use of the fixed-width integer types -.Fa uint16_t -and -.Fa uint32_t -first appeared in -.St -xns5 . .Sh HISTORY The .Nm byteorder
CVS commit: src/sys/fs/tmpfs
Module Name:src
Committed By: rmind
Date: Mon May 2 23:42:10 UTC 2011
Modified Files:
src/sys/fs/tmpfs: tmpfs_vnops.c
Log Message:
Constify, update some comments, use memset() to clear pgs.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/fs/tmpfs/tmpfs_vnops.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/fs/tmpfs/tmpfs_vnops.c
diff -u src/sys/fs/tmpfs/tmpfs_vnops.c:1.77 src/sys/fs/tmpfs/tmpfs_vnops.c:1.78
--- src/sys/fs/tmpfs/tmpfs_vnops.c:1.77 Sun Apr 24 21:35:29 2011
+++ src/sys/fs/tmpfs/tmpfs_vnops.c Mon May 2 23:42:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: tmpfs_vnops.c,v 1.77 2011/04/24 21:35:29 rmind Exp $ */
+/* $NetBSD: tmpfs_vnops.c,v 1.78 2011/05/02 23:42:10 rmind Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.77 2011/04/24 21:35:29 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tmpfs_vnops.c,v 1.78 2011/05/02 23:42:10 rmind Exp $");
#include
#include
@@ -738,7 +738,7 @@
}
/*
- * tmpfs:link: create hard link.
+ * tmpfs_link: create hard link.
*/
int
tmpfs_link(void *v)
@@ -1395,25 +1395,29 @@
return lf_advlock(v, &node->tn_lockf, node->tn_size);
}
-/* - */
-
int
tmpfs_getpages(void *v)
{
- struct vnode *vp = ((struct vop_getpages_args *)v)->a_vp;
- voff_t offset = ((struct vop_getpages_args *)v)->a_offset;
- struct vm_page **m = ((struct vop_getpages_args *)v)->a_m;
- int *count = ((struct vop_getpages_args *)v)->a_count;
- int centeridx = ((struct vop_getpages_args *)v)->a_centeridx;
- vm_prot_t access_type = ((struct vop_getpages_args *)v)->a_access_type;
- int advice = ((struct vop_getpages_args *)v)->a_advice;
- int flags = ((struct vop_getpages_args *)v)->a_flags;
-
- int error;
- int i;
+ struct vop_getpages_args /* {
+ struct vnode *a_vp;
+ voff_t a_offset;
+ struct vm_page **a_m;
+ int *a_count;
+ int a_centeridx;
+ vm_prot_t a_access_type;
+ int a_advice;
+ int a_flags;
+ } */ * const ap = v;
+ struct vnode *vp = ap->a_vp;
+ const voff_t offset = ap->a_offset;
+ struct vm_page **pgs = ap->a_m;
+ const int centeridx = ap->a_centeridx;
+ const vm_prot_t access_type = ap->a_access_type;
+ const int advice = ap->a_advice;
+ const int flags = ap->a_flags;
+ int error, npages = *ap->a_count;
struct tmpfs_node *node;
struct uvm_object *uobj;
- int npages = *count;
KASSERT(vp->v_type == VREG);
KASSERT(mutex_owned(&vp->v_interlock));
@@ -1421,8 +1425,9 @@
node = VP_TO_TMPFS_NODE(vp);
uobj = node->tn_spec.tn_reg.tn_aobj;
- /* We currently don't rely on PGO_PASTEOF. */
-
+ /*
+ * Currently, PGO_PASTEOF is not supported.
+ */
if (vp->v_size <= offset + (centeridx << PAGE_SHIFT)) {
if ((flags & PGO_LOCKED) == 0)
mutex_exit(&vp->v_interlock);
@@ -1447,47 +1452,44 @@
mutex_exit(&vp->v_interlock);
/*
- * Make sure that the array on which we will store the
- * gotten pages is clean. Otherwise uao_get (pointed to by
- * the pgo_get below) gets confused and does not return the
- * appropriate pages.
+ * Invoke the pager.
*
- * XXX This shall be revisited when kern/32166 is addressed
- * because the loop to clean m[i] will most likely be redundant
- * as well as the PGO_ALLPAGES flag.
+ * Clean the array of pages before. XXX: PR/32166
+ * Note that vnode lock is shared with underlying UVM object.
*/
- if (m != NULL)
- for (i = 0; i < npages; i++)
- m[i] = NULL;
+ if (pgs) {
+ memset(pgs, 0, sizeof(struct vm_pages *) * npages);
+ }
mutex_enter(&uobj->vmobjlock);
- error = (*uobj->pgops->pgo_get)(uobj, offset, m, &npages, centeridx,
+ error = (*uobj->pgops->pgo_get)(uobj, offset, pgs, &npages, centeridx,
access_type, advice, flags | PGO_ALLPAGES);
+
#if defined(DEBUG)
- {
- /* Make sure that all the pages we return are valid. */
- int dbgi;
- if (error == 0 && m != NULL)
- for (dbgi = 0; dbgi < npages; dbgi++)
-KASSERT(m[dbgi] != NULL);
+ if (!error && pgs) {
+ for (int i = 0; i < npages; i++) {
+ KASSERT(pgs[i] != NULL);
+ }
}
#endif
-
return error;
}
-/* - */
-
int
tmpfs_putpages(void *v)
{
- struct vnode *vp = ((struct vop_putpages_args *)v)->a_vp;
- voff_t offlo = ((struct vop_putpages_args *)v)->a_offlo;
- voff_t offhi = ((struct vop_putpages_args *)v)->a_offhi;
- int flags = ((struct vop_putpages_args *)v)->a_flags;
-
- int error;
+ struct vop_putpages_args /* {
+ struct vnode *a_vp;
+ voff_t a_offlo;
+ voff_t a_offhi;
+ int a_flags;
+ } */ * const ap = v;
+ struct vnode *vp = ap->a_vp;
+ const voff_t offlo = ap->a_offlo;
+ const voff_t offhi = ap->a_offhi;
+ const int flags = ap->a_flags;
struct tmpfs_node *node;
struct uvm_object *uobj;
+ int error;
KASSERT(mutex_owned(&vp->v_interlock))
CVS commit: src/sys/sys
Module Name:src
Committed By: rmind
Date: Mon May 2 22:27:53 UTC 2011
Modified Files:
src/sys/sys: proc.h
Log Message:
Update few comments.
To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 src/sys/sys/proc.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/sys/proc.h
diff -u src/sys/sys/proc.h:1.306 src/sys/sys/proc.h:1.307
--- src/sys/sys/proc.h:1.306 Sun May 1 01:15:18 2011
+++ src/sys/sys/proc.h Mon May 2 22:27:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: proc.h,v 1.306 2011/05/01 01:15:18 rmind Exp $ */
+/* $NetBSD: proc.h,v 1.307 2011/05/02 22:27:53 rmind Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -194,15 +194,14 @@
* which might be addressible only on a processor on which the process
* is running.
*
- * Field markings and the corresponding locks (not yet fully implemented,
- * more a statement of intent):
+ * Field markings and the corresponding locks:
*
* a: p_auxlock
* k: ktrace_mutex
* l: proc_lock
* t: p_stmutex
* p: p_lock
- * q: mqlist_mtx
+ * (: updated atomically
* :: unlocked, stable
*/
struct proc {
@@ -224,7 +223,7 @@
struct vmspace *p_vmspace; /* :: Address space */
struct sigacts *p_sigacts; /* :: Process sigactions */
struct aioproc *p_aio; /* p: Asynchronous I/O data */
- u_int p_mqueue_cnt; /* q: Count of open mqueues */
+ u_int p_mqueue_cnt; /* (: Count of open message queues */
specificdata_reference
p_specdataref; /*subsystem proc-specific data */
CVS commit: src/doc
Module Name:src Committed By: rmind Date: Mon May 2 21:00:46 UTC 2011 Modified Files: src/doc: CHANGES Log Message: Mention POSIX semaphore improvements and PowerPC conversion to use PCU. To generate a diff of this commit: cvs rdiff -u -r1.1543 -r1.1544 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.1543 src/doc/CHANGES:1.1544 --- src/doc/CHANGES:1.1543 Fri Apr 29 20:33:42 2011 +++ src/doc/CHANGES Mon May 2 21:00:46 2011 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1543 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1544 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -943,7 +943,7 @@ more efficient, added "fast" software interrupts and kernel preemption. Added support for RMI (NetLogic) XLS/XLR models. Major clean up for MIPS port. [matt 20110220] - mips: Converted MIPS to use PCU. [matt 20110220] + mips: Converted MIPS to use PCU to manage FPU. [matt 20110220] ath(4): Add support for AR9285 devices. [cegger 20110221] libsaslc(3): Complete integration of libsaslc written for GSoC 2010 by Mateusz Kocielski, improved and integrated with Postfix @@ -996,7 +996,10 @@ dhcpcd(8): Import dhcpcd-5.2.12. [roy 20110406] sparc64: Add EDID (Extended Display Identification Data) reading, and video mode setting support, to ffb(4). [jdc 20110408] + kernel: Bug fixes and improvements to POSIX semaphore. [rmind 20110411] kernel: Support for Darwin, Mach, IRIX and PECOFF emulation was retired. [joerg 20110426] balloon(4): Balloon driver now enabled for all Xen kernels. [jym 20110429] + powerpc: Converted PowerPC to use PCU to manage FPU/AltiVec/SPE. + [matt 20110502]
CVS commit: src/doc
Module Name:src Committed By: rmind Date: Mon May 2 20:48:28 UTC 2011 Modified Files: src/doc: BRANCHES Log Message: Update description of rmind-uvmplock branch. To generate a diff of this commit: cvs rdiff -u -r1.305 -r1.306 src/doc/BRANCHES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/BRANCHES diff -u src/doc/BRANCHES:1.305 src/doc/BRANCHES:1.306 --- src/doc/BRANCHES:1.305 Mon Feb 21 02:35:55 2011 +++ src/doc/BRANCHES Mon May 2 20:48:27 2011 @@ -1,4 +1,4 @@ -# $NetBSD: BRANCHES,v 1.305 2011/02/21 02:35:55 itohy Exp $ +# $NetBSD: BRANCHES,v 1.306 2011/05/02 20:48:27 rmind Exp $ # # This file contains a list of branches that exist in the NetBSD CVS # tree and their current state. @@ -486,7 +486,7 @@ within the same tree Branch: rmind-uvmplock -Description: Reorganize locking in UVM for pmap(9) +Description: Reorganize locking in UVM and improve x86 pmap(9) Status: Active Start Date: 15 March 2010 End Date: @@ -501,9 +501,13 @@ - Simplify locking in pmap(9) modules by removing P->V locking. - Use mutex_obj(9) on vmobjlock (and thus vnode_t::v_interlock) to share locks among UVM objects where necessary. - - Optimize pmap_remove() with tracking in struct vm_map_entry. + - Rewrite and optimize x86 TLB shootdown code. - Unify /dev/mem et al in MI code and provide required locking. + Future work: + + - Optimize pmap_remove() with tracking in struct vm_map_entry. + Branch: rpaulo-netinet-merge-pcb Description: merge in6pcb with inpcb Status: Dormant
CVS commit: src/external/bsd/bind
Module Name:src
Committed By: christos
Date: Mon May 2 19:04:55 UTC 2011
Modified Files:
src/external/bsd/bind: Makefile.inc
Log Message:
PR/44928: Henning Petersen: Remove missing include dirs in Makefile.inc
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/Makefile.inc
diff -u src/external/bsd/bind/Makefile.inc:1.9 src/external/bsd/bind/Makefile.inc:1.10
--- src/external/bsd/bind/Makefile.inc:1.9 Wed Dec 15 02:36:51 2010
+++ src/external/bsd/bind/Makefile.inc Mon May 2 15:04:54 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.9 2010/12/15 07:36:51 enami Exp $
+# $NetBSD: Makefile.inc,v 1.10 2011/05/02 19:04:54 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -35,13 +35,12 @@
CPPFLAGS+=-I${BIND_SRCDIR}/include \
-I${IDIST} \
- -I${IDIST}/lib/dns/include -I${IDIST}/lib/dns/unix/include \
+ -I${IDIST}/lib/dns/include \
-I${IDIST}/lib/isc/include -I${IDIST}/lib/isc/unix/include \
-I${IDIST}/lib/bind9/include \
-I${IDIST}/lib/isccfg/include \
-I${IDIST}/lib/isccc/include \
-I${IDIST}/lib/lwres/include -I${IDIST}/lib/lwres/unix/include \
- -I${IDIST}/lib/dns/sec/dst/include \
-DNS_LOCALSTATEDIR=\"${LOCALSTATEDIR}\" \
-DNS_SYSCONFDIR=\"${SYSCONFDIR}\" \
-DSESSION_KEYFILE=\"${LOCALSTATEDIR}/run/named/session.key\" \
CVS commit: src/lib/libc/gen
Module Name:src Committed By: jruoho Date: Mon May 2 17:34:06 UTC 2011 Modified Files: src/lib/libc/gen: ualarm.3 Log Message: Clarify STANDARDS (i.e. cf. ualarm(3) is no longer in POSIX). To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/lib/libc/gen/ualarm.3 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/gen/ualarm.3 diff -u src/lib/libc/gen/ualarm.3:1.18 src/lib/libc/gen/ualarm.3:1.19 --- src/lib/libc/gen/ualarm.3:1.18 Thu Apr 29 06:07:35 2010 +++ src/lib/libc/gen/ualarm.3 Mon May 2 17:34:05 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: ualarm.3,v 1.18 2010/04/29 06:07:35 jruoho Exp $ +.\" $NetBSD: ualarm.3,v 1.19 2011/05/02 17:34:05 jruoho Exp $ .\" .\" Copyright (c) 1986, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)ualarm.3 8.2 (Berkeley) 4/19/94 .\" -.Dd April 29, 2010 +.Dd May 2, 2011 .Dt UALARM 3 .Os .Sh NAME @@ -91,16 +91,11 @@ .Sh STANDARDS The .Fn ualarm -functions conforms to -.St -xpg4.2 -and +function conforms to .St -p1003.1-2001 . -The latter standard marked -.Fn ualarm -as obsolescent and a later revision, -.St -p1003.1-2008 , -removed the specification of -.Fn ualarm . +However, the later +.St -p1003.1-2008 +revision removed the function from the specification. .Sh HISTORY The .Fn ualarm
CVS commit: src
Module Name:src
Committed By: jruoho
Date: Mon May 2 17:26:23 UTC 2011
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/syscall: Makefile
Added Files:
src/tests/syscall: t_itimer.c
Log Message:
Few basic tests for getitimer(2) and setitimer(2).
To generate a diff of this commit:
cvs rdiff -u -r1.319 -r1.320 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.25 -r1.26 src/tests/syscall/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/syscall/t_itimer.c
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.319 src/distrib/sets/lists/tests/mi:1.320
--- src/distrib/sets/lists/tests/mi:1.319 Mon May 2 08:32:21 2011
+++ src/distrib/sets/lists/tests/mi Mon May 2 17:26:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.319 2011/05/02 08:32:21 pgoyette Exp $
+# $NetBSD: mi,v 1.320 2011/05/02 17:26:23 jruoho Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -604,6 +604,7 @@
./usr/libdata/debug/usr/tests/syscall/t_getrusage.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_getsid.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_gettimeofday.debug tests-syscall-debug debug,atf
+./usr/libdata/debug/usr/tests/syscall/t_itimer.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_kill.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_mmap.debug tests-syscall-debug debug,atf
./usr/libdata/debug/usr/tests/syscall/t_mprotect.debug tests-syscall-debug debug,atf
@@ -2285,6 +2286,7 @@
./usr/tests/syscall/t_getrusage tests-syscall-tests atf
./usr/tests/syscall/t_getsid tests-syscall-tests atf
./usr/tests/syscall/t_gettimeofday tests-syscall-tests atf
+./usr/tests/syscall/t_itimer tests-syscall-tests atf
./usr/tests/syscall/t_kill tests-syscall-tests atf
./usr/tests/syscall/t_mmap tests-syscall-tests atf
./usr/tests/syscall/t_mprotect tests-syscall-tests atf
Index: src/tests/syscall/Makefile
diff -u src/tests/syscall/Makefile:1.25 src/tests/syscall/Makefile:1.26
--- src/tests/syscall/Makefile:1.25 Sun May 1 09:09:35 2011
+++ src/tests/syscall/Makefile Mon May 2 17:26:23 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2011/05/01 09:09:35 jruoho Exp $
+# $NetBSD: Makefile,v 1.26 2011/05/02 17:26:23 jruoho Exp $
.include
@@ -6,7 +6,7 @@
TESTS_C+= t_access t_cmsg t_dup t_fsync
TESTS_C+= t_getgroups t_getpid t_getrusage t_getsid t_gettimeofday
-TESTS_C+= t_kill t_mmap t_mprotect t_msync t_nanosleep
+TESTS_C+= t_itimer t_kill t_mmap t_mprotect t_msync t_nanosleep
TESTS_C+= t_setrlimit t_setuid t_timer t_umask
LDADD.t_getpid+= -lpthread
Added files:
Index: src/tests/syscall/t_itimer.c
diff -u /dev/null src/tests/syscall/t_itimer.c:1.1
--- /dev/null Mon May 2 17:26:23 2011
+++ src/tests/syscall/t_itimer.c Mon May 2 17:26:23 2011
@@ -0,0 +1,215 @@
+/* $NetBSD: t_itimer.c,v 1.1 2011/05/02 17:26:23 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2011 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include
+__RCSID("$NetBSD: t_itimer.c,v 1.1 2011/05/02 17:26:23 jruoho Exp $");
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+
+static bool fail;
+static void sighandler(int);
+
+static void
+sighandler(int signo)
+{
+
+ if (signo == SIGALRM || signo == SIGVTALRM)
+ fail = false;
+}
+
+ATF_TC(getitimer_empty);
CVS commit: src/lib/libc/sys
Module Name:src Committed By: jruoho Date: Mon May 2 17:14:20 UTC 2011 Modified Files: src/lib/libc/sys: getitimer.2 Log Message: Note also that the interaction between setitimer(2) and alarm(3) or sleep(3) is unspecified. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/lib/libc/sys/getitimer.2 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/sys/getitimer.2 diff -u src/lib/libc/sys/getitimer.2:1.25 src/lib/libc/sys/getitimer.2:1.26 --- src/lib/libc/sys/getitimer.2:1.25 Mon May 2 17:01:52 2011 +++ src/lib/libc/sys/getitimer.2 Mon May 2 17:14:20 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: getitimer.2,v 1.25 2011/05/02 17:01:52 jruoho Exp $ +.\" $NetBSD: getitimer.2,v 1.26 2011/05/02 17:14:20 jruoho Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -89,9 +89,6 @@ to 0 causes a timer to be disabled after its next expiration (assuming .Fa it_value is non-zero). -Note that time values smaller than the resolution of the -system clock are rounded up to this resolution -(typically 10 milliseconds). .Pp The .Fa which @@ -124,16 +121,29 @@ Because this signal may interrupt in-progress system calls, programs using this timer must be prepared to restart interrupted system calls. +.El +Note that: +.Bl -bullet -offset indent +.It +Time values smaller than the resolution of the +system clock are rounded up to this resolution +(typically 10 milliseconds). +.It +The interaction between +.Fn setitimer +and +.Xr alarm 3 +or +.Xr sleep 3 +is unspecified by the specification. +.El .Sh RETURN VALUES If the calls succeed, a value of 0 is returned. If an error occurs, the value \-1 is returned, and a more precise error code is placed in the global variable .Va errno . .Sh ERRORS -.Fn getitimer -and -.Fn setitimer -will fail if: +Both functions may fail if: .Bl -tag -width Er .It Bq Er EFAULT The
CVS commit: src/lib/libc/sys
Module Name:src Committed By: jruoho Date: Mon May 2 17:01:52 UTC 2011 Modified Files: src/lib/libc/sys: getitimer.2 Log Message: Remove NOTES as it is documented in itimerval(3). Remove #ifdefs from SYNOPSIS (these are visible enough in the body of the text). Use a list for the timers. Improve wording and markup. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/lib/libc/sys/getitimer.2 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/sys/getitimer.2 diff -u src/lib/libc/sys/getitimer.2:1.24 src/lib/libc/sys/getitimer.2:1.25 --- src/lib/libc/sys/getitimer.2:1.24 Fri Apr 30 04:17:45 2010 +++ src/lib/libc/sys/getitimer.2 Mon May 2 17:01:52 2011 @@ -1,4 +1,4 @@ -.\" $NetBSD: getitimer.2,v 1.24 2010/04/30 04:17:45 jruoho Exp $ +.\" $NetBSD: getitimer.2,v 1.25 2011/05/02 17:01:52 jruoho Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)getitimer.2 8.3 (Berkeley) 5/16/95 .\" -.Dd April 30, 2010 +.Dd May 2, 2011 .Dt GETITIMER 2 .Os .Sh NAME @@ -40,9 +40,6 @@ .Lb libc .Sh SYNOPSIS .In sys/time.h -.Fd #define ITIMER_REAL 0 -.Fd #define ITIMER_VIRTUAL 1 -.Fd #define ITIMER_PROF 2 .Ft int .Fn getitimer "int which" "struct itimerval *value" .Ft int @@ -60,10 +57,11 @@ The .Fn setitimer call sets a timer to the specified -.Fa value -(returning the previous value of the timer if +.Fa value , +returning the previous value of the timer if .Fa ovalue -is non-nil). +is not +.Dv NULL . .Pp A timer value is defined by the .Fa itimerval @@ -91,30 +89,28 @@ to 0 causes a timer to be disabled after its next expiration (assuming .Fa it_value is non-zero). -.Pp -Time values smaller than the resolution of the +Note that time values smaller than the resolution of the system clock are rounded up to this resolution (typically 10 milliseconds). .Pp The -.Dv ITIMER_REAL +.Fa which +parameter specifies the type of the timer: +.Bl -tag -width "ITIMER_VIRTUAL " -offset indent +.It Dv ITIMER_REAL timer decrements in real time. A .Dv SIGALRM signal is delivered when this timer expires. -.Pp -The -.Dv ITIMER_VIRTUAL +.It Dv ITIMER_VIRTUAL timer decrements in process virtual time. It runs only when the process is executing. A .Dv SIGVTALRM signal is delivered when it expires. -.Pp -The -.Dv ITIMER_PROF +.It Dv ITIMER_PROF timer decrements both in process virtual time and when the system is running on behalf of the process. It is designed to be used by interpreters in statistically profiling @@ -128,22 +124,6 @@ Because this signal may interrupt in-progress system calls, programs using this timer must be prepared to restart interrupted system calls. -.Sh NOTES -Macros for manipulating time values are defined in the -.In sys/time.h -header; -.Fn timerclear -sets a time value to zero, -.Fn timerisset -tests if a time value is non-zero, -.Fn timercmp -compares two time values, -.Fn timeradd -adds a time value to another time value, -.Fn timersub -computes the time difference between two time values. -For additional details, see -.Xr timeradd 3 . .Sh RETURN VALUES If the calls succeed, a value of 0 is returned. If an error occurs, the value \-1 is returned, and a more precise error @@ -167,19 +147,16 @@ .El .Sh SEE ALSO .Xr gettimeofday 2 , -.Xr poll 2 , .Xr select 2 , -.Xr sigaction 2 +.Xr sigaction 2 , +.Xr itimerval 3 , +.Xr timeradd 3 .Sh STANDARDS -The -.Fn getitimer -and -.Fn setitimer -functions conform to +The functions conform to .St -p1003.1-2001 . The later .St -p1003.1-2008 -revision however marked both functions as obsolescent, +revision however marked both as obsolescent, recommending the use of .Xr timer_gettime 2 and
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: tsutsui Date: Mon May 2 15:31:01 UTC 2011 Modified Files: src/sys/arch/mips/mips: pmap.c Log Message: Fix "removing options MIPS3 cause DS5000 to loop during boot" (i.e. no options MIPS3 kernel doesn't work on MIPS1) problem. Reported and tested by Erik Bertelsen on port-pmax: http://mail-index.NetBSD.org/port-pmax/2011/04/21/msg99.html To generate a diff of this commit: cvs rdiff -u -r1.199 -r1.200 src/sys/arch/mips/mips/pmap.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/mips/mips/pmap.c diff -u src/sys/arch/mips/mips/pmap.c:1.199 src/sys/arch/mips/mips/pmap.c:1.200 --- src/sys/arch/mips/mips/pmap.c:1.199 Fri Apr 29 22:18:53 2011 +++ src/sys/arch/mips/mips/pmap.c Mon May 2 15:31:01 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.199 2011/04/29 22:18:53 matt Exp $ */ +/* $NetBSD: pmap.c,v 1.200 2011/05/02 15:31:01 tsutsui Exp $ */ /*- * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc. @@ -67,7 +67,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.199 2011/04/29 22:18:53 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.200 2011/05/02 15:31:01 tsutsui Exp $"); /* * Manages physical address maps. @@ -2346,6 +2346,7 @@ pmap_page_cache(pg, true); } #endif +#endif /* MIPS3_PLUS */ pmap_check_pvlist(md); PG_MD_PVLIST_UNLOCK(md); @@ -2372,6 +2373,7 @@ PMAP_COUNT(exec_synced_remove); } } +#ifdef MIPS3_PLUS /* XXX mmu XXX */ if (MIPS_HAS_R4K_MMU && last) /* XXX why */ mips_dcache_wbinv_range_index(va, PAGE_SIZE); #endif /* MIPS3_PLUS */
CVS commit: src/sys/dev/pci
Module Name:src Committed By: manu Date: Mon May 2 14:06:50 UTC 2011 Modified Files: src/sys/dev/pci: pcidevs Log Message: Don't conflict SUNIX new vendor Id with the previous one To generate a diff of this commit: cvs rdiff -u -r1.1072 -r1.1073 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1072 src/sys/dev/pci/pcidevs:1.1073 --- src/sys/dev/pci/pcidevs:1.1072 Mon May 2 14:00:09 2011 +++ src/sys/dev/pci/pcidevs Mon May 2 14:06:50 2011 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1072 2011/05/02 14:00:09 manu Exp $ +$NetBSD: pcidevs,v 1.1073 2011/05/02 14:06:50 manu Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -626,7 +626,7 @@ vendor QUMRANET 0x1af4 Qumranet vendor SYMPHONY2 0x1c1c Symphony Labs (2nd PCI Vendor ID) vendor TEKRAM2 0x1de1 Tekram Technology (2nd PCI Vendor ID) -vendor SUNIX 0x1fd4 SUNIX Co +vendor SUNIX2 0x1fd4 SUNIX Co vendor HINT 0x3388 HiNT vendor 3DLABS 0x3d3d 3D Labs vendor AVANCE2 0x4005 Avance Logic (2nd PCI Vendor ID)
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: manu
Date: Mon May 2 14:00:09 UTC 2011
Modified Files:
src/sys/dev/pci: pcidevs pucdata.c
Log Message:
Add new PCI vendor Id for Sunix, and the corresponding device Id.
To generate a diff of this commit:
cvs rdiff -u -r1.1071 -r1.1072 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.71 -r1.72 src/sys/dev/pci/pucdata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1071 src/sys/dev/pci/pcidevs:1.1072
--- src/sys/dev/pci/pcidevs:1.1071 Wed Apr 13 22:24:12 2011
+++ src/sys/dev/pci/pcidevs Mon May 2 14:00:09 2011
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1071 2011/04/13 22:24:12 wiz Exp $
+$NetBSD: pcidevs,v 1.1072 2011/05/02 14:00:09 manu Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -626,6 +626,7 @@
vendor QUMRANET 0x1af4 Qumranet
vendor SYMPHONY2 0x1c1c Symphony Labs (2nd PCI Vendor ID)
vendor TEKRAM2 0x1de1 Tekram Technology (2nd PCI Vendor ID)
+vendor SUNIX 0x1fd4 SUNIX Co
vendor HINT 0x3388 HiNT
vendor 3DLABS 0x3d3d 3D Labs
vendor AVANCE2 0x4005 Avance Logic (2nd PCI Vendor ID)
@@ -4239,6 +4240,10 @@
product SUNDANCETI ST1023 0x1023 ST1023 Gigabit Ethernet
product SUNDANCETI ST2021 0x2021 ST2021 Gigabit Ethernet
+/* SUNIX products */
+product SUNIX 0001 0x0001 Matrix serial adapter
+product SUNIX 1999 0x1999 1999 multiport adapter
+
/* Surecom Technology products */
product SURECOM NE34 0x0e34 NE-34 Ethernet
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.71 src/sys/dev/pci/pucdata.c:1.72
--- src/sys/dev/pci/pucdata.c:1.71 Fri Mar 11 20:22:53 2011
+++ src/sys/dev/pci/pucdata.c Mon May 2 14:00:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.71 2011/03/11 20:22:53 he Exp $ */
+/* $NetBSD: pucdata.c,v 1.72 2011/05/02 14:00:09 manu Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.71 2011/03/11 20:22:53 he Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.72 2011/05/02 14:00:09 manu Exp $");
#include
#include
@@ -1144,6 +1144,116 @@
},
},
+ { "SUNIX 5008 1P",
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0100 },
+ { 0x, 0x, 0x, 0xeff0 },
+ {
+ { PUC_PORT_TYPE_LPT, 0x14, 0x00, 0x00 },
+ },
+ },
+
+ { "SUNIX 5016 8S",
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0010 },
+ { 0x, 0x, 0x, 0x },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x08, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x10, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x18, COM_FREQ * 8},
+/*
+ * PUC_MAX_PORTS needs to be raised in order to reach these ports
+ */
+#if PUC_MAX_PORTS >= 16
+ { PUC_PORT_TYPE_COM, 0x14, 0x20, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x28, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x30, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x38, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x40, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x48, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x50, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x58, COM_FREQ * 8},
+#endif /* PUC_MAX_PORTS >= 16 */
+ },
+ },
+
+ { "SUNIX 5027 1S",
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0001 },
+ { 0x, 0x, 0x, 0x },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
+ },
+ },
+
+ { "SUNIX 5037 2S",
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0002 },
+ { 0x, 0x, 0x, 0x },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8},
+ },
+ },
+
+ { "SUNIX 5056 4S",
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0004 },
+ { 0x, 0x, 0x, 0x },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8},
+ },
+ },
+
+ { "SUNIX 5066 8S",
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0008 },
+ { 0x, 0x, 0x, 0x },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x10, 0x08, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x10, 0x10, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x10, 0x18, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x00, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x08, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x10, COM_FREQ * 8},
+ { PUC_PORT_TYPE_COM, 0x14, 0x18, COM_FREQ * 8},
+ },
+ },
+
+ { "SUNIX 5069 1S / 1P",
+ { 0x1fd4, 0x1999, 0x1fd4, 0x0101 },
+ { 0x, 0x, 0x, 0xeff0 },
+ {
+ { PUC_PORT_TYPE_COM, 0x10, 0x00, COM_FREQ * 8},
+ { PUC_
CVS commit: src/etc/mtree
Module Name:src Committed By: njoly Date: Mon May 2 11:55:15 UTC 2011 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: Add back usr/libdata/debug/usr/tests/lib/libc/termios, needed for debug builds. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.40 src/etc/mtree/NetBSD.dist.tests:1.41 --- src/etc/mtree/NetBSD.dist.tests:1.40 Mon May 2 08:11:41 2011 +++ src/etc/mtree/NetBSD.dist.tests Mon May 2 11:55:15 2011 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.40 2011/05/02 08:11:41 pgoyette Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.41 2011/05/02 11:55:15 njoly Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -63,6 +63,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/stdlib ./usr/libdata/debug/usr/tests/lib/libc/string ./usr/libdata/debug/usr/tests/lib/libc/sys +./usr/libdata/debug/usr/tests/lib/libc/termios ./usr/libdata/debug/usr/tests/lib/libc/tls ./usr/libdata/debug/usr/tests/lib/libc/ttyio ./usr/libdata/debug/usr/tests/lib/libc/time
CVS commit: src/tests/syscall
Module Name:src
Committed By: gson
Date: Mon May 2 11:14:29 UTC 2011
Modified Files:
src/tests/syscall: t_nanosleep.c
Log Message:
Don't print a time_t with %lu
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/syscall/t_nanosleep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/syscall/t_nanosleep.c
diff -u src/tests/syscall/t_nanosleep.c:1.5 src/tests/syscall/t_nanosleep.c:1.6
--- src/tests/syscall/t_nanosleep.c:1.5 Mon May 2 07:02:09 2011
+++ src/tests/syscall/t_nanosleep.c Mon May 2 11:14:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_nanosleep.c,v 1.5 2011/05/02 07:02:09 jruoho Exp $ */
+/* $NetBSD: t_nanosleep.c,v 1.6 2011/05/02 11:14:29 gson Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_nanosleep.c,v 1.5 2011/05/02 07:02:09 jruoho Exp $");
+__RCSID("$NetBSD: t_nanosleep.c,v 1.6 2011/05/02 11:14:29 gson Exp $");
#include
#include
@@ -80,12 +80,12 @@
if (timespeccmp(&ts2, &ts1, <=) != 0) {
(void)fprintf(stderr,
- "sleep time:: sec %lu, nsec %lu\n\t\t"
- "ts1: sec %lu, nsec %lu\n\t\t"
- "ts2: sec %lu, nsec %lu\n",
- tsn.tv_sec, tsn.tv_nsec,
- ts1.tv_sec, ts1.tv_nsec,
- ts2.tv_sec, ts2.tv_nsec);
+ "sleep time:: sec %llu, nsec %lu\n\t\t"
+ "ts1: sec %llu, nsec %lu\n\t\t"
+ "ts2: sec %llu, nsec %lu\n",
+ (unsigned long long)tsn.tv_sec, tsn.tv_nsec,
+ (unsigned long long)ts1.tv_sec, ts1.tv_nsec,
+ (unsigned long long)ts2.tv_sec, ts2.tv_nsec);
atf_tc_fail_nonfatal("inaccuracies in sleep time "
"(resolution = %lu nsec)", tsn.tv_nsec);
CVS commit: src/sys/dev
Module Name:src
Committed By: jym
Date: Mon May 2 09:03:10 UTC 2011
Modified Files:
src/sys/dev/mii: brgphy.c
src/sys/dev/pci: if_bge.c if_bnx.c if_bnxreg.h
Log Message:
Fix BCM5709 PHY detection for ethernet PHYs (the SerDes case being already
handled):
- export bge(4) and bnx(4) CHIP ID and PHY flags to brgphy(4). Move to
"unsigned int" rather than "int", and reuse the same softc members for
chipid and phyflags (behavior controlled by the sc_isbge/isbnx boolean).
- apply bug fix for revisions A and B, so that autonegotiation can
complete (from OpenBSD).
Bug reported by Rivo Nurges via private mail, patch tested and
confirmed working by him (with thanks!)
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/mii/brgphy.c
cvs rdiff -u -r1.194 -r1.195 src/sys/dev/pci/if_bge.c
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/pci/if_bnx.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/if_bnxreg.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/mii/brgphy.c
diff -u src/sys/dev/mii/brgphy.c:1.57 src/sys/dev/mii/brgphy.c:1.58
--- src/sys/dev/mii/brgphy.c:1.57 Thu Dec 9 23:25:49 2010
+++ src/sys/dev/mii/brgphy.c Mon May 2 09:03:10 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: brgphy.c,v 1.57 2010/12/09 23:25:49 jym Exp $ */
+/* $NetBSD: brgphy.c,v 1.58 2011/05/02 09:03:10 jym Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.57 2010/12/09 23:25:49 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brgphy.c,v 1.58 2011/05/02 09:03:10 jym Exp $");
#include
#include
@@ -90,8 +90,8 @@
struct mii_softc sc_mii;
bool sc_isbge;
bool sc_isbnx;
- int sc_bge_flags;
- int sc_bnx_flags;
+ uint32_t sc_chipid;/* parent's chipid */
+ uint32_t sc_phyflags; /* parent's phyflags */
};
CFATTACH_DECL3_NEW(brgphy, sizeof(struct brgphy_softc),
@@ -111,6 +111,7 @@
static void brgphy_5704_a0_bug(struct mii_softc *);
static void brgphy_ber_bug(struct mii_softc *);
static void brgphy_crc_bug(struct mii_softc *);
+static void brgphy_disable_early_dac(struct mii_softc *);
static void brgphy_jumbo_settings(struct mii_softc *);
static void brgphy_eth_wirespeed(struct mii_softc *);
@@ -251,18 +252,19 @@
sc->mii_extcapabilities = PHY_READ(sc, MII_EXTSR);
- if (device_is_a(parent, "bge")) {
+ if (device_is_a(parent, "bge"))
bsc->sc_isbge = true;
- dict = device_properties(parent);
- if (!prop_dictionary_get_uint32(dict, "phyflags",
- &bsc->sc_bge_flags))
- aprint_error_dev(self, "failed to get phyflags");
- } else if (device_is_a(parent, "bnx")) {
+ else if (device_is_a(parent, "bnx"))
bsc->sc_isbnx = true;
+
+ if (bsc->sc_isbge || bsc->sc_isbnx) {
dict = device_properties(parent);
if (!prop_dictionary_get_uint32(dict, "phyflags",
- &bsc->sc_bnx_flags))
- aprint_error_dev(self, "failed to get phyflags");
+ &bsc->sc_phyflags))
+ aprint_error_dev(self, "failed to get phyflags\n");
+ if (!prop_dictionary_get_uint32(dict, "chipid",
+ &bsc->sc_chipid))
+ aprint_error_dev(self, "failed to get chipid\n");
}
aprint_normal_dev(self, "");
@@ -287,7 +289,7 @@
* on the BCM5708S and BCM5709S controllers.
*/
#define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL)
-if (bsc->sc_bnx_flags
+if (bsc->sc_phyflags
& BNX_PHY_2_5G_CAPABLE_FLAG) {
ADD(IFM_MAKEWORD(IFM_ETHER, IFM_2500_SX,
IFM_FDX, sc->mii_inst), 0);
@@ -627,18 +629,19 @@
if (bsc->sc_isbge) {
if (!(sc->mii_flags & MIIF_HAVEFIBER)) {
- if (bsc->sc_bge_flags & BGE_PHY_ADC_BUG)
+ if (bsc->sc_phyflags & BGE_PHY_ADC_BUG)
brgphy_adc_bug(sc);
- if (bsc->sc_bge_flags & BGE_PHY_5704_A0_BUG)
+ if (bsc->sc_phyflags & BGE_PHY_5704_A0_BUG)
brgphy_5704_a0_bug(sc);
- if (bsc->sc_bge_flags & BGE_PHY_BER_BUG)
+ if (bsc->sc_phyflags & BGE_PHY_BER_BUG)
brgphy_ber_bug(sc);
- else if (bsc->sc_bge_flags & BGE_PHY_JITTER_BUG) {
+ else if (bsc->sc_phyflags & BGE_PHY_JITTER_BUG) {
PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x0c00);
PHY_WRITE(sc, BRGPHY_MII_DSP_ADDR_REG,
0x000a);
-if (bsc->sc_bge_flags & BGE_PHY_ADJUST_TRIM) {
+if (bsc->sc_phyflags
+& BGE_PHY_ADJUST_TRIM) {
PHY_WRITE(sc, BRGPHY_MII_DSP_RW_PORT,
0x110b);
PHY_WRITE(sc, BRGPHY_TEST1,
@@ -650,11 +653,11 @@
PHY_WRITE(sc, BRGPHY_MII_AUXCTL, 0x0400);
}
- if (bsc->sc_bge_flags & BGE_PHY_CRC_BUG)
+ if (bsc->sc_phyflags & BGE_PHY_CRC_BUG)
brgphy_crc_bug(sc);
/* Set Jumbo frame settings in the PHY. */
- if (bsc->sc_bge_flags & BGE_JUMBO_CAPABLE)
+ if (bsc->sc_phyflags & BGE_JUMBO_CAPABLE)
brgphy_jumbo_settings(sc);
/* Adjust output voltage */
@@ -662,12 +665,12 @@
PHY_WRITE(sc, BRGPHY_MII_EPHY_PTEST, 0x12);
/* Enable Ethernet@Wirespeed */
- if (!(bsc->sc_bge_flags &
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: pgoyette Date: Mon May 2 08:32:21 UTC 2011 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Also add the Atffile to the sets list To generate a diff of this commit: cvs rdiff -u -r1.318 -r1.319 src/distrib/sets/lists/tests/mi 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.318 src/distrib/sets/lists/tests/mi:1.319 --- src/distrib/sets/lists/tests/mi:1.318 Sun May 1 17:07:05 2011 +++ src/distrib/sets/lists/tests/mi Mon May 2 08:32:21 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.318 2011/05/01 17:07:05 jruoho Exp $ +# $NetBSD: mi,v 1.319 2011/05/02 08:32:21 pgoyette Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1940,6 +1940,7 @@ ./usr/tests/lib/libc/sys/t_cerror tests-lib-tests atf ./usr/tests/lib/libc/sys/t_sigqueue tests-lib-tests atf ./usr/tests/lib/libc/termios tests-lib-tests +./usr/tests/lib/libc/termios/Atffile tests-lib-tests atf ./usr/tests/lib/libc/termios/t_tcsetpgrp tests-lib-tests atf ./usr/tests/lib/libc/tls tests-lib-tests ./usr/tests/lib/libc/tls/Atffile tests-lib-tests atf
CVS commit: src/tests/util/awk
Module Name:src
Committed By: jruoho
Date: Mon May 2 08:30:21 UTC 2011
Modified Files:
src/tests/util/awk: t_awk.sh
Log Message:
Use the standard "PR foo/1234" notation such that the PR number is parsed
correctly for the atf(7) HTML reports.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/util/awk/t_awk.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/util/awk/t_awk.sh
diff -u src/tests/util/awk/t_awk.sh:1.5 src/tests/util/awk/t_awk.sh:1.6
--- src/tests/util/awk/t_awk.sh:1.5 Sat Apr 30 01:10:07 2011
+++ src/tests/util/awk/t_awk.sh Mon May 2 08:30:21 2011
@@ -1,4 +1,4 @@
-# $NetBSD: t_awk.sh,v 1.5 2011/04/30 01:10:07 alnsn Exp $
+# $NetBSD: t_awk.sh,v 1.6 2011/05/02 08:30:21 jruoho Exp $
#
# Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -94,7 +94,7 @@
{
export LANG=ru_RU.KOI8-R
- atf_expect_fail "PR/42320"
+ atf_expect_fail "PR bin/42320"
h_check period -v x=0.5
}
CVS commit: src/sys/sys
Module Name:src Committed By: martin Date: Mon May 2 08:26:32 UTC 2011 Modified Files: src/sys/sys: pcu.h Log Message: Make it self-contained (add missing stdbool.h include when used for libkvm) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/sys/pcu.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/sys/pcu.h diff -u src/sys/sys/pcu.h:1.6 src/sys/sys/pcu.h:1.7 --- src/sys/sys/pcu.h:1.6 Mon May 2 02:28:57 2011 +++ src/sys/sys/pcu.h Mon May 2 08:26:32 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pcu.h,v 1.6 2011/05/02 02:28:57 rmind Exp $ */ +/* $NetBSD: pcu.h,v 1.7 2011/05/02 08:26:32 martin Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. @@ -36,6 +36,10 @@ #error "not supposed to be exposed to userland" #endif +#ifndef _KERNEL +#include +#endif + /* * Default: no PCU for MD. */
CVS commit: src/etc/mtree
Module Name:src Committed By: pgoyette Date: Mon May 2 08:11:41 UTC 2011 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: Get this right. It was not the debugdata directory that was missing... To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.39 src/etc/mtree/NetBSD.dist.tests:1.40 --- src/etc/mtree/NetBSD.dist.tests:1.39 Mon May 2 02:43:04 2011 +++ src/etc/mtree/NetBSD.dist.tests Mon May 2 08:11:41 2011 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.39 2011/05/02 02:43:04 pgoyette Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.40 2011/05/02 08:11:41 pgoyette Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -63,7 +63,6 @@ ./usr/libdata/debug/usr/tests/lib/libc/stdlib ./usr/libdata/debug/usr/tests/lib/libc/string ./usr/libdata/debug/usr/tests/lib/libc/sys -./usr/libdata/debug/usr/tests/lib/libc/termios ./usr/libdata/debug/usr/tests/lib/libc/tls ./usr/libdata/debug/usr/tests/lib/libc/ttyio ./usr/libdata/debug/usr/tests/lib/libc/time @@ -183,6 +182,7 @@ ./usr/tests/lib/libc/stdlib ./usr/tests/lib/libc/string ./usr/tests/lib/libc/sys +./usr/tests/lib/libc/termios ./usr/tests/lib/libc/tls ./usr/tests/lib/libc/ttyio ./usr/tests/lib/libc/time
CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: mrg
Date: Mon May 2 07:29:19 UTC 2011
Modified Files:
src/sys/dev/raidframe: rf_raid1.c rf_reconbuffer.c rf_reconstruct.c
rf_reconstruct.h rf_reconutil.c
Log Message:
convert rb_mutex to a kmutex/cv.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/raidframe/rf_raid1.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/raidframe/rf_reconbuffer.c
cvs rdiff -u -r1.111 -r1.112 src/sys/dev/raidframe/rf_reconstruct.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/raidframe/rf_reconstruct.h
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/raidframe/rf_reconutil.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/raidframe/rf_raid1.c
diff -u src/sys/dev/raidframe/rf_raid1.c:1.33 src/sys/dev/raidframe/rf_raid1.c:1.34
--- src/sys/dev/raidframe/rf_raid1.c:1.33 Sun May 1 01:09:05 2011
+++ src/sys/dev/raidframe/rf_raid1.c Mon May 2 07:29:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_raid1.c,v 1.33 2011/05/01 01:09:05 mrg Exp $ */
+/* $NetBSD: rf_raid1.c,v 1.34 2011/05/02 07:29:18 mrg Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.33 2011/05/01 01:09:05 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_raid1.c,v 1.34 2011/05/02 07:29:18 mrg Exp $");
#include "rf_raid.h"
#include "rf_raid1.h"
@@ -581,12 +581,12 @@
}
RF_LOCK_PSS_MUTEX(raidPtr, rbuf->parityStripeID);
- RF_LOCK_MUTEX(reconCtrlPtr->rb_mutex);
+ rf_lock_mutex2(reconCtrlPtr->rb_mutex);
while(reconCtrlPtr->rb_lock) {
- ltsleep(&reconCtrlPtr->rb_lock, PRIBIO, "reconctlcnmhs", 0, &reconCtrlPtr->rb_mutex);
+ rf_wait_cond2(reconCtrlPtr->rb_cv, reconCtrlPtr->rb_mutex);
}
reconCtrlPtr->rb_lock = 1;
- RF_UNLOCK_MUTEX(reconCtrlPtr->rb_mutex);
+ rf_unlock_mutex2(reconCtrlPtr->rb_mutex);
pssPtr = rf_LookupRUStatus(raidPtr, reconCtrlPtr->pssTable,
rbuf->parityStripeID, rbuf->which_ru, RF_PSS_NONE, NULL);
@@ -688,10 +688,10 @@
out:
RF_UNLOCK_PSS_MUTEX(raidPtr, rbuf->parityStripeID);
- RF_LOCK_MUTEX(reconCtrlPtr->rb_mutex);
+ rf_lock_mutex2(reconCtrlPtr->rb_mutex);
reconCtrlPtr->rb_lock = 0;
- wakeup(&reconCtrlPtr->rb_lock);
- RF_UNLOCK_MUTEX(reconCtrlPtr->rb_mutex);
+ rf_broadcast_cond2(reconCtrlPtr->rb_cv);
+ rf_unlock_mutex2(reconCtrlPtr->rb_mutex);
#if RF_DEBUG_RECON
if (rf_reconbufferDebug) {
printf("raid%d: RAID1 rbuf submission: returning %d\n",
Index: src/sys/dev/raidframe/rf_reconbuffer.c
diff -u src/sys/dev/raidframe/rf_reconbuffer.c:1.24 src/sys/dev/raidframe/rf_reconbuffer.c:1.25
--- src/sys/dev/raidframe/rf_reconbuffer.c:1.24 Sun Mar 4 06:02:39 2007
+++ src/sys/dev/raidframe/rf_reconbuffer.c Mon May 2 07:29:18 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_reconbuffer.c,v 1.24 2007/03/04 06:02:39 christos Exp $ */
+/* $NetBSD: rf_reconbuffer.c,v 1.25 2011/05/02 07:29:18 mrg Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -33,7 +33,7 @@
***/
#include
-__KERNEL_RCSID(0, "$NetBSD: rf_reconbuffer.c,v 1.24 2007/03/04 06:02:39 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rf_reconbuffer.c,v 1.25 2011/05/02 07:29:18 mrg Exp $");
#include "rf_raid.h"
#include "rf_reconbuffer.h"
@@ -140,12 +140,12 @@
RF_LOCK_PSS_MUTEX(raidPtr, rbuf->parityStripeID);
- RF_LOCK_MUTEX(reconCtrlPtr->rb_mutex);
+ rf_lock_mutex2(reconCtrlPtr->rb_mutex);
while(reconCtrlPtr->rb_lock) {
- ltsleep(&reconCtrlPtr->rb_lock, PRIBIO, "reconctlcnmhs", 0, &reconCtrlPtr->rb_mutex);
+ rf_wait_cond2(reconCtrlPtr->rb_cv, reconCtrlPtr->rb_mutex);
}
reconCtrlPtr->rb_lock = 1;
- RF_UNLOCK_MUTEX(reconCtrlPtr->rb_mutex);
+ rf_unlock_mutex2(reconCtrlPtr->rb_mutex);
pssPtr = rf_LookupRUStatus(raidPtr, reconCtrlPtr->pssTable, rbuf->parityStripeID, rbuf->which_ru, RF_PSS_NONE, NULL);
RF_ASSERT(pssPtr); /* if it didn't exist, we wouldn't have gotten
@@ -193,10 +193,10 @@
}
if (keep_it) {
RF_UNLOCK_PSS_MUTEX(raidPtr, rbuf->parityStripeID);
- RF_LOCK_MUTEX(reconCtrlPtr->rb_mutex);
+ rf_lock_mutex2(reconCtrlPtr->rb_mutex);
reconCtrlPtr->rb_lock = 0;
- wakeup(&reconCtrlPtr->rb_lock);
- RF_UNLOCK_MUTEX(reconCtrlPtr->rb_mutex);
+ rf_broadcast_cond2(reconCtrlPtr->rb_cv);
+ rf_unlock_mutex2(reconCtrlPtr->rb_mutex);
rf_FreeReconBuffer(rbuf);
return (retcode);
}
@@ -286,10 +286,10 @@
out:
RF_UNLOCK_PSS_MUTEX(raidPtr, rbuf->parityStripeID);
- RF_LOCK_MUTEX(reconCtrlPtr->rb_mutex);
+ rf_lock_mutex2(reconCtrlPtr->rb_mutex);
reconCtrlPtr->rb_lock = 0;
- wakeup(&reconCtrlPtr->rb_lock);
- RF_UNLOCK_MUTEX(reconCtrlPtr->rb_mutex);
+ rf_broadcast_cond2(reconCtrlPtr->rb_cv);
+ rf_unlock_mutex2(reconCtrlPtr->rb_mutex);
return (retcode);
}
/* pssPtr - the pss descriptor for this parity str
CVS commit: src/tests/syscall
Module Name:src
Committed By: jruoho
Date: Mon May 2 07:02:09 UTC 2011
Modified Files:
src/tests/syscall: t_nanosleep.c
Log Message:
Verify that nanosleep(2) can suspend for one nanosecond (or longer).
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/syscall/t_nanosleep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/syscall/t_nanosleep.c
diff -u src/tests/syscall/t_nanosleep.c:1.4 src/tests/syscall/t_nanosleep.c:1.5
--- src/tests/syscall/t_nanosleep.c:1.4 Sun May 1 09:44:26 2011
+++ src/tests/syscall/t_nanosleep.c Mon May 2 07:02:09 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: t_nanosleep.c,v 1.4 2011/05/01 09:44:26 jruoho Exp $ */
+/* $NetBSD: t_nanosleep.c,v 1.5 2011/05/02 07:02:09 jruoho Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_nanosleep.c,v 1.4 2011/05/01 09:44:26 jruoho Exp $");
+__RCSID("$NetBSD: t_nanosleep.c,v 1.5 2011/05/02 07:02:09 jruoho Exp $");
#include
#include
@@ -58,14 +58,14 @@
ATF_TC_BODY(nanosleep_basic, tc)
{
- static const size_t maxiter = 100;
+ static const size_t maxiter = 10;
struct timespec ts1, ts2, tsn;
size_t i;
- for (i = 0; i < maxiter; i++) {
+ for (i = 1; i < maxiter; i++) {
tsn.tv_sec = 0;
- tsn.tv_nsec = 1;
+ tsn.tv_nsec = i;
(void)memset(&ts1, 0, sizeof(struct timespec));
(void)memset(&ts2, 0, sizeof(struct timespec));
@@ -74,8 +74,22 @@
ATF_REQUIRE(nanosleep(&tsn, NULL) == 0);
ATF_REQUIRE(clock_gettime(CLOCK_MONOTONIC, &ts2) == 0);
- if (timespeccmp(&ts2, &ts1, <) != 0)
- atf_tc_fail("inaccuracies in sleep time");
+ /*
+ * Verify that we slept at least one nanosecond.
+ */
+ if (timespeccmp(&ts2, &ts1, <=) != 0) {
+
+ (void)fprintf(stderr,
+ "sleep time:: sec %lu, nsec %lu\n\t\t"
+ "ts1: sec %lu, nsec %lu\n\t\t"
+ "ts2: sec %lu, nsec %lu\n",
+ tsn.tv_sec, tsn.tv_nsec,
+ ts1.tv_sec, ts1.tv_nsec,
+ ts2.tv_sec, ts2.tv_nsec);
+
+ atf_tc_fail_nonfatal("inaccuracies in sleep time "
+ "(resolution = %lu nsec)", tsn.tv_nsec);
+ }
}
}
CVS commit: othersrc/external/bsd/iscsi
Module Name:othersrc Committed By: agc Date: Mon May 2 07:01:15 UTC 2011 Update of /cvsroot/othersrc/external/bsd/iscsi In directory ivanova.netbsd.org:/tmp/cvs-serv28163 Log Message: Initial import of the in-kernel iSCSI initiator, kindly contributed by Wasabi Systems under a 2-clause BSD license, to the othersrc tree. The initiator itself can be loaded as an lkm, and works successfully on 2.0 (the "burner" host), running against the NetBSD target on a 5.99 host. burner# modload -v -s -p /usr/lkm/iscsi_post.sh /usr/lkm/iscsidrv.o modload: reserving 36864 bytes of memory Module loaded as ID 0 burner# iscsid iSCSI Daemon loaded burner# iscsictl add_send_target -a 172.16.135.133 Added Send Target 1 burner# iscsictl refresh_targets OK burner# iscsictl list_targets 1: iqn.1994-04.org.netbsd.iscsi-target:target0 2: 172.16.135.133:3260,1 burner# iscsictl login -P 2 Created Session 2, Connection 1 burner# iscsictl list_sessions Session 2: Target iqn.1994-04.org.netbsd.iscsi-target:target0 burner# newfs /dev/rsd0a /dev/rsd0a: 100.0MB (204800 sectors) block size 8192, fragment size 1024 using 4 cylinder groups of 25.00MB, 3200 blks, 6144 inodes. super-block backups (for fsck -b #) at: 32, 51232, 102432, 153632, burner# mount /dev/sd0a /mnt burner# df Filesystem 1K-blocks Used Avail Capacity Mounted on /dev/wd0a 4066094 186994 3675795 4%/ kernfs 11 0 100%/kern /dev/sd0a 992471 94283 0%/mnt burner# dmesg | egrep '(scsibus|sd0)' scsibus0 at bha2: 16 targets, 8 luns per target scsibus0: waiting 2 seconds for devices to settle... scsibus1 at iscsi0: 1 target, 16 luns per target sd0 at scsibus1 target 0 lun 0: disk fixed sd0: fabricating a geometry sd0: 100 MB, 100 cyl, 64 head, 32 sec, 512 bytes/sect x 204800 sectors sd0: fabricating a geometry sd0: fabricating a geometry sd0: fabricating a geometry burner# on the target end: Reading configuration from `/etc/iscsi/targets' target0:rw:0.0.0.0/0 extent0:/tmp/iscsi-target0:0:104857600 DISK: 1 logical unit (204800 blocks, 512 bytes/block), type iscsi fs DISK: LUN 0: 100 MB disk storage for "target0" TARGET: iSCSI Qualified Name (IQN) is iqn.1994-04.org.netbsd.iscsi-target > iSCSI Discovery login successful from iqn.1994-04.org.netbsd:iscsi.burner.cupertino.alistaircrooks.com:0 on 172.16.135.137 disk -1, ISID 70368764559360, TSIH 1 < iSCSI Discovery logout successful from iqn.1994-04.org.netbsd:iscsi.burner.cupertino.alistaircrooks.com:0 on 172.16.135.137 disk -1, ISID 70368764559360, TSIH 1 > iSCSI Normal login successful from iqn.1994-04.org.netbsd:iscsi.burner.cupertino.alistaircrooks.com:0 on 172.16.135.137 disk 0, ISID 70368764559360, TSIH 2 Status: Vendor Tag: WASABI Release Tags: iscsi-initiator-base N othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_daemonif.c N othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_driverif.c N othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_globals.h N othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_main.c N othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_parse.c N othersrc/external/bsd/iscsi/sbin/iscsictl/iscsic_test.c N othersrc/external/bsd/iscsi/sbin/iscsictl/Makefile N othersrc/external/bsd/iscsi/sbin/iscsictl/TODO N othersrc/external/bsd/iscsi/sbin/iscsid/iscsid.h N othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_discover.c N othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_driverif.c N othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_globals.h N othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_lists.c N othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_main.c N othersrc/external/bsd/iscsi/sbin/iscsid/iscsid_targets.c N othersrc/external/bsd/iscsi/sbin/iscsid/Makefile N othersrc/external/bsd/iscsi/scripts/load-iscsi N othersrc/external/bsd/iscsi/scripts/load-iscsi-lkm N othersrc/external/bsd/iscsi/sys/arch/i386/conf/ISCSI N othersrc/external/bsd/iscsi/sys/conf/files N othersrc/external/bsd/iscsi/sys/conf/majors N othersrc/external/bsd/iscsi/sys/dev/iscsi/base64.c N othersrc/external/bsd/iscsi/sys/dev/iscsi/base64.h N othersrc/external/bsd/iscsi/sys/dev/iscsi/files.iscsi N othersrc/external/bsd/iscsi/sys/dev/iscsi/iscsi.h N othersrc/external/bsd/iscsi/sys/dev/iscsi/iscsi_globals.h N othersrc/external/bsd/iscsi/sys/dev/iscsi/iscsi_ioctl.c N othersrc/external/bsd/iscsi/sys/dev/iscsi/iscsi_ioctl.h N othersrc/external/bsd/iscsi/sys/dev/iscsi/iscsi_main.c N othersrc/external/bsd/iscsi/sys/dev/iscsi/iscsi_pdu.h N othersrc/external/bsd/iscsi/sys/dev/iscsi/iscsi_perf.h N othersrc/external/bsd/iscsi/s
