CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: skrll Date: Tue Aug 5 06:24:56 UTC 2014 Modified Files: src/sys/arch/arm/include: types.h Log Message: Don't set __NO_STRICT_ALIGNMENT as armv[67] ldm/stm have alignment restrictions. PR/49020: Writing to tap device may cause panic on RPI Discussed with matt@ To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/include/types.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/arm/include/types.h diff -u src/sys/arch/arm/include/types.h:1.27 src/sys/arch/arm/include/types.h:1.28 --- src/sys/arch/arm/include/types.h:1.27 Fri Apr 18 15:45:46 2014 +++ src/sys/arch/arm/include/types.h Tue Aug 5 06:24:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.27 2014/04/18 15:45:46 matt Exp $ */ +/* $NetBSD: types.h,v 1.28 2014/08/05 06:24:56 skrll Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -93,9 +93,6 @@ typedef volatile int __cpu_simple_lock_ #if defined(__ARM_EABI__) defined(_ARM_ARCH_6) #define __HAVE_ATOMIC64_OPS #endif -#if defined(_ARM_ARCH_6) -#define __NO_STRICT_ALIGNMENT -#endif #if defined(_KERNEL) || defined(_KMEMUSER) #define PCU_FPU 0
CVS commit: src/sys
Module Name:src
Committed By: skrll
Date: Tue Aug 5 06:35:24 UTC 2014
Modified Files:
src/sys/dev/usb: ehci.c motg.c ohci.c uhci.c usbdi.c xhci.c
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
Simplify the freeing of the interrupt pipe transfer. Inspired by OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/motg.c
cvs rdiff -u -r1.250 -r1.251 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.263 -r1.264 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.160 -r1.161 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.28 -r1.29 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/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.226 src/sys/dev/usb/ehci.c:1.227
--- src/sys/dev/usb/ehci.c:1.226 Mon Aug 4 06:17:04 2014
+++ src/sys/dev/usb/ehci.c Tue Aug 5 06:35:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.226 2014/08/04 06:17:04 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.227 2014/08/05 06:35:24 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.226 2014/08/04 06:17:04 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.227 2014/08/05 06:35:24 skrll Exp $);
#include ohci.h
#include uhci.h
@@ -2609,10 +2609,10 @@ ehci_root_intr_abort(usbd_xfer_handle xf
#endif
KASSERT(mutex_owned(sc-sc_lock));
- if (xfer-pipe-intrxfer == xfer) {
- DPRINTF((ehci_root_intr_abort: remove\n));
- xfer-pipe-intrxfer = NULL;
- }
+ KASSERT(xfer-pipe-intrxfer == xfer);
+
+ sc-sc_intrxfer = NULL;
+
xfer-status = USBD_CANCELLED;
usb_transfer_complete(xfer);
}
@@ -3832,10 +3832,8 @@ Static void
ehci_device_intr_abort(usbd_xfer_handle xfer)
{
DPRINTFN(1, (ehci_device_intr_abort: xfer=%p\n, xfer));
- if (xfer-pipe-intrxfer == xfer) {
- DPRINTFN(1, (echi_device_intr_abort: remove\n));
- xfer-pipe-intrxfer = NULL;
- }
+ KASSERT(xfer-pipe-intrxfer == xfer);
+
/*
* XXX - abort_xfer uses ehci_sync_hc, which syncs via the advance
* async doorbell. That's dependent on the async list, wheras
Index: src/sys/dev/usb/motg.c
diff -u src/sys/dev/usb/motg.c:1.4 src/sys/dev/usb/motg.c:1.5
--- src/sys/dev/usb/motg.c:1.4 Fri Jul 25 21:16:31 2014
+++ src/sys/dev/usb/motg.c Tue Aug 5 06:35:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: motg.c,v 1.4 2014/07/25 21:16:31 joerg Exp $ */
+/* $NetBSD: motg.c,v 1.5 2014/08/05 06:35:24 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: motg.c,v 1.4 2014/07/25 21:16:31 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: motg.c,v 1.5 2014/08/05 06:35:24 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1185,17 +1185,14 @@ motg_root_intr_abort(usbd_xfer_handle xf
struct motg_softc *sc = xfer-pipe-device-bus-hci_private;
KASSERT(mutex_owned(sc-sc_lock));
+ KASSERT(xfer-pipe-intrxfer == xfer);
sc-sc_intr_xfer = NULL;
- if (xfer-pipe-intrxfer == xfer) {
- DPRINTFN(MD_ROOT, (motg_root_intr_abort: remove\n));
- xfer-pipe-intrxfer = 0;
- }
- xfer-status = USBD_CANCELLED;
#ifdef DIAGNOSTIC
// XXX UXFER(xfer)-iinfo.isdone = 1;
#endif
+ xfer-status = USBD_CANCELLED;
usb_transfer_complete(xfer);
}
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.250 src/sys/dev/usb/ohci.c:1.251
--- src/sys/dev/usb/ohci.c:1.250 Mon Feb 17 07:34:21 2014
+++ src/sys/dev/usb/ohci.c Tue Aug 5 06:35:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.250 2014/02/17 07:34:21 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.251 2014/08/05 06:35:24 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.250 2014/02/17 07:34:21 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.251 2014/08/05 06:35:24 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2870,11 +2870,8 @@ ohci_root_intr_abort(usbd_xfer_handle xf
#endif
KASSERT(mutex_owned(sc-sc_lock));
+ KASSERT(xfer-pipe-intrxfer == xfer);
- if (xfer-pipe-intrxfer == xfer) {
- DPRINTF((ohci_root_intr_abort: remove\n));
- xfer-pipe-intrxfer = NULL;
- }
xfer-status = USBD_CANCELLED;
usb_transfer_complete(xfer);
}
@@ -3256,11 +3253,8 @@ ohci_device_intr_abort(usbd_xfer_handle
#endif
KASSERT(mutex_owned(sc-sc_lock));
+ KASSERT(xfer-pipe-intrxfer == xfer);
- if (xfer-pipe-intrxfer == xfer) {
- DPRINTF((ohci_device_intr_abort: remove\n));
- xfer-pipe-intrxfer = NULL;
- }
ohci_abort_xfer(xfer, USBD_CANCELLED);
}
Index: src/sys/dev/usb/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.263 src/sys/dev/usb/uhci.c:1.264
--- src/sys/dev/usb/uhci.c:1.263 Sun Dec 1 07:28:48 2013
+++ src/sys/dev/usb/uhci.c Tue Aug 5
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Aug 5 06:35:56 UTC 2014 Modified Files: src/sys/dev/usb: motg.c Log Message: Whitespace. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/usb/motg.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/motg.c diff -u src/sys/dev/usb/motg.c:1.5 src/sys/dev/usb/motg.c:1.6 --- src/sys/dev/usb/motg.c:1.5 Tue Aug 5 06:35:24 2014 +++ src/sys/dev/usb/motg.c Tue Aug 5 06:35:55 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: motg.c,v 1.5 2014/08/05 06:35:24 skrll Exp $ */ +/* $NetBSD: motg.c,v 1.6 2014/08/05 06:35:55 skrll Exp $ */ /* * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: motg.c,v 1.5 2014/08/05 06:35:24 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: motg.c,v 1.6 2014/08/05 06:35:55 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -2420,7 +2420,7 @@ motg_device_xfer_abort(usbd_xfer_handle DPRINTF((motg_device_xfer_abort: already aborting\n)); xfer-hcflags |= UXFER_ABORTWAIT; while (xfer-hcflags UXFER_ABORTING) - cv_wait(xfer-hccv, sc-sc_lock); + cv_wait(xfer-hccv, sc-sc_lock); return; } xfer-hcflags |= UXFER_ABORTING;
CVS commit: src/sys/netinet
Module Name:src
Committed By: rtr
Date: Tue Aug 5 07:10:41 UTC 2014
Modified Files:
src/sys/netinet: tcp_usrreq.c
Log Message:
get_tcppcb() is nearly always called upon entry to usrreqs so
KASSERT(solocked(so)) inside it and remove the redundant KASSERT
everywhere we are using tcp_getpcb()
To generate a diff of this commit:
cvs rdiff -u -r1.196 -r1.197 src/sys/netinet/tcp_usrreq.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/netinet/tcp_usrreq.c
diff -u src/sys/netinet/tcp_usrreq.c:1.196 src/sys/netinet/tcp_usrreq.c:1.197
--- src/sys/netinet/tcp_usrreq.c:1.196 Tue Aug 5 05:24:26 2014
+++ src/sys/netinet/tcp_usrreq.c Tue Aug 5 07:10:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_usrreq.c,v 1.196 2014/08/05 05:24:26 rtr Exp $ */
+/* $NetBSD: tcp_usrreq.c,v 1.197 2014/08/05 07:10:41 rtr Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -99,7 +99,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.196 2014/08/05 05:24:26 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: tcp_usrreq.c,v 1.197 2014/08/05 07:10:41 rtr Exp $);
#include opt_inet.h
#include opt_ipsec.h
@@ -181,6 +181,9 @@ static int
tcp_getpcb(struct socket *so, struct inpcb **inp,
struct in6pcb **in6p, struct tcpcb **tp)
{
+
+ KASSERT(solocked(so));
+
/*
* When a TCP is attached to a socket, then there will be
* a (struct inpcb) pointed at by the socket, and this
@@ -273,8 +276,6 @@ tcp_usrreq(struct socket *so, int req, s
return (0);
}
- KASSERT(solocked(so));
-
if ((error = tcp_getpcb(so, inp, in6p, tp)) != 0) {
splx(s);
return error;
@@ -687,8 +688,6 @@ tcp_detach(struct socket *so)
struct tcpcb *tp = NULL;
int s;
- KASSERT(solocked(so));
-
if (tcp_getpcb(so, inp, in6p, tp) != 0)
return;
@@ -707,8 +706,6 @@ tcp_accept(struct socket *so, struct mbu
int error = 0;
int s;
- KASSERT(solocked(so));
-
if ((error = tcp_getpcb(so, inp, in6p, tp)) != 0)
return error;
@@ -746,8 +743,6 @@ tcp_bind(struct socket *so, struct mbuf
int error = 0;
int ostate = 0;
- KASSERT(solocked(so));
-
if ((error = tcp_getpcb(so, inp, in6p, tp)) != 0)
return error;
@@ -792,8 +787,6 @@ tcp_listen(struct socket *so, struct lwp
int ostate = 0;
int s;
- KASSERT(solocked(so));
-
if ((error = tcp_getpcb(so, inp, in6p, tp)) != 0)
return error;
@@ -836,8 +829,6 @@ tcp_connect(struct socket *so, struct mb
int error = 0;
int ostate = 0;
- KASSERT(solocked(so));
-
if ((error = tcp_getpcb(so, inp, in6p, tp)) != 0)
return error;
@@ -925,8 +916,6 @@ tcp_disconnect(struct socket *so)
int ostate = 0;
int s;
- KASSERT(solocked(so));
-
if ((error = tcp_getpcb(so, inp, in6p, tp)) != 0)
return error;
@@ -961,8 +950,6 @@ tcp_shutdown(struct socket *so)
int ostate = 0;
int s;
- KASSERT(solocked(so));
-
if ((error = tcp_getpcb(so, inp, in6p, tp)) != 0)
return error;
@@ -991,8 +978,6 @@ tcp_abort(struct socket *so)
int ostate = 0;
int s;
- KASSERT(solocked(so));
-
if ((error = tcp_getpcb(so, inp, in6p, tp)) != 0)
return error;
CVS commit: src/etc/mtree
Module Name:src Committed By: dholland Date: Tue Aug 5 07:34:52 UTC 2014 Modified Files: src/etc/mtree: special Log Message: Remove tags=nodiff from /var/log/authlog as suggested by uebayasi@; part of PR 49031. To generate a diff of this commit: cvs rdiff -u -r1.147 -r1.148 src/etc/mtree/special Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/special diff -u src/etc/mtree/special:1.147 src/etc/mtree/special:1.148 --- src/etc/mtree/special:1.147 Mon May 19 05:43:35 2014 +++ src/etc/mtree/special Tue Aug 5 07:34:52 2014 @@ -1,4 +1,4 @@ -# $NetBSD: special,v 1.147 2014/05/19 05:43:35 uebayasi Exp $ +# $NetBSD: special,v 1.148 2014/08/05 07:34:52 dholland Exp $ # @(#)special 8.2 (Berkeley) 1/23/94 # # This file may be overwritten on upgrades. @@ -407,7 +407,7 @@ ./var/cron/tabs/root type=file mode=0600 tags=nodiff ./var/db type=dir mode=0755 ./var/log type=dir mode=0755 -./var/log/authlog type=file mode=0600 optional tags=exclude tags=nodiff +./var/log/authlog type=file mode=0600 optional tags=exclude ./var/log/lastlog type=file mode=0664 gname=utmp tags=exclude ./var/log/lastlogx type=file mode=0664 gname=utmp tags=exclude ./var/log/wtmp type=file mode=0664 gname=utmp tags=exclude
CVS commit: src/sys
Module Name:src Committed By: rtr Date: Tue Aug 5 07:55:32 UTC 2014 Modified Files: src/sys/dev: kttcp.c src/sys/dev/bluetooth: bthidev.c btmagic.c btsco.c src/sys/kern: uipc_socket.c uipc_usrreq.c src/sys/net: if_gre.c link_proto.c raw_cb.h raw_usrreq.c rtsock.c src/sys/netatalk: ddp_usrreq.c src/sys/netbt: hci_socket.c l2cap.h l2cap_lower.c l2cap_socket.c l2cap_upper.c rfcomm.h rfcomm_session.c rfcomm_socket.c rfcomm_upper.c sco.h sco_socket.c sco_upper.c src/sys/netinet: raw_ip.c tcp_usrreq.c udp_usrreq.c src/sys/netinet6: raw_ip6.c udp6_usrreq.c src/sys/netipsec: keysock.c src/sys/netmpls: mpls_proto.c src/sys/netnatm: natm.c src/sys/nfs: nfs_socket.c src/sys/rump/net/lib/libsockin: sockin.c src/sys/sys: protosw.h Log Message: split PRU_SEND function out of pr_generic() usrreq switches and put into separate functions xxx_send(struct socket *, struct mbuf *, struct mbuf *, struct mbuf *, struct lwp *) - always KASSERT(solocked(so)) even if not implemented - replace calls to pr_generic() with req = PRU_SEND with calls to pr_send() rename existing functions that operate on PCB for consistency (and to free up their names for xxx_send() PRUs - l2cap_send() - l2cap_send_pcb() - sco_send() - sco_send_pcb() - rfcomm_send() - rfcomm_send_pcb() patch reviewed by rmind To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/dev/kttcp.c cvs rdiff -u -r1.28 -r1.29 src/sys/dev/bluetooth/bthidev.c cvs rdiff -u -r1.10 -r1.11 src/sys/dev/bluetooth/btmagic.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/bluetooth/btsco.c cvs rdiff -u -r1.231 -r1.232 src/sys/kern/uipc_socket.c cvs rdiff -u -r1.165 -r1.166 src/sys/kern/uipc_usrreq.c cvs rdiff -u -r1.157 -r1.158 src/sys/net/if_gre.c cvs rdiff -u -r1.21 -r1.22 src/sys/net/link_proto.c cvs rdiff -u -r1.22 -r1.23 src/sys/net/raw_cb.h cvs rdiff -u -r1.49 -r1.50 src/sys/net/raw_usrreq.c cvs rdiff -u -r1.160 -r1.161 src/sys/net/rtsock.c cvs rdiff -u -r1.58 -r1.59 src/sys/netatalk/ddp_usrreq.c cvs rdiff -u -r1.37 -r1.38 src/sys/netbt/hci_socket.c cvs rdiff -u -r1.17 -r1.18 src/sys/netbt/l2cap.h src/sys/netbt/l2cap_upper.c cvs rdiff -u -r1.9 -r1.10 src/sys/netbt/l2cap_lower.c cvs rdiff -u -r1.28 -r1.29 src/sys/netbt/l2cap_socket.c cvs rdiff -u -r1.16 -r1.17 src/sys/netbt/rfcomm.h cvs rdiff -u -r1.22 -r1.23 src/sys/netbt/rfcomm_session.c cvs rdiff -u -r1.30 -r1.31 src/sys/netbt/rfcomm_socket.c \ src/sys/netbt/sco_socket.c cvs rdiff -u -r1.19 -r1.20 src/sys/netbt/rfcomm_upper.c cvs rdiff -u -r1.10 -r1.11 src/sys/netbt/sco.h cvs rdiff -u -r1.15 -r1.16 src/sys/netbt/sco_upper.c cvs rdiff -u -r1.142 -r1.143 src/sys/netinet/raw_ip.c cvs rdiff -u -r1.197 -r1.198 src/sys/netinet/tcp_usrreq.c cvs rdiff -u -r1.214 -r1.215 src/sys/netinet/udp_usrreq.c cvs rdiff -u -r1.133 -r1.134 src/sys/netinet6/raw_ip6.c cvs rdiff -u -r1.112 -r1.113 src/sys/netinet6/udp6_usrreq.c cvs rdiff -u -r1.40 -r1.41 src/sys/netipsec/keysock.c cvs rdiff -u -r1.21 -r1.22 src/sys/netmpls/mpls_proto.c cvs rdiff -u -r1.42 -r1.43 src/sys/netnatm/natm.c cvs rdiff -u -r1.191 -r1.192 src/sys/nfs/nfs_socket.c cvs rdiff -u -r1.55 -r1.56 src/sys/rump/net/lib/libsockin/sockin.c cvs rdiff -u -r1.57 -r1.58 src/sys/sys/protosw.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/kttcp.c diff -u src/sys/dev/kttcp.c:1.35 src/sys/dev/kttcp.c:1.36 --- src/sys/dev/kttcp.c:1.35 Fri Jul 25 08:10:35 2014 +++ src/sys/dev/kttcp.c Tue Aug 5 07:55:31 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: kttcp.c,v 1.35 2014/07/25 08:10:35 dholland Exp $ */ +/* $NetBSD: kttcp.c,v 1.36 2014/08/05 07:55:31 rtr Exp $ */ /* * Copyright (c) 2002 Wasabi Systems, Inc. @@ -42,7 +42,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: kttcp.c,v 1.35 2014/07/25 08:10:35 dholland Exp $); +__KERNEL_RCSID(0, $NetBSD: kttcp.c,v 1.36 2014/08/05 07:55:31 rtr Exp $); #include sys/param.h #include sys/types.h @@ -324,8 +324,8 @@ nopages: error = (*so-so_proto-pr_usrreqs-pr_sendoob)(so, top, NULL); else -error = (*so-so_proto-pr_usrreqs-pr_generic)(so, -PRU_SEND, top, NULL, NULL, l); +error = (*so-so_proto-pr_usrreqs-pr_send)(so, +top, NULL, NULL, l); if (dontroute) so-so_options = ~SO_DONTROUTE; if (resid 0) Index: src/sys/dev/bluetooth/bthidev.c diff -u src/sys/dev/bluetooth/bthidev.c:1.28 src/sys/dev/bluetooth/bthidev.c:1.29 --- src/sys/dev/bluetooth/bthidev.c:1.28 Thu Jul 31 03:39:35 2014 +++ src/sys/dev/bluetooth/bthidev.c Tue Aug 5 07:55:31 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: bthidev.c,v 1.28 2014/07/31 03:39:35 rtr Exp $ */ +/* $NetBSD: bthidev.c,v 1.29 2014/08/05 07:55:31 rtr Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD:
CVS commit: src/usr.bin/timeout
Module Name:src Committed By: christos Date: Tue Aug 5 08:20:02 UTC 2014 Modified Files: src/usr.bin/timeout: timeout.c Log Message: Fix overflow check. From Kamil Rytarowski. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/timeout/timeout.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/timeout/timeout.c diff -u src/usr.bin/timeout/timeout.c:1.3 src/usr.bin/timeout/timeout.c:1.4 --- src/usr.bin/timeout/timeout.c:1.3 Sat Aug 2 05:16:22 2014 +++ src/usr.bin/timeout/timeout.c Tue Aug 5 04:20:02 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: timeout.c,v 1.3 2014/08/02 09:16:22 martin Exp $ */ +/* $NetBSD: timeout.c,v 1.4 2014/08/05 08:20:02 christos Exp $ */ /*- * Copyright (c) 2014 Baptiste Daroussin b...@freebsd.org @@ -32,7 +32,7 @@ #if 0 __FBSDID($FreeBSD: head/usr.bin/timeout/timeout.c 268763 2014-07-16 13:52:05Z bapt $); #else -__RCSID($NetBSD: timeout.c,v 1.3 2014/08/02 09:16:22 martin Exp $); +__RCSID($NetBSD: timeout.c,v 1.4 2014/08/05 08:20:02 christos Exp $); #endif #endif /* not lint */ @@ -130,7 +130,7 @@ parse_signal(const char *str) if (str[0] == '\0' || *ep != '\0') goto err; - if (errno == ERANGE (sig == INT_MAX || sig == INT_MIN)) + if (errno == ERANGE (sig == LONG_MAX || sig == LONG_MIN)) goto err; if (sig = sys_nsig || sig 0) goto err;
CVS commit: src/sys
Module Name:src Committed By: skrll Date: Tue Aug 5 08:33:50 UTC 2014 Modified Files: src/sys/dev/usb: ohci.c xhci.c src/sys/external/bsd/dwc2: dwc2.c Log Message: Prevent the root hub sending updates once the root interrupt abort is called. To generate a diff of this commit: cvs rdiff -u -r1.251 -r1.252 src/sys/dev/usb/ohci.c cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/xhci.c cvs rdiff -u -r1.29 -r1.30 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/dev/usb/ohci.c diff -u src/sys/dev/usb/ohci.c:1.251 src/sys/dev/usb/ohci.c:1.252 --- src/sys/dev/usb/ohci.c:1.251 Tue Aug 5 06:35:24 2014 +++ src/sys/dev/usb/ohci.c Tue Aug 5 08:33:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.251 2014/08/05 06:35:24 skrll Exp $ */ +/* $NetBSD: ohci.c,v 1.252 2014/08/05 08:33:50 skrll Exp $ */ /* * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.251 2014/08/05 06:35:24 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.252 2014/08/05 08:33:50 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -2872,6 +2872,8 @@ ohci_root_intr_abort(usbd_xfer_handle xf KASSERT(mutex_owned(sc-sc_lock)); KASSERT(xfer-pipe-intrxfer == xfer); + sc-sc_intrxfer = NULL; + xfer-status = USBD_CANCELLED; usb_transfer_complete(xfer); } Index: src/sys/dev/usb/xhci.c diff -u src/sys/dev/usb/xhci.c:1.21 src/sys/dev/usb/xhci.c:1.22 --- src/sys/dev/usb/xhci.c:1.21 Tue Aug 5 06:35:24 2014 +++ src/sys/dev/usb/xhci.c Tue Aug 5 08:33:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: xhci.c,v 1.21 2014/08/05 06:35:24 skrll Exp $ */ +/* $NetBSD: xhci.c,v 1.22 2014/08/05 08:33:50 skrll Exp $ */ /* * Copyright (c) 2013 Jonathan A. Kollasch @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.21 2014/08/05 06:35:24 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.22 2014/08/05 08:33:50 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -2461,6 +2461,8 @@ xhci_root_intr_abort(usbd_xfer_handle xf DPRINTF((%s: remove\n, __func__)); + sc-sc_intrxfer = NULL; + xfer-status = USBD_CANCELLED; usb_transfer_complete(xfer); } Index: src/sys/external/bsd/dwc2/dwc2.c diff -u src/sys/external/bsd/dwc2/dwc2.c:1.29 src/sys/external/bsd/dwc2/dwc2.c:1.30 --- src/sys/external/bsd/dwc2/dwc2.c:1.29 Tue Aug 5 06:35:24 2014 +++ src/sys/external/bsd/dwc2/dwc2.c Tue Aug 5 08:33:50 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc2.c,v 1.29 2014/08/05 06:35:24 skrll Exp $ */ +/* $NetBSD: dwc2.c,v 1.30 2014/08/05 08:33:50 skrll Exp $ */ /*- * Copyright (c) 2013 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dwc2.c,v 1.29 2014/08/05 06:35:24 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: dwc2.c,v 1.30 2014/08/05 08:33:50 skrll Exp $); #include opt_usb.h @@ -912,6 +912,8 @@ dwc2_root_intr_abort(usbd_xfer_handle xf KASSERT(mutex_owned(sc-sc_lock)); KASSERT(xfer-pipe-intrxfer == xfer); + sc-sc_intrxfer = NULL; + xfer-status = USBD_CANCELLED; usb_transfer_complete(xfer); }
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Tue Aug 5 08:39:39 UTC 2014
Modified Files:
src/usr.sbin/sysinst: partman.c
Log Message:
Avoid comparision between array and NULL
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/partman.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/sysinst/partman.c
diff -u src/usr.sbin/sysinst/partman.c:1.1 src/usr.sbin/sysinst/partman.c:1.2
--- src/usr.sbin/sysinst/partman.c:1.1 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/partman.c Tue Aug 5 08:39:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: partman.c,v 1.1 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: partman.c,v 1.2 2014/08/05 08:39:39 martin Exp $ */
/*
* Copyright 2012 Eugene Lozovoy
@@ -2115,8 +2115,7 @@ pm_mountall(void)
pm_i-bsdlabel[i].mnt_opts != NULL))
continue;
mnts[num_devs].mnt_opts = pm_i-bsdlabel[i].mnt_opts;
- if (pm_i-bsdlabel[i].mounted != NULL
- strlen(pm_i-bsdlabel[i].mounted) 0) {
+ if (strlen(pm_i-bsdlabel[i].mounted) 0) {
/* Device is already mounted. So, doing mount_null */
strlcpy(mnts[num_devs].dev, pm_i-bsdlabel[i].mounted, MOUNTLEN);
mnts[num_devs].mnt_opts = -t null;
CVS commit: src/sys/fs/adosfs
Module Name:src
Committed By: hannken
Date: Tue Aug 5 08:50:54 UTC 2014
Modified Files:
src/sys/fs/adosfs: adosfs.h adutil.c advfsops.c advnops.c
Log Message:
Change adosfs from hashlist to vcache.
- point ap-block to real file header block for hard links.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/fs/adosfs/adosfs.h
cvs rdiff -u -r1.16 -r1.17 src/sys/fs/adosfs/adutil.c
cvs rdiff -u -r1.70 -r1.71 src/sys/fs/adosfs/advfsops.c
cvs rdiff -u -r1.44 -r1.45 src/sys/fs/adosfs/advnops.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/fs/adosfs/adosfs.h
diff -u src/sys/fs/adosfs/adosfs.h:1.12 src/sys/fs/adosfs/adosfs.h:1.13
--- src/sys/fs/adosfs/adosfs.h:1.12 Wed Oct 3 07:20:50 2012
+++ src/sys/fs/adosfs/adosfs.h Tue Aug 5 08:50:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: adosfs.h,v 1.12 2012/10/03 07:20:50 mlelstv Exp $ */
+/* $NetBSD: adosfs.h,v 1.13 2014/08/05 08:50:54 hannken Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -73,7 +73,6 @@ enum anode_type { AROOT, ADIR, AFILE, AL
*/
struct anode {
struct genfs_node gnode;
- LIST_ENTRY(anode) link;
enum anode_type type;
char name[ADMAXNAMELEN+1]; /* (r/d/f) name for object */
struct datestamp mtimev; /* (r) volume modified */
@@ -112,7 +111,6 @@ struct anode {
#define ANODEHASHSZ (512)
struct adosfsmount {
- LIST_HEAD(anodechain, anode) anodetab[ANODEHASHSZ];
struct mount *mp; /* owner mount */
u_int32_t dostype; /* type of volume */
u_long rootb; /* root block number */
@@ -169,10 +167,6 @@ int adoshash(const u_char *, int, int, i
int adunixprot(int);
int adosfs_getblktype(struct adosfsmount *, struct buf *);
-struct vnode *adosfs_ahashget(struct mount *, ino_t);
-void adosfs_ainshash(struct adosfsmount *, struct anode *);
-void adosfs_aremhash(struct anode *);
-
int adosfs_lookup(void *);
extern int (**adosfs_vnodeop_p)(void *);
Index: src/sys/fs/adosfs/adutil.c
diff -u src/sys/fs/adosfs/adutil.c:1.16 src/sys/fs/adosfs/adutil.c:1.17
--- src/sys/fs/adosfs/adutil.c:1.16 Thu Feb 27 16:51:37 2014
+++ src/sys/fs/adosfs/adutil.c Tue Aug 5 08:50:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: adutil.c,v 1.16 2014/02/27 16:51:37 hannken Exp $ */
+/* $NetBSD: adutil.c,v 1.17 2014/08/05 08:50:54 hannken Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: adutil.c,v 1.16 2014/02/27 16:51:37 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: adutil.c,v 1.17 2014/08/05 08:50:54 hannken Exp $);
#include sys/param.h
#include sys/vnode.h
@@ -47,62 +47,8 @@ __KERNEL_RCSID(0, $NetBSD: adutil.c,v 1
/*
* look for anode in the mount's hash table, return locked.
*/
-#define AHASH(an) ((an) (ANODEHASHSZ - 1))
static int CapitalChar(int, int);
-extern kmutex_t adosfs_hashlock;
-
-struct vnode *
-adosfs_ahashget(struct mount *mp, ino_t an)
-{
- struct anodechain *hp;
- struct anode *ap;
- struct vnode *vp;
-
- hp = VFSTOADOSFS(mp)-anodetab[AHASH(an)];
-
-start_over:
- mutex_enter(adosfs_hashlock);
- for (ap = hp-lh_first; ap != NULL; ap = ap-link.le_next) {
- if (ap-block == an) {
- vp = ATOV(ap);
- mutex_enter(vp-v_interlock);
- mutex_exit(adosfs_hashlock);
- if (vget(vp, LK_EXCLUSIVE))
-goto start_over;
- return (ATOV(ap));
- }
- }
- mutex_exit(adosfs_hashlock);
- return (NULL);
-}
-
-/*
- * insert in hash table and lock
- *
- * ap-vp must have been initialized before this call.
- */
-void
-adosfs_ainshash(struct adosfsmount *amp, struct anode *ap)
-{
- int error __diagused;
-
- error = VOP_LOCK(ATOV(ap), LK_EXCLUSIVE);
- KASSERT(error == 0);
-
- mutex_enter(adosfs_hashlock);
- LIST_INSERT_HEAD(amp-anodetab[AHASH(ap-block)], ap, link);
- mutex_exit(adosfs_hashlock);
-}
-
-void
-adosfs_aremhash(struct anode *ap)
-{
- mutex_enter(adosfs_hashlock);
- LIST_REMOVE(ap, link);
- mutex_exit(adosfs_hashlock);
-}
-
int
adosfs_getblktype(struct adosfsmount *amp, struct buf *bp)
{
Index: src/sys/fs/adosfs/advfsops.c
diff -u src/sys/fs/adosfs/advfsops.c:1.70 src/sys/fs/adosfs/advfsops.c:1.71
--- src/sys/fs/adosfs/advfsops.c:1.70 Wed Apr 16 18:55:18 2014
+++ src/sys/fs/adosfs/advfsops.c Tue Aug 5 08:50:54 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: advfsops.c,v 1.70 2014/04/16 18:55:18 maxv Exp $ */
+/* $NetBSD: advfsops.c,v 1.71 2014/08/05 08:50:54 hannken Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: advfsops.c,v 1.70 2014/04/16 18:55:18 maxv Exp $);
+__KERNEL_RCSID(0, $NetBSD: advfsops.c,v 1.71 2014/08/05 08:50:54 hannken Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -70,8 +70,6 @@ static struct sysctllog *adosfs_sysctl_l
int adosfs_mountfs(struct vnode *, struct mount *, struct lwp *);
int adosfs_loadbitmap(struct adosfsmount *);
-kmutex_t adosfs_hashlock;
-
struct pool adosfs_node_pool;
CVS commit: src/sys/kern
Module Name:src
Committed By: rtr
Date: Tue Aug 5 08:52:10 UTC 2014
Modified Files:
src/sys/kern: uipc_usrreq.c
Log Message:
actually use the passed in struct lwp *l instead of curlwp in unp_connect()
To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/sys/kern/uipc_usrreq.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/uipc_usrreq.c
diff -u src/sys/kern/uipc_usrreq.c:1.166 src/sys/kern/uipc_usrreq.c:1.167
--- src/sys/kern/uipc_usrreq.c:1.166 Tue Aug 5 07:55:31 2014
+++ src/sys/kern/uipc_usrreq.c Tue Aug 5 08:52:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uipc_usrreq.c,v 1.166 2014/08/05 07:55:31 rtr Exp $ */
+/* $NetBSD: uipc_usrreq.c,v 1.167 2014/08/05 08:52:10 rtr Exp $ */
/*-
* Copyright (c) 1998, 2000, 2004, 2008, 2009 The NetBSD Foundation, Inc.
@@ -96,7 +96,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uipc_usrreq.c,v 1.166 2014/08/05 07:55:31 rtr Exp $);
+__KERNEL_RCSID(0, $NetBSD: uipc_usrreq.c,v 1.167 2014/08/05 08:52:10 rtr Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1120,7 +1120,7 @@ unp_connect(struct socket *so, struct mb
goto bad;
}
pathbuf_destroy(pb);
- if ((error = VOP_ACCESS(vp, VWRITE, curlwp-l_cred)) != 0)
+ if ((error = VOP_ACCESS(vp, VWRITE, l-l_cred)) != 0)
goto bad;
/* Acquire v_interlock to protect against unp_detach(). */
mutex_enter(vp-v_interlock);
@@ -1162,9 +1162,9 @@ unp_connect(struct socket *so, struct mb
unp3-unp_addrlen = unp2-unp_addrlen;
}
unp3-unp_flags = unp2-unp_flags;
- unp3-unp_connid.unp_pid = curlwp-l_proc-p_pid;
- unp3-unp_connid.unp_euid = kauth_cred_geteuid(curlwp-l_cred);
- unp3-unp_connid.unp_egid = kauth_cred_getegid(curlwp-l_cred);
+ unp3-unp_connid.unp_pid = l-l_proc-p_pid;
+ unp3-unp_connid.unp_euid = kauth_cred_geteuid(l-l_cred);
+ unp3-unp_connid.unp_egid = kauth_cred_getegid(l-l_cred);
unp3-unp_flags |= UNP_EIDSVALID;
if (unp2-unp_flags UNP_EIDSBIND) {
unp-unp_connid = unp2-unp_connid;
CVS commit: src/sys
Module Name:src
Committed By: skrll
Date: Tue Aug 5 10:33:46 UTC 2014
Modified Files:
src/sys/dev/usb: ehci.c ohci.c xhci.c
src/sys/external/bsd/dwc2: dwc2.c
Log Message:
Remove #ifdef DIAGNOSTIC around sc from the root interrupt abort methods
now it's always used.
To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.252 -r1.253 src/sys/dev/usb/ohci.c
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.30 -r1.31 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/dev/usb/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.227 src/sys/dev/usb/ehci.c:1.228
--- src/sys/dev/usb/ehci.c:1.227 Tue Aug 5 06:35:24 2014
+++ src/sys/dev/usb/ehci.c Tue Aug 5 10:33:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.227 2014/08/05 06:35:24 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.228 2014/08/05 10:33:46 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.227 2014/08/05 06:35:24 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.228 2014/08/05 10:33:46 skrll Exp $);
#include ohci.h
#include uhci.h
@@ -2604,9 +2604,7 @@ ehci_root_intr_start(usbd_xfer_handle xf
Static void
ehci_root_intr_abort(usbd_xfer_handle xfer)
{
-#ifdef DIAGNOSTIC
ehci_softc_t *sc = xfer-pipe-device-bus-hci_private;
-#endif
KASSERT(mutex_owned(sc-sc_lock));
KASSERT(xfer-pipe-intrxfer == xfer);
Index: src/sys/dev/usb/ohci.c
diff -u src/sys/dev/usb/ohci.c:1.252 src/sys/dev/usb/ohci.c:1.253
--- src/sys/dev/usb/ohci.c:1.252 Tue Aug 5 08:33:50 2014
+++ src/sys/dev/usb/ohci.c Tue Aug 5 10:33:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ohci.c,v 1.252 2014/08/05 08:33:50 skrll Exp $ */
+/* $NetBSD: ohci.c,v 1.253 2014/08/05 10:33:46 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.252 2014/08/05 08:33:50 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.253 2014/08/05 10:33:46 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2865,9 +2865,7 @@ ohci_root_intr_start(usbd_xfer_handle xf
Static void
ohci_root_intr_abort(usbd_xfer_handle xfer)
{
-#ifdef DIAGNOSTIC
ohci_softc_t *sc = xfer-pipe-device-bus-hci_private;
-#endif
KASSERT(mutex_owned(sc-sc_lock));
KASSERT(xfer-pipe-intrxfer == xfer);
Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.22 src/sys/dev/usb/xhci.c:1.23
--- src/sys/dev/usb/xhci.c:1.22 Tue Aug 5 08:33:50 2014
+++ src/sys/dev/usb/xhci.c Tue Aug 5 10:33:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.22 2014/08/05 08:33:50 skrll Exp $ */
+/* $NetBSD: xhci.c,v 1.23 2014/08/05 10:33:46 skrll Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.22 2014/08/05 08:33:50 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: xhci.c,v 1.23 2014/08/05 10:33:46 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2452,9 +2452,7 @@ xhci_root_intr_start(usbd_xfer_handle xf
static void
xhci_root_intr_abort(usbd_xfer_handle xfer)
{
-#ifdef DIAGNOSTIC
struct xhci_softc * const sc = xfer-pipe-device-bus-hci_private;
-#endif
KASSERT(mutex_owned(sc-sc_lock));
KASSERT(xfer-pipe-intrxfer == xfer);
Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.30 src/sys/external/bsd/dwc2/dwc2.c:1.31
--- src/sys/external/bsd/dwc2/dwc2.c:1.30 Tue Aug 5 08:33:50 2014
+++ src/sys/external/bsd/dwc2/dwc2.c Tue Aug 5 10:33:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2.c,v 1.30 2014/08/05 08:33:50 skrll Exp $ */
+/* $NetBSD: dwc2.c,v 1.31 2014/08/05 10:33:46 skrll Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc2.c,v 1.30 2014/08/05 08:33:50 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc2.c,v 1.31 2014/08/05 10:33:46 skrll Exp $);
#include opt_usb.h
@@ -904,9 +904,8 @@ dwc2_root_intr_start(usbd_xfer_handle xf
Static void
dwc2_root_intr_abort(usbd_xfer_handle xfer)
{
-#ifdef DIAGNOSTIC
struct dwc2_softc *sc = DWC2_XFER2SC(xfer);
-#endif
+
DPRINTF(xfer=%p\n, xfer);
KASSERT(mutex_owned(sc-sc_lock));
CVS commit: src/distrib/sets/lists/xdebug
Module Name:src Committed By: martin Date: Tue Aug 5 13:26:10 UTC 2014 Modified Files: src/distrib/sets/lists/xdebug: md.luna68k Log Message: Add a few missing files To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/xdebug/md.luna68k 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/xdebug/md.luna68k diff -u src/distrib/sets/lists/xdebug/md.luna68k:1.2 src/distrib/sets/lists/xdebug/md.luna68k:1.3 --- src/distrib/sets/lists/xdebug/md.luna68k:1.2 Sun Aug 11 22:29:03 2013 +++ src/distrib/sets/lists/xdebug/md.luna68k Tue Aug 5 13:26:10 2014 @@ -1,10 +1,12 @@ -# $NetBSD: md.luna68k,v 1.2 2013/08/11 22:29:03 joerg Exp $ +# $NetBSD: md.luna68k,v 1.3 2014/08/05 13:26:10 martin Exp $ ./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libextmod_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/extensions/libglx_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/librecord_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/extensions/libshadow_g.a -unknown- debuglib,xorg +./usr/X11R7/lib/modules/libexa_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libfb_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libi2c_g.a -unknown- debuglib,xorg ./usr/X11R7/lib/modules/libshadowfb_g.a -unknown- debuglib,xorg @@ -18,6 +20,10 @@ ./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- debug,xorg ./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug -unknown- xorg,debug +./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug -unknown- xorg,debug ./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri2.so.0.debug -unknown- xorg,debug
CVS commit: src/sys/sys
Module Name:src Committed By: rtr Date: Tue Aug 5 14:02:42 UTC 2014 Modified Files: src/sys/sys: un.h Log Message: whitespace To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/sys/un.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/sys/un.h diff -u src/sys/sys/un.h:1.53 src/sys/sys/un.h:1.54 --- src/sys/sys/un.h:1.53 Tue Aug 5 05:24:27 2014 +++ src/sys/sys/un.h Tue Aug 5 14:02:42 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: un.h,v 1.53 2014/08/05 05:24:27 rtr Exp $ */ +/* $NetBSD: un.h,v 1.54 2014/08/05 14:02:42 rtr Exp $ */ /* * Copyright (c) 1982, 1986, 1993 @@ -79,15 +79,15 @@ struct sockopt; extern const struct pr_usrreqs unp_usrreqs; int uipc_ctloutput(int, struct socket *, struct sockopt *); -void uipc_init (void); -kmutex_t *uipc_dgramlock (void); -kmutex_t *uipc_streamlock (void); -kmutex_t *uipc_rawlock (void); - -int unp_connect (struct socket *, struct mbuf *, struct lwp *); -int unp_connect2 (struct socket *, struct socket *, int); -void unp_dispose (struct mbuf *); -int unp_externalize (struct mbuf *, struct lwp *, int); +void uipc_init(void); +kmutex_t *uipc_dgramlock(void); +kmutex_t *uipc_streamlock(void); +kmutex_t *uipc_rawlock(void); + +int unp_connect(struct socket *, struct mbuf *, struct lwp *); +int unp_connect2(struct socket *, struct socket *, int); +void unp_dispose(struct mbuf *); +int unp_externalize(struct mbuf *, struct lwp *, int); #else /* !_KERNEL */
CVS commit: src/sys/arch/x68k/stand
Module Name:src
Committed By: isaki
Date: Tue Aug 5 13:49:04 UTC 2014
Modified Files:
src/sys/arch/x68k/stand/boot: Makefile boot.c
src/sys/arch/x68k/stand/netboot: Makefile
Added Files:
src/sys/arch/x68k/stand/boot: switch.c switch.h
Log Message:
Support a 'switch' command.
It displays/modifies some SRAM parameters on X680x0, like as
memswitch(1) or Human68k's SWITCH.X .
It makes easy to change the boot devices or correct the inconsistency
of SRAM/real memory size.
sample usage:
switch show .. show all supported parameters
switch boot=std .. set boot order to 'STD'
switch memory=12.. set memory size to 12MB
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/x68k/stand/boot/Makefile
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x68k/stand/boot/boot.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/x68k/stand/boot/switch.c \
src/sys/arch/x68k/stand/boot/switch.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/x68k/stand/netboot/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x68k/stand/boot/Makefile
diff -u src/sys/arch/x68k/stand/boot/Makefile:1.23 src/sys/arch/x68k/stand/boot/Makefile:1.24
--- src/sys/arch/x68k/stand/boot/Makefile:1.23 Sun Jul 6 06:28:49 2014
+++ src/sys/arch/x68k/stand/boot/Makefile Tue Aug 5 13:49:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/07/06 06:28:49 tsutsui Exp $
+# $NetBSD: Makefile,v 1.24 2014/08/05 13:49:04 isaki Exp $
NOMAN= # defined
@@ -22,7 +22,7 @@ BFDNAME= a.out-m68k-netbsd
STRIP?= /usr/bin/strip
OBJCOPY?= /usr/bin/objcopy
-SRCS= srt0.S boot.c conf.c exec_image.S
+SRCS= srt0.S boot.c conf.c switch.c exec_image.S
S= ${.CURDIR}/../../../..
M= ${.CURDIR}/../..
COMMONDIR= $M/stand/common
Index: src/sys/arch/x68k/stand/boot/boot.c
diff -u src/sys/arch/x68k/stand/boot/boot.c:1.21 src/sys/arch/x68k/stand/boot/boot.c:1.22
--- src/sys/arch/x68k/stand/boot/boot.c:1.21 Sun Jul 6 08:10:21 2014
+++ src/sys/arch/x68k/stand/boot/boot.c Tue Aug 5 13:49:04 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.21 2014/07/06 08:10:21 tsutsui Exp $ */
+/* $NetBSD: boot.c,v 1.22 2014/08/05 13:49:04 isaki Exp $ */
/*
* Copyright (c) 2001 Minoura Makoto
@@ -39,6 +39,7 @@
#include libx68k.h
#include iocs.h
+#include switch.h
#include exec_image.h
@@ -122,6 +123,7 @@ help(void)
#ifndef NETBOOT
printf(ls [dev:][directory]\n);
#endif
+ printf(switch [show | key=val]\n);
printf(halt\nreboot\n);
}
@@ -318,6 +320,8 @@ bootmenu(void)
else if (strcmp(halt, p) == 0 ||
strcmp(reboot, p) == 0)
exit(0);
+ else if (strcmp(switch, p) == 0)
+ cmd_switch(options);
#ifndef NETBOOT
else if (strcmp(ls, p) == 0)
cmd_ls(options);
Index: src/sys/arch/x68k/stand/netboot/Makefile
diff -u src/sys/arch/x68k/stand/netboot/Makefile:1.3 src/sys/arch/x68k/stand/netboot/Makefile:1.4
--- src/sys/arch/x68k/stand/netboot/Makefile:1.3 Sun Jul 6 06:28:49 2014
+++ src/sys/arch/x68k/stand/netboot/Makefile Tue Aug 5 13:49:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2014/07/06 06:28:49 tsutsui Exp $
+# $NetBSD: Makefile,v 1.4 2014/08/05 13:49:04 isaki Exp $
NOMAN= # defined
@@ -29,7 +29,7 @@ OBJCOPY?= /usr/bin/objcopy
BOOTDIR= ${.CURDIR}/../boot
.PATH: ${BOOTDIR}
-SRCS= srt0.S boot.c conf.c exec_image.S if_ne.c ne.c dp8390.c
+SRCS= srt0.S boot.c conf.c switch.c exec_image.S if_ne.c ne.c dp8390.c
S= ${.CURDIR}/../../../..
M= ${.CURDIR}/../..
COMMONDIR= $M/stand/common
Added files:
Index: src/sys/arch/x68k/stand/boot/switch.c
diff -u /dev/null src/sys/arch/x68k/stand/boot/switch.c:1.1
--- /dev/null Tue Aug 5 13:49:04 2014
+++ src/sys/arch/x68k/stand/boot/switch.c Tue Aug 5 13:49:04 2014
@@ -0,0 +1,330 @@
+/* $NetBSD: switch.c,v 1.1 2014/08/05 13:49:04 isaki Exp $ */
+
+/*
+ * Copyright (c) 2014 Tetsuya Isaki. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND
CVS commit: src/distrib/luna68k/ramdisk
Module Name:src
Committed By: martin
Date: Tue Aug 5 14:58:02 UTC 2014
Modified Files:
src/distrib/luna68k/ramdisk: Makefile
Log Message:
Bump ramdisk size
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/luna68k/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/luna68k/ramdisk/Makefile
diff -u src/distrib/luna68k/ramdisk/Makefile:1.2 src/distrib/luna68k/ramdisk/Makefile:1.3
--- src/distrib/luna68k/ramdisk/Makefile:1.2 Thu Feb 20 14:30:23 2014
+++ src/distrib/luna68k/ramdisk/Makefile Tue Aug 5 14:58:01 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.2 2014/02/20 14:30:23 tsutsui Exp $
+# $NetBSD: Makefile,v 1.3 2014/08/05 14:58:01 martin Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 1700k
+IMAGESIZE= 1800k
MAKEFS_FLAGS= -f 15
WARNS= 1
CVS commit: src/lib/libc/sys
Module Name:src Committed By: riastradh Date: Tue Aug 5 15:01:03 UTC 2014 Modified Files: src/lib/libc/sys: minherit.2 Log Message: Rework minherit(2) man page into a table. XXX Do we not guarantee page-granularity inheritance? Cursory glance at uvm suggests we do -- can we nix the caveats about regions vs pages? To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libc/sys/minherit.2 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/sys/minherit.2 diff -u src/lib/libc/sys/minherit.2:1.19 src/lib/libc/sys/minherit.2:1.20 --- src/lib/libc/sys/minherit.2:1.19 Fri Jul 18 12:39:17 2014 +++ src/lib/libc/sys/minherit.2 Tue Aug 5 15:01:03 2014 @@ -1,4 +1,4 @@ -.\ $NetBSD: minherit.2,v 1.19 2014/07/18 12:39:17 christos Exp $ +.\ $NetBSD: minherit.2,v 1.20 2014/08/05 15:01:03 riastradh Exp $ .\ .\ Copyright (c) 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)minherit.2 8.1 (Berkeley) 6/9/93 .\ -.Dd July 18, 2014 +.Dd August 5, 2014 .Dt MINHERIT 2 .Os .Sh NAME @@ -44,38 +44,43 @@ .Sh DESCRIPTION The .Fn minherit -system call -changes the specified range of virtual addresses to have the specified -fork-time inheritance characteristic +system call changes the specified range of virtual addresses to have +the inheritance characteristic .Fa inherit , -which can be set to -.Dv MAP_INHERIT_NONE , +which determines how +.Xr fork 2 +will map the region in the child process. +The supported inheritance characteristics are: +.Bl -tag -offset abcd -width MAP_INHERIT_DEFAULT +.It MAP_INHERIT_COPY +The child is given a private copy of the region: writes from parent or +child are not seen by the other. +.It MAP_INHERIT_NONE +The region is unmapped in the child. +.It MAP_INHERIT_SHARE +The child is shares the region with the parent: writes from parent and +child are seen by both. +.It MAP_INHERIT_ZERO +The region is mapped in the child to anonymous pages filled with +zeros. +.El +.Pp +Normally, the parent's virtual address space is copied for the child +as if with .Dv MAP_INHERIT_COPY , -.Dv MAP_INHERIT_SHARE , -or -.Dv MAP_INHERIT_ZERO . -Also possible is -.Dv MAP_INHERIT_DEFAULT , -which defaults to -.Dv MAP_INHERIT_COPY . +for which the alias +.Dv MAP_INHERIT_DEFAULT +is provided. +Regions in the parent mapped using +.Xr mmap 2 +with the +.Dv MAP_SHARED +flag are by default shared with the child as if with +.Dv MAP_INHERIT_SHARED . +.Pp Not all implementations will guarantee that the inheritance characteristic can be set on a page basis; the granularity of changes may be as large as an entire region. -.Pp -Normally, the entire address space is marked -.Dv MAP_INHERIT_COPY ; -when the process calls -.Fn fork , -the child receives a (virtual) copy of the entire address space. -Pages or regions marked -.Dv MAP_INHERIT_SHARE -are shared between the address spaces, while pages or regions marked -.Dv MAP_INHERIT_NONE -will be unmapped in the child. -Finally pages or regions marked -.Dv MAP_INHERIT_ZERO -will still be present at the child, but will be initialized to -.Dv 0 . .Sh RETURN VALUES .Rv -std minherit .Sh ERRORS @@ -89,6 +94,7 @@ An invalid region or invalid parameters .Xr fork 2 , .Xr madvise 2 , .Xr mincore 2 , +.Xr mmap 2 , .Xr mprotect 2 , .Xr msync 2 , .Xr munmap 2
CVS commit: src/share/mk
Module Name:src
Committed By: apb
Date: Tue Aug 5 15:25:20 UTC 2014
Modified Files:
src/share/mk: bsd.README bsd.own.mk
Log Message:
Provide and document GZIP_N_FLAG and TOOL_GZIP_N.
These may be used to pass -nT instead of just -n
when the gzip program is actually pigz.
To generate a diff of this commit:
cvs rdiff -u -r1.334 -r1.335 src/share/mk/bsd.README
cvs rdiff -u -r1.824 -r1.825 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.334 src/share/mk/bsd.README:1.335
--- src/share/mk/bsd.README:1.334 Sun Jul 6 18:22:03 2014
+++ src/share/mk/bsd.README Tue Aug 5 15:25:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.334 2014/07/06 18:22:03 dholland Exp $
+# $NetBSD: bsd.README,v 1.335 2014/08/05 15:25:20 apb Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -621,6 +621,10 @@ DOCOWN Documentation owner. [root]
DOCMODE Documentation mode. [${NONBINMODE}]
+GZIP_N_FLAG Flags to pass to TOOL_GZIP to prevent it from inserting
+ file names or timestamps in the compressed output.
+ [-n, or -nT when TOOL_GZIP is really TOOL_PIGZ]
+
NLSDIR Base path for Native Language Support files installation.
[/usr/share/nls]
@@ -800,6 +804,11 @@ TOOL_GROFF Front end for groff document
TOOL_GZIP Compression/decompression tool. [gzip]
+TOOL_GZIP_N Same as TOOL_GZIP, plus a command line option to
+ prevent it from inserting file names or timestamps
+ into the compressed output.
+ [${TOOL_GZIP} ${GZIP_N_FLAG}]
+
TOOL_HEXDUMP Ascii, decimal, hexadecimal, octal dump. [hexdump]
TOOL_HP300MKBOOT Make bootable image for hp300. [hp300-mkboot]
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.824 src/share/mk/bsd.own.mk:1.825
--- src/share/mk/bsd.own.mk:1.824 Thu Jul 24 20:29:19 2014
+++ src/share/mk/bsd.own.mk Tue Aug 5 15:25:20 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.824 2014/07/24 20:29:19 plunky Exp $
+# $NetBSD: bsd.own.mk,v 1.825 2014/08/05 15:25:20 apb Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1174,11 +1174,17 @@ ${var}?= yes
${var}?= no
.endfor
+#
+# TOOL_GZIP and friends. These might refer to TOOL_PIGS or to the host gzip.
+#
.if ${USE_PIGZGZIP} != no
TOOL_GZIP= ${TOOL_PIGZ}
+GZIP_N_FLAG?= -nT
.else
TOOL_GZIP= gzip
+GZIP_N_FLAG?= -n
.endif
+TOOL_GZIP_N= ${TOOL_GZIP} ${GZIP_N_FLAG}
#
# Where X11 sources are and where it is installed to.
CVS commit: src
Module Name:src
Committed By: apb
Date: Tue Aug 5 15:40:59 UTC 2014
Modified Files:
src/distrib/alpha/floppy-GENERIC: Makefile
src/distrib/alpha/rz25dist: Makefile
src/distrib/cobalt: Makefile
src/distrib/common: Makefile.image Makefile.mdset Makefile.minirootkmod
Makefile.tarfloppy
src/distrib/common/bootimage: Makefile.bootimage
src/distrib/evbarm/gzboot/gzimg: Makefile
src/distrib/ews4800mips/floppies/instkernel: Makefile
src/distrib/prep/floppies/kernel-generic: Makefile
src/distrib/rs6000/bootfs: Makefile
src/distrib/sparc64/xminiroot: Makefile
src/distrib/x68k/floppies/bootfloppy.generic: Makefile
src/etc: Makefile
src/external/mit/xorg/share/fonts: Makefile.bdf
src/external/mit/xorg/share/fonts/encodings: Makefile.enc
src/share/mk: bsd.man.mk
src/sys/arch/cobalt/stand/boot: Makefile
src/sys/arch/evbmips/conf: Makefile.evbmips.inc
src/sys/arch/evbppc/conf: Makefile.obs405.inc
src/sys/arch/ews4800mips/stand/boot: Makefile
src/sys/arch/powerpc/conf: Makefile.powerpc
src/x11/share/fonts/bdf: Makefile.bdf
src/x11/share/fonts/encodings: Makefile.enc
Log Message:
Use ${TOOL_GZIP_N} instead of ${TOOL_GZIP} -n, and similarly
use ${TOOL_GZIP_N} -9 instead of ${TOOL_GZIP} -9n, etc.
This will pass -nT instead of just -n if the gzip program is
actually pigz.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/alpha/floppy-GENERIC/Makefile
cvs rdiff -u -r1.30 -r1.31 src/distrib/alpha/rz25dist/Makefile
cvs rdiff -u -r1.4 -r1.5 src/distrib/cobalt/Makefile
cvs rdiff -u -r1.33 -r1.34 src/distrib/common/Makefile.image
cvs rdiff -u -r1.39 -r1.40 src/distrib/common/Makefile.mdset
cvs rdiff -u -r1.2 -r1.3 src/distrib/common/Makefile.minirootkmod
cvs rdiff -u -r1.17 -r1.18 src/distrib/common/Makefile.tarfloppy
cvs rdiff -u -r1.8 -r1.9 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.26 -r1.27 src/distrib/evbarm/gzboot/gzimg/Makefile
cvs rdiff -u -r1.5 -r1.6 src/distrib/ews4800mips/floppies/instkernel/Makefile
cvs rdiff -u -r1.10 -r1.11 src/distrib/prep/floppies/kernel-generic/Makefile
cvs rdiff -u -r1.2 -r1.3 src/distrib/rs6000/bootfs/Makefile
cvs rdiff -u -r1.31 -r1.32 src/distrib/sparc64/xminiroot/Makefile
cvs rdiff -u -r1.8 -r1.9 \
src/distrib/x68k/floppies/bootfloppy.generic/Makefile
cvs rdiff -u -r1.416 -r1.417 src/etc/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/share/fonts/Makefile.bdf
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/share/fonts/encodings/Makefile.enc
cvs rdiff -u -r1.114 -r1.115 src/share/mk/bsd.man.mk
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/cobalt/stand/boot/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/conf/Makefile.evbmips.inc
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/conf/Makefile.obs405.inc
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/ews4800mips/stand/boot/Makefile
cvs rdiff -u -r1.54 -r1.55 src/sys/arch/powerpc/conf/Makefile.powerpc
cvs rdiff -u -r1.8 -r1.9 src/x11/share/fonts/bdf/Makefile.bdf
cvs rdiff -u -r1.9 -r1.10 src/x11/share/fonts/encodings/Makefile.enc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/alpha/floppy-GENERIC/Makefile
diff -u src/distrib/alpha/floppy-GENERIC/Makefile:1.21 src/distrib/alpha/floppy-GENERIC/Makefile:1.22
--- src/distrib/alpha/floppy-GENERIC/Makefile:1.21 Mon Jan 27 08:18:07 2014
+++ src/distrib/alpha/floppy-GENERIC/Makefile Tue Aug 5 15:40:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.22 2014/08/05 15:40:58 apb Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
@@ -42,7 +42,7 @@ netbsd: ${FLOPPYKERNEL}
@rm -f ${.TARGET} ${.TARGET}.tmp
cp ${.ALLSRC} ${.TARGET}.tmp
${STRIP} ${.TARGET}.tmp
- ${TOOL_GZIP} -9nf ${.TARGET}.tmp
+ ${TOOL_GZIP_N} -9f ${.TARGET}.tmp
mv ${.TARGET}.tmp.gz ${.TARGET}
CLEANFILES+= netbsd netbsd.tmp netbsd.tmp.gz
Index: src/distrib/alpha/rz25dist/Makefile
diff -u src/distrib/alpha/rz25dist/Makefile:1.30 src/distrib/alpha/rz25dist/Makefile:1.31
--- src/distrib/alpha/rz25dist/Makefile:1.30 Mon Jan 27 08:18:07 2014
+++ src/distrib/alpha/rz25dist/Makefile Tue Aug 5 15:40:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2014/01/27 08:18:07 apb Exp $
+# $NetBSD: Makefile,v 1.31 2014/08/05 15:40:58 apb Exp $
.include ../../../Makefile.inc
@@ -77,21 +77,21 @@ diskimage.gz: mount-fs build-fs unmount-
umount ${DESTDIR}/usr ${DESTDIR}
/bin/rm -f $@
dd if=/dev/r${DESTDISK}c bs=`expr ${SECPERCYL} \* 512` \
- count=${CYLS} | ${TOOL_GZIP} -9n $@
+ count=${CYLS} | ${TOOL_GZIP_N} -9 $@
bin.tar.gz: mount-fs build-fs
/bin/rm -f $@
(cd ${DESTDIR} ; find . | grep -v '^./etc' | \
grep -v '^./usr/X11R6' | grep -v '^./netbsd' | \
- grep -v
CVS commit: src
Module Name:src
Committed By: apb
Date: Tue Aug 5 15:43:50 UTC 2014
Modified Files:
src/distrib/common: Makefile.image
src/etc: Makefile
Log Message:
Pass GZIP=-9 ${GZIP_N_FLAG} instead of GZIP=-9n
in the environmentto commands that invoke ${TOOL_GZIP}.
This will allow them to use -nT instead of just -n with pigz.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/distrib/common/Makefile.image
cvs rdiff -u -r1.417 -r1.418 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.image
diff -u src/distrib/common/Makefile.image:1.34 src/distrib/common/Makefile.image:1.35
--- src/distrib/common/Makefile.image:1.34 Tue Aug 5 15:40:58 2014
+++ src/distrib/common/Makefile.image Tue Aug 5 15:43:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.34 2014/08/05 15:40:58 apb Exp $
+# $NetBSD: Makefile.image,v 1.35 2014/08/05 15:43:50 apb Exp $
#
# Makefile snippet to build a tree from the provided lists,
# and make an ffs file system image from that tree
@@ -121,7 +121,8 @@ CLEANFILES+= ${IMAGE} ${IMAGE}.gz ${IMAG
${IMAGETAR}: ${WORKBUILT} ${WORKSPEC} ${IMAGEDEPENDS}
${_MKTARGET_CREATE}
( cd ${WORKDIR}; \
- GZIP=-9n ${TOOL_PAX} -ON ${NETBSDSRCDIR}/etc -wdzM ${.OBJDIR}/${WORKSPEC} \
+ GZIP=-9 ${GZIP_N_FLAG} \
+ ${TOOL_PAX} -ON ${NETBSDSRCDIR}/etc -wdzM ${.OBJDIR}/${WORKSPEC} \
) ${.TARGET}.tmp \
mv ${.TARGET}.tmp ${.TARGET}
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.417 src/etc/Makefile:1.418
--- src/etc/Makefile:1.417 Tue Aug 5 15:40:59 2014
+++ src/etc/Makefile Tue Aug 5 15:43:50 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.417 2014/08/05 15:40:59 apb Exp $
+# $NetBSD: Makefile,v 1.418 2014/08/05 15:43:50 apb Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -593,7 +593,7 @@ kernset-${configfile}: .PHONY build_kern
kerndir=${KERNOBJDIR}/${configfile:C/.*\///}; \
kernsuffixes=${KERNEL_SUFFIXES:S/^/./}; \
kern_tgz=${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets/kern-${configfile}.tgz; \
- pax_cmd=COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP=-9n ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}; \
+ pax_cmd=COMPRESS_PROGRAM=${TOOL_GZIP:Q} GZIP=-9 ${GZIP_N_FLAG} ${TOOL_PAX} -O -zw -M -N ${NETBSDSRCDIR}/etc -f $${kern_tgz}; \
cd $${kerndir} { \
kernels=; newest=; \
for kernel in $${kernlist}; do \
CVS commit: src
Module Name:src
Committed By: apb
Date: Tue Aug 5 15:45:50 UTC 2014
Modified Files:
src/distrib/sets: Makefile
src/lib/libc/time: Makefile
Log Message:
Ue ${GZIP_N_FLAG} instead of -n when setting GZIPFLAGS or GZIP_FLAGS.
This will allow -nT instead of just -n to be passed to pigz.
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/distrib/sets/Makefile
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/time/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/Makefile
diff -u src/distrib/sets/Makefile:1.96 src/distrib/sets/Makefile:1.97
--- src/distrib/sets/Makefile:1.96 Mon Jun 9 01:17:44 2014
+++ src/distrib/sets/Makefile Tue Aug 5 15:45:49 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2014/06/09 01:17:44 uebayasi Exp $
+# $NetBSD: Makefile,v 1.97 2014/08/05 15:45:49 apb Exp $
# Experimental RCS METALOG versioning
# (Needs host's rcs(1) commands)
@@ -16,7 +16,7 @@ all:
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
COMPRESS_PROGRAM=${TOOL_GZIP}
-GZIP_FLAGS= -n
+GZIP_FLAGS= ${GZIP_N_FLAG}
SETSENV= DESTDIR=${DESTDIR:Q} \
MACHINE=${MACHINE:Q} \
Index: src/lib/libc/time/Makefile
diff -u src/lib/libc/time/Makefile:1.20 src/lib/libc/time/Makefile:1.21
--- src/lib/libc/time/Makefile:1.20 Sat Jun 14 17:49:27 2014
+++ src/lib/libc/time/Makefile Tue Aug 5 15:45:49 2014
@@ -287,7 +287,7 @@ TARFLAGS= `if tar $(GNUTARFLAGS) --versi
fi`
# Flags to give 'gzip' when making a distribution.
-GZIPFLAGS= -9n
+GZIPFLAGS= -9 ${GZIP_N_FLAG}
###
CVS commit: src/share/mk
Module Name:src
Committed By: apb
Date: Tue Aug 5 15:51:23 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Typo in comment
To generate a diff of this commit:
cvs rdiff -u -r1.825 -r1.826 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.825 src/share/mk/bsd.own.mk:1.826
--- src/share/mk/bsd.own.mk:1.825 Tue Aug 5 15:25:20 2014
+++ src/share/mk/bsd.own.mk Tue Aug 5 15:51:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.825 2014/08/05 15:25:20 apb Exp $
+# $NetBSD: bsd.own.mk,v 1.826 2014/08/05 15:51:23 apb Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1175,7 +1175,7 @@ ${var}?= no
.endfor
#
-# TOOL_GZIP and friends. These might refer to TOOL_PIGS or to the host gzip.
+# TOOL_GZIP and friends. These might refer to TOOL_PIGZ or to the host gzip.
#
.if ${USE_PIGZGZIP} != no
TOOL_GZIP= ${TOOL_PIGZ}
CVS commit: src/sys/arch/luna68k/conf
Module Name:src Committed By: martin Date: Tue Aug 5 15:52:38 UTC 2014 Modified Files: src/sys/arch/luna68k/conf: INSTALL Log Message: Adapt to grown ramdisk image size To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/luna68k/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/luna68k/conf/INSTALL diff -u src/sys/arch/luna68k/conf/INSTALL:1.15 src/sys/arch/luna68k/conf/INSTALL:1.16 --- src/sys/arch/luna68k/conf/INSTALL:1.15 Thu Feb 20 14:30:23 2014 +++ src/sys/arch/luna68k/conf/INSTALL Tue Aug 5 15:52:38 2014 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.15 2014/02/20 14:30:23 tsutsui Exp $ +# $NetBSD: INSTALL,v 1.16 2014/08/05 15:52:38 martin Exp $ # # config for installation ramdisk kernel # @@ -15,7 +15,7 @@ options FPSP # on m68040 to emulate som options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # Force root on ram-disk options MEMORY_DISK_SERVER=0 # no userspace md(4) support -options MEMORY_DISK_ROOT_SIZE=3400 # 1.60 Megabytes +options MEMORY_DISK_ROOT_SIZE=3600 # 1.80 Megabytes options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode # Standard system options
CVS commit: src/distrib/macppc/floppies/ramdisk
Module Name:src
Committed By: martin
Date: Tue Aug 5 16:18:16 UTC 2014
Modified Files:
src/distrib/macppc/floppies/ramdisk: Makefile
Log Message:
Bump ramdisk size
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/macppc/floppies/ramdisk/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/macppc/floppies/ramdisk/Makefile
diff -u src/distrib/macppc/floppies/ramdisk/Makefile:1.41 src/distrib/macppc/floppies/ramdisk/Makefile:1.42
--- src/distrib/macppc/floppies/ramdisk/Makefile:1.41 Mon Aug 4 11:30:35 2014
+++ src/distrib/macppc/floppies/ramdisk/Makefile Tue Aug 5 16:18:16 2014
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.41 2014/08/04 11:30:35 martin Exp $
+# $NetBSD: Makefile,v 1.42 2014/08/05 16:18:16 martin Exp $
.include bsd.own.mk
.include ${NETBSDSRCDIR}/distrib/common/Makefile.distrib
IMAGE= ramdisk.fs
-IMAGESIZE= 2218k
+IMAGESIZE= 2236k
MAKEFS_FLAGS= -f 15
WARNS= 1
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: martin Date: Tue Aug 5 16:22:01 UTC 2014 Modified Files: src/sys/arch/macppc/conf: INSTALL Log Message: Adapt to bigger ramdisk image To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/sys/arch/macppc/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/macppc/conf/INSTALL diff -u src/sys/arch/macppc/conf/INSTALL:1.119 src/sys/arch/macppc/conf/INSTALL:1.120 --- src/sys/arch/macppc/conf/INSTALL:1.119 Sat Apr 27 21:43:32 2013 +++ src/sys/arch/macppc/conf/INSTALL Tue Aug 5 16:22:01 2014 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.119 2013/04/27 21:43:32 christos Exp $ +# $NetBSD: INSTALL,v 1.120 2014/08/05 16:22:01 martin Exp $ # # config file for INSTALL FLOPPY # @@ -17,7 +17,7 @@ options RTC_OFFSET=0 # hardware clock i options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # Force root on ram-disk options MEMORY_DISK_SERVER=0 # no userspace memory disk support -options MEMORY_DISK_ROOT_SIZE=4424 # 2212 KiB +options MEMORY_DISK_ROOT_SIZE=4472 # 2236 KiB options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode options USERCONF # userconf(4) support
CVS commit: src/sys/arch
Module Name:src Committed By: joerg Date: Tue Aug 5 16:28:39 UTC 2014 Modified Files: src/sys/arch/evbppc/obs405: obs200_locore.S obs600_locore.S src/sys/arch/evbppc/walnut: walnut_start.S src/sys/arch/powerpc/ibm4xx/openbios: locore.S Log Message: The argument of stwu is displacement(register), but GAS translates the %rX mnemonic very early into plain X, so it seemingly accepts %register(displacement) as well. Be consistent in the formatting for human consumption. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/obs405/obs200_locore.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbppc/obs405/obs600_locore.S cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbppc/walnut/walnut_start.S cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/ibm4xx/openbios/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/evbppc/obs405/obs200_locore.S diff -u src/sys/arch/evbppc/obs405/obs200_locore.S:1.11 src/sys/arch/evbppc/obs405/obs200_locore.S:1.12 --- src/sys/arch/evbppc/obs405/obs200_locore.S:1.11 Mon Jun 20 19:56:11 2011 +++ src/sys/arch/evbppc/obs405/obs200_locore.S Tue Aug 5 16:28:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: obs200_locore.S,v 1.11 2011/06/20 19:56:11 matt Exp $ */ +/* $NetBSD: obs200_locore.S,v 1.12 2014/08/05 16:28:39 joerg Exp $ */ /* Original Tag: locore.S,v 1.1 2003/09/23 15:21:58 shige Exp */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ @@ -170,7 +170,7 @@ __start_cpu0: addi %r8,%r8,_C_LABEL(end)@l /* zero bss */ li %r4,0 -2: stwu %r4,%r4(3) +2: stwu %r4,4(%r3) cmpw %r3,%r8 bne+ 2b Index: src/sys/arch/evbppc/obs405/obs600_locore.S diff -u src/sys/arch/evbppc/obs405/obs600_locore.S:1.5 src/sys/arch/evbppc/obs405/obs600_locore.S:1.6 --- src/sys/arch/evbppc/obs405/obs600_locore.S:1.5 Mon Dec 12 11:28:04 2011 +++ src/sys/arch/evbppc/obs405/obs600_locore.S Tue Aug 5 16:28:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: obs600_locore.S,v 1.5 2011/12/12 11:28:04 kiyohara Exp $ */ +/* $NetBSD: obs600_locore.S,v 1.6 2014/08/05 16:28:39 joerg Exp $ */ /* * Copyright (c) 2009 KIYOHARA Takashi @@ -88,7 +88,7 @@ __start: addi %r8, %r8, _C_LABEL(end)@l /* zero bss */ li %r4, 0 -2: stwu %r4, %r4(3) +2: stwu %r4, 4(%r3) cmpw %r3, %r8 bne+ 2b Index: src/sys/arch/evbppc/walnut/walnut_start.S diff -u src/sys/arch/evbppc/walnut/walnut_start.S:1.22 src/sys/arch/evbppc/walnut/walnut_start.S:1.23 --- src/sys/arch/evbppc/walnut/walnut_start.S:1.22 Mon Jun 20 19:56:11 2011 +++ src/sys/arch/evbppc/walnut/walnut_start.S Tue Aug 5 16:28:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: walnut_start.S,v 1.22 2011/06/20 19:56:11 matt Exp $ */ +/* $NetBSD: walnut_start.S,v 1.23 2014/08/05 16:28:39 joerg Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -172,7 +172,7 @@ __start_cpu0: addi %r8,%r8,_C_LABEL(end)@l /* zero bss */ li %r4,0 -2: stwu %r4,%r4(%r3) +2: stwu %r4,4(%r3) cmpw %r3,%r8 bne+ 2b Index: src/sys/arch/powerpc/ibm4xx/openbios/locore.S diff -u src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.10 src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.11 --- src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.10 Mon Jun 20 19:56:12 2011 +++ src/sys/arch/powerpc/ibm4xx/openbios/locore.S Tue Aug 5 16:28:39 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.10 2011/06/20 19:56:12 matt Exp $ */ +/* $NetBSD: locore.S,v 1.11 2014/08/05 16:28:39 joerg Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -193,7 +193,7 @@ __start_cpu0: addi %r8,%r8,_C_LABEL(end)@l /* zero bss */ li %r4,0 -2: stwu %r4,%r4(3) +2: stwu %r4,4(%r3) cmpw %r3,%r8 bne+ 2b
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jmcneill
Date: Tue Aug 5 17:25:16 UTC 2014
Modified Files:
src/sys/dev/pci: if_wpi.c
Log Message:
Sprinkle bus_dmamap_sync to make this work on my Thinkpad T61 (amd64)
with 4GB RAM.
To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/pci/if_wpi.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/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.62 src/sys/dev/pci/if_wpi.c:1.63
--- src/sys/dev/pci/if_wpi.c:1.62 Sat Jul 5 17:39:21 2014
+++ src/sys/dev/pci/if_wpi.c Tue Aug 5 17:25:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.62 2014/07/05 17:39:21 jakllsch Exp $ */
+/* $NetBSD: if_wpi.c,v 1.63 2014/08/05 17:25:16 jmcneill Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.62 2014/07/05 17:39:21 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.63 2014/08/05 17:25:16 jmcneill Exp $);
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -450,6 +450,7 @@ wpi_dma_contig_alloc(bus_dma_tag_t tag,
goto fail;
memset(dma-vaddr, 0, size);
+ bus_dmamap_sync(dma-tag, dma-map, 0, size, BUS_DMASYNC_PREWRITE);
dma-paddr = dma-map-dm_segs[0].ds_addr;
if (kvap != NULL)
@@ -605,12 +606,14 @@ wpi_free_rpool(struct wpi_softc *sc)
static int
wpi_alloc_rx_ring(struct wpi_softc *sc, struct wpi_rx_ring *ring)
{
+ bus_size_t size;
int i, error;
ring-cur = 0;
+ size = WPI_RX_RING_COUNT * sizeof (uint32_t);
error = wpi_dma_contig_alloc(sc-sc_dmat, ring-desc_dma,
- (void **)ring-desc, WPI_RX_RING_COUNT * sizeof (uint32_t),
+ (void **)ring-desc, size,
WPI_RING_DMA_ALIGN, BUS_DMA_NOWAIT);
if (error != 0) {
aprint_error_dev(sc-sc_dev,
@@ -648,6 +651,9 @@ wpi_alloc_rx_ring(struct wpi_softc *sc,
ring-desc[i] = htole32(rbuf-paddr);
}
+ bus_dmamap_sync(sc-sc_dmat, ring-desc_dma.map, 0, size,
+ BUS_DMASYNC_PREWRITE);
+
return 0;
fail: wpi_free_rx_ring(sc, ring);
@@ -711,6 +717,8 @@ wpi_alloc_tx_ring(struct wpi_softc *sc,
/* update shared page with ring's base address */
sc-shared-txbase[qid] = htole32(ring-desc_dma.paddr);
+ bus_dmamap_sync(sc-sc_dmat, sc-shared_dma.map, 0,
+ sizeof(struct wpi_shared), BUS_DMASYNC_PREWRITE);
error = wpi_dma_contig_alloc(sc-sc_dmat, ring-cmd_dma,
(void **)ring-cmd, count * sizeof (struct wpi_tx_cmd), 4,
@@ -1303,6 +1311,8 @@ wpi_load_firmware(struct wpi_softc *sc)
memcpy((char *)dma-vaddr + WPI_FW_INIT_DATA_MAXSZ, init_text,
init_textsz);
+ bus_dmamap_sync(dma-tag, dma-map, 0, dma-size, BUS_DMASYNC_PREWRITE);
+
/* tell adapter where to find initialization images */
wpi_mem_lock(sc);
wpi_mem_write(sc, WPI_MEM_DATA_BASE, dma-paddr);
@@ -1333,6 +1343,8 @@ wpi_load_firmware(struct wpi_softc *sc)
memcpy((char *)dma-vaddr + WPI_FW_MAIN_DATA_MAXSZ, main_text,
main_textsz);
+ bus_dmamap_sync(dma-tag, dma-map, 0, dma-size, BUS_DMASYNC_PREWRITE);
+
/* tell adapter where to find runtime images */
wpi_mem_lock(sc);
wpi_mem_write(sc, WPI_MEM_DATA_BASE, dma-paddr);
@@ -1995,6 +2007,16 @@ wpi_tx_data(struct wpi_softc *sc, struct
ring-queued++;
+ bus_dmamap_sync(sc-sc_dmat, data-map, 0,
+ data-map-dm_mapsize,
+ BUS_DMASYNC_PREWRITE);
+ bus_dmamap_sync(sc-sc_dmat, ring-cmd_dma.map, 0,
+ ring-cmd_dma.size,
+ BUS_DMASYNC_PREWRITE);
+ bus_dmamap_sync(sc-sc_dmat, ring-desc_dma.map, 0,
+ ring-desc_dma.size,
+ BUS_DMASYNC_PREWRITE);
+
/* kick ring */
ring-cur = (ring-cur + 1) % WPI_TX_RING_COUNT;
WPI_WRITE(sc, WPI_TX_WIDX, ring-qid 8 | ring-cur);
@@ -2290,6 +2312,7 @@ wpi_cmd(struct wpi_softc *sc, int code,
struct wpi_tx_ring *ring = sc-cmdq;
struct wpi_tx_desc *desc;
struct wpi_tx_cmd *cmd;
+ struct wpi_dma_info *dma;
KASSERT(size = sizeof cmd-data);
@@ -2302,11 +2325,17 @@ wpi_cmd(struct wpi_softc *sc, int code,
cmd-idx = ring-cur;
memcpy(cmd-data, buf, size);
+ dma = ring-cmd_dma;
+ bus_dmamap_sync(dma-tag, dma-map, 0, dma-size, BUS_DMASYNC_PREWRITE);
+
desc-flags = htole32(WPI_PAD32(size) 28 | 1 24);
desc-segs[0].addr = htole32(ring-cmd_dma.paddr +
ring-cur * sizeof (struct wpi_tx_cmd));
desc-segs[0].len = htole32(4 + size);
+ dma = ring-desc_dma;
+ bus_dmamap_sync(dma-tag, dma-map, 0, dma-size, BUS_DMASYNC_PREWRITE);
+
/* kick cmd ring */
ring-cur = (ring-cur + 1) % WPI_CMD_RING_COUNT;
WPI_WRITE(sc, WPI_TX_WIDX, ring-qid 8 | ring-cur);
@@ -2627,6 +2656,9 @@ wpi_setup_beacon(struct wpi_softc *sc, s
desc-segs[1].addr = htole32(data-map-dm_segs[0].ds_addr);
desc-segs[1].len = htole32(data-map-dm_segs[0].ds_len);
+ bus_dmamap_sync(sc-sc_dmat, data-map, 0, data-map-dm_mapsize,
+ BUS_DMASYNC_PREWRITE);
+
/* kick cmd ring */
ring-cur = (ring-cur + 1) % WPI_CMD_RING_COUNT;
WPI_WRITE(sc, WPI_TX_WIDX, ring-qid 8 | ring-cur);
@@ -2857,6
CVS commit: src/sys/external/bsd/drm2/nouveau
Module Name:src
Committed By: riastradh
Date: Tue Aug 5 17:39:07 UTC 2014
Added Files:
src/sys/external/bsd/drm2/nouveau: nouveau2netbsd
Log Message:
Add kludgey nouveau2netbsd script in preparation for re-import.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/drm2/nouveau/nouveau2netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/sys/external/bsd/drm2/nouveau/nouveau2netbsd
diff -u /dev/null src/sys/external/bsd/drm2/nouveau/nouveau2netbsd:1.1
--- /dev/null Tue Aug 5 17:39:07 2014
+++ src/sys/external/bsd/drm2/nouveau/nouveau2netbsd Tue Aug 5 17:39:07 2014
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# $NetBSD: nouveau2netbsd,v 1.1 2014/08/05 17:39:07 riastradh Exp $
+#
+# $ /path/to/nouveau2netbsd /path/to/files.nouveau.new
+#
+# Run from the top-level Nouveau source directory. This stupid kludge
+# reinterprets the GNU makefile as a BSD makefile to extract the source
+# file names, renames the ones that have obscure and/or colliding
+# basenames to be less obscure and unlikely (though not guaranteed) to
+# collide, and spits out config(5) directives for all of them.
+
+set -Ceu
+
+# Location of the Nouveau sources relative to $NETBSDSRCDIR.
+nouveau_top=external/bsd/drm2/dist/drm/nouveau
+
+# config(5) flag for the Nouveau driver.
+nouveau_flag=nouveau
+
+filemap=
+
+clean ()
+{
+ [ -z $filemap ] || rm -f -- $filemap || :
+}
+trap clean EXIT HUP INT TERM
+
+filemap=$(mktemp -t ${0##*/})
+
+cat Makefile\
+| sed -e 's,^include \(.*\)$,.include \1,'\
+| sed -e 's,^ifdef \(.*\)$,.if !empty(\1:M[yY][eE][sS]),' \
+| sed -e 's,^endif$,.endif,' \
+| make -f /dev/stdin -V nouveau-y src=. \
+| tr ' ' '\n'\
+| sed -e 's,^$,,' \
+| sort -u\
+| sed -e 's,\.o$,.c,' \
+| awk '
+ BEGIN {
+ duplicates = 0
+ }
+ $1 ~ nouveau_[^/]*$ {
+ if (seen[$1])
+ printf(Duplicate basename: %s\n, $1)
+ seen[$1] = $1
+ printf(%s %s\n, $1, $1)
+ next
+ }
+ {
+ if (index($1, /)) {
+ dir = $1
+ sub(/[^/]*$, /, dir)
+ } else {
+ dir =
+ }
+ base = $1
+ sub(^core/, , base)
+ gsub(/, _, base)
+ if (seen[base]) {
+ printf(Duplicate basename: %s %s\n, seen[base], $1) \
+ /dev/stderr
+ duplicates = 1
+ }
+ if (duplicates)
+ next
+ seen[base] = $1
+ printf(%s %s\n, $1, dir nouveau_ base)
+ }
+ END {
+ if (duplicates) {
+ printf(Time to rewite me!\n) /dev/stderr
+ exit 1
+ }
+ }
+' $filemap
+
+while read from to; do
+ if [ x$from != x$to ]; then
+ mv -f -- $from $to
+ fi
+# Probably not necessary -- Linux tends not to have RCS ids --
+# but a precaution out of paranoia.
+cleantags $to
+ case $to in
+ *.c)
+ awk '
+ BEGIN {
+done = 0
+printf(/*\t%c%s%c\t*/\n\n, $,NetBSD,$)
+ }
+ /^#include/ !done {
+printf(#include sys/cdefs.h\n)
+printf(__KERNEL_RCSID(0, \%c%s%c\);\n,
+$,NetBSD,$)
+printf(\n)
+done = 1
+ }
+ {
+print
+ }
+ ' $to $to.tmp
+ ;;
+ esac
+ mv -f -- $to.tmp $to
+ printf 'file\t%s\t%s\n' $nouveau_top/$to $nouveau_flag
+done $filemap | sort
+
+# We sort the output again at the end because we renamed some files but
+# left $TOP/nouveau_* unchanged, so their sort order relative to the
+# ones that got renamed may have changed.
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src
Committed By: joerg
Date: Tue Aug 5 17:55:20 UTC 2014
Modified Files:
src/sys/arch/sandpoint/stand/altboot: brdsetup.c dev_net.c dsk.c main.c
nif.c
Log Message:
Don't use non-literal strings as format strings.
XXX Switch to strlcpy.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/sandpoint/stand/altboot/brdsetup.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sandpoint/stand/altboot/dev_net.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sandpoint/stand/altboot/dsk.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sandpoint/stand/altboot/main.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sandpoint/stand/altboot/nif.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/sandpoint/stand/altboot/brdsetup.c
diff -u src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.33 src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.34
--- src/sys/arch/sandpoint/stand/altboot/brdsetup.c:1.33 Thu Nov 7 14:51:36 2013
+++ src/sys/arch/sandpoint/stand/altboot/brdsetup.c Tue Aug 5 17:55:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: brdsetup.c,v 1.33 2013/11/07 14:51:36 nisimura Exp $ */
+/* $NetBSD: brdsetup.c,v 1.34 2014/08/05 17:55:20 joerg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -319,11 +319,11 @@ brdsetup(void)
brdfixup();
bi_mem.memsize = mpc107memsize();
- snprintf(bi_cons.devname, sizeof(bi_cons.devname), consname);
+ snprintf(bi_cons.devname, sizeof(bi_cons.devname), %s, consname);
bi_cons.addr = consport;
bi_cons.speed = brdprop-consspeed;
bi_clk.ticks_per_sec = ticks_per_sec;
- snprintf(bi_fam.name, sizeof(bi_fam.name), brdprop-family);
+ snprintf(bi_fam.name, sizeof(bi_fam.name), %s, brdprop-family);
}
struct brdprop *
Index: src/sys/arch/sandpoint/stand/altboot/dev_net.c
diff -u src/sys/arch/sandpoint/stand/altboot/dev_net.c:1.2 src/sys/arch/sandpoint/stand/altboot/dev_net.c:1.3
--- src/sys/arch/sandpoint/stand/altboot/dev_net.c:1.2 Sun Jul 17 20:54:46 2011
+++ src/sys/arch/sandpoint/stand/altboot/dev_net.c Tue Aug 5 17:55:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.2 2011/07/17 20:54:46 joerg Exp $ */
+/* $NetBSD: dev_net.c,v 1.3 2014/08/05 17:55:20 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -75,7 +75,7 @@ net_open(struct open_file *f, ...)
}
if (file[0] != '\0')
- snprintf(bootfile, sizeof(bootfile), file);
+ snprintf(bootfile, sizeof(bootfile), %s, file);
else if (bootfile[0] == '\0')
snprintf(bootfile, sizeof(bootfile), netbsd);
@@ -83,7 +83,7 @@ net_open(struct open_file *f, ...)
(error = nfs_mount(netdev_sock, rootip, rootpath)) != 0)
goto bad;
- snprintf(bi_path.bootpath, sizeof(bi_path.bootpath), bootfile);
+ snprintf(bi_path.bootpath, sizeof(bi_path.bootpath), %s, bootfile);
f-f_devdata = netdev_sock;
netdev_opens++;
return 0;
Index: src/sys/arch/sandpoint/stand/altboot/dsk.c
diff -u src/sys/arch/sandpoint/stand/altboot/dsk.c:1.16 src/sys/arch/sandpoint/stand/altboot/dsk.c:1.17
--- src/sys/arch/sandpoint/stand/altboot/dsk.c:1.16 Thu Apr 26 19:59:37 2012
+++ src/sys/arch/sandpoint/stand/altboot/dsk.c Tue Aug 5 17:55:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dsk.c,v 1.16 2012/04/26 19:59:37 phx Exp $ */
+/* $NetBSD: dsk.c,v 1.17 2014/08/05 17:55:20 joerg Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -502,7 +502,7 @@ dsk_open(struct open_file *f, ...)
d-part = part;
f-f_devdata = d;
- snprintf(bi_path.bootpath, sizeof(bi_path.bootpath), name);
+ snprintf(bi_path.bootpath, sizeof(bi_path.bootpath), %s, name);
if (dlp-d_partitions[part].p_fstype == FS_BSDFFS) {
if ((error = ffsv2_open(name, f)) == 0) {
fs = fs_ffsv2;
Index: src/sys/arch/sandpoint/stand/altboot/main.c
diff -u src/sys/arch/sandpoint/stand/altboot/main.c:1.25 src/sys/arch/sandpoint/stand/altboot/main.c:1.26
--- src/sys/arch/sandpoint/stand/altboot/main.c:1.25 Wed Mar 26 17:35:08 2014
+++ src/sys/arch/sandpoint/stand/altboot/main.c Tue Aug 5 17:55:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.25 2014/03/26 17:35:08 christos Exp $ */
+/* $NetBSD: main.c,v 1.26 2014/08/05 17:55:20 joerg Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -525,7 +525,7 @@ module_load(const char *kernel_path)
if (size bm-bm_len)
printf(WARNING: couldn't load);
else {
- snprintf(bi-kmod, sizeof(bi-kmod), bm-bm_kmod);
+ snprintf(bi-kmod, sizeof(bi-kmod), %s, bm-bm_kmod);
bi-type = BI_MODULE_ELF;
bi-len = size;
bi-base = kmodloadp;
Index: src/sys/arch/sandpoint/stand/altboot/nif.c
diff -u src/sys/arch/sandpoint/stand/altboot/nif.c:1.5 src/sys/arch/sandpoint/stand/altboot/nif.c:1.6
--- src/sys/arch/sandpoint/stand/altboot/nif.c:1.5 Sat Mar 12 16:41:23 2011
+++ src/sys/arch/sandpoint/stand/altboot/nif.c Tue Aug 5 17:55:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nif.c,v 1.5 2011/03/12 16:41:23 phx Exp $ */
+/* $NetBSD: nif.c,v 1.6
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: martin Date: Tue Aug 5 18:08:03 UTC 2014 Modified Files: src/sys/arch/macppc/conf: GENERIC_MD MAMBO POWERMAC_G5 Log Message: Update all ramdisk sizes To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/macppc/conf/GENERIC_MD cvs rdiff -u -r1.18 -r1.19 src/sys/arch/macppc/conf/MAMBO cvs rdiff -u -r1.19 -r1.20 src/sys/arch/macppc/conf/POWERMAC_G5 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/macppc/conf/GENERIC_MD diff -u src/sys/arch/macppc/conf/GENERIC_MD:1.12 src/sys/arch/macppc/conf/GENERIC_MD:1.13 --- src/sys/arch/macppc/conf/GENERIC_MD:1.12 Fri Mar 23 18:37:42 2012 +++ src/sys/arch/macppc/conf/GENERIC_MD Tue Aug 5 18:08:02 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_MD,v 1.12 2012/03/23 18:37:42 he Exp $ +# $NetBSD: GENERIC_MD,v 1.13 2014/08/05 18:08:02 martin Exp $ # # GENERIC_MD config file # @@ -8,5 +8,5 @@ include arch/macppc/conf/GENERIC # Enable the hooks used for initializing the ram-disk. options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # Force root on ram-disk -options MEMORY_DISK_ROOT_SIZE=4424 # 2212 KiB +options MEMORY_DISK_ROOT_SIZE=4472 # 2236 KiB options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode Index: src/sys/arch/macppc/conf/MAMBO diff -u src/sys/arch/macppc/conf/MAMBO:1.18 src/sys/arch/macppc/conf/MAMBO:1.19 --- src/sys/arch/macppc/conf/MAMBO:1.18 Sat Apr 27 21:43:32 2013 +++ src/sys/arch/macppc/conf/MAMBO Tue Aug 5 18:08:02 2014 @@ -6,7 +6,7 @@ include arch/macppc/conf/std.macppc.g5 options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident GENERIC-$Revision: 1.18 $ +#ident GENERIC-$Revision: 1.19 $ maxusers 32 @@ -197,7 +197,7 @@ pseudo-device nsmb # SMB requester # Enable the hooks used for initializing the ram-disk. options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # Force root on ram-disk -options MEMORY_DISK_ROOT_SIZE=4224 # 2112 KiB +options MEMORY_DISK_ROOT_SIZE=4472 # 2236 KiB options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode options MAMBO Index: src/sys/arch/macppc/conf/POWERMAC_G5 diff -u src/sys/arch/macppc/conf/POWERMAC_G5:1.19 src/sys/arch/macppc/conf/POWERMAC_G5:1.20 --- src/sys/arch/macppc/conf/POWERMAC_G5:1.19 Sat Apr 27 21:43:32 2013 +++ src/sys/arch/macppc/conf/POWERMAC_G5 Tue Aug 5 18:08:02 2014 @@ -187,5 +187,5 @@ pseudo-device nsmb # SMB requester # Enable the hooks used for initializing the ram-disk. options MEMORY_DISK_HOOKS options MEMORY_DISK_IS_ROOT # Force root on ram-disk -options MEMORY_DISK_ROOT_SIZE=4224 # 2112 KiB +options MEMORY_DISK_ROOT_SIZE=4472 # 2236 KiB options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Aug 5 18:13:46 UTC 2014 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Add some TODOs in comment. To generate a diff of this commit: cvs rdiff -u -r1.285 -r1.286 src/sys/dev/pci/if_wm.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/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.285 src/sys/dev/pci/if_wm.c:1.286 --- src/sys/dev/pci/if_wm.c:1.285 Thu Jul 31 03:50:09 2014 +++ src/sys/dev/pci/if_wm.c Tue Aug 5 18:13:46 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.285 2014/07/31 03:50:09 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.286 2014/08/05 18:13:46 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -72,11 +72,16 @@ * * TODO (in order of importance): * + * - Internal SERDES mode newer than or equal to 82575. + * - EEE (Energy Efficiency Ethernet) + * - MSI/MSI-X + * - Virtual Function + * - Set LED correctly (based on contents in EEPROM) * - Rework how parameters are loaded from the EEPROM. */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.285 2014/07/31 03:50:09 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.286 2014/08/05 18:13:46 msaitoh Exp $); #include sys/param.h #include sys/systm.h
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Tue Aug 5 18:46:04 UTC 2014
Modified Files:
src/usr.sbin/sysinst: Makefile.inc
Log Message:
Install language files
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/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/usr.sbin/sysinst/Makefile.inc
diff -u src/usr.sbin/sysinst/Makefile.inc:1.3 src/usr.sbin/sysinst/Makefile.inc:1.4
--- src/usr.sbin/sysinst/Makefile.inc:1.3 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/Makefile.inc Tue Aug 5 18:46:04 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.3 2014/08/03 16:09:38 martin Exp $
+# $NetBSD: Makefile.inc,v 1.4 2014/08/05 18:46:04 martin Exp $
#
# Makefile for sysinst
@@ -47,10 +47,12 @@ LDADD= -lcurses -ltermlib -lutil
UNIF_AWK= ${.CURDIR}/../../unif.awk
MSG_XLAT_SH= ${.CURDIR}/../../msg_xlat.sh
+CATALOGDIR= /usr/share/sysinst/catalog
CPPFLAGS+= -I. -I${.CURDIR}/../.. -I${.CURDIR} \
-DREL=\${DISTRIBVER}\ -DMACH=\${MACHINE}\ \
-DMACH_${MACHINE} -DARCH_${MACHINE_ARCH} \
- ${NODISKLABEL:D-DNO_DISKLABEL}
+ ${NODISKLABEL:D-DNO_DISKLABEL} \
+ -DCATALOG_DIR=\${CATALOGDIR}\
.if (defined(DEBUG))
CPPFLAGS+=-DDEBUG -g -O0
@@ -161,6 +163,8 @@ sysinstmsgs.${LANG}: msg.mi.${LANG} ${MS
${HOST_SH} ${MSG_XLAT_SH} -f sysinstmsgs.fmtcnt ${.TARGET}
DPSRCS+= sysinstmsgs.${LANG}
+FILES+= sysinstmsgs.${LANG}
+FILESDIR_sysinstmsgs.${LANG}= ${CATALOGDIR}
.endfor
.include bsd.prog.mk
CVS commit: src/etc/mtree
Module Name:src Committed By: martin Date: Tue Aug 5 18:45:35 UTC 2014 Modified Files: src/etc/mtree: NetBSD.dist.base Log Message: Add a directory for sysinst language files To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 src/etc/mtree/NetBSD.dist.base Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.base diff -u src/etc/mtree/NetBSD.dist.base:1.137 src/etc/mtree/NetBSD.dist.base:1.138 --- src/etc/mtree/NetBSD.dist.base:1.137 Sat Jul 19 18:38:33 2014 +++ src/etc/mtree/NetBSD.dist.base Tue Aug 5 18:45:35 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.base,v 1.137 2014/07/19 18:38:33 lneto Exp $ +# $NetBSD: NetBSD.dist.base,v 1.138 2014/08/05 18:45:35 martin Exp $ # @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93 # Do not customize this file as it may be overwritten on upgrades. @@ -1200,6 +1200,8 @@ ./usr/share/nls/zh_CN.UTF-8 ./usr/share/nvi ./usr/share/nvi/catalog +./usr/share/sysinst +./usr/share/sysinst/catalog ./usr/share/tabset ./usr/share/tmac ./usr/share/tmac/mdoc
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: martin Date: Tue Aug 5 18:46:21 UTC 2014 Modified Files: src/distrib/sets/lists/base: mi Log Message: Add sysinst message files To generate a diff of this commit: cvs rdiff -u -r1.1079 -r1.1080 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1079 src/distrib/sets/lists/base/mi:1.1080 --- src/distrib/sets/lists/base/mi:1.1079 Fri Aug 1 14:08:47 2014 +++ src/distrib/sets/lists/base/mi Tue Aug 5 18:46:21 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1079 2014/08/01 14:08:47 christos Exp $ +# $NetBSD: mi,v 1.1080 2014/08/05 18:46:21 martin Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -4890,7 +4890,13 @@ ./usr/share/sushi/util/logging/func base-obsolete obsolete ./usr/share/sushi/util/scripting base-obsolete obsolete ./usr/share/sushi/util/scripting/func base-obsolete obsolete -./usr/share/tabsetbase-util-share +./usr/share/sysinstbase-util-share +./usr/share/sysinst/catalog base-util-share +./usr/share/sysinst/catalog/sysinstmsgs.de base-util-share share +./usr/share/sysinst/catalog/sysinstmsgs.es base-util-share share +./usr/share/sysinst/catalog/sysinstmsgs.fr base-util-share share +./usr/share/sysinst/catalog/sysinstmsgs.pl base-util-share share +./usr/share/tabsetbase-util-share share ./usr/share/tabset/3101base-util-share share ./usr/share/tabset/9837base-util-share share ./usr/share/tabset/aabase-util-share share
CVS commit: src/sys/external/bsd/drm2/nouveau
Module Name:src
Committed By: riastradh
Date: Tue Aug 5 19:49:13 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/nouveau: nouveau2netbsd
Log Message:
Tweak heuristic for placing __KERNEL_RCSID in nouveau2netbsd.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/external/bsd/drm2/nouveau/nouveau2netbsd
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/drm2/nouveau/nouveau2netbsd
diff -u src/sys/external/bsd/drm2/nouveau/nouveau2netbsd:1.1 src/sys/external/bsd/drm2/nouveau/nouveau2netbsd:1.2
--- src/sys/external/bsd/drm2/nouveau/nouveau2netbsd:1.1 Tue Aug 5 17:39:07 2014
+++ src/sys/external/bsd/drm2/nouveau/nouveau2netbsd Tue Aug 5 19:49:13 2014
@@ -1,6 +1,6 @@
#!/bin/sh
-# $NetBSD: nouveau2netbsd,v 1.1 2014/08/05 17:39:07 riastradh Exp $
+# $NetBSD: nouveau2netbsd,v 1.2 2014/08/05 19:49:13 riastradh Exp $
#
# $ /path/to/nouveau2netbsd /path/to/files.nouveau.new
#
@@ -85,12 +85,17 @@ while read from to; do
cleantags $to
case $to in
*.c)
+ # Heuristically apply NetBSD RCS ids: a comment at the
+ # top of the file, and a __KERNEL_RCSID before the
+ # first cpp line, which, with any luck, should be the
+ # first non-comment line and lie between the copyright
+ # notice and the header.
awk '
BEGIN {
done = 0
printf(/*\t%c%s%c\t*/\n\n, $,NetBSD,$)
}
- /^#include/ !done {
+ /^#/ !done {
printf(#include sys/cdefs.h\n)
printf(__KERNEL_RCSID(0, \%c%s%c\);\n,
$,NetBSD,$)
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src Committed By: riastradh Date: Tue Aug 5 20:28:56 UTC 2014 Modified Files: src/sys/external/bsd/drm2/i915drm: intelfb.c Log Message: Use surface_width/height, not fb_width/height. This matches the sizes the upstream code uses. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/external/bsd/drm2/i915drm/intelfb.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/drm2/i915drm/intelfb.c diff -u src/sys/external/bsd/drm2/i915drm/intelfb.c:1.5 src/sys/external/bsd/drm2/i915drm/intelfb.c:1.6 --- src/sys/external/bsd/drm2/i915drm/intelfb.c:1.5 Fri Jul 25 16:35:43 2014 +++ src/sys/external/bsd/drm2/i915drm/intelfb.c Tue Aug 5 20:28:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: intelfb.c,v 1.5 2014/07/25 16:35:43 riastradh Exp $ */ +/* $NetBSD: intelfb.c,v 1.6 2014/08/05 20:28:56 riastradh Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: intelfb.c,v 1.5 2014/07/25 16:35:43 riastradh Exp $); +__KERNEL_RCSID(0, $NetBSD: intelfb.c,v 1.6 2014/08/05 20:28:56 riastradh Exp $); #ifdef _KERNEL_OPT #include vga.h @@ -192,11 +192,12 @@ intelfb_setconfig_task(struct i915drmkms 0, sc-sc_ifa.ifa_fb_size); /* XXX Ugh... Pass these parameters some other way! */ - prop_dictionary_set_uint32(dict, width, sizes-fb_width); - prop_dictionary_set_uint32(dict, height, sizes-fb_height); + prop_dictionary_set_uint32(dict, width, sizes-surface_width); + prop_dictionary_set_uint32(dict, height, sizes-surface_height); prop_dictionary_set_uint8(dict, depth, sizes-surface_bpp); prop_dictionary_set_uint16(dict, linebytes, - roundup2((sizes-fb_width * howmany(sizes-surface_bpp, 8)), 64)); + roundup2((sizes-surface_width * howmany(sizes-surface_bpp, 8)), + 64)); prop_dictionary_set_uint32(dict, address, 0); /* XXX 32-bit */ CTASSERT(sizeof(uintptr_t) = sizeof(uint64_t)); prop_dictionary_set_uint64(dict, virtual_address,
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jmcneill
Date: Tue Aug 5 21:54:39 UTC 2014
Modified Files:
src/sys/dev/pci: if_wpi.c if_wpivar.h
Log Message:
bus_dmamap_sync for rx descriptors too, derived from openbsd driver
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/pci/if_wpi.c
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/pci/if_wpivar.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/pci/if_wpi.c
diff -u src/sys/dev/pci/if_wpi.c:1.63 src/sys/dev/pci/if_wpi.c:1.64
--- src/sys/dev/pci/if_wpi.c:1.63 Tue Aug 5 17:25:16 2014
+++ src/sys/dev/pci/if_wpi.c Tue Aug 5 21:54:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpi.c,v 1.63 2014/08/05 17:25:16 jmcneill Exp $ */
+/* $NetBSD: if_wpi.c,v 1.64 2014/08/05 21:54:39 jmcneill Exp $ */
/*-
* Copyright (c) 2006, 2007
@@ -18,7 +18,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.63 2014/08/05 17:25:16 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wpi.c,v 1.64 2014/08/05 21:54:39 jmcneill Exp $);
/*
* Driver for Intel PRO/Wireless 3945ABG 802.11 network adapters.
@@ -628,6 +628,14 @@ wpi_alloc_rx_ring(struct wpi_softc *sc,
struct wpi_rx_data *data = ring-data[i];
struct wpi_rbuf *rbuf;
+ error = bus_dmamap_create(sc-sc_dmat, WPI_RBUF_SIZE, 1,
+ WPI_RBUF_SIZE, 0, BUS_DMA_NOWAIT, data-map);
+ if (error) {
+ aprint_error_dev(sc-sc_dev,
+ could not allocate rx dma map\n);
+ goto fail;
+ }
+
MGETHDR(data-m, M_DONTWAIT, MT_DATA);
if (data-m == NULL) {
aprint_error_dev(sc-sc_dev,
@@ -648,6 +656,15 @@ wpi_alloc_rx_ring(struct wpi_softc *sc,
rbuf);
data-m-m_flags |= M_EXT_RW;
+ error = bus_dmamap_load(sc-sc_dmat, data-map,
+ mtod(data-m, void *), WPI_RBUF_SIZE, NULL,
+ BUS_DMA_NOWAIT | BUS_DMA_READ);
+ if (error) {
+ aprint_error_dev(sc-sc_dev,
+ could not load mbuf: %d\n, error);
+ goto fail;
+ }
+
ring-desc[i] = htole32(rbuf-paddr);
}
@@ -690,8 +707,13 @@ wpi_free_rx_ring(struct wpi_softc *sc, s
wpi_dma_contig_free(ring-desc_dma);
for (i = 0; i WPI_RX_RING_COUNT; i++) {
- if (ring-data[i].m != NULL)
+ if (ring-data[i].m != NULL) {
+ bus_dmamap_unload(sc-sc_dmat, ring-data[i].map);
m_freem(ring-data[i].m);
+ }
+ if (ring-data[i].map != NULL) {
+ bus_dmamap_destroy(sc-sc_dmat, ring-data[i].map);
+ }
}
}
@@ -1451,6 +1473,8 @@ wpi_rx_intr(struct wpi_softc *sc, struct
struct mbuf *m, *mnew;
int data_off;
+ bus_dmamap_sync(sc-sc_dmat, data-map, 0, data-map-dm_mapsize,
+ BUS_DMASYNC_POSTREAD);
stat = (struct wpi_rx_stat *)(desc + 1);
if (stat-len WPI_STAT_MAXLEN) {
@@ -1506,6 +1530,7 @@ wpi_rx_intr(struct wpi_softc *sc, struct
return;
}
} else {
+ int error;
MGETHDR(mnew, M_DONTWAIT, MT_DATA);
if (mnew == NULL) {
@@ -1521,11 +1546,23 @@ wpi_rx_intr(struct wpi_softc *sc, struct
rbuf);
mnew-m_flags |= M_EXT_RW;
+ bus_dmamap_unload(sc-sc_dmat, data-map);
m = data-m;
data-m = mnew;
+ error = bus_dmamap_load(sc-sc_dmat, data-map,
+ mtod(data-m, void *), WPI_RBUF_SIZE, NULL,
+ BUS_DMA_NOWAIT | BUS_DMA_READ);
+ if (error) {
+ panic(%s: bus_dmamap_load failed: %d\n,
+ device_xname(sc-sc_dev), error);
+ }
+
/* update Rx descriptor */
ring-desc[ring-cur] = htole32(rbuf-paddr);
+ bus_dmamap_sync(sc-sc_dmat, ring-desc_dma.map, 0,
+ ring-desc_dma.size,
+ BUS_DMASYNC_PREWRITE);
m-m_data = (char*)m-m_data + data_off;
m-m_pkthdr.len = m-m_len = le16toh(head-len);
@@ -1655,11 +1692,17 @@ wpi_notif_intr(struct wpi_softc *sc)
struct ifnet *ifp = ic-ic_ifp;
uint32_t hw;
+ bus_dmamap_sync(sc-sc_dmat, sc-shared_dma.map, 0,
+ sizeof(struct wpi_shared), BUS_DMASYNC_POSTREAD);
+
hw = le32toh(sc-shared-next);
while (sc-rxq.cur != hw) {
struct wpi_rx_data *data = sc-rxq.data[sc-rxq.cur];
struct wpi_rx_desc *desc = mtod(data-m, struct wpi_rx_desc *);
+ bus_dmamap_sync(sc-sc_dmat, data-map, 0, data-map-dm_mapsize,
+ BUS_DMASYNC_POSTREAD);
+
DPRINTFN(4, (rx notification qid=%x idx=%d flags=%x type=%d
len=%d\n, desc-qid, desc-idx, desc-flags,
desc-type, le32toh(desc-len)));
Index: src/sys/dev/pci/if_wpivar.h
diff -u src/sys/dev/pci/if_wpivar.h:1.15 src/sys/dev/pci/if_wpivar.h:1.16
--- src/sys/dev/pci/if_wpivar.h:1.15 Tue Jan 19 22:07:02 2010
+++ src/sys/dev/pci/if_wpivar.h Tue Aug 5 21:54:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wpivar.h,v 1.15 2010/01/19 22:07:02 pooka Exp $*/
+/* $NetBSD: if_wpivar.h,v 1.16 2014/08/05 21:54:39 jmcneill Exp $*/
/*-
* Copyright (c) 2006
@@ -92,7 +92,8 @@ struct wpi_rbuf {
};
struct wpi_rx_data {
- struct mbuf *m;
+ bus_dmamap_t map;
+ struct mbuf *m;
};
struct wpi_rx_ring {
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Wed Aug 6 02:55:50 UTC 2014
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Don't check SWSM_SMBI bit if WM_F_LOCK_SWSM isn't set. Fix a problem when
using vmware with e1000e. With e1000e which is regarded as 82574L,
wm_gmii_init() fails with could not acquire SWSM SMBI message without
this change. This problem doesn't occur with real 82574L card.
TODO:
- Change the function name. It's difficult to understand. The name was
from old Intel original e1000 driver.
- Read Intel original driver again and check ALL location where semaphore is
used.
To generate a diff of this commit:
cvs rdiff -u -r1.286 -r1.287 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.286 src/sys/dev/pci/if_wm.c:1.287
--- src/sys/dev/pci/if_wm.c:1.286 Tue Aug 5 18:13:46 2014
+++ src/sys/dev/pci/if_wm.c Wed Aug 6 02:55:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.286 2014/08/05 18:13:46 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.287 2014/08/06 02:55:50 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.286 2014/08/05 18:13:46 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.287 2014/08/06 02:55:50 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -8325,21 +8325,24 @@ wm_get_swsm_semaphore(struct wm_softc *s
int32_t timeout;
uint32_t swsm;
- /* Get the SW semaphore. */
- timeout = 1000 + 1; /* XXX */
- while (timeout) {
- swsm = CSR_READ(sc, WMREG_SWSM);
+ if (sc-sc_flags WM_F_LOCK_SWSM) {
+ /* Get the SW semaphore. */
+ timeout = 1000 + 1; /* XXX */
+ while (timeout) {
+ swsm = CSR_READ(sc, WMREG_SWSM);
- if ((swsm SWSM_SMBI) == 0)
- break;
+ if ((swsm SWSM_SMBI) == 0)
+break;
- delay(50);
- timeout--;
- }
+ delay(50);
+ timeout--;
+ }
- if (timeout == 0) {
- aprint_error_dev(sc-sc_dev, could not acquire SWSM SMBI\n);
- return 1;
+ if (timeout == 0) {
+ aprint_error_dev(sc-sc_dev,
+ could not acquire SWSM SMBI\n);
+ return 1;
+ }
}
/* Get the FW semaphore. */
