Minimal changes to adapt to removal of NCR5380_PERMIT_RESELECT.
This driver should be updated to allow per-target control over disconnect/reselect, but I will leave that to the port masters.
This commit is contained in:
parent
07b4e45308
commit
2de163471e
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: sbc.c,v 1.19 1997/02/24 05:47:35 scottr Exp $ */
|
||||
/* $NetBSD: sbc.c,v 1.20 1997/02/26 22:29:08 gwr Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1996 Scott Reynolds. All rights reserved.
|
||||
|
@ -334,8 +334,6 @@ sbc_attach(parent, self, args)
|
|||
ncr_sc->sc_min_dma_len = MIN_DMA_LEN;
|
||||
|
||||
if (sc->sc_options & SBC_INTR) {
|
||||
if (sc->sc_options & SBC_RESELECT)
|
||||
ncr_sc->sc_flags |= NCR5380_PERMIT_RESELECT;
|
||||
ncr_sc->sc_dma_alloc = sbc_dma_alloc;
|
||||
ncr_sc->sc_dma_free = sbc_dma_free;
|
||||
ncr_sc->sc_dma_poll = sbc_dma_poll;
|
||||
|
@ -348,6 +346,9 @@ sbc_attach(parent, self, args)
|
|||
} else
|
||||
ncr_sc->sc_flags |= NCR5380_FORCE_POLLING;
|
||||
|
||||
if ((sc->sc_options & SBC_RESELECT) == 0)
|
||||
ncr_sc->sc_no_disconnect = 0xff;
|
||||
|
||||
/*
|
||||
* Initialize fields used only here in the MD code.
|
||||
*/
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ncr.c,v 1.33 1997/01/11 10:58:14 matthias Exp $ */
|
||||
/* $NetBSD: ncr.c,v 1.34 1997/02/26 22:29:09 gwr Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1996 Matthias Pfaller.
|
||||
|
@ -170,10 +170,10 @@ ncr_attach(parent, self, aux)
|
|||
/*
|
||||
* Copy options from cf_flags to sc_flags and sc_parity_disable.
|
||||
*/
|
||||
sc->sc_flags = ((flags & NCR_DISABLE_RESELECT) ?
|
||||
0 : NCR5380_PERMIT_RESELECT) |
|
||||
((flags & NCR_DISABLE_INTERRUPTS) ?
|
||||
NCR5380_FORCE_POLLING : 0);
|
||||
if (flags & NCR_DISABLE_RESELECT)
|
||||
sc->sc_no_disconnect = 0xff;
|
||||
if (flags & NCR_DISABLE_INTERRUPTS)
|
||||
sc->sc_flags |= NCR5380_FORCE_POLLING;
|
||||
sc->sc_parity_disable = flags >> 8;
|
||||
|
||||
intr_establish(IR_SCSI1, ncr_intr, (void *)sc, sc->sc_dev.dv_xname,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: si.c,v 1.32 1997/01/23 02:11:23 thorpej Exp $ */
|
||||
/* $NetBSD: si.c,v 1.33 1997/02/26 22:29:11 gwr Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1996 The NetBSD Foundation, Inc.
|
||||
|
@ -410,8 +410,8 @@ si_attach(parent, self, args)
|
|||
}
|
||||
|
||||
ncr_sc->sc_flags = 0;
|
||||
if (sc->sc_options & SI_DO_RESELECT)
|
||||
ncr_sc->sc_flags |= NCR5380_PERMIT_RESELECT;
|
||||
if ((sc->sc_options & SI_DO_RESELECT) == 0)
|
||||
ncr_sc->sc_no_disconnect = 0xFF;
|
||||
if ((sc->sc_options & SI_DMA_INTR) == 0)
|
||||
ncr_sc->sc_flags |= NCR5380_FORCE_POLLING;
|
||||
ncr_sc->sc_min_dma_len = MIN_DMA_LEN;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ncr.c,v 1.7 1997/02/26 18:38:19 ragge Exp $ */
|
||||
/* $NetBSD: ncr.c,v 1.8 1997/02/26 22:29:12 gwr Exp $ */
|
||||
|
||||
/* #define DEBUG /* */
|
||||
/* #define TRACE /* */
|
||||
|
@ -422,8 +422,8 @@ si_attach(parent, self, aux)
|
|||
ncr_sc->sc_dma_stop = si_dma_stop;
|
||||
|
||||
ncr_sc->sc_flags = 0;
|
||||
if (si_options & SI_DO_RESELECT)
|
||||
ncr_sc->sc_flags |= NCR5380_PERMIT_RESELECT;
|
||||
if ((si_options & SI_DO_RESELECT) == 0)
|
||||
ncr_sc->sc_no_disconnect = 0xff;
|
||||
if ((si_options & SI_DMA_INTR) == 0)
|
||||
ncr_sc->sc_flags |= NCR5380_FORCE_POLLING;
|
||||
ncr_sc->sc_min_dma_len = MIN_DMA_LEN;
|
||||
|
|
Loading…
Reference in New Issue