summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2008-06-13 04:27:09 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2008-06-13 04:27:09 +0000
commit69347af79ede54346cfae7b8abfe8bf6409ec110 (patch)
tree2cc7532eddd234d24ae5133c2751cb5e94769597 /sys/dev
parent749817b1d5a135d2f0d1642726f23b9be56241c9 (diff)
Merge show_scsi_xs() and show_scsi_cmd() and move invocation so the
debug output shows the xs/command before it's issued rather than displaying it on command completion. Some commands don't come back and it would be nice to see their details. While here nuke invocations of scsi_show* in umass. If you want SCSI debug output use SCSI debug options. Only affects SCSI debug output. ok marco@
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/usb/umass_scsi.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/dev/usb/umass_scsi.c b/sys/dev/usb/umass_scsi.c
index 7783397d114..dc3439699ff 100644
--- a/sys/dev/usb/umass_scsi.c
+++ b/sys/dev/usb/umass_scsi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: umass_scsi.c,v 1.21 2007/10/20 04:37:54 krw Exp $ */
+/* $OpenBSD: umass_scsi.c,v 1.22 2008/06/13 04:27:07 krw Exp $ */
/* $NetBSD: umass_scsipi.c,v 1.9 2003/02/16 23:14:08 augustss Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -194,13 +194,6 @@ umass_scsi_cmd(struct scsi_xfer *xs)
sc_link->target, sc_link->lun, xs, xs->cmd->opcode,
xs->datalen, sc_link->quirks, xs->flags & SCSI_POLL));
-#if defined(USB_DEBUG) && defined(SCSIDEBUG)
- if (umassdebug & UDMASS_SCSI)
- show_scsi_xs(xs);
- else if (umassdebug & ~UDMASS_CMD)
- show_scsi_cmd(xs);
-#endif
-
if (sc->sc_dying) {
xs->error = XS_DRIVER_STUFFUP;
goto done;