CVS commit: src/lib/libc/softfloat
Module Name:src
Committed By: matt
Date: Thu Jan 10 08:16:11 UTC 2013
Modified Files:
src/lib/libc/softfloat: fpsetmask.c fpsetround.c fpsetsticky.c
softfloat-specialize
src/lib/libc/softfloat/bits32: softfloat.c
src/lib/libc/softfloat/bits64: softfloat.c
Log Message:
Add hooks to softfloat to support per-lwp exception state.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/softfloat/fpsetmask.c
cvs rdiff -u -r1.3 -r1.4 src/lib/libc/softfloat/fpsetround.c \
src/lib/libc/softfloat/fpsetsticky.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/softfloat/softfloat-specialize
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/softfloat/bits32/softfloat.c
cvs rdiff -u -r1.11 -r1.12 src/lib/libc/softfloat/bits64/softfloat.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/softfloat/fpsetmask.c
diff -u src/lib/libc/softfloat/fpsetmask.c:1.4 src/lib/libc/softfloat/fpsetmask.c:1.5
--- src/lib/libc/softfloat/fpsetmask.c:1.4 Mon Apr 28 20:23:00 2008
+++ src/lib/libc/softfloat/fpsetmask.c Thu Jan 10 08:16:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: fpsetmask.c,v 1.5 2013/01/10 08:16:10 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fpsetmask.c,v 1.4 2008/04/28 20:23:00 martin Exp $);
+__RCSID($NetBSD: fpsetmask.c,v 1.5 2013/01/10 08:16:10 matt Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -50,9 +50,11 @@ __weak_alias(fpsetmask,_fpsetmask)
fp_except
fpsetmask(fp_except mask)
{
- fp_except old;
-
- old = float_exception_mask;
+#ifdef set_float_exception_mask
+ return set_float_exception_mask(mask);
+#else
+ const fp_except old = float_exception_mask;
float_exception_mask = mask;
return old;
+#endif
}
Index: src/lib/libc/softfloat/fpsetround.c
diff -u src/lib/libc/softfloat/fpsetround.c:1.3 src/lib/libc/softfloat/fpsetround.c:1.4
--- src/lib/libc/softfloat/fpsetround.c:1.3 Mon Apr 28 20:23:00 2008
+++ src/lib/libc/softfloat/fpsetround.c Thu Jan 10 08:16:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: fpsetround.c,v 1.4 2013/01/10 08:16:10 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fpsetround.c,v 1.3 2008/04/28 20:23:00 martin Exp $);
+__RCSID($NetBSD: fpsetround.c,v 1.4 2013/01/10 08:16:10 matt Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -50,9 +50,11 @@ __weak_alias(fpsetround,_fpsetround)
fp_rnd
fpsetround(fp_rnd rnd_dir)
{
- fp_rnd old;
-
- old = float_rounding_mode;
+#ifdef set_float_rounding_mode
+ return set_float_rounding_mode(rnd_dir);
+#else
+ const fp_rnd old = float_rounding_mode;
float_rounding_mode = rnd_dir;
return old;
+#endif
}
Index: src/lib/libc/softfloat/fpsetsticky.c
diff -u src/lib/libc/softfloat/fpsetsticky.c:1.3 src/lib/libc/softfloat/fpsetsticky.c:1.4
--- src/lib/libc/softfloat/fpsetsticky.c:1.3 Mon Apr 28 20:23:00 2008
+++ src/lib/libc/softfloat/fpsetsticky.c Thu Jan 10 08:16:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fpsetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $ */
+/* $NetBSD: fpsetsticky.c,v 1.4 2013/01/10 08:16:10 matt Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: fpsetsticky.c,v 1.3 2008/04/28 20:23:00 martin Exp $);
+__RCSID($NetBSD: fpsetsticky.c,v 1.4 2013/01/10 08:16:10 matt Exp $);
#endif /* LIBC_SCCS and not lint */
#include namespace.h
@@ -50,9 +50,11 @@ __weak_alias(fpsetsticky,_fpsetsticky)
fp_except
fpsetsticky(fp_except except)
{
- fp_except old;
-
- old = float_exception_flags;
+#ifdef set_float_exception_flags
+ return set_float_exception_flags(except, 1);
+#else
+ const fp_except old = float_exception_flags;
float_exception_flags = except;
return old;
+#endif
}
Index: src/lib/libc/softfloat/softfloat-specialize
diff -u src/lib/libc/softfloat/softfloat-specialize:1.7 src/lib/libc/softfloat/softfloat-specialize:1.8
--- src/lib/libc/softfloat/softfloat-specialize:1.7 Wed Mar 21 02:32:26 2012
+++ src/lib/libc/softfloat/softfloat-specialize Thu Jan 10 08:16:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: softfloat-specialize,v 1.7 2012/03/21 02:32:26 christos Exp $ */
+/* $NetBSD: softfloat-specialize,v 1.8 2013/01/10 08:16:10 matt Exp $ */
/* This is a derivative work. */
@@ -56,16 +56,28 @@ should be simply `float_exception_flags
---
*/
#ifdef SOFTFLOAT_FOR_GCC
+#ifndef set_float_exception_mask
#define float_exception_mask _softfloat_float_exception_mask
#endif
+#endif
+#ifndef
CVS commit: othersrc/external/bsd/netdiff
Module Name:othersrc Committed By: agc Date: Thu Jan 10 08:17:11 UTC 2013 Update of /cvsroot/othersrc/external/bsd/netdiff In directory ivanova.netbsd.org:/tmp/cvs-serv19258 Log Message: Import netdiff library and program, version 20130107, into othersrc. This is the old BSD diff(1) program, rewritten and re-organised into a library and a small program to call the functions in the library. There are no static variables, and so many comparisons can be performed simultaneously. Functionally, the netdiff(1) program is the same as diff(1). Standard diff output is produced by default. Context and unified diff output can be specified using the -c and -u command line switches, and the amount of context can be specified in the usual way. SCM programs usually use ed scripts (RCS and CVS) or binary diffs, and these are produced using this program. In addition, a simplified form of VCDIFF output (RFC 3284) can be produced -- and a separate binary patch program is used to reconstruct versions through this method. As this is organised into a library interface, libnetdiff(3) is also targetted at scripting languages. Comparison output can be sent to a file, or held in a buffer, and the buffer read using the API. If neither of these options is specified, then the comparsion output will be sent to stdout. qdiff(1) is a small program which uses the buffer interface to retrieve the comparison information. It is provided as an illustration of how to use the API, and is not installed by default. Simple tests are in the two Makefiles in the netdiff and qdiff sub-directories of bin in the reachover infrastructure. Status: Vendor Tag: NETDIFF Release Tags: netdiff-20130107-base N othersrc/external/bsd/netdiff/Makefile N othersrc/external/bsd/netdiff/bin/Makefile N othersrc/external/bsd/netdiff/bin/netdiff/001.expected N othersrc/external/bsd/netdiff/bin/netdiff/002.expected N othersrc/external/bsd/netdiff/bin/netdiff/003.expected N othersrc/external/bsd/netdiff/bin/netdiff/004.expected N othersrc/external/bsd/netdiff/bin/netdiff/005.expected N othersrc/external/bsd/netdiff/bin/netdiff/006.expected N othersrc/external/bsd/netdiff/bin/netdiff/007.expected N othersrc/external/bsd/netdiff/bin/netdiff/Makefile N othersrc/external/bsd/netdiff/bin/netdiff/f1 N othersrc/external/bsd/netdiff/bin/netdiff/f2 N othersrc/external/bsd/netdiff/bin/qdiff/001.expected N othersrc/external/bsd/netdiff/bin/qdiff/002.expected N othersrc/external/bsd/netdiff/bin/qdiff/003.expected N othersrc/external/bsd/netdiff/bin/qdiff/004.expected N othersrc/external/bsd/netdiff/bin/qdiff/005.expected N othersrc/external/bsd/netdiff/bin/qdiff/006.expected N othersrc/external/bsd/netdiff/bin/qdiff/Makefile N othersrc/external/bsd/netdiff/dist/Makefile N othersrc/external/bsd/netdiff/dist/TODO N othersrc/external/bsd/netdiff/dist/diff.c N othersrc/external/bsd/netdiff/dist/diff_subr.c N othersrc/external/bsd/netdiff/dist/diffdir.c N othersrc/external/bsd/netdiff/dist/diffreg.c N othersrc/external/bsd/netdiff/dist/internal.h N othersrc/external/bsd/netdiff/dist/libnetdiff.3 N othersrc/external/bsd/netdiff/dist/netdiff.1 N othersrc/external/bsd/netdiff/dist/netdiff.h N othersrc/external/bsd/netdiff/dist/pathnames.h N othersrc/external/bsd/netdiff/dist/qdiff.c N othersrc/external/bsd/netdiff/lib/Makefile N othersrc/external/bsd/netdiff/lib/shlib_version No conflicts created by this import
CVS commit: src/usr.sbin/puffs/rump_lfs
Module Name:src Committed By: riastradh Date: Thu Jan 10 08:35:26 UTC 2013 Modified Files: src/usr.sbin/puffs/rump_lfs: rump_lfs.c Log Message: After mount_lfs_parseargs, reset getopt for lfs_cleaner_main. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/puffs/rump_lfs/rump_lfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/puffs/rump_lfs/rump_lfs.c diff -u src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.16 src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.17 --- src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.16 Wed Mar 3 17:37:01 2010 +++ src/usr.sbin/puffs/rump_lfs/rump_lfs.c Thu Jan 10 08:35:26 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_lfs.c,v 1.16 2010/03/03 17:37:01 pooka Exp $ */ +/* $NetBSD: rump_lfs.c,v 1.17 2013/01/10 08:35:26 riastradh Exp $ */ /* * Copyright (c) 2008 Antti Kantee. All Rights Reserved. @@ -82,6 +82,10 @@ main(int argc, char *argv[]) } mount_lfs_parseargs(argc, argv, args, mntflags, canon_dev, canon_dir); + /* Reset getopt for lfs_cleaner_main. */ + optreset = 1; + optind = 1; + p2m = p2k_init(0); if (!p2m) err(1, init p2k);
CVS commit: othersrc/external/bsd/netdiff/dist
Module Name:othersrc Committed By: wiz Date: Thu Jan 10 08:51:28 UTC 2013 Modified Files: othersrc/external/bsd/netdiff/dist: netdiff.1 Log Message: Fix date; add RCS Id. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/netdiff/dist/netdiff.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/netdiff/dist/netdiff.1 diff -u othersrc/external/bsd/netdiff/dist/netdiff.1:1.1.1.1 othersrc/external/bsd/netdiff/dist/netdiff.1:1.2 --- othersrc/external/bsd/netdiff/dist/netdiff.1:1.1.1.1 Thu Jan 10 08:17:11 2013 +++ othersrc/external/bsd/netdiff/dist/netdiff.1 Thu Jan 10 08:51:28 2013 @@ -1,3 +1,4 @@ +.\ $NetBSD: netdiff.1,v 1.2 2013/01/10 08:51:28 wiz Exp $ .\ $FreeBSD$ .\ $OpenBSD: diff.1,v 1.33 2007/05/31 19:20:09 jmc Exp $ .\ @@ -30,7 +31,7 @@ .\ .\ @(#)diff.1 8.1 (Berkeley) 6/30/93 .\ -.Dd Apr 7, 2008 +.Dd April 7, 2008 .Dt DIFF 1 .Os .Sh NAME
CVS commit: othersrc/external/bsd/netdiff/dist
Module Name:othersrc Committed By: wiz Date: Thu Jan 10 08:51:44 UTC 2013 Modified Files: othersrc/external/bsd/netdiff/dist: libnetdiff.3 Log Message: xref netdiff instead of bsddiff (I guess that was the intention). To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/netdiff/dist/libnetdiff.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/netdiff/dist/libnetdiff.3 diff -u othersrc/external/bsd/netdiff/dist/libnetdiff.3:1.1.1.1 othersrc/external/bsd/netdiff/dist/libnetdiff.3:1.2 --- othersrc/external/bsd/netdiff/dist/libnetdiff.3:1.1.1.1 Thu Jan 10 08:17:11 2013 +++ othersrc/external/bsd/netdiff/dist/libnetdiff.3 Thu Jan 10 08:51:44 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: libnetdiff.3,v 1.1.1.1 2013/01/10 08:17:11 agc Exp $ +.\ $NetBSD: libnetdiff.3,v 1.2 2013/01/10 08:51:44 wiz Exp $ .\ .\ Copyright (c) 2013 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -74,7 +74,7 @@ The .Nm library is a library interface to the BSD difference program -.Xr bsddiff 1 , +.Xr netdiff 1 , and is designed to be used either as an integral part of C programs, or as an interface to scripting languages, allowing them direct access to all of the features of the standard
CVS commit: src/share/man/man4
Module Name:src Committed By: skrll Date: Thu Jan 10 09:02:53 UTC 2013 Added Files: src/share/man/man4: usmsc.4 Log Message: Simple usmsc(4) man page. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/share/man/man4/usmsc.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/share/man/man4/usmsc.4 diff -u /dev/null src/share/man/man4/usmsc.4:1.1 --- /dev/null Thu Jan 10 09:02:53 2013 +++ src/share/man/man4/usmsc.4 Thu Jan 10 09:02:53 2013 @@ -0,0 +1,78 @@ +.\ $NetBSD: usmsc.4,v 1.1 2013/01/10 09:02:53 skrll Exp $ +.\ $OpenBSD: smsc.4,v 1.3 2012/09/20 07:40:26 jsg Exp $ +.\ +.\ Copyright (c) 2012 Jonathan Gray j...@openbsd.org +.\ +.\ Permission to use, copy, modify, and distribute this software for any +.\ purpose with or without fee is hereby granted, provided that the above +.\ copyright notice and this permission notice appear in all copies. +.\ +.\ THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES +.\ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +.\ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +.\ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +.\ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +.\ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +.\ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +.\ +.Dd January 9, 2013 +.Dt USMSC 4 +.Os +.Sh NAME +.Nm usmsc +.Nd SMSC LAN95xx 10/100 USB Ethernet device +.Sh SYNOPSIS +.Cd usmsc* at uhub? +.Cd ukphy* at mii? +.Sh DESCRIPTION +The +.Nm +driver supports SMSC LAN9500/LAN9500A/LAN9530/LAN9730/LAN89530 USB 2.0 10/100 +Ethernet devices and LAN951x USB 2.0 hub and 10/100 Ethernet devices, including: +.Pp +.Bl -tag -width Ds -offset indent -compact +.It RaspberryPI +.It Gamber Johnson MAG Docking Station 7160-0204 +.It Gamber Johnson MAG Docking Station 7160-0205 +.It Gamber Johnson MAG Docking Station 7160-0227 +.It GWC Technology HE2440 +.It HP USB Media Port Replicator +.It j5create Newport Station JUD200 +.It Kensington Universal Notebook Docking Station (K33926US) +.It LevelOne USB-0501 +.It Samsung Central Station monitors +.It StarTech USBVGADOCK2 +.It XPower XP2440 +.El +.Pp +For more information on configuring this device, see +.Xr ifconfig 8 . +.Sh SEE ALSO +.Xr arp 4 , +.Xr ifmedia 4 , +.Xr mii 4 , +.Xr netintro 4 , +.Xr uhub 4 , +.Xr ukphy 4 , +.Xr usb 4 , +.Xr ifconfig 8 +.Sh HISTORY +The +.Nm +driver was written by +.An Ben Gray +.Aq bg...@freebsd.org +for +.Fx +and ported to +.Nx +from the +.Ox version +by +.An Nick Hudson +.Aq sk...@netbsd.org . +.Pp +The +.Nm +driver first appeared in +.Nx 7.0 .
CVS commit: src/sys/kern
Module Name:src Committed By: mlelstv Date: Thu Jan 10 10:15:59 UTC 2013 Modified Files: src/sys/kern: subr_autoconf.c Log Message: Also report attachment of pseudo-devices to userland. To generate a diff of this commit: cvs rdiff -u -r1.224 -r1.225 src/sys/kern/subr_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/kern/subr_autoconf.c diff -u src/sys/kern/subr_autoconf.c:1.224 src/sys/kern/subr_autoconf.c:1.225 --- src/sys/kern/subr_autoconf.c:1.224 Sat Oct 27 17:18:39 2012 +++ src/sys/kern/subr_autoconf.c Thu Jan 10 10:15:59 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_autoconf.c,v 1.224 2012/10/27 17:18:39 chs Exp $ */ +/* $NetBSD: subr_autoconf.c,v 1.225 2013/01/10 10:15:59 mlelstv Exp $ */ /* * Copyright (c) 1996, 2000 Christopher G. Demetriou @@ -77,7 +77,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.224 2012/10/27 17:18:39 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: subr_autoconf.c,v 1.225 2013/01/10 10:15:59 mlelstv Exp $); #ifdef _KERNEL_OPT #include opt_ddb.h @@ -1585,7 +1585,12 @@ config_attach_pseudo(cfdata_t cf) #if 0 /* XXXJRT not yet */ device_register(dev, NULL); /* like a root node */ #endif + + /* Let userland know */ + devmon_report_device(dev, true); + (*dev-dv_cfattach-ca_attach)(ROOT, dev, NULL); + config_process_deferred(deferred_config_queue, dev); return dev; }
CVS commit: src/sys/arch/alpha/stand/netboot
Module Name:src Committed By: he Date: Thu Jan 10 10:36:41 UTC 2013 Modified Files: src/sys/arch/alpha/stand/netboot: getsecs.c Log Message: Include machine/cpu.h for alpha_rpcc declaration. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/stand/netboot/getsecs.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/alpha/stand/netboot/getsecs.c diff -u src/sys/arch/alpha/stand/netboot/getsecs.c:1.9 src/sys/arch/alpha/stand/netboot/getsecs.c:1.10 --- src/sys/arch/alpha/stand/netboot/getsecs.c:1.9 Mon Jan 12 11:32:43 2009 +++ src/sys/arch/alpha/stand/netboot/getsecs.c Thu Jan 10 10:36:41 2013 @@ -1,7 +1,8 @@ -/* $NetBSD: getsecs.c,v 1.9 2009/01/12 11:32:43 tsutsui Exp $ */ +/* $NetBSD: getsecs.c,v 1.10 2013/01/10 10:36:41 he Exp $ */ #include sys/param.h +#include machine/cpu.h #include netinet/in.h #include netinet/in_systm.h
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Thu Jan 10 13:10:26 UTC 2013
Modified Files:
src/sys/arch/luna68k/stand/boot: Makefile boot.ldscript
Log Message:
Link the target boot binary as a.out directly rather than using elf2aout(1).
Confirmed working on LUNA-I.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/boot.ldscript
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/luna68k/stand/boot/Makefile
diff -u src/sys/arch/luna68k/stand/boot/Makefile:1.2 src/sys/arch/luna68k/stand/boot/Makefile:1.3
--- src/sys/arch/luna68k/stand/boot/Makefile:1.2 Wed Jan 9 16:28:41 2013
+++ src/sys/arch/luna68k/stand/boot/Makefile Thu Jan 10 13:10:26 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2013/01/09 16:28:41 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3 2013/01/10 13:10:26 tsutsui Exp $
# @(#)Makefile 8.2 (Berkeley) 8/15/93
NOMAN= # defined
@@ -73,11 +73,10 @@ vers.c: ${.CURDIR}/version
${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}
${PROG}: ${LDSCRIPT} ${OBJS} ${LIBS}
- ${LD} ${LINKFORMAT} -x -o ${PROG}.elf ${OBJS} ${LIBS}
- ${ELF2AOUT} ${PROG}.elf ${PROG}.aout
+ ${LD} ${LINKFORMAT} -x -o ${PROG}.aout ${OBJS} ${LIBS}
mv ${PROG}.aout ${PROG}
-CLEANFILES+= ${PROG}.map ${PROG}.elf ${PROG}.gz
+CLEANFILES+= ${PROG}.aout
cleandir distclean: .WAIT cleanlibdir
Index: src/sys/arch/luna68k/stand/boot/boot.ldscript
diff -u src/sys/arch/luna68k/stand/boot/boot.ldscript:1.1 src/sys/arch/luna68k/stand/boot/boot.ldscript:1.2
--- src/sys/arch/luna68k/stand/boot/boot.ldscript:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/boot.ldscript Thu Jan 10 13:10:26 2013
@@ -1,6 +1,6 @@
-/* $NetBSD: boot.ldscript,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: boot.ldscript,v 1.2 2013/01/10 13:10:26 tsutsui Exp $ */
-OUTPUT_FORMAT(elf32-m68k)
+OUTPUT_FORMAT(a.out-m68k-netbsd)
OUTPUT_ARCH(m68k)
ENTRY(start)
SECTIONS
@@ -45,4 +45,6 @@ SECTIONS
_end = .;
_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
PROVIDE (end = .);
+
+ /DISCARD/ : { *(.ident) *(.stab) *(.stabstr) *(.comment) }
}
CVS commit: src/etc
Module Name:src
Committed By: skrll
Date: Thu Jan 10 13:38:37 UTC 2013
Modified Files:
src/etc: MAKEDEV.tmpl
src/etc/etc.evbarm: MAKEDEV.conf
Log Message:
Create a plcom0 device node for RaspberryPI
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/etc/MAKEDEV.tmpl
cvs rdiff -u -r1.8 -r1.9 src/etc/etc.evbarm/MAKEDEV.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.tmpl
diff -u src/etc/MAKEDEV.tmpl:1.159 src/etc/MAKEDEV.tmpl:1.160
--- src/etc/MAKEDEV.tmpl:1.159 Wed Sep 19 21:24:28 2012
+++ src/etc/MAKEDEV.tmpl Thu Jan 10 13:38:37 2013
@@ -1,5 +1,5 @@
#!/bin/sh -
-# $NetBSD: MAKEDEV.tmpl,v 1.159 2012/09/19 21:24:28 bouyer Exp $
+# $NetBSD: MAKEDEV.tmpl,v 1.160 2013/01/10 13:38:37 skrll Exp $
#
# Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -123,6 +123,7 @@
# ttyB0 UART on first 68901 (formerly mdm01) (atari)
# ixpcom IXP12x0 COM ports
# epcom EP93xx COM ports
+# plcom ARM PL01[01] serial ports
# ttyM? HP200/300 4 port serial mux interface (hp300)
# ttya ttya system console (luna68k)
# ttyb second system serial port (luna68k)
@@ -1899,6 +1900,11 @@ epcom[0-9]*)
mkdev epcom$unit c %epcom_chr% $unit $u_uucp
;;
+plcom[0-9]*)
+ unit=${i#plcom}
+ mkdev plcom$unit c %plcom_chr% $unit $u_uucp
+ ;;
+
ucbsnd)
mkdev ucbsnd c %ucbsnd_chr% 0 666
;;
Index: src/etc/etc.evbarm/MAKEDEV.conf
diff -u src/etc/etc.evbarm/MAKEDEV.conf:1.8 src/etc/etc.evbarm/MAKEDEV.conf:1.9
--- src/etc/etc.evbarm/MAKEDEV.conf:1.8 Sat Oct 13 01:13:59 2012
+++ src/etc/etc.evbarm/MAKEDEV.conf Thu Jan 10 13:38:37 2013
@@ -1,10 +1,10 @@
-# $NetBSD: MAKEDEV.conf,v 1.8 2012/10/13 01:13:59 jakllsch Exp $
+# $NetBSD: MAKEDEV.conf,v 1.9 2013/01/10 13:38:37 skrll Exp $
all_md)
makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3
makedev ld0 ld1 ld2 ld3 dk0 dk1 dk2 dk3 dk4 dk5 dk6 dk7
makedev flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7
- makedev tty0 tty1 st0 st1 ch0 cd0 cd1
+ makedev tty0 tty1 plcom0 st0 st1 ch0 cd0 cd1
makedev uk0 uk1 ss0
makedev lpa0 lpt0
makedev usbs isdns
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: jmcneill Date: Thu Jan 10 14:12:16 UTC 2013 Modified Files: src/sys/arch/arm/broadcom: bcm2835_genfb.c Log Message: only print switching to fb message if genfb is console To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm2835_genfb.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/arm/broadcom/bcm2835_genfb.c diff -u src/sys/arch/arm/broadcom/bcm2835_genfb.c:1.2 src/sys/arch/arm/broadcom/bcm2835_genfb.c:1.3 --- src/sys/arch/arm/broadcom/bcm2835_genfb.c:1.2 Wed Jan 9 23:58:40 2013 +++ src/sys/arch/arm/broadcom/bcm2835_genfb.c Thu Jan 10 14:12:16 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_genfb.c,v 1.2 2013/01/09 23:58:40 jmcneill Exp $ */ +/* $NetBSD: bcm2835_genfb.c,v 1.3 2013/01/10 14:12:16 jmcneill Exp $ */ /*- * Copyright (c) 2013 Jared D. McNeill jmcne...@invisible.ca @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bcm2835_genfb.c,v 1.2 2013/01/09 23:58:40 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: bcm2835_genfb.c,v 1.3 2013/01/10 14:12:16 jmcneill Exp $); #include sys/param.h #include sys/types.h @@ -77,6 +77,7 @@ bcmgenfb_attach(device_t parent, device_ struct amba_attach_args *aaa = aux; prop_dictionary_t dict = device_properties(self); struct genfb_ops ops; + bool is_console = false; int error; sc-sc_gen.sc_dev = self; @@ -84,6 +85,7 @@ bcmgenfb_attach(device_t parent, device_ sc-sc_wstype = WSDISPLAY_TYPE_VC4; prop_dictionary_get_uint32(dict, wsdisplay_type, sc-sc_wstype); + prop_dictionary_get_bool(dict, is_console, is_console); genfb_init(sc-sc_gen); @@ -108,7 +110,11 @@ bcmgenfb_attach(device_t parent, device_ ops.genfb_mmap = bcmgenfb_mmap; aprint_naive(\n); - aprint_normal(: switching to framebuffer console\n); + + if (is_console) + aprint_normal(: switching to framebuffer console\n); + else + aprint_normal(\n); genfb_attach(sc-sc_gen, ops); }
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src
Committed By: jmcneill
Date: Thu Jan 10 14:15:20 UTC 2013
Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
Modify fb attachment so genfb still attaches even if it isn't the console
device. Slight change to cmdline.txt to allow for this:
- console=fb enables fb console, otherwise serial console will be used
- fb=WxH to select a mode, otherwise EDID will be tried and fallback to
default mode (1280x720)
- fb=disable to disable fb completely
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/rpi/rpi_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/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.26 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.27
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.26 Wed Jan 9 23:58:40 2013
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Thu Jan 10 14:15:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.26 2013/01/09 23:58:40 jmcneill Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.27 2013/01/10 14:15:20 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.26 2013/01/09 23:58:40 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.27 2013/01/10 14:15:20 jmcneill Exp $);
#include opt_evbarm_boardtype.h
@@ -574,15 +574,15 @@ consinit(void)
static bool
rpi_fb_parse_mode(const char *s, uint32_t *pwidth, uint32_t *pheight)
{
- if (strncmp(s, fb, 2) != 0)
+ char *x;
+
+ if (strncmp(s, disable, 7) == 0)
return false;
- if (strncmp(s, fb:, 3) == 0) {
- char *x = strchr(s + 3, 'x');
- if (x) {
- *pwidth = strtoul(s + 3, NULL, 10);
- *pheight = strtoul(x + 1, NULL, 10);
- }
+ x = strchr(s, 'x');
+ if (x) {
+ *pwidth = strtoul(s, NULL, 10);
+ *pheight = strtoul(x + 1, NULL, 10);
}
return true;
@@ -625,15 +625,9 @@ rpi_fb_get_edid_mode(uint32_t *pwidth, u
* Initialize framebuffer console.
*
* Some notes about boot parameters:
- * - If console= specifies something other than fb, ignore framebuffer
- *completely.
- * - If console=fb is present, try to use the preferred mode of the
- *display from the EDID block. If the EDID block is not present, use
- *RPI_FB_WIDTH and RPI_FB_HEIGHT.
- * - If console=fb:widthxheight is present, use the specified mode.
- *
- * If the specified mode cannot be set, the framebuffer will not be used
- * as the console device.
+ * - If fb=disable is present, ignore framebuffer completely.
+ * - If fb=widthxheight is present, use the specified mode.
+ * - If console=fb is present, attach framebuffer to console.
*/
static bool
rpi_fb_init(prop_dictionary_t dict)
@@ -644,24 +638,18 @@ rpi_fb_init(prop_dictionary_t dict)
int integer;
int error;
- if (get_bootconf_option(boot_args, console,
+ if (get_bootconf_option(boot_args, fb,
BOOTOPT_TYPE_STRING, ptr)) {
if (rpi_fb_parse_mode(ptr, width, height) == false)
return false;
- if (width == 0 || height == 0)
- rpi_fb_get_edid_mode(width, height);
- if (width == 0 || height == 0) {
- width = RPI_FB_WIDTH;
- height = RPI_FB_HEIGHT;
- }
- } else {
- /* console= not specified, so only attach if EDID block found */
- if (rpi_fb_get_edid_mode(width, height) == false)
- return false;
}
-
- if (width == 0 || height == 0)
- return false;
+ if (width == 0 || height == 0) {
+ rpi_fb_get_edid_mode(width, height);
+ }
+ if (width == 0 || height == 0) {
+ width = RPI_FB_WIDTH;
+ height = RPI_FB_HEIGHT;
+ }
vb_setfb.vbt_res.width = width;
vb_setfb.vbt_res.height = height;
@@ -768,9 +756,15 @@ rpi_device_register(device_t dev, void *
#if NGENFB 0
if (device_is_a(dev, genfb)) {
+ char *ptr;
if (rpi_fb_init(dict) == false)
return;
- prop_dictionary_set_bool(dict, is_console, true);
+ if (get_bootconf_option(boot_args, console,
+ BOOTOPT_TYPE_STRING, ptr) strncmp(ptr, fb, 2) == 0) {
+ prop_dictionary_set_bool(dict, is_console, true);
+ } else {
+ prop_dictionary_set_bool(dict, is_console, false);
+ }
}
#endif
}
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Thu Jan 10 15:51:32 UTC 2013
Modified Files:
src/sys/arch/luna68k/stand/boot: Makefile boot.ldscript
Log Message:
Revert to using elf2aout(1) to build a.out binary.
a.out binary linked by ldscript doesn't work on some uncertain conditions.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/boot.ldscript
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/luna68k/stand/boot/Makefile
diff -u src/sys/arch/luna68k/stand/boot/Makefile:1.3 src/sys/arch/luna68k/stand/boot/Makefile:1.4
--- src/sys/arch/luna68k/stand/boot/Makefile:1.3 Thu Jan 10 13:10:26 2013
+++ src/sys/arch/luna68k/stand/boot/Makefile Thu Jan 10 15:51:32 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2013/01/10 13:10:26 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2013/01/10 15:51:32 tsutsui Exp $
# @(#)Makefile 8.2 (Berkeley) 8/15/93
NOMAN= # defined
@@ -73,10 +73,11 @@ vers.c: ${.CURDIR}/version
${.CURDIR}/version ${MACHINE} ${NEWVERSWHAT}
${PROG}: ${LDSCRIPT} ${OBJS} ${LIBS}
- ${LD} ${LINKFORMAT} -x -o ${PROG}.aout ${OBJS} ${LIBS}
+ ${LD} ${LINKFORMAT} -x -o ${PROG}.elf ${OBJS} ${LIBS}
+ ${ELF2AOUT} ${PROG}.elf ${PROG}.aout
mv ${PROG}.aout ${PROG}
-CLEANFILES+= ${PROG}.aout
+CLEANFILES+= ${PROG}.aout ${PROG}.elf
cleandir distclean: .WAIT cleanlibdir
Index: src/sys/arch/luna68k/stand/boot/boot.ldscript
diff -u src/sys/arch/luna68k/stand/boot/boot.ldscript:1.2 src/sys/arch/luna68k/stand/boot/boot.ldscript:1.3
--- src/sys/arch/luna68k/stand/boot/boot.ldscript:1.2 Thu Jan 10 13:10:26 2013
+++ src/sys/arch/luna68k/stand/boot/boot.ldscript Thu Jan 10 15:51:32 2013
@@ -1,6 +1,6 @@
-/* $NetBSD: boot.ldscript,v 1.2 2013/01/10 13:10:26 tsutsui Exp $ */
+/* $NetBSD: boot.ldscript,v 1.3 2013/01/10 15:51:32 tsutsui Exp $ */
-OUTPUT_FORMAT(a.out-m68k-netbsd)
+OUTPUT_FORMAT(elf32-m68k)
OUTPUT_ARCH(m68k)
ENTRY(start)
SECTIONS
@@ -45,6 +45,4 @@ SECTIONS
_end = .;
_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;
PROVIDE (end = .);
-
- /DISCARD/ : { *(.ident) *(.stab) *(.stabstr) *(.comment) }
}
CVS commit: src/lib/libedit
Module Name:src Committed By: wiz Date: Thu Jan 10 16:03:06 UTC 2013 Modified Files: src/lib/libedit: editline.3 Log Message: In 2000, .editrc reading from $PWD was removed. Update the man page. From LEVAI Daniel via jmc@OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/lib/libedit/editline.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libedit/editline.3 diff -u src/lib/libedit/editline.3:1.77 src/lib/libedit/editline.3:1.78 --- src/lib/libedit/editline.3:1.77 Tue Sep 11 20:29:58 2012 +++ src/lib/libedit/editline.3 Thu Jan 10 16:03:06 2013 @@ -1,6 +1,6 @@ -.\ $NetBSD: editline.3,v 1.77 2012/09/11 20:29:58 christos Exp $ +.\ $NetBSD: editline.3,v 1.78 2013/01/10 16:03:06 wiz Exp $ .\ -.\ Copyright (c) 1997-2003 The NetBSD Foundation, Inc. +.\ Copyright (c) 1997-2013 The NetBSD Foundation, Inc. .\ All rights reserved. .\ .\ This file was contributed to The NetBSD Foundation by Luke Mewburn. @@ -26,7 +26,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd September 11, 2012 +.Dd January 10, 2013 .Dt EDITLINE 3 .Os .Sh NAME @@ -581,8 +581,6 @@ If is .Dv NULL , try -.Pa $PWD/.editrc -then .Pa $HOME/.editrc . Refer to .Xr editrc 5
CVS commit: src/lib/libedit
Module Name:src Committed By: wiz Date: Thu Jan 10 16:03:42 UTC 2013 Modified Files: src/lib/libedit: editrc.5 Log Message: Add FILES section. From jmc@OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/lib/libedit/editrc.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libedit/editrc.5 diff -u src/lib/libedit/editrc.5:1.26 src/lib/libedit/editrc.5:1.27 --- src/lib/libedit/editrc.5:1.26 Sat Jun 2 14:19:20 2012 +++ src/lib/libedit/editrc.5 Thu Jan 10 16:03:42 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: editrc.5,v 1.26 2012/06/02 14:19:20 njoly Exp $ +.\ $NetBSD: editrc.5,v 1.27 2013/01/10 16:03:42 wiz Exp $ .\ .\ Copyright (c) 1997-2000 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -26,7 +26,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd October 18, 2003 +.Dd January 10, 2013 .Dt EDITRC 5 .Os .Sh NAME @@ -478,6 +478,13 @@ Move down one line. Editline extended command. .El .\ End of section automatically generated with makelist +.Sh FILES +.Bl -tag -width ~/.editrcXXX +.It Pa ~/.editrc +User configuration file for the +.Xr editline 3 +library. +.El .Sh SEE ALSO .Xr editline 3 , .Xr regex 3 ,
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Thu Jan 10 16:03:49 UTC 2013 Modified Files: src/sys/arch/luna68k/stand/boot: locore.S Log Message: Use proper asm symbol macro. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/locore.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/luna68k/stand/boot/locore.S diff -u src/sys/arch/luna68k/stand/boot/locore.S:1.1 src/sys/arch/luna68k/stand/boot/locore.S:1.2 --- src/sys/arch/luna68k/stand/boot/locore.S:1.1 Sat Jan 5 17:44:24 2013 +++ src/sys/arch/luna68k/stand/boot/locore.S Thu Jan 10 16:03:49 2013 @@ -102,82 +102,83 @@ .text - .globl Reset - .globl _buserr,_addrerr - .globl _illinst,_zerodiv,_chkinst,_trapvinst,_privinst - .globl _lev6intr,_lev5intr,_lev3intr,_lev2intr,_badtrap - ASENTRY_NOPROFILE(start) -Reset: +ASGLOBAL(Reset) jmp _C_LABEL(start1) /* 0: NOT USED (reset PC) */ .word 0 /* 1: NOT USED (reset PC) */ - .long _buserr /* 2: bus error */ - .long _addrerr /* 3: address error */ - .long _illinst /* 4: illegal instruction */ - .long _zerodiv /* 5: zero divide */ - .long _chkinst /* 6: CHK instruction */ - .long _trapvinst /* 7: TRAPV instruction */ - .long _privinst /* 8: privilege violation */ - .long _badtrap /* 9: trace */ - .long _illinst /* 10: line 1010 emulator */ - .long _illinst /* 11: line emulator */ - .long _badtrap /* 12: unassigned, reserved */ - .long _coperr /* 13: coprocessor protocol violation */ - .long _fmterr /* 14: format error */ - .long _badtrap /* 15: uninitialized interrupt vector */ - .long _badtrap /* 16: unassigned, reserved */ - .long _badtrap /* 17: unassigned, reserved */ - .long _badtrap /* 18: unassigned, reserved */ - .long _badtrap /* 19: unassigned, reserved */ - .long _badtrap /* 20: unassigned, reserved */ - .long _badtrap /* 21: unassigned, reserved */ - .long _badtrap /* 22: unassigned, reserved */ - .long _badtrap /* 23: unassigned, reserved */ - .long _badtrap /* 24: spurious interrupt */ - .long _badtrap /* 25: level 1 interrupt autovector */ - .long _lev2intr /* 26: level 2 interrupt autovector */ - .long _lev3intr /* 27: level 3 interrupt autovector */ - .long _badtrap /* 28: level 4 interrupt autovector */ - .long _lev5intr /* 29: level 5 interrupt autovector */ - .long _lev6intr /* 30: level 6 interrupt autovector */ - .long _badtrap /* 31: level 7 interrupt autovector */ - .long _illinst /* 32: syscalls */ - .long _illinst /* 33: sigreturn syscall or breakpoint */ - .long _illinst /* 34: breakpoint or sigreturn syscall */ - .long _illinst /* 35: TRAP instruction vector */ - .long _illinst /* 36: TRAP instruction vector */ - .long _illinst /* 37: TRAP instruction vector */ - .long _illinst /* 38: TRAP instruction vector */ - .long _illinst /* 39: TRAP instruction vector */ - .long _illinst /* 40: TRAP instruction vector */ - .long _illinst /* 41: TRAP instruction vector */ - .long _illinst /* 42: TRAP instruction vector */ - .long _illinst /* 43: TRAP instruction vector */ - .long _illinst /* 44: TRAP instruction vector */ - .long _illinst /* 45: TRAP instruction vector */ - .long _illinst /* 46: TRAP instruction vector */ - .long _illinst /* 47: TRAP instruction vector */ - .long _fptrap /* 48: FPCP branch/set on unordered cond */ - .long _fptrap /* 49: FPCP inexact result */ - .long _fptrap /* 50: FPCP divide by zero */ - .long _fptrap /* 51: FPCP underflow */ - .long _fptrap /* 52: FPCP operand error */ - .long _fptrap /* 53: FPCP overflow */ - .long _fptrap /* 54: FPCP signalling NAN */ - - .long _badtrap /* 55: unassigned, reserved */ - .long _badtrap /* 56: unassigned, reserved */ - .long _badtrap /* 57: unassigned, reserved */ - .long _badtrap /* 58: unassigned, reserved */ - .long _badtrap /* 59: unassigned, reserved */ - .long _badtrap /* 60: unassigned, reserved */ - .long _badtrap /* 61: unassigned, reserved */ - .long _badtrap /* 62: unassigned, reserved */ - .long _badtrap /* 63: unassigned, reserved */ -#define BADTRAP16 .long _badtrap,_badtrap,_badtrap,_badtrap,\ -_badtrap,_badtrap,_badtrap,_badtrap,\ -_badtrap,_badtrap,_badtrap,_badtrap,\ -_badtrap,_badtrap,_badtrap,_badtrap + VECTOR(buserr) /* 2: bus error */ + VECTOR(addrerr) /* 3: address error */ + VECTOR(illinst) /* 4: illegal instruction */ + VECTOR(zerodiv) /* 5: zero divide */ + VECTOR(chkinst) /* 6: CHK instruction */ + VECTOR(trapvinst) /* 7: TRAPV instruction */ + VECTOR(privinst) /* 8: privilege violation */ + VECTOR(badtrap) /* 9: trace */ + VECTOR(illinst) /* 10: line 1010 emulator */ + VECTOR(illinst) /* 11: line emulator */ + VECTOR(badtrap) /* 12: unassigned, reserved */ + VECTOR(coperr) /* 13: coprocessor protocol violation */ + VECTOR(fmterr) /* 14: format error */ + VECTOR(badtrap) /* 15: uninitialized interrupt vector */ + VECTOR(badtrap) /* 16: unassigned, reserved */ + VECTOR(badtrap)
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Thu Jan 10 16:20:11 UTC 2013
Modified Files:
src/sys/arch/luna68k/stand/boot: disklabel.c omron_disklabel.h
Log Message:
Make disklabel command print correct disklabel info.
- use exact-width interger types to define on-disk format
(daddr_t could be a different size)
- use proper LABELOFFSET to locate BSD disklabel
(LABELOFFSET for luna68k is 64 as 4.4BSD-Lite2 while other
ports that use sun_disklabel use 128)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/disklabel.c \
src/sys/arch/luna68k/stand/boot/omron_disklabel.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/luna68k/stand/boot/disklabel.c
diff -u src/sys/arch/luna68k/stand/boot/disklabel.c:1.1 src/sys/arch/luna68k/stand/boot/disklabel.c:1.2
--- src/sys/arch/luna68k/stand/boot/disklabel.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/disklabel.c Thu Jan 10 16:20:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.c,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: disklabel.c,v 1.2 2013/01/10 16:20:11 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -112,7 +112,7 @@ int
disklabel(int argc, char *argv[])
{
struct scd_dk_label *omp = (struct scd_dk_label *) lbl_buff;
- struct disklabel*bp = (struct disklabel *)omp-dkl_pad;
+ struct disklabel*bp = (struct disklabel *)lbl_buff[LABELOFFSET];
struct fs *fp = (struct fs *) lbl_buff;
u_short *p;
u_long chksum, count;
@@ -147,7 +147,7 @@ disklabel(int argc, char *argv[])
printf(Offset = %d\n, i);
printf(\n);
printf(Checksum of Bad Track:\t0x%x\n, omp-dkl_badchk);
- printf(Logical Block Total:\t%lu(0x%lx)\n, omp-dkl_maxblk, omp-dkl_maxblk);
+ printf(Logical Block Total:\t%u(0x%x)\n, omp-dkl_maxblk, omp-dkl_maxblk);
printf(Disk Drive Type:\t0x%x\n, omp-dkl_dtype);
printf(Number of Disk Drives:\t%d(0x%x)\n, omp-dkl_ndisk, omp-dkl_ndisk);
printf(Number of Data Cylinders:\t%d(0x%x)\n, omp-dkl_ncyl, omp-dkl_ncyl);
@@ -162,8 +162,8 @@ disklabel(int argc, char *argv[])
printf(Physical Partition Number:\t%d(0x%x)\n,
omp-dkl_ppart, omp-dkl_ppart);
for (i = 0; i NLPART; i++)
- printf(\t%d:\t%ld\t%ld\n, i,
- (long)omp-dkl_map[i].dkl_blkno, (long)omp-dkl_map[i].dkl_nblk);
+ printf(\t%d:\t%d\t%d\n, i,
+ omp-dkl_map[i].dkl_blkno, omp-dkl_map[i].dkl_nblk);
printf(Identifies This Label Format:\t0x%x\n, omp-dkl_magic);
printf(XOR Checksum of Sector:\t0x%x\n, omp-dkl_cksum);
} else if (!strcmp(argv[1], checksum)) {
Index: src/sys/arch/luna68k/stand/boot/omron_disklabel.h
diff -u src/sys/arch/luna68k/stand/boot/omron_disklabel.h:1.1 src/sys/arch/luna68k/stand/boot/omron_disklabel.h:1.2
--- src/sys/arch/luna68k/stand/boot/omron_disklabel.h:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/omron_disklabel.h Thu Jan 10 16:20:11 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omron_disklabel.h,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: omron_disklabel.h,v 1.2 2013/01/10 16:20:11 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -80,20 +80,20 @@
struct scd_dk_label {
char dkl_asciilabel[128]; /* for compatibility */
char dkl_pad[512-(128+8*8+11*2+4)];
- unsigned short dkl_badchk; /* checksum of bad track */
- unsigned long dkl_maxblk; /* # of total logical block */
- unsigned short dkl_dtype; /* disk drive type */
- unsigned short dkl_ndisk; /* # of disk drives */
- unsigned short dkl_ncyl; /* # of data cylinders */
- unsigned short dkl_acyl; /* # of alternate cylinders */
- unsigned short dkl_nhead; /* # of heads in this partition */
- unsigned short dkl_nsect; /* # of 512 byte sectors per track */
- unsigned short dkl_bhead; /* identifies proper label locations */
- unsigned short dkl_ppart; /* physical partition # */
+ uint16_t dkl_badchk; /* checksum of bad track */
+ uint32_t dkl_maxblk; /* # of total logical block */
+ uint16_t dkl_dtype; /* disk drive type */
+ uint16_t dkl_ndisk; /* # of disk drives */
+ uint16_t dkl_ncyl; /* # of data cylinders */
+ uint16_t dkl_acyl; /* # of alternate cylinders */
+ uint16_t dkl_nhead; /* # of heads in this partition */
+ uint16_t dkl_nsect; /* # of 512 byte sectors per track */
+ uint16_t dkl_bhead; /* identifies proper label locations */
+ uint16_t dkl_ppart; /* physical partition # */
struct dk_map {/* logical partitions */
- daddr_t dkl_blkno; /* starting block */
- daddr_t dkl_nblk; /* number of blocks */
+ int32_t dkl_blkno; /* starting block */
+ int32_t dkl_nblk; /* number of blocks */
} dkl_map[NLPART];
- unsigned short dkl_magic; /* identifies this label format */
- unsigned short dkl_cksum; /* xor checksum of sector */
+ uint16_t dkl_magic; /* identifies this label format */
+ uint16_t dkl_cksum; /* xor checksum of sector */
};
CVS commit: src/sys/dev/sdmmc
Module Name:src
Committed By: jmcneill
Date: Thu Jan 10 17:19:33 UTC 2013
Modified Files:
src/sys/dev/sdmmc: sdhc.c sdhcvar.h
Log Message:
add SDHC_FLAG_NO_HS_BIT flag to prevent sdhc driver from setting the
SDHC_HIGH_SPEED bit in SDHC_HOST_CTL, required to get many high speed cards
working on rpi
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/sys/dev/sdmmc/sdhc.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/sdmmc/sdhcvar.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/sdmmc/sdhc.c
diff -u src/sys/dev/sdmmc/sdhc.c:1.42 src/sys/dev/sdmmc/sdhc.c:1.43
--- src/sys/dev/sdmmc/sdhc.c:1.42 Tue Jan 8 19:36:38 2013
+++ src/sys/dev/sdmmc/sdhc.c Thu Jan 10 17:19:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc.c,v 1.42 2013/01/08 19:36:38 jakllsch Exp $ */
+/* $NetBSD: sdhc.c,v 1.43 2013/01/10 17:19:33 jmcneill Exp $ */
/* $OpenBSD: sdhc.c,v 1.25 2009/01/13 19:44:20 grange Exp $ */
/*
@@ -23,7 +23,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.42 2013/01/08 19:36:38 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: sdhc.c,v 1.43 2013/01/10 17:19:33 jmcneill Exp $);
#ifdef _KERNEL_OPT
#include opt_sdmmc.h
@@ -949,7 +949,8 @@ sdhc_bus_clock(sdmmc_chipset_handle_t sc
*/
HSET2(hp, SDHC_CLOCK_CTL, SDHC_SDCLK_ENABLE);
- if (freq 25000)
+ if (freq 25000
+ !ISSET(hp-sc-sc_flags, SDHC_FLAG_NO_HS_BIT))
HSET1(hp, SDHC_HOST_CTL, SDHC_HIGH_SPEED);
else
HCLR1(hp, SDHC_HOST_CTL, SDHC_HIGH_SPEED);
Index: src/sys/dev/sdmmc/sdhcvar.h
diff -u src/sys/dev/sdmmc/sdhcvar.h:1.12 src/sys/dev/sdmmc/sdhcvar.h:1.13
--- src/sys/dev/sdmmc/sdhcvar.h:1.12 Thu Dec 20 14:37:00 2012
+++ src/sys/dev/sdmmc/sdhcvar.h Thu Jan 10 17:19:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhcvar.h,v 1.12 2012/12/20 14:37:00 jakllsch Exp $ */
+/* $NetBSD: sdhcvar.h,v 1.13 2013/01/10 17:19:33 jmcneill Exp $ */
/* $OpenBSD: sdhcvar.h,v 1.3 2007/09/06 08:01:01 jsg Exp $ */
/*
@@ -48,6 +48,7 @@ struct sdhc_softc {
#define SDHC_FLAG_RSP136_CRC 0x0400 /* Resp 136 with CRC and end-bit */
#define SDHC_FLAG_SINGLE_ONLY 0x0800 /* Single transfer only */
#define SDHC_FLAG_WAIT_RESET 0x1000 /* Wait for soft resets to start */
+#define SDHC_FLAG_NO_HS_BIT 0x2000 /* Don't set SDHC_HIGH_SPEED bit */
uint32_t sc_clkbase;
int sc_clkmsk; /* Mask for SDCLK */
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: jmcneill Date: Thu Jan 10 17:21:36 UTC 2013 Modified Files: src/sys/arch/arm/broadcom: bcm2835_emmc.c Log Message: reinstate SDHC_HIGH_SPEED_SUPP capability, and add SDHC_FLAG_NO_HS_BIT flag to workaround bcm2835 sdhc issue with many high speed cards To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/broadcom/bcm2835_emmc.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/arm/broadcom/bcm2835_emmc.c diff -u src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.6 src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.7 --- src/sys/arch/arm/broadcom/bcm2835_emmc.c:1.6 Thu Jan 10 03:59:22 2013 +++ src/sys/arch/arm/broadcom/bcm2835_emmc.c Thu Jan 10 17:21:36 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: bcm2835_emmc.c,v 1.6 2013/01/10 03:59:22 jmcneill Exp $ */ +/* $NetBSD: bcm2835_emmc.c,v 1.7 2013/01/10 17:21:36 jmcneill Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: bcm2835_emmc.c,v 1.6 2013/01/10 03:59:22 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: bcm2835_emmc.c,v 1.7 2013/01/10 17:21:36 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -87,7 +87,9 @@ bcmemmc_attach(device_t parent, device_t sc-sc.sc_flags = 0; sc-sc.sc_flags |= SDHC_FLAG_32BIT_ACCESS; sc-sc.sc_flags |= SDHC_FLAG_HOSTCAPS; - sc-sc.sc_caps = SDHC_VOLTAGE_SUPP_3_3V | SDHC_MAX_BLK_LEN_1024; + sc-sc.sc_flags |= SDHC_FLAG_NO_HS_BIT; + sc-sc.sc_caps = SDHC_VOLTAGE_SUPP_3_3V | SDHC_HIGH_SPEED_SUPP | + SDHC_MAX_BLK_LEN_1024; #if notyet sc-sc.sc_flags |= SDHC_FLAG_USE_DMA; sc-sc.sc_caps |= SDHC_DMA_SUPPORT;
CVS commit: src/sys/arch/evbarm/beagle
Module Name:src
Committed By: macallan
Date: Thu Jan 10 17:36:36 UTC 2013
Modified Files:
src/sys/arch/evbarm/beagle: beagle_machdep.c
Log Message:
do as RPi does - if console=fb is in bootargs, tell omapfb to become the
console and com not to, otherwise let com be the console
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/beagle/beagle_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/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.33 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.34
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.33 Tue Jan 1 23:21:26 2013
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Thu Jan 10 17:36:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.33 2013/01/01 23:21:26 jmcneill Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.34 2013/01/10 17:36:35 macallan Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: beagle_machdep.c,v 1.33 2013/01/01 23:21:26 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: beagle_machdep.c,v 1.34 2013/01/10 17:36:35 macallan Exp $);
#include opt_machdep.h
#include opt_ddb.h
@@ -186,6 +186,8 @@ __KERNEL_RCSID(0, $NetBSD: beagle_machd
#include prcm.h
#include omapwdt32k.h
+#include ukbd.h
+#include dev/usb/ukbdvar.h
#ifdef BOOT_ARGS
#define DEFAULT_BOOT_ARGS BOOT_ARGS
@@ -207,6 +209,8 @@ u_int uboot_args[4] = { 0 }; /* filled i
extern char KERNEL_BASE_phys[];
extern char _end[];
+int use_fb_console = false;
+
/*
* Macros to translate between physical and virtual for a subset of the
* kernel address space. *Not* for general use.
@@ -396,6 +400,7 @@ u_int
initarm(void *arg)
{
psize_t ram_size = 0;
+ char *ptr;
#if 1
beagle_putchar('d');
#endif
@@ -440,7 +445,7 @@ initarm(void *arg)
printf(\nNetBSD/evbarm (beagle) booting ...\n);
#endif
-#ifdef BOOT_ARGS
+#ifdef BOOT_ARGSt
char mi_bootargs[] = BOOT_ARGS;
parse_mi_bootargs(mi_bootargs);
#endif
@@ -487,7 +492,13 @@ initarm(void *arg)
db_trap_callback = beagle_db_trap;
+ if (get_bootconf_option(boot_args, console,
+ BOOTOPT_TYPE_STRING, ptr) strncmp(ptr, fb, 2) == 0) {
+ use_fb_console = true;
+ }
+
return initarm_common(KERNEL_VM_BASE, KERNEL_VM_SIZE, NULL, 0);
+
}
static void
@@ -544,6 +555,10 @@ consinit(void)
bus_space_unmap(omap_a4x_bs_tag, bh, OMAP_COM_SIZE);
+#if NUKBD 0
+ ukbd_cnattach(); /* allow USB keyboard to become console */
+#endif
+
beagle_putchar('f');
beagle_putchar('g');
}
@@ -783,6 +798,12 @@ beagle_device_register(device_t self, vo
prop_data_create_data(beagle_edid,
sizeof(beagle_edid)));
}
+ if (use_fb_console)
+ prop_dictionary_set_bool(dict, is_console, true);
return;
}
+ if (device_is_a(self, com)) {
+ if (use_fb_console)
+ prop_dictionary_set_bool(dict, is_console, false);
+ }
}
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: macallan
Date: Thu Jan 10 17:38:10 UTC 2013
Modified Files:
src/sys/dev/ic: com.c
Log Message:
don't try to become console if we get is_console=false as device property
To generate a diff of this commit:
cvs rdiff -u -r1.306 -r1.307 src/sys/dev/ic/com.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/ic/com.c
diff -u src/sys/dev/ic/com.c:1.306 src/sys/dev/ic/com.c:1.307
--- src/sys/dev/ic/com.c:1.306 Mon May 21 20:51:46 2012
+++ src/sys/dev/ic/com.c Thu Jan 10 17:38:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: com.c,v 1.306 2012/05/21 20:51:46 skrll Exp $ */
+/* $NetBSD: com.c,v 1.307 2013/01/10 17:38:10 macallan Exp $ */
/*-
* Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: com.c,v 1.306 2012/05/21 20:51:46 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: com.c,v 1.307 2013/01/10 17:38:10 macallan Exp $);
#include opt_com.h
#include opt_ddb.h
@@ -379,9 +379,14 @@ com_attach_subr(struct com_softc *sc)
u_int8_t lcr;
#endif
const char *fifo_msg = NULL;
+ prop_dictionary_t dict;
+ bool is_console = true;
aprint_naive(\n);
+ dict = device_properties(sc-sc_dev);
+ prop_dictionary_get_bool(dict, is_console, is_console);
+
callout_init(sc-sc_diag_callout, 0);
mutex_init(sc-sc_lock, MUTEX_DEFAULT, IPL_HIGH);
@@ -402,9 +407,13 @@ com_attach_subr(struct com_softc *sc)
(u_long)comcons_info.regs.cr_iobase);
}
+
/* Make sure the console is always hardwired. */
delay(1); /* wait for output to finish */
- SET(sc-sc_hwflags, COM_HW_CONSOLE);
+ if (is_console) {
+ SET(sc-sc_hwflags, COM_HW_CONSOLE);
+ }
+
SET(sc-sc_swflags, TIOCFLAG_SOFTCAR);
}
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Thu Jan 10 19:13:05 UTC 2013
Modified Files:
src/lib/librumpuser: rumpuser.c
Log Message:
Provide an implementation of writewatchfile for platforms without kqueue
or inotify (it's a rather simple implementation ;)
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/lib/librumpuser/rumpuser.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/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.25 src/lib/librumpuser/rumpuser.c:1.26
--- src/lib/librumpuser/rumpuser.c:1.25 Fri Dec 14 10:48:48 2012
+++ src/lib/librumpuser/rumpuser.c Thu Jan 10 19:13:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.25 2012/12/14 10:48:48 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.26 2013/01/10 19:13:04 pooka Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: rumpuser.c,v 1.25 2012/12/14 10:48:48 pooka Exp $);
+__RCSID($NetBSD: rumpuser.c,v 1.26 2013/01/10 19:13:04 pooka Exp $);
#endif /* !lint */
#include sys/ioctl.h
@@ -696,6 +696,31 @@ rumpuser_writewatchfile_wait(int kq, int
}
return (nn/sizeof(iev));
}
+
+#else
+
+/* a polling default implementation */
+int
+rumpuser_writewatchfile_setup(int inotify, int fd, intptr_t notused, int *error)
+{
+ static int warned = 0;
+
+ if (!warned) {
+ fprintf(WARNING: rumpuser writewatchfile routines are
+ polling-only on this platform\n);
+ warned = 1;
+ }
+
+ return 0;
+}
+
+int
+rumpuser_writewatchfile_wait(int kq, intptr_t *opaque, int *error)
+{
+
+ KLOCK_WRAP(usleep(1));
+ return 0;
+}
#endif
/*
CVS commit: src/lib/librumpuser
Module Name:src
Committed By: pooka
Date: Thu Jan 10 19:14:12 UTC 2013
Modified Files:
src/lib/librumpuser: rumpuser.c
Log Message:
.. and make it compile on said platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/lib/librumpuser/rumpuser.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/librumpuser/rumpuser.c
diff -u src/lib/librumpuser/rumpuser.c:1.26 src/lib/librumpuser/rumpuser.c:1.27
--- src/lib/librumpuser/rumpuser.c:1.26 Thu Jan 10 19:13:04 2013
+++ src/lib/librumpuser/rumpuser.c Thu Jan 10 19:14:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpuser.c,v 1.26 2013/01/10 19:13:04 pooka Exp $ */
+/* $NetBSD: rumpuser.c,v 1.27 2013/01/10 19:14:12 pooka Exp $ */
/*
* Copyright (c) 2007-2010 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
#include rumpuser_port.h
#if !defined(lint)
-__RCSID($NetBSD: rumpuser.c,v 1.26 2013/01/10 19:13:04 pooka Exp $);
+__RCSID($NetBSD: rumpuser.c,v 1.27 2013/01/10 19:14:12 pooka Exp $);
#endif /* !lint */
#include sys/ioctl.h
@@ -706,7 +706,7 @@ rumpuser_writewatchfile_setup(int inotif
static int warned = 0;
if (!warned) {
- fprintf(WARNING: rumpuser writewatchfile routines are
+ fprintf(stderr, WARNING: rumpuser writewatchfile routines are
polling-only on this platform\n);
warned = 1;
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Thu Jan 10 20:31:05 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: add missing call to dwc_otg_xfer_end() in dwc_otg_device_bulk_done To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/dwc_otg.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/usb/dwc_otg.c diff -u src/sys/dev/usb/dwc_otg.c:1.1 src/sys/dev/usb/dwc_otg.c:1.2 --- src/sys/dev/usb/dwc_otg.c:1.1 Wed Jan 9 22:23:44 2013 +++ src/sys/dev/usb/dwc_otg.c Thu Jan 10 20:31:04 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_otg.c,v 1.1 2013/01/09 22:23:44 skrll Exp $ */ +/* $NetBSD: dwc_otg.c,v 1.2 2013/01/10 20:31:04 jmcneill Exp $ */ /*- * Copyright (c) 2012 Hans Petter Selasky. All rights reserved. @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.1 2013/01/09 22:23:44 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.2 2013/01/10 20:31:04 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -1410,6 +1410,7 @@ dwc_otg_device_bulk_done(usbd_xfer_handl DPRINTF(\n); + dwc_otg_xfer_end(xfer); sc = sc; }
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Thu Jan 10 21:25:54 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: defer updating td actlen until we get acknowledgement that the tx was successful, fixes umass writes (and probably a lot of other things) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/dwc_otg.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/usb/dwc_otg.c diff -u src/sys/dev/usb/dwc_otg.c:1.2 src/sys/dev/usb/dwc_otg.c:1.3 --- src/sys/dev/usb/dwc_otg.c:1.2 Thu Jan 10 20:31:04 2013 +++ src/sys/dev/usb/dwc_otg.c Thu Jan 10 21:25:53 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_otg.c,v 1.2 2013/01/10 20:31:04 jmcneill Exp $ */ +/* $NetBSD: dwc_otg.c,v 1.3 2013/01/10 21:25:53 jmcneill Exp $ */ /*- * Copyright (c) 2012 Hans Petter Selasky. All rights reserved. @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.2 2013/01/10 20:31:04 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.3 2013/01/10 21:25:53 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -3013,6 +3013,7 @@ dwc_otg_host_data_tx(struct dwc_otg_td * if (!dwc_otg_host_channel_wait(td)) break; + td-actlen += td-tx_bytes; td-offset += td-tx_bytes; td-remainder -= td-tx_bytes; td-toggle ^= 1; @@ -3159,7 +3160,6 @@ send_pkt_sync: /* store number of bytes transmitted */ td-tx_bytes = count; - td-actlen += count; goto busy; send_cpkt:
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jmcneill
Date: Thu Jan 10 21:50:56 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c
Log Message:
also need to update actlen on ack for split transfers
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/dwc_otg.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/usb/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.3 src/sys/dev/usb/dwc_otg.c:1.4
--- src/sys/dev/usb/dwc_otg.c:1.3 Thu Jan 10 21:25:53 2013
+++ src/sys/dev/usb/dwc_otg.c Thu Jan 10 21:50:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.3 2013/01/10 21:25:53 jmcneill Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.4 2013/01/10 21:50:56 jmcneill Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.3 2013/01/10 21:25:53 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.4 2013/01/10 21:50:56 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -3059,6 +3059,7 @@ dwc_otg_host_data_tx(struct dwc_otg_td *
if (hcint HCINT_ACK) {
if (!dwc_otg_host_channel_wait(td))
break;
+ td-actlen += td-tx_bytes;
td-offset += td-tx_bytes;
td-remainder -= td-tx_bytes;
td-toggle ^= 1;
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: jmcneill
Date: Thu Jan 10 21:57:38 UTC 2013
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_space.c
Log Message:
basic mmap support, ok skrll
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/bcm2835_space.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/arm/broadcom/bcm2835_space.c
diff -u src/sys/arch/arm/broadcom/bcm2835_space.c:1.1 src/sys/arch/arm/broadcom/bcm2835_space.c:1.2
--- src/sys/arch/arm/broadcom/bcm2835_space.c:1.1 Thu Jul 26 06:21:57 2012
+++ src/sys/arch/arm/broadcom/bcm2835_space.c Thu Jan 10 21:57:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_space.c,v 1.1 2012/07/26 06:21:57 skrll Exp $ */
+/* $NetBSD: bcm2835_space.c,v 1.2 2013/01/10 21:57:38 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_space.c,v 1.1 2012/07/26 06:21:57 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_space.c,v 1.2 2013/01/10 21:57:38 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -65,7 +65,7 @@ struct bus_space bcm2835_bs_tag = {
bcm2835_bs_vaddr,
/* mmap */
- bs_notimpl_bs_mmap,
+ bcm2835_bs_mmap,
/* barrier */
bcm2835_bs_barrier,
@@ -373,6 +373,12 @@ bcm2835_bs_vaddr(void *t, bus_space_hand
return (void *)bsh;
}
+paddr_t
+bcm2835_bs_mmap(void *t, bus_addr_t paddr, off_t offset, int prot, int flags)
+{
+
+ return (arm_btop((paddr + offset)));
+}
int
bcm2835_bs_alloc(void *t, bus_addr_t rstart, bus_addr_t rend,
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Thu Jan 10 22:02:12 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c
Log Message:
Misc tidyup
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/dwc_otg.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/usb/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.4 src/sys/dev/usb/dwc_otg.c:1.5
--- src/sys/dev/usb/dwc_otg.c:1.4 Thu Jan 10 21:50:56 2013
+++ src/sys/dev/usb/dwc_otg.c Thu Jan 10 22:02:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.4 2013/01/10 21:50:56 jmcneill Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.5 2013/01/10 22:02:12 skrll Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.4 2013/01/10 21:50:56 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.5 2013/01/10 22:02:12 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2510,8 +2510,6 @@ dwc_otg_host_setup_tx(struct dwc_otg_td
return (1); /* busy */
send_pkt:
-// printf(%s: send_pkt %zu td-remainder %d\n, __func__, sizeof(req), td-remainder);
-// DPRINTF(send_pkt %zu td-remainder %d\n, sizeof(req), td-remainder);
if (sizeof(req) != td-remainder) {
td-error_any = 1;
return (0); /* complete */
@@ -2862,7 +2860,6 @@ receive_pkt:
td-state = DWC_CHAN_ST_WAIT_ANE;
/* receive one packet */
- /* receive one packet */
uint32_t hctsiz =
(td-max_packet_size HCTSIZ_XFERSIZE_SHIFT) |
(1 HCTSIZ_PKTCNT_SHIFT) |
@@ -2879,12 +2876,6 @@ receive_pkt:
/* must enable channel before data can be received */
DWC_OTG_WRITE_4(sc, DOTG_HCCHAR(td-channel), hcchar);
-#if 0
- if (ep_type == UE_BULK td-retrycnt 2) {
- printf(%s: xfer = %p, write HCTSIZ = %08x HCSPLT = %08x HCCHAR = %08x retry = %d\n, __func__, td-xfer, hctsiz, td-hcsplt, hcchar, td-retrycnt);
- }
-#endif
-
goto busy;
receive_spkt:
@@ -3327,9 +3318,8 @@ dwc_otg_interrupt_poll(struct dwc_otg_so
uint8_t got_rx_status;
// DPRINTF(\n);
-// printf(%s: \n, __func__);
-// KASSERT(mutex_owned(sc-sc_lock));
+ KASSERT(mutex_owned(sc-sc_intr_lock));
repeat:
/* get all channel interrupts */
@@ -3339,10 +3329,6 @@ repeat:
// printf(%s: ch %d intrs %08x\n, __func__, ch, intrs);
// DPRINTF(ch %d intrs %08x\n, ch, intrs);
-// // if (intrs HCINT_XACTERR)
-// // printf(%s: ch=%d xacterr\n, __func__, ch);
-// // if (intrs HCINT_AHBERR)
-// // printf(%s: ch=%d ahberrerr\n, __func__, ch);
DWC_OTG_WRITE_4(sc, DOTG_HCINT(ch), intrs);
intrs = ~HCINT_SOFTWARE_ONLY;
sc-sc_chan_state[ch].hcint |= intrs;
@@ -3376,8 +3362,6 @@ repeat:
/* receive data, if any */
if (bcnt != 0) {
-// printf(%s: Reading %d bytes from ep %d\n, __func__, bcnt,
-// ep_no);
DPRINTF(Reading %d bytes from ep %d\n, bcnt,
ep_no);
bus_space_barrier(sc-sc_iot, sc-sc_ioh,
@@ -3387,15 +3371,6 @@ repeat:
DOTG_DFIFO(ep_no), sc-sc_rx_bounce_buffer,
(bcnt + 3) / 4);
}
-#if 0
- if (bcnt != 0) {
- printf(%s: (bcnt = %d) - , __func__, bcnt);
- int i = 0;
- for (; i bcnt; i++)
- printf(%02x , *((uint8_t *)sc-sc_rx_bounce_buffer + i));
- printf(\n);
- }
-#endif
/* check if we should dump the data */
if (!(sc-sc_active_rx_ep (1U ep_no))) {
@@ -3722,24 +3697,14 @@ static void
dwc_otg_setup_standard_chain_sub(struct dwc_otg_std_temp *temp)
{
struct dwc_otg_td *td;
- const char *msg;
/* get current Transfer Descriptor */
td = temp-td_next;
temp-td = td;
- if (temp-func == dwc_otg_host_setup_tx) {
- msg = setup tx;
- } else if (temp-func == dwc_otg_host_data_tx) {
- msg = data tx;
- } else if (temp-func == dwc_otg_host_data_rx) {
- msg = data rx;
- } else {
- msg = wtf ;
- }
DPRINTF(td %p buf %p \n, td, temp-buf);
- DPRINTF(td %p %s offset %08x remainder %08x shrt %d alt %d\n, td,
- msg, temp-offset, temp-len, temp-short_pkt,
+ DPRINTF(td %p func %p offset %08x remainder %08x shrt %d alt %d\n,
+ td, td-func, temp-offset, temp-len, temp-short_pkt,
temp-setup_alt_next);
/* prepare for next TD */
temp-td_next = td-obj_next;
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: matt
Date: Thu Jan 10 22:06:33 UTC 2013
Modified Files:
src/sys/arch/arm/broadcom: bcm53xx_board.c
Log Message:
Use the clk_info in cpu_softc.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/broadcom/bcm53xx_board.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/arm/broadcom/bcm53xx_board.c
diff -u src/sys/arch/arm/broadcom/bcm53xx_board.c:1.8 src/sys/arch/arm/broadcom/bcm53xx_board.c:1.9
--- src/sys/arch/arm/broadcom/bcm53xx_board.c:1.8 Sun Oct 21 10:29:23 2012
+++ src/sys/arch/arm/broadcom/bcm53xx_board.c Thu Jan 10 22:06:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm53xx_board.c,v 1.8 2012/10/21 10:29:23 matt Exp $ */
+/* $NetBSD: bcm53xx_board.c,v 1.9 2013/01/10 22:06:32 matt Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: bcm53xx_board.c,v 1.8 2012/10/21 10:29:23 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: bcm53xx_board.c,v 1.9 2013/01/10 22:06:32 matt Exp $);
#include sys/param.h
#include sys/bus.h
@@ -65,7 +65,6 @@ bus_space_tag_t bcm53xx_armcore_bst = b
bus_space_handle_t bcm53xx_armcore_bsh;
static struct cpu_softc cpu_softc;
-static struct bcm53xx_clock_info clk_info;
struct arm32_dma_range bcm53xx_dma_ranges[2] = {
[0] = {
@@ -450,23 +449,24 @@ void
bcm53xx_print_clocks(void)
{
#if defined(VERBOSE_ARM_INIT)
- printf(ref clk = %u (%#x)\n, clk_info.clk_ref, clk_info.clk_ref);
- printf(sys clk = %u (%#x)\n, clk_info.clk_sys, clk_info.clk_sys);
- printf(lcpll clk = %u (%#x)\n, clk_info.clk_lcpll, clk_info.clk_lcpll);
- printf(pcie ref clk = %u (%#x) [CH0]\n, clk_info.clk_pcie_ref, clk_info.clk_pcie_ref);
- printf(sdio clk = %u (%#x) [CH1]\n, clk_info.clk_sdio, clk_info.clk_sdio);
- printf(ddr ref clk = %u (%#x) [CH2]\n, clk_info.clk_ddr_ref, clk_info.clk_ddr_ref);
- printf(axi clk = %u (%#x) [CH3]\n, clk_info.clk_axi, clk_info.clk_axi);
- printf(genpll clk = %u (%#x)\n, clk_info.clk_genpll, clk_info.clk_genpll);
- printf(mac clk = %u (%#x) [CH0]\n, clk_info.clk_mac, clk_info.clk_mac);
- printf(robo clk = %u (%#x) [CH1]\n, clk_info.clk_robo, clk_info.clk_robo);
- printf(usb2 clk = %u (%#x) [CH2]\n, clk_info.clk_usb2, clk_info.clk_usb2);
- printf(iproc clk = %u (%#x) [CH3]\n, clk_info.clk_iproc, clk_info.clk_iproc);
- printf(ddr clk = %u (%#x)\n, clk_info.clk_ddr, clk_info.clk_ddr);
- printf(ddr mhz = %u (%#x)\n, clk_info.clk_ddr_mhz, clk_info.clk_ddr_mhz);
- printf(cpu clk = %u (%#x)\n, clk_info.clk_cpu, clk_info.clk_cpu);
- printf(apb clk = %u (%#x)\n, clk_info.clk_apb, clk_info.clk_apb);
- printf(usb ref clk = %u (%#x)\n, clk_info.clk_usb_ref, clk_info.clk_usb_ref);
+ const struct bcm53xx_clock_info * const clk = cpu_softc.cpu_clk;
+ printf(ref clk = %u (%#x)\n, clk-clk_ref, clk-clk_ref);
+ printf(sys clk = %u (%#x)\n, clk-clk_sys, clk-clk_sys);
+ printf(lcpll clk = %u (%#x)\n, clk-clk_lcpll, clk-clk_lcpll);
+ printf(pcie ref clk = %u (%#x) [CH0]\n, clk-clk_pcie_ref, clk-clk_pcie_ref);
+ printf(sdio clk = %u (%#x) [CH1]\n, clk-clk_sdio, clk-clk_sdio);
+ printf(ddr ref clk = %u (%#x) [CH2]\n, clk-clk_ddr_ref, clk-clk_ddr_ref);
+ printf(axi clk = %u (%#x) [CH3]\n, clk-clk_axi, clk-clk_axi);
+ printf(genpll clk = %u (%#x)\n, clk-clk_genpll, clk-clk_genpll);
+ printf(mac clk = %u (%#x) [CH0]\n, clk-clk_mac, clk-clk_mac);
+ printf(robo clk = %u (%#x) [CH1]\n, clk-clk_robo, clk-clk_robo);
+ printf(usb2 clk = %u (%#x) [CH2]\n, clk-clk_usb2, clk-clk_usb2);
+ printf(iproc clk = %u (%#x) [CH3]\n, clk-clk_iproc, clk-clk_iproc);
+ printf(ddr clk = %u (%#x)\n, clk-clk_ddr, clk-clk_ddr);
+ printf(ddr mhz = %u (%#x)\n, clk-clk_ddr_mhz, clk-clk_ddr_mhz);
+ printf(cpu clk = %u (%#x)\n, clk-clk_cpu, clk-clk_cpu);
+ printf(apb clk = %u (%#x)\n, clk-clk_apb, clk-clk_apb);
+ printf(usb ref clk = %u (%#x)\n, clk-clk_usb_ref, clk-clk_usb_ref);
#endif
}
@@ -500,7 +500,7 @@ bcm53xx_bootstrap(vaddr_t iobase)
bcm53xx_get_chip_ioreg_state(bcs, bcm53xx_ioreg_bst, bcm53xx_ioreg_bsh);
bcm53xx_get_chip_armcore_state(bcs, bcm53xx_armcore_bst, bcm53xx_armcore_bsh);
- struct bcm53xx_clock_info * const clk = clk_info;
+ struct bcm53xx_clock_info * const clk = cpu_softc.cpu_clk;
bcm53xx_clock_init(clk);
bcm53xx_lcpll_clock_init(clk, bcs.bcs_lcpll_control1,
@@ -575,7 +575,7 @@ bcm53xx_device_register(device_t self, v
* to timers that are part of the A9 MP core subsystem.
*/
prop_dictionary_set_uint32(dict, frequency,
- clk_info.clk_cpu / 2);
+ cpu_softc.cpu_clk.clk_cpu / 2);
return;
}
CVS commit: src/sys/dev/wsfb
Module Name:src
Committed By: jmcneill
Date: Thu Jan 10 22:06:59 UTC 2013
Modified Files:
src/sys/dev/wsfb: genfb.c
Log Message:
for WSDISPLAYIO_SMODE, if the bus ioctl handler returns EPASSTHROUGH, dont
treat it as an error
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/dev/wsfb/genfb.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/wsfb/genfb.c
diff -u src/sys/dev/wsfb/genfb.c:1.49 src/sys/dev/wsfb/genfb.c:1.50
--- src/sys/dev/wsfb/genfb.c:1.49 Wed Jan 9 01:57:59 2013
+++ src/sys/dev/wsfb/genfb.c Thu Jan 10 22:06:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb.c,v 1.49 2013/01/09 01:57:59 jmcneill Exp $ */
+/* $NetBSD: genfb.c,v 1.50 2013/01/10 22:06:59 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.49 2013/01/09 01:57:59 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: genfb.c,v 1.50 2013/01/10 22:06:59 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -380,7 +380,7 @@ genfb_ioctl(void *v, void *vs, u_long cm
if (sc-sc_ops.genfb_ioctl)
error = sc-sc_ops.genfb_ioctl(sc, vs,
cmd, data, flag, l);
- if (error)
+ if (error error != EPASSTHROUGH)
return error;
if (new_mode != sc-sc_mode) {
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: matt Date: Thu Jan 10 22:07:19 UTC 2013 Modified Files: src/sys/arch/arm/broadcom: bcm53xx_eth.c Log Message: Don't hard code the frequency used for INTRCVLAZY but grab the correct frequency from the cpu_softc. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/broadcom/bcm53xx_eth.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/arm/broadcom/bcm53xx_eth.c diff -u src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.21 src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.22 --- src/sys/arch/arm/broadcom/bcm53xx_eth.c:1.21 Wed Jan 9 18:19:09 2013 +++ src/sys/arch/arm/broadcom/bcm53xx_eth.c Thu Jan 10 22:07:19 2013 @@ -35,7 +35,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: bcm53xx_eth.c,v 1.21 2013/01/09 18:19:09 matt Exp $); +__KERNEL_RCSID(1, $NetBSD: bcm53xx_eth.c,v 1.22 2013/01/10 22:07:19 matt Exp $); #include sys/param.h #include sys/atomic.h @@ -551,8 +551,9 @@ bcmeth_ifinit(struct ifnet *ifp) bcmeth_write_4(sc, GMAC_DEVCONTROL, devctl); /* Setup lazy receive (at most 1ms). */ + const struct cpu_softc * const cpu = curcpu()-ci_softc; sc-sc_rcvlazy = __SHIFTIN(4, INTRCVLAZY_FRAMECOUNT) - | __SHIFTIN(12500 / 1000, INTRCVLAZY_TIMEOUT); + | __SHIFTIN(cpu-cpu_clk.clk_apb / 1000, INTRCVLAZY_TIMEOUT); bcmeth_write_4(sc, GMAC_INTRCVLAZY, sc-sc_rcvlazy); /* 11. Enable transmit queues in TQUEUE, and ensure that the transmit scheduling mode is correctly set in TCTRL. */
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Thu Jan 10 22:08:11 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: RPI Log Message: enable framebuffer console driver To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/RPI 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/conf/RPI diff -u src/sys/arch/evbarm/conf/RPI:1.19 src/sys/arch/evbarm/conf/RPI:1.20 --- src/sys/arch/evbarm/conf/RPI:1.19 Wed Jan 9 23:19:13 2013 +++ src/sys/arch/evbarm/conf/RPI Thu Jan 10 22:08:11 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: RPI,v 1.19 2013/01/09 23:19:13 skrll Exp $ +# $NetBSD: RPI,v 1.20 2013/01/10 22:08:11 jmcneill Exp $ # # RPi -- Raspberry Pi # @@ -187,8 +187,8 @@ vcmbox0 at bcmmbox0 plcom0 at obio? # Framebuffer console -#genfb0 at obio? -#wsdisplay* at genfb? +genfb0 at obio? +wsdisplay* at genfb? # System timer bcmtmr0 at obio?
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Thu Jan 10 22:15:04 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c
Log Message:
More tidyup
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/dwc_otg.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/usb/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.5 src/sys/dev/usb/dwc_otg.c:1.6
--- src/sys/dev/usb/dwc_otg.c:1.5 Thu Jan 10 22:02:12 2013
+++ src/sys/dev/usb/dwc_otg.c Thu Jan 10 22:15:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.5 2013/01/10 22:02:12 skrll Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.6 2013/01/10 22:15:04 skrll Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.5 2013/01/10 22:02:12 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.6 2013/01/10 22:15:04 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2273,36 +2273,6 @@ dwc_otg_host_channel_alloc(struct dwc_ot
return (0); /* already allocated */
}
- if ((int)td 0xc000) {
- printf(%s: td %p\n, __func__, td);
- panic(td);
- }
- if ((int)td-xfer 0xc000) {
- printf(%s: td %p\n, __func__, td);
- printf(%s: td-xfer %p\n, __func__, td-xfer);
- panic(xfer);
- }
- if ((int)td-xfer-pipe 0xc000) {
- printf(%s: td %p\n, __func__, td);
- printf(%s: td-xfer %p\n, __func__, td-xfer);
- printf(%s: td-xfer-pipe %p\n, __func__, td-xfer-pipe);
- panic(pipe);
- }
- if ((int)td-xfer-pipe-device 0xc000) {
- printf(%s: td %p\n, __func__, td);
- printf(%s: td-xfer %p\n, __func__, td-xfer);
- printf(%s: td-xfer-pipe %p\n, __func__, td-xfer-pipe);
- printf(%s: td-xfer-pipe-device %p\n, __func__, td-xfer-pipe-device);
- panic(device);
- }
- if ((int)td-xfer-pipe-device-bus 0xc000) {
- printf(%s: td %p\n, __func__, td);
- printf(%s: td-xfer %p\n, __func__, td-xfer);
- printf(%s: td-xfer-pipe %p\n, __func__, td-xfer-pipe);
- printf(%s: td-xfer-pipe-device %p\n, __func__, td-xfer-pipe-device);
- printf(%s: td-xfer-pipe-device-bus %p\n, __func__, td-xfer-pipe-device-bus);
- panic(bus);
- }
/* get pointer to softc */
sc = DWC_OTG_TD2SC(td);
@@ -2414,12 +2384,6 @@ dwc_otg_host_setup_tx(struct dwc_otg_td
DWC_OTG_READ_4(sc, DOTG_HCCHAR(td-channel)),
DWC_OTG_READ_4(sc, DOTG_HCTSIZ(td-channel)));
-// printf(GNPTXFSIZ 0x%08x\n, DWC_OTG_READ_4(sc, DOTG_GNPTXFSIZ));
-// printf(GNPTXSTS 0x%08x\n, DWC_OTG_READ_4(sc, DOTG_GNPTXSTS));
-// printf(HFIR 0x%08x\n, DWC_OTG_READ_4(sc, DOTG_HFIR));
-// printf(HFNUM 0x%08x\n, DWC_OTG_READ_4(sc, DOTG_HFNUM));
-// printf(HPTXSTS0x%08x\n, DWC_OTG_READ_4(sc, DOTG_HPTXSTS));
-
if (hcint (HCINT_RETRY |
HCINT_ACK | HCINT_NYET)) {
/* give success bits priority over failure bits */
@@ -2429,8 +2393,6 @@ dwc_otg_host_setup_tx(struct dwc_otg_td
td-error_any = 1;
return (0); /* complete */
} else if (hcint HCINT_ERRORS) {
-// printf(%s: ch=%d hcint %08x\n, __func__, td-channel, hcint);
-// DPRINTF(CH=%d ERROR\n, td-channel);
td-errcnt++;
if (td-hcsplt != 0 || td-errcnt = 3) {
td-error_any = 1;
@@ -2539,7 +2501,6 @@ send_pkt_sync:
/* XXX Why ? */
usbd_copy_out(td-buf, 0, req, sizeof(req));
-// mutex_spin_enter(sc-sc_intr_lock);
DWC_OTG_WRITE_4(sc, DOTG_HCTSIZ(td-channel),
(sizeof(req) HCTSIZ_XFERSIZE_SHIFT) |
(1 HCTSIZ_PKTCNT_SHIFT) |
@@ -2560,12 +2521,10 @@ send_pkt_sync:
/* store number of bytes transmitted */
td-tx_bytes = sizeof(req);
-// mutex_spin_exit(sc-sc_intr_lock);
return (1); /* busy */
send_cpkt:
-// DPRINTF(send_cpkt td-buf %p size %zu\n, td-buf, sizeof(req));
td-hcsplt |= HCSPLT_COMPSPLT;
td-state = DWC_CHAN_ST_WAIT_C_ANE;
@@ -2716,7 +2675,6 @@ dwc_otg_host_data_rx(struct dwc_otg_td *
td-short_pkt = 1;
td-got_short = 1;
} else {
-printf(%s: count %d td-max_packet_size %d\n, __func__, count, td-max_packet_size);
/* invalid USB packet */
td-error_any = 1;
@@ -3326,7 +3284,6 @@ repeat:
for (ch = 0; ch sc-sc_host_ch_max; ++ch) {
intrs = DWC_OTG_READ_4(sc, DOTG_HCINT(ch));
if (intrs != 0) {
-// printf(%s: ch %d intrs %08x\n, __func__, ch, intrs);
// DPRINTF(ch %d intrs %08x\n, ch, intrs);
DWC_OTG_WRITE_4(sc, DOTG_HCINT(ch), intrs);
@@ -3452,20 +3409,6 @@ dwc_otg_vbus_interrupt(struct dwc_otg_so
}
}
-#define NSTAT 128
-
-int nhbgintsts[NSTAT];
-int nhbhprt[NSTAT];
-int nhbhaint[NSTAT];
-int nhbhfnum[NSTAT];
-
-int nhagintsts[NSTAT];
-int nhahprt[NSTAT];
-int nhahaint[NSTAT];
-int nhahfnum[NSTAT];
-
-int nhcur;
-
int
dwc_otg_interrupt(struct dwc_otg_softc *sc)
{
@@ -3476,33 +3419,6 @@ dwc_otg_interrupt(struct dwc_otg_softc *
DWC_OTG_WRITE_4(sc, DOTG_GINTSTS, status);
KASSERT(mutex_owned(sc-sc_intr_lock));
-// nhhaint = DWC_OTG_READ_4(sc, DOTG_HAINT);
-//
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Fri Jan 11 02:20:41 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: clear queued flag when aborting xfer To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/dwc_otg.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/usb/dwc_otg.c diff -u src/sys/dev/usb/dwc_otg.c:1.6 src/sys/dev/usb/dwc_otg.c:1.7 --- src/sys/dev/usb/dwc_otg.c:1.6 Thu Jan 10 22:15:04 2013 +++ src/sys/dev/usb/dwc_otg.c Fri Jan 11 02:20:41 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_otg.c,v 1.6 2013/01/10 22:15:04 skrll Exp $ */ +/* $NetBSD: dwc_otg.c,v 1.7 2013/01/11 02:20:41 jmcneill Exp $ */ /*- * Copyright (c) 2012 Hans Petter Selasky. All rights reserved. @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.6 2013/01/10 22:15:04 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.7 2013/01/11 02:20:41 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -648,9 +648,10 @@ dwc_otg_abort_xfer(usbd_xfer_handle xfer } mutex_spin_enter(sc-sc_intr_lock); + dxfer-queued = false; TAILQ_REMOVE(sc-sc_active, dxfer, xnext); mutex_spin_exit(sc-sc_intr_lock); - + /* * Step 4: Execute callback. */
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: christos Date: Fri Jan 11 02:49:09 UTC 2013 Modified Files: src/sys/compat/linux/common: linux_futex.h Log Message: add the futex PI commands (not implemented yet) PI = Priotity Inheritance To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/compat/linux/common/linux_futex.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/compat/linux/common/linux_futex.h diff -u src/sys/compat/linux/common/linux_futex.h:1.5 src/sys/compat/linux/common/linux_futex.h:1.6 --- src/sys/compat/linux/common/linux_futex.h:1.5 Wed Sep 14 08:28:08 2011 +++ src/sys/compat/linux/common/linux_futex.h Thu Jan 10 21:49:09 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_futex.h,v 1.5 2011/09/14 12:28:08 christos Exp $ */ +/* $NetBSD: linux_futex.h,v 1.6 2013/01/11 02:49:09 christos Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -34,21 +34,28 @@ #ifndef _LINUX_FUTEX_H #define _LINUX_FUTEX_H -#define LINUX_FUTEX_WAIT 0 -#define LINUX_FUTEX_WAKE 1 -#define LINUX_FUTEX_FD 2 -#define LINUX_FUTEX_REQUEUE 3 -#define LINUX_FUTEX_CMP_REQUEUE 4 -#define LINUX_FUTEX_WAKE_OP 5 +#define LINUX_FUTEX_WAIT 0 +#define LINUX_FUTEX_WAKE 1 +#define LINUX_FUTEX_FD 2 +#define LINUX_FUTEX_REQUEUE 3 +#define LINUX_FUTEX_CMP_REQUEUE 4 +#define LINUX_FUTEX_WAKE_OP 5 +#define LINUX_FUTEX_LOCK_PI 6 +#define LINUX_FUTEX_UNLOCK_PI 7 +#define LINUX_FUTEX_TRYLOCK_PI 8 +#define LINUX_FUTEX_WAIT_BITSET 9 +#define LINUX_FUTEX_WAKE_BITSET 10 +#define LINUX_FUTEX_WAIT_REQUEUE_PI 11 +#define LINUX_FUTEX_CMP_REQUEUE_PI 12 #define LINUX_FUTEX_PRIVATE_FLAG 128 +#define LINUX_FUTEX_CLOCK_REALTIME 256 #define FUTEX_OP_SET 0 #define FUTEX_OP_ADD 1 #define FUTEX_OP_OR 2 #define FUTEX_OP_ANDN 3 #define FUTEX_OP_XOR 4 - #define FUTEX_OP_OPARG_SHIFT 8 #define FUTEX_OP_CMP_EQ 0
CVS commit: src/etc/defaults
Module Name:src
Committed By: riastradh
Date: Fri Jan 11 04:32:42 UTC 2013
Modified Files:
src/etc/defaults: rc.conf
Log Message:
Nix `-b 1024' from ssh_keygen_flags in /etc/defaults/rc.conf.
No objections on tech-security:
http://mail-index.NetBSD.org/tech-security/2012/09/03/msg000548.html
The security of generating keys at boot remains questionable, but
this change makes that no worse.
To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 src/etc/defaults/rc.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.120 src/etc/defaults/rc.conf:1.121
--- src/etc/defaults/rc.conf:1.120 Mon Aug 13 08:20:44 2012
+++ src/etc/defaults/rc.conf Fri Jan 11 04:32:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rc.conf,v 1.120 2012/08/13 08:20:44 christos Exp $
+# $NetBSD: rc.conf,v 1.121 2013/01/11 04:32:41 riastradh Exp $
#
# /etc/defaults/rc.conf --
# default configuration of /etc/rc.conf
@@ -228,7 +228,7 @@ ntpd=NO ntpd_flags= # see below for
postfix=${_rc_d_postfix:-YES}
lpd=NO lpd_flags=-s # -s secure unix domain only
sshd=NO sshd_flags=
-ssh_keygen_flags=-b 1024 # generate 1024 bit keys if host keys missing
+ssh_keygen_flags=
ftpd=NO ftpd_flags=-ll
httpd=NO httpd_flags=
httpd_wwwdir=/var/www
CVS commit: othersrc/external/bsd/netdiff
Module Name:othersrc Committed By: agc Date: Fri Jan 11 05:10:19 UTC 2013 Modified Files: othersrc/external/bsd/netdiff/bin/netdiff: 002.expected 003.expected 004.expected 006.expected othersrc/external/bsd/netdiff/bin/qdiff: 002.expected 003.expected 004.expected 006.expected othersrc/external/bsd/netdiff/dist: diff_subr.c Log Message: Feedback from fuzz tests - check input arguments to exported functions Modify the expected output files for mtimes on the tests after the import To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ othersrc/external/bsd/netdiff/bin/netdiff/002.expected \ othersrc/external/bsd/netdiff/bin/netdiff/003.expected \ othersrc/external/bsd/netdiff/bin/netdiff/004.expected \ othersrc/external/bsd/netdiff/bin/netdiff/006.expected cvs rdiff -u -r1.1.1.1 -r1.2 \ othersrc/external/bsd/netdiff/bin/qdiff/002.expected \ othersrc/external/bsd/netdiff/bin/qdiff/003.expected \ othersrc/external/bsd/netdiff/bin/qdiff/004.expected \ othersrc/external/bsd/netdiff/bin/qdiff/006.expected cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/netdiff/dist/diff_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/netdiff/bin/netdiff/002.expected diff -u othersrc/external/bsd/netdiff/bin/netdiff/002.expected:1.1.1.1 othersrc/external/bsd/netdiff/bin/netdiff/002.expected:1.2 --- othersrc/external/bsd/netdiff/bin/netdiff/002.expected:1.1.1.1 Thu Jan 10 08:17:11 2013 +++ othersrc/external/bsd/netdiff/bin/netdiff/002.expected Fri Jan 11 05:10:19 2013 @@ -1,5 +1,5 @@ -*** f1 Sun Jan 6 21:29:26 2013 f2 Sun Jan 6 21:29:26 2013 +*** f1 Thu Jan 10 00:17:11 2013 +--- f2 Thu Jan 10 00:17:11 2013 *** *** 1,3 --- 1,27 Index: othersrc/external/bsd/netdiff/bin/netdiff/003.expected diff -u othersrc/external/bsd/netdiff/bin/netdiff/003.expected:1.1.1.1 othersrc/external/bsd/netdiff/bin/netdiff/003.expected:1.2 --- othersrc/external/bsd/netdiff/bin/netdiff/003.expected:1.1.1.1 Thu Jan 10 08:17:11 2013 +++ othersrc/external/bsd/netdiff/bin/netdiff/003.expected Fri Jan 11 05:10:19 2013 @@ -1,5 +1,5 @@ f1 2013-01-06 21:29:26.0 -0800 -+++ f2 2013-01-06 21:29:26.0 -0800 +--- f1 2013-01-10 00:17:11.0 -0800 f2 2013-01-10 00:17:11.0 -0800 @@ -1,3 +1,27 @@ +/*- + * Copyright (c) 2013 Alistair Crooks a...@netbsd.org Index: othersrc/external/bsd/netdiff/bin/netdiff/004.expected diff -u othersrc/external/bsd/netdiff/bin/netdiff/004.expected:1.1.1.1 othersrc/external/bsd/netdiff/bin/netdiff/004.expected:1.2 --- othersrc/external/bsd/netdiff/bin/netdiff/004.expected:1.1.1.1 Thu Jan 10 08:17:11 2013 +++ othersrc/external/bsd/netdiff/bin/netdiff/004.expected Fri Jan 11 05:10:19 2013 @@ -6,9 +6,9 @@ diff /usr/src/sbin/Makefile /d/thinfs-sr SUBDIR+= mount_thinfs diff /usr/src/sbin/Makefile.inc /d/thinfs-src/sbin/Makefile.inc 1c1 - # $NetBSD: 004.expected,v 1.1.1.1 2013/01/10 08:17:11 agc Exp $ + # $NetBSD: 004.expected,v 1.2 2013/01/11 05:10:19 agc Exp $ --- - # $NetBSD: 004.expected,v 1.1.1.1 2013/01/10 08:17:11 agc Exp $ + # $NetBSD: 004.expected,v 1.2 2013/01/11 05:10:19 agc Exp $ 6c6 WARNS?= 4 --- Index: othersrc/external/bsd/netdiff/bin/netdiff/006.expected diff -u othersrc/external/bsd/netdiff/bin/netdiff/006.expected:1.1.1.1 othersrc/external/bsd/netdiff/bin/netdiff/006.expected:1.2 --- othersrc/external/bsd/netdiff/bin/netdiff/006.expected:1.1.1.1 Thu Jan 10 08:17:11 2013 +++ othersrc/external/bsd/netdiff/bin/netdiff/006.expected Fri Jan 11 05:10:19 2013 @@ -1,5 +1,5 @@ f1 2013-01-06 21:29:26.0 -0800 -+++ f2 2013-01-06 21:29:26.0 -0800 +--- f1 2013-01-10 00:17:11.0 -0800 f2 2013-01-10 00:17:11.0 -0800 @@ -1,3 +1,27 @@ +/*- + * Copyright (c) 2013 Alistair Crooks a...@netbsd.org Index: othersrc/external/bsd/netdiff/bin/qdiff/002.expected diff -u othersrc/external/bsd/netdiff/bin/qdiff/002.expected:1.1.1.1 othersrc/external/bsd/netdiff/bin/qdiff/002.expected:1.2 --- othersrc/external/bsd/netdiff/bin/qdiff/002.expected:1.1.1.1 Thu Jan 10 08:17:11 2013 +++ othersrc/external/bsd/netdiff/bin/qdiff/002.expected Fri Jan 11 05:10:19 2013 @@ -1,5 +1,5 @@ -*** /usr/othersrc/external/bsd/netdiff/bin/qdiff/../netdiff/f1 Sun Jan 6 21:29:26 2013 /usr/othersrc/external/bsd/netdiff/bin/qdiff/../netdiff/f2 Sun Jan 6 21:29:26 2013 +*** /usr/othersrc/external/bsd/netdiff/bin/qdiff/../netdiff/f1 Thu Jan 10 00:17:11 2013 +--- /usr/othersrc/external/bsd/netdiff/bin/qdiff/../netdiff/f2 Thu Jan 10 00:17:11 2013 *** *** 1,3 --- 1,27 Index: othersrc/external/bsd/netdiff/bin/qdiff/003.expected diff -u othersrc/external/bsd/netdiff/bin/qdiff/003.expected:1.1.1.1 othersrc/external/bsd/netdiff/bin/qdiff/003.expected:1.2 ---
CVS commit: othersrc/external/bsd/netdiff
Module Name:othersrc
Committed By: agc
Date: Fri Jan 11 05:19:46 UTC 2013
Modified Files:
othersrc/external/bsd/netdiff/bin/netdiff: 004.expected
othersrc/external/bsd/netdiff/bin/qdiff: 004.expected
othersrc/external/bsd/netdiff/dist: diff.c diff_subr.c diffdir.c
diffreg.c
Log Message:
avoid accessing fields in the struct from main() and other callers -
set defaults at the start of the 3 main functions - diff_file(),
diff_dir() and difference().
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
othersrc/external/bsd/netdiff/bin/netdiff/004.expected
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/netdiff/bin/qdiff/004.expected
cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/netdiff/dist/diff.c \
othersrc/external/bsd/netdiff/dist/diffdir.c \
othersrc/external/bsd/netdiff/dist/diffreg.c
cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/netdiff/dist/diff_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/netdiff/bin/netdiff/004.expected
diff -u othersrc/external/bsd/netdiff/bin/netdiff/004.expected:1.2 othersrc/external/bsd/netdiff/bin/netdiff/004.expected:1.3
--- othersrc/external/bsd/netdiff/bin/netdiff/004.expected:1.2 Fri Jan 11 05:10:19 2013
+++ othersrc/external/bsd/netdiff/bin/netdiff/004.expected Fri Jan 11 05:19:46 2013
@@ -6,9 +6,9 @@ diff /usr/src/sbin/Makefile /d/thinfs-sr
SUBDIR+= mount_thinfs
diff /usr/src/sbin/Makefile.inc /d/thinfs-src/sbin/Makefile.inc
1c1
- # $NetBSD: 004.expected,v 1.2 2013/01/11 05:10:19 agc Exp $
+ # $NetBSD: 004.expected,v 1.3 2013/01/11 05:19:46 agc Exp $
---
- # $NetBSD: 004.expected,v 1.2 2013/01/11 05:10:19 agc Exp $
+ # $NetBSD: 004.expected,v 1.3 2013/01/11 05:19:46 agc Exp $
6c6
WARNS?= 4
---
Index: othersrc/external/bsd/netdiff/bin/qdiff/004.expected
diff -u othersrc/external/bsd/netdiff/bin/qdiff/004.expected:1.2 othersrc/external/bsd/netdiff/bin/qdiff/004.expected:1.3
--- othersrc/external/bsd/netdiff/bin/qdiff/004.expected:1.2 Fri Jan 11 05:10:19 2013
+++ othersrc/external/bsd/netdiff/bin/qdiff/004.expected Fri Jan 11 05:19:46 2013
@@ -6,9 +6,9 @@ diff /usr/src/sbin/Makefile /d/thinfs-sr
SUBDIR+= mount_thinfs
diff /usr/src/sbin/Makefile.inc /d/thinfs-src/sbin/Makefile.inc
1c1
- # $NetBSD: 004.expected,v 1.2 2013/01/11 05:10:19 agc Exp $
+ # $NetBSD: 004.expected,v 1.3 2013/01/11 05:19:46 agc Exp $
---
- # $NetBSD: 004.expected,v 1.2 2013/01/11 05:10:19 agc Exp $
+ # $NetBSD: 004.expected,v 1.3 2013/01/11 05:19:46 agc Exp $
6c6
WARNS?= 4
---
Index: othersrc/external/bsd/netdiff/dist/diff.c
diff -u othersrc/external/bsd/netdiff/dist/diff.c:1.1.1.1 othersrc/external/bsd/netdiff/dist/diff.c:1.2
--- othersrc/external/bsd/netdiff/dist/diff.c:1.1.1.1 Thu Jan 10 08:17:11 2013
+++ othersrc/external/bsd/netdiff/dist/diff.c Fri Jan 11 05:19:46 2013
@@ -346,9 +346,6 @@ main(int argc, char **argv)
char *prog;
memset(diff, 0x0, sizeof(diff));
- diff.tabsize = 8;
- diff.fp = stdout;
- diff.optfile = \0;
oargv = argv;
oargc = argc;
lastch = '\0';
Index: othersrc/external/bsd/netdiff/dist/diffdir.c
diff -u othersrc/external/bsd/netdiff/dist/diffdir.c:1.1.1.1 othersrc/external/bsd/netdiff/dist/diffdir.c:1.2
--- othersrc/external/bsd/netdiff/dist/diffdir.c:1.1.1.1 Thu Jan 10 08:17:11 2013
+++ othersrc/external/bsd/netdiff/dist/diffdir.c Fri Jan 11 05:19:46 2013
@@ -228,6 +228,15 @@ diff_dir(diff_t *diff, char *p1, char *p
if (diff == NULL || p1 == NULL || p2 == NULL) {
return 0;
}
+ if (diff-tabsize == 0) {
+ diff-tabsize = 8;
+ }
+ if (diff-fp == NULL) {
+ diff-fp = stdout;
+ }
+ if (diff-optfile == NULL) {
+ diff-optfile = \0;
+ }
dirlen1 = strlcpy(path1, *p1 ? p1 : ., sizeof(path1));
if (dirlen1 = sizeof(path1) - 1) {
warnx(%s: %s, p1, strerror(ENAMETOOLONG));
Index: othersrc/external/bsd/netdiff/dist/diffreg.c
diff -u othersrc/external/bsd/netdiff/dist/diffreg.c:1.1.1.1 othersrc/external/bsd/netdiff/dist/diffreg.c:1.2
--- othersrc/external/bsd/netdiff/dist/diffreg.c:1.1.1.1 Thu Jan 10 08:17:11 2013
+++ othersrc/external/bsd/netdiff/dist/diffreg.c Fri Jan 11 05:19:46 2013
@@ -1763,6 +1763,15 @@ diff_file(diff_t *diff, const char *ofil
if (diff == NULL || ofile1 == NULL || ofile2 == NULL) {
return D_MISMATCH1;
}
+ if (diff-tabsize == 0) {
+ diff-tabsize = 8;
+ }
+ if (diff-fp == NULL) {
+ diff-fp = stdout;
+ }
+ if (diff-optfile == NULL) {
+ diff-optfile = \0;
+ }
memset(s, 0x0, sizeof(s));
memset(f[0], 0x0, sizeof(f[0]));
memset(f[1], 0x0, sizeof(f[1]));
Index: othersrc/external/bsd/netdiff/dist/diff_subr.c
diff -u othersrc/external/bsd/netdiff/dist/diff_subr.c:1.2 othersrc/external/bsd/netdiff/dist/diff_subr.c:1.3
--- othersrc/external/bsd/netdiff/dist/diff_subr.c:1.2 Fri Jan 11 05:10:19 2013
+++ othersrc/external/bsd/netdiff/dist/diff_subr.c Fri Jan 11 05:19:46 2013
@@ -384,6 +384,15 @@ difference(diff_t *diff,
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Fri Jan 11 06:22:23 UTC 2013
Modified Files:
src/sys/dev/usb: umass.c
Log Message:
Improve a panic message slightly
To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/dev/usb/umass.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/usb/umass.c
diff -u src/sys/dev/usb/umass.c:1.146 src/sys/dev/usb/umass.c:1.147
--- src/sys/dev/usb/umass.c:1.146 Fri Aug 24 12:20:02 2012
+++ src/sys/dev/usb/umass.c Fri Jan 11 06:22:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: umass.c,v 1.146 2012/08/24 12:20:02 drochner Exp $ */
+/* $NetBSD: umass.c,v 1.147 2013/01/11 06:22:23 skrll Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -124,7 +124,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: umass.c,v 1.146 2012/08/24 12:20:02 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: umass.c,v 1.147 2013/01/11 06:22:23 skrll Exp $);
#ifdef _KERNEL_OPT
#include opt_umass.h
@@ -1241,9 +1241,10 @@ umass_bbb_state(usbd_xfer_handle xfer, u
} else if (sc-transfer_actlen sc-transfer_datalen) {
/* Buffer overrun! Don't let this go by unnoticed */
- panic(%s: transferred %d bytes instead of %d bytes,
-device_xname(sc-sc_dev),
-sc-transfer_actlen, sc-transfer_datalen);
+ panic(%s: transferred %s %d bytes instead of %d bytes,
+ device_xname(sc-sc_dev),
+ sc-transfer_dir == DIR_IN ? IN : OUT,
+ sc-transfer_actlen, sc-transfer_datalen);
#if 0
} else if (sc-transfer_datalen - sc-transfer_actlen
!= residue) {
CVS commit: othersrc/external/bsd/binpatch
Module Name:othersrc Committed By: agc Date: Fri Jan 11 06:27:01 UTC 2013 Update of /cvsroot/othersrc/external/bsd/binpatch In directory ivanova.netbsd.org:/tmp/cvs-serv26282 Log Message: Import a binary patch library, libbinpatch(3), and program, binpatch(1), into the othersrc repository. This can be used to encode a binary patch file from an original file, and a new file. To do this, 3 separate instructions are used, similar to those outlined in RFC 3284 - + add - addition of new data + copy - copying of data from original file + run - a run of characters, similar to memset(3) The binary patches generated here are a much simplified form of those described in the RFC, but have 64bit offsets and 32bit sizes in the instructions. The generated binary patch files are also much smaller than the original files, and even standard diffs, and are only just larger then the equivalent vcdiff binary patch file. % diff f1 f2 | wc 58 3381969 % diff -u f1 f2 | wc 85 4082530 % binpatch -e f1 f2 | wc 44 2691801 % vcdiff encode -dictionary f1 -target f2 | wc 40 2571663 (The last is the Google vcdiff program found in pkgsrc/devel/open-vcdiff) The binpatch(1) program can be used to generate binary patch files, and to reconstruct the target files, in the following way % binpatch -e -o patch f1 f2 % binpatch -f f1 -o recon patch % diff f2 recon % rm -f recon % binpatch -v -f f1 -o recon patch Add 1337 bytes Copy 187 bytes from 0 Copy 386 bytes from 198 Add 50 bytes Copy 173 bytes from 592 Add 55 bytes Copy 373 bytes from 816 Add 74 bytes Copy 34 bytes from 1189 Add 182 bytes Copy 23 bytes from 1262 diff f2 recon % diff f2 recon % rm -f recon binpatch(1) uses libbinpatch(3) and libnetdiff(3) to encode binary patch files, and libbinpatch(3) to decode binary patch files. Status: Vendor Tag: CROOKS Release Tags: binpatch-base N othersrc/external/bsd/binpatch/Makefile N othersrc/external/bsd/binpatch/bin/007.expected N othersrc/external/bsd/binpatch/bin/Makefile N othersrc/external/bsd/binpatch/bin/f1 N othersrc/external/bsd/binpatch/bin/f2 N othersrc/external/bsd/binpatch/dist/Makefile N othersrc/external/bsd/binpatch/dist/binpatch.c N othersrc/external/bsd/binpatch/dist/binpatch.h N othersrc/external/bsd/binpatch/dist/main.c N othersrc/external/bsd/binpatch/dist/libbinpatch.3 N othersrc/external/bsd/binpatch/dist/binpatch.1 N othersrc/external/bsd/binpatch/lib/Makefile N othersrc/external/bsd/binpatch/lib/shlib_version No conflicts created by this import
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Fri Jan 11 06:41:02 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: RPI Log Message: Bump SYMTAB_SPACE To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/RPI 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/conf/RPI diff -u src/sys/arch/evbarm/conf/RPI:1.20 src/sys/arch/evbarm/conf/RPI:1.21 --- src/sys/arch/evbarm/conf/RPI:1.20 Thu Jan 10 22:08:11 2013 +++ src/sys/arch/evbarm/conf/RPI Fri Jan 11 06:41:01 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: RPI,v 1.20 2013/01/10 22:08:11 jmcneill Exp $ +# $NetBSD: RPI,v 1.21 2013/01/11 06:41:01 skrll Exp $ # # RPi -- Raspberry Pi # @@ -144,7 +144,7 @@ options DDB_ONPANIC=1 options DDB_HISTORY_SIZE=100 # Enable history editing in DDB #options KGDB makeoptions DEBUG=-g # compile full symbol table -options SYMTAB_SPACE=51 +options SYMTAB_SPACE=80 options PLCONSOLE #options PLCONSOLE,PLCOMCNUNIT=0,PLCONSPEED=115200,PLCONMODE=0xB00
CVS commit: src/lib/libc/softfloat
Module Name:src Committed By: matt Date: Thu Jan 10 08:16:11 UTC 2013 Modified Files: src/lib/libc/softfloat: fpsetmask.c fpsetround.c fpsetsticky.c softfloat-specialize src/lib/libc/softfloat/bits32: softfloat.c src/lib/libc/softfloat/bits64: softfloat.c Log Message: Add hooks to softfloat to support per-lwp exception state. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/softfloat/fpsetmask.c cvs rdiff -u -r1.3 -r1.4 src/lib/libc/softfloat/fpsetround.c \ src/lib/libc/softfloat/fpsetsticky.c cvs rdiff -u -r1.7 -r1.8 src/lib/libc/softfloat/softfloat-specialize cvs rdiff -u -r1.2 -r1.3 src/lib/libc/softfloat/bits32/softfloat.c cvs rdiff -u -r1.11 -r1.12 src/lib/libc/softfloat/bits64/softfloat.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/netdiff
Module Name:othersrc Committed By: agc Date: Thu Jan 10 08:17:11 UTC 2013 Update of /cvsroot/othersrc/external/bsd/netdiff In directory ivanova.netbsd.org:/tmp/cvs-serv19258 Log Message: Import netdiff library and program, version 20130107, into othersrc. This is the old BSD diff(1) program, rewritten and re-organised into a library and a small program to call the functions in the library. There are no static variables, and so many comparisons can be performed simultaneously. Functionally, the netdiff(1) program is the same as diff(1). Standard diff output is produced by default. Context and unified diff output can be specified using the -c and -u command line switches, and the amount of context can be specified in the usual way. SCM programs usually use ed scripts (RCS and CVS) or binary diffs, and these are produced using this program. In addition, a simplified form of VCDIFF output (RFC 3284) can be produced -- and a separate binary patch program is used to reconstruct versions through this method. As this is organised into a library interface, libnetdiff(3) is also targetted at scripting languages. Comparison output can be sent to a file, or held in a buffer, and the buffer read using the API. If neither of these options is specified, then the comparsion output will be sent to stdout. qdiff(1) is a small program which uses the buffer interface to retrieve the comparison information. It is provided as an illustration of how to use the API, and is not installed by default. Simple tests are in the two Makefiles in the netdiff and qdiff sub-directories of bin in the reachover infrastructure. Status: Vendor Tag: NETDIFF Release Tags: netdiff-20130107-base N othersrc/external/bsd/netdiff/Makefile N othersrc/external/bsd/netdiff/bin/Makefile N othersrc/external/bsd/netdiff/bin/netdiff/001.expected N othersrc/external/bsd/netdiff/bin/netdiff/002.expected N othersrc/external/bsd/netdiff/bin/netdiff/003.expected N othersrc/external/bsd/netdiff/bin/netdiff/004.expected N othersrc/external/bsd/netdiff/bin/netdiff/005.expected N othersrc/external/bsd/netdiff/bin/netdiff/006.expected N othersrc/external/bsd/netdiff/bin/netdiff/007.expected N othersrc/external/bsd/netdiff/bin/netdiff/Makefile N othersrc/external/bsd/netdiff/bin/netdiff/f1 N othersrc/external/bsd/netdiff/bin/netdiff/f2 N othersrc/external/bsd/netdiff/bin/qdiff/001.expected N othersrc/external/bsd/netdiff/bin/qdiff/002.expected N othersrc/external/bsd/netdiff/bin/qdiff/003.expected N othersrc/external/bsd/netdiff/bin/qdiff/004.expected N othersrc/external/bsd/netdiff/bin/qdiff/005.expected N othersrc/external/bsd/netdiff/bin/qdiff/006.expected N othersrc/external/bsd/netdiff/bin/qdiff/Makefile N othersrc/external/bsd/netdiff/dist/Makefile N othersrc/external/bsd/netdiff/dist/TODO N othersrc/external/bsd/netdiff/dist/diff.c N othersrc/external/bsd/netdiff/dist/diff_subr.c N othersrc/external/bsd/netdiff/dist/diffdir.c N othersrc/external/bsd/netdiff/dist/diffreg.c N othersrc/external/bsd/netdiff/dist/internal.h N othersrc/external/bsd/netdiff/dist/libnetdiff.3 N othersrc/external/bsd/netdiff/dist/netdiff.1 N othersrc/external/bsd/netdiff/dist/netdiff.h N othersrc/external/bsd/netdiff/dist/pathnames.h N othersrc/external/bsd/netdiff/dist/qdiff.c N othersrc/external/bsd/netdiff/lib/Makefile N othersrc/external/bsd/netdiff/lib/shlib_version No conflicts created by this import
CVS commit: src/usr.sbin/puffs/rump_lfs
Module Name:src Committed By: riastradh Date: Thu Jan 10 08:35:26 UTC 2013 Modified Files: src/usr.sbin/puffs/rump_lfs: rump_lfs.c Log Message: After mount_lfs_parseargs, reset getopt for lfs_cleaner_main. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/puffs/rump_lfs/rump_lfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/netdiff/dist
Module Name:othersrc Committed By: wiz Date: Thu Jan 10 08:51:28 UTC 2013 Modified Files: othersrc/external/bsd/netdiff/dist: netdiff.1 Log Message: Fix date; add RCS Id. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/netdiff/dist/netdiff.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/netdiff/dist
Module Name:othersrc Committed By: wiz Date: Thu Jan 10 08:51:44 UTC 2013 Modified Files: othersrc/external/bsd/netdiff/dist: libnetdiff.3 Log Message: xref netdiff instead of bsddiff (I guess that was the intention). To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/netdiff/dist/libnetdiff.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4
Module Name:src Committed By: skrll Date: Thu Jan 10 09:02:53 UTC 2013 Added Files: src/share/man/man4: usmsc.4 Log Message: Simple usmsc(4) man page. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/share/man/man4/usmsc.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: mlelstv Date: Thu Jan 10 10:15:59 UTC 2013 Modified Files: src/sys/kern: subr_autoconf.c Log Message: Also report attachment of pseudo-devices to userland. To generate a diff of this commit: cvs rdiff -u -r1.224 -r1.225 src/sys/kern/subr_autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/alpha/stand/netboot
Module Name:src Committed By: he Date: Thu Jan 10 10:36:41 UTC 2013 Modified Files: src/sys/arch/alpha/stand/netboot: getsecs.c Log Message: Include machine/cpu.h for alpha_rpcc declaration. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/alpha/stand/netboot/getsecs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Thu Jan 10 13:10:26 UTC 2013 Modified Files: src/sys/arch/luna68k/stand/boot: Makefile boot.ldscript Log Message: Link the target boot binary as a.out directly rather than using elf2aout(1). Confirmed working on LUNA-I. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/boot.ldscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc
Module Name:src Committed By: skrll Date: Thu Jan 10 13:38:37 UTC 2013 Modified Files: src/etc: MAKEDEV.tmpl src/etc/etc.evbarm: MAKEDEV.conf Log Message: Create a plcom0 device node for RaspberryPI To generate a diff of this commit: cvs rdiff -u -r1.159 -r1.160 src/etc/MAKEDEV.tmpl cvs rdiff -u -r1.8 -r1.9 src/etc/etc.evbarm/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: jmcneill Date: Thu Jan 10 14:12:16 UTC 2013 Modified Files: src/sys/arch/arm/broadcom: bcm2835_genfb.c Log Message: only print switching to fb message if genfb is console To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm2835_genfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: jmcneill Date: Thu Jan 10 14:15:20 UTC 2013 Modified Files: src/sys/arch/evbarm/rpi: rpi_machdep.c Log Message: Modify fb attachment so genfb still attaches even if it isn't the console device. Slight change to cmdline.txt to allow for this: - console=fb enables fb console, otherwise serial console will be used - fb=WxH to select a mode, otherwise EDID will be tried and fallback to default mode (1280x720) - fb=disable to disable fb completely To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/rpi/rpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Thu Jan 10 15:51:32 UTC 2013 Modified Files: src/sys/arch/luna68k/stand/boot: Makefile boot.ldscript Log Message: Revert to using elf2aout(1) to build a.out binary. a.out binary linked by ldscript doesn't work on some uncertain conditions. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/boot.ldscript Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libedit
Module Name:src Committed By: wiz Date: Thu Jan 10 16:03:06 UTC 2013 Modified Files: src/lib/libedit: editline.3 Log Message: In 2000, .editrc reading from $PWD was removed. Update the man page. From LEVAI Daniel via jmc@OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/lib/libedit/editline.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libedit
Module Name:src Committed By: wiz Date: Thu Jan 10 16:03:42 UTC 2013 Modified Files: src/lib/libedit: editrc.5 Log Message: Add FILES section. From jmc@OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/lib/libedit/editrc.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Thu Jan 10 16:03:49 UTC 2013 Modified Files: src/sys/arch/luna68k/stand/boot: locore.S Log Message: Use proper asm symbol macro. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src Committed By: tsutsui Date: Thu Jan 10 16:20:11 UTC 2013 Modified Files: src/sys/arch/luna68k/stand/boot: disklabel.c omron_disklabel.h Log Message: Make disklabel command print correct disklabel info. - use exact-width interger types to define on-disk format (daddr_t could be a different size) - use proper LABELOFFSET to locate BSD disklabel (LABELOFFSET for luna68k is 64 as 4.4BSD-Lite2 while other ports that use sun_disklabel use 128) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/disklabel.c \ src/sys/arch/luna68k/stand/boot/omron_disklabel.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/sdmmc
Module Name:src Committed By: jmcneill Date: Thu Jan 10 17:19:33 UTC 2013 Modified Files: src/sys/dev/sdmmc: sdhc.c sdhcvar.h Log Message: add SDHC_FLAG_NO_HS_BIT flag to prevent sdhc driver from setting the SDHC_HIGH_SPEED bit in SDHC_HOST_CTL, required to get many high speed cards working on rpi To generate a diff of this commit: cvs rdiff -u -r1.42 -r1.43 src/sys/dev/sdmmc/sdhc.c cvs rdiff -u -r1.12 -r1.13 src/sys/dev/sdmmc/sdhcvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: jmcneill Date: Thu Jan 10 17:21:36 UTC 2013 Modified Files: src/sys/arch/arm/broadcom: bcm2835_emmc.c Log Message: reinstate SDHC_HIGH_SPEED_SUPP capability, and add SDHC_FLAG_NO_HS_BIT flag to workaround bcm2835 sdhc issue with many high speed cards To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/broadcom/bcm2835_emmc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/beagle
Module Name:src Committed By: macallan Date: Thu Jan 10 17:36:36 UTC 2013 Modified Files: src/sys/arch/evbarm/beagle: beagle_machdep.c Log Message: do as RPi does - if console=fb is in bootargs, tell omapfb to become the console and com not to, otherwise let com be the console To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/beagle/beagle_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: macallan Date: Thu Jan 10 17:38:10 UTC 2013 Modified Files: src/sys/dev/ic: com.c Log Message: don't try to become console if we get is_console=false as device property To generate a diff of this commit: cvs rdiff -u -r1.306 -r1.307 src/sys/dev/ic/com.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net80211
Module Name:src Committed By: christos Date: Thu Jan 10 17:40:10 UTC 2013 Modified Files: src/sys/net80211: ieee80211_input.c ieee80211_node.c ieee80211_proto.c ieee80211_proto.h Log Message: The IEEE80211_F_ flag prefix was used for both the flags in ieee80211_var.h and for the rates in ieee80211_proto.h; rename the rate bits as _R_ to avoid confusion. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/sys/net80211/ieee80211_input.c cvs rdiff -u -r1.63 -r1.64 src/sys/net80211/ieee80211_node.c cvs rdiff -u -r1.29 -r1.30 src/sys/net80211/ieee80211_proto.c cvs rdiff -u -r1.18 -r1.19 src/sys/net80211/ieee80211_proto.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumpuser
Module Name:src Committed By: pooka Date: Thu Jan 10 19:13:05 UTC 2013 Modified Files: src/lib/librumpuser: rumpuser.c Log Message: Provide an implementation of writewatchfile for platforms without kqueue or inotify (it's a rather simple implementation ;) To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/lib/librumpuser/rumpuser.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/librumpuser
Module Name:src Committed By: pooka Date: Thu Jan 10 19:14:12 UTC 2013 Modified Files: src/lib/librumpuser: rumpuser.c Log Message: .. and make it compile on said platforms. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/lib/librumpuser/rumpuser.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Thu Jan 10 20:31:05 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: add missing call to dwc_otg_xfer_end() in dwc_otg_device_bulk_done To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/dwc_otg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Thu Jan 10 21:25:54 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: defer updating td actlen until we get acknowledgement that the tx was successful, fixes umass writes (and probably a lot of other things) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/usb/dwc_otg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Thu Jan 10 21:50:56 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: also need to update actlen on ack for split transfers To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/dwc_otg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: jmcneill Date: Thu Jan 10 21:57:38 UTC 2013 Modified Files: src/sys/arch/arm/broadcom: bcm2835_space.c Log Message: basic mmap support, ok skrll To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/broadcom/bcm2835_space.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Thu Jan 10 22:02:12 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: Misc tidyup To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/dwc_otg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: matt Date: Thu Jan 10 22:06:33 UTC 2013 Modified Files: src/sys/arch/arm/broadcom: bcm53xx_board.c Log Message: Use the clk_info in cpu_softc. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/broadcom/bcm53xx_board.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/wsfb
Module Name:src Committed By: jmcneill Date: Thu Jan 10 22:06:59 UTC 2013 Modified Files: src/sys/dev/wsfb: genfb.c Log Message: for WSDISPLAYIO_SMODE, if the bus ioctl handler returns EPASSTHROUGH, dont treat it as an error To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/sys/dev/wsfb/genfb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/broadcom
Module Name:src Committed By: matt Date: Thu Jan 10 22:07:19 UTC 2013 Modified Files: src/sys/arch/arm/broadcom: bcm53xx_eth.c Log Message: Don't hard code the frequency used for INTRCVLAZY but grab the correct frequency from the cpu_softc. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/broadcom/bcm53xx_eth.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Thu Jan 10 22:08:11 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: RPI Log Message: enable framebuffer console driver To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/RPI Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Thu Jan 10 22:15:04 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: More tidyup To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/dwc_otg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Fri Jan 11 02:20:41 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: clear queued flag when aborting xfer To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/dwc_otg.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/common
Module Name:src Committed By: christos Date: Fri Jan 11 02:49:09 UTC 2013 Modified Files: src/sys/compat/linux/common: linux_futex.h Log Message: add the futex PI commands (not implemented yet) PI = Priotity Inheritance To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/compat/linux/common/linux_futex.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/defaults
Module Name:src Committed By: riastradh Date: Fri Jan 11 04:32:42 UTC 2013 Modified Files: src/etc/defaults: rc.conf Log Message: Nix `-b 1024' from ssh_keygen_flags in /etc/defaults/rc.conf. No objections on tech-security: http://mail-index.NetBSD.org/tech-security/2012/09/03/msg000548.html The security of generating keys at boot remains questionable, but this change makes that no worse. To generate a diff of this commit: cvs rdiff -u -r1.120 -r1.121 src/etc/defaults/rc.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/netdiff
Module Name:othersrc Committed By: agc Date: Fri Jan 11 05:10:19 UTC 2013 Modified Files: othersrc/external/bsd/netdiff/bin/netdiff: 002.expected 003.expected 004.expected 006.expected othersrc/external/bsd/netdiff/bin/qdiff: 002.expected 003.expected 004.expected 006.expected othersrc/external/bsd/netdiff/dist: diff_subr.c Log Message: Feedback from fuzz tests - check input arguments to exported functions Modify the expected output files for mtimes on the tests after the import To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 \ othersrc/external/bsd/netdiff/bin/netdiff/002.expected \ othersrc/external/bsd/netdiff/bin/netdiff/003.expected \ othersrc/external/bsd/netdiff/bin/netdiff/004.expected \ othersrc/external/bsd/netdiff/bin/netdiff/006.expected cvs rdiff -u -r1.1.1.1 -r1.2 \ othersrc/external/bsd/netdiff/bin/qdiff/002.expected \ othersrc/external/bsd/netdiff/bin/qdiff/003.expected \ othersrc/external/bsd/netdiff/bin/qdiff/004.expected \ othersrc/external/bsd/netdiff/bin/qdiff/006.expected cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/netdiff/dist/diff_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/netdiff
Module Name:othersrc Committed By: agc Date: Fri Jan 11 05:19:46 UTC 2013 Modified Files: othersrc/external/bsd/netdiff/bin/netdiff: 004.expected othersrc/external/bsd/netdiff/bin/qdiff: 004.expected othersrc/external/bsd/netdiff/dist: diff.c diff_subr.c diffdir.c diffreg.c Log Message: avoid accessing fields in the struct from main() and other callers - set defaults at the start of the 3 main functions - diff_file(), diff_dir() and difference(). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ othersrc/external/bsd/netdiff/bin/netdiff/004.expected cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/netdiff/bin/qdiff/004.expected cvs rdiff -u -r1.1.1.1 -r1.2 othersrc/external/bsd/netdiff/dist/diff.c \ othersrc/external/bsd/netdiff/dist/diffdir.c \ othersrc/external/bsd/netdiff/dist/diffreg.c cvs rdiff -u -r1.2 -r1.3 othersrc/external/bsd/netdiff/dist/diff_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Fri Jan 11 06:22:23 UTC 2013 Modified Files: src/sys/dev/usb: umass.c Log Message: Improve a panic message slightly To generate a diff of this commit: cvs rdiff -u -r1.146 -r1.147 src/sys/dev/usb/umass.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/external/bsd/binpatch
Module Name:othersrc Committed By: agc Date: Fri Jan 11 06:27:01 UTC 2013 Update of /cvsroot/othersrc/external/bsd/binpatch In directory ivanova.netbsd.org:/tmp/cvs-serv26282 Log Message: Import a binary patch library, libbinpatch(3), and program, binpatch(1), into the othersrc repository. This can be used to encode a binary patch file from an original file, and a new file. To do this, 3 separate instructions are used, similar to those outlined in RFC 3284 - + add - addition of new data + copy - copying of data from original file + run - a run of characters, similar to memset(3) The binary patches generated here are a much simplified form of those described in the RFC, but have 64bit offsets and 32bit sizes in the instructions. The generated binary patch files are also much smaller than the original files, and even standard diffs, and are only just larger then the equivalent vcdiff binary patch file. % diff f1 f2 | wc 58 3381969 % diff -u f1 f2 | wc 85 4082530 % binpatch -e f1 f2 | wc 44 2691801 % vcdiff encode -dictionary f1 -target f2 | wc 40 2571663 (The last is the Google vcdiff program found in pkgsrc/devel/open-vcdiff) The binpatch(1) program can be used to generate binary patch files, and to reconstruct the target files, in the following way % binpatch -e -o patch f1 f2 % binpatch -f f1 -o recon patch % diff f2 recon % rm -f recon % binpatch -v -f f1 -o recon patch Add 1337 bytes Copy 187 bytes from 0 Copy 386 bytes from 198 Add 50 bytes Copy 173 bytes from 592 Add 55 bytes Copy 373 bytes from 816 Add 74 bytes Copy 34 bytes from 1189 Add 182 bytes Copy 23 bytes from 1262 diff f2 recon % diff f2 recon % rm -f recon binpatch(1) uses libbinpatch(3) and libnetdiff(3) to encode binary patch files, and libbinpatch(3) to decode binary patch files. Status: Vendor Tag: CROOKS Release Tags: binpatch-base N othersrc/external/bsd/binpatch/Makefile N othersrc/external/bsd/binpatch/bin/007.expected N othersrc/external/bsd/binpatch/bin/Makefile N othersrc/external/bsd/binpatch/bin/f1 N othersrc/external/bsd/binpatch/bin/f2 N othersrc/external/bsd/binpatch/dist/Makefile N othersrc/external/bsd/binpatch/dist/binpatch.c N othersrc/external/bsd/binpatch/dist/binpatch.h N othersrc/external/bsd/binpatch/dist/main.c N othersrc/external/bsd/binpatch/dist/libbinpatch.3 N othersrc/external/bsd/binpatch/dist/binpatch.1 N othersrc/external/bsd/binpatch/lib/Makefile N othersrc/external/bsd/binpatch/lib/shlib_version No conflicts created by this import
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: skrll Date: Fri Jan 11 06:41:02 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: RPI Log Message: Bump SYMTAB_SPACE To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/RPI Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
