date:20160225

CVS commit: [nick-nhusb] src/sys/external/bsd/dwc2

2016-02-25 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Fri Feb 26 07:36:02 UTC 2016

Modified Files:
src/sys/external/bsd/dwc2 [nick-nhusb]: dwc2var.h

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.3.12.7 -r1.3.12.8 src/sys/external/bsd/dwc2/dwc2var.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/external/bsd/dwc2/dwc2var.h
diff -u src/sys/external/bsd/dwc2/dwc2var.h:1.3.12.7 src/sys/external/bsd/dwc2/dwc2var.h:1.3.12.8
--- src/sys/external/bsd/dwc2/dwc2var.h:1.3.12.7	Thu Oct 22 11:15:42 2015
+++ src/sys/external/bsd/dwc2/dwc2var.h	Fri Feb 26 07:36:02 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: dwc2var.h,v 1.3.12.7 2015/10/22 11:15:42 skrll Exp $	*/
+/*	$NetBSD: dwc2var.h,v 1.3.12.8 2016/02/26 07:36:02 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -97,7 +97,6 @@ typedef struct dwc2_softc {
 
 	TAILQ_HEAD(, dwc2_xfer) sc_complete;	/* complete transfers */
 
-
 	pool_cache_t sc_xferpool;
 	pool_cache_t sc_qhpool;
 	pool_cache_t sc_qtdpool;

CVS commit: src/sys

2016-02-25 Thread Kengo NAKAHARA

Module Name:src
Committed By:   knakahara
Date:   Fri Feb 26 07:35:17 UTC 2016

Modified Files:
src/sys/net: if_gif.c
src/sys/netinet: ip_encap.c ip_encap.h
src/sys/netinet6: in6_gif.c in6_gif.h

Log Message:
To eliminate gif_softc_list linear search, add extra argument to 
encapsw.pr_ctlinput().


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/net/if_gif.c
cvs rdiff -u -r1.51 -r1.52 src/sys/netinet/ip_encap.c
cvs rdiff -u -r1.17 -r1.18 src/sys/netinet/ip_encap.h
cvs rdiff -u -r1.71 -r1.72 src/sys/netinet6/in6_gif.c
cvs rdiff -u -r1.13 -r1.14 src/sys/netinet6/in6_gif.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/net/if_gif.c
diff -u src/sys/net/if_gif.c:1.105 src/sys/net/if_gif.c:1.106
--- src/sys/net/if_gif.c:1.105	Mon Jan 18 06:08:26 2016
+++ src/sys/net/if_gif.c	Fri Feb 26 07:35:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_gif.c,v 1.105 2016/01/18 06:08:26 knakahara Exp $	*/
+/*	$NetBSD: if_gif.c,v 1.106 2016/02/26 07:35:17 knakahara Exp $	*/
 /*	$KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.105 2016/01/18 06:08:26 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.106 2016/02/26 07:35:17 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -90,7 +90,7 @@ static void	gifintr(void *);
 /*
  * gif global variable definitions
  */
-LIST_HEAD(, gif_softc) gif_softc_list;	/* XXX should be static */
+static LIST_HEAD(, gif_softc) gif_softc_list;
 
 static void	gif_sysctl_setup(struct sysctllog **);
 

Index: src/sys/netinet/ip_encap.c
diff -u src/sys/netinet/ip_encap.c:1.51 src/sys/netinet/ip_encap.c:1.52
--- src/sys/netinet/ip_encap.c:1.51	Tue Jan 26 05:58:05 2016
+++ src/sys/netinet/ip_encap.c	Fri Feb 26 07:35:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_encap.c,v 1.51 2016/01/26 05:58:05 knakahara Exp $	*/
+/*	$NetBSD: ip_encap.c,v 1.52 2016/02/26 07:35:17 knakahara Exp $	*/
 /*	$KAME: ip_encap.c,v 1.73 2001/10/02 08:30:58 itojun Exp $	*/
 
 /*
@@ -67,7 +67,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.51 2016/01/26 05:58:05 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_encap.c,v 1.52 2016/02/26 07:35:17 knakahara Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_mrouting.h"
@@ -676,7 +676,7 @@ encap6_ctlinput(int cmd, const struct so
 		/* XXX need to pass ep->arg or ep itself to listeners */
 		esw = ep->esw;
 		if (esw && esw->encapsw6.pr_ctlinput) {
-			(*esw->encapsw6.pr_ctlinput)(cmd, sa, d);
+			(*esw->encapsw6.pr_ctlinput)(cmd, sa, d, ep->arg);
 		}
 	}
 

