diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ic/aic6360.c | 20 | ||||
| -rw-r--r-- | sys/dev/ic/aic6360var.h | 4 |
2 files changed, 17 insertions, 7 deletions
diff --git a/sys/dev/ic/aic6360.c b/sys/dev/ic/aic6360.c index c9e3539016a..881b2a79ce7 100644 --- a/sys/dev/ic/aic6360.c +++ b/sys/dev/ic/aic6360.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aic6360.c,v 1.10 2006/04/20 20:27:38 miod Exp $ */ +/* $OpenBSD: aic6360.c,v 1.11 2006/05/23 20:42:21 miod Exp $ */ /* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */ #ifdef DDB @@ -110,7 +110,9 @@ * kernel debugger. If you set AIC_DEBUG to 0 they are not included (the * kernel uses less memory) but you lose the debugging facilities. */ +#ifndef SMALL_KERNEL #define AIC_DEBUG 1 +#endif #define AIC_ABORT_TIMEOUT 2000 /* time to wait for abort */ @@ -148,7 +150,7 @@ #define Debugger() panic("should call debugger here (aic6360.c)") #endif /* ! DDB */ -#if AIC_DEBUG +#ifdef AIC_DEBUG int aic_debug = 0x00; /* AIC_SHOWSTART|AIC_SHOWMISC|AIC_SHOWTRACE; */ #endif @@ -174,7 +176,7 @@ void aic_abort(struct aic_softc *, struct aic_acb *); void aic_msgout(struct aic_softc *); int aic_dataout_pio(struct aic_softc *, u_char *, int); int aic_datain_pio(struct aic_softc *, u_char *, int); -#if AIC_DEBUG +#ifdef AIC_DEBUG void aic_print_acb(struct aic_acb *); void aic_dump_driver(struct aic_softc *); void aic_dump6360(struct aic_softc *); @@ -188,7 +190,11 @@ struct cfdriver aic_cd = { struct scsi_adapter aic_switch = { aic_scsi_cmd, +#ifdef notyet aic_minphys, +#else + minphys, +#endif 0, 0, }; @@ -549,6 +555,7 @@ aic_scsi_cmd(xs) return COMPLETE; } +#ifdef notyet /* * Adjust transfer size in buffer structure */ @@ -562,6 +569,7 @@ aic_minphys(bp) bp->b_bcount = (AIC_NSEG << PGSHIFT); minphys(bp); } +#endif /* * Used when interrupt driven I/O isn't allowed, e.g. during boot. @@ -846,7 +854,7 @@ aic_done(sc, acb) xs->flags |= ITSDONE; -#if AIC_DEBUG +#ifdef AIC_DEBUG if ((aic_debug & AIC_SHOWMISC) != 0) { if (xs->resid != 0) printf("resid=%d ", xs->resid); @@ -1943,7 +1951,7 @@ dophase: case PH_CMD: if (sc->sc_state != AIC_CONNECTED) break; -#if AIC_DEBUG +#ifdef AIC_DEBUG if ((aic_debug & AIC_SHOWMISC) != 0) { AIC_ASSERT(sc->sc_nexus != NULL); acb = sc->sc_nexus; @@ -2065,7 +2073,7 @@ aic_timeout(arg) splx(s); } -#if AIC_DEBUG +#ifdef AIC_DEBUG /* * The following functions are mostly used for debugging purposes, either * directly called from the driver or from the kernel debugger. diff --git a/sys/dev/ic/aic6360var.h b/sys/dev/ic/aic6360var.h index c8deba51ded..e93cc94e3ea 100644 --- a/sys/dev/ic/aic6360var.h +++ b/sys/dev/ic/aic6360var.h @@ -1,4 +1,4 @@ -/* $OpenBSD: aic6360var.h,v 1.3 2003/05/14 09:04:59 jason Exp $ */ +/* $OpenBSD: aic6360var.h,v 1.4 2006/05/23 20:42:21 miod Exp $ */ /* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */ /* @@ -56,12 +56,14 @@ typedef u_long physaddr; typedef u_long physlen; +#ifdef notyet struct aic_dma_seg { physaddr seg_addr; physlen seg_len; }; #define AIC_NSEG 16 +#endif /* * ACB. Holds additional information for each SCSI command Comments: We |