Attachment 17049 Details for Bug 31084 – xe-patch

xe-patch

xe-patch (text/plain), 2.08 KB, created by Joseph Koshy on 2001-10-10 05:56:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joseph Koshy

Created: 2001-10-10 05:56:56 UTC

Size: 2.08 KB

patch

obsolete

>--- if_xe.c--	Sat Jul 22 04:08:24 2000
>+++ if_xe.c	Tue Oct  9 15:45:14 2001
>@@ -205,7 +205,7 @@
>  * Debug functions -- uncomment for VERY verbose dignostic information.
>  * Set to 1 for less verbose information
>  */
>-/* #define XE_DEBUG 2 */
>+/*#define XE_DEBUG 2 */
> #ifdef XE_DEBUG
> #define XE_REG_DUMP(scp)		xe_reg_dump((scp))
> #define XE_MII_DUMP(scp)		xe_mii_dump((scp))
>@@ -226,10 +226,8 @@
>   struct xe_softc *sc = (struct xe_softc *) device_get_softc(dev);
>   bus_space_tag_t bst;
>   bus_space_handle_t bsh;
>-  struct resource *r;
>-  int rid;
>+  struct resource *r; int rid;
>   int ioport;
>-
> #ifdef XE_DEBUG
>   device_printf(dev, "Hacking your Realport, master\n");
> #endif
>@@ -244,11 +242,10 @@
>   r = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, 0, ~0, 4 << 10, RF_ACTIVE);
>   if (!r) {
> #if XE_DEBUG > 0
>-    device_printf(dev, "Can't map in attribute memory\n");
>+     device_printf(dev, "Can't map in attribute memory\n");
> #endif
>-    return -1;
>+     return -1;
>   }
>-
>   bsh = rman_get_bushandle(r);
>   bst = rman_get_bustag(r);
> 
>@@ -291,7 +288,7 @@
>   int buf;
>   u_char ver_str[CISTPL_BUFSIZE>>1];
>   off_t offs;
>-  int success, rc, i;
>+  int success, rc = 0, i;
>   int rid;
>   struct resource *r;
> 
>@@ -360,6 +357,7 @@
> #if XE_DEBUG > 1
> 	device_printf(dev, "Not a PCMCIA Ethernet card!\n");
> #endif
>+	success--;
> 	rc = ENODEV;		/* Not a PCMCIA Ethernet device */
>       } else {
> 	if (media & 0x10) {	/* Ethernet/modem cards */
>@@ -388,6 +386,7 @@
> 	    scp->dingo = 1;
> 	    scp->card_type = "CEM56"; break;
> 	  default:
>+	    success--;
> 	    rc = ENODEV;
> 	  }
> 	} else {		/* Ethernet-only cards */
>@@ -404,6 +403,7 @@
> 	    scp->mohawk = 1;
> 	    scp->card_type = "CE3"; break;
> 	  default:
>+	    success--;
> 	    rc = ENODEV;
> 	  }
> 	}
>@@ -440,6 +440,8 @@
>   /* Die now if something went wrong above */
>   if (success < 3)
>     return ENXIO;
>+  if (rc != 0)
>+    return (rc);
> 
>   /* Check for certain strange CE2's that look like CE's */
>   if (strcmp(scp->card_type, "CE") == 0) {
>@@ -2252,3 +2254,4 @@
> devclass_t xe_devclass;
> 
> DRIVER_MODULE(xe, pccard, xe_pccard_driver, xe_devclass, 0, 0);
>+

Actions: View

Attachments on bug 31084: 17049