CVS commit: src/share/man/man9

2016-04-08 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Sat Apr  9 05:16:23 UTC 2016

Modified Files:
src/share/man/man9: pslist.9

Log Message:
Fix name of example list head.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man9/pslist.9

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

Modified files:

Index: src/share/man/man9/pslist.9
diff -u src/share/man/man9/pslist.9:1.1 src/share/man/man9/pslist.9:1.2
--- src/share/man/man9/pslist.9:1.1	Sat Apr  9 04:39:46 2016
+++ src/share/man/man9/pslist.9	Sat Apr  9 05:16:23 2016
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pslist.9,v 1.1 2016/04/09 04:39:46 riastradh Exp $
+.\"	$NetBSD: pslist.9,v 1.2 2016/04/09 05:16:23 riastradh Exp $
 .\"
 .\" Copyright (c) 2016 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -375,7 +375,7 @@ Create and publish a frotz:
 
 	/* Publish it.  */
 	mutex_enter(\*[Am]frobbotzim.lock);
-	PSLIST_WRITER_INSERT_HEAD(\*[Am]frobbotzim.head, f, f_entry);
+	PSLIST_WRITER_INSERT_HEAD(\*[Am]frobbotzim.list, f, f_entry);
 	mutex_exit(\*[Am]frobbotzim.lock);
 .Ed
 .Pp
@@ -387,7 +387,7 @@ Look up a frotz and return its associate
 	int s;
 
 	s = pserialize_read_enter();
