Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check for an unterminated bus; if yes: complain and don't try to use this 

bus. Without this, cbiiisc used to hang if nothing was connected.
Reported by Matthias Scheler. A similar method to avoid this was suggested
by Ralph Schmidt.
This commit is contained in:
is 1999-06-07 21:30:57 +00:00
parent 2c35c7bd03
commit b7ee76f1c4
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/amiga/dev/cbiiisc.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: cbiiisc.c,v 1.4 1999/06/06 19:58:31 is Exp $ */
/* $NetBSD: cbiiisc.c,v 1.5 1999/06/07 21:30:58 is Exp $ */
/*
* Copyright (c) 1994,1998 Michael L. Hitch
@ -146,6 +146,9 @@ cbiiiscattach(pdp, dp, auxp)
siopnginitialize(sc);
if (sc->sc_link.scsipi_scsi.max_target < 0)
return;
sc->sc_isr.isr_intr = cbiiisc_dmaintr;
sc->sc_isr.isr_arg = sc;
sc->sc_isr.isr_ipl = 2; /* ?? */

19
sys/arch/amiga/dev/siop2.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: siop2.c,v 1.11 1999/04/01 17:27:22 mhitch Exp $ */
/* $NetBSD: siop2.c,v 1.12 1999/06/07 21:30:57 is Exp $ */
/*
* Copyright (c) 1994,1998 Michael L. Hitch
@ -645,6 +645,23 @@ siopngreset(sc)
splx (s);
delay (siopng_reset_delay * 1000);
/*
* is lower half unterminated?
*/
if ((rp->siop_sbdl & 0x00ff) == 0x00ff) {
printf(" no SCSI termination, host adapter deactivated.\n");
sc->sc_link.scsipi_scsi.max_target = -1; /* XXX */
sc->sc_flags &= ~(SIOP_ALIVE|SIOP_INTDEFER|SIOP_INTSOFF);
/* disable SCSI and DMA interrupts */
sc->sc_sien = 0;
sc->sc_dien = 0;
rp->siop_sien = sc->sc_sien;
rp->siop_dien = sc->sc_dien;
return;
}
/*
* Check if upper half of SCSI bus is unterminated, and disallow
* disconnections if it appears to be unterminated.