Module Name: src
Committed By: snj
Date: Fri Aug 7 06:09:44 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-5-0]: twa.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #886):
sys/dev/pci/twa.c: revision 1.32
Disable completely bogus DIAGNOSTIC check.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.10.1 src/sys/dev/pci/twa.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/twa.c
diff -u src/sys/dev/pci/twa.c:1.28 src/sys/dev/pci/twa.c:1.28.10.1
--- src/sys/dev/pci/twa.c:1.28 Sun Jul 27 13:10:11 2008
+++ src/sys/dev/pci/twa.c Fri Aug 7 06:09:44 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: twa.c,v 1.28 2008/07/27 13:10:11 joerg Exp $ */
+/* $NetBSD: twa.c,v 1.28.10.1 2009/08/07 06:09:44 snj Exp $ */
/* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */
/*-
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.28 2008/07/27 13:10:11 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.28.10.1 2009/08/07 06:09:44 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1300,7 +1300,7 @@
}
-#ifdef DIAGNOSTIC
+#if 0
static void
twa_check_response_q(struct twa_request *tr, int clear)
{
@@ -1321,6 +1321,7 @@
req = tr;
if ((tr->tr_cmd_pkt_type & TWA_CMD_PKT_TYPE_EXTERNAL) != 0) {
+ XXX this is bogus ! req can't be anything else but tr !
if (req->tr_request_id == tr->tr_request_id)
panic("req id: %d on controller queue twice",
tr->tr_request_id);
@@ -1353,7 +1354,7 @@
/* Response queue is not empty. */
rq.value = twa_inl(sc, TWA_RESPONSE_QUEUE_OFFSET);
tr = sc->sc_twa_request + rq.u.response_id;
-#ifdef DIAGNOSTIC
+#if 0
twa_check_response_q(tr, 0);
#endif
/* Unmap the command packet, and any associated data buffer. */
@@ -1367,7 +1368,7 @@
}
(void)twa_drain_pending_queue(sc);
-#ifdef DIAGNOSTIC
+#if 0
twa_check_response_q(NULL, 1);
#endif
return(rv);