-	PSLIST_READER_FOREACH(f, \*[Am]frobbotzim.head, struct frotz, f_entry) {
+	PSLIST_READER_FOREACH(f, \*[Am]frobbotzim.list, struct frotz, f_entry) {
 		if (f->f_key == key) {
 			*datump = f->f_datum;
 			error = 0;



CVS commit: src/tests/include/sys

2016-04-08 Thread Taylor R Campbell
Module Name:src
Committed By:   riastradh
Date:   Fri Apr  8 21:53:10 UTC 2016

Modified Files:
src/tests/include/sys: Makefile

Log Message:
Make this list diff- and sort-friendlier.

No functional change.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/include/sys/Makefile

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

Modified files:

Index: src/tests/include/sys/Makefile
diff -u src/tests/include/sys/Makefile:1.9 src/tests/include/sys/Makefile:1.10
--- src/tests/include/sys/Makefile:1.9	Sat Jan 23 21:22:48 2016
+++ src/tests/include/sys/Makefile	Fri Apr  8 21:53:10 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/01/23 21:22:48 christos Exp $
+# $NetBSD: Makefile,v 1.10 2016/04/08 21:53:10 riastradh Exp $
 
 NOMAN=		# defined
 
@@ -6,7 +6,11 @@ NOMAN=		# defined
 
 TESTSDIR=		${TESTSBASE}/include/sys
 
-TESTS_C=		t_bitops t_bootblock t_cdefs t_tree t_types
+TESTS_C+=		t_bitops
+TESTS_C+=		t_bootblock
+TESTS_C+=		t_cdefs
+TESTS_C+=		t_tree
+TESTS_C+=		t_types
 
 LDADD.t_bitops+=	-lm
 



CVS commit: src/sys/dev/ic

2016-04-08 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Fri Apr  8 14:52:56 UTC 2016

Modified Files:
src/sys/dev/ic: ath.c

Log Message:
Revert prior.


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/dev/ic/ath.c

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

Modified files:

Index: src/sys/dev/ic/ath.c
diff -u src/sys/dev/ic/ath.c:1.118 src/sys/dev/ic/ath.c:1.119
--- src/sys/dev/ic/ath.c:1.118	Wed Apr  6 15:10:35 2016
+++ src/sys/dev/ic/ath.c	Fri Apr  8 14:52:56 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ath.c,v 1.118 2016/04/06 15:10:35 roy Exp $	*/
+/*	$NetBSD: ath.c,v 1.119 2016/04/08 14:52:56 roy Exp $	*/
 
 /*-
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -41,7 +41,7 @@
 __FBSDID("$FreeBSD: src/sys/dev/ath/if_ath.c,v 1.104 2005/09/16 10:09:23 ru Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.118 2016/04/06 15:10:35 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ath.c,v 1.119 2016/04/08 14:52:56 roy Exp $");
 #endif
 
 /*
@@ -158,7 +158,7 @@ static int	ath_desc_alloc(struct ath_sof
 static void	ath_desc_free(struct ath_softc *);
 static struct ieee80211_node *ath_node_alloc(struct ieee80211_node_table *);
 static void	ath_node_free(struct ieee80211_node *);
-static int8_t	ath_node_getrssi(const struct ieee80211_node *);
+static u_int8_t	ath_node_getrssi(const struct ieee80211_node *);
 static int	ath_rxbuf_init(struct ath_softc *, struct ath_buf *);
 static void	ath_recv_mgmt(struct ieee80211com *ic, struct mbuf *m,
 			struct ieee80211_node *ni,
@@ -2797,7 +2797,7 @@ ath_node_free(struct ieee80211_node *ni)
 	sc->sc_node_free(ni);
 }
 
-static int8_t
+static u_int8_t
 ath_node_getrssi(const struct ieee80211_node *ni)
 {
 #define	HAL_EP_RND(x, mul) \



CVS commit: src/sys/net80211

2016-04-08 Thread Roy Marples
Module Name:src
Committed By:   roy
Date:   Fri Apr  8 14:30:47 UTC 2016

Modified Files:
src/sys/net80211: ieee80211_ioctl.h ieee80211_node.c ieee80211_node.h
ieee80211_rssadapt.h ieee80211_var.h

Log Message:
Revert prior.


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/net80211/ieee80211_ioctl.h
cvs rdiff -u -r1.70 -r1.71 src/sys/net80211/ieee80211_node.c
cvs rdiff -u -r1.26 -r1.27 src/sys/net80211/ieee80211_node.h
cvs rdiff -u -r1.8 -r1.9 src/sys/net80211/ieee80211_rssadapt.h
cvs rdiff -u -r1.29 -r1.30 src/sys/net80211/ieee80211_var.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/net80211/ieee80211_ioctl.h
diff -u src/sys/net80211/ieee80211_ioctl.h:1.22 src/sys/net80211/ieee80211_ioctl.h:1.23
--- src/sys/net80211/ieee80211_ioctl.h:1.22	Wed Apr  6 14:42:16 2016
+++ src/sys/net80211/ieee80211_ioctl.h	Fri Apr  8 14:30:47 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee80211_ioctl.h,v 1.22 2016/04/06 14:42:16 roy Exp $	*/
+/*	$NetBSD: ieee80211_ioctl.h,v 1.23 2016/04/08 14:30:47 roy Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -356,7 +356,7 @@ struct ieee80211req_sta_info {
 	u_int16_t	isi_flags;		/* channel flags */
 	u_int16_t	isi_state;		/* state flags */
 	u_int8_t	isi_authmode;		/* authentication algorithm */
-	int8_t		isi_rssi;
+	u_int8_t	isi_rssi;
 	u_int8_t	isi_capinfo;		/* capabilities */
 	u_int8_t	isi_erp;		/* ERP element */
 	u_int8_t	isi_macaddr[IEEE80211_ADDR_LEN];
@@ -524,8 +524,8 @@ struct ieee80211req_scan_result {
 	u_int16_t	isr_len;		/* length (mult of 4) */
 	u_int16_t	isr_freq;		/* MHz */
 	u_int16_t	isr_flags;		/* channel flags */
-	int8_t		isr_noise;
-	int8_t		isr_rssi;
+	u_int8_t	isr_noise;
+	u_int8_t	isr_rssi;
 	u_int8_t	isr_intval;		/* beacon interval */
 	u_int8_t	isr_capinfo;		/* capabilities */
 	u_int8_t	isr_erp;		/* ERP element */

Index: src/sys/net80211/ieee80211_node.c
diff -u src/sys/net80211/ieee80211_node.c:1.70 src/sys/net80211/ieee80211_node.c:1.71
--- src/sys/net80211/ieee80211_node.c:1.70	Wed Apr  6 14:42:16 2016
+++ src/sys/net80211/ieee80211_node.c	Fri Apr  8 14:30:47 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee80211_node.c,v 1.70 2016/04/06 14:42:16 roy Exp $	*/
+/*	$NetBSD: ieee80211_node.c,v 1.71 2016/04/08 14:30:47 roy Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_node.c,v 1.65 2005/08/13 17:50:21 sam Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_node.c,v 1.70 2016/04/06 14:42:16 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_node.c,v 1.71 2016/04/08 14:30:47 roy Exp $");
 #endif
 
 #ifdef _KERNEL_OPT
@@ -85,7 +85,7 @@ __KERNEL_RCSID(0, "$NetBSD: ieee80211_no
 static struct ieee80211_node *node_alloc(struct ieee80211_node_table *);
 static void node_cleanup(struct ieee80211_node *);
 static void node_free(struct ieee80211_node *);
-static int8_t node_getrssi(const struct ieee80211_node *);
+static u_int8_t node_getrssi(const struct ieee80211_node *);
 
 static void ieee80211_setup_node(struct ieee80211_node_table *,
 		struct ieee80211_node *, const u_int8_t *);
@@ -589,7 +589,7 @@ ieee80211_node_compare(struct ieee80211c
 		   const struct ieee80211_node *b)
 {
 	u_int8_t maxa, maxb;
-	int8_t rssia, rssib;
+	u_int8_t rssia, rssib;
 	int weight;
 
 	/* privacy support preferred */
@@ -1001,7 +1001,7 @@ node_free(struct ieee80211_node *ni)
 	free(ni, M_80211_NODE);
 }
 
-static int8_t
+static u_int8_t
 node_getrssi(const struct ieee80211_node *ni)
 {
 	return ni->ni_rssi;
@@ -2347,12 +2347,12 @@ done:
 		ieee80211_free_node(ni);
 }
 
-int8_t
+u_int8_t
 ieee80211_getrssi(struct ieee80211com *ic)
 {
 #define	NZ(x)	((x) == 0 ? 1 : (x))
 	struct ieee80211_node_table *nt = >ic_sta;
-	int32_t rssi_samples, rssi_total;
+	u_int32_t rssi_samples, rssi_total;
 	struct ieee80211_node *ni;
 
 	rssi_total = 0;

Index: src/sys/net80211/ieee80211_node.h
diff -u src/sys/net80211/ieee80211_node.h:1.26 src/sys/net80211/ieee80211_node.h:1.27
--- src/sys/net80211/ieee80211_node.h:1.26	Wed Apr  6 14:42:16 2016
+++ src/sys/net80211/ieee80211_node.h	Fri Apr  8 14:30:47 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: ieee80211_node.h,v 1.26 2016/04/06 14:42:16 roy Exp $	*/
+/*	$NetBSD: ieee80211_node.h,v 1.27 2016/04/08 14:30:47 roy Exp $	*/
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -120,7 +120,7 @@ struct ieee80211_node {
 
 	/* hardware */
 	u_int32_t		ni_rstamp;	/* recv timestamp */
-	int8_t			ni_rssi;	/* recv ssi */
+	u_int8_t		ni_rssi;	/* recv ssi */
 
 	/* header */
 	u_int8_t		ni_macaddr[IEEE80211_ADDR_LEN];
@@ -286,7 +286,7 @@ struct ieee80211_node *ieee80211_fakeup_
 		struct ieee80211_node_table *, const u_int8_t macaddr[]);
 void	ieee80211_node_join(struct 

CVS commit: src/sys/net

2016-04-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Apr  8 12:01:22 UTC 2016

Modified Files:
src/sys/net: rtsock.c

Log Message:
- remove printf
- fix indent


To generate a diff of this commit:
cvs rdiff -u -r1.181 -r1.182 src/sys/net/rtsock.c

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

Modified files:

Index: src/sys/net/rtsock.c
diff -u src/sys/net/rtsock.c:1.181 src/sys/net/rtsock.c:1.182
--- src/sys/net/rtsock.c:1.181	Thu Apr  7 17:41:02 2016
+++ src/sys/net/rtsock.c	Fri Apr  8 08:01:22 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: rtsock.c,v 1.181 2016/04/07 21:41:02 christos Exp $	*/
+/*	$NetBSD: rtsock.c,v 1.182 2016/04/08 12:01:22 christos Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.181 2016/04/07 21:41:02 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rtsock.c,v 1.182 2016/04/08 12:01:22 christos Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -471,7 +471,7 @@ route_get_sdl(const struct ifnet *ifp, c
 	? >ll_addr : NULL;
 
 	a = sockaddr_dl_init(sdl, sizeof(*sdl), ifp->if_index, ifp->if_type,
-		NULL, 0, a, ifp->if_addrlen);
+	NULL, 0, a, ifp->if_addrlen);
 	KASSERT(a != NULL);
 
 	if (la != NULL) {
@@ -1028,7 +1028,6 @@ COMPATNAME(rt_msg1)(int type, struct rt_
 	rtm->rtm_msglen = len;
 	rtm->rtm_version = RTM_XVERSION;
 	rtm->rtm_type = type;
-printf("%s: type=%#x len=%d\n", __func__, type, len);
 	return m;
 out:
 	m_freem(m);



CVS commit: src/external/bsd/blacklist/port

2016-04-08 Thread Christos Zoulas
Module Name:src
Committed By:   christos
Date:   Fri Apr  8 11:56:43 UTC 2016

Modified Files:
src/external/bsd/blacklist/port: config.h

Log Message:
remove HAVE_FPARSELN


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/blacklist/port/config.h

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

Modified files:

Index: src/external/bsd/blacklist/port/config.h
diff -u src/external/bsd/blacklist/port/config.h:1.1 src/external/bsd/blacklist/port/config.h:1.2
--- src/external/bsd/blacklist/port/config.h:1.1	Tue Apr  5 08:28:57 2016
+++ src/external/bsd/blacklist/port/config.h	Fri Apr  8 07:56:43 2016
@@ -1,4 +1,3 @@
 #if defined(__FreeBSD__)
-#define HAVE_FPARSELN
 #include "port.h"
 #endif



CVS commit: src

2016-04-08 Thread Andreas Gustafsson
Module Name:src
Committed By:   gson
Date:   Fri Apr  8 10:09:16 UTC 2016

Modified Files:
src/distrib/sets/lists/tests: mi
src/etc/mtree: NetBSD.dist.tests
src/tests/usr.bin: Makefile
Added Files:
src/tests/usr.bin/gdb: Makefile t_regress.sh

Log Message:
Add regression tests for some past gdb bugs.


To generate a diff of this commit:
cvs rdiff -u -r1.670 -r1.671 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.125 -r1.126 src/etc/mtree/NetBSD.dist.tests
cvs rdiff -u -r1.20 -r1.21 src/tests/usr.bin/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/usr.bin/gdb/Makefile \
src/tests/usr.bin/gdb/t_regress.sh

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

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.670 src/distrib/sets/lists/tests/mi:1.671
--- src/distrib/sets/lists/tests/mi:1.670	Wed Apr  6 00:47:15 2016
+++ src/distrib/sets/lists/tests/mi	Fri Apr  8 10:09:16 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.670 2016/04/06 00:47:15 christos Exp $
+# $NetBSD: mi,v 1.671 2016/04/08 10:09:16 gson Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -3523,6 +3523,10 @@
 ./usr/tests/usr.bin/find/Atffile		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/find/Kyuafile		tests-usr.bin-tests	compattestfile,atf,kyua
 ./usr/tests/usr.bin/find/t_find			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/gdbtests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/gdb/Atffile			tests-usr.bin-tests	compattestfile,atf
+./usr/tests/usr.bin/gdb/Kyuafile		tests-usr.bin-tests	compattestfile,atf,kyua
+./usr/tests/usr.bin/gdb/t_regress		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/grep			tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/grep/Atffile		tests-usr.bin-tests	compattestfile,atf
 ./usr/tests/usr.bin/grep/Kyuafile		tests-usr.bin-tests	compattestfile,atf,kyua

Index: src/etc/mtree/NetBSD.dist.tests
diff -u src/etc/mtree/NetBSD.dist.tests:1.125 src/etc/mtree/NetBSD.dist.tests:1.126
--- src/etc/mtree/NetBSD.dist.tests:1.125	Fri Mar  4 02:44:45 2016
+++ src/etc/mtree/NetBSD.dist.tests	Fri Apr  8 10:09:16 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.tests,v 1.125 2016/03/04 02:44:45 ozaki-r Exp $
+#	$NetBSD: NetBSD.dist.tests,v 1.126 2016/04/08 10:09:16 gson Exp $
 
 ./usr/libdata/debug/usr/tests
 ./usr/libdata/debug/usr/tests/atf
@@ -375,6 +375,7 @@
 ./usr/tests/usr.bin/diff
 ./usr/tests/usr.bin/dirname
 ./usr/tests/usr.bin/find
+./usr/tests/usr.bin/gdb
 ./usr/tests/usr.bin/grep
 ./usr/tests/usr.bin/gzip
 ./usr/tests/usr.bin/id

Index: src/tests/usr.bin/Makefile
diff -u src/tests/usr.bin/Makefile:1.20 src/tests/usr.bin/Makefile:1.21
--- src/tests/usr.bin/Makefile:1.20	Fri Nov 14 09:03:39 2014
+++ src/tests/usr.bin/Makefile	Fri Apr  8 10:09:16 2016
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2014/11/14 09:03:39 uebayasi Exp $
+#	$NetBSD: Makefile,v 1.21 2016/04/08 10:09:16 gson Exp $
 #
 
 .include 
@@ -6,7 +6,8 @@
 TESTSDIR=   ${TESTSBASE}/usr.bin
 
 TESTS_SUBDIRS=	awk basename bzip2 cc cmp config cut \
-		diff dirname find grep gzip id infocmp jot ld m4 make mkdep \
+		diff dirname find gdb grep gzip id \
+		infocmp jot ld m4 make mkdep \
 		nbperf netpgpverify pr rump_server shmif_dumpbus sdiff \
 		sed sort tmux tr unifdef vmstat xlint
 

Added files:

Index: src/tests/usr.bin/gdb/Makefile
diff -u /dev/null src/tests/usr.bin/gdb/Makefile:1.1
--- /dev/null	Fri Apr  8 10:09:16 2016
+++ src/tests/usr.bin/gdb/Makefile	Fri Apr  8 10:09:16 2016
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile,v 1.1 2016/04/08 10:09:16 gson Exp $
+
+.include 
+
+TESTSDIR=	${TESTSBASE}/usr.bin/gdb
+
+TESTS_SH=	t_regress
+
+.include 
Index: src/tests/usr.bin/gdb/t_regress.sh
diff -u /dev/null src/tests/usr.bin/gdb/t_regress.sh:1.1
--- /dev/null	Fri Apr  8 10:09:16 2016
+++ src/tests/usr.bin/gdb/t_regress.sh	Fri Apr  8 10:09:16 2016
@@ -0,0 +1,77 @@
+# $NetBSD: t_regress.sh,v 1.1 2016/04/08 10:09:16 gson Exp $
+#
+# Copyright (c) 2016 The NetBSD Foundation, Inc.
+# 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 NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``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 FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY 

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

2016-04-08 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Fri Apr  8 09:48:15 UTC 2016

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

Log Message:
Don't rely on XHCI_IMAN_INTR_PEND.  Instead do as others do and simply
clear the bit and handle any pending events.

usb 3 now works on my toshiba laptop (and probably elsewhere)


To generate a diff of this commit:
cvs rdiff -u -r1.28.2.54 -r1.28.2.55 src/sys/dev/usb/xhci.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/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.28.2.54 src/sys/dev/usb/xhci.c:1.28.2.55
--- src/sys/dev/usb/xhci.c:1.28.2.54	Sat Mar 19 11:30:21 2016
+++ src/sys/dev/usb/xhci.c	Fri Apr  8 09:48:14 2016
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci.c,v 1.28.2.54 2016/03/19 11:30:21 skrll Exp $	*/
+/*	$NetBSD: xhci.c,v 1.28.2.55 2016/04/08 09:48:14 skrll Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.54 2016/03/19 11:30:21 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.55 2016/04/08 09:48:14 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -1022,14 +1022,7 @@ xhci_intr1(struct xhci_softc * const sc)
 
 	iman = xhci_rt_read_4(sc, XHCI_IMAN(0));
 	DPRINTFN(16, "IMAN0 %08x", iman, 0, 0, 0);
-
-	/* XXX 4.17.5 IP may be 0 if MSI/MSI-X is used */
-	if (!(sc->sc_quirks & XHCI_QUIRK_FORCE_INTR)) {
-		if ((iman & XHCI_IMAN_INTR_PEND) == 0) {
-			return 0;
-		}
-	}
-
+	iman |= XHCI_IMAN_INTR_PEND;
 	xhci_rt_write_4(sc, XHCI_IMAN(0), iman);
 	iman = xhci_rt_read_4(sc, XHCI_IMAN(0));
 	DPRINTFN(16, "IMAN0 %08x", iman, 0, 0, 0);