diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-01-15 01:40:33 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-01-15 01:40:33 +0000 |
| commit | 336305543ad5abd4f77606599e1896b29af0386b (patch) | |
| tree | 2cdcbffc078b4d3f04514f158f214da3e579f9b5 /sys/dev/ic/aic7xxx.c | |
| parent | 034bc9e87c409d8b2f8deaf131a099ff2c17e9ba (diff) | |
from netbsd:
Add the "ahe" driver, autoconfiguration support for the aic7xxx-based
Adaptec 2[78]4x SCSI controllers, from Michael Graff <explorer@flame.org>.
Fixes PR #1594 from Noriyuki Soda <soda@sra.co.jp> in a different way.
Diffstat (limited to 'sys/dev/ic/aic7xxx.c')
| -rw-r--r-- | sys/dev/ic/aic7xxx.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c index dd2ddf0a9fc..806b1e559d8 100644 --- a/sys/dev/ic/aic7xxx.c +++ b/sys/dev/ic/aic7xxx.c @@ -1,4 +1,4 @@ -/* $NetBSD: aic7xxx.c,v 1.1 1995/10/09 09:49:30 mycroft Exp $ */ +/* $NetBSD: aic7xxx.c,v 1.2 1996/01/13 02:05:22 thorpej Exp $ */ /* * Generic driver for the aic7xxx based adaptec SCSI controllers @@ -536,10 +536,10 @@ ahc_print_scb(scb) scb->SG_segment_count, scb->SG_list_pointer); printf("\tsg_addr:%x sg_len:%d\n", - scb->ahc_dma[0].addr, - scb->ahc_dma[0].len); + scb->ahc_dma[0].seg_addr, + scb->ahc_dma[0].seg_len); printf(" size:%d\n", - (int)&scb->next - (int)scb); + (int)&scb->next_waiting - (int)scb); } void @@ -1003,7 +1003,7 @@ ahcintr(ahc) ahc_getscb(iobase, scb); -#ifdef AHC_DEBUG +#ifdef AHC_MORE_DEBUG if (xs->sc_link->target == DEBUGTARGET) ahc_print_scb(scb); #endif @@ -1418,19 +1418,19 @@ ahc_init(ahc) switch (ahc->type) { case AHC_274: - printf(": 274x ", ahc->sc_dev.dv_xname); + printf("%s: 274x ", ahc->sc_dev.dv_xname); ahc->maxscbs = 0x4; break; case AHC_284: - printf(": 284x ", ahc->sc_dev.dv_xname); + printf("%s: 284x ", ahc->sc_dev.dv_xname); ahc->maxscbs = 0x4; break; case AHC_AIC7870: case AHC_294: if (ahc->type == AHC_AIC7870) - printf(": aic7870 ", ahc->sc_dev.dv_xname); + printf("%s: aic7870 ", ahc->sc_dev.dv_xname); else - printf(": 294x ", ahc->sc_dev.dv_xname); + printf("%s: 294x ", ahc->sc_dev.dv_xname); ahc->maxscbs = 0x10; #define DFTHRESH 3 outb(DSPCISTATUS + iobase, DFTHRESH << 6); @@ -1442,6 +1442,9 @@ ahc_init(ahc) /* In case we are a wide card */ outb(HA_SCSICONF + 1 + iobase, 0x07); break; + default: + printf("%s: unknown(0x%x) ", ahc->sc_dev.dv_xname, ahc->type); + break; } /* Determine channel configuration and who we are on the scsi bus. */ @@ -1466,7 +1469,7 @@ ahc_init(ahc) outb(HA_FLAGS + iobase, TWIN_BUS); break; default: - printf(" Unsupported adapter type. %x Ignoring\n",sblkctl); + printf(" Unsupported adapter type. %x Ignoring\n", sblkctl); return(-1); } @@ -1839,7 +1842,7 @@ ahc_scsi_cmd(xs) scb->SG_segment_count = 0; } -#ifdef AHC_DEBUG +#ifdef AHC_MORE_DEBUG if (sc_link->target == DEBUGTARGET) ahc_print_scb(scb); #endif |