patch-2.4.0-test10 linux/drivers/net/pcmcia/xirc2ps_cs.c

• Lines: 118
• Date: Thu Oct 26 16:52:16 2000
• Orig file: v2.4.0-test9/linux/drivers/net/pcmcia/xirc2ps_cs.c
• Orig date: Sat Sep 2 00:15:37 2000

diff -u --recursive --new-file v2.4.0-test9/linux/drivers/net/pcmcia/xirc2ps_cs.c linux/drivers/net/pcmcia/xirc2ps_cs.c
@@ -247,25 +247,16 @@
 /*====================================================================*/
 
 /* Parameters that can be set with 'insmod' */
-static int if_port = 0;
-MODULE_PARM(if_port, "i");
 
-/* Bit map of interrupts to choose from */
-/* This means pick from 15, 14, 12, 11, 10, 9, 7, 5, 4, and 3 */
-static u_long irq_mask = 0xdeb8;
-MODULE_PARM(irq_mask, "i");
+#define INT_MODULE_PARM(n, v) static int n = v; MODULE_PARM(n, "i")
 
 static int irq_list[4] = { -1 };
 MODULE_PARM(irq_list, "1-4i");
-
-static int do_sound = 1;
-MODULE_PARM(do_sound, "i");
-
-static int card_type = 0;
-MODULE_PARM(card_type, "i");  /* dummy, not used anymore */
-
-static int lockup_hack = 0;
-MODULE_PARM(lockup_hack, "i");  /* anti lockup hack */
+INT_MODULE_PARM(irq_mask,	0xdeb8);
+INT_MODULE_PARM(if_port,	0);
+INT_MODULE_PARM(full_duplex,	0);
+INT_MODULE_PARM(do_sound, 	1);
+INT_MODULE_PARM(lockup_hack,	0);  /* anti lockup hack */
 
 /*====================================================================*/
 
@@ -601,29 +592,6 @@
     mii_idle(ioaddr);
 }
 
-#ifdef PCMCIA_DEBUG
-static void
-mii_dump(struct net_device *dev)
-{
-    ioaddr_t ioaddr = dev->base_addr;
-    int i;
-
-    /* Note that registers 14, 1d,1e and 1f are reserved and should
-     * not be read according to the DP83840A specs.
-     */
-    printk(KERN_DEBUG "%s: MII register dump:\n", dev->name);
-    for (i=0; i < 32; i++) {
-	if (!(i % 8)) {
-	    if (i)
-		printk("\n");
-	    printk(KERN_DEBUG "%s:", dev->name);
-	}
-	printk(" %04x", mii_rd(ioaddr, 0, i));
-    }
-    printk("\n");
-}
-#endif
-
 /*============= Main bulk of functions	=========================*/
 
 /****************
@@ -1706,12 +1674,6 @@
 	       dev->name, if_names[dev->if_port]);
 	do_reset(dev,1);  /* not the fine way :-) */
     }
-  #ifdef PCMCIA_DEBUG
-    else if (local->mohawk) {
-	/* kludge to print the mii regsiters */
-	mii_dump(dev);
-    }
-  #endif
     return 0;
 }
 
@@ -1903,6 +1865,8 @@
 		PutByte(XIRCREG42_SWC1, 0x80);
 	    busy_loop(HZ/25);	/* wait 40 msec to let it complete */
 	}
+	if (full_duplex)
+	    PutByte(XIRCREG1_ECR, GetByte(XIRCREG1_ECR | FullDuplex));
     } else {  /* No MII */
 	SelectPage(0);
 	value = GetByte(XIRCREG_ESR);	 /* read the ESR */
@@ -1957,12 +1921,6 @@
     unsigned control, status, linkpartner;
     int i;
 
-  #ifdef PCMCIA_DEBUG
-    if (pc_debug>1) {
-	mii_dump(dev);
-    }
-  #endif
-
     status = mii_rd(ioaddr,  0, 1);
     if ((status & 0xff00) != 0x7800)
 	return 0; /* No MII */
@@ -2019,11 +1977,6 @@
 	}
     }
 
-  #ifdef PCMCIA_DEBUG
-    if (pc_debug)
-	mii_dump(dev);
-  #endif
-
     return 1;
 }
 
@@ -2077,8 +2030,6 @@
     servinfo_t serv;
 
     printk(KERN_INFO "%s\n", version);
-    if (card_type)
-	printk(KINF_XIRC "option card_type is obsolete\n");
     if (lockup_hack)
 	printk(KINF_XIRC "lockup hack is enabled\n");
     CardServices(GetCardServicesInfo, &serv);