Stop using OLDCARD shims. rename xe_pccard_match to xe_pccard_probe

and combine the old xe_pccard_{probe,attach} into one routine _attach.
Create a lookup function to lookup items in the table.  Eliminate the
check for network cards, since many modems were eliminated by it.
Tweak a few printfs as well.

This gets many of my older cards working again CEM2, CEM28, CEM36,
etc.

2 files changed, 61 insertions, 100 deletions

diff --git a/sys/dev/xe/if_xe.c b/sys/dev/xe/if_xe.c
index cb706a9..cb4f636 100644
--- a/sys/dev/xe/if_xe.c
+++ b/sys/dev/xe/if_xe.c
@@ -277,13 +277,9 @@ xe_attach (device_t dev)
     scp->srev = (XE_INB(XE_BOV) & 0x30) >> 4;
 
   /* Print some useful information */
-  device_printf(dev, "%s %s, version 0x%02x/0x%02x%s%s\n",
-	 scp->vendor,
-	 scp->card_type,
-	 scp->version,
-	 scp->srev,
-	 scp->mohawk ? ", 100Mbps capable" : "",
-	 scp->modem ?  ", with modem"      : "");
+  device_printf(dev, "version 0x%02x/0x%02x%s%s\n", scp->version,
+    scp->srev, scp->mohawk ? ", 100Mbps capable" : "",
+    scp->modem ?  ", with modem" : "");
   if (scp->mohawk) {
     XE_SELECT_PAGE(0x10);
     DEVPRINTF(1, (dev, "DingoID=0x%04x, RevisionID=0x%04x, VendorID=0x%04x\n",
@@ -1900,8 +1896,7 @@ xe_activate(device_t dev)
 	    for (i = 0; i < 2; i++) {
 		start += (i == 0 ? 8 : -24);
 		sc->port_res = bus_alloc_resource(dev, SYS_RES_IOPORT,
-						  &sc->port_rid, start,
-						  start + 18, 18, RF_ACTIVE);
+		    &sc->port_rid, start, start + 15, 16, RF_ACTIVE);
 		if (sc->port_res == 0)
 		    continue;	/* Failed, try again if possible */
 		if (bus_get_resource_start(dev, SYS_RES_IOPORT,
diff --git a/sys/dev/xe/if_xe_pccard.c b/sys/dev/xe/if_xe_pccard.c
index 8037417..bec7c69 100644
--- a/sys/dev/xe/if_xe_pccard.c
+++ b/sys/dev/xe/if_xe_pccard.c
@@ -253,13 +253,36 @@ xe_macfix(device_t dev, int offset)
 	return (0);
 }
 
+static int
+xe_pccard_product_match(device_t dev, const struct pccard_product* ent, int vpfmatch)
+{
+	const struct xe_pccard_product* xpp;
+	uint16_t prodext;
+
+	xpp = (const struct xe_pccard_product*)ent;
+	pccard_get_prodext(dev, &prodext);
+	if (xpp->prodext != prodext)
+		vpfmatch = 0;
+	else
+		vpfmatch++;
+	return (vpfmatch);
+}
+
+static const struct xe_pccard_product *
+xe_pccard_get_product(device_t dev)
+{
+	return ((const struct xe_pccard_product *) pccard_product_lookup(dev,
+	    (const struct pccard_product *)xe_pccard_products,
+	    sizeof(xe_pccard_products[0]), xe_pccard_product_match));
+}
+
 /*
- * PCMCIA probe routine.
+ * PCMCIA attach routine.
  * Identify the device.  Called from the bus driver when the card is
  * inserted or otherwise powers up.
  */
 static int
-xe_pccard_probe(device_t dev)
+xe_pccard_attach(device_t dev)
 {
 	struct xe_softc *scp = (struct xe_softc *) device_get_softc(dev);
 	uint32_t vendor,product;
@@ -269,8 +292,9 @@ xe_pccard_probe(device_t dev)
 	const char* cis4_str = NULL;
 	const char *cis3_str=NULL;
 	const struct xe_pccard_product *xpp;
+	int err;
 
-	DEVPRINTF(2, (dev, "pccard_probe\n"));
+	DEVPRINTF(2, (dev, "pccard_attach\n"));
 
 	pccard_get_vendor(dev, &vendor);
 	pccard_get_product(dev, &product);
@@ -289,33 +313,9 @@ xe_pccard_probe(device_t dev)
 	DEVPRINTF(1, (dev, "cis4_str = %s\n", cis4_str));
 
 
-	/*
-	 * Possibly already did this search in xe_pccard_match(),
-	 * but we need to do it here anyway to figure out which
-	 * card we have.
-	 */
-	for (xpp = xe_pccard_products; xpp->product.pp_vendor != 0; xpp++) {
-		if (vendor == xpp->product.pp_vendor &&
-		    product == xpp->product.pp_product &&
-		    prodext == xpp->prodext)
-			break;
-	}
-
-	/* Found a match? */
-	if (xpp->product.pp_vendor == 0)
-		return (ENODEV);
-
-
-	/* Set card name for logging later */
-	if (xpp->product.pp_name != NULL)
-		device_set_desc(dev, xpp->product.pp_name);
-
-	/* Reject known but unsupported cards */
-	if (xpp->flags & XE_CARD_TYPE_FLAGS_NO) {
-		device_printf(dev, "Sorry, your %s %s card is not supported :(\n",
-				vendor_str, product_str);
-		return (ENODEV);
-	}
+	xpp = xe_pccard_get_product(dev);
+	if (xpp == NULL)
+		return (ENXIO);
 
 	/* Set various card ID fields in softc */
 	scp->vendor = vendor_str;
@@ -342,35 +342,20 @@ xe_pccard_probe(device_t dev)
 		|| scp->enaddr[2] != XE_MAC_ADDR_2)
 	    && xe_macfix(dev, XE_BOGUS_MAC_OFFSET) < 0) {
 		device_printf(dev,
-			      "Unable to find MAC address for your %s card\n",
-			      scp->card_type);
-		return (ENODEV);	    
+		    "Unable to find MAC address for your %s card\n",
+		    device_get_desc(dev));
+		return (ENXIO);
 	}
 
-	/* Success */
-	return (0);
-}
-
-/*
- * Attach a device.
- */
-static int
-xe_pccard_attach(device_t dev)
-{
-	struct xe_softc *scp = device_get_softc(dev);
-	int err;
-
-	DEVPRINTF(2, (dev, "pccard_attach\n"));
-
 	if ((err = xe_activate(dev)) != 0)
 		return (err);
          
 	/* Hack RealPorts into submission */
 	if (scp->modem && xe_cemfix(dev) < 0) {
-		device_printf(dev, "Unable to fix your %s %s combo card\n",
-					  scp->vendor, scp->card_type);
+		device_printf(dev, "Unable to fix your %s combo card\n",
+		    device_get_desc(dev));
 		xe_deactivate(dev);
-		return (ENODEV);
+		return (ENXIO);
 	}
 	if ((err = xe_attach(dev))) {
 		device_printf(dev, "xe_attach() failed! (%d)\n", err);
@@ -400,60 +385,41 @@ xe_pccard_detach(device_t dev)
 }
 
 static int
-xe_pccard_product_match(device_t dev, const struct pccard_product* ent, int vpfmatch)
+xe_pccard_probe(device_t dev)
 {
-	const struct xe_pccard_product* xpp;
-	uint16_t prodext;
-
-	DEVPRINTF(2, (dev, "pccard_product_match\n"));
-
-	xpp = (const struct xe_pccard_product*)ent;
-	pccard_get_prodext(dev, &prodext);
+	const struct xe_pccard_product *xpp;
 
-	if (xpp->prodext != prodext)
-		vpfmatch = 0;
-	else
-		vpfmatch++;
+	DEVPRINTF(2, (dev, "pccard_probe\n"));
 
-	return (vpfmatch);
-}
+	/*
+	 * Xircom cards aren't proper MFC cards, so we have to take all
+	 * cards that match, not just ones that are network.
+	 */
 
-static int
-xe_pccard_match(device_t dev)
-{
-	int		error = 0;
-	uint32_t	fcn = PCCARD_FUNCTION_UNSPEC;
-	const struct pccard_product *pp;
+	/* If we match something in the table, it is our device. */
+	if ((xpp = xe_pccard_get_product(dev)) == NULL)
+		return (ENXIO);
 
-	DEVPRINTF(2, (dev, "pccard_match\n"));
+	/* Set card name for logging later */
+	if (xpp->product.pp_name != NULL)
+		device_set_desc(dev, xpp->product.pp_name);
 
-	/* Make sure we're a network function */
-	error = pccard_get_function(dev, &fcn);
-	if (error != 0)
-		return (error);
-	if (fcn != PCCARD_FUNCTION_NETWORK)
+	/* Reject known but unsupported cards */
+	if (xpp->flags & XE_CARD_TYPE_FLAGS_NO) {
+		device_printf(dev, "Sorry, your %s card is not supported :(\n",
+		    device_get_desc(dev));
 		return (ENXIO);
+	}
 
-	/* If we match something in the table, it is our device. */
-	pp = (const struct pccard_product *)xe_pccard_products;
-	if ((pp = pccard_product_lookup(dev, pp,
-	     sizeof(xe_pccard_products[0]), xe_pccard_product_match)) != NULL)
-		return (0);
-
-	return (EIO);
+	return (0);
 }
 
 static device_method_t xe_pccard_methods[] = {
         /* Device interface */
-        DEVMETHOD(device_probe,         pccard_compat_probe),
-        DEVMETHOD(device_attach,        pccard_compat_attach),
+        DEVMETHOD(device_probe,         xe_pccard_probe),
+        DEVMETHOD(device_attach,        xe_pccard_attach),
         DEVMETHOD(device_detach,        xe_pccard_detach),
 
-        /* Card interface */
-        DEVMETHOD(card_compat_match,    xe_pccard_match),
-        DEVMETHOD(card_compat_probe,    xe_pccard_probe),
-        DEVMETHOD(card_compat_attach,   xe_pccard_attach),
-
         { 0, 0 }
 };