Index: src/sys/netinet/ip_encap.h
diff -u src/sys/netinet/ip_encap.h:1.17 src/sys/netinet/ip_encap.h:1.18
--- src/sys/netinet/ip_encap.h:1.17	Tue Jan 26 06:00:10 2016
+++ src/sys/netinet/ip_encap.h	Fri Feb 26 07:35:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ip_encap.h,v 1.17 2016/01/26 06:00:10 knakahara Exp $	*/
+/*	$NetBSD: ip_encap.h,v 1.18 2016/02/26 07:35:17 knakahara Exp $	*/
 /*	$KAME: ip_encap.h,v 1.7 2000/03/25 07:23:37 sumikawa Exp $	*/
 
 /*
@@ -44,14 +44,14 @@ struct encapsw {
 		struct encapsw4 {
 			void	(*pr_input)	/* input to protocol (from below) */
 (struct mbuf *, int, int);
-			void*(*pr_ctlinput)	/* control input (from below) */
-(int, const struct sockaddr *, void *);
+			void	*(*pr_ctlinput)		/* control input (from below) */
+(int, const struct sockaddr *, void *, void *);
 		} _encapsw4;
 		struct encapsw6 {
 			int	(*pr_input)	/* input to protocol (from below) */
 (struct mbuf **, int *, int);
-			void	*(*pr_ctlinput)	/* control input (from below) */
-(int, const struct sockaddr *, void *);
+			void	*(*pr_ctlinput)		/* control input (from below) */
+(int, const struct sockaddr *, void *, void *);
 		} _encapsw6;
 	} encapsw46;
 };
@@ -105,6 +105,20 @@ const struct encaptab *encap_attach_func
 void	*encap6_ctlinput(int, const struct sockaddr *, void *);
 int	encap_detach(const struct encaptab *);
 void	*encap_getarg(struct mbuf *);
+
+void encap_lock_enter(void);
+void encap_lock_exit(void);
+
+#define	ENCAP_PR_WRAP_CTLINPUT(name)\
+static void *			\
+name##_wrapper(int a, const struct sockaddr *b, void *c, void *d) \
+{\
+	void *rv;		\
+	KERNEL_LOCK(1, NULL);	\
+	rv = name(a, b, c, d);	\
+	KERNEL_UNLOCK_ONE(NULL);\
+	return rv;		\
+}
 #endif
 
 #endif /* !_NETINET_IP_ENCAP_H_ */

