summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/dev/isa/ad1848.c29
-rw-r--r--sys/dev/isa/ad1848var.h4
-rw-r--r--sys/dev/isa/aha.c10
-rw-r--r--sys/dev/isa/aic_isa.c33
-rw-r--r--sys/dev/isa/aria.c14
-rw-r--r--sys/dev/isa/bt.c10
-rw-r--r--sys/dev/isa/fd.c19
-rw-r--r--sys/dev/isa/fdc.c47
-rw-r--r--sys/dev/isa/isavar.h9
-rw-r--r--sys/dev/isa/pas.c43
-rw-r--r--sys/dev/isa/pss.c27
-rw-r--r--sys/dev/isa/sb.c23
-rw-r--r--sys/dev/isa/seagate.c5
-rw-r--r--sys/dev/isa/wds.c10
14 files changed, 14 insertions, 269 deletions
diff --git a/sys/dev/isa/ad1848.c b/sys/dev/isa/ad1848.c
index 643498d3c4c..13a59793efe 100644
--- a/sys/dev/isa/ad1848.c
+++ b/sys/dev/isa/ad1848.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ad1848.c,v 1.14 1998/12/29 09:10:29 deraadt Exp $ */
+/* $OpenBSD: ad1848.c,v 1.15 1999/01/07 06:14:46 niklas Exp $ */
/* $NetBSD: ad1848.c,v 1.45 1998/01/30 02:02:38 augustss Exp $ */
/*
@@ -267,33 +267,6 @@ ad1848_dump_regs(sc)
}
#endif
-#ifdef NEWCONFIG
-void
-ad1848_forceintr(sc)
- struct ad1848_softc *sc;
-{
- static char dmabuf;
-
- /*
- * Set up a DMA read of one byte.
- * XXX Note that at this point we haven't called
- * at_setup_dmachan(). This is okay because it just
- * allocates a buffer in case it needs to make a copy,
- * and it won't need to make a copy for a 1 byte buffer.
- * (I think that calling at_setup_dmachan() should be optional;
- * if you don't call it, it will be called the first time
- * it is needed (and you pay the latency). Also, you might
- * never need the buffer anyway.)
- */
- isa_dmastart(sc->sc_isa, sc->sc_drq, &dmabuf, 1, NULL,
- DMAMODE_READ, BUS_DMA_NOWAIT);
-
- ad_write(sc, SP_LOWER_BASE_COUNT, 0);
- ad_write(sc, SP_UPPER_BASE_COUNT, 0);
- ad_write(sc, SP_INTERFACE_CONFIG, PLAYBACK_ENABLE);
-}
-#endif
-
/*
* Map and probe for the ad1848 chip
*/
diff --git a/sys/dev/isa/ad1848var.h b/sys/dev/isa/ad1848var.h
index f7f02a0a5a0..a0ab67c73a1 100644
--- a/sys/dev/isa/ad1848var.h
+++ b/sys/dev/isa/ad1848var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ad1848var.h,v 1.7 1998/05/08 18:37:20 csapuntz Exp $ */
+/* $OpenBSD: ad1848var.h,v 1.8 1999/01/07 06:14:46 niklas Exp $ */
/* $NetBSD: ad1848var.h,v 1.22 1998/01/19 22:18:26 augustss Exp $ */
/*
@@ -58,11 +58,9 @@ struct ad1848_softc {
u_int sc_lastcc; /* size of last DMA xfer */
int sc_mode; /* half-duplex record/play */
-#ifndef NEWCONFIG
int sc_dma_flags;
void *sc_dma_bp;
u_int sc_dma_cnt;
-#endif
char sc_playrun; /* running in continuous mode */
char sc_recrun; /* running in continuous mode */
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 22ab12b8b7a..3764adc9854 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aha.c,v 1.32 1998/12/27 09:41:56 deraadt Exp $ */
+/* $OpenBSD: aha.c,v 1.33 1999/01/07 06:14:46 niklas Exp $ */
/* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */
#undef AHADIAG
@@ -353,11 +353,6 @@ ahaprobe(parent, match, aux)
return 0;
#endif
-#ifdef NEWCONFIG
- if (ia->ia_iobase == IOBASEUNK)
- return 0;
-#endif
-
/* See if there is a unit at this location. */
if (aha_find(ia, NULL, 0) != 0)
return 0;
@@ -403,9 +398,6 @@ ahaattach(parent, self, aux)
sc->sc_link.device = &aha_dev;
sc->sc_link.openings = 2;
-#ifdef NEWCONFIG
- isa_establish(&sc->sc_id, &sc->sc_dev);
-#endif
sc->sc_ih = isa_intr_establish(ia->ia_ic, sc->sc_irq, IST_EDGE,
IPL_BIO, ahaintr, sc, sc->sc_dev.dv_xname);
diff --git a/sys/dev/isa/aic_isa.c b/sys/dev/isa/aic_isa.c
index 812756240bc..a6e19bc68e5 100644
--- a/sys/dev/isa/aic_isa.c
+++ b/sys/dev/isa/aic_isa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic_isa.c,v 1.2 1998/10/05 07:34:43 fgsch Exp $ */
+/* $OpenBSD: aic_isa.c,v 1.3 1999/01/07 06:14:47 niklas Exp $ */
/* $NetBSD: aic6360.c,v 1.52 1996/12/10 21:27:51 thorpej Exp $ */
/*
@@ -100,11 +100,6 @@ aic_isa_probe(parent, match, aux)
bus_space_handle_t ioh;
int rv;
-#ifdef NEWCONFIG
- if (ia->ia_iobase == IOBASEUNK)
- return (0);
-#endif
-
if (bus_space_map(iot, ia->ia_iobase, AIC_NPORTS, 0, &ioh))
return (0);
@@ -113,28 +108,6 @@ aic_isa_probe(parent, match, aux)
bus_space_unmap(iot, ioh, AIC_NPORTS);
-#ifdef NEWCONFIG
- if (ia->ia_irq != IRQUNK) {
- if (ia->ia_irq != sc->sc_irq) {
- printf("%s: irq mismatch; ", sc->sc_dev.dv_xname);
- printf("kernel configured %d != board configured %d\n",
- ia->ia_irq, sc->sc_irq);
- return (0);
- }
- } else
- ia->ia_irq = sc->sc_irq;
-
- if (ia->ia_drq != DRQUNK) {
- if (ia->ia_drq != sc->sc_drq) {
- printf("%s: drq mismatch; ", sc->sc_dev.dv_xname);
- printf("kernel configured %d != board configured %d\n",
- ia->ia_drq, sc->sc_drq);
- return (0);
- }
- } else
- ia->ia_drq = sc->sc_drq;
-#endif
-
if (rv) {
ia->ia_msize = 0;
ia->ia_iosize = AIC_NPORTS;
@@ -163,10 +136,6 @@ aic_isa_attach(parent, self, aux)
printf("\n");
-#ifdef NEWCONFIG
- isa_establish(&sc->sc_id, &sc->sc_dev);
-#endif
-
sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
IPL_BIO, aicintr, sc, sc->sc_dev.dv_xname);
diff --git a/sys/dev/isa/aria.c b/sys/dev/isa/aria.c
index 57340ad4b5d..1fe2fadce81 100644
--- a/sys/dev/isa/aria.c
+++ b/sys/dev/isa/aria.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aria.c,v 1.4 1998/11/03 21:14:58 downsj Exp $ */
+/* $OpenBSD: aria.c,v 1.5 1999/01/07 06:14:47 niklas Exp $ */
/*
* Copyright (c) 1995, 1996 Roland C. Dowdeswell. All rights reserved.
@@ -401,18 +401,6 @@ aria_do_kludge(func, bits, and, or, rba)
outb(0x201, (i&and) | or);
}
-#ifdef NEWCONFIG
-void
-ariaforceintr(aux)
- void *aux;
-{
- struct isa_attach_args *ia = aux;
- u_short iobase = ia->ia_iobase;
-
- (void)aria_sendcmd(iobase, ARIADSPC_FORCEINTR, -1, -1, -1);
-}
-#endif
-
/*
* Attach hardware to driver, attach hardware driver to audio
* pseudo-device driver.
diff --git a/sys/dev/isa/bt.c b/sys/dev/isa/bt.c
index 308ea2bf29e..8bf31d4a04c 100644
--- a/sys/dev/isa/bt.c
+++ b/sys/dev/isa/bt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bt.c,v 1.22 1998/01/18 18:58:40 niklas Exp $ */
+/* $OpenBSD: bt.c,v 1.23 1999/01/07 06:14:47 niklas Exp $ */
/* $NetBSD: bt.c,v 1.10 1996/05/12 23:51:54 mycroft Exp $ */
#undef BTDIAG
@@ -327,11 +327,6 @@ btprobe(parent, match, aux)
{
register struct isa_attach_args *ia = aux;
-#ifdef NEWCONFIG
- if (ia->ia_iobase == IOBASEUNK)
- return 0;
-#endif
-
/* See if there is a unit at this location. */
if (bt_find(ia, NULL) != 0)
return 0;
@@ -374,9 +369,6 @@ btattach(parent, self, aux)
sc->sc_link.device = &bt_dev;
sc->sc_link.openings = 4;
-#ifdef NEWCONFIG
- isa_establish(&sc->sc_id, &sc->sc_dev);
-#endif
sc->sc_ih = isa_intr_establish(ia->ia_ic, sc->sc_irq, IST_EDGE,
IPL_BIO, btintr, sc, sc->sc_dev.dv_xname);
diff --git a/sys/dev/isa/fd.c b/sys/dev/isa/fd.c
index 3d81c2add55..91f24aedd46 100644
--- a/sys/dev/isa/fd.c
+++ b/sys/dev/isa/fd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fd.c,v 1.39 1998/10/03 21:19:00 millert Exp $ */
+/* $OpenBSD: fd.c,v 1.40 1999/01/07 06:14:48 niklas Exp $ */
/* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */
/*-
@@ -695,13 +695,8 @@ loop:
}}
#endif
read = bp->b_flags & B_READ ? DMAMODE_READ : DMAMODE_WRITE;
-#ifdef NEWCONFIG
- at_dma(read, bp->b_data + fd->sc_skip, fd->sc_nbytes,
- fdc->sc_drq);
-#else
isadma_start(bp->b_data + fd->sc_skip, fd->sc_nbytes,
fdc->sc_drq, read);
-#endif
bus_space_write_1(iot, ioh_ctl, fdctl, type->rate);
#ifdef FD_DEBUG
printf("fdintr: %s drive %d track %d head %d sec %d nblks %d\n",
@@ -766,11 +761,7 @@ loop:
goto doio;
case IOTIMEDOUT:
-#ifdef NEWCONFIG
- at_dma_abort(fdc->sc_drq);
-#else
isadma_abort(fdc->sc_drq);
-#endif
case SEEKTIMEDOUT:
case RECALTIMEDOUT:
case RESETTIMEDOUT:
@@ -783,11 +774,7 @@ loop:
disk_unbusy(&fd->sc_dk, (bp->b_bcount - bp->b_resid));
if (fdcresult(fdc) != 7 || (st0 & 0xf8) != 0) {
-#ifdef NEWCONFIG
- at_dma_abort(fdc->sc_drq);
-#else
isadma_abort(fdc->sc_drq);
-#endif
#ifdef FD_DEBUG
fdcstatus(&fd->sc_dev, 7, bp->b_flags & B_READ ?
"read failed" : "write failed");
@@ -797,12 +784,8 @@ loop:
fdretry(fd);
goto loop;
}
-#ifdef NEWCONFIG
- at_dma_terminate(fdc->sc_drq);
-#else
read = bp->b_flags & B_READ ? DMAMODE_READ : DMAMODE_WRITE;
isadma_done(fdc->sc_drq);
-#endif
if (fdc->sc_errors) {
diskerr(bp, "fd", "soft error", LOG_PRINTF,
fd->sc_skip / fd_bsize, (struct disklabel *)NULL);
diff --git a/sys/dev/isa/fdc.c b/sys/dev/isa/fdc.c
index 05529686ace..ef7f6b38f6d 100644
--- a/sys/dev/isa/fdc.c
+++ b/sys/dev/isa/fdc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fdc.c,v 1.11 1998/08/08 23:01:15 downsj Exp $ */
+/* $OpenBSD: fdc.c,v 1.12 1999/01/07 06:14:48 niklas Exp $ */
/* $NetBSD: fd.c,v 1.90 1996/05/12 23:12:03 mycroft Exp $ */
/*-
@@ -83,9 +83,6 @@
/* controller driver configuration */
int fdcprobe __P((struct device *, void *, void *));
-#ifdef NEWCONFIG
-void fdcforceintr __P((void *));
-#endif
void fdcattach __P((struct device *, struct device *, void *));
struct cfattach fdc_ca = {
@@ -113,11 +110,6 @@ fdcprobe(parent, match, aux)
iot = ia->ia_iot;
rv = 0;
-#ifdef NEWCONFIG
- if (ia->ia_iobase == IOBASEUNK || ia->ia_drq == DRQUNK)
- return 0;
-#endif
-
/* Map the i/o space. */
if (bus_space_map(iot, ia->ia_iobase, FDC_NPORT, 0, &ioh))
return 0;
@@ -136,19 +128,6 @@ fdcprobe(parent, match, aux)
out_fdc(iot, ioh, 0xdf);
out_fdc(iot, ioh, 2);
-#ifdef NEWCONFIG
- if (ia->ia_irq == IRQUNK) {
- ia->ia_irq = isa_discoverintr(fdcforceintr, aux);
- if (ia->ia_irq == IRQNONE)
- goto out;
-
- /* reset it again */
- bus_space_write_1(iot, ioh, fdout, 0);
- delay(100);
- bus_space_write_1(iot, ioh, fdout, FDO_FRST);
- }
-#endif
-
rv = 1;
ia->ia_iosize = FDC_NPORT;
ia->ia_msize = 0;
@@ -159,26 +138,6 @@ fdcprobe(parent, match, aux)
return rv;
}
-#ifdef NEWCONFIG
-/*
- * XXX This is broken, and needs fixing. In general, the interface needs
- * XXX to change.
- */
-void
-fdcforceintr(aux)
- void *aux;
-{
- struct isa_attach_args *ia = aux;
- int iobase = ia->ia_iobase;
-
- /* the motor is off; this should generate an error with or
- without a disk drive present */
- out_fdc(iot, ioh, NE7CMD_SEEK);
- out_fdc(iot, ioh, 0);
- out_fdc(iot, ioh, 0);
-}
-#endif
-
void
fdcattach(parent, self, aux)
struct device *parent, *self;
@@ -210,10 +169,6 @@ fdcattach(parent, self, aux)
printf("\n");
-#ifdef NEWCONFIG
- at_setup_dmachan(fdc->sc_drq, FDC_MAXIOSIZE);
- isa_establish(&fdc->sc_id, &fdc->sc_dev);
-#endif
fdc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
IPL_BIO, fdcintr, fdc, fdc->sc_dev.dv_xname);
diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index 92ca8c49bb5..0ccb2fc428a 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isavar.h,v 1.31 1998/11/28 01:27:40 deraadt Exp $ */
+/* $OpenBSD: isavar.h,v 1.32 1999/01/07 06:14:48 niklas Exp $ */
/* $NetBSD: isavar.h,v 1.26 1997/06/06 23:43:57 thorpej Exp $ */
/*-
@@ -398,13 +398,6 @@ char *isa_intr_typename __P((int type));
void isascan __P((struct device *parent, void *match));
int isaprint __P((void *, const char *));
-#ifdef NEWCONFIG
-/*
- * Establish a device as being on the ISA bus (XXX NOT IMPLEMENTED).
- */
-void isa_establish __P((struct isadev *, struct device *));
-#endif
-
/*
* Some ISA devices (e.g. on a VLB) can perform 32-bit DMA. This
* flag is passed to bus_dmamap_create() to indicate that fact.
diff --git a/sys/dev/isa/pas.c b/sys/dev/isa/pas.c
index 77a3108b062..ed3dad5bf18 100644
--- a/sys/dev/isa/pas.c
+++ b/sys/dev/isa/pas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pas.c,v 1.18 1999/01/02 00:02:46 niklas Exp $ */
+/* $OpenBSD: pas.c,v 1.19 1999/01/07 06:14:48 niklas Exp $ */
/* $NetBSD: pas.c,v 1.37 1998/01/12 09:43:43 thorpej Exp $ */
/*
@@ -373,19 +373,6 @@ pasprobe(parent, match, aux)
DPRINTF(("pas: configured dma chan %d invalid\n", ia->ia_drq));
goto unmap;
}
-#ifdef NEWCONFIG
- /*
- * If the IRQ wasn't compiled in, auto-detect it.
- */
- if (ia->ia_irq == IRQUNK) {
- ia->ia_irq = isa_discoverintr(pasforceintr, aux);
- sbdsp_reset(&sc->sc_sbdsp);
- if (!SB_IRQ_VALID(ia->ia_irq)) {
- DPRINTF(("pas: couldn't auto-detect interrupt"));
- goto unmap;
- }
- } else
-#endif
if (!SB_IRQ_VALID(ia->ia_irq)) {
DPRINTF(("pas: configured irq chan %d invalid\n", ia->ia_irq));
goto unmap;
@@ -408,34 +395,6 @@ pasprobe(parent, match, aux)
return 0;
}
-#ifdef NEWCONFIG
-void
-pasforceintr(aux)
- void *aux;
-{
- static char dmabuf;
- struct isa_attach_args *ia = aux;
- int iobase = ia->ia_iobase;
-
- /*
- * Set up a DMA read of one byte.
- * XXX Note that at this point we haven't called
- * at_setup_dmachan(). This is okay because it just
- * allocates a buffer in case it needs to make a copy,
- * and it won't need to make a copy for a 1 byte buffer.
- * (I think that calling at_setup_dmachan() should be optional;
- * if you don't call it, it will be called the first time
- * it is needed (and you pay the latency). Also, you might
- * never need the buffer anyway.)
- */
- at_dma(DMAMODE_READ, &dmabuf, 1, ia->ia_drq);
- if (pas_wdsp(iobase, SB_DSP_RDMA) == 0) {
- (void)pas_wdsp(iobase, 0);
- (void)pas_wdsp(iobase, 0);
- }
-}
-#endif
-
/*
* Attach hardware to driver, attach hardware driver to audio
* pseudo-device driver .
diff --git a/sys/dev/isa/pss.c b/sys/dev/isa/pss.c
index acbc6b2e1b1..18da81cdb72 100644
--- a/sys/dev/isa/pss.c
+++ b/sys/dev/isa/pss.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pss.c,v 1.17 1999/01/02 00:02:46 niklas Exp $ */
+/* $OpenBSD: pss.c,v 1.18 1999/01/07 06:14:49 niklas Exp $ */
/* $NetBSD: pss.c,v 1.38 1998/01/12 09:43:44 thorpej Exp $ */
/*
@@ -110,9 +110,6 @@
struct pss_softc {
struct device sc_dev; /* base device */
-#ifdef NEWCONFIG
- struct isadev sc_id; /* ISA device */
-#endif
void *sc_ih; /* interrupt vectoring */
int sc_iobase; /* I/O port base address */
@@ -134,9 +131,6 @@ struct pss_softc {
#ifdef notyet
struct mpu_softc {
struct device sc_dev; /* base device */
-#ifdef NEWCONFIG
- struct isadev sc_id; /* ISA device */
-#endif
void *sc_ih; /* interrupt vectoring */
int sc_iobase; /* MIDI I/O port base address */
@@ -145,9 +139,6 @@ struct mpu_softc {
struct pcd_softc {
struct device sc_dev; /* base device */
-#ifdef NEWCONFIG
- struct isadev sc_id; /* ISA device */
-#endif
void *sc_ih; /* interrupt vectoring */
int sc_iobase; /* CD I/O port base address */
@@ -1030,10 +1021,6 @@ pssattach(parent, self, aux)
sc->sc_iobase = iobase;
sc->sc_drq = ia->ia_drq;
-#ifdef NEWCONFIG
- isa_establish(&sc->sc_id, &sc->sc_dev);
-#endif
-
/* Setup interrupt handler for PSS */
sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE, IPL_AUDIO,
pssintr, sc, sc->sc_dev.dv_xname);
@@ -1066,10 +1053,6 @@ spattach(parent, self, aux)
sc->sc_iobase = iobase;
sc->sc_drq = cf->cf_drq;
-#ifdef NEWCONFIG
- isa_establish(&sc->sc_id, &sc->sc_dev);
-#endif
-
sc->sc_ih = isa_intr_establish(ic, cf->cf_irq, IST_EDGE, IPL_AUDIO,
ad1848_intr, sc, sc->sc_dev.dv_xname);
@@ -1093,10 +1076,6 @@ mpuattach(parent, self, aux)
sc->sc_iobase = iobase;
-#ifdef NEWCONFIG
- isa_establish(&sc->sc_id, &sc->sc_dev);
-#endif
-
sc->sc_ih = isa_intr_establish(ic, cf->cf_irq, IST_EDGE, IPL_AUDIO,
mpuintr, sc, sc->sc_dev.dv_xname);
@@ -1122,10 +1101,6 @@ pcdattach(parent, self, aux)
*/
sc->sc_iobase = iobase;
-#ifdef NEWCONFIG
- isa_establish(&sc->sc_id, &sc->sc_dev);
-#endif
-
/* XXX might use pssprint func ?? */
printf(" port 0x%x-0x%x irq %d\n",
sc->sc_iobase, sc->sc_iobase+2,
diff --git a/sys/dev/isa/sb.c b/sys/dev/isa/sb.c
index 10306436c48..942331d15df 100644
--- a/sys/dev/isa/sb.c
+++ b/sys/dev/isa/sb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sb.c,v 1.17 1999/01/02 00:02:47 niklas Exp $ */
+/* $OpenBSD: sb.c,v 1.18 1999/01/07 06:14:49 niklas Exp $ */
/* $NetBSD: sb.c,v 1.57 1998/01/12 09:43:46 thorpej Exp $ */
/*
@@ -194,27 +194,6 @@ sbmatch(sc)
} else
sc->sc_drq16 = sc->sc_drq8;
-#ifdef NEWCONFIG
- /*
- * If the IRQ wasn't compiled in, auto-detect it.
- */
- if (sc->sc_irq == IRQUNK) {
- sc->sc_irq = isa_discoverintr(sbforceintr, sc);
- sbdsp_reset(sc);
- if (ISSBPROCLASS(sc)) {
- if (!SBP_IRQ_VALID(sc->sc_irq)) {
- DPRINTF(("%s: couldn't auto-detect interrupt\n", sc->sc_dev.dv_xname));
- return 0;
- }
- }
- else {
- if (!SB_IRQ_VALID(sc->sc_irq)) {
- DPRINTF(("%s: couldn't auto-detect interrupt\n", sc->sc_dev.dv_xname));
- return 0;
- }
- }
- } else
-#endif
if (ISSBPROCLASS(sc)) {
if (!SBP_IRQ_VALID(sc->sc_irq)) {
DPRINTF(("%s: configured irq %d invalid\n",
diff --git a/sys/dev/isa/seagate.c b/sys/dev/isa/seagate.c
index 7b99ea2e3f4..4d7d9755480 100644
--- a/sys/dev/isa/seagate.c
+++ b/sys/dev/isa/seagate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: seagate.c,v 1.11 1997/11/07 08:07:10 niklas Exp $ */
+/* $OpenBSD: seagate.c,v 1.12 1999/01/07 06:14:49 niklas Exp $ */
/*
* ST01/02, Future Domain TMC-885, TMC-950 SCSI driver
@@ -444,9 +444,6 @@ seaattach(parent, self, aux)
printf("\n");
-#ifdef NEWCONFIG
- isa_establish(&sea->sc_id, &sea->sc_deV);
-#endif
sea->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
IPL_BIO, seaintr, sea, sea->sc_dev.dv_xname);
diff --git a/sys/dev/isa/wds.c b/sys/dev/isa/wds.c
index 71725b52a84..28f7a7bb5a5 100644
--- a/sys/dev/isa/wds.c
+++ b/sys/dev/isa/wds.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: wds.c,v 1.13 1998/01/18 18:48:40 niklas Exp $ */
+/* $OpenBSD: wds.c,v 1.14 1999/01/07 06:14:49 niklas Exp $ */
/* $NetBSD: wds.c,v 1.13 1996/11/03 16:20:31 mycroft Exp $ */
#undef WDSDIAG
@@ -249,11 +249,6 @@ wdsprobe(parent, match, aux)
{
register struct isa_attach_args *ia = aux;
-#ifdef NEWCONFIG
- if (ia->ia_iobase == IOBASEUNK)
- return 0;
-#endif
-
/* See if there is a unit at this location. */
if (wds_find(ia, NULL) != 0)
return 0;
@@ -311,9 +306,6 @@ wdsattach(parent, self, aux)
/* It gives Vendor Error 26 whenever I try it. */
sc->sc_link.openings = 1;
-#ifdef NEWCONFIG
- isa_establish(&sc->sc_id, &sc->sc_dev);
-#endif
sc->sc_ih = isa_intr_establish(ia->ia_ic, sc->sc_irq, IST_EDGE,
IPL_BIO, wdsintr, sc, sc->sc_dev.dv_xname);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 08:42:57 +0000