CVS commit: src/sys/dev/ic
Module Name:src
Committed By: skrll
Date: Sun Sep 22 06:54:35 UTC 2013
Modified Files:
src/sys/dev/ic: sl811hs.c sl811hsreg.h sl811hsvar.h
Log Message:
Remove all trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/dev/ic/sl811hs.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/ic/sl811hsreg.h
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/sl811hsvar.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/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.36 src/sys/dev/ic/sl811hs.c:1.37
--- src/sys/dev/ic/sl811hs.c:1.36 Sun Sep 22 06:52:11 2013
+++ src/sys/dev/ic/sl811hs.c Sun Sep 22 06:54:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.36 2013/09/22 06:52:11 skrll Exp $ */
+/* $NetBSD: sl811hs.c,v 1.37 2013/09/22 06:54:35 skrll Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -85,7 +85,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.36 2013/09/22 06:52:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sl811hs.c,v 1.37 2013/09/22 06:54:35 skrll Exp $");
#include "opt_slhci.h"
@@ -191,11 +191,11 @@ pnames(int ptype)
/*
* Maximum allowable reserved bus time. Since intr/isoc transfers have
- * unconditional priority, this is all that ensures control and bulk transfers
- * get a chance. It is a single value for all frames since all transfers can
- * use multiple consecutive frames if an error is encountered. Note that it
- * is not really possible to fill the bus with transfers, so this value should
- * be on the low side. Defaults to giving a warning unless SLHCI_NO_OVERTIME
+ * unconditional priority, this is all that ensures control and bulk transfers
+ * get a chance. It is a single value for all frames since all transfers can
+ * use multiple consecutive frames if an error is encountered. Note that it
+ * is not really possible to fill the bus with transfers, so this value should
+ * be on the low side. Defaults to giving a warning unless SLHCI_NO_OVERTIME
* is defined. Full time is 12000 - END_BUSTIME.
*/
#ifndef SLHCI_RESERVED_BUSTIME
@@ -204,7 +204,7 @@ pnames(int ptype)
/*
* Rate for "exceeds reserved bus time" warnings (default) or errors.
- * Warnings only happen when an endpoint open causes the time to go above
+ * Warnings only happen when an endpoint open causes the time to go above
* SLHCI_RESERVED_BUSTIME, not if it is already above.
*/
#ifndef SLHCI_OVERTIME_WARNING_RATE
@@ -233,8 +233,8 @@ static const struct timeval overflow_war
/*
* This is an approximation of the USB worst-case timings presented on p. 54 of
- * the USB 1.1 spec translated to full speed bit times.
- * FS = full speed with handshake, FSII = isoc in, FSIO = isoc out,
+ * the USB 1.1 spec translated to full speed bit times.
+ * FS = full speed with handshake, FSII = isoc in, FSIO = isoc out,
* FSI = isoc (worst case), LS = low speed
*/
#define SLHCI_FS_CONST 114
@@ -618,8 +618,8 @@ struct kern_history_ent slhci_he[SLHCI_N
#define DLOG(x, f, a, b, c, d) SLHCI_DEXEC(x, DDOLOG(f, a, b, c, d))
/*
* DLOGFLAG8 is a macro not a function so that flag name expressions are not
- * evaluated unless the flag bit is set (which could save a register read).
- * x is debug mask, y is flag identifier, z is flag variable,
+ * evaluated unless the flag bit is set (which could save a register read).
+ * x is debug mask, y is flag identifier, z is flag variable,
* a-h are flag names (must evaluate to string constants, msb first).
*/
#define DDOLOGFLAG8(y, z, a, b, c, d, e, f, g, h) do { uint8_t _DLF8 = (z); \
@@ -1003,10 +1003,10 @@ slhci_start(struct usbd_xfer *xfer)
/*
* The goal of newbustime and newlen is to avoid bustime calculation
- * in the interrupt. The calculations are not too complex, but they
- * complicate the conditional logic somewhat and doing them all in the
- * same place shares constants. Index 0 is "short length" for bulk and
- * ctrl data and 1 is "full length" for ctrl data (bulk/intr are
+ * in the interrupt. The calculations are not too complex, but they
+ * complicate the conditional logic somewhat and doing them all in the
+ * same place shares constants. Index 0 is "short length" for bulk and
+ * ctrl data and 1 is "full length" for ctrl data (bulk/intr are
* already set to full length).
*/
if (spipe->pflags & PF_LS) {
@@ -1041,10 +1041,10 @@ slhci_start(struct usbd_xfer *xfer)
/*
* The datasheet incorrectly indicates that DIRECTION is for
- * "transmit to host". It is for OUT and SETUP. The app note
+ * "transmit to host". It is for OUT and SETUP. The app note
* describes its use correctly.
*/
- if ((spipe->tregs[PID] & SL11_PID_BITS) != SL11_PID_IN)
+ if ((spipe->tregs[PID] & SL11_PID_BITS) != SL11_PID_IN)
spipe->control |= SL11_EPCTRL_DIRECTION;
slhci_start_entry(sc, spipe);
@@ -1095,7 +1095,7 @@ slhci_open(struct usbd_pipe *pipe)
/*
CVS commit: src/sys/dev/ic
Module Name:src Committed By: skrll Date: Sun Sep 22 06:52:11 UTC 2013 Modified Files: src/sys/dev/ic: sl811hs.c Log Message: Remove trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ic/sl811hs.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/sl811hs.c diff -u src/sys/dev/ic/sl811hs.c:1.35 src/sys/dev/ic/sl811hs.c:1.36 --- src/sys/dev/ic/sl811hs.c:1.35 Mon Sep 2 12:27:18 2013 +++ src/sys/dev/ic/sl811hs.c Sun Sep 22 06:52:11 2013 @@ -1,11 +1,11 @@ -/* $NetBSD: sl811hs.c,v 1.35 2013/09/02 12:27:18 skrll Exp $ */ +/* $NetBSD: sl811hs.c,v 1.36 2013/09/22 06:52:11 skrll Exp $ */ /* * Not (c) 2007 Matthew Orgass - * This file is public domain, meaning anyone can make any use of part or all - * of this file including copying into other works without credit. Any use, - * modified or not, is solely the responsibility of the user. If this file is - * part of a collection then use in the collection is governed by the terms of + * This file is public domain, meaning anyone can make any use of part or all + * of this file including copying into other works without credit. Any use, + * modified or not, is solely the responsibility of the user. If this file is + * part of a collection then use in the collection is governed by the terms of * the collection. */ @@ -13,64 +13,64 @@ * Cypress/ScanLogic SL811HS/T USB Host Controller * Datasheet, Errata, and App Note available at www.cypress.com * - * Uses: Ratoc CFU1U PCMCIA USB Host Controller, Nereid X68k USB HC, ISA + * Uses: Ratoc CFU1U PCMCIA USB Host Controller, Nereid X68k USB HC, ISA * HCs. The Ratoc CFU2 uses a different chip. * - * This chip puts the serial in USB. It implements USB by means of an eight - * bit I/O interface. It can be used for ISA, PCMCIA/CF, parallel port, - * serial port, or any eight bit interface. It has 256 bytes of memory, the - * first 16 of which are used for register access. There are two sets of - * registers for sending individual bus transactions. Because USB is polled, - * this organization means that some amount of card access must often be made - * when devices are attached, even if when they are not directly being used. - * A per-ms frame interrupt is necessary and many devices will poll with a + * This chip puts the serial in USB. It implements USB by means of an eight + * bit I/O interface. It can be used for ISA, PCMCIA/CF, parallel port, + * serial port, or any eight bit interface. It has 256 bytes of memory, the + * first 16 of which are used for register access. There are two sets of + * registers for sending individual bus transactions. Because USB is polled, + * this organization means that some amount of card access must often be made + * when devices are attached, even if when they are not directly being used. + * A per-ms frame interrupt is necessary and many devices will poll with a * per-frame bulk transfer. * - * It is possible to write a little over two bytes to the chip (auto - * incremented) per full speed byte time on the USB. Unfortunately, - * auto-increment does not work reliably so write and bus speed is + * It is possible to write a little over two bytes to the chip (auto + * incremented) per full speed byte time on the USB. Unfortunately, + * auto-increment does not work reliably so write and bus speed is * approximately the same for full speed devices. * - * In addition to the 240 byte packet size limit for isochronous transfers, - * this chip has no means of determining the current frame number other than - * getting all 1ms SOF interrupts, which is not always possible even on a fast - * system. Isochronous transfers guarantee that transfers will never be - * retried in a later frame, so this can cause problems with devices beyond - * the difficulty in actually performing the transfer most frames. I tried - * implementing isoc transfers and was able to play CD-derrived audio via an + * In addition to the 240 byte packet size limit for isochronous transfers, + * this chip has no means of determining the current frame number other than + * getting all 1ms SOF interrupts, which is not always possible even on a fast + * system. Isochronous transfers guarantee that transfers will never be + * retried in a later frame, so this can cause problems with devices beyond + * the difficulty in actually performing the transfer most frames. I tried + * implementing isoc transfers and was able to play CD-derrived audio via an * iMic on a 2GHz PC, however it would still be interrupted at times and - * once interrupted, would stay out of sync. All isoc support has been + * once interrupted, would stay out of sync. All isoc support has been * removed. * - * BUGS: all chip revisions have problems with low speed devices through hubs. - * The chip stops generating SOF w
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: riz Date: Sun Sep 22 05:16:34 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.3 Log Message: Whitespace fixes. To generate a diff of this commit: cvs rdiff -u -r1.1.2.26 -r1.1.2.27 src/doc/CHANGES-6.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.3 diff -u src/doc/CHANGES-6.0.3:1.1.2.26 src/doc/CHANGES-6.0.3:1.1.2.27 --- src/doc/CHANGES-6.0.3:1.1.2.26 Sat Sep 21 02:56:40 2013 +++ src/doc/CHANGES-6.0.3 Sun Sep 22 05:16:34 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.3,v 1.1.2.26 2013/09/21 02:56:40 riz Exp $ +# $NetBSD: CHANGES-6.0.3,v 1.1.2.27 2013/09/22 05:16:34 riz Exp $ A complete list of changes from the NetBSD 6.0.2 release to the NetBSD 6.0.3 release: @@ -97,6 +97,7 @@ lib/libm/arch/x86_64/fenv.c 1.3-1.4 got lost somewhere along the line; the i387 code has it. Fix sense of fegetexcept on x86. [riastradh, ticket #899] + tests/lib/libm/t_atan.c1.4 - 1.7, 1.9 via patch Fix test of atan_inf_neg, atan_inf_pos and atan_tan on i386. @@ -224,6 +225,7 @@ sys/netinet6/in6.c1.167 via patch Include BRDADDR and NETMASK to the v4 ioctls we ban for v6; from FreeBSD. [spz, ticket #944] + xsrc/external/mit/libX11/dist/src/xkb/XKBNames.c patch xsrc/external/mit/libX11/dist/src/xkb/XKBGetMap.c patch
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: riz Date: Sun Sep 22 05:15:57 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.2 Log Message: Whitespace fixes. To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-6.1.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.2 diff -u src/doc/CHANGES-6.1.2:1.1.2.12 src/doc/CHANGES-6.1.2:1.1.2.13 --- src/doc/CHANGES-6.1.2:1.1.2.12 Sat Sep 21 16:38:45 2013 +++ src/doc/CHANGES-6.1.2 Sun Sep 22 05:15:57 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.2,v 1.1.2.12 2013/09/21 16:38:45 riz Exp $ +# $NetBSD: CHANGES-6.1.2,v 1.1.2.13 2013/09/22 05:15:57 riz Exp $ A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2 release: @@ -55,6 +55,7 @@ sys/net/npf/npf_inet.c1.23 - npf_cache_all: clear NBUF_DATAREF_RESET since npf_cache_ip() handles it. [riz, ticket #942] + lib/libc/stdlib/_env.c1.8 Don't scrub the environment unless we are going to change it. @@ -76,6 +77,7 @@ sys/netinet6/in6.c1.167 via patch Include BRDADDR and NETMASK to the v4 ioctls we ban for v6; from FreeBSD. [spz, ticket #944] + xsrc/external/mit/libX11/dist/src/xkb/XKBNames.c patch xsrc/external/mit/libX11/dist/src/xkb/XKBGetMap.c patch
CVS commit: src
Module Name:src
Committed By: joerg
Date: Sat Sep 21 22:28:12 UTC 2013
Modified Files:
src/distrib/sets/lists/comp: md.amd64 md.i386
src/external/bsd/dhcp: Makefile.inc
src/external/bsd/ipf: Makefile.inc
src/external/bsd/libevent/lib: Makefile.inc
src/external/bsd/llvm: Makefile.inc
src/external/bsd/llvm/include: Makefile
src/external/bsd/llvm/lib/libLLVMScalarOpts: Makefile
src/external/bsd/llvm/lib/libLLVMSupport: Makefile
src/external/bsd/llvm/lib/liblldDriver: Makefile
src/external/bsd/ntp: Makefile.inc
src/external/bsd/tcpdump/bin: Makefile
src/lib/libm: Makefile
src/sys/conf: Makefile.kern.inc
src/usr.bin/nvi: Makefile.inc
Log Message:
Update LLVM/Clang snapshot to r191105. This brings in a better detection
of unused static variables and functions. Disable this for some external
code and for ioconf.c in the kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.198 -r1.199 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.136 -r1.137 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcp/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/ipf/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libevent/lib/Makefile.inc
cvs rdiff -u -r1.54 -r1.55 src/external/bsd/llvm/Makefile.inc
cvs rdiff -u -r1.20 -r1.21 src/external/bsd/llvm/include/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/bsd/llvm/lib/libLLVMScalarOpts/Makefile
cvs rdiff -u -r1.21 -r1.22 src/external/bsd/llvm/lib/libLLVMSupport/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/llvm/lib/liblldDriver/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/ntp/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/tcpdump/bin/Makefile
cvs rdiff -u -r1.141 -r1.142 src/lib/libm/Makefile
cvs rdiff -u -r1.161 -r1.162 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.2 -r1.3 src/usr.bin/nvi/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.198 src/distrib/sets/lists/comp/md.amd64:1.199
--- src/distrib/sets/lists/comp/md.amd64:1.198 Sun Aug 11 22:29:02 2013
+++ src/distrib/sets/lists/comp/md.amd64 Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.198 2013/08/11 22:29:02 joerg Exp $
+# $NetBSD: md.amd64,v 1.199 2013/09/21 22:28:12 joerg Exp $
./usr/include/amd64comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -163,6 +163,7 @@
./usr/include/clang-3.4/prfchwintrin.h comp-c-include llvm
./usr/include/clang-3.4/rdseedintrin.h comp-c-include llvm
./usr/include/clang-3.4/rtmintrin.h comp-c-include llvm
+./usr/include/clang-3.4/shaintrin.h comp-c-include llvm
./usr/include/clang-3.4/smmintrin.h comp-c-include llvm
./usr/include/clang-3.4/tmmintrin.h comp-c-include llvm
./usr/include/clang-3.4/wmmintrin.h comp-c-include llvm
Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.136 src/distrib/sets/lists/comp/md.i386:1.137
--- src/distrib/sets/lists/comp/md.i386:1.136 Sun Aug 11 22:29:02 2013
+++ src/distrib/sets/lists/comp/md.i386 Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.136 2013/08/11 22:29:02 joerg Exp $
+# $NetBSD: md.i386,v 1.137 2013/09/21 22:28:12 joerg Exp $
./usr/include/clang-3.0/avx2intrin.h comp-obsolete obsolete
./usr/include/clang-3.0/avxintrin.h comp-obsolete obsolete
./usr/include/clang-3.0/bmi2intrin.h comp-obsolete obsolete
@@ -94,6 +94,7 @@
./usr/include/clang-3.4/prfchwintrin.h comp-c-include llvm
./usr/include/clang-3.4/rdseedintrin.h comp-c-include llvm
./usr/include/clang-3.4/rtmintrin.h comp-c-include llvm
+./usr/include/clang-3.4/shaintrin.h comp-c-include llvm
./usr/include/clang-3.4/smmintrin.h comp-c-include llvm
./usr/include/clang-3.4/tmmintrin.h comp-c-include llvm
./usr/include/clang-3.4/wmmintrin.h comp-c-include llvm
Index: src/external/bsd/dhcp/Makefile.inc
diff -u src/external/bsd/dhcp/Makefile.inc:1.7 src/external/bsd/dhcp/Makefile.inc:1.8
--- src/external/bsd/dhcp/Makefile.inc:1.7 Sun Aug 11 14:42:04 2013
+++ src/external/bsd/dhcp/Makefile.inc Sat Sep 21 22:28:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.7 2013/08/11 14:42:04 tsutsui Exp $
+# $NetBSD: Makefile.inc,v 1.8 2013/09/21 22:28:12 joerg Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual -Wsign-compare
@@ -7,7 +7,7 @@ WARNS?= 1 # XXX -Wshadow -Wcast-qual -Ws
USE_FORT?= yes # network client/server
CWARNFLAGS.clang+= -Wno-tautological-compare \
-Wno-conversion -Wno-constant-logical-operand \
- -Wno-format-security
+ -Wno-format-security -Wno-error=unused-const-variable
DIST:= ${.PARSEDIR}/dist
BIND:= ${.PARSEDIR}/../bind/dist
Index: src/external/bsd/ipf/Makefile.inc
diff -u src/external/bsd/ipf/M
CVS commit: src/sys/kern
Module Name:src Committed By: dholland Date: Sat Sep 21 19:51:33 UTC 2013 Modified Files: src/sys/kern: vfs_vnode.c Log Message: In description of a locking mess, add reference to the PR for the bug the mess is supposed to help with. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/kern/vfs_vnode.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/vfs_vnode.c diff -u src/sys/kern/vfs_vnode.c:1.19 src/sys/kern/vfs_vnode.c:1.20 --- src/sys/kern/vfs_vnode.c:1.19 Wed Feb 13 14:03:48 2013 +++ src/sys/kern/vfs_vnode.c Sat Sep 21 19:51:33 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: vfs_vnode.c,v 1.19 2013/02/13 14:03:48 hannken Exp $ */ +/* $NetBSD: vfs_vnode.c,v 1.20 2013/09/21 19:51:33 dholland Exp $ */ /*- * Copyright (c) 1997-2011 The NetBSD Foundation, Inc. @@ -121,10 +121,12 @@ * * Note: if VI_CLEAN is set, vnode_t::v_interlock will be released while * mntvnode_lock is still held. + * + * See PR 41374. */ #include -__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.19 2013/02/13 14:03:48 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vfs_vnode.c,v 1.20 2013/09/21 19:51:33 dholland Exp $"); #include #include
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Sat Sep 21 16:40:20 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.46 -r1.1.2.47 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.46 src/doc/CHANGES-6.2:1.1.2.47 --- src/doc/CHANGES-6.2:1.1.2.46 Sat Sep 21 02:56:13 2013 +++ src/doc/CHANGES-6.2 Sat Sep 21 16:40:20 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.46 2013/09/21 02:56:13 riz Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.47 2013/09/21 16:40:20 riz Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -754,3 +754,8 @@ share/zoneinfo/australasia 1.33 This year Fiji will start DST on October 27, not October 20. [apb, ticket #949] +usr.bin/flock/flock.11.9 + + flock(1) really appeared first in NetBSD 6.1 + [khorben, ticket #951] +
CVS commit: [netbsd-6] src/usr.bin/flock
Module Name:src Committed By: riz Date: Sat Sep 21 16:39:58 UTC 2013 Modified Files: src/usr.bin/flock [netbsd-6]: flock.1 Log Message: Pull up following revision(s) (requested by khorben in ticket #951): usr.bin/flock/flock.1: revision 1.9 flock(1) really appeared first in NetBSD 6.1 To generate a diff of this commit: cvs rdiff -u -r1.8.4.2 -r1.8.4.3 src/usr.bin/flock/flock.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/flock/flock.1 diff -u src/usr.bin/flock/flock.1:1.8.4.2 src/usr.bin/flock/flock.1:1.8.4.3 --- src/usr.bin/flock/flock.1:1.8.4.2 Wed Nov 28 21:34:36 2012 +++ src/usr.bin/flock/flock.1 Sat Sep 21 16:39:58 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: flock.1,v 1.8.4.2 2012/11/28 21:34:36 riz Exp $ +.\" $NetBSD: flock.1,v 1.8.4.3 2013/09/21 16:39:58 riz Exp $ .\" .\" Copyright (c) 2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -97,4 +97,4 @@ Obtain an exclusive lock. An .Nm utility appeared in -.Nx 7.0 . +.Nx 6.1 .
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: riz Date: Sat Sep 21 16:38:45 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.2 Log Message: Ticket 951. To generate a diff of this commit: cvs rdiff -u -r1.1.2.11 -r1.1.2.12 src/doc/CHANGES-6.1.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.2 diff -u src/doc/CHANGES-6.1.2:1.1.2.11 src/doc/CHANGES-6.1.2:1.1.2.12 --- src/doc/CHANGES-6.1.2:1.1.2.11 Sat Sep 21 02:57:03 2013 +++ src/doc/CHANGES-6.1.2 Sat Sep 21 16:38:45 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.2,v 1.1.2.11 2013/09/21 02:57:03 riz Exp $ +# $NetBSD: CHANGES-6.1.2,v 1.1.2.12 2013/09/21 16:38:45 riz Exp $ A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2 release: @@ -101,3 +101,8 @@ share/zoneinfo/australasia 1.33 This year Fiji will start DST on October 27, not October 20. [apb, ticket #949] +usr.bin/flock/flock.11.9 + + flock(1) really appeared first in NetBSD 6.1 + [khorben, ticket #951] +
CVS commit: [netbsd-6-1] src/usr.bin/flock
Module Name:src Committed By: riz Date: Sat Sep 21 16:36:12 UTC 2013 Modified Files: src/usr.bin/flock [netbsd-6-1]: flock.1 Log Message: Pull up following revision(s) (requested by khorben in ticket #951): usr.bin/flock/flock.1: revision 1.9 flock(1) really appeared first in NetBSD 6.1 To generate a diff of this commit: cvs rdiff -u -r1.8.4.2 -r1.8.4.2.2.1 src/usr.bin/flock/flock.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/flock/flock.1 diff -u src/usr.bin/flock/flock.1:1.8.4.2 src/usr.bin/flock/flock.1:1.8.4.2.2.1 --- src/usr.bin/flock/flock.1:1.8.4.2 Wed Nov 28 21:34:36 2012 +++ src/usr.bin/flock/flock.1 Sat Sep 21 16:36:12 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: flock.1,v 1.8.4.2 2012/11/28 21:34:36 riz Exp $ +.\" $NetBSD: flock.1,v 1.8.4.2.2.1 2013/09/21 16:36:12 riz Exp $ .\" .\" Copyright (c) 2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -97,4 +97,4 @@ Obtain an exclusive lock. An .Nm utility appeared in -.Nx 7.0 . +.Nx 6.1 .
CVS commit: src/usr.bin/flock
Module Name:src Committed By: khorben Date: Sat Sep 21 15:01:14 UTC 2013 Modified Files: src/usr.bin/flock: flock.1 Log Message: flock(1) really appeared first in NetBSD 6.1 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.bin/flock/flock.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/flock/flock.1 diff -u src/usr.bin/flock/flock.1:1.8 src/usr.bin/flock/flock.1:1.9 --- src/usr.bin/flock/flock.1:1.8 Sat Nov 3 00:50:04 2012 +++ src/usr.bin/flock/flock.1 Sat Sep 21 15:01:14 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: flock.1,v 1.8 2012/11/03 00:50:04 wiz Exp $ +.\" $NetBSD: flock.1,v 1.9 2013/09/21 15:01:14 khorben Exp $ .\" .\" Copyright (c) 2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -97,4 +97,4 @@ Obtain an exclusive lock. An .Nm utility appeared in -.Nx 7.0 . +.Nx 6.1 .
CVS commit: src/sys
Module Name:src Committed By: skrll Date: Sat Sep 21 13:22:48 UTC 2013 Modified Files: src/sys/arch/arm/broadcom: files.bcm2835 src/sys/conf: files Log Message: Some dwc2 glue. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/broadcom/files.bcm2835 cvs rdiff -u -r1.1079 -r1.1080 src/sys/conf/files 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/files.bcm2835 diff -u src/sys/arch/arm/broadcom/files.bcm2835:1.16 src/sys/arch/arm/broadcom/files.bcm2835:1.17 --- src/sys/arch/arm/broadcom/files.bcm2835:1.16 Sun Mar 24 19:55:19 2013 +++ src/sys/arch/arm/broadcom/files.bcm2835 Sat Sep 21 13:22:48 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.bcm2835,v 1.16 2013/03/24 19:55:19 jmcneill Exp $ +# $NetBSD: files.bcm2835,v 1.17 2013/09/21 13:22:48 skrll Exp $ # # Configuration info for Broadcom BCM2835 ARM Peripherals # @@ -59,6 +59,10 @@ file arch/arm/broadcom/bcm2835_emmc.c bc attach dotg at obio with dotg_amba file arch/arm/broadcom/bcm2835_dotg.c dotg needs-flag +# USB (BCM2835_USB_BASE) +attach dwctwo at obio with bcmdwctwo +file arch/arm/broadcom/bcm2835_dwctwo.c bcmdwctwo needs-flag + # GPIO misc. functions define bcm2835_gpio_subr file arch/arm/broadcom/bcm2835_gpio_subr.c bcm2835_gpio_subr Index: src/sys/conf/files diff -u src/sys/conf/files:1.1079 src/sys/conf/files:1.1080 --- src/sys/conf/files:1.1079 Sun Sep 8 12:51:14 2013 +++ src/sys/conf/files Sat Sep 21 13:22:48 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1079 2013/09/08 12:51:14 jmcneill Exp $ +# $NetBSD: files,v 1.1080 2013/09/21 13:22:48 skrll Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20100430 @@ -1213,6 +1213,10 @@ file dev/ic/sl811hs.c slhci needs-fla device dotg: usbus, usbroothub, usb_dma file dev/usb/dwc_otg.c dotg needs-flag +# DesignWare HS OTG host controller +# +include "external/bsd/dwc2/conf/files.dwc2" + # USB HID processing (as used by bluetooth and usb code) define hid file dev/usb/hid.c hid
CVS commit: src/sys/external/bsd/dwc2
Module Name:src
Committed By: skrll
Date: Sat Sep 21 13:17:00 UTC 2013
Modified Files:
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
Improve a couple of DPRINTFs
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/dwc2/dwc2.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/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.1 src/sys/external/bsd/dwc2/dwc2.c:1.2
--- src/sys/external/bsd/dwc2/dwc2.c:1.1 Thu Sep 5 20:25:27 2013
+++ src/sys/external/bsd/dwc2/dwc2.c Sat Sep 21 13:17:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.1 2013/09/05 20:25:27 skrll Exp $ */
+/* $NetBSD: dwc2.c,v 1.2 2013/09/21 13:17:00 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.1 2013/09/05 20:25:27 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.2 2013/09/21 13:17:00 skrll Exp $");
#include "opt_usb.h"
@@ -1240,10 +1240,11 @@ dwc2_device_start(usbd_xfer_handle xfer)
usb_device_request_t *req = &xfer->request;
DPRINTFN(3, "xfer=%p, type=0x%02x, request=0x%02x, wValue=0x%04x,"
- "wIndex=0x%04x len=%d, addr=%d, endpt=%d, dir=%s, speed=%d\n",
+ "wIndex=0x%04x len=%d, addr=%d, endpt=%d, dir=%s, speed=%d"
+ "mps=%d\n",
xfer, req->bmRequestType, req->bRequest, UGETW(req->wValue),
UGETW(req->wIndex), UGETW(req->wLength), dev->address,
- epnum, dir == UT_READ ? "in" :"out", dev->speed);
+ epnum, dir == UT_READ ? "in" :"out", dev->speed, mps);
/* Copy request packet to our DMA buffer */
memcpy(KERNADDR(&dpipe->req_dma, 0), req, sizeof(*req));
@@ -1261,8 +1262,8 @@ dwc2_device_start(usbd_xfer_handle xfer)
len, dir == UE_DIR_IN ? "in" : "out");
} else {
DPRINTFN(3, "xfer=%p, len=%d, flags=%d, addr=%d, endpt=%d,"
- " dir %s\n", xfer, xfer->length, xfer->flags, addr, epnum,
- dir == UT_READ ? "in" :"out");
+ " mps=%d dir %s\n", xfer, xfer->length, xfer->flags, addr,
+ epnum, mps, dir == UT_READ ? "in" :"out");
len = xfer->length;
}
CVS commit: src/sys/arch/mvmeppc/stand
Module Name:src
Committed By: tsutsui
Date: Sat Sep 21 08:40:37 UTC 2013
Modified Files:
src/sys/arch/mvmeppc/stand: Makefile.booters
src/sys/arch/mvmeppc/stand/libsa: Makefile Makefile.inc
Log Message:
Explicitly link srt0.o (Standalone RunTime startup code) first.
Taken from the similar fix of mvme68k:
http://mail-index.netbsd.org/source-changes/2013/09/21/msg047819.html
> MVME PROM requires raw binaries (by objcopy -O binary) so we have to
> make sure the entry point is located at the first address of the binaries.
The original changes to switch to using MI libsa is:
http://mail-index.netbsd.org/source-changes/2011/01/02/msg016563.html
Should be pulled up to netbsd-6 branches.
(though untested since there seems no users of mvmeppc)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/mvmeppc/stand/Makefile.booters
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvmeppc/stand/libsa/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mvmeppc/stand/libsa/Makefile.inc
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/mvmeppc/stand/Makefile.booters
diff -u src/sys/arch/mvmeppc/stand/Makefile.booters:1.12 src/sys/arch/mvmeppc/stand/Makefile.booters:1.13
--- src/sys/arch/mvmeppc/stand/Makefile.booters:1.12 Sat Jan 22 19:19:20 2011
+++ src/sys/arch/mvmeppc/stand/Makefile.booters Sat Sep 21 08:40:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.12 2011/01/22 19:19:20 joerg Exp $
+# $NetBSD: Makefile.booters,v 1.13 2013/09/21 08:40:37 tsutsui Exp $
S?= ${.CURDIR}/../../../..
MDEC_DIR?= /usr/mdec
@@ -56,6 +56,8 @@ LIBSA_DIR!= cd ${LIB_SA_DIR} && ${PRINTO
LIBSA= ${LIBSA_DIR}/lib/sa/libsa.a
LIBKERN= ${LIBSA_DIR}/lib/kern/libkern.a
+SRTOBJ?= ${LIBSA_DIR}/srt0.o
+
#WRTVID_BOOT_DIR= ${.CURDIR}/../wrtvid
#WRTVID_DIR!= cd ${WRTVID_BOOT_DIR} && ${PRINTOBJDIR}
#WRTVID=${WRTVID_DIR}/wrtvid
Index: src/sys/arch/mvmeppc/stand/libsa/Makefile
diff -u src/sys/arch/mvmeppc/stand/libsa/Makefile:1.10 src/sys/arch/mvmeppc/stand/libsa/Makefile:1.11
--- src/sys/arch/mvmeppc/stand/libsa/Makefile:1.10 Sun Jan 2 09:40:52 2011
+++ src/sys/arch/mvmeppc/stand/libsa/Makefile Sat Sep 21 08:40:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2011/01/02 09:40:52 tsutsui Exp $
+# $NetBSD: Makefile,v 1.11 2013/09/21 08:40:37 tsutsui Exp $
S!= cd ${.CURDIR}/../../../..; pwd
@@ -32,7 +32,9 @@ LIBKERN= ${KERNLIB}
LIBS= ${LIBSA} ${LIBKERN}
-all realall: ${LIBS}
+CLEANFILES+= srt0.o
+
+all realall: ${LIBS} srt0.o
cleandir distclean: .WAIT cleanlibdir
Index: src/sys/arch/mvmeppc/stand/libsa/Makefile.inc
diff -u src/sys/arch/mvmeppc/stand/libsa/Makefile.inc:1.1 src/sys/arch/mvmeppc/stand/libsa/Makefile.inc:1.2
--- src/sys/arch/mvmeppc/stand/libsa/Makefile.inc:1.1 Sun Jan 2 09:40:52 2011
+++ src/sys/arch/mvmeppc/stand/libsa/Makefile.inc Sat Sep 21 08:40:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2011/01/02 09:40:52 tsutsui Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/09/21 08:40:37 tsutsui Exp $
S!= cd ${SA_EXTRADIR}/../../../..; pwd
@@ -7,7 +7,7 @@ S!= cd ${SA_EXTRADIR}/../../../..; pwd
SRC_sa= dev_net.c
-SRC_here= srt0.S bugsyscalls.S exec_mvme.c parse_args.c getchar.c putchar.c
+SRC_here= bugsyscalls.S exec_mvme.c parse_args.c getchar.c putchar.c
SRC_here+= if_bug.c clock.c
SRCS+= ${SRC_sa} ${SRC_here}
CVS commit: src/sys/arch/mvme68k/stand
Module Name:src
Committed By: tsutsui
Date: Sat Sep 21 08:32:39 UTC 2013
Modified Files:
src/sys/arch/mvme68k/stand: Makefile.booters
src/sys/arch/mvme68k/stand/libsa: Makefile Makefile.inc
Log Message:
Explicitly link SRT0.o (Standalone RunTime startup code) first.
This is my fault on changes to make mvme68k bootloaders use MI libsa:
http://mail-index.netbsd.org/source-changes/2011/01/02/msg016539.html
MVME PROM requires raw binaries (by objcopy -O binary) so we have to
make sure the entry point is located at the first address of the binaries.
The problem (6.1 netboot fails with an illegal instruction message)
is reported by Andrew Gillham on port-mvme68k@:
http://mail-index.netbsd.org/port-mvme68k/2013/09/17/msg82.html
Note mvme68k bootloadres in netbsd-6 still have another bug triggered
by gcc-4.5.
Should be pulled up to netbsd-6 branches.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/mvme68k/stand/Makefile.booters
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mvme68k/stand/libsa/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mvme68k/stand/libsa/Makefile.inc
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/mvme68k/stand/Makefile.booters
diff -u src/sys/arch/mvme68k/stand/Makefile.booters:1.23 src/sys/arch/mvme68k/stand/Makefile.booters:1.24
--- src/sys/arch/mvme68k/stand/Makefile.booters:1.23 Mon Aug 12 16:34:05 2013
+++ src/sys/arch/mvme68k/stand/Makefile.booters Sat Sep 21 08:32:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.23 2013/08/12 16:34:05 joerg Exp $
+# $NetBSD: Makefile.booters,v 1.24 2013/09/21 08:32:39 tsutsui Exp $
S?= ${.CURDIR}/../../../..
MDEC_DIR?= /usr/mdec
@@ -59,6 +59,8 @@ LIBSA_DIR!= cd ${LIB_SA_DIR} && ${PRINTO
LIBSA= ${LIBSA_DIR}/lib/sa/libsa.a
LIBKERN= ${LIBSA_DIR}/lib/kern/libkern.a
+SRTOBJ?= ${LIBSA_DIR}/SRT0.o
+
LIB_BUG_DIR= ${.CURDIR}/../libbug
LIBBUG_DIR!= cd ${LIB_BUG_DIR} && ${PRINTOBJDIR}
LIBBUG=${LIBBUG_DIR}/libbug.a
Index: src/sys/arch/mvme68k/stand/libsa/Makefile
diff -u src/sys/arch/mvme68k/stand/libsa/Makefile:1.33 src/sys/arch/mvme68k/stand/libsa/Makefile:1.34
--- src/sys/arch/mvme68k/stand/libsa/Makefile:1.33 Sun Jan 2 05:30:12 2011
+++ src/sys/arch/mvme68k/stand/libsa/Makefile Sat Sep 21 08:32:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2011/01/02 05:30:12 tsutsui Exp $
+# $NetBSD: Makefile,v 1.34 2013/09/21 08:32:39 tsutsui Exp $
S!= cd ${.CURDIR}/../../../..; pwd
@@ -31,7 +31,9 @@ LIBKERN= ${KERNLIB}
LIBS= ${LIBSA} ${LIBKERN}
-all realall: ${LIBS}
+CLEANFILES+= SRT0.o
+
+all realall: ${LIBS} SRT0.o
cleandir distclean: .WAIT cleanlibdir
Index: src/sys/arch/mvme68k/stand/libsa/Makefile.inc
diff -u src/sys/arch/mvme68k/stand/libsa/Makefile.inc:1.5 src/sys/arch/mvme68k/stand/libsa/Makefile.inc:1.6
--- src/sys/arch/mvme68k/stand/libsa/Makefile.inc:1.5 Sun Jan 2 05:30:12 2011
+++ src/sys/arch/mvme68k/stand/libsa/Makefile.inc Sat Sep 21 08:32:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2011/01/02 05:30:12 tsutsui Exp $
+# $NetBSD: Makefile.inc,v 1.6 2013/09/21 08:32:39 tsutsui Exp $
S!= cd ${SA_EXTRADIR}/../../../..; pwd
@@ -9,8 +9,7 @@ SRC_sa= dev_net.c
SRC_mvme= exec_mvme.c
-SRC_here= SRT0.S \
- bugdev.c \
+SRC_here= bugdev.c \
chiptotime.c clock.c \
parse_args.c
