etherlabmaster: comparison drivers/drv

equal deleted inserted replaced

-:1b5aea4d5147
+:5a42f6d1085c
 static void rtl8139_chip_reset (void *ioaddr)
 {
 	int i;
-	int succ = 0 ;
+#ifdef ECAT_DEBUG
+	int succ = 0;
+#endif
 	/* Soft reset the chip. */
 	RTL_W8 (ChipCmd, CmdReset);
 	/* Check that the chip has finished the reset. */
 	for (i = 1000; i > 0; i--) {
 		barrier();
 		if ((RTL_R8 (ChipCmd) & CmdReset) == 0) {
+#ifdef ECAT_DEBUG
 		    succ = 1;
+#endif
 		    break;
 		}
 		udelay (10);
 	}
+#ifdef ECAT_DEBUG
 	EC_DBG("rtl8139 chipreset");
 	if(succ == 0)
 	    EC_DBG("failed");
 	else
 	    EC_DBG("success at count %d",i);
+#endif
 }
 static int __devinit rtl8139_init_board (struct pci_dev *pdev,
 					 struct net_device **dev_out)
 	int retval;
 #ifdef RTL8139_DEBUG
 	void *ioaddr = tp->mmio_addr;
 #endif
+	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
+#ifdef ECAT_DEBUG
 EC_DBG(KERN_DEBUG "%s: open\n", dev->name);
+#endif
-	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 if (dev != rtl_ecat_dev.dev)
 {
 retval = request_irq(dev->irq, rtl8139_interrupt, SA_SHIRQ, dev->name, dev);
 if (retval)
 if (tp->thr_pid < 0)
 EC_DBG (KERN_WARNING "%s: unable to start kernel thread\n",
 dev->name);
 	}
+#ifdef ECAT_DEBUG
+EC_DBG(KERN_DEBUG "%s: open finished.\n", dev->name);
+#endif
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
-EC_DBG(KERN_DEBUG "%s: open finished.\n", dev->name);
 	return 0;
 }
 " auto-negotiated partner ability %4.4x.\n",
 		        dev->name, mii_lpa == 0 ? "" :
 (mii_lpa & 0x0180) ? "100mbps " : "10mbps ",
 			tp->mii.full_duplex ? "full" : "half", mii_lpa);
 	}
+	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
+#ifdef ECAT_DEBUG
 EC_DBG(KERN_DEBUG "rtl_check_media done.\n");
+#endif
+	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 }
 /* Start the hardware at open or resume. */
 static void rtl8139_hw_start (struct net_device *dev)
 {
 	struct rtl8139_private *tp = dev->priv;
 	void *ioaddr = tp->mmio_addr;
 	u32 i;
 	u8 tmp;
+	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
+#ifdef ECAT_DEBUG
 EC_DBG(KERN_DEBUG "%s: rtl8139_hw_start\n", dev->name);
+#endif
+	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	/* Bring old chips out of low-power mode. */
 	if (rtl_chip_info[tp->chipset].flags & HasHltClk)
 		RTL_W8 (HltClk, 'R');
 else
 {
 RTL_W16 (IntrMask, 0x0000);
 }
+#ifdef ECAT_DEBUG
+EC_DBG(KERN_DEBUG "%s: rtl8139_hw_start finished.\n", dev->name);
+#endif
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
-EC_DBG(KERN_DEBUG "%s: rtl8139_hw_start finished.\n", dev->name);
 }
 /* Initialize the Rx and Tx rings, along with various 'dev' bits. */
 static void rtl8139_init_ring (struct net_device *dev)
 {
 	struct net_device *dev = data;
 	struct rtl8139_private *tp = dev->priv;
 	unsigned long timeout;
-EC_DBG(KERN_DEBUG "%s: thread\n", dev->name);
 	daemonize ();
 	reparent_to_init();
 	spin_lock_irq(&current->sigmask_lock);
 	sigemptyset(&current->blocked);
 	recalc_sigpending(current);
 	spin_unlock_irq(&current->sigmask_lock);
 	strncpy (current->comm, dev->name, sizeof(current->comm) - 1);
 	current->comm[sizeof(current->comm) - 1] = '\0';
-EC_DBG(KERN_DEBUG "%s: thread entering loop...\n", dev->name);
 	while (1) {
 		timeout = next_tick;
 		do {
 			timeout = interruptible_sleep_on_timeout (&tp->thr_wait, timeout);
 		} while (!signal_pending (current) && (timeout > 0));
 		if (tp->time_to_die)
 			break;
 		rtnl_lock ();
-EC_DBG(KERN_DEBUG "%s: thread iter\n", dev->name);
 		rtl8139_thread_iter (dev, tp, tp->mmio_addr);
-EC_DBG(KERN_DEBUG "%s: thread iter finished.\n", dev->name);
 		rtnl_unlock ();
 	}
-EC_DBG(KERN_DEBUG "%s: thread exiting...\n", dev->name);
 	complete_and_exit (&tp->thr_exited, 0);
-EC_DBG(KERN_DEBUG "%s: thread exit.\n", dev->name);
 }
 static void rtl8139_tx_clear (struct rtl8139_private *tp)
 {
 	void *ioaddr = tp->mmio_addr;
 	int i;
 	u8 tmp8;
 	unsigned long flags;
-EC_DBG(KERN_DEBUG "%s: tx_timeout\n", dev->name);
 	DPRINTK ("%s: Transmit timeout, status %2.2x %4.4x "
 		 "media %2.2x.\n", dev->name,
 		 RTL_R8 (ChipCmd),
 		 RTL_R16 (IntrStatus),
 		 RTL_R8 (MediaStatus));
 	tp->xstats.tx_timeouts++;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
+EC_DBG(KERN_DEBUG "%s: tx_timeout\n", dev->name);
 if (dev == rtl_ecat_dev.dev)
 {
 if (rtl_ecat_dev.state != ECAT_DS_SENT)
 {
 	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 if (dev != rtl_ecat_dev.dev) netif_wake_queue (dev);
+EC_DBG(KERN_DEBUG "%s: tx_timeout finished.\n", dev->name);
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
-EC_DBG(KERN_DEBUG "%s: tx_timeout finished.\n", dev->name);
 }
 static int rtl8139_start_xmit (struct sk_buff *skb, struct net_device *dev)
 {
 	struct rtl8139_private *tp = dev->priv;
 	RTL_W8 (Cfg9346, Cfg9346_Unlock);
 	if (rtl_chip_info[tp->chipset].flags & HasHltClk)
 		RTL_W8 (HltClk, 'H');	/* 'R' would leave the clock running. */
-	EC_DBG ("rtl8139: closing done\n");
 	return 0;
 }
 /* Get the ethtool Wake-on-LAN settings.  Assumes that wol points to
 static struct net_device_stats *rtl8139_get_stats (struct net_device *dev)
 {
 	struct rtl8139_private *tp = dev->priv;
 	void *ioaddr = tp->mmio_addr;
 	unsigned long flags;
-	EC_DBG("%s: rtl8139 GETSTATS called...",dev->name);
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 	if (dev == rtl_ecat_dev.dev || netif_running(dev))
 {
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 EtherCAT_device_init(&rtl_ecat_dev);
-printk(KERN_DEBUG "Driver rtl_ecat_dev has address %X.\n",
-(unsigned) &rtl_ecat_dev);
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	return pci_module_init (&rtl8139_pci_driver);
 }

changeset 18	5a42f6d1085c
parent 5	6f2508af550c