Index: src/sys/netinet6/in6_gif.c
diff -u src/sys/netinet6/in6_gif.c:1.71 src/sys/netinet6/in6_gif.c:1.72
--- src/sys/netinet6/in6_gif.c:1.71	Tue Jan 26 05:58:05 2016
+++ src/sys/netinet6/in6_gif.c	Fri Feb 26 07:35:17 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: in6_gif.c,v 1.71 2016/01/26 05:58:05 knakahara Exp $	*/
+/*	$NetBSD: in6_gif.c,v 1.72 2016/02/26 07:35:17 knakahara Exp $	*/
 /*	$KAME: in6_gif.c,v 1.62 2001/07/29 04:27:25 itojun Exp $	*/
 
 /*
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0,

CVS commit: src/sys/dev/sbus

2016-02-25 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Thu Feb 25 17:09:39 UTC 2016

Modified Files:
src/sys/dev/sbus: mgx.c

Log Message:
Mark mgx_wait_host explicitly as unused.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/sbus/mgx.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/sbus/mgx.c
diff -u src/sys/dev/sbus/mgx.c:1.6 src/sys/dev/sbus/mgx.c:1.7
--- src/sys/dev/sbus/mgx.c:1.6	Thu Feb 11 20:53:06 2016
+++ src/sys/dev/sbus/mgx.c	Thu Feb 25 17:09:39 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: mgx.c,v 1.6 2016/02/11 20:53:06 macallan Exp $ */
+/*	$NetBSD: mgx.c,v 1.7 2016/02/25 17:09:39 joerg Exp $ */
 
 /*-
  * Copyright (c) 2014 Michael Lorenz
@@ -29,7 +29,7 @@
 /* a console driver for the SSB 4096V-MGX graphics card */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mgx.c,v 1.6 2016/02/11 20:53:06 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mgx.c,v 1.7 2016/02/25 17:09:39 joerg Exp $");
 
 #include 
 #include 
