Make NdisReadPcmciaAttributeMemory() and NdisWritePcmciaAttributeMemory()

actually work.

Make the PCI and PCCARD attachments provide a bus_get_resource_list()
method so that resource listing for PCCARD works. PCCARD does not
have a bus_get_resource_list() method (yet), so I faked up the
resource list management in if_ndis_pccard.c, and added
bus_get_resource_list() methods to both if_ndis_pccard.c and if_ndis_pci.c.
The one in the PCI attechment just hands off to the PCI bus code.
The difference is transparent to the NDIS resource handler code.

Fixed ndis_open_file() so that opening files which live on NFS
filesystems work: pass an actual ucred structure to VOP_GETATTR()
(NFS explodes if the ucred structure is NOCRED).

Make NdisMMapIoSpace() handle mapping of PCMCIA attribute memory
resources correctly.

Turn subr_ndis.c:my_strcasecmp() into ndis_strcasecmp() and export
it so that if_ndis_pccard.c can use it, and junk the other copy
of my_strcasecmp() from if_ndis_pccard.c.

3 files changed, 75 insertions, 22 deletions

diff --git a/sys/dev/if_ndis/if_ndis_pccard.c b/sys/dev/if_ndis/if_ndis_pccard.c
index 60c1e7b..8f26eac 100644
--- a/sys/dev/if_ndis/if_ndis_pccard.c
+++ b/sys/dev/if_ndis/if_ndis_pccard.c
@@ -85,14 +85,14 @@ static struct ndis_pccard_type ndis_devs[] = {
 
 static int ndis_probe_pccard	(device_t);
 static int ndis_attach_pccard	(device_t);
+static struct resource_list *ndis_get_resource_list
+				(device_t, 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[] = {
@@ -104,6 +104,15 @@ static device_method_t ndis_methods[] = {
 	DEVMETHOD(device_suspend,	ndis_suspend),
 	DEVMETHOD(device_resume,	ndis_resume),
 
+	/* Bus interface. */
+
+	/*
+	 * This is an awful kludge, but we need it becase pccard
+	 * does not implement a bus_get_resource_list() method.
+	 */
+
+	DEVMETHOD(bus_get_resource_list, ndis_get_resource_list),
+
 	{ 0, 0 }
 };
 
@@ -127,22 +136,6 @@ NDIS_MODNAME_OVERRIDE_PCMCIA(NDIS_MODNAME);
 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.
@@ -165,8 +158,8 @@ ndis_probe_pccard(dev)
 		return(error);
 
 	while(t->ndis_name != NULL) {
-		if (my_strcasecmp(vendstr, t->ndis_vid, strlen(vendstr)) &&
-		    my_strcasecmp(prodstr, t->ndis_did, strlen(prodstr))) {
+		if (ndis_strcasecmp(vendstr, t->ndis_vid) == 0 &&
+		    ndis_strcasecmp(prodstr, t->ndis_did) == 0) {
 			device_set_desc(dev, t->ndis_name);
 			return(0);
 		}
@@ -193,6 +186,7 @@ ndis_attach_pccard(dev)
 	sc = device_get_softc(dev);
 	unit = device_get_unit(dev);
 	sc->ndis_dev = dev;
+	resource_list_init(&sc->ndis_rl);
 
 	sc->ndis_io_rid = 0;
 	sc->ndis_res_io = bus_alloc_resource(dev,
@@ -205,6 +199,9 @@ ndis_attach_pccard(dev)
 		goto fail;
 	}
 	sc->ndis_rescnt++;
+	resource_list_add(&sc->ndis_rl, SYS_RES_IOPORT, rid,
+	    rman_get_start(sc->ndis_res_io), rman_get_end(sc->ndis_res_io),
+	    rman_get_size(sc->ndis_res_io));
 
 	rid = 0;
 	sc->ndis_irq = bus_alloc_resource(dev,
@@ -217,6 +214,8 @@ ndis_attach_pccard(dev)
 		goto fail;
 	}
 	sc->ndis_rescnt++;
+	resource_list_add(&sc->ndis_rl, SYS_RES_IRQ, rid,
+	    rman_get_start(sc->ndis_irq), rman_get_start(sc->ndis_irq), 1);
 
 	sc->ndis_iftype = PCMCIABus;
 
@@ -232,8 +231,8 @@ ndis_attach_pccard(dev)
 		return(error);
 
 	while(t->ndis_name != NULL) {
-		if (my_strcasecmp(vendstr, t->ndis_vid, strlen(vendstr)) &&
-		    my_strcasecmp(prodstr, t->ndis_did, strlen(prodstr)))
+		if (ndis_strcasecmp(vendstr, t->ndis_vid) == 0 &&
+		    ndis_strcasecmp(prodstr, t->ndis_did) == 0)
 			break;
 		t++;
 		devidx++;
@@ -247,6 +246,17 @@ fail:
 	return(error);
 }
 
+static struct resource_list *
+ndis_get_resource_list(dev, child)
+	device_t		dev;
+	device_t		child;
+{
+	struct ndis_softc	*sc;
+
+	sc = device_get_softc(dev);
+	return (&sc->ndis_rl);
+}
+
 #endif /* NDIS_PCI_DEV_TABLE */
 
 #define NDIS_AM_RID 3
@@ -271,6 +281,10 @@ ndis_alloc_amem(arg)
 		    "failed to allocate attribute memory\n");
 		return(ENXIO);
 	}
+	sc->ndis_rescnt++;
+	resource_list_add(&sc->ndis_rl, SYS_RES_MEMORY, rid,
+	    rman_get_start(sc->ndis_res_am), rman_get_end(sc->ndis_res_am),
+	    rman_get_size(sc->ndis_res_am));
 
 	error = CARD_SET_MEMORY_OFFSET(device_get_parent(sc->ndis_dev),
 	    sc->ndis_dev, rid, 0, NULL);
@@ -290,5 +304,26 @@ ndis_alloc_amem(arg)
 		return(error);
 	}
 
+	sc->ndis_am_rid = rid;
+
 	return(0);
 }
+
+void
+ndis_free_amem(arg)
+	void			*arg;
+{
+	struct ndis_softc	*sc;
+
+	if (arg == NULL)
+		return;
+
+	sc = arg;
+
+	if (sc->ndis_res_am != NULL)
+		bus_release_resource(sc->ndis_dev, SYS_RES_MEMORY,
+		    sc->ndis_am_rid, sc->ndis_res_am);
+	resource_list_free(&sc->ndis_rl);
+
+	return;
+}
diff --git a/sys/dev/if_ndis/if_ndis_pci.c b/sys/dev/if_ndis/if_ndis_pci.c
index 7602dd1..47c2f69 100644
--- a/sys/dev/if_ndis/if_ndis_pci.c
+++ b/sys/dev/if_ndis/if_ndis_pci.c
@@ -84,6 +84,8 @@ static struct ndis_pci_type ndis_devs[] = {
 
 static int ndis_probe_pci	(device_t);
 static int ndis_attach_pci	(device_t);
+static struct resource_list *ndis_get_resource_list
+				(device_t, device_t);
 extern int ndis_attach		(device_t);
 extern int ndis_shutdown	(device_t);
 extern int ndis_detach		(device_t);
@@ -101,6 +103,9 @@ static device_method_t ndis_methods[] = {
 	DEVMETHOD(device_suspend,	ndis_suspend),
 	DEVMETHOD(device_resume,	ndis_resume),
 
+	/* Bus interface */
+	DEVMETHOD(bus_get_resource_list, ndis_get_resource_list),
+
 	{ 0, 0 }
 };
 
@@ -321,4 +326,15 @@ fail:
 	return(error);
 }
 
+static struct resource_list *
+ndis_get_resource_list(dev, child)
+	device_t		dev;
+	device_t		child;
+{
+	struct ndis_softc	*sc;
+
+	sc = device_get_softc(dev);
+	return (BUS_GET_RESOURCE_LIST(device_get_parent(sc->ndis_dev), dev));
+}
+
 #endif /* NDIS_PCI_DEV_TABLE */
diff --git a/sys/dev/if_ndis/if_ndisvar.h b/sys/dev/if_ndis/if_ndisvar.h
index 4560e34..0e60744 100644
--- a/sys/dev/if_ndis/if_ndisvar.h
+++ b/sys/dev/if_ndis/if_ndisvar.h
@@ -90,7 +90,9 @@ struct ndis_softc {
 	struct resource		*ndis_res_altmem;
 	int			ndis_altmem_rid;
 	struct resource		*ndis_res_am;	/* attribute mem (pccard) */
+	int			ndis_am_rid;
 	struct resource		*ndis_res_cm;	/* common mem (pccard) */
+	struct resource_list	ndis_rl;
 	int			ndis_rescnt;
 	struct mtx		ndis_mtx;
 	struct mtx		ndis_intrmtx;