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

Minor fixes from Matthias Pfaller. 

ncr.c => add parity disable code.
This commit is contained in:
phil 1996-05-19 05:32:09 +00:00
parent 640382281e
commit 8d6d309bf0
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/arch/pc532/dev/lpt.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: lpt.c,v 1.9 1996/05/07 01:12:53 thorpej Exp $ */
/* $NetBSD: lpt.c,v 1.10 1996/05/19 05:32:09 phil Exp $ */
/*
* Copyright (c) 1994 Matthias Pfaller.
@ -406,7 +406,7 @@ lptintr(struct lpt_softc *sc)
volatile struct i8255 *i8255 = sc->sc_i8255;
#if defined(INET) && defined(PLIP)
if(sc->sc_arpcom.ac_if.if_flags & IFF_UP) {
if (sc->sc_arpcom.ac_if.if_flags & IFF_UP) {
i8255->port_a &= ~LPA_ACKENABLE;
sc->sc_pending |= PLIP_IPENDING;
softintr(sc->sc_ifsoftint);
@ -532,7 +532,6 @@ plipioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
sc->sc_arpcom.ac_enaddr[1] = 0xfc;
bcopy((caddr_t)&IA_SIN(ifa)->sin_addr,
(caddr_t)&sc->sc_arpcom.ac_enaddr[2], 4);
sc->sc_arpcom.ac_ipaddr = IA_SIN(ifa)->sin_addr;
#if defined(COMPAT_PLIP10)
if (ifp->if_flags & IFF_LINK0) {
int i;

27
sys/arch/pc532/dev/ncr.c
View File

@ -59,6 +59,21 @@ static int ncr_match __P((struct device *, void *, void *));
#define NCR5380 ((volatile u_char *) 0xffd00000)
#define MIN_PHYS 0x10000
/*
* Bit allocation in config's sc_flags field.
*
* bit 0: disable disconnect/reconnect
* bit 1: disable use of interrupts
* bits 8-15: disable parity (per target)
*/
#define NCR_DISABLE_RESELECT 1
#define NCR_DISABLE_INTERRUPTS 2
/*
* Make the default options patchable with gdb.
*/
int ncr_default_options = 0;
struct scsi_adapter ncr_switch = {
ncr5380_scsi_cmd, /* scsi_cmd() */
ncr_minphys, /* scsi_minphys() */
@ -99,12 +114,16 @@ ncr_attach(parent, self, aux)
void *aux;
{
struct ncr5380_softc *sc = (struct ncr5380_softc *) self;
int flags;
/*
* For now we only support the DP8490.
*/
scsi_select_ctlr(DP8490);
/* Pull in config flags. */
flags = sc->sc_dev.dv_cfdata->cf_flags | ncr_default_options;
/*
* Fill in the prototype scsi_link.
*/
@ -134,9 +153,13 @@ ncr_attach(parent, self, aux)
sc->sc_pio_out = ncr_pdma_out;
/*
* Allow disconnect/reconnect.
* Copy options from cf_flags to sc_flags and sc_parity_disable.
*/
sc->sc_flags = NCR5380_PERMIT_RESELECT;
sc->sc_flags = ((flags & NCR_DISABLE_RESELECT) ?
0 : NCR5380_PERMIT_RESELECT) |
((flags & NCR_DISABLE_INTERRUPTS) ?
NCR5380_FORCE_POLLING : 0);
sc->sc_parity_disable = flags >> 8;
intr_establish(IR_SCSI1, ncr_intr, (void *)sc, sc->sc_dev.dv_xname,
IPL_BIO, RISING_EDGE);