@@ -104,7 +104,7 @@ static void	mgx_init_palette(struct mgx_
 static int	mgx_putcmap(struct mgx_softc *, struct wsdisplay_cmap *);
 static int 	mgx_getcmap(struct mgx_softc *, struct wsdisplay_cmap *);
 static int	mgx_wait_engine(struct mgx_softc *);
-static int	mgx_wait_host(struct mgx_softc *);
+__unused static int	mgx_wait_host(struct mgx_softc *);
 static int	mgx_wait_fifo(struct mgx_softc *, unsigned int);
 
 static void	mgx_bitblt(void *, int, int, int, int, int, int, int);

CVS commit: src/lib/libedit

2016-02-25 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Feb 25 14:59:22 UTC 2016

Modified Files:
src/lib/libedit: editline.3

Log Message:
Use \- for minus sign, use Ev, use Er.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/lib/libedit/editline.3

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libedit/editline.3
diff -u src/lib/libedit/editline.3:1.87 src/lib/libedit/editline.3:1.88
--- src/lib/libedit/editline.3:1.87	Wed Feb 24 19:45:48 2016
+++ src/lib/libedit/editline.3	Thu Feb 25 14:59:22 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: editline.3,v 1.87 2016/02/24 19:45:48 christos Exp $
+.\"	$NetBSD: editline.3,v 1.88 2016/02/25 14:59:22 wiz Exp $
 .\"
 .\" Copyright (c) 1997-2014 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -177,7 +177,7 @@ Programs should be linked with
 The
 .Nm
 library respects the
-.Dv LC_CTYPE
+.Ev LC_CTYPE
 locale set by the application program and never uses
 .Xr setlocale 3
 to change the locale.
@@ -259,10 +259,10 @@ if that is not empty, and store it in
 If an invalid or incomplete character is found, it is discarded,
 .Va errno
 is set to
-.Dv EILSEQ ,
+.Er EILSEQ ,
 and the next character is read and stored in
 .Fa ch .
-Returns 1 if a valid character was read, 0 on end of file, or -1 on
+Returns 1 if a valid character was read, 0 on end of file, or \-1 on
 .Xr read 2
 failure.
 In the latter case,
@@ -271,7 +271,7 @@ is set to indicate the error.
 .It Fn el_getc
 Read a wide character as described for
 .Fn el_wgetc
-and return 0 on end of file or -1 on failure.
+and return 0 on end of file or \-1 on failure.
 If the wide character can be represented as a single-byte character,
 convert it with
 .Xr wctob 3 ,
@@ -280,8 +280,8 @@ store the result in
 and return 1; otherwise, set
 .Va errno
 to
-.Dv ERANGE
-and return -1.
+.Er ERANGE
+and return \-1.
 In the C or POSIX locale, this simply reads a byte, but for any other
 locale, including UTF-8, this is rarely useful.
 .It Fn el_push

CVS commit: src/usr.bin/indent

2016-02-25 Thread Thomas Klausner

Module Name:src
Committed By:   wiz
Date:   Thu Feb 25 14:55:56 UTC 2016

Modified Files:
src/usr.bin/indent: indent.1

Log Message:
Remove trailing whitespace.


To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/indent/indent.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/indent/indent.1
diff -u src/usr.bin/indent/indent.1:1.25 src/usr.bin/indent/indent.1:1.26
--- src/usr.bin/indent/indent.1:1.25	Wed Feb 24 17:38:15 2016
+++ src/usr.bin/indent/indent.1	Thu Feb 25 14:55:56 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: indent.1,v 1.25 2016/02/24 17:38:15 ginsbach Exp $
+.\"	$NetBSD: indent.1,v 1.26 2016/02/25 14:55:56 wiz Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -141,7 +141,7 @@ checks to make sure it is different from
 If no
 .Ar input-file
 is specified
-input is read from stdin and the formatted file is written to stdout. 
+input is read from stdin and the formatted file is written to stdout.
 .Pp
 The options listed below control the formatting style imposed by
 .Nm .

CVS commit: src/sys/arch/arm/imx

2016-02-25 Thread Ryo Shimizu

Module Name:src
Committed By:   ryo
Date:   Thu Feb 25 13:27:33 UTC 2016

Modified Files:
src/sys/arch/arm/imx: imx6_ahcisata.c

Log Message:
fix always false comparison.

pointed out by joerg@


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/imx6_ahcisata.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/arm/imx/imx6_ahcisata.c
diff -u src/sys/arch/arm/imx/imx6_ahcisata.c:1.2 src/sys/arch/arm/imx/imx6_ahcisata.c:1.3
--- src/sys/arch/arm/imx/imx6_ahcisata.c:1.2	Mon Oct  6 10:27:13 2014
+++ src/sys/arch/arm/imx/imx6_ahcisata.c	Thu Feb 25 13:27:33 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_ahcisata.c,v 1.2 2014/10/06 10:27:13 ryo Exp $	*/
+/*	$NetBSD: imx6_ahcisata.c,v 1.3 2016/02/25 13:27:33 ryo Exp $	*/
 
 /*
  * Copyright (c) 2014 Ryo Shimizu 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: imx6_ahcisata.c,v 1.2 2014/10/06 10:27:13 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_ahcisata.c,v 1.3 2016/02/25 13:27:33 ryo Exp $");
 
 #include "locators.h"
 #include "opt_imx.h"
@@ -259,7 +259,7 @@ static int
 ixm6_ahcisata_init(struct imx_ahci_softc *sc)
 {
 	uint32_t v;
-	int timeout;
+	int timeout, pllstat;
 
 	/* AHCISATA clock enable */
 	v = imx6_ccm_read(CCM_CCGR5);
@@ -308,13 +308,13 @@ ixm6_ahcisata_init(struct imx_ahci_softc
 
 	for (timeout = 50; timeout > 0; --timeout) {
 		delay(100);
-		v = imx6_ahcisata_phy_read(sc, SATA_PHY_LANE0_OUT_STAT);
-		if (v < 0) {
+		pllstat = imx6_ahcisata_phy_read(sc, SATA_PHY_LANE0_OUT_STAT);
+		if (pllstat < 0) {
 			aprint_error_dev(sc->sc_dev,
 			"cannot read LANE0 status\n");
 			break;
 		}
-		if (v & SATA_PHY_LANE0_OUT_STAT_RX_PLL_STATE)
+		if (pllstat & SATA_PHY_LANE0_OUT_STAT_RX_PLL_STATE)
 			break;
 	}
 	if (timeout <= 0)

CVS commit: src/usr.bin/indent

2016-02-25 Thread Brian Ginsbach

Module Name:src
Committed By:   ginsbach
Date:   Thu Feb 25 13:23:27 UTC 2016

Modified Files:
src/usr.bin/indent: indent.c io.c pr_comment.c

Log Message:
Fix obvious contraction spelling mistakes by adding missing apostrophes.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/indent/indent.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/indent/io.c
cvs rdiff -u -r1.9 -r1.10 src/usr.bin/indent/pr_comment.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/indent/indent.c
diff -u src/usr.bin/indent/indent.c:1.21 src/usr.bin/indent/indent.c:1.22
--- src/usr.bin/indent/indent.c:1.21	Mon Feb 22 22:01:48 2016
+++ src/usr.bin/indent/indent.c	Thu Feb 25 13:23:27 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: indent.c,v 1.21 2016/02/22 22:01:48 ginsbach Exp $	*/
+/*	$NetBSD: indent.c,v 1.22 2016/02/25 13:23:27 ginsbach Exp $	*/
 
 /*
  * Copyright (c) 1980, 1993
@@ -75,7 +75,7 @@ __COPYRIGHT("@(#) Copyright (c) 1985 Sun
 #if 0
 static char sccsid[] = "@(#)indent.c	5.17 (Berkeley) 6/7/93";
 #else
-__RCSID("$NetBSD: indent.c,v 1.21 2016/02/22 22:01:48 ginsbach Exp $");
+__RCSID("$NetBSD: indent.c,v 1.22 2016/02/25 13:23:27 ginsbach Exp $");
 #endif
 #endif/* not lint */
 
@@ -260,7 +260,7 @@ main(int argc, char **argv)
 		}
 	}
 	if (ps.com_ind <= 1)
-		ps.com_ind = 2;	/* dont put normal comments before column 2 */
+		ps.com_ind = 2;	/* don't put normal comments before column 2 */
 	if (troff) {
 		if (bodyf.font[0] == 0)
 			parsefont(, "R");
@@ -355,7 +355,7 @@ main(int argc, char **argv)
 			case lbrace:	/* this is a brace that starts the
 	 * compound stmt */
 if (sc_end == 0) {	/* ignore buffering if a
-			 * comment wasnt stored
+			 * comment wasn't stored
 			 * up */
 	ps.search_brace = false;
 	goto check_type;
@@ -420,7 +420,7 @@ main(int argc, char **argv)
 	force_nl = false;
 
 if (sc_end == 0) {	/* ignore buffering if
-			 * comment wasnt saved
+			 * comment wasn't saved
 			 * up */
 	ps.search_brace = false;
 	goto check_type;
@@ -503,7 +503,7 @@ check_type:
 	diag(0, "Line broken");
 flushed_nl = false;
 dump_line();
-ps.want_blank = false;	/* dont insert blank at
+ps.want_blank = false;	/* don't insert blank at
 			 * line start */
 force_nl = false;
 			}
@@ -623,7 +623,7 @@ check_type:
 ps.last_u_d = true;	/* inform lexi that a
 			 * following operator is
 			 * unary */
-ps.in_stmt = false;	/* dont use stmt
+ps.in_stmt = false;	/* don't use stmt
 			 * continuation
 			 * indentation */
 
@@ -785,8 +785,8 @@ check_type:
 
 			ps.in_decl = (ps.dec_nest > 0);	/* if we were in a first
 			 * level structure
-			 * declaration, we arent
-			 * any more */
+			 * declaration, we
+			 * aren't any more */
 
 			if ((!sp_sw || hd_type != forstmt) && ps.p_l_follow > 0) {
 
@@ -801,8 +801,8 @@ check_type:
 		 * while, etc. with unbalanced
 		 * parens */
 	sp_sw = false;
-	parse(hd_type);	/* dont lose the if, or
-			 * whatever */
+	parse(hd_type);	/* don't lose the if,
+			 * or whatever */
 }
 			}
 			*e_code++ = ';';
@@ -819,7 +819,7 @@ check_type:
 			break;
 
 		case lbrace:	/* got a '{' */
-			ps.in_stmt = false;	/* dont indent the {} */
+			ps.in_stmt = false;	/* don't indent the {} */
 			if (!ps.block_init)
 force_nl = true;	/* force other stuff on
 			 * same line as '{' onto
@@ -856,7 +856,7 @@ check_type:
 }
 			}
 			if (s_code == e_code)
-ps.ind_stmt = false;	/* dont put extra
+ps.ind_stmt = false;	/* don't put extra
 			 * indentation on line
 			 * with '{' */
 			if (ps.in_decl && ps.in_or_st) {	/* this is either a
@@ -865,9 +865,9 @@ check_type:
 di_stack[ps.dec_nest++] = dec_ind;
 /* ?		dec_ind = 0; */
 			} else {
-ps.decl_on_line = false;	/* we cant be in the
+ps.decl_on_line = false;	/* we can't be in the
  * middle of a
- * declaration, so dont
+ * declaration, so don't
  * do special
  * indentation of
  * comments */
@@ -1088,7 +1088,7 @@ check_type:
 		case period:	/* treat a period kind of like a binary
  * operation */
 			*e_code++ = '.';	/* move the period into line */
-			ps.want_blank = false;	/* dont put a blank after a
+			ps.want_blank = false;	/* don't put a blank after a
 		 * period */
 			break;
 
@@ -1256,7 +1256,7 @@ check_type:
 		 * line here */
 flushed_nl = false;
 dump_line();
-ps.want_blank = false;	/* dont insert blank at
+ps.want_blank = false;	/* don't insert blank at
 			 * line start */
 force_nl = false;
 			}

Index: src/usr.bin/indent/io.c
diff -u src/usr.bin/indent/io.c:1.16 src/usr.bin/indent/io.c:1.17
--- src/usr.bin/indent/io.c:1.16	Mon Feb 22 19:04:18 2016
+++ src/usr.bin/indent/io.c	Thu Feb 25 13:23:27 2016
@@ -1,4 +1,4 @@
-/*

CVS commit: [nick-nhusb] src/sys/dev/usb

2016-02-25 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu Feb 25 12:52:09 UTC 2016

Modified Files:
src/sys/dev/usb [nick-nhusb]: ohci.c

Log Message:
Remove the big delay / dump ED/TD state debug code.


To generate a diff of this commit:
cvs rdiff -u -r1.254.2.48 -r1.254.2.49 src/sys/dev/usb/ohci.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.254.2.48 src/sys/dev/usb/ohci.c:1.254.2.49
--- src/sys/dev/usb/ohci.c:1.254.2.48	Wed Feb 24 09:06:04 2016
+++ src/sys/dev/usb/ohci.c	Thu Feb 25 12:52:09 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ohci.c,v 1.254.2.48 2016/02/24 09:06:04 skrll Exp $	*/
+/*	$NetBSD: ohci.c,v 1.254.2.49 2016/02/25 12:52:09 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.48 2016/02/24 09:06:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.254.2.49 2016/02/25 12:52:09 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -2976,22 +2976,6 @@ ohci_device_ctrl_start(struct usbd_xfer 
 			ohci_timeout, xfer);
 	}
 
-#ifdef OHCI_DEBUG
-	DPRINTFN(20, "--- dump start ---", 0, 0, 0, 0);
-	if (ohcidebug >= 20) {
-		delay(1);
-		DPRINTFN(20, "status=%x", OREAD4(sc, OHCI_COMMAND_STATUS),
-		0, 0, 0);
-		ohci_dumpregs(sc);
-		DPRINTFN(20, "ctrl head:", 0, 0, 0, 0);
-		ohci_dump_ed(sc, sc->sc_ctrl_head);
-		DPRINTF("sed:", 0, 0, 0, 0);
-		ohci_dump_ed(sc, sed);
-		ohci_dump_tds(sc, setup);
-	}
-	DPRINTFN(20, "--- dump start ---", 0, 0, 0, 0);
-#endif
-
 	DPRINTF("done", 0, 0, 0, 0);
 
 	mutex_exit(>sc_lock);
@@ -3748,16 +3732,6 @@ ohci_device_isoc_enter(struct usbd_xfer 
 	sizeof(sed->ed.ed_flags),
 	BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
 	mutex_exit(>sc_lock);
-
-#ifdef OHCI_DEBUG
-	if (ohcidebug >= 5) {
-		delay(15);
-		DPRINTF("after frame=%d", O32TOH(sc->sc_hcca->hcca_frame_number),
-		0, 0, 0);
-		ohci_dump_itds(sc, xfer->ux_hcpriv);
-		ohci_dump_ed(sc, sed);
-	}
-#endif
 }
 
 usbd_status

CVS commit: src/external/gpl3

2016-02-25 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Thu Feb 25 12:36:36 UTC 2016

Modified Files:
src/external/gpl3/binutils.old/dist/gas/config: tc-sparc.c
src/external/gpl3/binutils/dist/gas/config: tc-sparc.c

Log Message:
SPARC before v8 requires a nop instruction between a floating point
instruction and a floating point branch.  SPARCv8 requires a nop only
immediately after FPop2 (fcmp*) instructions. Adjust the logic to
properly implement the v8 rules when targetting a less ancient
architecture.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/gpl3/binutils.old/dist/gas/config/tc-sparc.c
cvs rdiff -u -r1.1.1.4 -r1.2 \
src/external/gpl3/binutils/dist/gas/config/tc-sparc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/binutils.old/dist/gas/config/tc-sparc.c
diff -u src/external/gpl3/binutils.old/dist/gas/config/tc-sparc.c:1.1.1.1 src/external/gpl3/binutils.old/dist/gas/config/tc-sparc.c:1.2
--- src/external/gpl3/binutils.old/dist/gas/config/tc-sparc.c:1.1.1.1	Tue Jan 26 17:26:18 2016
+++ src/external/gpl3/binutils.old/dist/gas/config/tc-sparc.c	Thu Feb 25 12:36:36 2016
@@ -1348,13 +1348,17 @@ md_assemble (char *str)
 	  || (last_opcode & ANNUL) == 0))
 as_warn (_("FP branch in delay slot"));
 
-  /* SPARC before v9 requires a nop instruction between a floating
- point instruction and a floating point branch.  We insert one
- automatically, with a warning.  */
-  if (max_architecture < SPARC_OPCODE_ARCH_V9
-  && last_insn != NULL
+  /* SPARC before v8 requires a nop instruction between a floating
+ point instruction and a floating point branch.  SPARCv8 requires
+ a nop only immediately after FPop2 (fcmp*) instructions.
+ We insert one automatically, with a warning.
+   */
+  if (last_insn != NULL
   && (insn->flags & F_FBR) != 0
-  && (last_insn->flags & F_FLOAT) != 0)
+  && (last_insn->flags & F_FLOAT) != 0
+  && (max_architecture < SPARC_OPCODE_ARCH_V8 ||
+  (max_architecture < SPARC_OPCODE_ARCH_V9 &&
+   strncmp(last_insn->name, "fcmp", 4) == 0)))
 {
   struct sparc_it nop_insn;
 

Index: src/external/gpl3/binutils/dist/gas/config/tc-sparc.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-sparc.c:1.1.1.4 src/external/gpl3/binutils/dist/gas/config/tc-sparc.c:1.2
--- src/external/gpl3/binutils/dist/gas/config/tc-sparc.c:1.1.1.4	Fri Jan 29 12:44:35 2016
+++ src/external/gpl3/binutils/dist/gas/config/tc-sparc.c	Thu Feb 25 12:36:36 2016
@@ -1402,13 +1402,17 @@ md_assemble (char *str)
 	  || (last_opcode & ANNUL) == 0))
 as_warn (_("FP branch in delay slot"));
 
-  /* SPARC before v9 requires a nop instruction between a floating
- point instruction and a floating point branch.  We insert one
- automatically, with a warning.  */
-  if (max_architecture < SPARC_OPCODE_ARCH_V9
-  && last_insn != NULL
+  /* SPARC before v8 requires a nop instruction between a floating
+ point instruction and a floating point branch.  SPARCv8 requires
+ a nop only immediately after FPop2 (fcmp*) instructions.
+ We insert one automatically, with a warning.
+   */
+  if (last_insn != NULL
   && (insn->flags & F_FBR) != 0
-  && (last_insn->flags & F_FLOAT) != 0)
+  && (last_insn->flags & F_FLOAT) != 0
+  && (max_architecture < SPARC_OPCODE_ARCH_V8 ||
+  (max_architecture < SPARC_OPCODE_ARCH_V9 &&
+   strncmp(last_insn->name, "fcmp", 4) == 0)))
 {
   struct sparc_it nop_insn;

CVS commit: src/sys/arch/evbarm/nitrogen6

2016-02-25 Thread Joerg Sonnenberger

Module Name:src
Committed By:   joerg
Date:   Thu Feb 25 12:22:30 UTC 2016

Modified Files:
src/sys/arch/evbarm/nitrogen6: nitrogen6_machdep.c

Log Message:
Garbage collect unused variables comcnaddr, comcnspeed and comcnmode.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c
diff -u src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.5 src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.6
--- src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c:1.5	Thu Dec 31 12:14:01 2015
+++ src/sys/arch/evbarm/nitrogen6/nitrogen6_machdep.c	Thu Feb 25 12:22:30 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: nitrogen6_machdep.c,v 1.5 2015/12/31 12:14:01 ryo Exp $	*/
+/*	$NetBSD: nitrogen6_machdep.c,v 1.6 2016/02/25 12:22:30 joerg Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.5 2015/12/31 12:14:01 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nitrogen6_machdep.c,v 1.6 2016/02/25 12:22:30 joerg Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
@@ -97,10 +97,6 @@ u_int uboot_args[4] = { 0 };
 void nitrogen6_setup_iomux(void);
 void nitrogen6_device_register(device_t, void *);
 
-static const bus_addr_t comcnaddr = (bus_addr_t)CONADDR;
-static const int comcnspeed = CONSPEED;
-static const int comcnmode = CONMODE | CLOCAL;
-
 #ifdef KGDB
 #include 
 #endif

CVS commit: src/sys/external/bsd/common/conf

2016-02-25 Thread Nick Hudson

Module Name:src
Committed By:   skrll
Date:   Thu Feb 25 08:51:54 UTC 2016

Added Files:
src/sys/external/bsd/common/conf: files.linux

Log Message:
Missed this file in the linux_work move.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/sys/external/bsd/common/conf/files.linux

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/common/conf/files.linux
diff -u /dev/null src/sys/external/bsd/common/conf/files.linux:1.1
--- /dev/null	Thu Feb 25 08:51:54 2016
+++ src/sys/external/bsd/common/conf/files.linux	Thu Feb 25 08:51:54 2016
@@ -0,0 +1,7 @@
+#   $NetBSD: files.linux,v 1.1 2016/02/25 08:51:54 skrll Exp $
+
+define	linux
+
+makeoptions 	linux	CPPFLAGS+="-I$S/external/bsd/common/include"
+
+file	external/bsd/common/linux/linux_work.c		linux

CVS commit: [nick-nhusb] src/sys/external/bsd/dwc2

CVS commit: src/sys

CVS commit: src/sys/dev/sbus

CVS commit: src/lib/libedit

CVS commit: src/usr.bin/indent

CVS commit: src/sys/arch/arm/imx

CVS commit: src/usr.bin/indent

CVS commit: [nick-nhusb] src/sys/dev/usb

CVS commit: src/external/gpl3

CVS commit: src/sys/arch/evbarm/nitrogen6

CVS commit: src/sys/external/bsd/common/conf

11 matches

Site Navigation

Mail list logo

Footer information