CVS commit: src/sys/arch/sparc64/conf
Module Name:src Committed By: mrg Date: Wed Dec 8 08:43:34 UTC 2010 Modified Files: src/sys/arch/sparc64/conf: GENERIC Log Message: add dbcool(4) - there are two of them on the SB2500. fix a spelling error. To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 src/sys/arch/sparc64/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.130 src/sys/arch/sparc64/conf/GENERIC:1.131 --- src/sys/arch/sparc64/conf/GENERIC:1.130 Tue Nov 23 11:14:06 2010 +++ src/sys/arch/sparc64/conf/GENERIC Wed Dec 8 08:43:34 2010 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.130 2010/11/23 11:14:06 hannken Exp $ +# $NetBSD: GENERIC,v 1.131 2010/12/08 08:43:34 mrg Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.130 $ +#ident GENERIC-$Revision: 1.131 $ maxusers 64 @@ -926,7 +926,8 @@ admtemp* at iic? addr? ecadc* at iic? addr? # envctrl/envctrltwo on E250/E450 lmtemp* at iic? addr? -tda* at iic? addr? # fan controll on SB1000/2000 +tda* at iic? addr? # fan control on SB1000/2000 +dbcool* at iic? addr? # SB25000 ### Other pseudo-devices
CVS commit: src/usr.sbin/ldpd
Module Name:src Committed By: wiz Date: Wed Dec 8 09:43:22 UTC 2010 Modified Files: src/usr.sbin/ldpd: ldpd.8 Log Message: Add all options to SYNOPSIS. New sentence, new line. Some rewording. Use more macros. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/ldpd/ldpd.8 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/ldpd/ldpd.8 diff -u src/usr.sbin/ldpd/ldpd.8:1.1 src/usr.sbin/ldpd/ldpd.8:1.2 --- src/usr.sbin/ldpd/ldpd.8:1.1 Wed Dec 8 07:20:14 2010 +++ src/usr.sbin/ldpd/ldpd.8 Wed Dec 8 09:43:22 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: ldpd.8,v 1.1 2010/12/08 07:20:14 kefren Exp $ +.\ $NetBSD: ldpd.8,v 1.2 2010/12/08 09:43:22 wiz Exp $ .\ .\ Copyright (c) 2010 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -25,58 +25,68 @@ .\ POSSIBILITY OF SUCH DAMAGE. .\ .Dd December 7, 2010 -.Dt ldpd 8 +.Dt LDPD 8 .Os .Sh NAME .Nm ldpd .Nd Label Distribution Protocol Daemon .Sh SYNOPSIS .Nm -.Op Fl dDW -.Bk -words +.Op Fl DdfhW .Op Fl p Ar port -.Ek .Sh DESCRIPTION .Nm is a utility used to automatically distribute labels between two MPLS LSRs -almost conforming to RFC3036. Right now is in BETA stage and many features -are not implemented or may not work. As a security measure you SHOULD filter -the LDP well-known ( 646 ) TCP and UDP ports before starting -.Nm -using your favourite packet filter. Also this is the current measure used -to filter neighbours. You should see some logs reported via +almost conforming to RFC3036. +Right now it is in BETA stage and many features +are not implemented or may not work. +As a security measure you SHOULD filter the LDP well-known (646) +TCP and UDP ports using your favourite packet filter before starting +.Nm . +Also this is the current measure used to filter neighbours. +You should see some logs reported via .Xr syslog 3 interface. .Pp -You can increase the log verbosity using -W and -D parameters. -Also you can telnet on control port (default: 2626) and use this interface -in order to get informations about protocol, neighbours etc. but also to -set runtime parameters. The required password is the same as root password. +You can increase the log verbosity using the +.Fl W +and +.Fl D +flags. +Also you can telnet to the control port (default: 2626) and use +this interface in order to get informations about protocol, neighbours +etc. but also to set runtime parameters. +The required password is the same as the root password. .Pp .Nm -computes existing routes and try to match them on MPLS labels announced by -other LDP peers. This means that 'normal' routes will be changed into tagged -routes, and MPLS routing table will be populated. It will also announce -peers about its mappings. -.Nm -will also listen on a route socket and compute the necessary changes in -order to change untagged routes into tagged routes. This means that one may -use his favourite dynamic routing protocol daemon without modifications. +computes existing routes and tries to match them on MPLS labels +announced by other LDP peers. +This means that +.Dq normal +routes will be changed into tagged routes, and MPLS routing table +will be populated. +It will also announce its mappings to its peers. +.Nm +will listen on a route socket and compute the necessary changes in +order to change untagged routes into tagged routes. +This means that one may use one's favourite dynamic routing protocol +daemon without modifications. .Pp The options are as follows: .Bl -tag -width 15n -.It Fl d -Don't use route interception code. .It Fl D Enable debug mode. +.It Fl d +Don't use route interception code. .It Fl f -Run in foreground. Use STDOUT for warning and debug messages. +Run in foreground. +Use STDOUT for warning and debug messages. .It Fl h Outputs supported flags. .It Fl p Ar port Changes the TCP control port (default: 2626). .It Fl W -Enable warning messages output. +Enable output of warning messages. .El .Sh SEE ALSO .Rs @@ -88,7 +98,8 @@ .Sh HISTORY The .Nm -command appeared in NetBSD 6.0 +command appeared in +.Nx 6.0 . .Sh BUGS .Nm -supports only IPv4 +supports only IPv4.
CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: wiz
Date: Wed Dec 8 09:43:28 UTC 2010
Modified Files:
src/usr.sbin/ldpd: main.c
Log Message:
Add all options to usage.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/ldpd/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/usr.sbin/ldpd/main.c
diff -u src/usr.sbin/ldpd/main.c:1.1 src/usr.sbin/ldpd/main.c:1.2
--- src/usr.sbin/ldpd/main.c:1.1 Wed Dec 8 07:20:14 2010
+++ src/usr.sbin/ldpd/main.c Wed Dec 8 09:43:28 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.1 2010/12/08 07:20:14 kefren Exp $ */
+/* $NetBSD: main.c,v 1.2 2010/12/08 09:43:28 wiz Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
void print_usage(char *myself)
{
- printf(\nUsage: %s [-hdDW] [-p PORT]\n\n, myself);
+ printf(\nUsage: %s [-DdfhW] [-p PORT]\n\n, myself);
}
int
@@ -70,12 +70,12 @@
while((ch = getopt(argc, argv, dDfhp:W)) != -1)
switch(ch) {
- case 'd':
- dont_catch = 1;
- break;
case 'D':
debug_f = 1;
break;
+ case 'd':
+ dont_catch = 1;
+ break;
case 'f':
dontfork = 1;
break;
CVS commit: src/sys/arch/hp700/dev
Module Name:src
Committed By: skrll
Date: Wed Dec 8 09:48:28 UTC 2010
Modified Files:
src/sys/arch/hp700/dev: cpu.c
Log Message:
Update hp700_intr_establish call. Missed in previous.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hp700/dev/cpu.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/dev/cpu.c
diff -u src/sys/arch/hp700/dev/cpu.c:1.15 src/sys/arch/hp700/dev/cpu.c:1.16
--- src/sys/arch/hp700/dev/cpu.c:1.15 Sun Jun 6 12:13:35 2010
+++ src/sys/arch/hp700/dev/cpu.c Wed Dec 8 09:48:27 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.15 2010/06/06 12:13:35 skrll Exp $ */
+/* $NetBSD: cpu.c,v 1.16 2010/12/08 09:48:27 skrll Exp $ */
/* $OpenBSD: cpu.c,v 1.28 2004/12/28 05:18:25 mickey Exp $ */
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.15 2010/06/06 12:13:35 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.16 2010/12/08 09:48:27 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -152,9 +152,8 @@
/* sanity against luser amongst config editors */
if (ca-ca_irq == 31) {
- sc-sc_ih = hp700_intr_establish(sc-sc_dev, IPL_CLOCK,
- clock_intr, NULL /*clockframe*/, int_reg_cpu,
- ca-ca_irq);
+ sc-sc_ih = hp700_intr_establish(IPL_CLOCK, clock_intr,
+ NULL /*clockframe*/, int_reg_cpu, ca-ca_irq);
} else {
aprint_error_dev(self, bad irq number %d\n, ca-ca_irq);
}
CVS commit: src/distrib/notes/common
Module Name:src Committed By: ryoon Date: Wed Dec 8 10:22:56 UTC 2010 Modified Files: src/distrib/notes/common: main Log Message: Add myself, Ryo ONODERA. To generate a diff of this commit: cvs rdiff -u -r1.469 -r1.470 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.469 src/distrib/notes/common/main:1.470 --- src/distrib/notes/common/main:1.469 Wed Dec 1 01:57:09 2010 +++ src/distrib/notes/common/main Wed Dec 8 10:22:55 2010 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.469 2010/12/01 01:57:09 mef Exp $ +.\ $NetBSD: main,v 1.470 2010/12/08 10:22:55 ryoon Exp $ .\ .\ Copyright (c) 1999-2008 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1278,6 +1278,7 @@ .It Ta Tatoku Ogaito Ta Mt ta...@netbsd.org .It Ta OKANO Takayoshi Ta Mt k...@netbsd.org .It Ta Masaru Oki Ta Mt o...@netbsd.org +.It Ta Ryo ONODERA Ta Mt ry...@netbsd.org .It Ta Atsushi Onoe Ta Mt o...@netbsd.org .It Ta Greg Oster Ta Mt os...@netbsd.org .It Ta Jonathan Perkin Ta Mt ske...@netbsd.org
CVS commit: src/sbin/resize_ffs
Module Name:src Committed By: riz Date: Wed Dec 8 15:23:53 UTC 2010 Modified Files: src/sbin/resize_ffs: TODO Log Message: Remove accidentally-resurrected TODO item. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sbin/resize_ffs/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/resize_ffs/TODO diff -u src/sbin/resize_ffs/TODO:1.6 src/sbin/resize_ffs/TODO:1.7 --- src/sbin/resize_ffs/TODO:1.6 Wed Dec 8 00:25:54 2010 +++ src/sbin/resize_ffs/TODO Wed Dec 8 15:23:53 2010 @@ -2,6 +2,5 @@ * Add support for swapped byte order * Fix support for disk blocks of size other than 512 bytes -* Add support for plain files (primarily to ease testing) * Extend to support UFS2. Probably growth first, then shrinking separately. * Expand the testing done in src/tests/sbin/resize_ffs
CVS commit: src/sys/dev/raidframe
Module Name:src
Committed By: christos
Date: Wed Dec 8 16:18:06 UTC 2010
Modified Files:
src/sys/dev/raidframe: rf_netbsdkintf.c
Log Message:
PR/44207: Wolfgang.Stukenbrock:
memory-leak in raid-ioctl(RAIDFRAME_GET_COMPONENT_LAB
To generate a diff of this commit:
cvs rdiff -u -r1.276 -r1.277 src/sys/dev/raidframe/rf_netbsdkintf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/raidframe/rf_netbsdkintf.c
diff -u src/sys/dev/raidframe/rf_netbsdkintf.c:1.276 src/sys/dev/raidframe/rf_netbsdkintf.c:1.277
--- src/sys/dev/raidframe/rf_netbsdkintf.c:1.276 Sat Dec 4 05:01:16 2010
+++ src/sys/dev/raidframe/rf_netbsdkintf.c Wed Dec 8 11:18:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_netbsdkintf.c,v 1.276 2010/12/04 10:01:16 mrg Exp $ */
+/* $NetBSD: rf_netbsdkintf.c,v 1.277 2010/12/08 16:18:06 christos Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -139,7 +139,7 @@
***/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.276 2010/12/04 10:01:16 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: rf_netbsdkintf.c,v 1.277 2010/12/08 16:18:06 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -1186,7 +1186,7 @@
* there is no stale data left in the case of a
* reconfiguration
*/
- memset((char *) raidPtr, 0, sizeof(RF_Raid_t));
+ memset(raidPtr, 0, sizeof(*raidPtr));
raidPtr-raidid = unit;
retcode = rf_Configure(raidPtr, k_cfg, NULL);
@@ -1252,11 +1252,11 @@
*/
RF_Malloc(clabel, sizeof(*clabel), (RF_ComponentLabel_t *));
- retcode = copyin( *clabel_ptr, clabel,
- sizeof(RF_ComponentLabel_t));
+ retcode = copyin(*clabel_ptr, clabel, sizeof(*clabel));
if (retcode) {
- return(retcode);
+ RF_Free(clabel, sizeof(*clabel));
+ return retcode;
}
clabel-row = 0; /* Don't allow looking at anything else.*/
@@ -1264,19 +1264,16 @@
column = clabel-column;
if ((column 0) || (column = raidPtr-numCol +
- raidPtr-numSpare)) {
- return(EINVAL);
+ raidPtr-numSpare)) {
+ RF_Free(clabel, sizeof(*clabel));
+ return EINVAL;
}
RF_Free(clabel, sizeof(*clabel));
clabel = raidget_component_label(raidPtr, column);
- if (retcode == 0) {
- retcode = copyout(clabel, *clabel_ptr,
- sizeof(RF_ComponentLabel_t));
- }
- return (retcode);
+ return copyout(clabel, *clabel_ptr, sizeof(**clabel_ptr));
#if 0
case RAIDFRAME_SET_COMPONENT_LABEL:
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: njoly Date: Wed Dec 8 16:38:52 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi Log Message: +ldpd.debug To generate a diff of this commit: cvs rdiff -u -r1.1531 -r1.1532 src/distrib/sets/lists/comp/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/mi diff -u src/distrib/sets/lists/comp/mi:1.1531 src/distrib/sets/lists/comp/mi:1.1532 --- src/distrib/sets/lists/comp/mi:1.1531 Tue Dec 7 21:40:09 2010 +++ src/distrib/sets/lists/comp/mi Wed Dec 8 16:38:52 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1531 2010/12/07 21:40:09 pooka Exp $ +# $NetBSD: mi,v 1.1532 2010/12/08 16:38:52 njoly Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3648,6 +3648,7 @@ ./usr/libdata/debug/usr/sbin/kstash.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/sbin/ktutil.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/sbin/lastlogin.debug comp-sysutil-debug debug +./usr/libdata/debug/usr/sbin/ldpd.debug comp-router-debug debug ./usr/libdata/debug/usr/sbin/link.debug comp-sysutil-debug debug ./usr/libdata/debug/usr/sbin/lmcconfig.debug comp-netutil-debug debug ./usr/libdata/debug/usr/sbin/lockstat.debug comp-sysutil-debug debug
CVS commit: src/games/sail
Module Name:src Committed By: joerg Date: Wed Dec 8 17:06:35 UTC 2010 Modified Files: src/games/sail: array.h Removed Files: src/games/sail: inlinedefs.h Log Message: Use __c99inline from sys/cdefs.h To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/games/sail/array.h cvs rdiff -u -r1.1 -r0 src/games/sail/inlinedefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/sail/array.h diff -u src/games/sail/array.h:1.1 src/games/sail/array.h:1.2 --- src/games/sail/array.h:1.1 Sun Mar 15 03:33:56 2009 +++ src/games/sail/array.h Wed Dec 8 17:06:35 2010 @@ -30,8 +30,6 @@ #ifndef ARRAY_H #define ARRAY_H -#include inlinedefs.h - #define ARRAYS_CHECKED #ifdef ARRAYS_CHECKED @@ -65,7 +63,7 @@ // inlining for base operations #ifndef ARRAYINLINE -#define ARRAYINLINE INLINE +#define ARRAYINLINE __c99inline #endif ARRAYINLINE unsigned
CVS commit: src/games/dab
Module Name:src Committed By: joerg Date: Wed Dec 8 17:08:07 UTC 2010 Modified Files: src/games/dab: gamescreen.h Log Message: Don't use the same name for two parameters. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/games/dab/gamescreen.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/dab/gamescreen.h diff -u src/games/dab/gamescreen.h:1.2 src/games/dab/gamescreen.h:1.3 --- src/games/dab/gamescreen.h:1.2 Mon Apr 28 20:22:54 2008 +++ src/games/dab/gamescreen.h Wed Dec 8 17:08:07 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: gamescreen.h,v 1.2 2008/04/28 20:22:54 martin Exp $ */ +/* $NetBSD: gamescreen.h,v 1.3 2010/12/08 17:08:07 joerg Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -63,9 +63,9 @@ virtual void redraw(void) = 0; // Refresh virtual int getinput(void) = 0; // Get user input virtual void bell(void) = 0; // Beep -virtual void score(size_t p, const PLAYER p) = 0; // Post current score -virtual void games(size_t p, const PLAYER p) = 0; // Post games won -virtual void total(size_t p, const PLAYER p) = 0; // Post total score +virtual void score(size_t l, const PLAYER p) = 0; // Post current score +virtual void games(size_t l, const PLAYER p) = 0; // Post games won +virtual void total(size_t l, const PLAYER p) = 0; // Post total score virtual void ties(const PLAYER p) = 0; // Post tie games };
CVS commit: src/sys/net
Module Name:src
Committed By: pooka
Date: Wed Dec 8 17:10:14 UTC 2010
Modified Files:
src/sys/net: bpf.c
Log Message:
linkset no more
To generate a diff of this commit:
cvs rdiff -u -r1.158 -r1.159 src/sys/net/bpf.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/net/bpf.c
diff -u src/sys/net/bpf.c:1.158 src/sys/net/bpf.c:1.159
--- src/sys/net/bpf.c:1.158 Wed Apr 14 13:31:33 2010
+++ src/sys/net/bpf.c Wed Dec 8 17:10:13 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bpf.c,v 1.158 2010/04/14 13:31:33 pooka Exp $ */
+/* $NetBSD: bpf.c,v 1.159 2010/12/08 17:10:13 pooka Exp $ */
/*
* Copyright (c) 1990, 1991, 1993
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bpf.c,v 1.158 2010/04/14 13:31:33 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: bpf.c,v 1.159 2010/12/08 17:10:13 pooka Exp $);
#if defined(_KERNEL_OPT)
#include opt_bpf.h
@@ -1896,37 +1896,39 @@
return (error);
}
-SYSCTL_SETUP(sysctl_net_bpf_setup, sysctl net.bpf subtree setup)
+static struct sysctllog *bpf_sysctllog;
+static void
+sysctl_net_bpf_setup(void)
{
const struct sysctlnode *node;
- sysctl_createv(clog, 0, NULL, NULL,
+ sysctl_createv(bpf_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_NODE, net, NULL,
NULL, 0, NULL, 0,
CTL_NET, CTL_EOL);
node = NULL;
- sysctl_createv(clog, 0, NULL, node,
+ sysctl_createv(bpf_sysctllog, 0, NULL, node,
CTLFLAG_PERMANENT,
CTLTYPE_NODE, bpf,
SYSCTL_DESCR(BPF options),
NULL, 0, NULL, 0,
CTL_NET, CTL_CREATE, CTL_EOL);
if (node != NULL) {
- sysctl_createv(clog, 0, NULL, NULL,
+ sysctl_createv(bpf_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT|CTLFLAG_READWRITE,
CTLTYPE_INT, maxbufsize,
SYSCTL_DESCR(Maximum size for data capture buffer),
sysctl_net_bpf_maxbufsize, 0, bpf_maxbufsize, 0,
CTL_NET, node-sysctl_num, CTL_CREATE, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
+ sysctl_createv(bpf_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_STRUCT, stats,
SYSCTL_DESCR(BPF stats),
NULL, 0, bpf_gstats, sizeof(bpf_gstats),
CTL_NET, node-sysctl_num, CTL_CREATE, CTL_EOL);
- sysctl_createv(clog, 0, NULL, NULL,
+ sysctl_createv(bpf_sysctllog, 0, NULL, NULL,
CTLFLAG_PERMANENT,
CTLTYPE_STRUCT, peers,
SYSCTL_DESCR(BPF peers),
@@ -1972,6 +1974,7 @@
bpf_ops_handover_enter(bpf_ops_kernel);
atomic_swap_ptr(bpf_ops, bpf_ops_kernel);
bpf_ops_handover_exit();
+ sysctl_net_bpf_setup();
break;
case MODULE_CMD_FINI:
@@ -1996,6 +1999,7 @@
* disable packet capture.
*/
error = EOPNOTSUPP;
+ /* insert sysctl teardown */
break;
default:
CVS commit: src/sys/rump/net
Module Name:src
Committed By: pooka
Date: Wed Dec 8 18:06:43 UTC 2010
Modified Files:
src/sys/rump/net: Makefile.rumpnetcomp
src/sys/rump/net/lib/libnet: Makefile component.c
Added Files:
src/sys/rump/net/lib/libbridge: Makefile component.c shlib_version
Log Message:
Actually, unlike e.g. carp, bridge can be its own component since
it doesn't want to join the protosw party. We can deal with other
linkhappy stuff with weak symbols.
(where is our modular networking stack?)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/net/Makefile.rumpnetcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libbridge/Makefile \
src/sys/rump/net/lib/libbridge/component.c \
src/sys/rump/net/lib/libbridge/shlib_version
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/net/lib/libnet/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/rump/net/lib/libnet/component.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/rump/net/Makefile.rumpnetcomp
diff -u src/sys/rump/net/Makefile.rumpnetcomp:1.2 src/sys/rump/net/Makefile.rumpnetcomp:1.3
--- src/sys/rump/net/Makefile.rumpnetcomp:1.2 Tue Dec 7 17:23:27 2010
+++ src/sys/rump/net/Makefile.rumpnetcomp Wed Dec 8 18:06:43 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.rumpnetcomp,v 1.2 2010/12/07 17:23:27 pooka Exp $
+# $NetBSD: Makefile.rumpnetcomp,v 1.3 2010/12/08 18:06:43 pooka Exp $
#
-RUMPNETCOMP= net net80211 netbt netinet local shmif virtif
+RUMPNETCOMP= bridge net net80211 netbt netinet local shmif virtif
RUMPNETSOCKIN= sockin
Index: src/sys/rump/net/lib/libnet/Makefile
diff -u src/sys/rump/net/lib/libnet/Makefile:1.9 src/sys/rump/net/lib/libnet/Makefile:1.10
--- src/sys/rump/net/lib/libnet/Makefile:1.9 Tue Dec 7 20:39:07 2010
+++ src/sys/rump/net/lib/libnet/Makefile Wed Dec 8 18:06:43 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/12/07 20:39:07 pooka Exp $
+# $NetBSD: Makefile,v 1.10 2010/12/08 18:06:43 pooka Exp $
#
.PATH: ${.CURDIR}/../../../../net ${.CURDIR}/../../../../compat/common
@@ -6,9 +6,8 @@
LIB= rumpnet_net
# iffy stuff
-SRCS= if.c if_bridge.c if_loop.c route.c rtsock.c raw_usrreq.c \
+SRCS= if.c if_loop.c route.c rtsock.c raw_usrreq.c \
raw_cb.c if_media.c link_proto.c net_stats.c if_ethersubr.c
-SRCS+= bridgestp.c
SRCS+= if_43.c uipc_syscalls_50.c
SRCS+= component.c
Index: src/sys/rump/net/lib/libnet/component.c
diff -u src/sys/rump/net/lib/libnet/component.c:1.6 src/sys/rump/net/lib/libnet/component.c:1.7
--- src/sys/rump/net/lib/libnet/component.c:1.6 Tue Dec 7 20:39:07 2010
+++ src/sys/rump/net/lib/libnet/component.c Wed Dec 8 18:06:43 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: component.c,v 1.6 2010/12/07 20:39:07 pooka Exp $ */
+/* $NetBSD: component.c,v 1.7 2010/12/08 18:06:43 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: component.c,v 1.6 2010/12/07 20:39:07 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: component.c,v 1.7 2010/12/08 18:06:43 pooka Exp $);
#include sys/param.h
#include sys/domain.h
@@ -49,7 +49,6 @@
ifinit1();
ifinit();
loopattach(1);
- bridgeattach(1);
DOMAINADD(linkdomain);
DOMAINADD(routedomain);
}
Added files:
Index: src/sys/rump/net/lib/libbridge/Makefile
diff -u /dev/null src/sys/rump/net/lib/libbridge/Makefile:1.1
--- /dev/null Wed Dec 8 18:06:43 2010
+++ src/sys/rump/net/lib/libbridge/Makefile Wed Dec 8 18:06:43 2010
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2010/12/08 18:06:43 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../net
+
+LIB= rumpnet_bridge
+
+SRCS= if_bridge.c bridgestp.c
+
+SRCS+= component.c
+
+CPPFLAGS+= -I${.CURDIR}/../libnet/opt
+
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/net/lib/libbridge/component.c
diff -u /dev/null src/sys/rump/net/lib/libbridge/component.c:1.1
--- /dev/null Wed Dec 8 18:06:43 2010
+++ src/sys/rump/net/lib/libbridge/component.c Wed Dec 8 18:06:43 2010
@@ -0,0 +1,42 @@
+/* $NetBSD: component.c,v 1.1 2010/12/08 18:06:43 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR
CVS commit: src/sys/rump/librump/rumpnet
Module Name:src
Committed By: pooka
Date: Wed Dec 8 18:06:59 UTC 2010
Modified Files:
src/sys/rump/librump/rumpnet: net_stub.c
Log Message:
add weak stubs for bridge (not the game)
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpnet/net_stub.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/rump/librump/rumpnet/net_stub.c
diff -u src/sys/rump/librump/rumpnet/net_stub.c:1.9 src/sys/rump/librump/rumpnet/net_stub.c:1.10
--- src/sys/rump/librump/rumpnet/net_stub.c:1.9 Wed Dec 8 01:22:55 2010
+++ src/sys/rump/librump/rumpnet/net_stub.c Wed Dec 8 18:06:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: net_stub.c,v 1.9 2010/12/08 01:22:55 joerg Exp $ */
+/* $NetBSD: net_stub.c,v 1.10 2010/12/08 18:06:58 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: net_stub.c,v 1.9 2010/12/08 01:22:55 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: net_stub.c,v 1.10 2010/12/08 18:06:58 pooka Exp $);
#include sys/param.h
#include sys/protosw.h
@@ -43,7 +43,7 @@
__rumpnet_stub(void)
{
- panic(rumpnet stubs only, linking against librumpnet_net required);
+ panic(component not available);
}
__weak_alias(rtioctl,__rumpnet_stub);
__weak_alias(rt_walktree,__rumpnet_stub);
@@ -55,6 +55,16 @@
__weak_alias(route_enqueue,__rumpnet_stub);
__weak_alias(route_cb,__rumpnet_stub);
+/*
+ * Weak symbols so that we can optionally leave components out.
+ * (would be better to fix sys/net* to be more modular, though)
+ */
+
+/* bridge */
+__weak_alias(bridge_ifdetach,__rumpnet_stub);
+__weak_alias(bridge_output,__rumpnet_stub);
+__weak_alias(bridge_input,__rumpnet_stub);
+
struct ifnet_head ifnet;
u_long
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pooka Date: Wed Dec 8 18:16:17 UTC 2010 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi Log Message: +rumpnet_bridge To generate a diff of this commit: cvs rdiff -u -r1.562 -r1.563 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1532 -r1.1533 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.144 -r1.145 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/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.562 src/distrib/sets/lists/base/shl.mi:1.563 --- src/distrib/sets/lists/base/shl.mi:1.562 Tue Dec 7 21:40:08 2010 +++ src/distrib/sets/lists/base/shl.mi Wed Dec 8 18:16:16 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.562 2010/12/07 21:40:08 pooka Exp $ +# $NetBSD: shl.mi,v 1.563 2010/12/08 18:16:16 pooka Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -546,6 +546,9 @@ ./usr/lib/librumpnet.sobase-rump-shlib ./usr/lib/librumpnet.so.0 base-rump-shlib ./usr/lib/librumpnet.so.0.0 base-rump-shlib +./usr/lib/librumpnet_bridge.so base-rump-shlib +./usr/lib/librumpnet_bridge.so.0 base-rump-shlib +./usr/lib/librumpnet_bridge.so.0.0 base-rump-shlib ./usr/lib/librumpnet_local.so base-rump-shlib ./usr/lib/librumpnet_local.so.0 base-rump-shlib ./usr/lib/librumpnet_local.so.0.0 base-rump-shlib Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1532 src/distrib/sets/lists/comp/mi:1.1533 --- src/distrib/sets/lists/comp/mi:1.1532 Wed Dec 8 16:38:52 2010 +++ src/distrib/sets/lists/comp/mi Wed Dec 8 18:16:16 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1532 2010/12/08 16:38:52 njoly Exp $ +# $NetBSD: mi,v 1.1533 2010/12/08 18:16:16 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2792,6 +2792,9 @@ ./usr/lib/librumpkern_z_p.a comp-c-proflib profile ./usr/lib/librumpnet.acomp-c-lib ./usr/lib/librumpnet_g.a -unknown- debuglib +./usr/lib/librumpnet_bridge.a comp-c-lib +./usr/lib/librumpnet_bridge_g.a -unknown- debuglib +./usr/lib/librumpnet_bridge_p.a comp-c-proflib profile ./usr/lib/librumpnet_local.a comp-c-lib ./usr/lib/librumpnet_local_g.a -unknown- debuglib ./usr/lib/librumpnet_local_p.a comp-c-proflib profile Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.144 src/distrib/sets/lists/comp/shl.mi:1.145 --- src/distrib/sets/lists/comp/shl.mi:1.144 Tue Dec 7 21:40:09 2010 +++ src/distrib/sets/lists/comp/shl.mi Wed Dec 8 18:16:17 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.144 2010/12/07 21:40:09 pooka Exp $ +# $NetBSD: shl.mi,v 1.145 2010/12/08 18:16:17 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -150,6 +150,7 @@ ./usr/lib/librumpkern_ksem_pic.a comp-c-piclib ./usr/lib/librumpkern_tty_pic.a comp-c-piclib ./usr/lib/librumpkern_z_pic.a comp-c-piclib +./usr/lib/librumpnet_bridge_pic.a comp-c-piclib ./usr/lib/librumpnet_local_pic.a comp-c-piclib ./usr/lib/librumpnet_net80211_pic.a comp-c-piclib ./usr/lib/librumpnet_net_pic.a comp-c-piclib @@ -336,6 +337,7 @@ ./usr/libdata/debug/usr/lib/librumpkern_tty.so.0.0.debug comp-rump-debug debug ./usr/libdata/debug/usr/lib/librumpkern_z.so.0.0.debug comp-rump-debug debug ./usr/libdata/debug/usr/lib/librumpnet.so.0.0.debug comp-rump-debug debug +./usr/libdata/debug/usr/lib/librumpnet_bridge.so.0.0.debug comp-rump-debug debug ./usr/libdata/debug/usr/lib/librumpnet_local.so.0.0.debug comp-rump-debug debug ./usr/libdata/debug/usr/lib/librumpnet_net.so.0.0.debug comp-rump-debug debug ./usr/libdata/debug/usr/lib/librumpnet_net80211.so.0.0.debug comp-rump-debug debug
CVS commit: src/sys/rump/net
Module Name:src
Committed By: pooka
Date: Wed Dec 8 20:20:17 UTC 2010
Modified Files:
src/sys/rump/net: Makefile.rumpnetcomp
src/sys/rump/net/lib/libnet/opt: agr.h
Added Files:
src/sys/rump/net/lib/libagr: Makefile component.c shlib_version
Log Message:
agr(4) support
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/net/Makefile.rumpnetcomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/net/lib/libagr/Makefile \
src/sys/rump/net/lib/libagr/component.c \
src/sys/rump/net/lib/libagr/shlib_version
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/net/lib/libnet/opt/agr.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/rump/net/Makefile.rumpnetcomp
diff -u src/sys/rump/net/Makefile.rumpnetcomp:1.3 src/sys/rump/net/Makefile.rumpnetcomp:1.4
--- src/sys/rump/net/Makefile.rumpnetcomp:1.3 Wed Dec 8 18:06:43 2010
+++ src/sys/rump/net/Makefile.rumpnetcomp Wed Dec 8 20:20:16 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.rumpnetcomp,v 1.3 2010/12/08 18:06:43 pooka Exp $
+# $NetBSD: Makefile.rumpnetcomp,v 1.4 2010/12/08 20:20:16 pooka Exp $
#
-RUMPNETCOMP= bridge net net80211 netbt netinet local shmif virtif
+RUMPNETCOMP= agr bridge net net80211 netbt netinet local shmif virtif
RUMPNETSOCKIN= sockin
Index: src/sys/rump/net/lib/libnet/opt/agr.h
diff -u src/sys/rump/net/lib/libnet/opt/agr.h:1.1 src/sys/rump/net/lib/libnet/opt/agr.h:1.2
--- src/sys/rump/net/lib/libnet/opt/agr.h:1.1 Mon Oct 6 00:27:06 2008
+++ src/sys/rump/net/lib/libnet/opt/agr.h Wed Dec 8 20:20:17 2010
@@ -1,3 +1,3 @@
-/* $NetBSD: agr.h,v 1.1 2008/10/06 00:27:06 pooka Exp $ */
+/* $NetBSD: agr.h,v 1.2 2010/12/08 20:20:17 pooka Exp $ */
-/* dummy */
+#define NAGR 1
Added files:
Index: src/sys/rump/net/lib/libagr/Makefile
diff -u /dev/null src/sys/rump/net/lib/libagr/Makefile:1.1
--- /dev/null Wed Dec 8 20:20:17 2010
+++ src/sys/rump/net/lib/libagr/Makefile Wed Dec 8 20:20:17 2010
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2010/12/08 20:20:17 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../net/agr
+
+LIB= rumpnet_agr
+
+SRCS= if_agr.c if_agrsoftc.c if_agrsubr.c if_agrtimer.c if_agrmonitor.c \
+ if_agrether.c if_agrether_hash.c ieee8023ad_marker.c ieee8023ad_lacp.c \
+ ieee8023ad_lacp_select.c ieee8023ad_lacp_timer.c \
+ ieee8023ad_lacp_sm_rx.c ieee8023ad_lacp_sm_mux.c \
+ ieee8023ad_lacp_sm_ptx.c ieee8023ad_lacp_sm_tx.c \
+ ieee8023ad_lacp_debug.c ieee8023_tlv.c
+
+SRCS+= component.c
+
+.include bsd.lib.mk
+.include bsd.klinks.mk
Index: src/sys/rump/net/lib/libagr/component.c
diff -u /dev/null src/sys/rump/net/lib/libagr/component.c:1.1
--- /dev/null Wed Dec 8 20:20:17 2010
+++ src/sys/rump/net/lib/libagr/component.c Wed Dec 8 20:20:17 2010
@@ -0,0 +1,42 @@
+/* $NetBSD: component.c,v 1.1 2010/12/08 20:20:17 pooka Exp $ */
+
+/*
+ * Copyright (c) 2009 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: component.c,v 1.1 2010/12/08 20:20:17 pooka Exp $);
+
+#include sys/param.h
+
+#include rump_private.h
+#include rump_net_private.h
+
+int agrattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_NET_IF)
+{
+
+ agrattach(0);
+}
Index: src/sys/rump/net/lib/libagr/shlib_version
diff -u /dev/null src/sys/rump/net/lib/libagr/shlib_version:1.1
--- /dev/null Wed Dec 8 20:20:17 2010
+++ src/sys/rump/net/lib/libagr/shlib_version Wed Dec 8 20:20:17 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/12/08 20:20:17 pooka Exp $
+#
+major=0
+minor=0
CVS commit: src/sys/rump/librump/rumpnet
Module Name:src Committed By: pooka Date: Wed Dec 8 20:20:52 UTC 2010 Modified Files: src/sys/rump/librump/rumpnet: net_stub.c Log Message: weak stubs for agr(4) To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/rump/librump/rumpnet/net_stub.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/rump/librump/rumpnet/net_stub.c diff -u src/sys/rump/librump/rumpnet/net_stub.c:1.10 src/sys/rump/librump/rumpnet/net_stub.c:1.11 --- src/sys/rump/librump/rumpnet/net_stub.c:1.10 Wed Dec 8 18:06:58 2010 +++ src/sys/rump/librump/rumpnet/net_stub.c Wed Dec 8 20:20:52 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: net_stub.c,v 1.10 2010/12/08 18:06:58 pooka Exp $ */ +/* $NetBSD: net_stub.c,v 1.11 2010/12/08 20:20:52 pooka Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: net_stub.c,v 1.10 2010/12/08 18:06:58 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: net_stub.c,v 1.11 2010/12/08 20:20:52 pooka Exp $); #include sys/param.h #include sys/protosw.h @@ -65,6 +65,11 @@ __weak_alias(bridge_output,__rumpnet_stub); __weak_alias(bridge_input,__rumpnet_stub); +/* agr */ +__weak_alias(agr_input,__rumpnet_stub); +__weak_alias(ieee8023ad_lacp_input,__rumpnet_stub); +__weak_alias(ieee8023ad_marker_input,__rumpnet_stub); + struct ifnet_head ifnet; u_long
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pooka Date: Wed Dec 8 20:23:13 UTC 2010 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: mi shl.mi Log Message: +rumpnet_agr To generate a diff of this commit: cvs rdiff -u -r1.563 -r1.564 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.1533 -r1.1534 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.145 -r1.146 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/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.563 src/distrib/sets/lists/base/shl.mi:1.564 --- src/distrib/sets/lists/base/shl.mi:1.563 Wed Dec 8 18:16:16 2010 +++ src/distrib/sets/lists/base/shl.mi Wed Dec 8 20:23:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.563 2010/12/08 18:16:16 pooka Exp $ +# $NetBSD: shl.mi,v 1.564 2010/12/08 20:23:12 pooka Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -546,6 +546,9 @@ ./usr/lib/librumpnet.sobase-rump-shlib ./usr/lib/librumpnet.so.0 base-rump-shlib ./usr/lib/librumpnet.so.0.0 base-rump-shlib +./usr/lib/librumpnet_agr.so base-rump-shlib +./usr/lib/librumpnet_agr.so.0 base-rump-shlib +./usr/lib/librumpnet_agr.so.0.0 base-rump-shlib ./usr/lib/librumpnet_bridge.so base-rump-shlib ./usr/lib/librumpnet_bridge.so.0 base-rump-shlib ./usr/lib/librumpnet_bridge.so.0.0 base-rump-shlib Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1533 src/distrib/sets/lists/comp/mi:1.1534 --- src/distrib/sets/lists/comp/mi:1.1533 Wed Dec 8 18:16:16 2010 +++ src/distrib/sets/lists/comp/mi Wed Dec 8 20:23:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1533 2010/12/08 18:16:16 pooka Exp $ +# $NetBSD: mi,v 1.1534 2010/12/08 20:23:12 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2792,6 +2792,9 @@ ./usr/lib/librumpkern_z_p.a comp-c-proflib profile ./usr/lib/librumpnet.acomp-c-lib ./usr/lib/librumpnet_g.a -unknown- debuglib +./usr/lib/librumpnet_agr.a comp-c-lib +./usr/lib/librumpnet_agr_g.a -unknown- debuglib +./usr/lib/librumpnet_agr_p.a comp-c-proflib profile ./usr/lib/librumpnet_bridge.a comp-c-lib ./usr/lib/librumpnet_bridge_g.a -unknown- debuglib ./usr/lib/librumpnet_bridge_p.a comp-c-proflib profile Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.145 src/distrib/sets/lists/comp/shl.mi:1.146 --- src/distrib/sets/lists/comp/shl.mi:1.145 Wed Dec 8 18:16:17 2010 +++ src/distrib/sets/lists/comp/shl.mi Wed Dec 8 20:23:12 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.145 2010/12/08 18:16:17 pooka Exp $ +# $NetBSD: shl.mi,v 1.146 2010/12/08 20:23:12 pooka Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -150,6 +150,7 @@ ./usr/lib/librumpkern_ksem_pic.a comp-c-piclib ./usr/lib/librumpkern_tty_pic.a comp-c-piclib ./usr/lib/librumpkern_z_pic.a comp-c-piclib +./usr/lib/librumpnet_agr_pic.a comp-c-piclib ./usr/lib/librumpnet_bridge_pic.a comp-c-piclib ./usr/lib/librumpnet_local_pic.a comp-c-piclib ./usr/lib/librumpnet_net80211_pic.a comp-c-piclib @@ -337,6 +338,7 @@ ./usr/libdata/debug/usr/lib/librumpkern_tty.so.0.0.debug comp-rump-debug debug ./usr/libdata/debug/usr/lib/librumpkern_z.so.0.0.debug comp-rump-debug debug ./usr/libdata/debug/usr/lib/librumpnet.so.0.0.debug comp-rump-debug debug +./usr/libdata/debug/usr/lib/librumpnet_agr.so.0.0.debug comp-rump-debug debug ./usr/libdata/debug/usr/lib/librumpnet_bridge.so.0.0.debug comp-rump-debug debug ./usr/libdata/debug/usr/lib/librumpnet_local.so.0.0.debug comp-rump-debug debug ./usr/libdata/debug/usr/lib/librumpnet_net.so.0.0.debug comp-rump-debug debug
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: phx
Date: Wed Dec 8 20:59:58 UTC 2010
Modified Files:
src/sys/dev/usb: usb_quirks.c usbdevs
Log Message:
Apple product 0x1000 is a Bluetooth HCI in HID-proxy mode, which was the
reason it appears as keyboard- and mouse-HID. Do not ignore it.
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/dev/usb/usb_quirks.c
cvs rdiff -u -r1.569 -r1.570 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/usb_quirks.c
diff -u src/sys/dev/usb/usb_quirks.c:1.70 src/sys/dev/usb/usb_quirks.c:1.71
--- src/sys/dev/usb/usb_quirks.c:1.70 Tue Nov 30 11:35:30 2010
+++ src/sys/dev/usb/usb_quirks.c Wed Dec 8 20:59:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_quirks.c,v 1.70 2010/11/30 11:35:30 phx Exp $ */
+/* $NetBSD: usb_quirks.c,v 1.71 2010/12/08 20:59:58 phx Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_quirks.c,v 1.30 2003/01/02 04:15:55 imp Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_quirks.c,v 1.70 2010/11/30 11:35:30 phx Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_quirks.c,v 1.71 2010/12/08 20:59:58 phx Exp $);
#include sys/param.h
#include sys/systm.h
@@ -56,7 +56,6 @@
} usb_quirks[] = {
/* Devices which should be ignored by uhid */
{ USB_VENDOR_APC, USB_PRODUCT_APC_UPS, ANY, { UQ_HID_IGNORE }},
- { USB_VENDOR_APPLE, USB_PRODUCT_APPLE_ADB, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_CYBERPOWER, USB_PRODUCT_CYBERPOWER_UPS, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS1, ANY, { UQ_HID_IGNORE }},
{ USB_VENDOR_MGE, USB_PRODUCT_MGE_UPS2, ANY, { UQ_HID_IGNORE }},
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.569 src/sys/dev/usb/usbdevs:1.570
--- src/sys/dev/usb/usbdevs:1.569 Tue Nov 30 11:25:25 2010
+++ src/sys/dev/usb/usbdevs Wed Dec 8 20:59:58 2010
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.569 2010/11/30 11:25:25 phx Exp $
+$NetBSD: usbdevs,v 1.570 2010/12/08 20:59:58 phx Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -777,7 +777,7 @@
product APPLE FOUNTAIN_TP 0x030a Apple Internal Trackpad (Fountain)
product APPLE GEYSER1_TP 0x030b Apple Internal Trackpad (Geyser)
product APPLE MAGICMOUSE 0x030d Magic Mouse
-product APPLE ADB 0x1000 Internal ADB device
+product APPLE BLUETOOTH_HIDMODE 0x1000 Bluetooth HCI (HID-proxy mode)
product APPLE EXT_KBD_HUB 0x1003 Hub in Apple Extended USB Keyboard
product APPLE SPEAKERS 0x1101 Speakers
product APPLE IPHONE 0x1290 iPhone
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: phx
Date: Wed Dec 8 21:02:12 UTC 2010
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.562 -r1.563 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.563 -r1.564 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.562 src/sys/dev/usb/usbdevs.h:1.563
--- src/sys/dev/usb/usbdevs.h:1.562 Tue Nov 30 11:28:44 2010
+++ src/sys/dev/usb/usbdevs.h Wed Dec 8 21:02:12 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.562 2010/11/30 11:28:44 phx Exp $ */
+/* $NetBSD: usbdevs.h,v 1.563 2010/12/08 21:02:12 phx Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.569 2010/11/30 11:25:25 phx Exp
+ * NetBSD: usbdevs,v 1.570 2010/12/08 20:59:58 phx Exp
*/
/*
@@ -784,7 +784,7 @@
#define USB_PRODUCT_APPLE_FOUNTAIN_TP 0x030a /* Apple Internal Trackpad (Fountain) */
#define USB_PRODUCT_APPLE_GEYSER1_TP 0x030b /* Apple Internal Trackpad (Geyser) */
#define USB_PRODUCT_APPLE_MAGICMOUSE 0x030d /* Magic Mouse */
-#define USB_PRODUCT_APPLE_ADB 0x1000 /* Internal ADB device */
+#define USB_PRODUCT_APPLE_BLUETOOTH_HIDMODE 0x1000 /* Bluetooth HCI (HID-proxy mode) */
#define USB_PRODUCT_APPLE_EXT_KBD_HUB 0x1003 /* Hub in Apple Extended USB Keyboard */
#define USB_PRODUCT_APPLE_SPEAKERS 0x1101 /* Speakers */
#define USB_PRODUCT_APPLE_IPHONE 0x1290 /* iPhone */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.563 src/sys/dev/usb/usbdevs_data.h:1.564
--- src/sys/dev/usb/usbdevs_data.h:1.563 Tue Nov 30 11:28:44 2010
+++ src/sys/dev/usb/usbdevs_data.h Wed Dec 8 21:02:12 2010
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.563 2010/11/30 11:28:44 phx Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.564 2010/12/08 21:02:12 phx Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.569 2010/11/30 11:25:25 phx Exp
+ * NetBSD: usbdevs,v 1.570 2010/12/08 20:59:58 phx Exp
*/
/*
@@ -2615,8 +2615,8 @@
Magic Mouse,
},
{
- USB_VENDOR_APPLE, USB_PRODUCT_APPLE_ADB,
- Internal ADB device,
+ USB_VENDOR_APPLE, USB_PRODUCT_APPLE_BLUETOOTH_HIDMODE,
+ Bluetooth HCI (HID-proxy mode),
},
{
USB_VENDOR_APPLE, USB_PRODUCT_APPLE_EXT_KBD_HUB,
CVS commit: src/sys/arch/i386/stand/mbr
Module Name:src Committed By: jakllsch Date: Wed Dec 8 21:56:42 UTC 2010 Modified Files: src/sys/arch/i386/stand/mbr: mbr.S Log Message: Remove now-incorrect detail about the link address from comment. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/i386/stand/mbr/mbr.S 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/mbr/mbr.S diff -u src/sys/arch/i386/stand/mbr/mbr.S:1.22 src/sys/arch/i386/stand/mbr/mbr.S:1.23 --- src/sys/arch/i386/stand/mbr/mbr.S:1.22 Thu Nov 19 22:10:03 2009 +++ src/sys/arch/i386/stand/mbr/mbr.S Wed Dec 8 21:56:42 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: mbr.S,v 1.22 2009/11/19 22:10:03 dsl Exp $ */ +/* $NetBSD: mbr.S,v 1.23 2010/12/08 21:56:42 jakllsch Exp $ */ /* * Copyright (c) 1999-2004 The NetBSD Foundation, Inc. @@ -121,7 +121,7 @@ .code16 /* * Move ourselves out of the way first. - * (to the address we are linked at - 0x600) + * (to the address we are linked at) * and zero our bss */ ENTRY(start)
CVS commit: src
Module Name:src
Committed By: njoly
Date: Wed Dec 8 23:56:02 UTC 2010
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: mi
src/etc: Makefile
src/etc/mtree: Makefile NetBSD.dist.base
src/tests: Makefile
Added Files:
src/etc/mtree: NetBSD.dist.tests
Log Message:
Make tests set generation optional, skipped for MKATF=no build.
To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 src/distrib/sets/sets.subr
cvs rdiff -u -r1.897 -r1.898 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.382 -r1.383 src/etc/Makefile
cvs rdiff -u -r1.17 -r1.18 src/etc/mtree/Makefile
cvs rdiff -u -r1.66 -r1.67 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r0 -r1.1 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.24 -r1.25 src/tests/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/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.124 src/distrib/sets/sets.subr:1.125
--- src/distrib/sets/sets.subr:1.124 Sat Jun 19 03:50:30 2010
+++ src/distrib/sets/sets.subr Wed Dec 8 23:56:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.124 2010/06/19 03:50:30 mrg Exp $
+# $NetBSD: sets.subr,v 1.125 2010/12/08 23:56:01 njoly Exp $
#
#
@@ -131,10 +131,17 @@
setsdir=${rundir}
obsolete=0
-module=yes
if [ ${MKKMOD} = no ]; then
module=no # MODULEs are off.
- kmod=no
+ modset=
+else
+ module=yes
+ modset=modules
+fi
+if [ ${MKATF} = no ]; then
+ testset=
+else
+ testset=tests
fi
# Determine lib type. Do this first so stlib also gets set.
if [ ${OBJECT_FMT} = ELF ]; then
@@ -147,11 +154,7 @@
if [ ${MKPIC} = no ]; then
shlib=no
fi
-if [ $module != no ]; then
- nlists=base comp etc games man misc modules tests text
-else
- nlists=base comp etc games man misc tests text
-fi
+nlists=base comp etc games man misc $modset $testset text
xlists=xbase xcomp xetc xfont xserver
extlists=extbase extcomp extetc
@@ -168,7 +171,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.124 2010/06/19 03:50:30 mrg Exp $
+# # $NetBSD: sets.subr,v 1.125 2010/12/08 23:56:01 njoly Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -188,6 +191,7 @@
# obsolete file is obsolete, and only printed if
#${obsolete} != 0
#
+# atf ${MKATF} != no
# bfd obsolete, use binutils.
# binutils ${MKBINUTILS} != no
# catpages ${MKCATPAGES} != no
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.897 src/distrib/sets/lists/base/mi:1.898
--- src/distrib/sets/lists/base/mi:1.897 Wed Dec 8 07:20:59 2010
+++ src/distrib/sets/lists/base/mi Wed Dec 8 23:56:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.897 2010/12/08 07:20:59 kefren Exp $
+# $NetBSD: mi,v 1.898 2010/12/08 23:56:01 njoly Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -4805,7 +4805,7 @@
./var/db/obsolete/gamesbase-sys-root
./var/db/obsolete/manbase-sys-root
./var/db/obsolete/miscbase-sys-root
-./var/db/obsolete/testsbase-sys-root
+./var/db/obsolete/testsbase-sys-root atf
./var/db/obsolete/textbase-sys-root
./var/db/postfixbase-postfix-root
./var/db/xdm base-sys-root
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.382 src/etc/Makefile:1.383
--- src/etc/Makefile:1.382 Mon Oct 4 13:55:39 2010
+++ src/etc/Makefile Wed Dec 8 23:56:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.382 2010/10/04 13:55:39 tsutsui Exp $
+# $NetBSD: Makefile,v 1.383 2010/12/08 23:56:01 njoly Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -364,10 +364,13 @@
# Install var/db/obsolete set lists; this is performed by make build
#
OBSOLETE.dir= ${.OBJDIR}/obsolete.dir
-OBSOLETE.files= base comp etc games man misc tests text
+OBSOLETE.files= base comp etc games man misc text
.if ${MKKMOD} != no
OBSOLETE.files+= modules
.endif
+.if ${MKATF} != no
+OBSOLETE.files+= tests
+.endif
.if ${MKX11} != no
OBSOLETE.files+= xbase xcomp xetc xfont xserver
.endif
Index: src/etc/mtree/Makefile
diff -u src/etc/mtree/Makefile:1.17 src/etc/mtree/Makefile:1.18
--- src/etc/mtree/Makefile:1.17 Tue Apr 27 03:01:25 2010
+++ src/etc/mtree/Makefile Wed Dec 8 23:56:02 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/04/27 03:01:25 dyoung Exp $
+# $NetBSD: Makefile,v 1.18 2010/12/08 23:56:02 njoly Exp $
.include bsd.own.mk
@@ -14,6 +14,10 @@
EXTRA_DIST_FILES+= ${.CURDIR}/NetBSD.dist.${MACHINE_ARCH}
.endif
+.if ${MKATF} != no
+EXTRA_DIST_FILES+= ${.CURDIR}/NetBSD.dist.tests
+.endif
+
.if ${MKEXTSRC} != no
EXTRA_DIST_FILES+= ${.CURDIR}/NetBSD.dist.extsrc
.endif
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.66 src/etc/mtree/NetBSD.dist.base:1.67
---
CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: christos
Date: Thu Dec 9 00:11:00 UTC 2010
Modified Files:
src/usr.sbin/ldpd: fsm.c label.c ldp_peer.c mpls_interface.c
mpls_routes.c notifications.c socketops.c tlv_stack.c
Log Message:
- no cast for malloc
- malloc + memset = calloc
- sizeof(type) - sizeof(*var)
- small indents
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/ldpd/fsm.c src/usr.sbin/ldpd/label.c \
src/usr.sbin/ldpd/ldp_peer.c src/usr.sbin/ldpd/mpls_interface.c \
src/usr.sbin/ldpd/mpls_routes.c src/usr.sbin/ldpd/notifications.c \
src/usr.sbin/ldpd/socketops.c src/usr.sbin/ldpd/tlv_stack.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/ldpd/fsm.c
diff -u src/usr.sbin/ldpd/fsm.c:1.1 src/usr.sbin/ldpd/fsm.c:1.2
--- src/usr.sbin/ldpd/fsm.c:1.1 Wed Dec 8 02:20:14 2010
+++ src/usr.sbin/ldpd/fsm.c Wed Dec 8 19:10:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fsm.c,v 1.1 2010/12/08 07:20:14 kefren Exp $ */
+/* $NetBSD: fsm.c,v 1.2 2010/12/09 00:10:59 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
if (hi-ldp_id.s_addr == pduid-ldp_id.s_addr)
break;
if (hi == NULL) {
- hi = (struct hello_info *)malloc(sizeof(struct hello_info));
+ hi = malloc(sizeof(*hi));
if (!hi) {
fatalp(Cannot alloc a hello info);
return;
@@ -145,13 +145,12 @@
if (sa-sin_addr.s_addr 24 24 != 127)
adrcount++;
}
- t = (struct address_list_tlv *) malloc(sizeof(struct address_list_tlv)
- + (adrcount - 1) * sizeof(struct in_addr));
+ t = malloc(sizeof(*t) + (adrcount - 1) * sizeof(struct in_addr));
if (!t) {
fatalp(build_address_list_tlv: malloc problem\n);
return NULL;
- }
+ }
t-type = htons(LDP_ADDRESS);
t-length = htons(sizeof(struct address_list_tlv) - TLV_TYPE_LENGTH
Index: src/usr.sbin/ldpd/label.c
diff -u src/usr.sbin/ldpd/label.c:1.1 src/usr.sbin/ldpd/label.c:1.2
--- src/usr.sbin/ldpd/label.c:1.1 Wed Dec 8 02:20:14 2010
+++ src/usr.sbin/ldpd/label.c Wed Dec 8 19:10:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: label.c,v 1.1 2010/12/08 07:20:14 kefren Exp $ */
+/* $NetBSD: label.c,v 1.2 2010/12/09 00:10:59 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -58,13 +58,12 @@
struct label *l;
char spreftmp[INET_ADDRSTRLEN];
- l = (struct label *) malloc(sizeof(struct label));
- memset(l, 0, sizeof(struct label));
+ l = calloc(1, sizeof(*l));
if (!l) {
fatalp(label_add: malloc problem\n);
return NULL;
- }
+ }
assert(so_dest);
assert(so_pref);
Index: src/usr.sbin/ldpd/ldp_peer.c
diff -u src/usr.sbin/ldpd/ldp_peer.c:1.1 src/usr.sbin/ldpd/ldp_peer.c:1.2
--- src/usr.sbin/ldpd/ldp_peer.c:1.1 Wed Dec 8 02:20:14 2010
+++ src/usr.sbin/ldpd/ldp_peer.c Wed Dec 8 19:10:59 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ldp_peer.c,v 1.1 2010/12/08 07:20:14 kefren Exp $ */
+/* $NetBSD: ldp_peer.c,v 1.2 2010/12/09 00:10:59 christos Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -87,14 +87,13 @@
}
/* Set the peer in CONNECTING/CONNECTED state */
- p = (struct ldp_peer *) malloc(sizeof(struct ldp_peer));
+ p = calloc(1, sizeof(*p));
if (!p) {
fatalp(ldp_peer_new: malloc problem\n);
return NULL;
- }
+ }
- memset(p, 0, sizeof(struct ldp_peer));
SLIST_INSERT_HEAD(ldp_peer_head, p, peers);
memcpy(p-address, a, sizeof(struct in_addr));
memcpy(p-ldp_id, ldp_id, sizeof(struct in_addr));
@@ -282,14 +281,12 @@
if (check_ifaddr(p, a))
return LDP_E_ALREADY_DONE;
- lpa = (struct ldp_peer_address*)malloc(sizeof(struct ldp_peer_address));
+ lpa = calloc(1, sizeof(*lpa));
if (!lpa) {
fatalp(add_ifaddr: malloc problem\n);
return LDP_E_MEMORY;
- }
-
- memset(lpa, 0, sizeof(struct ldp_peer_address));
+ }
memcpy(lpa-address, a, sizeof(struct in_addr));
@@ -355,8 +352,7 @@
void
add_my_if_addrs(struct in_addr * a, int count)
{
- myaddresses = (struct in_addr *) malloc((count + 1) *
- (sizeof(struct in_addr)));
+ myaddresses = calloc((count + 1), sizeof(*myaddresses));
if (!myaddresses) {
fatalp(add_my_if_addrs: malloc problem\n);
@@ -378,7 +374,7 @@
if (ldp_peer_get_lm(p, a, prefix))
return LDP_E_ALREADY_DONE;
- lma = (struct label_mapping *) malloc(sizeof(struct label_mapping));
+ lma = malloc(sizeof(*lma));
if (!lma) {
fatalp(ldp_peer_add_mapping: malloc problem\n);
@@ -468,7 +464,7 @@
debugp(Cannot match that prefix to the specified peer\n);
return NULL;
}
- rv = (struct peer_map *) malloc(sizeof(struct peer_map));
+ rv = malloc(sizeof(*rv));
if (!rv) {
fatalp(ldp_test_mapping: malloc problem\n);
Index: src/usr.sbin/ldpd/mpls_interface.c
diff -u src/usr.sbin/ldpd/mpls_interface.c:1.1 src/usr.sbin/ldpd/mpls_interface.c:1.2
--- src/usr.sbin/ldpd/mpls_interface.c:1.1 Wed Dec 8 02:20:14 2010
+++ src/usr.sbin/ldpd/mpls_interface.c Wed Dec 8 19:10:59 2010
@@ -1,4 +1,4
CVS commit: src/sys/uvm
Module Name:src Committed By: uebayasi Date: Thu Dec 9 01:48:05 UTC 2010 Modified Files: src/sys/uvm: files.uvm uvm.h Log Message: Make UVM_PAGE_TRKOWN a real flag. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/uvm/files.uvm cvs rdiff -u -r1.58 -r1.59 src/sys/uvm/uvm.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/uvm/files.uvm diff -u src/sys/uvm/files.uvm:1.18 src/sys/uvm/files.uvm:1.19 --- src/sys/uvm/files.uvm:1.18 Sun Feb 21 13:17:50 2010 +++ src/sys/uvm/files.uvm Thu Dec 9 01:48:05 2010 @@ -1,4 +1,4 @@ -# $NetBSD: files.uvm,v 1.18 2010/02/21 13:17:50 drochner Exp $ +# $NetBSD: files.uvm,v 1.19 2010/12/09 01:48:05 uebayasi Exp $ # # UVM options @@ -11,6 +11,7 @@ defparam opt_pagermap.h PAGER_MAP_SIZE defflagPDPOLICY_CLOCKPRO defparam USER_VA0_DISABLE_DEFAULT +defflag opt_uvm_page_trkown.h UVM_PAGE_TRKOWN file uvm/uvm_amap.c file uvm/uvm_anon.c Index: src/sys/uvm/uvm.h diff -u src/sys/uvm/uvm.h:1.58 src/sys/uvm/uvm.h:1.59 --- src/sys/uvm/uvm.h:1.58 Sun Apr 25 15:54:14 2010 +++ src/sys/uvm/uvm.h Thu Dec 9 01:48:05 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: uvm.h,v 1.58 2010/04/25 15:54:14 ad Exp $ */ +/* $NetBSD: uvm.h,v 1.59 2010/12/09 01:48:05 uebayasi Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -67,6 +67,7 @@ #include opt_lockdebug.h #include opt_multiprocessor.h #include opt_uvmhist.h +#include opt_uvm_page_trkown.h #endif #include uvm/uvm_extern.h
CVS commit: [netbsd-5] src/sys/net
Module Name:src
Committed By: riz
Date: Thu Dec 9 04:11:39 UTC 2010
Modified Files:
src/sys/net [netbsd-5]: if_tap.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #1492):
sys/net/if_tap.c: revision 1.66
PR/44131: Matthew Mondor: if_tap.c tap_dev_ioctl() not propagating error,
always returns 0.
To generate a diff of this commit:
cvs rdiff -u -r1.47.4.7 -r1.47.4.8 src/sys/net/if_tap.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/net/if_tap.c
diff -u src/sys/net/if_tap.c:1.47.4.7 src/sys/net/if_tap.c:1.47.4.8
--- src/sys/net/if_tap.c:1.47.4.7 Thu Dec 3 09:40:00 2009
+++ src/sys/net/if_tap.c Thu Dec 9 04:11:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: if_tap.c,v 1.47.4.7 2009/12/03 09:40:00 sborrill Exp $ */
+/* $NetBSD: if_tap.c,v 1.47.4.8 2010/12/09 04:11:39 riz Exp $ */
/*
* Copyright (c) 2003, 2004, 2008, 2009 The NetBSD Foundation.
@@ -33,7 +33,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_tap.c,v 1.47.4.7 2009/12/03 09:40:00 sborrill Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_tap.c,v 1.47.4.8 2010/12/09 04:11:39 riz Exp $);
#if defined(_KERNEL_OPT)
#include bpfilter.h
@@ -1056,12 +1056,10 @@
static int
tap_dev_ioctl(int unit, u_long cmd, void *data, struct lwp *l)
{
- struct tap_softc *sc =
- device_lookup_private(tap_cd, unit);
- int error = 0;
+ struct tap_softc *sc = device_lookup_private(tap_cd, unit);
if (sc == NULL)
- return (ENXIO);
+ return ENXIO;
switch (cmd) {
case FIONREAD:
@@ -1078,27 +1076,26 @@
else
*(int *)data = m-m_pkthdr.len;
splx(s);
- } break;
+ return 0;
+ }
case TIOCSPGRP:
case FIOSETOWN:
- error = fsetown(sc-sc_pgid, cmd, data);
- break;
+ return fsetown(sc-sc_pgid, cmd, data);
case TIOCGPGRP:
case FIOGETOWN:
- error = fgetown(sc-sc_pgid, cmd, data);
- break;
+ return fgetown(sc-sc_pgid, cmd, data);
case FIOASYNC:
if (*(int *)data)
sc-sc_flags |= TAP_ASYNCIO;
else
sc-sc_flags = ~TAP_ASYNCIO;
- break;
+ return 0;
case FIONBIO:
if (*(int *)data)
sc-sc_flags |= TAP_NBIO;
else
sc-sc_flags = ~TAP_NBIO;
- break;
+ return 0;
#ifdef OTAPGIFNAME
case OTAPGIFNAME:
#endif
@@ -1108,13 +1105,11 @@
struct ifnet *ifp = sc-sc_ec.ec_if;
strlcpy(ifr-ifr_name, ifp-if_xname, IFNAMSIZ);
- } break;
+ return 0;
+ }
default:
- error = ENOTTY;
- break;
+ return ENOTTY;
}
-
- return (0);
}
static int
CVS commit: [netbsd-5] src/lib/libc/rpc
Module Name:src
Committed By: riz
Date: Thu Dec 9 04:14:46 UTC 2010
Modified Files:
src/lib/libc/rpc [netbsd-5]: xdr_rec.c
Log Message:
Pull up following revision(s) (requested by dholland in ticket #1493):
lib/libc/rpc/xdr_rec.c: revision 1.31
PR/44132: Wolfgang Stukenbrock: libc/rpc may overwrite not-allocated memory
Return XPRT_DIED when realloc fails for lack of a better error.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.4.1 src/lib/libc/rpc/xdr_rec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/rpc/xdr_rec.c
diff -u src/lib/libc/rpc/xdr_rec.c:1.29 src/lib/libc/rpc/xdr_rec.c:1.29.4.1
--- src/lib/libc/rpc/xdr_rec.c:1.29 Sun Aug 17 10:50:50 2008
+++ src/lib/libc/rpc/xdr_rec.c Thu Dec 9 04:14:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: xdr_rec.c,v 1.29 2008/08/17 10:50:50 rtr Exp $ */
+/* $NetBSD: xdr_rec.c,v 1.29.4.1 2010/12/09 04:14:46 riz Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -35,7 +35,7 @@
static char *sccsid = @(#)xdr_rec.c 1.21 87/08/11 Copyr 1984 Sun Micro;
static char *sccsid = @(#)xdr_rec.c 2.2 88/08/01 4.0 RPCSRC;
#else
-__RCSID($NetBSD: xdr_rec.c,v 1.29 2008/08/17 10:50:50 rtr Exp $);
+__RCSID($NetBSD: xdr_rec.c,v 1.29.4.1 2010/12/09 04:14:46 riz Exp $);
#endif
#endif
@@ -581,8 +581,12 @@
return FALSE;
}
rstrm-in_reclen += fraglen;
- if (rstrm-in_reclen rstrm-recvsize)
- realloc_stream(rstrm, rstrm-in_reclen);
+ if ((u_int)rstrm-in_reclen rstrm-recvsize) {
+ if (!realloc_stream(rstrm, rstrm-in_reclen)) {
+*statp = XPRT_DIED;
+return FALSE;
+ }
+ }
if (rstrm-in_header LAST_FRAG) {
rstrm-in_header = ~LAST_FRAG;
rstrm-last_frag = TRUE;
CVS commit: [netbsd-5] src/etc/mtree
Module Name:src Committed By: riz Date: Thu Dec 9 04:17:23 UTC 2010 Modified Files: src/etc/mtree [netbsd-5]: special Log Message: Pull up following revision(s) (requested by uwe in ticket #1494): etc/mtree/special: revision 1.132 Add quot;optionalquot; keyword to rc.d/xdm and rc.d/xfs. Fixes PR misc/43307. To generate a diff of this commit: cvs rdiff -u -r1.121.2.3 -r1.121.2.4 src/etc/mtree/special 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.121.2.3 src/etc/mtree/special:1.121.2.4 --- src/etc/mtree/special:1.121.2.3 Fri Sep 18 02:01:38 2009 +++ src/etc/mtree/special Thu Dec 9 04:17:22 2010 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.121.2.3 2009/09/18 02:01:38 snj Exp $ +# $NetBSD: special,v 1.121.2.4 2010/12/09 04:17:22 riz Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -285,8 +285,8 @@ ./etc/rc.d/wpa_supplicant type=file mode=0555 ./etc/rc.d/wscons type=file mode=0555 ./etc/rc.d/wsmoused type=file mode=0555 -./etc/rc.d/xdm type=file mode=0555 -./etc/rc.d/xfs type=file mode=0555 +./etc/rc.d/xdm type=file mode=0555 optional +./etc/rc.d/xfs type=file mode=0555 optional ./etc/rc.d/ypbind type=file mode=0555 ./etc/rc.d/yppasswdd type=file mode=0555 ./etc/rc.d/ypserv type=file mode=0555
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: riz Date: Thu Dec 9 04:18:20 UTC 2010 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Tickets 1492-1494. To generate a diff of this commit: cvs rdiff -u -r1.1.2.35 -r1.1.2.36 src/doc/CHANGES-5.2 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-5.2 diff -u src/doc/CHANGES-5.2:1.1.2.35 src/doc/CHANGES-5.2:1.1.2.36 --- src/doc/CHANGES-5.2:1.1.2.35 Wed Dec 8 04:36:02 2010 +++ src/doc/CHANGES-5.2 Thu Dec 9 04:18:20 2010 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.35 2010/12/08 04:36:02 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.36 2010/12/09 04:18:20 riz Exp $ A complete list of changes from the NetBSD 5.0 release to the NetBSD 5.1 release: @@ -909,3 +909,18 @@ Comment out CFLAGS+=-g. [uwe, ticket #1491] +sys/net/if_tap.c1.66 + + Make tap_dev_ioctl() properly return an error. PR#44131. + [christos, ticket #1492] + +lib/libc/rpc/xdr_rec.c1.31 via patch + + Don't overwrite not-allocated memory. PR#44132. + [dholland, ticket #1493] + +etc/mtree/special1.132 + + Add optional keyword to rc.d/xdm and rc.d/xfs. PR#43307. + [uwe, ticket #1494] +
CVS commit: src/sys/arch/evbppc/pmppc/dev
Module Name:src Committed By: uebayasi Date: Thu Dec 9 04:31:58 UTC 2010 Modified Files: src/sys/arch/evbppc/pmppc/dev: ds17485.c Log Message: Fix DEBUG build. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbppc/pmppc/dev/ds17485.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/evbppc/pmppc/dev/ds17485.c diff -u src/sys/arch/evbppc/pmppc/dev/ds17485.c:1.6 src/sys/arch/evbppc/pmppc/dev/ds17485.c:1.7 --- src/sys/arch/evbppc/pmppc/dev/ds17485.c:1.6 Mon Apr 28 20:23:17 2008 +++ src/sys/arch/evbppc/pmppc/dev/ds17485.c Thu Dec 9 04:31:57 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ds17485.c,v 1.6 2008/04/28 20:23:17 martin Exp $ */ +/* $NetBSD: ds17485.c,v 1.7 2010/12/09 04:31:57 uebayasi Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -150,7 +150,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ds17485.c,v 1.6 2008/04/28 20:23:17 martin Exp $); +__KERNEL_RCSID(0, $NetBSD: ds17485.c,v 1.7 2010/12/09 04:31:57 uebayasi Exp $); #include sys/param.h #include sys/systm.h @@ -201,9 +201,6 @@ } rtc_attached = 1; -#ifdef DEBUG - rtc_print(); -#endif rtc_write(sc, MC_REGA, MC_BASE_32_KHz | MC_RATE_1024_Hz); rtc_write(sc, MC_REGB, MC_REGB_24HR);
CVS commit: src/sys/dev/sbus
Module Name:src Committed By: uebayasi Date: Thu Dec 9 04:35:37 UTC 2010 Modified Files: src/sys/dev/sbus: zx.c Log Message: Fix DEBUG build. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/dev/sbus/zx.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/sbus/zx.c diff -u src/sys/dev/sbus/zx.c:1.37 src/sys/dev/sbus/zx.c:1.38 --- src/sys/dev/sbus/zx.c:1.37 Sat Nov 13 13:52:10 2010 +++ src/sys/dev/sbus/zx.c Thu Dec 9 04:35:36 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: zx.c,v 1.37 2010/11/13 13:52:10 uebayasi Exp $ */ +/* $NetBSD: zx.c,v 1.38 2010/12/09 04:35:36 uebayasi Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -45,7 +45,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: zx.c,v 1.37 2010/11/13 13:52:10 uebayasi Exp $); +__KERNEL_RCSID(0, $NetBSD: zx.c,v 1.38 2010/12/09 04:35:36 uebayasi Exp $); #include sys/param.h #include sys/systm.h @@ -57,6 +57,11 @@ #include sys/conf.h #include sys/syslog.h #include sys/buf.h +#ifdef DEBUG +/* for log(9) in zxioctl() */ +#include sys/lwp.h +#include sys/proc.h +#endif #include sys/bus.h #include machine/autoconf.h
CVS commit: src/sys/arch/hpcarm/dev
Module Name:src
Committed By: uebayasi
Date: Thu Dec 9 04:37:05 UTC 2010
Modified Files:
src/sys/arch/hpcarm/dev: wzero3_lcd.c
Log Message:
Fix DEBUG build.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hpcarm/dev/wzero3_lcd.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/hpcarm/dev/wzero3_lcd.c
diff -u src/sys/arch/hpcarm/dev/wzero3_lcd.c:1.1 src/sys/arch/hpcarm/dev/wzero3_lcd.c:1.2
--- src/sys/arch/hpcarm/dev/wzero3_lcd.c:1.1 Sat Apr 17 13:36:21 2010
+++ src/sys/arch/hpcarm/dev/wzero3_lcd.c Thu Dec 9 04:37:04 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: wzero3_lcd.c,v 1.1 2010/04/17 13:36:21 nonaka Exp $ */
+/* $NetBSD: wzero3_lcd.c,v 1.2 2010/12/09 04:37:04 uebayasi Exp $ */
/*
* Copyright (c) 2008,2009 NONAKA Kimihiro non...@netbsd.org
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: wzero3_lcd.c,v 1.1 2010/04/17 13:36:21 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: wzero3_lcd.c,v 1.2 2010/12/09 04:37:04 uebayasi Exp $);
#include sys/param.h
#include sys/systm.h
@@ -450,18 +450,18 @@
switch (dp-param) {
case WSDISPLAYIO_PARAM_BACKLIGHT:
/* unsupported */
- DPRINTF((%s: ioctl(WSDISPLAYIO_PARAM_BACKLIGHT) isn't supported\n, device_xname(sc-dev)));
+ DPRINTF((%s: ioctl(WSDISPLAYIO_PARAM_BACKLIGHT) isn't supported\n, device_xname(sc-dev)));
res = ENOTTY;
break;
case WSDISPLAYIO_PARAM_CONTRAST:
- DPRINTF((%s: ioctl(WSDISPLAYIO_PARAM_CONTRAST) isn't supported\n, device_xname(sc-dev)));
+ DPRINTF((%s: ioctl(WSDISPLAYIO_PARAM_CONTRAST) isn't supported\n, device_xname(sc-dev)));
/* unsupported */
res = ENOTTY;
break;
case WSDISPLAYIO_PARAM_BRIGHTNESS:
- DPRINTF((%s: ioctl(WSDISPLAYIO_PARAM_BRIGHTNESS) isn't supported\n, device_xname(sc-dev)));
+ DPRINTF((%s: ioctl(WSDISPLAYIO_PARAM_BRIGHTNESS) isn't supported\n, device_xname(sc-dev)));
/* unsupported */
res = ENOTTY;
}
CVS commit: src/sys/arch/evbarm/netwalker
Module Name:src
Committed By: bsh
Date: Thu Dec 9 04:40:22 UTC 2010
Added Files:
src/sys/arch/evbarm/netwalker: netwalker_usb.c
Log Message:
support USB on NetWalker
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/netwalker/netwalker_usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/arch/evbarm/netwalker/netwalker_usb.c
diff -u /dev/null src/sys/arch/evbarm/netwalker/netwalker_usb.c:1.1
--- /dev/null Thu Dec 9 04:40:22 2010
+++ src/sys/arch/evbarm/netwalker/netwalker_usb.c Thu Dec 9 04:40:22 2010
@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 2010 Genetec Corporation. All rights reserved.
+ * Written by Hiroyuki Bessho for Genetec Corporation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY GENETEC CORPORATION ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GENETEC CORPORATION
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: netwalker_usb.c,v 1.1 2010/12/09 04:40:22 bsh Exp $);
+
+#include sys/param.h
+#include sys/systm.h
+#include sys/conf.h
+#include sys/kernel.h
+#include sys/device.h
+#include sys/intr.h
+#include sys/bus.h
+
+#include dev/usb/usb.h
+#include dev/usb/usbdi.h
+#include dev/usb/usbdivar.h
+#include dev/usb/usb_mem.h
+
+#include dev/usb/ehcireg.h
+#include dev/usb/ehcivar.h
+
+#include arm/imx/imx51reg.h
+#include arm/imx/imx51var.h
+#include arm/imx/imxusbreg.h
+#include arm/imx/imxusbvar.h
+#include arm/imx/imx51_iomuxreg.h
+#include arm/imx/imxgpiovar.h
+#include locators.h
+
+
+struct netwalker_usbc_softc {
+ struct imxusbc_softc sc_imxusbc;
+};
+
+
+static int imxusbc_match(device_t, cfdata_t, void *);
+static void imxusbc_attach(device_t, device_t, void *);
+static void netwalker_usb_init(struct imxehci_softc *);
+
+static void init_otg(struct imxehci_softc *);
+static void init_h1(struct imxehci_softc *);
+
+extern const struct iomux_conf iomux_usb1_config[];
+
+/* attach structures */
+CFATTACH_DECL_NEW(imxusbc_axi, sizeof(struct netwalker_usbc_softc),
+imxusbc_match, imxusbc_attach, NULL, NULL);
+
+static int
+imxusbc_match(device_t parent, cfdata_t cf, void *aux)
+{
+ struct axi_attach_args *aa = aux;
+
+ printf(%s\n, __func__);
+
+ if (aa-aa_addr == USBOH3_BASE)
+ return 1;
+ return 0;
+}
+
+static void
+imxusbc_attach(device_t parent, device_t self, void *aux)
+{
+ struct axi_attach_args *aa = aux;
+ struct imxusbc_softc *sc = device_private(self);
+
+ sc-sc_init_md_hook = netwalker_usb_init;
+ sc-sc_setup_md_hook = NULL;
+
+ imxusbc_attach_common(parent, self, aa-aa_iot);
+
+}
+
+static void
+netwalker_usb_init(struct imxehci_softc *sc)
+{
+ switch (sc-sc_unit) {
+ case 0: /* OTG controller */
+ init_otg(sc);
+ break;
+ case 1: /* EHCI Host 1 */
+ init_h1(sc);
+ break;
+ default:
+ aprint_error_dev(sc-sc_hsc.sc_dev, unit %d not supprted\n,
+ sc-sc_unit);
+ }
+}
+
+static void
+init_otg(struct imxehci_softc *sc)
+{
+ struct imxusbc_softc *usbc = sc-sc_usbc;
+ uint32_t reg;
+
+ sc-sc_iftype = IMXUSBC_IF_UTMI;
+
+ imxehci_reset(sc);
+
+ reg = bus_space_read_4(usbc-sc_iot, usbc-sc_ioh, USBOH3_PHYCTRL0);
+ reg |= PHYCTRL0_OTG_OVER_CUR_DIS;
+ bus_space_write_4(usbc-sc_iot, usbc-sc_ioh, USBOH3_PHYCTRL0, reg);
+
+ reg = bus_space_read_4(usbc-sc_iot, usbc-sc_ioh, USBOH3_USBCTRL);
+ reg = ~(USBCTRL_OWIR|USBCTRL_OPM);
+ bus_space_write_4(usbc-sc_iot, usbc-sc_ioh, USBOH3_USBCTRL, reg);
+
+ reg = bus_space_read_4(usbc-sc_iot, usbc-sc_ioh, USBOH3_PHYCTRL1);
+ reg = (reg ~PHYCTRL1_PLLDIVVALUE_MASK) | PHYCTRL1_PLLDIVVALUE_24MHZ;
+ bus_space_write_4(usbc-sc_iot, usbc-sc_ioh, USBOH3_PHYCTRL1, reg);
+}
+
+
+
+
+static void
+init_h1(struct imxehci_softc *sc)
+{
+ struct imxusbc_softc *usbc = sc-sc_usbc;
+ uint32_t reg;
+
+ /* output HIGH to USBH1_STP */
+
CVS commit: src/sys/arch/evbarm/netwalker
Module Name:src
Committed By: bsh
Date: Thu Dec 9 05:00:15 UTC 2010
Modified Files:
src/sys/arch/evbarm/netwalker: netwalker_machdep.c
Log Message:
adapt to changes in imx51reg.h
CVS: --
CVS: CVSROOT cvs.NetBSD.org:/cvsroot
CVS: please use PR category/123 to have the commitmsg appended to PR 123
CVS:
CVS: Please evaluate your changes and consider the following.
CVS: Abort checkin if you answer no.
CVS: = For all changes:
CVS: Do the changed files compile?
CVS: Has the change been tested?
CVS: = If you are not completely familiar with the changed components:
CVS: Has the change been posted for review?
CVS: Have you allowed enough time for feedback?
CVS: = If the change is major:
CVS: = If the change adds files to, or removes files from $DESTDIR:
CVS: = If you are changing a library or kernel interface:
CVS: Have you successfully run ./build.sh release?
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/netwalker/netwalker_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/evbarm/netwalker/netwalker_machdep.c
diff -u src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.2 src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.3
--- src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.2 Sun Nov 28 08:23:24 2010
+++ src/sys/arch/evbarm/netwalker/netwalker_machdep.c Thu Dec 9 05:00:14 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: netwalker_machdep.c,v 1.2 2010/11/28 08:23:24 hannken Exp $ */
+/* $NetBSD: netwalker_machdep.c,v 1.3 2010/12/09 05:00:14 bsh Exp $ */
/*
* Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation.
@@ -102,7 +102,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netwalker_machdep.c,v 1.2 2010/11/28 08:23:24 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: netwalker_machdep.c,v 1.3 2010/12/09 05:00:14 bsh Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -946,45 +946,25 @@
/* left buttons */
IOMUX_DATA(EIM_EB2, IOMUX_CONFIG_ALT1,
- PAD_CTL_HYS_ENABLE),
+ PAD_CTL_HYS),
/* right buttons */
IOMUX_DATA(EIM_EB3, IOMUX_CONFIG_ALT1,
- PAD_CTL_HYS_ENABLE),
-
+ PAD_CTL_HYS),
-#if 0
- /* UART1 */
- IOMUX_DATA(UART1_RXD, IOMUX_CONFIG_ALT0,
- (PAD_CTL_HYS_ENABLE | PAD_CTL_PKE_ENABLE |
- PAD_CTL_PUE_PULL | PAD_CTL_DSE_HIGH |
- PAD_CTL_SRE_FAST)),
- IOMUX_DATA(UART1_TXD, IOMUX_CONFIG_ALT0,
- (PAD_CTL_HYS_ENABLE | PAD_CTL_PKE_ENABLE |
- PAD_CTL_PUE_PULL | PAD_CTL_DSE_HIGH |
- PAD_CTL_SRE_FAST)),
- IOMUX_DATA(UART1_RTS, IOMUX_CONFIG_ALT0,
- (PAD_CTL_HYS_ENABLE | PAD_CTL_PKE_ENABLE |
- PAD_CTL_PUE_PULL | PAD_CTL_DSE_HIGH)),
- IOMUX_DATA(UART1_CTS, IOMUX_CONFIG_ALT0,
- (PAD_CTL_HYS_ENABLE | PAD_CTL_PKE_ENABLE |
- PAD_CTL_PUE_PULL | PAD_CTL_DSE_HIGH)),
-#else
/* UART1 */
#if 1
IOMUX_DATA(UART1_RXD, IOMUX_CONFIG_ALT0,
- PAD_CTL_DSE_HIGH | PAD_CTL_SRE_FAST),
+ PAD_CTL_DSE_HIGH | PAD_CTL_SRE),
#else
IOMUX_DATA(UART1_RXD, IOMUX_CONFIG_ALT3, /* gpio4[28] */
- PAD_CTL_DSE_HIGH | PAD_CTL_SRE_FAST),
+ PAD_CTL_DSE_HIGH | PAD_CTL_SRE),
#endif
IOMUX_DATA(UART1_TXD, IOMUX_CONFIG_ALT0,
- PAD_CTL_DSE_HIGH | PAD_CTL_SRE_FAST),
+ PAD_CTL_DSE_HIGH | PAD_CTL_SRE),
IOMUX_DATA(UART1_RTS, IOMUX_CONFIG_ALT0,
PAD_CTL_DSE_HIGH),
IOMUX_DATA(UART1_CTS, IOMUX_CONFIG_ALT0,
PAD_CTL_DSE_HIGH),
-#endif
-
};
static void
@@ -1157,6 +1137,9 @@
}
printf(\n);
+ printf(\nCCM\n);
+ dump_sub(CCM_BASE, CCM_SIZE);
+
#if 0
/* disable power down counter in watch dog,
This must be done within 16 seconds of start-up. */
@@ -1181,3 +1164,27 @@
}
#endif
+
+
+#if 0
+#include arm/imx/imxgpiovar.h
+
+void gpio_test(void)
+void
+gpio_test(void)
+{
+ int left, right;
+
+ gpio_set_direction(GPIO_NO(2, 22), GPIO_DIR_IN);
+ gpio_set_direction(GPIO_NO(2, 23), GPIO_DIR_IN);
+
+ for (;;) {
+ left = gpio_data_read(GPIO_NO(2, 22));
+ right = gpio_data_read(GPIO_NO(2, 23));
+
+ printf(\r%s %s,
+ left ? off : ON ,
+ right ? off : ON );
+ }
+}
+#endif
CVS commit: src/sys/arch/acorn32/mainbus
Module Name:src Committed By: uebayasi Date: Thu Dec 9 05:14:28 UTC 2010 Modified Files: src/sys/arch/acorn32/mainbus: fd.c Log Message: Fix DEBUG build. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/acorn32/mainbus/fd.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/acorn32/mainbus/fd.c diff -u src/sys/arch/acorn32/mainbus/fd.c:1.48 src/sys/arch/acorn32/mainbus/fd.c:1.49 --- src/sys/arch/acorn32/mainbus/fd.c:1.48 Sun Nov 28 08:23:22 2010 +++ src/sys/arch/acorn32/mainbus/fd.c Thu Dec 9 05:14:28 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: fd.c,v 1.48 2010/11/28 08:23:22 hannken Exp $ */ +/* $NetBSD: fd.c,v 1.49 2010/12/09 05:14:28 uebayasi Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -82,7 +82,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.48 2010/11/28 08:23:22 hannken Exp $); +__KERNEL_RCSID(0, $NetBSD: fd.c,v 1.49 2010/12/09 05:14:28 uebayasi Exp $); #include opt_ddb.h @@ -1452,7 +1452,7 @@ bp-b_data = (void *)finfo; #ifdef DEBUG - printf(fdformat: blkno %llx count %lx\n, + printf(fdformat: blkno %llx count %x\n, (unsigned long long)bp-b_blkno, bp-b_bcount); #endif
CVS commit: src/sys/arch/acorn32/podulebus
Module Name:src
Committed By: uebayasi
Date: Thu Dec 9 05:14:48 UTC 2010
Modified Files:
src/sys/arch/acorn32/podulebus: esc.c sfas.c
Log Message:
Fix DEBUG build.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/acorn32/podulebus/esc.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/acorn32/podulebus/sfas.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/acorn32/podulebus/esc.c
diff -u src/sys/arch/acorn32/podulebus/esc.c:1.23 src/sys/arch/acorn32/podulebus/esc.c:1.24
--- src/sys/arch/acorn32/podulebus/esc.c:1.23 Sat May 16 16:40:58 2009
+++ src/sys/arch/acorn32/podulebus/esc.c Thu Dec 9 05:14:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: esc.c,v 1.23 2009/05/16 16:40:58 cegger Exp $ */
+/* $NetBSD: esc.c,v 1.24 2010/12/09 05:14:48 uebayasi Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -86,7 +86,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: esc.c,v 1.23 2009/05/16 16:40:58 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: esc.c,v 1.24 2010/12/09 05:14:48 uebayasi Exp $);
#include sys/param.h
#include sys/systm.h
@@ -144,6 +144,7 @@
u_char esc_inhibit_sync[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
u_char esc_inhibit_disc[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+#undef DEBUG
#define DEBUG
#ifdef DEBUG
#define QPRINTF(a) if (esc_debug 1) printf a
Index: src/sys/arch/acorn32/podulebus/sfas.c
diff -u src/sys/arch/acorn32/podulebus/sfas.c:1.20 src/sys/arch/acorn32/podulebus/sfas.c:1.21
--- src/sys/arch/acorn32/podulebus/sfas.c:1.20 Sat May 16 16:40:58 2009
+++ src/sys/arch/acorn32/podulebus/sfas.c Thu Dec 9 05:14:48 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sfas.c,v 1.20 2009/05/16 16:40:58 cegger Exp $ */
+/* $NetBSD: sfas.c,v 1.21 2010/12/09 05:14:48 uebayasi Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -82,7 +82,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sfas.c,v 1.20 2009/05/16 16:40:58 cegger Exp $);
+__KERNEL_RCSID(0, $NetBSD: sfas.c,v 1.21 2010/12/09 05:14:48 uebayasi Exp $);
#include sys/param.h
#include sys/systm.h
@@ -137,6 +137,7 @@
u_char sfas_inhibit_sync[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
u_char sfas_inhibit_disc[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+#undef DEBUG
#define DEBUG
#ifdef DEBUG
#define QPRINTF(a) if (sfas_debug 1) printf a
CVS commit: src/sys/arch/algor/include
Module Name:src
Committed By: uebayasi
Date: Thu Dec 9 05:15:06 UTC 2010
Modified Files:
src/sys/arch/algor/include: bus.h
Log Message:
Fix DEBUG build.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/algor/include/bus.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/algor/include/bus.h
diff -u src/sys/arch/algor/include/bus.h:1.14 src/sys/arch/algor/include/bus.h:1.15
--- src/sys/arch/algor/include/bus.h:1.14 Mon Apr 28 20:23:10 2008
+++ src/sys/arch/algor/include/bus.h Thu Dec 9 05:15:06 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: bus.h,v 1.14 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: bus.h,v 1.15 2010/12/09 05:15:06 uebayasi Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc.
@@ -85,7 +85,7 @@
#define __BUS_SPACE_ADDRESS_SANITY(p, t, d)\
({ \
if (__BUS_SPACE_ALIGNED_ADDRESS((p), t) == 0) { \
- printf(%s 0x%lx not aligned to %lu bytes %s:%d\n, \
+ printf(%s 0x%lx not aligned to %zu bytes %s:%d\n, \
d, (u_long)(p), sizeof(t), __FILE__, __LINE__); \
}\
(void) 0; \
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: riz Date: Thu Dec 9 05:19:43 UTC 2010 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Add new resize_ffs test programs, and obsolete an old one. To generate a diff of this commit: cvs rdiff -u -r1.169 -r1.170 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.169 src/distrib/sets/lists/tests/mi:1.170 --- src/distrib/sets/lists/tests/mi:1.169 Mon Dec 6 11:32:56 2010 +++ src/distrib/sets/lists/tests/mi Thu Dec 9 05:19:43 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.169 2010/12/06 11:32:56 pooka Exp $ +# $NetBSD: mi,v 1.170 2010/12/09 05:19:43 riz Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1663,7 +1663,11 @@ ./usr/tests/sbin/Atffile tests-sbin-tests atf ./usr/tests/sbin/resize_ffs tests-sbin-tests ./usr/tests/sbin/resize_ffs/Atffile tests-sbin-tests atf -./usr/tests/sbin/resize_ffs/t_resize_ffs tests-sbin-tests atf +./usr/tests/sbin/resize_ffs/t_grow tests-sbin-tests atf +./usr/tests/sbin/resize_ffs/t_resize_ffs tests-obsolete obsolete +./usr/tests/sbin/resize_ffs/t_shrink tests-sbin-tests atf +./usr/tests/sbin/resize_ffs/testdata.md5 tests-sbin-tests atf +./usr/tests/sbin/resize_ffs/testdata.tar.gz.base64 tests-sbin-tests atf ./usr/tests/systests-sys-tests ./usr/tests/sys/Atffile tests-sys-tests atf ./usr/tests/sys/rctests-sys-tests
CVS commit: src/external/gpl3/binutils/dist/gas/config
Module Name:src
Committed By: matt
Date: Thu Dec 9 06:22:03 UTC 2010
Modified Files:
src/external/gpl3/binutils/dist/gas/config: tc-vax.c
Log Message:
Use ELF_ST_VISIBILITY (S_GET_OTHER( )) instead of a local S_IS_HIDDEN as
suggested by binutils.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/binutils/dist/gas/config/tc-vax.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/dist/gas/config/tc-vax.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-vax.c:1.3 src/external/gpl3/binutils/dist/gas/config/tc-vax.c:1.4
--- src/external/gpl3/binutils/dist/gas/config/tc-vax.c:1.3 Mon Dec 6 21:17:00 2010
+++ src/external/gpl3/binutils/dist/gas/config/tc-vax.c Thu Dec 9 06:22:03 2010
@@ -266,23 +266,6 @@
#define min(a, b) ((a) (b) ? (a) : (b))
-#ifdef OBJ_ELF
-static int
-S_IS_HIDDEN(symbolS *symbolP)
-{
- asymbol *bfdsym;
- elf_symbol_type *elfsym;
-
- bfdsym = symbol_get_bfdsym (symbolP);
- elfsym = elf_symbol_from (bfd_asymbol_bfd (bfdsym), bfdsym);
-
- assert (elfsym);
-
- return (elfsym-internal_elf_sym.st_other 3) == STV_HIDDEN;
-}
-#endif /* OBJ_ELF */
-
-
void
md_number_to_chars (char con[], valueT value, int nbytes)
{
@@ -410,7 +393,7 @@
fragP-fr_symbol != NULL
flag_want_pic
#ifdef OBJ_ELF
- !S_IS_HIDDEN (fragP-fr_symbol)
+ ELF_ST_VISIBILITY (S_GET_OTHER (fragP-fr_symbol)) != STV_HIDDEN
#endif
(!S_IS_DEFINED (fragP-fr_symbol)
|| S_IS_WEAK (fragP-fr_symbol)
