CVS commit: src/share/man/man3
Module Name:src Committed By: wiz Date: Tue Jul 3 09:27:52 UTC 2012 Modified Files: src/share/man/man3: intro.3 Log Message: Reference libusbhid instead of usb(3) (which was the predecessor for libusbhid). Bump date. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/share/man/man3/intro.3 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/man3/intro.3 diff -u src/share/man/man3/intro.3:1.27 src/share/man/man3/intro.3:1.28 --- src/share/man/man3/intro.3:1.27 Mon Jul 2 21:44:09 2012 +++ src/share/man/man3/intro.3 Tue Jul 3 09:27:52 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: intro.3,v 1.27 2012/07/02 21:44:09 oki Exp $ +.\ $NetBSD: intro.3,v 1.28 2012/07/03 09:27:52 wiz Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)intro.3 8.1 (Berkeley) 6/5/93 .\ -.Dd April 5, 2012 +.Dd July 3, 2012 .Dt INTRO 3 .Os .Sh NAME @@ -285,9 +285,9 @@ The terminal-independent operation libra See .Xr terminfo 3 . .It Em libusb Pq Fl l Ns Ar usb -The Universal Serial Bus (USB) access library. +The Universal Serial Bus (USB) Human Interface Devices access library. See -.Xr usb 3 . +.Xr libusbhid 3 . .It Em libutil Pq Fl l Ns Ar util The system utilities library. See
CVS commit: src/share/man/man3
Module Name:src Committed By: wiz Date: Tue Jul 3 09:28:08 UTC 2012 Modified Files: src/share/man/man3: intro.3 Log Message: Finish previous. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/share/man/man3/intro.3 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/man3/intro.3 diff -u src/share/man/man3/intro.3:1.28 src/share/man/man3/intro.3:1.29 --- src/share/man/man3/intro.3:1.28 Tue Jul 3 09:27:52 2012 +++ src/share/man/man3/intro.3 Tue Jul 3 09:28:08 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: intro.3,v 1.28 2012/07/03 09:27:52 wiz Exp $ +.\ $NetBSD: intro.3,v 1.29 2012/07/03 09:28:08 wiz Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -284,7 +284,7 @@ The telnet library. The terminal-independent operation library. See .Xr terminfo 3 . -.It Em libusb Pq Fl l Ns Ar usb +.It Em libusbhid Pq Fl l Ns Ar usbhid The Universal Serial Bus (USB) Human Interface Devices access library. See .Xr libusbhid 3 .
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Tue Jul 3 13:03:47 UTC 2012
Modified Files:
src/sys/kern: subr_disk_mbr.c
Log Message:
Don't kill the iso partition at 'a' when we have a udf raw partition.
Makes cd0a mountable again. Should be pulled up to 6 (after people
verify that it works in the broken cases)
http://mail-index.netbsd.org/current-users/2012/06/14/msg020415.html
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/kern/subr_disk_mbr.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/subr_disk_mbr.c
diff -u src/sys/kern/subr_disk_mbr.c:1.42 src/sys/kern/subr_disk_mbr.c:1.43
--- src/sys/kern/subr_disk_mbr.c:1.42 Thu Jun 30 16:09:41 2011
+++ src/sys/kern/subr_disk_mbr.c Tue Jul 3 09:03:47 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk_mbr.c,v 1.42 2011/06/30 20:09:41 wiz Exp $ */
+/* $NetBSD: subr_disk_mbr.c,v 1.43 2012/07/03 13:03:47 christos Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -54,7 +54,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: subr_disk_mbr.c,v 1.42 2011/06/30 20:09:41 wiz Exp $);
+__KERNEL_RCSID(0, $NetBSD: subr_disk_mbr.c,v 1.43 2012/07/03 13:03:47 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -364,9 +364,11 @@ scan_iso_vrs(mbr_args_t *a)
a-lp-d_partitions[0].p_size = a-lp-d_secperunit;
a-lp-d_partitions[0].p_cdsession = is_iso9660;
a-lp-d_partitions[0].p_fstype = FS_ISO9660;
+#ifdef notyet
} else {
a-lp-d_partitions[0].p_size = 0;
a-lp-d_partitions[0].p_fstype = FS_UNUSED;
+#endif
}
/* add udf partition if found */
CVS commit: src/sys/arch/i386/stand/lib
Module Name:src
Committed By: tsutsui
Date: Tue Jul 3 15:24:37 UTC 2012
Modified Files:
src/sys/arch/i386/stand/lib: biosdisk.c
Log Message:
Apply patch:
PR/46583: BIOS bootloader problems with partitions that start above 1TB
Should be pulled up to netbsd-6.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/i386/stand/lib/biosdisk.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/i386/stand/lib/biosdisk.c
diff -u src/sys/arch/i386/stand/lib/biosdisk.c:1.41 src/sys/arch/i386/stand/lib/biosdisk.c:1.42
--- src/sys/arch/i386/stand/lib/biosdisk.c:1.41 Wed Jun 13 18:34:20 2012
+++ src/sys/arch/i386/stand/lib/biosdisk.c Tue Jul 3 15:24:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: biosdisk.c,v 1.41 2012/06/13 18:34:20 perseant Exp $ */
+/* $NetBSD: biosdisk.c,v 1.42 2012/07/03 15:24:37 tsutsui Exp $ */
/*
* Copyright (c) 1996, 1998
@@ -416,7 +416,7 @@ read_minix_subp(struct biosdisk *d, stru
if (readsects(d-ll, sector, 1, d-buf, 0)) {
#ifdef DISK_DEBUG
- printf(Error reading MFS sector %d\n, sector);
+ printf(Error reading MFS sector %PRId64\n, sector);
#endif
return EIO;
}
@@ -445,10 +445,11 @@ read_label(struct biosdisk *d)
struct disklabel dflt_lbl;
struct mbr_partition mbr[MBR_PART_COUNT];
struct partition *p;
- int sector, i;
+ uint32_t sector;
+ int i;
int error;
int typ;
- int ext_base, this_ext, next_ext;
+ uint32_t ext_base, this_ext, next_ext;
#ifdef COMPAT_386BSD_MBRPART
int sector_386bsd = -1;
#endif
@@ -473,7 +474,7 @@ read_label(struct biosdisk *d)
next_ext = 0;
if (readsects(d-ll, this_ext, 1, d-buf, 0)) {
#ifdef DISK_DEBUG
- printf(error reading MBR sector %d\n, this_ext);
+ printf(error reading MBR sector %u\n, this_ext);
#endif
return EIO;
}
@@ -486,7 +487,7 @@ read_label(struct biosdisk *d)
continue;
sector = this_ext + mbr[i].mbrp_start;
#ifdef DISK_DEBUG
- printf(ptn type %d in sector %d\n, typ, sector);
+ printf(ptn type %d in sector %u\n, typ, sector);
#endif
if (typ == MBR_PTYPE_MINIX_14B) {
if (!read_minix_subp(d, dflt_lbl,
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: njoly Date: Tue Jul 3 18:12:06 UTC 2012 Modified Files: src/distrib/sets/lists/comp: shl.mi Log Message: mudflap debug libraries are gcc 4.5 specific. To generate a diff of this commit: cvs rdiff -u -r1.223 -r1.224 src/distrib/sets/lists/comp/shl.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/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.223 src/distrib/sets/lists/comp/shl.mi:1.224 --- src/distrib/sets/lists/comp/shl.mi:1.223 Tue Jun 5 00:37:53 2012 +++ src/distrib/sets/lists/comp/shl.mi Tue Jul 3 18:12:05 2012 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.223 2012/06/05 00:37:53 christos Exp $ +# $NetBSD: shl.mi,v 1.224 2012/07/03 18:12:05 njoly Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -314,8 +314,8 @@ ./usr/libdata/debug/usr/lib/libmj.so.1.0.debug comp-crypto-debug debug ./usr/libdata/debug/usr/lib/libmpc.so.2.0.debug comp-c-shlib obsolete ./usr/libdata/debug/usr/lib/libmpfr.so.4.1.debug comp-c-shlib obsolete -./usr/libdata/debug/usr/lib/libmudflap.so.0.0.debug comp-sys-debug gcc,debug -./usr/libdata/debug/usr/lib/libmudflapth.so.0.0.debug comp-sys-debug gcc,debug +./usr/libdata/debug/usr/lib/libmudflap.so.0.0.debug comp-sys-debug gcc=45,debug +./usr/libdata/debug/usr/lib/libmudflapth.so.0.0.debug comp-sys-debug gcc=45,debug ./usr/libdata/debug/usr/lib/libnetpgp.so.3.0.debug comp-crypto-debug crypto,debug ./usr/libdata/debug/usr/lib/libnpf.so.0.0.debug comp-npf-debug npf,debug ./usr/libdata/debug/usr/lib/libnvpair.so.0.0.debug comp-zfs-debug zfs,dynamicroot,debug
CVS commit: src/share/man/man4/man4.amiga
Module Name:src Committed By: rkujawa Date: Tue Jul 3 19:09:44 UTC 2012 Modified Files: src/share/man/man4/man4.amiga: empb.4 Log Message: Add DIAGNOSTICS section. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.amiga/empb.4 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/man4/man4.amiga/empb.4 diff -u src/share/man/man4/man4.amiga/empb.4:1.4 src/share/man/man4/man4.amiga/empb.4:1.5 --- src/share/man/man4/man4.amiga/empb.4:1.4 Wed Jun 27 22:23:45 2012 +++ src/share/man/man4/man4.amiga/empb.4 Tue Jul 3 19:09:44 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: empb.4,v 1.4 2012/06/27 22:23:45 wiz Exp $ +.\ $NetBSD: empb.4,v 1.5 2012/07/03 19:09:44 rkujawa Exp $ .\ .\ Copyright (c) 2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd June 27, 2012 +.Dd July 3, 2012 .Dt EMPB 4 amiga .Os .Sh NAME @@ -54,6 +54,20 @@ driver supports the following hardware: .It ELBOX Mediator 1200 SX .It ELBOX Mediator 1200 TX .El +.Sh DIAGNOSTICS +.Bl -diag +.It empb: linear space mapping might not work +PCI card driver is trying map memory space with BUS_SPACE_MAP_LINEAR flag. +Due to windowed design of Medaitor, it is expected to fail miserably if +normal memory space access methods (e.g. pointer dereference) are used +instead of +.Xr bus_space 9 +methods. +.It empb%d: couldn't find memory space, check your WINDOW jumper +PCI memory space access is disabled on a hardware level. The +.Nm +driver will work anyway, but only PCI I/O space will be accessible. To enable +memory space set WINDOW jumper to 4MB or 8MB. .Sh SEE ALSO .Xr mppb 4 , .Xr p5pb 4 ,
CVS commit: [netbsd-6] src
Module Name:src
Committed By: jdc
Date: Tue Jul 3 20:48:40 UTC 2012
Modified Files:
src/sbin/iscsictl [netbsd-6]: iscsic_driverif.c
src/sbin/iscsid [netbsd-6]: iscsid_discover.c
src/sys/dev/iscsi [netbsd-6]: iscsi_globals.h iscsi_ioctl.c
iscsi_main.c iscsi_rcv.c iscsi_send.c iscsi_text.c iscsi_utils.c
Log Message:
Pull up revisions:
src/sys/dev/iscsi/iscsi_globals.h revisions 1.3,1.4
src/sys/dev/iscsi/iscsi_main.c revisions 1.4,1.5
src/sys/dev/iscsi/iscsi_text.c revisions 1.4,1.5
src/sys/dev/iscsi/iscsi_ioctl.c revisions 1.3,1.4
src/sys/dev/iscsi/iscsi_send.c revisions 1.3,1.4,1.5
src/sys/dev/iscsi/iscsi_utils.c revisions 1.2,1.3,1.4
src/sbin/iscsid/iscsid_discover.c revision 1.4
src/sys/dev/iscsi/iscsi_rcv.c revision 1.3
src/sbin/iscsictl/iscsic_driverif.c revisions 1.5,1.6
(requested by martin in ticket #357, with updates from mhitch and mlelstv).
avoid namespace pollution when debugging
don't panic when printing data for a dead (NULL) connection
Close file descriptor passed into the kernel on success.
Fix locking of file handle. More cleanup on error paths.
Keep track of CCBs, so they cannot be used after a session ends.
Handle CCB timeouts even when the connection is terminated.
Compute firstdata, firstimmed correctly.
assemble_login_parameters() has a strange error reporting convention:
errors are positive numbers, so = 0 is good, not = ...
This makes CHAP authenticated iscsi logins work.
use first successful connection to a ISNS server
Add more debugging, fix filehandle usage, login negotiation and session
shutdown.
Add #ifdef'd code to send negotiation parameters in hex instead of base64,
so it works against older Linux targets.
report luns returns a 32bit list length.
Make digests work also on big endian machines.
it's really 32bit
To generate a diff of this commit:
cvs rdiff -u -r1.2.4.1 -r1.2.4.2 src/sbin/iscsictl/iscsic_driverif.c
cvs rdiff -u -r1.3 -r1.3.2.1 src/sbin/iscsid/iscsid_discover.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/dev/iscsi/iscsi_globals.h
cvs rdiff -u -r1.2 -r1.2.2.1 src/sys/dev/iscsi/iscsi_ioctl.c
cvs rdiff -u -r1.1.8.1 -r1.1.8.2 src/sys/dev/iscsi/iscsi_main.c \
src/sys/dev/iscsi/iscsi_rcv.c src/sys/dev/iscsi/iscsi_send.c
cvs rdiff -u -r1.3 -r1.3.2.1 src/sys/dev/iscsi/iscsi_text.c
cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/dev/iscsi/iscsi_utils.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/iscsictl/iscsic_driverif.c
diff -u src/sbin/iscsictl/iscsic_driverif.c:1.2.4.1 src/sbin/iscsictl/iscsic_driverif.c:1.2.4.2
--- src/sbin/iscsictl/iscsic_driverif.c:1.2.4.1 Mon Jul 2 18:50:11 2012
+++ src/sbin/iscsictl/iscsic_driverif.c Tue Jul 3 20:48:40 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsic_driverif.c,v 1.2.4.1 2012/07/02 18:50:11 jdc Exp $ */
+/* $NetBSD: iscsic_driverif.c,v 1.2.4.2 2012/07/03 20:48:40 jdc Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -590,7 +590,6 @@ report_luns(int argc, char **argv)
int rc;
size_t llen;
uint32_t n;
- uint16_t n2;
uint64_t *lp;
(void) memset(io, 0x0, sizeof(io));
@@ -609,8 +608,8 @@ report_luns(int argc, char **argv)
if ((rc = do_ioctl(io, TRUE)) != 0) {
return rc;
}
- (void) memcpy(n2, buf, sizeof(n2));
- llen = ntohs(n2);
+ (void) memcpy(n, buf, sizeof(n));
+ llen = ntohl(n);
if (!llen) {
printf(No LUNs!\n);
return 1;
Index: src/sbin/iscsid/iscsid_discover.c
diff -u src/sbin/iscsid/iscsid_discover.c:1.3 src/sbin/iscsid/iscsid_discover.c:1.3.2.1
--- src/sbin/iscsid/iscsid_discover.c:1.3 Sun Nov 20 01:23:57 2011
+++ src/sbin/iscsid/iscsid_discover.c Tue Jul 3 20:48:40 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_discover.c,v 1.3 2011/11/20 01:23:57 agc Exp $ */
+/* $NetBSD: iscsid_discover.c,v 1.3.2.1 2012/07/03 20:48:40 jdc Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -522,7 +522,7 @@ iscsi_isns_serverconn(isns_t * isns)
return (uint32_t)-1;
}
- if (connect(sock, addr-ai_addr, addr-ai_addrlen) == -1)
+ if (connect(sock, addr-ai_addr, addr-ai_addrlen) != -1)
break;
DEB(1, (%s: connect call FAILED!\n, __func__));
Index: src/sys/dev/iscsi/iscsi_globals.h
diff -u src/sys/dev/iscsi/iscsi_globals.h:1.2 src/sys/dev/iscsi/iscsi_globals.h:1.2.4.1
--- src/sys/dev/iscsi/iscsi_globals.h:1.2 Tue Nov 29 03:50:31 2011
+++ src/sys/dev/iscsi/iscsi_globals.h Tue Jul 3 20:48:40 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsi_globals.h,v 1.2 2011/11/29 03:50:31 tls Exp $ */
+/* $NetBSD: iscsi_globals.h,v 1.2.4.1 2012/07/03 20:48:40 jdc Exp $ */
/*-
* Copyright (c) 2004,2005,2006,2011 The NetBSD Foundation, Inc.
@@ -387,6 +387,7 @@ struct connection_s {
/* if closing down: status */
intrecover; /* recovery count */
/* (reset on first successful data transfer) */
+ intusecount; /* number of active CCBs */
booldestroy; /* conn will be destroyed */
bool
CVS commit: src/usr.bin/make
Module Name:src
Committed By: sjg
Date: Tue Jul 3 21:03:41 UTC 2012
Modified Files:
src/usr.bin/make: job.c
Log Message:
An X!= command, can cause Shell_Init() to be called before Job_ParseShell().
Job_ParseShell() should call Shell_Init() again if needed
to ensure shellPath is correct.
To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 src/usr.bin/make/job.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/job.c
diff -u src/usr.bin/make/job.c:1.162 src/usr.bin/make/job.c:1.163
--- src/usr.bin/make/job.c:1.162 Tue Jun 12 19:21:50 2012
+++ src/usr.bin/make/job.c Tue Jul 3 21:03:40 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: job.c,v 1.162 2012/06/12 19:21:50 joerg Exp $ */
+/* $NetBSD: job.c,v 1.163 2012/07/03 21:03:40 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = $NetBSD: job.c,v 1.162 2012/06/12 19:21:50 joerg Exp $;
+static char rcsid[] = $NetBSD: job.c,v 1.163 2012/07/03 21:03:40 sjg Exp $;
#else
#include sys/cdefs.h
#ifndef lint
#if 0
static char sccsid[] = @(#)job.c 8.2 (Berkeley) 3/19/94;
#else
-__RCSID($NetBSD: job.c,v 1.162 2012/06/12 19:21:50 joerg Exp $);
+__RCSID($NetBSD: job.c,v 1.163 2012/07/03 21:03:40 sjg Exp $);
#endif
#endif /* not lint */
#endif
@@ -2423,7 +2423,7 @@ Job_ParseShell(char *line)
* If no path was given, the user wants one of the pre-defined shells,
* yes? So we find the one s/he wants with the help of JobMatchShell
* and set things up the right way. shellPath will be set up by
- * Job_Init.
+ * Shell_Init.
*/
if (newShell.name == NULL) {
Parse_Error(PARSE_FATAL, Neither path nor name specified);
@@ -2438,6 +2438,12 @@ Job_ParseShell(char *line)
}
commandShell = sh;
shellName = newShell.name;
+ if (shellPath) {
+ /* Shell_Init has already been called! Do it again. */
+ free(UNCONST(shellPath));
+ shellPath = NULL;
+ Shell_Init();
+ }
}
} else {
/*
CVS commit: src/sys/arch/usermode/modules/syscallemu
Module Name:src
Committed By: christos
Date: Tue Jul 3 21:07:41 UTC 2012
Modified Files:
src/sys/arch/usermode/modules/syscallemu: Makefile
Log Message:
no home-brewed NETBSDSRCDIR please (fix the build)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/usermode/modules/syscallemu/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/usermode/modules/syscallemu/Makefile
diff -u src/sys/arch/usermode/modules/syscallemu/Makefile:1.2 src/sys/arch/usermode/modules/syscallemu/Makefile:1.3
--- src/sys/arch/usermode/modules/syscallemu/Makefile:1.2 Fri Jan 6 08:16:20 2012
+++ src/sys/arch/usermode/modules/syscallemu/Makefile Tue Jul 3 17:07:41 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2012/01/06 13:16:20 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2012/07/03 21:07:41 christos Exp $
-NETBSDSRCDIR?= ../../../../..
+.include bsd.own.mk
S?= ${NETBSDSRCDIR}/sys
M?= ${S}/modules
CVS commit: [netbsd-6] src/sys/dev/ata
Module Name:src
Committed By: jdc
Date: Tue Jul 3 21:13:25 UTC 2012
Modified Files:
src/sys/dev/ata [netbsd-6]: wd.c
Log Message:
Pull up revision 1.393 (requested by bouyer in ticket #381).
In some case, when an error is reported by the disk, the ahci controller
still reports a number of bytes transfered equal to bcount.
This then triggers a KASSERT in physio_biodone:
if (done == todo)
KASSERT(bp-b_error == 0);
Detect this case in wd(4) (so that the workaround works for other controllers
too if they have the same issue, or if the issue is with the drive)
and claim we didn't read/write anything.
To generate a diff of this commit:
cvs rdiff -u -r1.392 -r1.392.2.1 src/sys/dev/ata/wd.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/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.392 src/sys/dev/ata/wd.c:1.392.2.1
--- src/sys/dev/ata/wd.c:1.392 Thu Feb 2 19:43:02 2012
+++ src/sys/dev/ata/wd.c Tue Jul 3 21:13:25 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.392 2012/02/02 19:43:02 tls Exp $ */
+/* $NetBSD: wd.c,v 1.392.2.1 2012/07/03 21:13:25 jdc Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wd.c,v 1.392 2012/02/02 19:43:02 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: wd.c,v 1.392.2.1 2012/07/03 21:13:25 jdc Exp $);
#include opt_ata.h
@@ -819,6 +819,14 @@ noerror: if ((wd-sc_wdc_bio.flags ATA
bp-b_error = EIO;
break;
}
+ if (__predict_false(bp-b_error != 0) bp-b_resid == 0) {
+ /*
+ * the disk or controller sometimes report a complete
+ * xfer, when there has been an error. This is wrong,
+ * assume nothing got transfered in this case
+ */
+ bp-b_resid = bp-b_bcount;
+ }
disk_unbusy(wd-sc_dk, (bp-b_bcount - bp-b_resid),
(bp-b_flags B_READ));
rnd_add_uint32(wd-rnd_source, bp-b_blkno);
CVS commit: [netbsd-6] src/sys/arch/powerpc/booke/dev
Module Name:src
Committed By: jdc
Date: Tue Jul 3 21:16:15 UTC 2012
Modified Files:
src/sys/arch/powerpc/booke/dev [netbsd-6]: pq3etsec.c
Log Message:
Pull up revision 1.10 (requested by matt in ticket #382).
Don't rely on being able to allocate while in a softintr. So preallocate
all the bus_dma maps in ifinit where we can sleep.
To generate a diff of this commit:
cvs rdiff -u -r1.9.8.1 -r1.9.8.2 src/sys/arch/powerpc/booke/dev/pq3etsec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/booke/dev/pq3etsec.c
diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.9.8.1 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.9.8.2
--- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.9.8.1 Thu May 17 18:09:44 2012
+++ src/sys/arch/powerpc/booke/dev/pq3etsec.c Tue Jul 3 21:16:15 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: pq3etsec.c,v 1.9.8.1 2012/05/17 18:09:44 riz Exp $ */
+/* $NetBSD: pq3etsec.c,v 1.9.8.2 2012/07/03 21:16:15 jdc Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -38,7 +38,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pq3etsec.c,v 1.9.8.1 2012/05/17 18:09:44 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: pq3etsec.c,v 1.9.8.2 2012/07/03 21:16:15 jdc Exp $);
#include sys/param.h
#include sys/cpu.h
@@ -240,7 +240,7 @@ static void pq3etsec_ifstop(struct ifnet
static int pq3etsec_ifioctl(struct ifnet *, u_long, void *);
static int pq3etsec_mapcache_create(struct pq3etsec_softc *,
-struct pq3etsec_mapcache **, size_t, size_t, size_t, size_t);
+struct pq3etsec_mapcache **, size_t, size_t, size_t);
static void pq3etsec_mapcache_destroy(struct pq3etsec_softc *,
struct pq3etsec_mapcache *);
static bus_dmamap_t pq3etsec_mapcache_get(struct pq3etsec_softc *,
@@ -546,14 +546,14 @@ pq3etsec_attach(device_t parent, device_
}
error = pq3etsec_mapcache_create(sc, sc-sc_rx_mapcache,
- ETSEC_MAXRXMBUFS, ETSEC_MINRXMBUFS, MCLBYTES, ETSEC_NRXSEGS);
+ ETSEC_MAXRXMBUFS, MCLBYTES, ETSEC_NRXSEGS);
if (error) {
aprint_error(: failed to allocate rx dmamaps: %d\n, error);
return;
}
error = pq3etsec_mapcache_create(sc, sc-sc_tx_mapcache,
- ETSEC_MAXTXMBUFS, ETSEC_MAXTXMBUFS, MCLBYTES, ETSEC_NTXSEGS);
+ ETSEC_MAXTXMBUFS, MCLBYTES, ETSEC_NTXSEGS);
if (error) {
aprint_error(: failed to allocate tx dmamaps: %d\n, error);
return;
@@ -693,6 +693,8 @@ pq3etsec_ifinit(struct ifnet *ifp)
struct pq3etsec_softc * const sc = ifp-if_softc;
int error = 0;
+ KASSERT(!cpu_softintr_p());
+
sc-sc_maxfrm = max(ifp-if_mtu + 32, MCLBYTES);
if (ifp-if_mtu ETHERMTU_JUMBO)
return error;
@@ -717,8 +719,7 @@ pq3etsec_ifinit(struct ifnet *ifp)
if (sc-sc_tx_mapcache == NULL) {
error = pq3etsec_mapcache_create(sc, sc-sc_tx_mapcache,
- ETSEC_MAXTXMBUFS, ETSEC_MAXTXMBUFS, sc-sc_maxfrm,
- ETSEC_NTXSEGS);
+ ETSEC_MAXTXMBUFS, sc-sc_maxfrm, ETSEC_NTXSEGS);
if (error)
return error;
}
@@ -1106,20 +1107,7 @@ pq3etsec_mapcache_get(
struct pq3etsec_softc *sc,
struct pq3etsec_mapcache *dmc)
{
- if (dmc-dmc_nmaps == 0) {
- bus_dmamap_t map;
- int error = bus_dmamap_create(sc-sc_dmat, dmc-dmc_maxmapsize,
- dmc-dmc_maxseg, dmc-dmc_maxmapsize, 0,
- BUS_DMA_WAITOK|BUS_DMA_ALLOCNOW, map);
- if (error) {
- aprint_error_dev(sc-sc_dev,
- failed to allocate a %zuB map: %d\n,
- dmc-dmc_maxmapsize, error);
- return NULL;
- }
- return map;
- }
-
+ KASSERT(dmc-dmc_nmaps 0);
KASSERT(dmc-dmc_maps[dmc-dmc_nmaps-1] != NULL);
return dmc-dmc_maps[--dmc-dmc_nmaps];
}
@@ -1154,7 +1142,6 @@ pq3etsec_mapcache_create(
struct pq3etsec_softc *sc,
struct pq3etsec_mapcache **dmc_p,
size_t maxmaps,
- size_t minmaps,
size_t maxmapsize,
size_t maxseg)
{
@@ -1163,19 +1150,19 @@ pq3etsec_mapcache_create(
struct pq3etsec_mapcache * const dmc = kmem_zalloc(dmc_size, KM_SLEEP);
dmc-dmc_maxmaps = maxmaps;
- dmc-dmc_nmaps = minmaps;
+ dmc-dmc_nmaps = maxmaps;
dmc-dmc_maxmapsize = maxmapsize;
dmc-dmc_maxseg = maxseg;
- for (u_int i = 0; i minmaps; i++) {
+ for (u_int i = 0; i maxmaps; i++) {
int error = bus_dmamap_create(sc-sc_dmat, dmc-dmc_maxmapsize,
dmc-dmc_maxseg, dmc-dmc_maxmapsize, 0,
BUS_DMA_WAITOK|BUS_DMA_ALLOCNOW, dmc-dmc_maps[i]);
if (error) {
aprint_error_dev(sc-sc_dev,
failed to creat dma map cache
- entry %u of %zu (max %zu): %d\n,
- i, minmaps, maxmaps, error);
+ entry %u of %zu: %d\n,
+ i, maxmaps, error);
while (i-- 0) {
bus_dmamap_destroy(sc-sc_dmat,
dmc-dmc_maps[i]);
CVS commit: [netbsd-6] src/sys/arch/amd64/conf
Module Name:src Committed By: jdc Date: Tue Jul 3 21:22:07 UTC 2012 Modified Files: src/sys/arch/amd64/conf [netbsd-6]: XEN3_DOM0 Log Message: Pull up revision 1.85 via patch (requested by khorben in ticket #383). Disable azalia(4) now that hdaudio(4) was switched on ok bouyer@ To generate a diff of this commit: cvs rdiff -u -r1.77.2.4 -r1.77.2.5 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.4 src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.5 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.4 Tue Jun 12 17:48:02 2012 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Jul 3 21:22:07 2012 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.77.2.4 2012/06/12 17:48:02 riz Exp $ +# $NetBSD: XEN3_DOM0,v 1.77.2.5 2012/07/03 21:22:07 jdc Exp $ include arch/amd64/conf/std.xen @@ -687,7 +687,7 @@ auich* at pci? dev ? function ? # Intel auixp* at pci? dev ? function ? # ATI IXP AC'97 Audio autri* at pci? dev ? function ? # Trident 4DWAVE based AC'97 Audio auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio -azalia* at pci? dev ? function ? # High Definition Audio +#azalia* at pci? dev ? function ? # High Definition Audio clcs* at pci? dev ? function ? # Cirrus Logic CS4280 clct* at pci? dev ? function ? # Cirrus Logic CS4281 cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Tue Jul 3 21:27:54 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 357, 381, 382, 383. To generate a diff of this commit: cvs rdiff -u -r1.1.2.146 -r1.1.2.147 src/doc/CHANGES-6.0 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-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.146 src/doc/CHANGES-6.0:1.1.2.147 --- src/doc/CHANGES-6.0:1.1.2.146 Mon Jul 2 21:42:47 2012 +++ src/doc/CHANGES-6.0 Tue Jul 3 21:27:54 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.146 2012/07/02 21:42:47 jdc Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.147 2012/07/03 21:27:54 jdc Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -6001,3 +6001,35 @@ dist/pdisk/partition_map.c 1.15 Fix uint32_t / long pointer abuse in pdisk. [abs, ticket #380] +sys/dev/iscsi/iscsi_globals.h 1.3,1.4 +sys/dev/iscsi/iscsi_main.c 1.4,1.5 +sys/dev/iscsi/iscsi_text.c 1.4,1.5 +sys/dev/iscsi/iscsi_ioctl.c 1.3,1.4 +sys/dev/iscsi/iscsi_send.c 1.3,1.4,1.5 +sys/dev/iscsi/iscsi_utils.c 1.2,1.3,1.4 +sbin/iscsid/iscsid_discover.c 1.4 +sys/dev/iscsi/iscsi_rcv.c 1.3 +sbin/iscsictl/iscsic_driverif.c 1.5,1.6 + iscsi fixes: + - make CHAP authenticated iscsi logins work + - fix error handling + - avoid namespace pollution when debugging, add more debugging + - make digests work on big-endian machines + [martin, ticket #357] + +sys/dev/ata/wd.c1.393 + In some cases, when an error is reported by the disk, the ahci + controller still reports a number of bytes transfered equal to + bcount. Detect these cases in wd(4), and claim that we didn't + read/write anything. + [bouyer, ticket #381] + +sys/arch/powerpc/booke/dev/pq3etsec.c 1.10 + Don't rely on being able to allocate while in a softintr. So + preallocate all the bus_dma maps in ifinit where we can sleep. + [matt, ticket #382] + +sys/arch/amd64/conf/XEN3_DOM0 1.85 via patch + Disable azalia(4) now that hdaudio(4) was switched on. + [khorben, ticket #383] +
CVS commit: src/share/man/man9
Module Name:src Committed By: cheusov Date: Tue Jul 3 21:35:05 UTC 2012 Modified Files: src/share/man/man9: kauth.9 Log Message: Fix documentation for function kauth_register_key (PR 46641). To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/share/man/man9/kauth.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/kauth.9 diff -u src/share/man/man9/kauth.9:1.102 src/share/man/man9/kauth.9:1.103 --- src/share/man/man9/kauth.9:1.102 Wed Jun 27 20:29:38 2012 +++ src/share/man/man9/kauth.9 Tue Jul 3 21:35:04 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: kauth.9,v 1.102 2012/06/27 20:29:38 wiz Exp $ +.\ $NetBSD: kauth.9,v 1.103 2012/07/03 21:35:04 cheusov Exp $ .\ .\ Copyright (c) 2005, 2006 Elad Efrat e...@netbsd.org .\ All rights reserved. @@ -25,7 +25,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd June 27, 2012 +.Dd July 4, 2012 .Dt KAUTH 9 .Os .Sh NAME @@ -1705,10 +1705,9 @@ may be associated with the credentials. Registering, and deregistering, a key is done by using these routines: .Pp .Bl -tag -width compact -.It Ft int Fn kauth_register_key const char *name kauth_key_t *keyp -Register new key for private data for -.Ar name -(usually, the security model name). +.It Ft int Fn kauth_register_key secmodel_t sm kauth_key_t *keyp +Register new key for private data for security model +.Ar sm . .Ar keyp will be used to return the key to be used in further calls. .Pp
CVS commit: src
Module Name:src
Committed By: abs
Date: Tue Jul 3 21:49:56 UTC 2012
Modified Files:
src/distrib/vax/miniroot: Makefile.inc list
src/distrib/vax/ramdisk: Makefile dot.profile list
src/etc/etc.vax: MAKEDEV.conf
src/sys/arch/vax/conf: INSTALL
Removed Files:
src/distrib/vax: install.md
Log Message:
All apply to vax only:
- Drop KERNFS from INSTALL kernel
- Add dmesg to sysinst ramdisk
- Add 'ramdisk' target to MAKEDEV and use
- Add dhcpcd to sysinst ramdisk
- Drop old install.md script
- Misc install image cleanup (reduce diff to zaurus of all things)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r0 src/distrib/vax/install.md
cvs rdiff -u -r1.21 -r1.22 src/distrib/vax/miniroot/Makefile.inc
cvs rdiff -u -r1.14 -r1.15 src/distrib/vax/miniroot/list
cvs rdiff -u -r1.29 -r1.30 src/distrib/vax/ramdisk/Makefile \
src/distrib/vax/ramdisk/list
cvs rdiff -u -r1.8 -r1.9 src/distrib/vax/ramdisk/dot.profile
cvs rdiff -u -r1.14 -r1.15 src/etc/etc.vax/MAKEDEV.conf
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/vax/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/vax/miniroot/Makefile.inc
diff -u src/distrib/vax/miniroot/Makefile.inc:1.21 src/distrib/vax/miniroot/Makefile.inc:1.22
--- src/distrib/vax/miniroot/Makefile.inc:1.21 Mon Jul 2 22:42:18 2012
+++ src/distrib/vax/miniroot/Makefile.inc Tue Jul 3 21:49:55 2012
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile.inc,v 1.21 2012/07/02 22:42:18 abs Exp $
+# $NetBSD: Makefile.inc,v 1.22 2012/07/03 21:49:55 abs Exp $
IMAGESIZE= 7m
MAKEFS_FLAGS= -o density=3k
IMAGEENDIAN= le
MAKEDEVTARGETS= all
LISTS+= ${DISTRIBDIR}/common/list.sysinst
-IMAGEDEPENDS+= ${ARCHDIR}/../install.md \
- ${ARCHDIR}/dot.profile \
+IMAGEDEPENDS+= ${ARCHDIR}/dot.profile \
${DESTDIR}/usr/mdec/boot \
${KERNOBJDIR}/GENERIC/netbsd
Index: src/distrib/vax/miniroot/list
diff -u src/distrib/vax/miniroot/list:1.14 src/distrib/vax/miniroot/list:1.15
--- src/distrib/vax/miniroot/list:1.14 Sun Jul 3 23:11:34 2011
+++ src/distrib/vax/miniroot/list Tue Jul 3 21:49:55 2012
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.14 2011/07/03 23:11:34 tron Exp $
+# $NetBSD: list,v 1.15 2012/07/03 21:49:55 abs Exp $
# Vax extras
PROG sbin/disklabel
@@ -36,5 +36,4 @@ SYMLINK /tmp/hosts etc/hosts
# and the installation tools
COPY ${ARCHDIR}/dot.profile .profile
-COPY ${ARCHDIR}/../install.md install.md
COPY ${DESTDIR}/usr/mdec/boot boot
Index: src/distrib/vax/ramdisk/Makefile
diff -u src/distrib/vax/ramdisk/Makefile:1.29 src/distrib/vax/ramdisk/Makefile:1.30
--- src/distrib/vax/ramdisk/Makefile:1.29 Thu Jun 28 13:53:49 2012
+++ src/distrib/vax/ramdisk/Makefile Tue Jul 3 21:49:56 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2012/06/28 13:53:49 abs Exp $
+# $NetBSD: Makefile,v 1.30 2012/07/03 21:49:56 abs Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -11,11 +11,10 @@ WARNS= 1
DBG= -Os
CRUNCHBIN= ramdiskbin
-LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
+LISTS= ${.CURDIR}/list ${DISTRIBDIR}/common/list.sysinst
MTREECONF= ${DISTRIBDIR}/common/mtree.common
IMAGEENDIAN= le
-MAKEDEVTARGETS= std mt0 st0 rd0 rd1 dz0 dl0 dhu0 rx0 ra0 ra1 ra2 ra3 hp0 hp1 \
- sd0 sd1 sd2 md0 pty0 cd0 cd1 racd0 racd1
+MAKEDEVTARGETS= ramdisk
IMAGEDEPENDS= ${CRUNCHBIN} \
Makefile dot.profile \
${DESTDIR}/boot ${DESTDIR}/usr/mdec/xxboot \
@@ -29,6 +28,7 @@ HACKSRC= ${DISTRIBDIR}/utils/libhack
${CRUNCHBIN}: libhack.o
.include ${DISTRIBDIR}/common/Makefile.crunch
+.include ${DISTRIBDIR}/common/Makefile.dhcpcd
.include ${DISTRIBDIR}/common/Makefile.makedev
.include ${DISTRIBDIR}/common/Makefile.image
Index: src/distrib/vax/ramdisk/list
diff -u src/distrib/vax/ramdisk/list:1.29 src/distrib/vax/ramdisk/list:1.30
--- src/distrib/vax/ramdisk/list:1.29 Wed Mar 21 05:49:17 2012
+++ src/distrib/vax/ramdisk/list Tue Jul 3 21:49:56 2012
@@ -1,6 +1,6 @@
-# $NetBSD: list,v 1.29 2012/03/21 05:49:17 matt Exp $
+# $NetBSD: list,v 1.30 2012/07/03 21:49:56 abs Exp $
-SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin
+SRCDIRS external/bsd/less/bin bin sbin usr.bin usr.sbin
PROG bin/cat
PROG bin/chmod
@@ -22,6 +22,7 @@ PROG bin/sync
PROG sbin/chown bin/chgrp
PROG sbin/disklabel
+PROG sbin/dmesg
PROG sbin/fsck
PROG sbin/fsck_ffs
PROG sbin/ifconfig
@@ -30,7 +31,6 @@ PROG sbin/mknod
PROG sbin/mount
PROG sbin/mount_cd9660
PROG sbin/mount_ffs
-PROG sbin/mount_kernfs
PROG sbin/mount_nfs
PROG sbin/newfs sbin/mount_mfs
PROG sbin/ping
@@ -45,7 +45,6 @@ PROG usr/bin/ftp
PROG usr/bin/gzip usr/bin/gzcat usr/bin/gunzip
PROG usr/bin/less usr/bin/more
PROG usr/bin/sed
-# PROG usr/bin/strings
# PROG usr/sbin/bad144
PROG usr/sbin/chroot
@@ -61,7 +60,7 @@ SPECIAL ping srcdir distrib/utils/x_pin
SPECIAL route srcdir distrib/utils/x_route
SPECIAL umount srcdir distrib/utils/x_umount
-LIBS
CVS commit: src/sys/arch/vax/conf
Module Name:src Committed By: abs Date: Tue Jul 3 22:42:48 UTC 2012 Modified Files: src/sys/arch/vax/conf: INSTALL Log Message: Sync devices with GENERIC, and include bpfilter to allow dhcpcd to work To generate a diff of this commit: cvs rdiff -u -r1.61 -r1.62 src/sys/arch/vax/conf/INSTALL 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/vax/conf/INSTALL diff -u src/sys/arch/vax/conf/INSTALL:1.61 src/sys/arch/vax/conf/INSTALL:1.62 --- src/sys/arch/vax/conf/INSTALL:1.61 Tue Jul 3 21:49:56 2012 +++ src/sys/arch/vax/conf/INSTALL Tue Jul 3 22:42:47 2012 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.61 2012/07/03 21:49:56 abs Exp $ +# $NetBSD: INSTALL,v 1.62 2012/07/03 22:42:47 abs Exp $ # # INSTALL kernel; all supported devices but nothing fancy. # @@ -24,7 +24,7 @@ options VAX43 # VS 3100/76 options VAX46 # VS 4000/60 options VAX48 # VS 4000 VLC options VAX49 # VS 4000/90 -options VAX53 # VAX 4000/105A +options VAX53 # VAX 4000/10[058], MicroVAX 3100/m96 # Max users on system; this is just a hint maxusers 8 @@ -38,15 +38,15 @@ options MEMORY_DISK_RBFLAGS=RB_SINGLE # # Kernel compiled-in symbolic debugger system call tracer #options DDB -#options DDB_HISTORY_SIZE=100 # enable history editing in DDB +#options DDB_HISTORY_SIZE=512 # enable history editing in DDB #options KTRACE #options DIAGNOSTIC,DEBUG,KMEMSTATS,PMAPDEBUG,TRAPDEBUG #options SCSIVERBOSE # Verbose SCSI errors -# Network support -#options GATEWAY -options INET +# Networking options +#options GATEWAY # packet forwarding +options INET # IP + ICMP + TCP + UDP # File systems file-system FFS @@ -56,11 +56,14 @@ file-system NFS #file-system FDESC #file-system KERNFS #file-system NULLFS +#file-system OVERLAY # overlay file system #file-system PROCFS #file-system UMAPFS #file-system UNION file-system CD9660 #file-system PTYFS # /dev/pts/N support +#file-system TMPFS # Efficient memory file-system +#file-system UDF # experimental - OSTA UDF CD/DVD file-system # Filesystem options #options QUOTA # legacy UFS quotas @@ -96,15 +99,17 @@ options WSEMUL_VT100 #options COMPAT_13 options COMPAT_14 options COMPAT_15 +options COMPAT_16 options COMPAT_20 options COMPAT_30 # NetBSD 3.0 compatibility. options COMPAT_40 # NetBSD 4.0 compatibility. +options COMPAT_50 # NetBSD 5.0 compatibility. #options COMPAT_ULTRIX options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. options USERCONF # userconf(4) support -options PIPE_SOCKETPAIR # smaller, but slower pipe(2) +options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel # Kernel(s) to compile @@ -112,74 +117,109 @@ config netbsd root on ? type ? mainbus0 at root -# Devices directly attached to mainbus. -sbi* at mainbus0 # SBI's, VAX-11/78[05] main bus -bi* at mainbus0 # VAXBI bus -cmi0 at mainbus0 # 11/750 internal bus. -vsbus0 at mainbus0 # Internal virtual VAXstation bus -sbi* at mainbus0 # SBI adapter -uba0 at mainbus0 # Q-Bus adapter -ze0 at mainbus0 # SGEC on-board ethernet -le0 at mainbus0 # LANCE +cpu* at mainbus0 -# Devices connected at VAXBI -cpu0 at bi? node? # KA820/KA825 CPU -cpu* at bi? node? -mem* at bi? node? # Memory subsystems -#uba* at bi? node? # DWBUA BI-Unibus adapter -#ni* at bi? node? # DEBNA/DEBNT ethernet adapter -kdb* at bi? node? # KDB50 MSCP disk ctlr -mscpbus* at kdb? +# All buses; from the beginning attached to mainbus. +abus0 at mainbus0 # Master bus on VAX 86x0 +sbi0 at mainbus0 # SBI, master bus on 11/78x. +cmi0 at mainbus0 # 11/750 internal bus. +bi0 at mainbus0 # VAX 8200 +vsbus0 at mainbus0 # All VAXstations +#nmi0 at mainbus0 # VAX 8800 +#xmi0 at mainbus0 # VAX 6000 +uba0 at mainbus0 # All MicroVAX +ze0 at mainbus0 # KA48, KA49, KA53 +le0 at mainbus0 # LANCE ethernet (MV3400) +#shac0 at mainbus0 # DSSI controller + +# NMI (internal bus) on VAX 88xx-series. +#cpu* at nmi0 slot? # 1-4 KA88 CPUs +#mem* at nmi0 slot? +#bi* at nmi0 slot? # BI bus adapters + +# XMI on VAX 6000 (and higher) +#cpu* at xmi? node? # 1-? VAX 6000 CPUs +#mem* at xmi? node? +#bi* at xmi? node? # XMI-BI adapter -# Devices connected at cmi -mem* at cmi? tr? # Memory subsystems -uba* at cmi? tr? # Unibus adapters -mba* at cmi? tr? # Massbus adapters - -# Devices connected at abus - -# Devices connected at sbi -mem* at sbi? tr? # Memory subsystems -uba* at sbi? tr? # Unibus adapters -mba* at sbi? tr? # Massbus adapters +# Vsbus, the virtual VAXstation bus, and possible devices. +le0 at vsbus0 csr 0x200e # LANCE ethernet +dz0 at vsbus0 csr 0x200a # DC-367 DZ-11 lookalike ctlr +dz0 at vsbus0 csr 0x2500 # VS4000/90 and 4000/10x serial line +si0 at vsbus0 csr 0x200c0080 # VS2000/3100 SCSI-ctlr +si1 at vsbus0 csr 0x200c0180 # VS2000/3100 SCSI-ctlr
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Wed Jul 4 01:08:27 UTC 2012 Modified Files: src/sys/dev/usb: usbdevs Log Message: add another sierra device To generate a diff of this commit: cvs rdiff -u -r1.623 -r1.624 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.623 src/sys/dev/usb/usbdevs:1.624 --- src/sys/dev/usb/usbdevs:1.623 Sun Jul 1 00:20:26 2012 +++ src/sys/dev/usb/usbdevs Tue Jul 3 21:08:26 2012 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.623 2012/07/01 04:20:26 nonaka Exp $ +$NetBSD: usbdevs,v 1.624 2012/07/04 01:08:26 christos Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2695,6 +2695,7 @@ product SIERRA AIRCARD580 0x0112 Sierra product SIERRA AC595U 0x0120 Sierra Wireless AirCard 595U product SIERRA MC5720 0x0218 MC5720 Wireless Modem product SIERRA MINI5725 0x0220 Sierra Wireless miniPCI 5275 +product SIERRA 250U 0x0301 Sieral Wireless 250U 3G product SIERRA INSTALLER 0x0fff Aircard Driver Installer product SIERRA MC8755_2 0x6802 MC8755 product SIERRA MC8765 0x6803 MC8765
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Wed Jul 4 01:08:58 UTC 2012
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.615 -r1.616 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.616 -r1.617 src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.615 src/sys/dev/usb/usbdevs.h:1.616
--- src/sys/dev/usb/usbdevs.h:1.615 Sun Jul 1 00:21:10 2012
+++ src/sys/dev/usb/usbdevs.h Tue Jul 3 21:08:57 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.615 2012/07/01 04:21:10 nonaka Exp $ */
+/* $NetBSD: usbdevs.h,v 1.616 2012/07/04 01:08:57 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.623 2012/07/01 04:20:26 nonaka Exp
+ * NetBSD: usbdevs,v 1.624 2012/07/04 01:08:26 christos Exp
*/
/*
@@ -2702,6 +2702,7 @@
#define USB_PRODUCT_SIERRA_AC595U 0x0120 /* Sierra Wireless AirCard 595U */
#define USB_PRODUCT_SIERRA_MC5720 0x0218 /* MC5720 Wireless Modem */
#define USB_PRODUCT_SIERRA_MINI5725 0x0220 /* Sierra Wireless miniPCI 5275 */
+#define USB_PRODUCT_SIERRA_250U 0x0301 /* Sieral Wireless 250U 3G */
#define USB_PRODUCT_SIERRA_INSTALLER 0x0fff /* Aircard Driver Installer */
#define USB_PRODUCT_SIERRA_MC8755_2 0x6802 /* MC8755 */
#define USB_PRODUCT_SIERRA_MC8765 0x6803 /* MC8765 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.616 src/sys/dev/usb/usbdevs_data.h:1.617
--- src/sys/dev/usb/usbdevs_data.h:1.616 Sun Jul 1 00:21:10 2012
+++ src/sys/dev/usb/usbdevs_data.h Tue Jul 3 21:08:58 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.616 2012/07/01 04:21:10 nonaka Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.617 2012/07/04 01:08:58 christos Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.623 2012/07/01 04:20:26 nonaka Exp
+ * NetBSD: usbdevs,v 1.624 2012/07/04 01:08:26 christos Exp
*/
/*
@@ -8191,6 +8191,10 @@ const struct usb_product usb_products[]
Sierra Wireless miniPCI 5275,
},
{
+ USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_250U,
+ Sieral Wireless 250U 3G,
+ },
+ {
USB_VENDOR_SIERRA, USB_PRODUCT_SIERRA_INSTALLER,
Aircard Driver Installer,
},
@@ -9531,4 +9535,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1860;
+const int usb_nproducts = 1861;
