diff options
| -rw-r--r-- | sys/scsi/scsi_base.c | 11 | ||||
| -rw-r--r-- | sys/scsi/scsi_ioctl.c | 4 | ||||
| -rw-r--r-- | sys/scsi/scsiconf.c | 8 | ||||
| -rw-r--r-- | sys/scsi/sd.c | 4 |
4 files changed, 14 insertions, 13 deletions
diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index fb3ffedd418..86e36f6aaa7 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_base.c,v 1.89 2005/10/04 20:58:10 deraadt Exp $ */ +/* $OpenBSD: scsi_base.c,v 1.90 2005/10/10 20:06:11 krw Exp $ */ /* $NetBSD: scsi_base.c,v 1.43 1997/04/02 02:29:36 mycroft Exp $ */ /* @@ -709,9 +709,7 @@ int scsi_execute_xs(xs) struct scsi_xfer *xs; { - int error; - int s; - int flags; + int error, flags, rslt, s; xs->flags &= ~ITSDONE; xs->error = XS_NOERROR; @@ -756,7 +754,8 @@ scsi_execute_xs(xs) panic("scsi_execute_xs: USER with POLL"); #endif retry: - switch ((*(xs->sc_link->adapter->scsi_cmd)) (xs)) { + rslt = (*(xs->sc_link->adapter->scsi_cmd))(xs); + switch (rslt) { case SUCCESSFULLY_QUEUED: if ((flags & (SCSI_NOSLEEP | SCSI_POLL)) == SCSI_NOSLEEP) return EJUSTRETURN; @@ -785,7 +784,7 @@ retry: goto doit; default: - panic("scsi_execute_xs: invalid return code"); + panic("scsi_execute_xs: invalid return code (%#x)", rslt); } #ifdef DIAGNOSTIC diff --git a/sys/scsi/scsi_ioctl.c b/sys/scsi/scsi_ioctl.c index d968e686b75..6c6f0d3e6b9 100644 --- a/sys/scsi/scsi_ioctl.c +++ b/sys/scsi/scsi_ioctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsi_ioctl.c,v 1.20 2005/05/28 04:08:39 krw Exp $ */ +/* $OpenBSD: scsi_ioctl.c,v 1.21 2005/10/10 20:06:11 krw Exp $ */ /* $NetBSD: scsi_ioctl.c,v 1.23 1996/10/12 23:23:17 christos Exp $ */ /* @@ -444,7 +444,7 @@ scsi_do_ioctl( struct scsi_link *sc_link, dev_t dev, u_long cmd, caddr_t addr, } default: #ifdef DIAGNOSTIC - panic("scsi_do_ioctl: impossible"); + panic("scsi_do_ioctl: impossible cmd (%#x)", cmd); #endif return (0); } diff --git a/sys/scsi/scsiconf.c b/sys/scsi/scsiconf.c index ce38e1ef2b6..38a3e56449a 100644 --- a/sys/scsi/scsiconf.c +++ b/sys/scsi/scsiconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: scsiconf.c,v 1.96 2005/06/03 15:24:05 krw Exp $ */ +/* $OpenBSD: scsiconf.c,v 1.97 2005/10/10 20:06:12 krw Exp $ */ /* $NetBSD: scsiconf.c,v 1.57 1996/05/02 01:09:01 neil Exp $ */ /* @@ -507,8 +507,10 @@ scsibusprint(aux, pnp) break; case SID_QUAL_RSVD: + panic("scsibusprint: qualifier == SID_QUAL_RSVD"); + case SID_QUAL_BAD_LU: - panic("scsibusprint: impossible qualifier"); + panic("scsibusprint: qualifier == SID_QUAL_BAD_LU"); default: qtype = ""; @@ -554,7 +556,7 @@ scsibusprint(aux, pnp) dtype = "simplified direct"; break; case T_NODEVICE: - panic("scsibusprint: impossible device type"); + panic("scsibusprint: device type T_NODEVICE"); default: dtype = "unknown"; break; diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index d89a250a3e9..a30bc308cb5 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.94 2005/09/19 04:25:00 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.95 2005/10/10 20:06:12 krw Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -240,7 +240,7 @@ sdattach(parent, self, aux) #ifdef DIAGNOSTIC default: - panic("sdattach: unknown result from get_parms"); + panic("sdattach: unknown result (%#x) from get_parms", result); break; #endif } |