diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-04-04 20:29:46 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2011-04-04 20:29:46 +0000 |
| commit | 994e90cd178c19fadc4f157cbff269dad1510821 (patch) | |
| tree | f1f3be1acac6f3ebdbd3afa2143f3f7b96ba552c /sys/dev/ic | |
| parent | e44f837ee6acb61bad440134e7b882c18e3e9d8c (diff) | |
Kill some #if 0'ed code (the 'raw' scsi path). Move splx()
to before scsi_done(). This doesn't mean aac will ever enabled!
ok dlg@
Diffstat (limited to 'sys/dev/ic')
| -rw-r--r-- | sys/dev/ic/aac.c | 35 |
1 files changed, 5 insertions, 30 deletions
diff --git a/sys/dev/ic/aac.c b/sys/dev/ic/aac.c index d7490836a91..f4e0d4ce7b4 100644 --- a/sys/dev/ic/aac.c +++ b/sys/dev/ic/aac.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aac.c,v 1.51 2010/10/12 00:53:32 krw Exp $ */ +/* $OpenBSD: aac.c,v 1.52 2011/04/04 20:29:45 krw Exp $ */ /*- * Copyright (c) 2000 Michael Smith @@ -111,9 +111,6 @@ int aac_alloc_commands(struct aac_softc *); void aac_free_commands(struct aac_softc *); void aac_unmap_command(struct aac_command *); -#if 0 -int aac_raw_scsi_cmd(struct scsi_xfer *); -#endif void aac_scsi_cmd(struct scsi_xfer *); void aac_startio(struct aac_softc *); void aac_startup(struct aac_softc *); @@ -130,12 +127,6 @@ struct scsi_adapter aac_switch = { aac_scsi_cmd, aacminphys, 0, 0, }; -#if 0 -struct scsi_adapter aac_raw_switch = { - aac_raw_scsi_cmd, aacminphys, 0, 0, -}; -#endif - /* Falcon/PPC interface */ int aac_fa_get_fwstatus(struct aac_softc *); void aac_fa_qnotify(struct aac_softc *, int); @@ -2488,24 +2479,6 @@ aacminphys(struct buf *bp, struct scsi_link *sl) minphys(bp); } -#if 0 -int -aac_raw_scsi_cmd(struct scsi_xfer *xs) -{ -#ifdef AAC_DEBUG - struct aac_softc *sc = xs->sc_link->adapter_softc; -#endif - int s; - - AAC_DPRINTF(AAC_D_CMD, ("%s: aac_raw_scsi_cmd\n", - sc->aac_dev.dv_xname)); - - /* XXX Not yet implemented */ - xs->error = XS_DRIVER_STUFFUP; - scsi_done(xs); -} -#endif - void aac_scsi_cmd(struct scsi_xfer *xs) { @@ -2516,7 +2489,9 @@ aac_scsi_cmd(struct scsi_xfer *xs) u_int32_t blockno, blockcnt; struct scsi_rw *rw; struct scsi_rw_big *rwb; - int s = splbio(); + int s; + + s = splbio(); xs->error = XS_NOERROR; @@ -2526,9 +2501,9 @@ aac_scsi_cmd(struct scsi_xfer *xs) * XXX Should be XS_SENSE but that would require setting up a * faked sense too. */ + splx(s); xs->error = XS_DRIVER_STUFFUP; scsi_done(xs); - splx(s); return; } |