Break out the bus front end code into separate files.

Note that these haven't been turned on nor has the old code
been removed from if_ed.c.  The next commit will address that.

1 files changed, 158 insertions, 0 deletions

diff --git a/sys/dev/ed/if_ed_isa.c b/sys/dev/ed/if_ed_isa.c
new file mode 100644
index 0000000..c00dc20
--- /dev/null
+++ b/sys/dev/ed/if_ed_isa.c
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 1995, David Greenman
+ * All rights reserved.
+ *
+ * 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 unmodified, 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/socket.h>
+#include <sys/kernel.h>
+
+#include <sys/module.h>
+#include <sys/bus.h>
+#include <machine/bus.h>
+
+#include <net/ethernet.h>
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/if_mib.h>
+
+#include <isa/isavar.h>
+#include <isa/pnpvar.h>
+
+#include <dev/ed/if_edvar.h>
+
+static int ed_isa_probe		__P((device_t));
+static int ed_isa_attach	__P((device_t));
+
+static struct isa_pnp_id ed_ids[] = {
+	{ 0x1684a34d,	NULL },		/* SMC8416 */
+	{ 0xd680d041,	NULL },		/* PNP80d6 */
+	{ 0x1980635e,	NULL },		/* WSC8019 */
+	{ 0x0131d805,	NULL },		/* ANX3101 */
+	{ 0x01200507,	NULL },		/* AXE2001 */
+	{ 0x19808c4a,	NULL },		/* RTL8019 */
+	{ 0x0090252a,	NULL },		/* JQE9000 */
+	{ 0x0020832e,	NULL },		/* KTC2000 */
+	{ 0,		NULL }
+};
+
+static int
+ed_isa_probe(dev)
+	device_t dev;
+{
+	struct ed_softc *sc = device_get_softc(dev);
+	int error = 0;
+
+	bzero(sc, sizeof(struct ed_softc));
+
+	/* Check isapnp ids */
+	error = ISA_PNP_PROBE(device_get_parent(dev), dev, ed_ids);
+
+	/* If the card had a PnP ID that didn't match any we know about */
+	if (error == ENXIO) {
+		printf("*** unknown PnP ID\n");
+		goto end;
+	}
+
+	/* If we had some other problem. */
+	if (!(error == 0 || error == ENOENT)) {
+		printf("*** Some other error (%d)\n", error);
+		goto end;
+	}
+
+	/* Heuristic probes */
+
+	error = ed_probe_WD80x3(dev);
+	if (error == 0)
+		goto end;
+	printf("*** Failed ed_probe_WD80x3() (%d)\n", error);
+	ed_release_resources(dev);
+
+	error = ed_probe_3Com(dev);
+	if (error == 0)
+		goto end;
+	ed_release_resources(dev);
+
+	error = ed_probe_Novell(dev);
+	if (error == 0)
+		goto end;
+	ed_release_resources(dev);
+	error = ed_probe_HP_pclanp(dev);
+	if (error == 0)
+		goto end;
+	ed_release_resources(dev);
+
+end:
+	if (error == 0)
+		error = ed_alloc_irq(dev, 0, 0);
+
+	ed_release_resources(dev);
+	return (error);
+}
+
+static int
+ed_isa_attach(dev)
+	device_t dev;
+{
+	struct ed_softc *sc = device_get_softc(dev);
+	int flags = device_get_flags(dev);
+	int error;
+	
+	if (sc->port_used > 0)
+		ed_alloc_port(dev, sc->port_rid, 1);
+	if (sc->mem_used)
+		ed_alloc_memory(dev, sc->mem_rid, 1);
+	ed_alloc_irq(dev, sc->irq_rid, 0);
+		
+	error = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET,
+			       edintr, sc, &sc->irq_handle);
+	if (error) {
+		ed_release_resources(dev);
+		return (error);
+	}	       
+
+	return ed_attach(sc, device_get_unit(dev), flags);
+} 
+
+static device_method_t ed_isa_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		ed_isa_probe),
+	DEVMETHOD(device_attach,	ed_isa_attach),
+
+	{ 0, 0 }
+};
+
+static driver_t ed_isa_driver = {
+	"ed",
+	ed_isa_methods,
+	sizeof(struct ed_softc)
+};
+
+static devclass_t ed_isa_devclass;
+
+DRIVER_MODULE(ed, isa, ed_isa_driver, ed_isa_devclass, 0, 0);