etherlabmaster: comparison devices/8139too.c

equal deleted inserted replaced

-:4e32bcc6b361
+:ca805255a935
 /* bitmapped message enable number */
 static int debug = -1;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-// Uncomment for debugging
-//#define EC_DEBUG
-// Device index for EtherCAT device selection
 static int ec_device_index = -1;
 static int ec_device_master_index = 0;
 static ec_device_t *rtl_ec_dev;
-int rtl_ec_dev_registered = 0;
+struct net_device *rtl_ec_net_dev = NULL;
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 /*
 * Receive ring size
 	assert (dev != NULL);
 	tp = netdev_priv(dev);
 	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (board_idx == ec_device_index)
+	if (board_idx == ec_device_index) {
-{
+rtl_ec_net_dev = dev;
-printk(KERN_INFO "Registering EtherCAT device...\n");
+strcpy(dev->name, "ec0");
-rtl_ec_dev = ecdev_register(ec_device_master_index, dev,
-rtl8139_interrupt, THIS_MODULE);
-if (rtl_ec_dev) strcpy(dev->name, "ec0");
 	}
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	ioaddr = tp->mmio_addr;
 	/* dev is fully set up and ready to use now */
 	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 	/* EtherCAT-Karten nicht beim Stack anmelden. */
-if (!ecdev_is_ec(rtl_ec_dev, dev))
+if (dev != rtl_ec_net_dev)
 	{
 DPRINTK("About to register device named %s (%p)...\n", dev->name, dev);
 i = register_netdev (dev);
 if (i) goto err_out;
 	}
 	assert (dev != NULL);
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (!ecdev_is_ec(rtl_ec_dev, dev))
+if (dev != rtl_ec_net_dev)
 {
 unregister_netdev (dev);
 	}
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 #ifdef EC_DEBUG
 printk(KERN_DEBUG "%s: open\n", dev->name);
 #endif
