isapnp wdc works

2 files changed, 193 insertions, 2 deletions

diff --git a/sys/dev/isa/files.isapnp b/sys/dev/isa/files.isapnp
index bf5850b2124..8557614aa8e 100644
--- a/sys/dev/isa/files.isapnp
+++ b/sys/dev/isa/files.isapnp
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isapnp,v 1.18 1999/07/20 17:03:11 deraadt Exp $
+#	$OpenBSD: files.isapnp,v 1.19 1999/07/21 03:50:10 deraadt Exp $
 #	$NetBSD: files.isapnp,v 1.7 1997/10/16 17:16:36 matt Exp $
 #
 # Config file and device description for machine-independent ISAPnP code.
@@ -23,7 +23,8 @@ file	dev/isa/mpu_isapnp.c		mpu
 
 #attach	com at isapnp with com_isapnp
 
-attach	wdc at isapnp with wdc_isapnp
+attach	wdc at isapnp with wdc_isapnp: isa_dma
+file   dev/isa/wdc_isapnp.c                wdc_isapnp
 
 attach	aha at isapnp with aha_isapnp
 
diff --git a/sys/dev/isa/wdc_isapnp.c b/sys/dev/isa/wdc_isapnp.c
new file mode 100644
index 00000000000..2663224fa30
--- /dev/null
+++ b/sys/dev/isa/wdc_isapnp.c
@@ -0,0 +1,190 @@
+/*	$NetBSD: wdc_isapnp.c,v 1.13 1999/03/22 10:00:12 mycroft Exp $	*/
+
+/*-
+ * Copyright (c) 1998 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Charles M. Hannum and by Onno van der Linden.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *        This product includes software developed by the NetBSD
+ *        Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/malloc.h>
+
+#include <machine/bus.h>
+#include <machine/intr.h>
+
+#include <dev/isa/isavar.h>
+#include <dev/isa/isadmavar.h>
+
+#include <dev/ata/atavar.h>
+#include <dev/ic/wdcreg.h>
+#include <dev/ic/wdcvar.h>
+
+struct wdc_isapnp_softc {
+	struct	wdc_softc sc_wdcdev;
+	struct	channel_softc *wdc_chanptr;
+	struct	channel_softc wdc_channel;
+	isa_chipset_tag_t sc_ic;
+	void	*sc_ih;
+	int	sc_drq;
+};
+
+int	wdc_isapnp_match 	__P((struct device *, void *, void *));
+void	wdc_isapnp_attach 	__P((struct device *, struct device *, void *));
+
+struct cfattach wdc_isapnp_ca = {
+	sizeof(struct wdc_isapnp_softc), wdc_isapnp_match, wdc_isapnp_attach
+};
+
+#ifdef notyet
+static void	wdc_isapnp_dma_setup __P((struct wdc_isapnp_softc *));
+static void	wdc_isapnp_dma_start __P((void *, void *, size_t, int));
+static void	wdc_isapnp_dma_finish __P((void *));
+#endif
+
+int
+wdc_isapnp_match(parent, match, aux)
+	struct device *parent;
+	void *match;
+	void *aux;
+{
+
+	return (1);
+}
+
+void
+wdc_isapnp_attach(parent, self, aux)
+	struct device *parent, *self;
+	void *aux;
+{
+	struct wdc_isapnp_softc *sc = (void *)self;
+	struct isa_attach_args *ipa = aux;
+
+	if (ipa->ipa_nio != 2 ||
+	    ipa->ipa_nmem != 0 ||
+	    ipa->ipa_nmem32 != 0 ||
+	    ipa->ipa_nirq != 1 ||
+	    ipa->ipa_ndrq > 1) {
+		printf(": unexpected configuration\n");
+		return;
+	}
+
+	sc->wdc_channel.cmd_iot = ipa->ia_iot;
+	sc->wdc_channel.ctl_iot = ipa->ia_iot;
+
+	/*
+	 * An IDE controller can feed us the regions in any order. Pass
+	 * them along with the 8-byte region in sc_ad.ioh, and the other
+	 * (2 byte) region in auxioh.
+	 */
+	if (ipa->ipa_io[0].length == 8) {
+		sc->wdc_channel.cmd_ioh = ipa->ipa_io[0].h;
+		sc->wdc_channel.ctl_ioh = ipa->ipa_io[1].h;
+	} else {
+		sc->wdc_channel.cmd_ioh = ipa->ipa_io[1].h;
+		sc->wdc_channel.ctl_ioh = ipa->ipa_io[0].h;
+	}
+	sc->wdc_channel.data32iot = sc->wdc_channel.cmd_iot;
+	sc->wdc_channel.data32ioh = sc->wdc_channel.cmd_ioh;
+
+	sc->sc_ic = ipa->ia_ic;
+	sc->sc_ih = isa_intr_establish(ipa->ia_ic, ipa->ipa_irq[0].num,
+	    ipa->ipa_irq[0].type, IPL_BIO, wdcintr, &sc->wdc_channel,
+	    sc->sc_wdcdev.sc_dev.dv_xname);
+
+#ifdef notyet
+	if (ipa->ipa_ndrq > 0) {
+		sc->sc_drq = ipa->ipa_drq[0].num;
+
+		sc->sc_ad.cap |= WDC_CAPABILITY_DMA;
+		sc->sc_ad.dma_start = &wdc_isapnp_dma_start;
+		sc->sc_ad.dma_finish = &wdc_isapnp_dma_finish;
+		wdc_isapnp_dma_setup(sc);
+	}
+#endif
+	sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32;
+	sc->sc_wdcdev.PIO_cap = 0;
+	sc->wdc_chanptr = &sc->wdc_channel;
+	sc->sc_wdcdev.channels = &sc->wdc_chanptr;
+	sc->sc_wdcdev.nchannels = 1;
+	sc->wdc_channel.channel = 0;
+	sc->wdc_channel.wdc = &sc->sc_wdcdev;
+	sc->wdc_channel.ch_queue = malloc(sizeof(struct channel_queue),
+	    M_DEVBUF, M_NOWAIT);
+	if (sc->wdc_channel.ch_queue == NULL) {
+		printf(": can't allocate memory for command queue\n");
+		return;
+	}
+
+	printf("\n");
+	wdcattach(&sc->wdc_channel);
+}
+
+#ifdef notyet
+static void
+wdc_isapnp_dma_setup(sc)
+	struct wdc_isapnp_softc *sc;
+{
+
+	if (isa_dmamap_create(sc->sc_ic, sc->sc_drq,
+	    MAXPHYS, BUS_DMA_NOWAIT|BUS_DMA_ALLOCNOW)) {
+		printf("%s: can't create map for drq %d\n",
+		    sc->sc_wdcdev.sc_dev.dv_xname, sc->sc_drq);
+		sc->sc_wdcdev.cap &= ~WDC_CAPABILITY_DMA;
+	}
+}
+
+static void
+wdc_isapnp_dma_start(scv, buf, size, read)
+	void *scv, *buf;
+	size_t size;
+	int read;
+{
+	struct wdc_isapnp_softc *sc = scv;
+
+	isa_dmastart(sc->sc_ic, sc->sc_drq, buf, size, NULL,
+	    (read ? DMAMODE_READ : DMAMODE_WRITE) | DMAMODE_DEMAND,
+	    BUS_DMA_NOWAIT);
+}
+
+static void
+wdc_isapnp_dma_finish(scv)
+	void *scv;
+{
+	struct wdc_isapnp_softc *sc = scv;
+
+	isa_dmadone(sc->sc_ic, sc->sc_drq);
+}
+#endif