CVS commit: src/libexec/getty
Module Name:src
Committed By: roy
Date: Thu Jun 28 08:55:10 UTC 2012
Modified Files:
src/libexec/getty: main.c
Log Message:
Don't attempt to parse a termcap/terminfo string ourselves;
always use tputs(3).
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/libexec/getty/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/getty/main.c
diff -u src/libexec/getty/main.c:1.58 src/libexec/getty/main.c:1.59
--- src/libexec/getty/main.c:1.58 Wed Feb 3 15:34:43 2010
+++ src/libexec/getty/main.c Thu Jun 28 08:55:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.58 2010/02/03 15:34:43 roy Exp $ */
+/* $NetBSD: main.c,v 1.59 2012/06/28 08:55:10 roy Exp $ */
/*-
* Copyright (c) 1980, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT(@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = from: @(#)main.c 8.1 (Berkeley) 6/20/93;
#else
-__RCSID($NetBSD: main.c,v 1.58 2010/02/03 15:34:43 roy Exp $);
+__RCSID($NetBSD: main.c,v 1.59 2012/06/28 08:55:10 roy Exp $);
#endif
#endif /* not lint */
@@ -173,11 +173,12 @@ timeoverrun(int signo)
static int getname(void);
static void oflush(void);
static void prompt(void);
-static void putchr(int);
+static int putchr(int);
static void putf(const char *);
-static void putpad(const char *);
static void xputs(const char *);
+#define putpad(s) tputs(s, 1, putchr)
+
int
main(int argc, char *argv[], char *envp[])
{
@@ -566,43 +567,6 @@ getname(void)
}
static void
-putpad(const char *s)
-{
- int pad = 0;
- speed_t ospd = cfgetospeed(tmode);
-
- if (isdigit((unsigned char)*s)) {
- while (isdigit((unsigned char)*s)) {
- pad *= 10;
- pad += *s++ - '0';
- }
- pad *= 10;
- if (*s == '.' isdigit((unsigned char)s[1])) {
- pad += s[1] - '0';
- s += 2;
- }
- }
-
- xputs(s);
- /*
- * If no delay needed, or output speed is
- * not comprehensible, then don't try to delay.
- */
- if (pad == 0)
- return;
-
- /*
- * Round up by a half a character frame, and then do the delay.
- * Too bad there are no user program accessible programmed delays.
- * Transmitting pad characters slows many terminals down and also
- * loads the system.
- */
- pad = (pad * ospd + 5) / 10;
- while (pad--)
- putchr(*PC);
-}
-
-static void
xputs(const char *s)
{
while (*s)
@@ -612,7 +576,7 @@ xputs(const char *s)
char outbuf[OBUFSIZ];
size_t obufcnt = 0;
-static void
+static int
putchr(int cc)
{
unsigned char c;
@@ -627,8 +591,9 @@ putchr(int cc)
outbuf[obufcnt++] = c;
if (obufcnt = OBUFSIZ)
oflush();
- } else
- (void)write(STDOUT_FILENO, c, 1);
+ return 1;
+ }
+ return write(STDOUT_FILENO, c, 1);
}
static void
CVS commit: src/lib/libperfuse
Module Name:src
Committed By: abs
Date: Thu Jun 28 13:53:13 UTC 2012
Modified Files:
src/lib/libperfuse: ops.c perfuse_priv.h
Log Message:
Fix the build by adding (unused) flags argument to perfuse_node_setattr_ttl
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/lib/libperfuse/ops.c
cvs rdiff -u -r1.29 -r1.30 src/lib/libperfuse/perfuse_priv.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libperfuse/ops.c
diff -u src/lib/libperfuse/ops.c:1.57 src/lib/libperfuse/ops.c:1.58
--- src/lib/libperfuse/ops.c:1.57 Thu Jun 14 05:58:22 2012
+++ src/lib/libperfuse/ops.c Thu Jun 28 13:53:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ops.c,v 1.57 2012/06/14 05:58:22 manu Exp $ */
+/* $NetBSD: ops.c,v 1.58 2012/06/28 13:53:13 abs Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -1680,13 +1680,13 @@ perfuse_node_setattr(struct puffs_usermo
const struct vattr *vap, const struct puffs_cred *pcr)
{
return perfuse_node_setattr_ttl(pu, opc,
- __UNCONST(vap), pcr, NULL);
+ __UNCONST(vap), pcr, NULL, 0);
}
int
perfuse_node_setattr_ttl(struct puffs_usermount *pu, puffs_cookie_t opc,
struct vattr *vap, const struct puffs_cred *pcr,
- struct timespec *va_ttl)
+ struct timespec *va_ttl, int flags)
{
perfuse_msg_t *pm;
uint64_t fh;
Index: src/lib/libperfuse/perfuse_priv.h
diff -u src/lib/libperfuse/perfuse_priv.h:1.29 src/lib/libperfuse/perfuse_priv.h:1.30
--- src/lib/libperfuse/perfuse_priv.h:1.29 Wed Apr 18 00:57:22 2012
+++ src/lib/libperfuse/perfuse_priv.h Thu Jun 28 13:53:13 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: perfuse_priv.h,v 1.29 2012/04/18 00:57:22 manu Exp $ */
+/* $NetBSD: perfuse_priv.h,v 1.30 2012/06/28 13:53:13 abs Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -259,7 +259,7 @@ int perfuse_node_getattr_ttl(struct puff
struct timespec *);
int perfuse_node_setattr_ttl(struct puffs_usermount *,
puffs_cookie_t, struct vattr *, const struct puffs_cred *,
-struct timespec *);
+struct timespec *, int flags);
struct perfuse_trace *perfuse_trace_begin(struct perfuse_state *,
puffs_cookie_t, perfuse_msg_t *);
CVS commit: src/distrib/vax/ramdisk
Module Name:src
Committed By: abs
Date: Thu Jun 28 13:53:49 UTC 2012
Modified Files:
src/distrib/vax/ramdisk: Makefile
Log Message:
Include racd0 and racd1 on ramdisk
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/distrib/vax/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/vax/ramdisk/Makefile
diff -u src/distrib/vax/ramdisk/Makefile:1.28 src/distrib/vax/ramdisk/Makefile:1.29
--- src/distrib/vax/ramdisk/Makefile:1.28 Wed Mar 21 05:49:39 2012
+++ src/distrib/vax/ramdisk/Makefile Thu Jun 28 13:53:49 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2012/03/21 05:49:39 matt Exp $
+# $NetBSD: Makefile,v 1.29 2012/06/28 13:53:49 abs Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -15,7 +15,7 @@ LISTS= ${.CURDIR}/list ${DISTRIBDIR}/c
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
+ sd0 sd1 sd2 md0 pty0 cd0 cd1 racd0 racd1
IMAGEDEPENDS= ${CRUNCHBIN} \
Makefile dot.profile \
${DESTDIR}/boot ${DESTDIR}/usr/mdec/xxboot \
CVS commit: src/sys/arch/vax
Module Name:src
Committed By: abs
Date: Thu Jun 28 13:58:21 UTC 2012
Modified Files:
src/sys/arch/vax/include: vsbus.h
src/sys/arch/vax/vsa: dz_vsbus.c vsbus.c
Log Message:
Define and use VS_REGS_KA49 rather than magic numbers. From OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/include/vsbus.h
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/vax/vsa/dz_vsbus.c
cvs rdiff -u -r1.59 -r1.60 src/sys/arch/vax/vsa/vsbus.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/vax/include/vsbus.h
diff -u src/sys/arch/vax/include/vsbus.h:1.18 src/sys/arch/vax/include/vsbus.h:1.19
--- src/sys/arch/vax/include/vsbus.h:1.18 Tue Mar 11 05:34:02 2008
+++ src/sys/arch/vax/include/vsbus.h Thu Jun 28 13:58:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus.h,v 1.18 2008/03/11 05:34:02 matt Exp $ */
+/* $NetBSD: vsbus.h,v 1.19 2012/06/28 13:58:21 abs Exp $ */
/*
* Copyright (c) 1996 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -60,10 +60,13 @@ struct vsbus_attach_args {
*/
#define VS_CFGTST 0x2002 /* config register */
#define VS_REGS 0x2008 /* Misc CPU internal regs */
+#define VS_REGS_KA49 0x25c0 /* ... same, on 512KB ROM systems */
#define NI_ADDR 0x2009 /* Ethernet address */
#define DZ_CSR 0x200a /* DZ11-compatible chip csr */
+#define DZ_CSR_KA49 0x2500 /* ... same, on 512KB ROM systems */
#define VS_CLOCK0x200b /* clock chip address */
#define SCA_REGS0x200c /* disk device addresses */
+#define SCA_REGS_KA49 0x2600 /* ... same, on 512KB ROM systems */
#define NI_BASE 0x200e /* LANCE CSRs */
#define NI_IOSIZE (128 * VAX_NBPG)/* IO address size */
Index: src/sys/arch/vax/vsa/dz_vsbus.c
diff -u src/sys/arch/vax/vsa/dz_vsbus.c:1.42 src/sys/arch/vax/vsa/dz_vsbus.c:1.43
--- src/sys/arch/vax/vsa/dz_vsbus.c:1.42 Tue Dec 14 23:31:16 2010
+++ src/sys/arch/vax/vsa/dz_vsbus.c Thu Jun 28 13:58:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dz_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $ */
+/* $NetBSD: dz_vsbus.c,v 1.43 2012/06/28 13:58:21 abs Exp $ */
/*
* Copyright (c) 1998 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dz_vsbus.c,v 1.42 2010/12/14 23:31:16 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: dz_vsbus.c,v 1.43 2012/06/28 13:58:21 abs Exp $);
#include sys/param.h
#include sys/systm.h
@@ -123,7 +123,7 @@ dz_vsbus_match(device_t parent, cfdata_t
#if VAX53 || VAX49 || VAXANY
if (vax_boardtype == VAX_BTYP_53 || vax_boardtype == VAX_BTYP_49)
- if (cf-cf_loc[VSBUSCF_CSR] != 0x2500)
+ if (cf-cf_loc[VSBUSCF_CSR] != DZ_CSR_KA49)
return 0; /* Ugly */
#endif
@@ -262,12 +262,12 @@ dzcnprobe(struct consdev *cndev)
break;
case VAX_BTYP_49:
- ioaddr = 0x2500;
+ ioaddr = DZ_CSR_KA49;
diagcons = (vax_confdata 8 ? 3 : 0);
break;
case VAX_BTYP_53:
- ioaddr = 0x2500;
+ ioaddr = DZ_CSR_KA49;
diagcons = 3;
break;
Index: src/sys/arch/vax/vsa/vsbus.c
diff -u src/sys/arch/vax/vsa/vsbus.c:1.59 src/sys/arch/vax/vsa/vsbus.c:1.60
--- src/sys/arch/vax/vsa/vsbus.c:1.59 Tue Dec 14 23:31:17 2010
+++ src/sys/arch/vax/vsa/vsbus.c Thu Jun 28 13:58:21 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vsbus.c,v 1.59 2010/12/14 23:31:17 matt Exp $ */
+/* $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $ */
/*
* Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden.
* All rights reserved.
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vsbus.c,v 1.59 2010/12/14 23:31:17 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $);
#include opt_cputype.h
@@ -122,7 +122,7 @@ vsbus_attach(device_t parent, device_t s
#if VAX49 || VAX53
case VAX_BTYP_53:
case VAX_BTYP_49:
- sc-sc_vsregs = vax_map_physmem(0x25c0, 1);
+ sc-sc_vsregs = vax_map_physmem(VS_REGS_KA49, 1);
sc-sc_intreq = (char *)sc-sc_vsregs + 12;
sc-sc_intclr = (char *)sc-sc_vsregs + 12;
sc-sc_intmsk = (char *)sc-sc_vsregs + 8;
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: abs Date: Thu Jun 28 13:59:26 UTC 2012 Modified Files: src/sys/arch/vax/vax: findcpu.c Log Message: dependent not dependend To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/vax/findcpu.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/vax/vax/findcpu.c diff -u src/sys/arch/vax/vax/findcpu.c:1.18 src/sys/arch/vax/vax/findcpu.c:1.19 --- src/sys/arch/vax/vax/findcpu.c:1.18 Tue Mar 11 05:34:03 2008 +++ src/sys/arch/vax/vax/findcpu.c Thu Jun 28 13:59:25 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: findcpu.c,v 1.18 2008/03/11 05:34:03 matt Exp $ */ +/* $NetBSD: findcpu.c,v 1.19 2012/06/28 13:59:25 abs Exp $ */ /* * Copyright (c) 1994, 1998 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: findcpu.c,v 1.18 2008/03/11 05:34:03 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: findcpu.c,v 1.19 2012/06/28 13:59:25 abs Exp $); #include sys/param.h #ifdef _KERNEL @@ -50,11 +50,11 @@ __KERNEL_RCSID(0, $NetBSD: findcpu.c,v */ int vax_cputype; /* highest byte of SID register */ int vax_bustype; /* holds/defines all busses on this machine */ -int vax_boardtype; /* machine dependend, combination of SID and SIE */ +int vax_boardtype; /* machine dependent, combination of SID and SIE */ int vax_cpudata; /* contents of the SID register */ int vax_siedata; /* contents of the SIE register */ -int vax_confdata; /* machine dependend, configuration/setup data */ +int vax_confdata; /* machine dependent, configuration/setup data */ /* * Try to figure out which type of system this is.
CVS commit: src/sys/arch/vax/vax
Module Name:src Committed By: abs Date: Thu Jun 28 13:59:55 UTC 2012 Modified Files: src/sys/arch/vax/vax: ka49.c Log Message: drop some blank lines - no functional change To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/vax/vax/ka49.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/vax/vax/ka49.c diff -u src/sys/arch/vax/vax/ka49.c:1.18 src/sys/arch/vax/vax/ka49.c:1.19 --- src/sys/arch/vax/vax/ka49.c:1.18 Tue Dec 14 23:44:49 2010 +++ src/sys/arch/vax/vax/ka49.c Thu Jun 28 13:59:55 2012 @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ka49.c,v 1.18 2010/12/14 23:44:49 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: ka49.c,v 1.19 2012/06/28 13:59:55 abs Exp $); #include sys/param.h #include sys/systm.h @@ -157,7 +157,6 @@ ka49_cache_enable(void) mtpr(mfpr(PR_BCEDSTS), PR_BCEDSTS); /* Clear error bits */ mtpr(mfpr(PR_NESTS), PR_NESTS); /* Clear error bits */ - start = 0x0140; slut = 0x0144; @@ -224,7 +223,6 @@ ka49_steal_pages(void) /* Turn on caches (to speed up execution a bit) */ ka49_cache_enable(); - } void
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: matt
Date: Thu Jun 28 15:28:45 UTC 2012
Modified Files:
src/sys/arch/powerpc/powerpc: vm_machdep.c
Log Message:
Don't panic if you can't allocate a contiguous stack for system threads.
Just use a mapped a stack.
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/powerpc/powerpc/vm_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/powerpc/powerpc/vm_machdep.c
diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.96 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.97
--- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.96 Sat Mar 24 17:52:35 2012
+++ src/sys/arch/powerpc/powerpc/vm_machdep.c Thu Jun 28 15:28:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.96 2012/03/24 17:52:35 matt Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.97 2012/06/28 15:28:44 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.96 2012/03/24 17:52:35 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vm_machdep.c,v 1.97 2012/06/28 15:28:44 matt Exp $);
#include opt_altivec.h
#include opt_multiprocessor.h
@@ -292,9 +292,7 @@ cpu_uarea_alloc(bool system)
*/
error = uvm_pglistalloc(USPACE, 0, ~0UL, 0, 0, pglist, 1, 1);
if (error) {
- if (!system)
- return NULL;
- panic(%s: uvm_pglistalloc failed: %d, __func__, error);
+ return NULL;
}
/*
CVS commit: [netbsd-6] src
Module Name:src
Committed By: riz
Date: Thu Jun 28 16:06:37 UTC 2012
Modified Files:
src/share/man/man4 [netbsd-6]: wm.4
src/sys/dev/pci [netbsd-6]: if_wm.c if_wmreg.h if_wmvar.h pcidevs
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #362):
sys/dev/pci/if_wm.c 1.228
sys/dev/pci/if_wmreg.h 1.47
sys/dev/pci/if_wmvar.h 1.13
sys/dev/pci/pcidevs 1.1117
sys/dev/pci/pcidevs.h regen
sys/dev/pci/pcidevs_data.h regen
share/man/man4/wm.4 1.22-1.25
Add support for Intel I350 Ethernet.
Update document.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.21.6.1 src/share/man/man4/wm.4
cvs rdiff -u -r1.227 -r1.227.2.1 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.46 -r1.46.2.1 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.12 -r1.12.10.1 src/sys/dev/pci/if_wmvar.h
cvs rdiff -u -r1.1102.2.5 -r1.1102.2.6 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/share/man/man4/wm.4
diff -u src/share/man/man4/wm.4:1.21 src/share/man/man4/wm.4:1.21.6.1
--- src/share/man/man4/wm.4:1.21 Sat Apr 23 16:46:51 2011
+++ src/share/man/man4/wm.4 Thu Jun 28 16:06:36 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: wm.4,v 1.21 2011/04/23 16:46:51 tron Exp $
+.\ $NetBSD: wm.4,v 1.21.6.1 2012/06/28 16:06:36 riz Exp $
.\
.\ Copyright 2002, 2003 Wasabi Systems, Inc.
.\ All rights reserved.
@@ -33,7 +33,7 @@
.\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\ POSSIBILITY OF SUCH DAMAGE.
.\
-.Dd April 23, 2011
+.Dd June 20, 2012
.Dt WM 4
.Os
.Sh NAME
@@ -120,11 +120,27 @@ Intel i82572 1000BASE-T Ethernet
.It
Intel i82573 1000BASE-T Ethernet
.It
+Intel i82575 1000BASE-T Ethernet
+.It
+Intel i82576 Ethernet (Copper, Fiber)
+.It
+Intel i80003 Ethernet (Copper, Fiber)
+.It
Intel i82801H (ICH8 LAN) 1000BASE-T Ethernet
.It
Intel i82801I (ICH9 LAN) 1000BASE-T Ethernet
.It
-Intel i80003 1000BASE-T Ethernet
+Intel i82801J (ICH10 LAN) 1000BASE-T Ethernet
+.It
+Intel 82578 with Intel 5 series chipset (PCH)
+.It
+Intel 82579 with Intel 6 or 7 series chipset (PCH2)
+.It
+Intel 82580 Ethernet (Copper, Fiber)
+.It
+Intel 82583 1000BASE-T Ethernet
+.It
+Intel I350 Ethernet (Copper, Fiber)
.El
.Pp
In addition to Intel's own
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.227 src/sys/dev/pci/if_wm.c:1.227.2.1
--- src/sys/dev/pci/if_wm.c:1.227 Thu Feb 2 19:43:05 2012
+++ src/sys/dev/pci/if_wm.c Thu Jun 28 16:06:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.227 2012/02/02 19:43:05 tls Exp $ */
+/* $NetBSD: if_wm.c,v 1.227.2.1 2012/06/28 16:06:36 riz Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.227 2012/02/02 19:43:05 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.227.2.1 2012/06/28 16:06:36 riz Exp $);
#include sys/param.h
#include sys/systm.h
@@ -603,6 +603,7 @@ static void wm_enable_phy_wakeup(struct
static void wm_enable_wakeup(struct wm_softc *);
#endif
static void wm_init_manageability(struct wm_softc *);
+static void wm_set_eee_i350(struct wm_softc *);
CFATTACH_DECL3_NEW(wm, sizeof(struct wm_softc),
wm_match, wm_attach, wm_detach, NULL, NULL, NULL, DVF_DETACH_SHUTDOWN);
@@ -1001,6 +1002,20 @@ static const struct wm_product {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_82580_QUAD_FIBER,
82580 quad-1000BaseX Ethernet,
WM_T_82580, WMP_F_1000X },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I350_COPPER,
+ I350 Gigabit Network Connection,
+ WM_T_I350, WMP_F_1000T },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I350_FIBER,
+ I350 Gigabit Fiber Network Connection,
+ WM_T_I350, WMP_F_1000X },
+#if 0
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I350_SERDES,
+ I350 Gigabit Backplane Connection,
+ WM_T_I350, WMP_F_SERDES },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I350_SGMII,
+ I350 Gigabit Connection,
+ WM_T_I350, WMP_F_1000T },
+#endif
{ 0, 0,
NULL,
0, 0 },
@@ -1151,7 +1166,8 @@ wm_attach(device_t parent, device_t self
}
if ((sc-sc_type == WM_T_82575) || (sc-sc_type == WM_T_82576)
- || (sc-sc_type == WM_T_82580) || (sc-sc_type == WM_T_82580ER))
+ || (sc-sc_type == WM_T_82580) || (sc-sc_type == WM_T_82580ER)
+ || (sc-sc_type == WM_T_I350))
sc-sc_flags |= WM_F_NEWQUEUE;
/* Set device properties (mactype) */
@@ -1264,7 +1280,8 @@ wm_attach(device_t parent, device_t self
if ((sc-sc_type == WM_T_82546) || (sc-sc_type == WM_T_82546_3)
|| (sc-sc_type == WM_T_82571) || (sc-sc_type == WM_T_80003)
|| (sc-sc_type == WM_T_82575) || (sc-sc_type == WM_T_82576)
- || (sc-sc_type == WM_T_82580) || (sc-sc_type == WM_T_82580ER))
+ || (sc-sc_type == WM_T_82580) || (sc-sc_type == WM_T_82580ER)
+ ||
CVS commit: [netbsd-6] src/bin/stty
Module Name:src
Committed By: riz
Date: Thu Jun 28 16:12:07 UTC 2012
Modified Files:
src/bin/stty [netbsd-6]: stty.1 stty.c
Log Message:
Pull up following revision(s) (requested by wiz in ticket #364):
bin/stty/stty.1: revision 1.40
bin/stty/stty.1: revision 1.41
bin/stty/stty.c: revision 1.22
- improve wording, and create more consistency within the text;
- correct `SYNOPSIS';
- improve macro usage;
- mention argument name for `-f' (and change list width for it);
- correct misplacement of periods (`.') and a parenthese (`(');
- fix typo;
- bump date.
From Bug Hunting.
- remove trailing white space;
- sync `usage' with man page.
From patch by Bug Hunting.
Remove another Pf. From Bug Hunting.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.39.8.1 src/bin/stty/stty.1
cvs rdiff -u -r1.21 -r1.21.20.1 src/bin/stty/stty.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/stty/stty.1
diff -u src/bin/stty/stty.1:1.39 src/bin/stty/stty.1:1.39.8.1
--- src/bin/stty/stty.1:1.39 Mon Apr 5 16:19:54 2010
+++ src/bin/stty/stty.1 Thu Jun 28 16:12:07 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: stty.1,v 1.39 2010/04/05 16:19:54 joerg Exp $
+.\ $NetBSD: stty.1,v 1.39.8.1 2012/06/28 16:12:07 riz Exp $
.\
.\ Copyright (c) 1990, 1993, 1994
.\ The Regents of the University of California. All rights reserved.
@@ -32,17 +32,17 @@
.\
.\ @(#)stty.1 8.5 (Berkeley) 6/1/94
.\
-.Dd December 14, 2009
+.Dd June 16, 2012
.Dt STTY 1
.Os
.Sh NAME
.Nm stty
-.Nd set the options for a terminal device interface
+.Nd set options for a terminal device interface
.Sh SYNOPSIS
.Nm
.Op Fl a | Fl e | Fl g
.Op Fl f Ar file
-.Op operands
+.Op operand ...
.Sh DESCRIPTION
The
.Nm
@@ -57,7 +57,7 @@ Some combinations of arguments are mutua
exclusive on some terminal types.
.Pp
The following options are available:
-.Bl -tag -width Ds
+.Bl -tag -width XfXfileXX
.It Fl a
Display all the current settings for the terminal to standard output
as per
@@ -66,8 +66,11 @@ as per
Display all the current settings for the terminal to standard output
in the traditional
.Bx
-``all'' and ``everything'' formats.
-.It Fl f
+.Dq all
+and
+.Dq everything
+formats.
+.It Fl f Ar file
Open and use the terminal named by
.Ar file
rather than using standard input.
@@ -91,7 +94,11 @@ characteristics:
.Ss Control Modes
Control mode flags affect hardware characteristics associated with the
terminal.
-This corresponds to the c_cflag in the termios structure.
+This corresponds to the
+.Fa c_cflag
+of the
+.Xr termios 4
+structure.
.Bl -tag -width Fl
.It Cm parenb Pq Fl parenb
Enable (disable) parity generation
@@ -101,15 +108,17 @@ Select odd (even) parity.
.It Cm cs5 cs6 cs7 cs8
Select character size, if possible.
.It Ar number
-Set terminal baud rate to the
-number given, if possible.
+Set terminal baud rate to
+.Ar number ,
+if possible.
If the
baud rate is set to zero, modem
control is no longer
asserted.
.It Cm ispeed Ar number
-Set terminal input baud rate to the
-number given, if possible.
+Set terminal input baud rate to
+.Ar number ,
+if possible.
If the
input baud rate is set to zero, the
input baud rate is set to the
@@ -117,7 +126,8 @@ value of the output baud
rate.
.It Cm ospeed Ar number
Set terminal output baud rate to
-the number given, if possible.
+.Ar number ,
+if possible.
If
the output baud rate is set to
zero, modem control is
@@ -148,7 +158,11 @@ Enable RTS/CTS flow control.
Enable DTR/CTS flow control (if supported).
.El
.Ss Input Modes
-This corresponds to the c_iflag in the termios structure.
+This corresponds to the
+.Fa c_iflag
+of the
+.Xr termios 4
+structure.
.Bl -tag -width Fl
.It Cm ignbrk Pq Fl ignbrk
Ignore (do not ignore) break on
@@ -226,7 +240,11 @@ is unset and the input queue is full, th
the entire input and output queues to be discarded.
.El
.Ss Output Modes
-This corresponds to the c_oflag of the termios structure.
+This corresponds to the
+.Fa c_oflag
+of the
+.Xr termios 4
+structure.
.Bl -tag -width Fl
.It Cm opost Pq Fl opost
Post-process output (do not
@@ -264,11 +282,15 @@ Later the driver ran on the first
at Evans Hall, UC Berkeley, where the job control details
were greatly modified but the structure definitions and names
remained essentially unchanged.
-The second interpretation of the 'l' in lflag
-is ``line discipline flag'' which corresponds to the
-.Ar c_lflag
+The second interpretation of the
+.Sq l
+in lflag
+is
+.Dq line discipline flag ,
+which corresponds to the
+.Fa c_lflag
of the
-.Ar termios
+.Xr termios 4
structure.
.Bl -tag -width Fl
.It Cm isig Pq Fl isig
@@ -280,7 +302,7 @@ and
.Dv SUSP .
.It Cm icanon Pq Fl icanon
Enable (disable) canonical input
-.Pf ( Dv ERASE
+.Dv ( ERASE
and
.Dv KILL
processing).
@@ -324,8 +346,10 @@ is set, echo control characters as ^X.
Otherwise control characters echo as
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Jun 28 16:13:39 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Tickets 362, 364 To generate a diff of this commit: cvs rdiff -u -r1.1.2.143 -r1.1.2.144 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.143 src/doc/CHANGES-6.0:1.1.2.144 --- src/doc/CHANGES-6.0:1.1.2.143 Thu Jun 28 04:56:00 2012 +++ src/doc/CHANGES-6.0 Thu Jun 28 16:13:39 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.143 2012/06/28 04:56:00 riz Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.144 2012/06/28 16:13:39 riz Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -5919,3 +5919,20 @@ external/lgpl3/gmp/dist/config.guess 1. Fix cross-building on Linux. [christos, ticket #361] +sys/dev/pci/if_wm.c 1.228 via patch +sys/dev/pci/if_wmreg.h 1.47 via patch +sys/dev/pci/if_wmvar.h 1.13 via patch +sys/dev/pci/pcidevs 1.1117 via patch +sys/dev/pci/pcidevs.h regen +sys/dev/pci/pcidevs_data.h regen +share/man/man4/wm.4 1.22-1.25 via patch + + Add support for Intel I350 Ethernet. + [msaitoh, ticket #362] + +bin/stty/stty.1 1.40-1.41 +bin/stty/stty.c 1.22 + + Improve documentation and sync usage. + [wiz, ticket #364] +
CVS commit: src
Module Name:src Committed By: kefren Date: Thu Jun 28 16:34:07 UTC 2012 Modified Files: src/etc/mtree: special src/usr.sbin/postinstall: postinstall Log Message: add ldpd rc.d script here too To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 src/etc/mtree/special cvs rdiff -u -r1.137 -r1.138 src/usr.sbin/postinstall/postinstall 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/special diff -u src/etc/mtree/special:1.141 src/etc/mtree/special:1.142 --- src/etc/mtree/special:1.141 Sat Dec 17 13:37:49 2011 +++ src/etc/mtree/special Thu Jun 28 16:34:07 2012 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.141 2011/12/17 13:37:49 tsutsui Exp $ +# $NetBSD: special,v 1.142 2012/06/28 16:34:07 kefren Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -220,6 +220,7 @@ ./etc/rc.d/isibootd type=file mode=0555 ./etc/rc.d/kdc type=file mode=0555 ./etc/rc.d/ldconfig type=file mode=0555 +./etc/rc.d/ldpd type=file mode=0555 ./etc/rc.d/local type=file mode=0555 ./etc/rc.d/lpd type=file mode=0555 ./etc/rc.d/lvm type=file mode=0555 Index: src/usr.sbin/postinstall/postinstall diff -u src/usr.sbin/postinstall/postinstall:1.137 src/usr.sbin/postinstall/postinstall:1.138 --- src/usr.sbin/postinstall/postinstall:1.137 Fri Jun 1 21:59:06 2012 +++ src/usr.sbin/postinstall/postinstall Thu Jun 28 16:34:06 2012 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: postinstall,v 1.137 2012/06/01 21:59:06 jnemeth Exp $ +# $NetBSD: postinstall,v 1.138 2012/06/28 16:34:06 kefren Exp $ # # Copyright (c) 2002-2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -1183,7 +1183,7 @@ do_rc() identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \ irdaattach iscsi_target isdnd isibootd \ kdc \ - ldconfig local lpd lvm\ + ldconfig ldpd local lpd lvm\ makemandb mdnsd mixerctl mopd motd mountall mountcritlocal \ mountcritremote mountd moused mrouted \ named ndbootd network newsyslog nfsd nfslocking npf \
CVS commit: src/sys/arch/sun3/sun3
Module Name:src Committed By: tsutsui Date: Thu Jun 28 17:53:43 UTC 2012 Modified Files: src/sys/arch/sun3/sun3: fpu_machdep.c Log Message: Fix typo in __KERNEL_RCSID(). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sun3/sun3/fpu_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sun3/sun3/fpu_machdep.c diff -u src/sys/arch/sun3/sun3/fpu_machdep.c:1.1 src/sys/arch/sun3/sun3/fpu_machdep.c:1.2 --- src/sys/arch/sun3/sun3/fpu_machdep.c:1.1 Tue Nov 15 12:23:22 2011 +++ src/sys/arch/sun3/sun3/fpu_machdep.c Thu Jun 28 17:53:42 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu_machdep.c,v 1.1 2011/11/15 12:23:22 tsutsui Exp $ */ +/* $NetBSD: fpu_machdep.c,v 1.2 2012/06/28 17:53:42 tsutsui Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD); +__KERNEL_RCSID(0, $NetBSD: fpu_machdep.c,v 1.2 2012/06/28 17:53:42 tsutsui Exp $); #include opt_fpu_emulate.h
CVS commit: src/sys/arch/amiga/clockport
Module Name:src
Committed By: rkujawa
Date: Thu Jun 28 18:55:04 UTC 2012
Modified Files:
src/sys/arch/amiga/clockport: a1k2cp.c clockport.c clockportvar.h
Log Message:
Obtain sc using device_private(), cosmetic changes.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/clockport/a1k2cp.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/clockport/clockport.c \
src/sys/arch/amiga/clockport/clockportvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/clockport/a1k2cp.c
diff -u src/sys/arch/amiga/clockport/a1k2cp.c:1.1 src/sys/arch/amiga/clockport/a1k2cp.c:1.2
--- src/sys/arch/amiga/clockport/a1k2cp.c:1.1 Tue Apr 17 09:59:03 2012
+++ src/sys/arch/amiga/clockport/a1k2cp.c Thu Jun 28 18:55:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: a1k2cp.c,v 1.1 2012/04/17 09:59:03 rkujawa Exp $ */
+/* $NetBSD: a1k2cp.c,v 1.2 2012/06/28 18:55:03 rkujawa Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -100,7 +100,7 @@ a1k2cp_attach(device_t parent, device_t
a1k2cp_aa.cp_intr_establish = clockport_generic_intr_establish;
#ifdef A1K2CP_DEBUG
- aprint_normal_dev(sc-sc_dev, pa %d va %p,
+ aprint_normal_dev(sc-sc_dev, pa %x va %p\n,
A1K2CP_BASE, (void*) a1k2cp_bst.base);
#endif /* A1K2CP_DEBUG */
Index: src/sys/arch/amiga/clockport/clockport.c
diff -u src/sys/arch/amiga/clockport/clockport.c:1.2 src/sys/arch/amiga/clockport/clockport.c:1.3
--- src/sys/arch/amiga/clockport/clockport.c:1.2 Fri May 18 20:52:02 2012
+++ src/sys/arch/amiga/clockport/clockport.c Thu Jun 28 18:55:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: clockport.c,v 1.2 2012/05/18 20:52:02 rkujawa Exp $ */
+/* $NetBSD: clockport.c,v 1.3 2012/06/28 18:55:03 rkujawa Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@ clockport_attach(device_t parent, device
aprint_normal(\n);
- sc = (struct clockportbus_softc *) self;
+ sc = device_private(self);
sc-cpb_aa = (struct clockportbus_attach_args *) aux;
config_search_ia(clockport_submatch, self, clockport, 0);
Index: src/sys/arch/amiga/clockport/clockportvar.h
diff -u src/sys/arch/amiga/clockport/clockportvar.h:1.2 src/sys/arch/amiga/clockport/clockportvar.h:1.3
--- src/sys/arch/amiga/clockport/clockportvar.h:1.2 Tue May 15 17:35:43 2012
+++ src/sys/arch/amiga/clockport/clockportvar.h Thu Jun 28 18:55:03 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: clockportvar.h,v 1.2 2012/05/15 17:35:43 rkujawa Exp $ */
+/* $NetBSD: clockportvar.h,v 1.3 2012/06/28 18:55:03 rkujawa Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@ struct gencp_softc {
};
struct clockportbus_softc {
+ device_t sc_dev;
struct clockportbus_attach_args *cpb_aa;
};
