CVS commit: src/sys/arch/hp700
Module Name:src
Committed By: skrll
Date: Thu May 28 08:41:29 UTC 2009
Modified Files:
src/sys/arch/hp700/conf: files.hp700
Added Files:
src/sys/arch/hp700/dev: com_ssio.c gecko.c lpt_ssio.c ssio.c
Log Message:
Commit work-in-progress.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/hp700/conf/files.hp700
cvs rdiff -u -r0 -r1.1 src/sys/arch/hp700/dev/com_ssio.c \
src/sys/arch/hp700/dev/gecko.c src/sys/arch/hp700/dev/lpt_ssio.c \
src/sys/arch/hp700/dev/ssio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hp700/conf/files.hp700
diff -u src/sys/arch/hp700/conf/files.hp700:1.21 src/sys/arch/hp700/conf/files.hp700:1.22
--- src/sys/arch/hp700/conf/files.hp700:1.21 Thu Apr 30 07:01:26 2009
+++ src/sys/arch/hp700/conf/files.hp700 Thu May 28 08:41:29 2009
@@ -1,4 +1,4 @@
-# $NetBSD: files.hp700,v 1.21 2009/04/30 07:01:26 skrll Exp $
+# $NetBSD: files.hp700,v 1.22 2009/05/28 08:41:29 skrll Exp $
#
# $OpenBSD: files.hp700,v 1.31 2001/06/26 02:41:25 mickey Exp $
#
@@ -94,6 +94,11 @@
attach phantomas at gedoens
file arch/hp700/dev/phantomas.c phantomas
+# GeckoBOA BC GSC+ port
+device gecko: gedoens
+attach gecko at gedoens
+file arch/hp700/dev/gecko.c gecko
+
# U2/Uturn, Runway to GSC Bus bridge & IOA
device uturn: gedoens
attach uturn at gedoens
@@ -146,6 +151,16 @@
attach siop at gedoens with siop_gedoens
file arch/hp700/dev/siop_sgc.c siop_gedoens
+device ssio {[irq = -1]}
+attach ssio at pci
+file arch/hp700/dev/ssio.c ssio
+
+attach com at ssio with com_ssio
+file arch/hp700/dev/com_ssio.c com_ssio
+
+attach lpt at ssio with lpt_ssio
+file arch/hp700/dev/lpt_ssio.c lpt_ssio
+
###
#
Added files:
Index: src/sys/arch/hp700/dev/com_ssio.c
diff -u /dev/null src/sys/arch/hp700/dev/com_ssio.c:1.1
--- /dev/null Thu May 28 08:41:29 2009
+++ src/sys/arch/hp700/dev/com_ssio.c Thu May 28 08:41:29 2009
@@ -0,0 +1,108 @@
+/* $NetBSD: com_ssio.c,v 1.1 2009/05/28 08:41:29 skrll Exp $ */
+
+/* $OpenBSD: com_ssio.c,v 1.2 2007/06/24 16:28:39 kettenis Exp $ */
+
+/*
+ * Copyright (c) 2007 Mark Kettenis
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+
+#include
+#include
+
+void *ssio_intr_establish(int, int, int (*)(void *), void *,
+const char *);
+
+#define COM_SSIO_FREQ 1843200
+
+struct com_ssio_softc {
+ struct com_softc sc_com; /* real "com" softc */
+ void *sc_ih; /* interrupt handler */
+};
+
+int com_ssio_match(device_t, cfdata_t, void *);
+voidcom_ssio_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(com_ssio, sizeof(struct com_ssio_softc), com_ssio_match,
+com_ssio_attach, NULL, NULL);
+
+int
+com_ssio_match(device_t parent, cfdata_t match, void *aux)
+{
+ cfdata_t cf = match;
+ struct ssio_attach_args *saa = aux;
+
+ if (strcmp(saa->saa_name, "com") != 0)
+ return (0);
+
+ /* Check locators. */
+ if (cf->ssiocf_irq != SSIO_UNK_IRQ && cf->ssiocf_irq != saa->saa_irq)
+ return (0);
+
+ return (1);
+}
+
+void
+com_ssio_attach(device_t parent, device_t self, void *aux)
+{
+ struct com_ssio_softc *sc_ssio = device_private(self);
+ struct com_softc *sc = &sc_ssio->sc_com;
+ struct ssio_attach_args *saa = aux;
+ int pagezero_cookie;
+
+ bus_addr_t iobase;
+ bus_space_handle_t ioh;
+ bus_space_tag_t iot;
+
+ sc->sc_dev = self;
+ iobase = saa->saa_iobase;
+ iot = saa->saa_iot;
+ if (bus_space_map(iot, iobase, COM_NPORTS,
+ 0, &ioh)) {
+ aprint_error(": can't map I/O space\n");
+ return;
+ }
+
+ pagezero_cookie = hp700_pagezero_map();
+ if (PAGE0->mem_cons.pz_class == PCL_DUPLEX &&
+ PAGE0->mem_cons.pz_hpa == (struct iomod *)iobase) {
+ bus_space_unmap(iot, ioh, COM_NPORTS);
+ if (comcnattach(iot, iobase, B9600, COM_SSIO_FREQ,
+ COM_TYPE_NORMAL,
+ (TTYDEF_CFLAG & ~(CSIZE | PARENB)) | CS8) != 0) {
+ aprint_error(": can't comcnattach\n");
+ hp700_pagezero_unmap(pagezero_cookie);
+ return;
+ }
+ }
+ hp700_pagezero_unmap(pagezero_cookie);
+
+ sc->sc_frequency = COM_SSIO_FREQ;
+ COM_INIT_REGS(sc->sc_regs, iot, ioh, iobase);
+ com_attach_subr(sc);
+
+ sc_ssio->sc_ih = ssio_intr_establish(IPL_TTY, saa->saa
CVS commit: src/share/zoneinfo
Module Name:src Committed By: kleink Date: Thu May 28 08:50:06 UTC 2009 Update of /cvsroot/src/share/zoneinfo In directory ivanova.netbsd.org:/tmp/cvs-serv29609 Log Message: Import tzdata2009h. Status: Vendor Tag: ADO Release Tags: TZDATA2009H U src/share/zoneinfo/antarctica U src/share/zoneinfo/africa C src/share/zoneinfo/australasia U src/share/zoneinfo/asia U src/share/zoneinfo/northamerica U src/share/zoneinfo/europe U src/share/zoneinfo/yearistype.sh U src/share/zoneinfo/southamerica U src/share/zoneinfo/pacificnew U src/share/zoneinfo/etcetera U src/share/zoneinfo/factory U src/share/zoneinfo/backward U src/share/zoneinfo/systemv U src/share/zoneinfo/solar87 U src/share/zoneinfo/solar88 U src/share/zoneinfo/solar89 U src/share/zoneinfo/iso3166.tab U src/share/zoneinfo/zone.tab U src/share/zoneinfo/leapseconds 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jADO:yesterday -jADO src/share/zoneinfo
CVS commit: src/share/zoneinfo
Module Name:src Committed By: kleink Date: Thu May 28 08:52:29 UTC 2009 Modified Files: src/share/zoneinfo: australasia Log Message: Merge tzdata2009h. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/zoneinfo/australasia Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/zoneinfo/australasia diff -u src/share/zoneinfo/australasia:1.17 src/share/zoneinfo/australasia:1.18 --- src/share/zoneinfo/australasia:1.17 Mon Sep 15 21:58:07 2008 +++ src/share/zoneinfo/australasia Thu May 28 08:52:29 2009 @@ -1,5 +1,7 @@ -# @(#)australasia 8.9 # +# @(#)australasia 8.11 +# This file is in the public domain, so clarified as of +# 2009-05-17 by Arthur David Olson. # This file also includes Pacific islands. @@ -1119,6 +1121,27 @@ # From Paul Eggert (2007-07-23): # See "southeast Australia" above for 2008 and later. +# From Steffen Thorsen (2009-04-28): +# According to the official press release, South Australia's extended daylight +# saving period will continue with the same rules as used during the 2008-2009 +# summer (southern hemisphere). +# +# From +# http://www.safework.sa.gov.au/uploaded_files/DaylightDatesSet.pdf";> +# http://www.safework.sa.gov.au/uploaded_files/DaylightDatesSet.pdf +# +# The extended daylight saving period that South Australia has been trialling +# for over the last year is now set to be ongoing. +# Daylight saving will continue to start on the first Sunday in October each +# year and finish on the first Sunday in April the following year. +# Industrial Relations Minister, Paul Caica, says this provides South Australia +# with a consistent half hour time difference with NSW, Victoria, Tasmania and +# the ACT for all 52 weeks of the year... +# +# We have a wrap-up here: +# http://www.timeanddate.com/news/time/south-australia-extends-dst.html";> +# http://www.timeanddate.com/news/time/south-australia-extends-dst.html +# ### # New Zealand
CVS commit: src/doc
Module Name:src
Committed By: kleink
Date: Thu May 28 08:53:39 UTC 2009
Modified Files:
src/doc: 3RDPARTY
Log Message:
tz{code,data}2009h out; tzdata2009h imported.
To generate a diff of this commit:
cvs rdiff -u -r1.698 -r1.699 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.698 src/doc/3RDPARTY:1.699
--- src/doc/3RDPARTY:1.698 Tue May 26 13:53:07 2009
+++ src/doc/3RDPARTY Thu May 28 08:53:39 2009
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.698 2009/05/26 13:53:07 dent Exp $
+# $NetBSD: 3RDPARTY,v 1.699 2009/05/28 08:53:39 kleink Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -997,8 +997,8 @@
Notes:
Package: tz
-Version: tzcode2004a / tzdata2009c
-Current Vers: tzcode2009e / tzdata2009g
+Version: tzcode2004a / tzdata2009h
+Current Vers: tzcode2009h / tzdata2009h
Maintainer: Arthur David Olson
Archive Site: ftp://elsie.nci.nih.gov/pub/
Home Page:
CVS commit: src/external/bsd/pkg_install/dist
Module Name:src Committed By: joerg Date: Thu May 28 09:01:02 UTC 2009 Update of /cvsroot/src/external/bsd/pkg_install/dist In directory ivanova.netbsd.org:/tmp/cvs-serv11613 Log Message: Import pkg_install-20090528: Reenable extraction of ownership from tarballs. Status: Vendor Tag: PKGSRC Release Tags: pkg_install-20090528 U src/external/bsd/pkg_install/dist/add/add.h U src/external/bsd/pkg_install/dist/add/main.c U src/external/bsd/pkg_install/dist/add/perform.c U src/external/bsd/pkg_install/dist/add/pkg_add.1 U src/external/bsd/pkg_install/dist/admin/README U src/external/bsd/pkg_install/dist/admin/admin.h U src/external/bsd/pkg_install/dist/admin/audit-packages.sh.in U src/external/bsd/pkg_install/dist/admin/audit.c U src/external/bsd/pkg_install/dist/admin/check.c U src/external/bsd/pkg_install/dist/admin/download-vulnerability-list.sh.in U src/external/bsd/pkg_install/dist/admin/main.c U src/external/bsd/pkg_install/dist/admin/pkg_admin.1 U src/external/bsd/pkg_install/dist/bpm/bpm.1 U src/external/bsd/pkg_install/dist/bpm/bpm.sh.in U src/external/bsd/pkg_install/dist/create/build.c U src/external/bsd/pkg_install/dist/create/create.h U src/external/bsd/pkg_install/dist/create/main.c U src/external/bsd/pkg_install/dist/create/perform.c U src/external/bsd/pkg_install/dist/create/pkg_create.1 U src/external/bsd/pkg_install/dist/create/pl.c U src/external/bsd/pkg_install/dist/create/util.c U src/external/bsd/pkg_install/dist/delete/pkg_delete.1 U src/external/bsd/pkg_install/dist/delete/pkg_delete.c U src/external/bsd/pkg_install/dist/info/info.h U src/external/bsd/pkg_install/dist/info/main.c U src/external/bsd/pkg_install/dist/info/perform.c U src/external/bsd/pkg_install/dist/info/pkg_info.1 U src/external/bsd/pkg_install/dist/info/show.c U src/external/bsd/pkg_install/dist/lib/automatic.c U src/external/bsd/pkg_install/dist/lib/config.h.in U src/external/bsd/pkg_install/dist/lib/conflicts.c U src/external/bsd/pkg_install/dist/lib/decompress.c U src/external/bsd/pkg_install/dist/lib/defs.h U src/external/bsd/pkg_install/dist/lib/dewey.c U src/external/bsd/pkg_install/dist/lib/dewey.h U src/external/bsd/pkg_install/dist/lib/fexec.c U src/external/bsd/pkg_install/dist/lib/file.c U src/external/bsd/pkg_install/dist/lib/global.c U src/external/bsd/pkg_install/dist/lib/gpgsig.c U src/external/bsd/pkg_install/dist/lib/iterate.c U src/external/bsd/pkg_install/dist/lib/lib.h U src/external/bsd/pkg_install/dist/lib/lpkg.c U src/external/bsd/pkg_install/dist/lib/opattern.c U src/external/bsd/pkg_install/dist/lib/parse-config.c U src/external/bsd/pkg_install/dist/lib/pkcs7.c U src/external/bsd/pkg_install/dist/lib/pkg_install.conf.5.in U src/external/bsd/pkg_install/dist/lib/pkg_io.c U src/external/bsd/pkg_install/dist/lib/pkg_signature.c U src/external/bsd/pkg_install/dist/lib/pkg_summary.5 U src/external/bsd/pkg_install/dist/lib/pkgdb.c U src/external/bsd/pkg_install/dist/lib/pkgsrc.7 U src/external/bsd/pkg_install/dist/lib/plist.c U src/external/bsd/pkg_install/dist/lib/remove.c U src/external/bsd/pkg_install/dist/lib/str.c U src/external/bsd/pkg_install/dist/lib/var.c U src/external/bsd/pkg_install/dist/lib/version.c U src/external/bsd/pkg_install/dist/lib/version.h U src/external/bsd/pkg_install/dist/lib/vulnerabilities-file.c U src/external/bsd/pkg_install/dist/lib/xwrapper.c U src/external/bsd/pkg_install/dist/lib/license.c U src/external/bsd/pkg_install/dist/x509/pkgsrc.cnf U src/external/bsd/pkg_install/dist/x509/pkgsrc.sh U src/external/bsd/pkg_install/dist/x509/signing.txt No conflicts created by this import
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Thu May 28 09:32:18 UTC 2009 Modified Files: src/share/man/man9: vnsubr.9 Log Message: Use Dv in more places. To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/share/man/man9/vnsubr.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/vnsubr.9 diff -u src/share/man/man9/vnsubr.9:1.36 src/share/man/man9/vnsubr.9:1.37 --- src/share/man/man9/vnsubr.9:1.36 Thu May 28 06:49:30 2009 +++ src/share/man/man9/vnsubr.9 Thu May 28 09:32:17 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: vnsubr.9,v 1.36 2009/05/28 06:49:30 jnemeth Exp $ +.\" $NetBSD: vnsubr.9,v 1.37 2009/05/28 09:32:17 wiz Exp $ .\" .\" Copyright (c) 2001, 2005, 2006 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -156,7 +156,9 @@ .Fa vp as being the text of a running process. .It Fn vn_setrecurse "vp" -Common code to enable LK_CANRECURSE on the vnode lock for vnode +Common code to enable +.Dv LK_CANRECURSE +on the vnode lock for vnode .Fa vp . .Fn vn_setrecurse returns the new @@ -191,7 +193,10 @@ then perform the I/O. The argument .Fa rw -specifies whether the I/O is a read (UIO_READ) or write (UIO_WRITE) +specifies whether the I/O is a read +.Pq Dv UIO_READ +or write +.Pq Dv UIO_WRITE operation. The vnode is specified by .Fa vp . @@ -203,13 +208,11 @@ If .Fa ioflg contains -.Dq IO_NODELOCKED , +.Dv IO_NODELOCKED , it is expected that the vnode is locked. .Fa ioflg will be passed to -.Fn VOP_READ -/ -.Fn VOP_WRITE . +.Fn VOP_READ Ns No / Ns Fn VOP_WRITE . The remaining arguments specify the uio parameters. For further information on these parameters see .Xr uiomove 9 . @@ -230,7 +233,9 @@ .Fa cookies and .Fa ncookies -should be NULL is they aren't required to be returned by +should be +.Dv NULL +is they aren't required to be returned by .Fn vn_readdir . If the operation is successful zero is returned, otherwise an appropriate error code is returned.
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src Committed By: wiz Date: Thu May 28 09:41:05 UTC 2009 Modified Files: src/sys/rump/librump/rumpkern: rump.3 Log Message: Use Nx for NetBSD. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/rump/librump/rumpkern/rump.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/librump/rumpkern/rump.3 diff -u src/sys/rump/librump/rumpkern/rump.3:1.3 src/sys/rump/librump/rumpkern/rump.3:1.4 --- src/sys/rump/librump/rumpkern/rump.3:1.3 Sun May 24 23:13:49 2009 +++ src/sys/rump/librump/rumpkern/rump.3 Thu May 28 09:41:05 2009 @@ -1,4 +1,4 @@ -.\" $NetBSD: rump.3,v 1.3 2009/05/24 23:13:49 pooka Exp $ +.\" $NetBSD: rump.3,v 1.4 2009/05/28 09:41:05 wiz Exp $ .\" .\" Copyright (c) 2008 Antti Kantee. All rights reserved. .\" @@ -92,7 +92,9 @@ can be found from the header .In rump_syscalls.h . .It Vnode Interface -To sort out namespace collisions for non-NetBSD platforms, the whole +To sort out namespace collisions for +.Pf non- Nx +platforms, the whole vnode interface set is provided under a special namespace. The operation is the same as in the kernel, but the interface names begin with the prefix RUMP_VOP.
CVS commit: src/usr.sbin/puffs/mount_sysctlfs
Module Name:src
Committed By: njoly
Date: Thu May 28 10:07:06 UTC 2009
Modified Files:
src/usr.sbin/puffs/mount_sysctlfs: sysctlfs.c
Log Message:
Fix a crash while trying to read nodes on amd64, reported in PR/41494,
by not doing any transfert when offset exceed the actual data length.
>From and ok by po...@.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c
diff -u src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c:1.10 src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c:1.11
--- src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c:1.10 Sun Jan 18 10:10:47 2009
+++ src/usr.sbin/puffs/mount_sysctlfs/sysctlfs.c Thu May 28 10:07:06 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sysctlfs.c,v 1.10 2009/01/18 10:10:47 lukem Exp $ */
+/* $NetBSD: sysctlfs.c,v 1.11 2009/05/28 10:07:06 njoly Exp $ */
/*
* Copyright (c) 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -33,7 +33,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: sysctlfs.c,v 1.10 2009/01/18 10:10:47 lukem Exp $");
+__RCSID("$NetBSD: sysctlfs.c,v 1.11 2009/05/28 10:07:06 njoly Exp $");
#endif /* !lint */
#include
@@ -627,7 +627,10 @@
return EISDIR;
doprint(sfs, &pn->pn_po, localbuf, sizeof(localbuf));
- xfer = MIN(*resid, strlen(localbuf) - offset);
+ if (strlen(localbuf) < offset)
+ xfer = 0;
+ else
+ xfer = MIN(*resid, strlen(localbuf) - offset);
if (xfer <= 0)
return 0;
CVS commit: src/external/bsd/fetch/lib
Module Name:src
Committed By: joerg
Date: Thu May 28 10:44:30 UTC 2009
Modified Files:
src/external/bsd/fetch/lib: Makefile
Log Message:
Allow building with MKCRYPTO=no.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/fetch/lib/Makefile
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/fetch/lib/Makefile
diff -u src/external/bsd/fetch/lib/Makefile:1.2 src/external/bsd/fetch/lib/Makefile:1.3
--- src/external/bsd/fetch/lib/Makefile:1.2 Tue Nov 25 05:32:05 2008
+++ src/external/bsd/fetch/lib/Makefile Thu May 28 10:44:29 2009
@@ -14,12 +14,15 @@
CPPFLAGS+= -DNETBSD
CPPFLAGS+= -DFTP_COMBINE_CWDS
CPPFLAGS+= -DINET6
+
+.if (${MKCRYPTO} != "no")
CPPFLAGS+= -DWITH_SSL
LDADD= -lssl -lcrypto
LIBDPLIBS+= ssl ${NETBSDSRCDIR}/lib/libssl \
crypto ${NETBSDSRCDIR}/lib/libcrypto
+.endif
CLEANFILES+= ftperr.h httperr.h
CVS commit: src/sys/compat/osf1
Module Name:src Committed By: njoly Date: Thu May 28 14:48:20 UTC 2009 Modified Files: src/sys/compat/osf1: osf1_file.c Log Message: Make getdirentries(2) correctly fail with EINVAL for an invalid file descriptor (not for a directory), by not updating basep syscall argument on error. To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/compat/osf1/osf1_file.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/compat/osf1/osf1_file.c diff -u src/sys/compat/osf1/osf1_file.c:1.33 src/sys/compat/osf1/osf1_file.c:1.34 --- src/sys/compat/osf1/osf1_file.c:1.33 Mon May 18 12:39:02 2009 +++ src/sys/compat/osf1/osf1_file.c Thu May 28 14:48:20 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_file.c,v 1.33 2009/05/18 12:39:02 njoly Exp $ */ +/* $NetBSD: osf1_file.c,v 1.34 2009/05/28 14:48:20 njoly Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.33 2009/05/18 12:39:02 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.34 2009/05/28 14:48:20 njoly Exp $"); #if defined(_KERNEL_OPT) #include "opt_syscall_debug.h" @@ -245,7 +245,7 @@ free(buf, M_TEMP); out1: fd_putfile(fd); - if (SCARG(uap, basep) != NULL) + if (error == 0 && SCARG(uap, basep) != NULL) error = copyout(&eofflag, SCARG(uap, basep), sizeof(long)); return error; }
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: christos
Date: Thu May 28 14:57:42 UTC 2009
Modified Files:
src/usr.bin/netstat: netstat.1
Log Message:
fix typo (Silas Silva)
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/usr.bin/netstat/netstat.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/netstat/netstat.1
diff -u src/usr.bin/netstat/netstat.1:1.50 src/usr.bin/netstat/netstat.1:1.51
--- src/usr.bin/netstat/netstat.1:1.50 Wed Mar 11 09:54:29 2009
+++ src/usr.bin/netstat/netstat.1 Thu May 28 10:57:42 2009
@@ -1,4 +1,4 @@
-.\" $NetBSD: netstat.1,v 1.50 2009/03/11 13:54:29 joerg Exp $
+.\" $NetBSD: netstat.1,v 1.51 2009/05/28 14:57:42 christos Exp $
.\"
.\" Copyright (c) 1983, 1990, 1992, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -380,7 +380,7 @@
.Xr bpf 4
descriptor which has three different values:
Idle ('I'), Waiting ('W') and Timed Out ('T').
-The second character indicates wheter the promisc flag is set.
+The second character indicates whether the promisc flag is set.
The third character indicates the status of the immediate mode.
The fourth character indicates whether the peer will have the ability
to see the packets sent.
CVS commit: src/sys/compat/osf1
Module Name:src Committed By: njoly Date: Thu May 28 15:21:26 UTC 2009 Modified Files: src/sys/compat/osf1: osf1_file.c Log Message: Redo previous, by simply updating basep earlier, before label. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/compat/osf1/osf1_file.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/compat/osf1/osf1_file.c diff -u src/sys/compat/osf1/osf1_file.c:1.34 src/sys/compat/osf1/osf1_file.c:1.35 --- src/sys/compat/osf1/osf1_file.c:1.34 Thu May 28 14:48:20 2009 +++ src/sys/compat/osf1/osf1_file.c Thu May 28 15:21:26 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: osf1_file.c,v 1.34 2009/05/28 14:48:20 njoly Exp $ */ +/* $NetBSD: osf1_file.c,v 1.35 2009/05/28 15:21:26 njoly Exp $ */ /* * Copyright (c) 1999 Christopher G. Demetriou. All rights reserved. @@ -58,7 +58,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.34 2009/05/28 14:48:20 njoly Exp $"); +__KERNEL_RCSID(0, "$NetBSD: osf1_file.c,v 1.35 2009/05/28 15:21:26 njoly Exp $"); #if defined(_KERNEL_OPT) #include "opt_syscall_debug.h" @@ -243,10 +243,10 @@ if (cookiebuf) free(cookiebuf, M_TEMP); free(buf, M_TEMP); + if (SCARG(uap, basep) != NULL) + error = copyout(&eofflag, SCARG(uap, basep), sizeof(long)); out1: fd_putfile(fd); - if (error == 0 && SCARG(uap, basep) != NULL) - error = copyout(&eofflag, SCARG(uap, basep), sizeof(long)); return error; }
CVS commit: src/doc
Module Name:src Committed By: pooka Date: Thu May 28 17:35:22 UTC 2009 Modified Files: src/doc: CHANGES Log Message: add a few noteworthy rump developments To generate a diff of this commit: cvs rdiff -u -r1.1235 -r1.1236 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.1235 src/doc/CHANGES:1.1236 --- src/doc/CHANGES:1.1235 Sun May 24 21:42:39 2009 +++ src/doc/CHANGES Thu May 28 17:35:22 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1235 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1236 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -91,6 +91,7 @@ known interface as Linux does for managing LVM. [haad 20081222] gcscaudio(4): Add AMD Geode CS5536 audio driver, from SHIMIZU Ryo. [jmcneill 20081228] + rump: i386 and amd64 can use kernel module binaries [pooka 20081230] mount_cd9660(8): Add nocasetrans option as a synonym for nomaplcase. [christos 20090103] rc.d(8): Add a script for rndctl(8). [apb 20090104] @@ -253,6 +254,7 @@ dhcpcd(8): Import dhcpcd-5.0.0. [roy 20090428] rc.d(8): Add an rc.d script for dhcpcd(8). [roy 20090428] ichlpcib(4): Attach 82801IEM LPC Interface Bridge too. [njoly 20090429] + rump: Add support for remote system calls [pooka 20090429] sh3: Add some support for SH7706. [nonaka 20090430] hppa: Merge the nick-hppapmap branch which includes a port of the OpenBSD pmap, improves support for machines without the @@ -285,3 +287,4 @@ with strftime(3). [ginsbach 20090524] kernel: File descriptor access performance improvements. [ad 20090524] + rumpnet: Add IPv6 support [pooka 20090527]
CVS commit: src/sys/arch/i386
Module Name:src
Committed By: dyoung
Date: Thu May 28 18:13:46 UTC 2009
Modified Files:
src/sys/arch/i386: Makefile
Log Message:
For the 'tags' target, use the right path to the Atheros HAL sources.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/i386/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/Makefile
diff -u src/sys/arch/i386/Makefile:1.36 src/sys/arch/i386/Makefile:1.37
--- src/sys/arch/i386/Makefile:1.36 Thu Nov 6 00:41:52 2008
+++ src/sys/arch/i386/Makefile Thu May 28 18:13:46 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/11/06 00:41:52 dyoung Exp $
+# $NetBSD: Makefile,v 1.37 2009/05/28 18:13:46 dyoung Exp $
# Makefile for i386 tags file and boot blocks
@@ -11,9 +11,9 @@
${SYSDIR}/arch/i386/mca/*.[ch] \
${SYSDIR}/arch/i386/pci/*.[ch] \
${SYSDIR}/arch/i386/pnpbios/*.[ch] \
- ${SYSDIR}/contrib/dev/ath/*.[ch] \
- ${SYSDIR}/contrib/dev/ath/netbsd/*.[ch] \
- ${SYSDIR}/contrib/dev/ath/public/*.[ch] \
+ ${SYSDIR}/external/isc/atheros_hal/dist/*.[ch] \
+ ${SYSDIR}/external/isc/atheros_hal/dist/*/*.[ch] \
+ ${SYSDIR}/external/isc/atheros_hal/ic/*.[ch] \
${SYSDIR}/dist/acpica/*.[ch]
SI386+= ${SYSDIR}/arch/x86/x86/*.[ch] \
${SYSDIR}/arch/x86/acpi/*.[ch] \
CVS commit: src/sys/kern
Module Name:src Committed By: yamt Date: Thu May 28 22:17:04 UTC 2009 Modified Files: src/sys/kern: kern_descrip.c Log Message: wrap a long line. To generate a diff of this commit: cvs rdiff -u -r1.193 -r1.194 src/sys/kern/kern_descrip.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/kern/kern_descrip.c diff -u src/sys/kern/kern_descrip.c:1.193 src/sys/kern/kern_descrip.c:1.194 --- src/sys/kern/kern_descrip.c:1.193 Tue May 26 00:42:33 2009 +++ src/sys/kern/kern_descrip.c Thu May 28 22:17:04 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_descrip.c,v 1.193 2009/05/26 00:42:33 ad Exp $ */ +/* $NetBSD: kern_descrip.c,v 1.194 2009/05/28 22:17:04 yamt Exp $ */ /*- * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc. @@ -70,7 +70,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.193 2009/05/26 00:42:33 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.194 2009/05/28 22:17:04 yamt Exp $"); #include #include @@ -979,7 +979,8 @@ /* Copy the existing descriptor table and zero the new portion. */ i = sizeof(fdfile_t *) * oldnfiles; memcpy(newdt->dt_ff, dt->dt_ff, i); - memset((uint8_t *)newdt->dt_ff + i, 0, numfiles * sizeof(fdfile_t *) - i); + memset((uint8_t *)newdt->dt_ff + i, 0, + numfiles * sizeof(fdfile_t *) - i); /* * Link old descriptor array into list to be discarded. We defer
CVS commit: src/sys/kern
Module Name:src
Committed By: yamt
Date: Fri May 29 00:10:52 UTC 2009
Modified Files:
src/sys/kern: kern_descrip.c
Log Message:
fd_free: reset fd_himap/lomap to make fd_checkmaps comfortable. PR/41487.
To generate a diff of this commit:
cvs rdiff -u -r1.194 -r1.195 src/sys/kern/kern_descrip.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/kern/kern_descrip.c
diff -u src/sys/kern/kern_descrip.c:1.194 src/sys/kern/kern_descrip.c:1.195
--- src/sys/kern/kern_descrip.c:1.194 Thu May 28 22:17:04 2009
+++ src/sys/kern/kern_descrip.c Fri May 29 00:10:52 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_descrip.c,v 1.194 2009/05/28 22:17:04 yamt Exp $ */
+/* $NetBSD: kern_descrip.c,v 1.195 2009/05/29 00:10:52 yamt Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.194 2009/05/28 22:17:04 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_descrip.c,v 1.195 2009/05/29 00:10:52 yamt Exp $");
#include
#include
@@ -1253,11 +1253,11 @@
for (fd = NDFDFILE; fd < NDFILE; fd++) {
KASSERT(fdp->fd_dtbuiltin.dt_ff[fd] == NULL);
}
+ KASSERT(fdp->fd_himap == fdp->fd_dhimap);
+ KASSERT(fdp->fd_lomap == fdp->fd_dlomap);
#endif /* DIAGNOSTIC */
fdp->fd_refcnt = 1;
- fdp->fd_himap = fdp->fd_dhimap;
- fdp->fd_lomap = fdp->fd_dlomap;
return fdp;
}
@@ -1278,6 +1278,8 @@
fdp->fd_lastkqfile = -1;
fdp->fd_dt = &fdp->fd_dtbuiltin;
fdp->fd_dtbuiltin.dt_nfiles = NDFILE;
+ fdp->fd_himap = fdp->fd_dhimap;
+ fdp->fd_lomap = fdp->fd_dlomap;
CTASSERT(sizeof(fdp->fd_dfdfile[0]) >= sizeof(fdfile_t));
for (i = 0, ffp = fdp->fd_dt->dt_ff; i < NDFDFILE; i++, ffp++) {
@@ -1544,6 +1546,8 @@
fdp->fd_exclose = false;
memset(&fdp->fd_startzero, 0, sizeof(*fdp) -
offsetof(filedesc_t, fd_startzero));
+ fdp->fd_himap = fdp->fd_dhimap;
+ fdp->fd_lomap = fdp->fd_dlomap;
KASSERT(fdp->fd_dtbuiltin.dt_nfiles == NDFILE);
KASSERT(fdp->fd_dtbuiltin.dt_link == NULL);
KASSERT(fdp->fd_dt == &fdp->fd_dtbuiltin);
CVS commit: src/sys
Module Name:src
Committed By: darran
Date: Fri May 29 04:57:05 UTC 2009
Modified Files:
src/sys/dev/pci: if_wm.c
src/sys/net: if_ethersubr.c
src/sys/net/agr: ieee8023ad_lacp.c if_agr.c if_agrether.c
if_agrvar_impl.h
Log Message:
Add vlan support and hardware offload capabilities to agr.
These changes allow vlans to be layered above agr, with the attach
and detach propogated to the member ports in the aggregation.
Note the agr interface must be up before the vlan is attached.
Adds SIOCINITIFADDR support to the wm driver for setting the AF_LINK
address, necessary for agr to be able to set the mac addresses of each
port to the agr address (i.e. so it can receive all intended traffic
at the hardware level).
Adds support for disabling the LACP protocol by setting LINK1 on the agr
interface (e.g. ifconfig agr0 link1).
In consultation with t...@.
To generate a diff of this commit:
cvs rdiff -u -r1.174 -r1.175 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.171 -r1.172 src/sys/net/if_ethersubr.c
cvs rdiff -u -r1.8 -r1.9 src/sys/net/agr/ieee8023ad_lacp.c
cvs rdiff -u -r1.22 -r1.23 src/sys/net/agr/if_agr.c
cvs rdiff -u -r1.6 -r1.7 src/sys/net/agr/if_agrether.c
cvs rdiff -u -r1.7 -r1.8 src/sys/net/agr/if_agrvar_impl.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.174 src/sys/dev/pci/if_wm.c:1.175
--- src/sys/dev/pci/if_wm.c:1.174 Tue Apr 7 18:42:30 2009
+++ src/sys/dev/pci/if_wm.c Fri May 29 04:57:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.174 2009/04/07 18:42:30 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.175 2009/05/29 04:57:04 darran Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.174 2009/04/07 18:42:30 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.175 2009/05/29 04:57:04 darran Exp $");
#include "bpfilter.h"
#include "rnd.h"
@@ -2366,6 +2366,8 @@
{
struct wm_softc *sc = ifp->if_softc;
struct ifreq *ifr = (struct ifreq *) data;
+ struct ifaddr *ifa = (struct ifaddr *)data;
+ struct sockaddr_dl *sdl;
int s, error;
s = splnet();
@@ -2387,6 +2389,18 @@
}
error = ifmedia_ioctl(ifp, ifr, &sc->sc_mii.mii_media, cmd);
break;
+ case SIOCINITIFADDR:
+ if (ifa->ifa_addr->sa_family == AF_LINK) {
+ sdl = satosdl(ifp->if_dl->ifa_addr);
+ (void)sockaddr_dl_setaddr(sdl, sdl->sdl_len,
+ LLADDR(satosdl(ifa->ifa_addr)),
+ ifp->if_addrlen);
+ /* unicast address is first multicast entry */
+ wm_set_filter(sc);
+ error = 0;
+ break;
+ }
+ /* Fall through for rest */
default:
if ((error = ether_ioctl(ifp, cmd, data)) != ENETRESET)
break;
Index: src/sys/net/if_ethersubr.c
diff -u src/sys/net/if_ethersubr.c:1.171 src/sys/net/if_ethersubr.c:1.172
--- src/sys/net/if_ethersubr.c:1.171 Tue Apr 28 21:26:51 2009
+++ src/sys/net/if_ethersubr.c Fri May 29 04:57:04 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ethersubr.c,v 1.171 2009/04/28 21:26:51 dyoung Exp $ */
+/* $NetBSD: if_ethersubr.c,v 1.172 2009/05/29 04:57:04 darran Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.171 2009/04/28 21:26:51 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.172 2009/05/29 04:57:04 darran Exp $");
#include "opt_inet.h"
#include "opt_atalk.h"
@@ -735,6 +735,15 @@
}
#endif
+#if NAGR > 0
+ if (ifp->if_agrprivate &&
+ __predict_true(etype != ETHERTYPE_SLOWPROTOCOLS)) {
+ m->m_flags &= ~M_PROMISC;
+ agr_input(ifp, m);
+ return;
+ }
+#endif /* NAGR > 0 */
+
/*
* If VLANs are configured on the interface, check to
* see if the device performed the decapsulation and
@@ -753,15 +762,6 @@
return;
}
-#if NAGR > 0
- if (ifp->if_agrprivate &&
- __predict_true(etype != ETHERTYPE_SLOWPROTOCOLS)) {
- m->m_flags &= ~M_PROMISC;
- agr_input(ifp, m);
- return;
- }
-#endif /* NAGR > 0 */
-
/*
* Handle protocols that expect to have the Ethernet header
* (and possibly FCS) intact.
Index: src/sys/net/agr/ieee8023ad_lacp.c
diff -u src/sys/net/agr/ieee8023ad_lacp.c:1.8 src/sys/net/agr/ieee8023ad_lacp.c:1.9
--- src/sys/net/agr/ieee8023ad_lacp.c:1.8 Sun Aug 26 22:59:09 2007
+++ src/sys/net/agr/ieee8023ad_lacp.c Fri May 29 04:57:05 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ieee8023ad_lacp.c,v 1.8 2007/08/26 22:59:09 dyoung Exp $ */
+/* $NetBSD: ieee8023ad_lacp.c,v 1.9 2009/05/29 04:57:05 darran Exp $ */
/*-
* Copyright (c)2005 YAMAMOTO Takashi,
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp.c,v 1.8 2007/08/26 22:59:09 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee8023ad_lacp.c,v 1.9 2009/05/29 04:57:05 darran Exp $");
#include
#include
@@ -101,9 +101,17 @@
if (__predict_false(port->port_flags & AGRPORT_DETACHING
CVS commit: src/sys/dev/pci
Module Name:src Committed By: skrll Date: Fri May 29 06:12:31 UTC 2009 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add a bunch of HP stuff. From OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.989 -r1.990 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.989 src/sys/dev/pci/pcidevs:1.990 --- src/sys/dev/pci/pcidevs:1.989 Mon May 18 09:06:22 2009 +++ src/sys/dev/pci/pcidevs Fri May 29 06:12:31 2009 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.989 2009/05/18 09:06:22 skrll Exp $ +$NetBSD: pcidevs,v 1.990 2009/05/29 06:12:31 skrll Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1999,15 +1999,26 @@ product HEURICON PMPPC 0x000e PM/PPC /* Hewlett-Packard products */ -product HP A4977A 0x1005 A4977A Visualize EG +product HP VISUALIZE_EG 0x1005 Visualize EG +product HP VISUALIZE_FX6 0x1006 Visualize FX6 product HP VISUALIZE_FX4 0x1008 Visualize FX4 +product HP VISUALIZE_FX2 0x100a Visualize FX2 product HP TACHYON_TL 0x1028 Tachyon TL FC Controller +product HP TACHYON_XL2 0x1029 Tachyon XL2 FC Controller product HP TACHYON_TS 0x102A Tachyon TS FC Controller -product HP TACHYON_XL2 0x1030 Tachyon XL2 FC Controller product HP J2585A 0x1030 J2585A product HP J2585B 0x1031 J2585B -product HP 82557B 0x1200 82557B 10/100 NIC +product HP DIVA 0x1048 Diva Serial Multiport +product HP ELROY 0x1054 Elroy Ropes-PCI +product HP VISUALIZE_FXE 0x108b Visualize FXe +product HP TOPTOOLS 0x10c1 TopTools Communications Port product HP NETRAID_4M 0x10c2 NetRaid-4M +product HP SMARTIRQ 0x10ed NetServer SmartIRQ +product HP 82557B 0x1200 82557B 10/100 NIC +product HP PLUTO 0x1229 Pluto MIO +product HP ZX1_IOC 0x122a zx1 IOC +product HP MERCURY 0x122e Mercury Ropes-PCI +product HP QUICKSILVER 0x12b4 QuickSilver Ropes-PCI product HP HPSAV100 0x3210 Smart Array V100 product HP HPSAE200I_1 0x3211 Smart Array E200i
