summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Reindl <martin@cvs.openbsd.org>2006-05-22 22:22:12 +0000
committerMartin Reindl <martin@cvs.openbsd.org>2006-05-22 22:22:12 +0000
commitcf376344d05470c4531028d23c1f50df3247a9d7 (patch)
treec4322bd7b552f67cade4092f48391d2b1cd3b403
parent657c3498f0f1f12424b08b44ee1ab824bc20ba62 (diff)
- fix and prettify SIOP_DEBUG
- print device name on request sense failure ok krw@
-rw-r--r--sys/dev/ic/siop.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index b7a510fc3b0..16c7caec417 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: siop.c,v 1.43 2005/12/03 16:53:16 krw Exp $ */
+/* $OpenBSD: siop.c,v 1.44 2006/05/22 22:22:11 martin Exp $ */
/* $NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $ */
/*
@@ -55,12 +55,17 @@
#ifndef SIOP_DEBUG
#undef SIOP_DEBUG
-#endif
-#undef SIOP_DEBUG
#undef SIOP_DEBUG_DR
#undef SIOP_DEBUG_INTR
#undef SIOP_DEBUG_SCHED
#undef DUMP_SCRIPT
+#else
+#define SIOP_DEBUG_DR
+#define SIOP_DEBUG_INTR
+#define SIOP_DEBUG_SCHED
+#define DUMP_SCRIPT
+#endif
+
#define SIOP_STATS
@@ -1094,7 +1099,8 @@ siop_scsicmd_end(siop_cmd)
case SCSI_CHECK:
if (siop_cmd->cmd_c.status == CMDST_SENSE_DONE) {
/* request sense on a request sense ? */
- printf("request sense failed\n");
+ printf("%s: request sense failed\n",
+ sc->sc_c.sc_dev.dv_xname);
xs->error = XS_DRIVER_STUFFUP;
} else {
siop_cmd->cmd_c.status = CMDST_SENSE;
@@ -1895,8 +1901,7 @@ siop_morecbd(sc)
"offset=0x%x\n", i,
letoh32(newcbd->cmds[i].cmd_tables->t_msgin.addr),
letoh32(newcbd->cmds[i].cmd_tables->t_msgout.addr),
- letoh32(newcbd->cmds[i].cmd_tables->t_status.addr),
- letoh32(newcbd->cmds[i].cmd_tables->t_offset.addr));
+ letoh32(newcbd->cmds[i].cmd_tables->t_status.addr));
#endif
}
s = splbio();