Module Name: src
Committed By: snj
Date: Tue Aug 25 18:22:12 UTC 2009
Modified Files:
src/sys/dev/pci [netbsd-4]: twa.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1349):
sys/dev/pci/twa.c: revision 1.32
Disable completely bogus DIAGNOSTIC check.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.2.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.16 src/sys/dev/pci/twa.c:1.16.2.1
--- src/sys/dev/pci/twa.c:1.16 Thu Nov 16 01:33:10 2006
+++ src/sys/dev/pci/twa.c Tue Aug 25 18:22:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: twa.c,v 1.16 2006/11/16 01:33:10 christos Exp $ */
+/* $NetBSD: twa.c,v 1.16.2.1 2009/08/25 18:22:12 snj Exp $ */
/* $wasabi: twa.c,v 1.27 2006/07/28 18:17:21 wrstuden Exp $ */
/*-
@@ -74,7 +74,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.16 2006/11/16 01:33:10 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: twa.c,v 1.16.2.1 2009/08/25 18:22:12 snj Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -1239,7 +1239,7 @@
}
-#ifdef DIAGNOSTIC
+#if 0
static void
twa_check_response_q(struct twa_request *tr, int clear)
{
@@ -1260,6 +1260,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);
@@ -1293,7 +1294,7 @@
rq = (union twa_response_queue)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. */
@@ -1307,7 +1308,7 @@
}
(void)twa_drain_pending_queue(sc);
-#ifdef DIAGNOSTIC
+#if 0
twa_check_response_q(NULL, 1);
#endif
return(rv);
