diff options
| -rw-r--r-- | sys/dev/isp/isp.c | 9 | ||||
| -rw-r--r-- | sys/dev/isp/isp_target.c | 2 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/isp/isp.c b/sys/dev/isp/isp.c index 9d184dc..2cc004b 100644 --- a/sys/dev/isp/isp.c +++ b/sys/dev/isp/isp.c @@ -5239,16 +5239,13 @@ static char *fc_mbcmd_names[] = { static void isp_mboxcmd_qnw(struct ispsoftc *isp, mbreg_t *mbp, int nodelay) { - unsigned int lim, ibits, obits, box, opcode; + unsigned int ibits, obits, box, opcode; u_int16_t *mcp; - if (IS_FC(isp)) { + if (IS_FC(isp)) mcp = mbpfc; - lim = (sizeof (mbpfc) / sizeof (mbpfc[0])); - } else { + else mcp = mbpscsi; - lim = (sizeof (mbpscsi) / sizeof (mbpscsi[0])); - } opcode = mbp->param[0]; ibits = HIBYT(mcp[opcode]) & NMBOX_BMASK(isp); obits = LOBYT(mcp[opcode]) & NMBOX_BMASK(isp); diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c index c737cf1..9d23805 100644 --- a/sys/dev/isp/isp_target.c +++ b/sys/dev/isp/isp_target.c @@ -1113,9 +1113,11 @@ isp_handle_ctio2(struct ispsoftc *isp, ct2_entry_t *ct) case CT_PORTNOTAVAIL: if (fmsg == NULL) fmsg = "Port not available"; + /*FALLTHROUGH*/ case CT_PORTCHANGED: if (fmsg == NULL) fmsg = "Port Changed"; + /*FALLTHROUGH*/ case CT_NOACK: if (fmsg == NULL) fmsg = "unacknowledged Immediate Notify pending"; |