-if (!ecdev_is_ec(rtl_ec_dev, dev))
+if (dev != rtl_ec_net_dev)
 {
 retval = request_irq(dev->irq, rtl8139_interrupt, SA_SHIRQ, dev->name, dev);
 if (retval)
 return retval;
 }
 					   &tp->rx_ring_dma);
 	if (tp->tx_bufs == NULL || tp->rx_ring == NULL)
 {
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (!ecdev_is_ec(rtl_ec_dev, dev))
+if (dev != rtl_ec_net_dev)
 {
 free_irq(dev->irq, dev);
 }
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	rtl8139_init_ring (dev);
 	rtl8139_hw_start (dev);
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (!ecdev_is_ec(rtl_ec_dev, dev))
+if (dev != rtl_ec_net_dev)
 {
 netif_start_queue (dev);
 if (netif_msg_ifup(tp))
 {
 static void rtl_check_media (struct net_device *dev, unsigned int init_media)
 {
 	struct rtl8139_private *tp = netdev_priv(dev);
-if (ecdev_is_ec(rtl_ec_dev, dev)) {
+if (dev == rtl_ec_net_dev) {
 void __iomem *ioaddr = tp->mmio_addr;
 uint16_t state = RTL_R16(BasicModeStatus) & BMSR_LSTATUS;
 ecdev_link_state(rtl_ec_dev, state ? 1 : 0);
 }
 else if (tp->phys[0] >= 0) {
 	if ((!(tmp & CmdRxEnb)) || (!(tmp & CmdTxEnb)))
 		RTL_W8 (ChipCmd, CmdRxEnb | CmdTxEnb);
 	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (!ecdev_is_ec(rtl_ec_dev, dev))
+if (dev != rtl_ec_net_dev)
 {
 /* Enable all known interrupts by setting the interrupt mask. */
 RTL_W16 (IntrMask, rtl8139_intr_mask);
 	}
 RTL_W8 (ChipCmd, CmdRxEnb);
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (!ecdev_is_ec(rtl_ec_dev, dev))
+if (dev != rtl_ec_net_dev)
 {
 spin_lock(&tp->rx_lock);
 /* Disable interrupts by clearing the interrupt mask. */
 RTL_W16 (IntrMask, 0x0000);
 {
 if (len < ETH_ZLEN)
 memset(tp->tx_buf[entry], 0, ETH_ZLEN);
 skb_copy_and_csum_dev(skb, tp->tx_buf[entry]);
-if (!ecdev_is_ec(rtl_ec_dev, dev)) dev_kfree_skb(skb);
+if (dev != rtl_ec_net_dev) dev_kfree_skb(skb);
 	}
 else
 {
-if (!ecdev_is_ec(rtl_ec_dev, dev)) dev_kfree_skb(skb);
+if (dev != rtl_ec_net_dev) dev_kfree_skb(skb);
 tp->stats.tx_dropped++;
 return 0;
 	}
-	if (!ecdev_is_ec(rtl_ec_dev, dev))
+	if (dev != rtl_ec_net_dev)
 {
 spin_lock_irq(&tp->lock);
 }
 	/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	tp->cur_tx++;
 	wmb();
 	/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (!ecdev_is_ec(rtl_ec_dev, dev))
+	if (dev != rtl_ec_net_dev)
 {
 if ((tp->cur_tx - NUM_TX_DESC) == tp->dirty_tx)
 netif_stop_queue (dev);
 spin_unlock_irq(&tp->lock);
 	}
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 #ifndef RTL8139_NDEBUG
-	if (!ecdev_is_ec(rtl_ec_dev, dev) && tp->cur_tx - dirty_tx > NUM_TX_DESC) {
+	if (dev != rtl_ec_net_dev && tp->cur_tx - dirty_tx > NUM_TX_DESC) {
 		printk (KERN_ERR "%s: Out-of-sync dirty pointer, %ld vs. %ld.\n",
 		        dev->name, dirty_tx, tp->cur_tx);
 		dirty_tx += NUM_TX_DESC;
 	}
 #endif /* RTL8139_NDEBUG */
 		tp->dirty_tx = dirty_tx;
 		mb();
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-		if (!ecdev_is_ec(rtl_ec_dev, dev))
+		if (dev != rtl_ec_net_dev)
 {
 netif_wake_queue (dev);
 }
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	DPRINTK ("%s: In rtl8139_rx(), current %4.4x BufAddr %4.4x,"
 		 " free to %4.4x, Cmd %2.2x.\n", dev->name, (u16)cur_rx,
 		 RTL_R16 (RxBufAddr),
 		 RTL_R16 (RxBufPtr), RTL_R8 (ChipCmd));
-	while ((ecdev_is_ec(rtl_ec_dev, dev) || netif_running(dev))
+	while ((dev == rtl_ec_net_dev || netif_running(dev))
 	       && received < budget
 	       && (RTL_R8 (ChipCmd) & RxBufEmpty) == 0) {
 		u32 ring_offset = cur_rx % RX_BUF_LEN;
 		u32 rx_status;
 		unsigned int pkt_size;
 		rx_size = rx_status >> 16;
 		pkt_size = rx_size - 4;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-		if (!ecdev_is_ec(rtl_ec_dev, dev) && netif_msg_rx_status(tp))
+		if (dev != rtl_ec_net_dev && netif_msg_rx_status(tp))
 printk(KERN_DEBUG "%s:  rtl8139_rx() status %4.4x, size %4.4x,"
 " cur %4.4x.\n", dev->name, rx_status,
 rx_size, cur_rx);
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 			goto out;
 		}
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (!ecdev_is_ec(rtl_ec_dev, dev))
+if (dev != rtl_ec_net_dev)
 {
 /* Malloc up new buffer, compatible with net-2e. */
 /* Omit the four octet CRC from the length. */
 skb = dev_alloc_skb(pkt_size + 2);
 	int link_changed = 0; /* avoid bogus "uninit" warning */
 	int handled = 0;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (ecdev_is_ec(rtl_ec_dev, dev))
+	if (dev == rtl_ec_net_dev)
 {
 status = RTL_R16 (IntrStatus);
 	}
 	else
 {
 	if (unlikely(status == 0xFFFF))
 		goto out;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (!ecdev_is_ec(rtl_ec_dev, dev))
+	if (dev != rtl_ec_net_dev)
 {
 /* close possible race's with dev_close */
 if (unlikely(!netif_running(dev))) {
 RTL_W16 (IntrMask, 0);
 goto out;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
 	if (status & RxAckBits)
 {
-if (!ecdev_is_ec(rtl_ec_dev, dev))
+if (dev != rtl_ec_net_dev)
 {
 /* Polling vormerken */
 if (netif_rx_schedule_prep(dev)) {
 RTL_W16_F (IntrMask, rtl8139_norx_intr_mask);
 __netif_rx_schedule (dev);
 			RTL_W16 (IntrStatus, TxErr);
 	}
 out:
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (!ecdev_is_ec(rtl_ec_dev, dev))
+	if (dev != rtl_ec_net_dev)
 {
 spin_unlock (&tp->lock);
 }
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	int ret = 0;
 	unsigned long flags;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-if (!ecdev_is_ec(rtl_ec_dev, dev))
+if (dev != rtl_ec_net_dev)
 {
 netif_stop_queue(dev);
 if (tp->thr_pid >= 0) {
 tp->time_to_die = 1;
 wmb();
 	struct rtl8139_private *np = netdev_priv(dev);
 	int rc;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (ecdev_is_ec(rtl_ec_dev, dev) || !netif_running(dev))
+	if (dev == rtl_ec_net_dev || !netif_running(dev))
 		return -EINVAL;
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	spin_lock_irq(&np->lock);
 	void __iomem *ioaddr = tp->mmio_addr;
 	unsigned long flags;
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (ecdev_is_ec(rtl_ec_dev, dev) || netif_running(dev))
+	if (dev == rtl_ec_net_dev || netif_running(dev))
 {
 spin_lock_irqsave (&tp->lock, flags);
 tp->stats.rx_missed_errors += RTL_R32 (RxMissed);
 RTL_W32 (RxMissed, 0);
 spin_unlock_irqrestore (&tp->lock, flags);
 	pci_save_state (pdev);
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (ecdev_is_ec(rtl_ec_dev, dev) || !netif_running (dev))
+	if (dev == rtl_ec_net_dev || !netif_running (dev))
 return 0;
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	netif_device_detach (dev);
 	pci_restore_state (pdev);
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-	if (ecdev_is_ec(rtl_ec_dev, dev) || !netif_running (dev))
+	if (dev == rtl_ec_net_dev || !netif_running (dev))
 return 0;
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 	pci_set_power_state (pdev, PCI_D0);
 };
 static int __init rtl8139_init_module (void)
 {
-	/* when we're a module, we always print a version message,
-	 * even if no 8139 board is found.
-	 */
-#ifdef MODULE
-	printk (KERN_INFO RTL8139_DRIVER_NAME "\n");
-#endif
 /* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-printk(KERN_INFO "Initializing RTL8139-EtherCAT module. %s\n", COMPILE_INFO);
+printk(KERN_INFO RTL8139_DRIVER_NAME " " COMPILE_INFO "\n");
-printk(KERN_INFO "EtherCAT device index is %i.\n", ec_device_index);
+printk(KERN_INFO "ec_device_index is %i\n", ec_device_index);
-if (pci_module_init(&rtl8139_pci_driver) < 0)
+if (pci_module_init(&rtl8139_pci_driver) < 0) {
-{
+printk(KERN_ERR "Failed to init PCI module.\n");
-printk(KERN_ERR "Could not init PCI module.\n");
+goto out_return;
-goto out_ec_dev;
 }
-if (!rtl_ec_dev)
+if (rtl_ec_net_dev) {
-{
+printk(KERN_INFO "Registering EtherCAT device...\n");
-printk(KERN_WARNING "NO EtherCAT device registered!\n");
+if (!(rtl_ec_dev = ecdev_register(ec_device_master_index,
+rtl_ec_net_dev, rtl8139_interrupt,
+THIS_MODULE))) {
+printk(KERN_ERR "Failed to register EtherCAT device!\n");
+goto out_pci;
+}
+printk(KERN_INFO "Starting EtherCAT device...\n");
+if (ecdev_start(ec_device_master_index)) {
+printk(KERN_ERR "Failed to start EtherCAT device!\n");
+goto out_unregister;
+}
 }
+else {
+printk(KERN_WARNING "NO EtherCAT device registered!\n");
+}
 return 0;
-out_ec_dev:
+out_unregister:
-if (rtl_ec_dev) {
+ecdev_unregister(ec_device_master_index, rtl_ec_dev);
-printk(KERN_INFO "Unregistering RTL8139-EtherCAT device...\n");
+out_pci:
+pci_unregister_driver(&rtl8139_pci_driver);
+out_return:
+return -1;
+/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
+}
+static void __exit rtl8139_cleanup_module (void)
+{
+/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
+printk(KERN_INFO "Cleaning up RTL8139-EtherCAT module...\n");
+if (rtl_ec_net_dev) {
+printk(KERN_INFO "Stopping device...\n");
+ecdev_stop(ec_device_master_index);
+printk(KERN_INFO "Unregistering device...\n");
 ecdev_unregister(ec_device_master_index, rtl_ec_dev);
 rtl_ec_dev = NULL;
 }
-return -1;
-/* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
-}
-static void __exit rtl8139_cleanup_module (void)
-{
-/* EtherCAT >>>>>>>>>>>>>>>>>>>>>>>>>>>>*/
-printk(KERN_INFO "Cleaning up RTL8139-EtherCAT module...\n");
 pci_unregister_driver(&rtl8139_pci_driver);
-if (rtl_ec_dev) {
-printk(KERN_INFO "Unregistering RTL8139-EtherCAT device...\n");
-ecdev_unregister(ec_device_master_index, rtl_ec_dev);
-rtl_ec_dev = NULL;
-}
 printk(KERN_INFO "RTL8139-EtherCAT module cleaned up.\n");
 /* EtherCAT <<<<<<<<<<<<<<<<<<<<<<<<<<<<*/
 }

changeset 191	ca805255a935
parent 104	052bc82d5442
child 192	8d7bd5082ed5