Add preliminary support for PCMCIA devices in addition to PCI/cardbus.

if_ndis.c has been split into if_ndis_pci.c and if_ndis_pccard.c.
The ndiscvt(8) utility should be able to parse device info for PCMCIA
devices now. The ndis_alloc_amem() has moved from kern_ndis.c to
if_ndis_pccard.c so that kern_ndis.c no longer depends on pccard.

NOTE: this stuff is not guaranteed to work 100% correctly yet. So
far I have been able to load/init my PCMCIA Cisco Aironet 340 card,
but it crashes in the interrupt handler. The existing support for
PCI/cardbus devices should still work as before.

1 files changed, 307 insertions, 0 deletions

diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
new file mode 100644
index 0000000..5919ae7
--- /dev/null
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -0,0 +1,307 @@
+/*
+ * Copyright (c) 2003
+ *	Bill Paul <wpaul@windriver.com>.  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, 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 Bill Paul.
+ * 4. Neither the name of the author nor the names of any co-contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
+ * 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/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/ctype.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/sockio.h>
+#include <sys/mbuf.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/socket.h>
+#include <sys/queue.h>
+#include <sys/sysctl.h>
+
+#include <net/if.h>
+#include <net/if_arp.h>
+#include <net/ethernet.h>
+#include <net/if_dl.h>
+#include <net/if_media.h>
+
+#include <net/bpf.h>
+
+#include <machine/bus_memio.h>
+#include <machine/bus_pio.h>
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+
+#include <net80211/ieee80211_var.h>
+#include <net80211/ieee80211_ioctl.h>
+
+#include <dev/wi/if_wavelan_ieee.h>
+
+#include <compat/ndis/pe_var.h>
+#include <compat/ndis/resource_var.h>
+#include <compat/ndis/ntoskrnl_var.h>
+#include <compat/ndis/ndis_var.h>
+#include <compat/ndis/cfg_var.h>
+#include <dev/if_ndis/if_ndisvar.h>
+
+#include <dev/pccard/pccardvar.h>
+#include "card_if.h"
+
+#include "ndis_driver_data.h"
+
+#ifdef NDIS_PCMCIA_DEV_TABLE 
+
+MODULE_DEPEND(ndis, pccard, 1, 1, 1);
+MODULE_DEPEND(ndis, ether, 1, 1, 1);
+MODULE_DEPEND(ndis, wlan, 1, 1, 1);
+MODULE_DEPEND(ndis, ndisapi, 1, 1, 1);
+
+/*
+ * Various supported device vendors/types and their names.
+ * These are defined in the ndis_driver_data.h file.
+ */
+static struct ndis_pccard_type ndis_devs[] = {
+#ifdef NDIS_PCMCIA_DEV_TABLE
+	NDIS_PCMCIA_DEV_TABLE
+#endif
+	{ NULL, NULL, NULL }
+};
+
+static int ndis_probe_pccard	(device_t);
+static int ndis_attach_pccard	(device_t);
+extern int ndis_attach		(device_t);
+extern int ndis_shutdown	(device_t);
+extern int ndis_detach		(device_t);
+extern int ndis_suspend		(device_t);
+extern int ndis_resume		(device_t);
+
+static int my_strcasecmp	(const char *, const char *, int);
+
+extern struct mtx_pool *ndis_mtxpool;
+
+static device_method_t ndis_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		ndis_probe_pccard),
+	DEVMETHOD(device_attach,	ndis_attach_pccard),
+	DEVMETHOD(device_detach,	ndis_detach),
+	DEVMETHOD(device_shutdown,	ndis_shutdown),
+	DEVMETHOD(device_suspend,	ndis_suspend),
+	DEVMETHOD(device_resume,	ndis_resume),
+
+	{ 0, 0 }
+};
+
+static driver_t ndis_driver = {
+#ifdef NDIS_DEVNAME
+	NDIS_DEVNAME,
+#else
+	"ndis",
+#endif
+	ndis_methods,
+	sizeof(struct ndis_softc)
+};
+
+static devclass_t ndis_devclass;
+
+#ifdef NDIS_MODNAME
+#define NDIS_MODNAME_OVERRIDE_PCMCIA(x)					\
+	DRIVER_MODULE(x, pccard, ndis_driver, ndis_devclass, 0, 0)
+NDIS_MODNAME_OVERRIDE_PCMCIA(NDIS_MODNAME);
+#else
+DRIVER_MODULE(ndis, pccard, ndis_driver, ndis_devclass, 0, 0);
+#endif
+
+static int my_strcasecmp(s1, s2, len)
+	const char		*s1;
+	const char		*s2;
+	int			len;
+{
+	int			i;
+
+	for (i = 0; i < len; i++) {
+		if (toupper(s1[i]) != toupper(s2[i]))
+			return(0);
+	}
+
+	return(1);
+}
+
+
+/*
+ * Probe for an NDIS device. Check the PCI vendor and device
+ * IDs against our list and return a device name if we find a match.
+ */
+static int
+ndis_probe_pccard(dev)
+	device_t		dev;
+{
+	struct ndis_pccard_type	*t;
+	const char		*prodstr, *vendstr;
+	int			error;
+
+	t = ndis_devs;
+
+	error = pccard_get_product_str(dev, &prodstr);
+	if (error)
+		return(error);
+	error = pccard_get_vendor_str(dev, &vendstr);
+	if (error)
+		return(error);
+
+	while(t->ndis_name != NULL) {
+		if (my_strcasecmp(vendstr, t->ndis_vid, strlen(vendstr)) &&
+		    my_strcasecmp(prodstr, t->ndis_did, strlen(prodstr))) {
+			device_set_desc(dev, t->ndis_name);
+			return(0);
+		}
+		t++;
+	}
+
+	return(ENXIO);
+}
+
+/*
+ * Attach the interface. Allocate softc structures, do ifmedia
+ * setup and ethernet/BPF attach.
+ */
+static int
+ndis_attach_pccard(dev)
+	device_t		dev;
+{
+	struct ndis_softc	*sc;
+	int			unit, error = 0, rid;
+	struct ndis_pccard_type	*t;
+	int			devidx = 0;
+	const char		*prodstr, *vendstr;
+	struct resource_list	*rl;
+	struct resource_list_entry	*rle;
+
+	sc = device_get_softc(dev);
+	unit = device_get_unit(dev);
+	sc->ndis_dev = dev;
+
+	sc->ndis_io_rid = 0;
+	sc->ndis_res_io = bus_alloc_resource(dev,
+	    SYS_RES_IOPORT, &sc->ndis_io_rid,
+	    0, ~0, 1, RF_ACTIVE);
+	if (sc->ndis_res_io == NULL) {
+		device_printf(dev,
+		    "couldn't map iospace\n");
+		error = ENXIO;
+		goto fail;
+	}
+	sc->ndis_rescnt++;
+
+	rid = 0;
+	sc->ndis_irq = bus_alloc_resource(dev,
+	    SYS_RES_IRQ, &rid, 0, ~0, 1,
+	    RF_SHAREABLE | RF_ACTIVE);
+	if (sc->ndis_irq == NULL) {
+		device_printf(dev,
+		    "couldn't map interrupt\n");
+		error = ENXIO;
+		goto fail;
+	}
+	sc->ndis_rescnt++;
+
+	sc->ndis_iftype = PCMCIABus;
+
+	/* Figure out exactly which device we matched. */
+
+	t = ndis_devs;
+
+	error = pccard_get_product_str(dev, &prodstr);
+	if (error)
+		return(error);
+	error = pccard_get_vendor_str(dev, &vendstr);
+	if (error)
+		return(error);
+
+	while(t->ndis_name != NULL) {
+		if (my_strcasecmp(vendstr, t->ndis_vid, strlen(vendstr)) &&
+		    my_strcasecmp(prodstr, t->ndis_did, strlen(prodstr)))
+			break;
+		t++;
+		devidx++;
+	}
+
+	sc->ndis_devidx = devidx;
+
+	error = ndis_attach(dev);
+
+fail:
+	return(error);
+}
+
+#endif /* NDIS_PCI_DEV_TABLE */
+
+#define NDIS_AM_RID 3
+
+int
+ndis_alloc_amem(arg)
+	void			*arg;
+{
+	struct ndis_softc	*sc;
+	int			error, rid;
+
+	if (arg == NULL)
+		return(EINVAL);
+
+	sc = arg;
+	rid = NDIS_AM_RID;
+	sc->ndis_res_am = bus_alloc_resource(sc->ndis_dev, SYS_RES_MEMORY,
+	    &rid, 0UL, ~0UL, 0x1000, RF_ACTIVE);
+
+	if (sc->ndis_res_am == NULL) {
+		device_printf(sc->ndis_dev,
+		    "failed to allocate attribute memory\n");
+		return(ENXIO);
+	}
+
+	error = CARD_SET_MEMORY_OFFSET(device_get_parent(sc->ndis_dev),
+	    sc->ndis_dev, rid, 0, NULL);
+
+	if (error) {
+		device_printf(sc->ndis_dev,
+		    "CARD_SET_MEMORY_OFFSET() returned 0x%x\n", error);
+		return(error);
+	}
+
+	error = CARD_SET_RES_FLAGS(device_get_parent(sc->ndis_dev),
+	    sc->ndis_dev, SYS_RES_MEMORY, rid, PCCARD_A_MEM_ATTR);
+
+	if (error) {
+		device_printf(sc->ndis_dev,
+		    "CARD_SET_RES_FLAGS() returned 0x%x\n", error);
+		return(error);
+	}
+
+	return(0);
+}