diff options
| author | Steve Murphree <smurph@cvs.openbsd.org> | 2002-07-01 23:31:06 +0000 |
|---|---|---|
| committer | Steve Murphree <smurph@cvs.openbsd.org> | 2002-07-01 23:31:06 +0000 |
| commit | 5dca0670d1f92a9364a99ac406bbcc14cc4598f5 (patch) | |
| tree | 635e807ec1875772fa8fb4c6ed80456a8ad52858 /sys | |
| parent | de45756bb813dd8b25c4840f5b4922a471177a7d (diff) | |
Ensure scb is setup correctly. Add debugging info.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/aic7xxx_openbsd.c | 8 | ||||
| -rw-r--r-- | sys/dev/ic/aic7xxx_openbsd.h | 6 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/dev/ic/aic7xxx_openbsd.c b/sys/dev/ic/aic7xxx_openbsd.c index cd21f7266ad..4441d87853c 100644 --- a/sys/dev/ic/aic7xxx_openbsd.c +++ b/sys/dev/ic/aic7xxx_openbsd.c @@ -29,10 +29,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx_openbsd.c,v 1.6 2002/06/28 05:01:28 millert Exp $ + * $Id: aic7xxx_openbsd.c,v 1.7 2002/07/01 23:31:05 smurph Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_freebsd.c,v 1.26 2001/07/18 21:39:47 gibbs Exp $ - * $OpenBSD: aic7xxx_openbsd.c,v 1.6 2002/06/28 05:01:28 millert Exp $ + * $OpenBSD: aic7xxx_openbsd.c,v 1.7 2002/07/01 23:31:05 smurph Exp $ */ #include <dev/ic/aic7xxx_openbsd.h> @@ -519,7 +519,7 @@ ahc_attach(ahc) ahc_lock(ahc, &s); ahc_controller_info(ahc, ahc_info); - printf("%s: %s\n", ahc_name(ahc), ahc_info); + printf("%s: %s %s\n", ahc_name(ahc), ahc_info, (ahc->flags & AHC_SCB_BTT) ? "BTT" : ""); /* * Initialize the software queue. */ @@ -926,9 +926,9 @@ get_scb: panic("ahc: queuing for busy target"); #endif + scb->flags = SCB_FREE; scb->io_ctx = xs; hscb = scb->hscb; - hscb->control = 0; timeout_set(&xs->stimeout, ahc_timeout, scb); diff --git a/sys/dev/ic/aic7xxx_openbsd.h b/sys/dev/ic/aic7xxx_openbsd.h index 5e70c368282..7f1a9f7a59a 100644 --- a/sys/dev/ic/aic7xxx_openbsd.h +++ b/sys/dev/ic/aic7xxx_openbsd.h @@ -30,10 +30,10 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: aic7xxx_openbsd.h,v 1.5 2002/06/28 00:34:54 smurph Exp $ + * $Id: aic7xxx_openbsd.h,v 1.6 2002/07/01 23:31:05 smurph Exp $ * * $FreeBSD: src/sys/dev/aic7xxx/aic7xxx_freebsd.h,v 1.12 2001/07/18 21:39:47 gibbs Exp $ - * $OpenBSD: aic7xxx_openbsd.h,v 1.5 2002/06/28 00:34:54 smurph Exp $ + * $OpenBSD: aic7xxx_openbsd.h,v 1.6 2002/07/01 23:31:05 smurph Exp $ */ #ifndef _AIC7XXX_OPENBSD_H_ @@ -688,6 +688,8 @@ ahc_platform_dump_card_state(ahc) struct ahc_softc *ahc; { /* Nothing to do here for OpenBSD */ + printf("FEATURES = 0x%x, FLAGS = 0x%x, CHIP = 0x%x BUGS =0x%x\n", + ahc->features, ahc->flags, ahc->chip, ahc->bugs); } /**************************** Transfer Settings *******************************/ void ahc_notify_xfer_settings_change(struct ahc_softc *, |