Signed-off-by: Michael Schmitz <[email protected]>
---
 drivers/net/Space.c                        |    4 -
 drivers/net/ethernet/8390/Kconfig          |    8 -
 drivers/net/ethernet/8390/Makefile         |    1 -
 drivers/net/ethernet/8390/atari_ethernec.c | 1008 ----------------------------
 4 files changed, 0 insertions(+), 1021 deletions(-)
 delete mode 100644 drivers/net/ethernet/8390/atari_ethernec.c

diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index 9060424..3a8c753 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -47,7 +47,6 @@ extern struct net_device *ni65_probe(int unit);
 extern struct net_device *sonic_probe(int unit);
 extern struct net_device *smc_init(int unit);
 extern struct net_device *atarilance_probe(int unit);
-extern struct net_device *atari_ethernec_probe(int unit);
 extern struct net_device *sun3lance_probe(int unit);
 extern struct net_device *sun3_82586_probe(int unit);
 extern struct net_device *apne_probe(int unit);
@@ -131,9 +130,6 @@ static struct devprobe2 m68k_probes[] __initdata = {
 #ifdef CONFIG_ATARILANCE       /* Lance-based Atari ethernet boards */
        {atarilance_probe, 0},
 #endif
-#ifdef CONFIG_ATARI_ETHERNEC   /* NE2000 based ROM port ethernet cards */
-       {atari_ethernec_probe, 0},
-#endif
 #ifdef CONFIG_SUN3LANCE         /* sun3 onboard Lance chip */
        {sun3lance_probe, 0},
 #endif
diff --git a/drivers/net/ethernet/8390/Kconfig 
b/drivers/net/ethernet/8390/Kconfig
index 1b41983..a5f91e1 100644
--- a/drivers/net/ethernet/8390/Kconfig
+++ b/drivers/net/ethernet/8390/Kconfig
@@ -135,14 +135,6 @@ config APNE
          To compile this driver as a module, choose M here: the module
          will be called apne.
 
-config ATARI_ETHERNEC
-       tristate "Atari EtherNEC Ethernet support"
-       depends on ATARI_ROM_ISA
-       help
-         Say Y to include support for the EtherNEC network adapter for the
-         ROM port. The driver works by polling instead of interrupts, so it
-         is quite slow.
-
 config PCMCIA_PCNET
        tristate "NE2000 compatible PCMCIA support"
        depends on PCMCIA
diff --git a/drivers/net/ethernet/8390/Makefile 
b/drivers/net/ethernet/8390/Makefile
index 150728b..588954a 100644
--- a/drivers/net/ethernet/8390/Makefile
+++ b/drivers/net/ethernet/8390/Makefile
@@ -5,7 +5,6 @@
 obj-$(CONFIG_MAC8390) += mac8390.o
 obj-$(CONFIG_APNE) += apne.o 8390.o
 obj-$(CONFIG_ARM_ETHERH) += etherh.o
-obj-$(CONFIG_ATARI_ETHERNEC) += atari_ethernec.o 8390.o
 obj-$(CONFIG_AX88796) += ax88796.o
 obj-$(CONFIG_HYDRA) += hydra.o 8390.o
 obj-$(CONFIG_MCF8390) += mcf8390.o 8390.o
diff --git a/drivers/net/ethernet/8390/atari_ethernec.c 
b/drivers/net/ethernet/8390/atari_ethernec.c
deleted file mode 100644
index 4b1b953..0000000
--- a/drivers/net/ethernet/8390/atari_ethernec.c
+++ /dev/null
@@ -1,1008 +0,0 @@
-/*
- * atari_ethernec.c: Atari cartridge port ethernet adapter
- * (C) 2006 Michael Schmitz
- *
- * Modified after:
- */
-
-/* ne.c: A general non-shared-memory NS8390 ethernet driver for linux. */
-/*
-    Written 1992-94 by Donald Becker.
-
-    Copyright 1993 United States Government as represented by the
-    Director, National Security Agency.
-
-    This software may be used and distributed according to the terms
-    of the GNU General Public License, incorporated herein by reference.
-
-    The author may be reached as [email protected], or C/O
-    Scyld Computing Corporation, 410 Severn Ave., Suite 210, Annapolis MD 21403
-
-    This driver should work with many programmed-I/O 8390-based ethernet
-    boards.  Currently it supports the NE1000, NE2000, many clones,
-    and some Cabletron products.
-
-    Changelog:
-
-    Paul Gortmaker     : use ENISR_RDC to monitor Tx PIO uploads, made
-                         sanity checks and bad clone support optional.
-    Paul Gortmaker     : new reset code, reset card after probe at boot.
-    Paul Gortmaker     : multiple card support for module users.
-    Paul Gortmaker     : Support for PCI ne2k clones, similar to lance.c
-    Paul Gortmaker     : Allow users with bad cards to avoid full probe.
-    Paul Gortmaker     : PCI probe changes, more PCI cards supported.
-    [email protected] : Changed init order so an interrupt will only
-    occur after memory is allocated for dev->priv. Deallocated memory
-    last in cleanup_modue()
-    Richard Guenther    : Added support for ISAPnP cards
-    Paul Gortmaker     : Discontinued PCI support - use ne2k-pci.c instead.
-    Hayato Fujiwara    : Add m32r support.
-
-*/
-
-/*
- * From the driver distribution kit by Thomas Redelberger:
- *
- * Hardware circuit description (see directory ETHERNEC for schematics)
- *
- * As there is no reset line on the CP, a resistor and a capacitor are
- * used to reset the NE card on power up.
- *
- * Reading from the NE card is done by a read cycle on the CP at address
- * /ROM4 + 512*ISA address as the ISA address lines A0-A4 are connected
- * to CP A9-A13. /ROM4 going low will start the ISA read cycle, enable
- * the ISA bus buffers of the NE card and start decoding of the ISA IO
- * address by the NE card. /ROM4 going high ends the cycle and the
- * processor latches the data.
- *
- * Because the CP is read only writing to the NE card must be done with
- * the trick to read from addresses that stand for the data. Dummy reads
- * at /ROM3 base address + data*2 + ISA address*512 effect this. You
- * might wonder why everything appears to be shifted up one bit. There is
- * no CP "A0" address line. There are the signals /UDS and /LDS instead
- * typical for the 68000 family. The original design which generated an
- * "A0" worked on an ST and an STE but did not on a Falcon.
- *
- * The falling edge of /ROM3 enables the CP address lines A1-A8 onto the
- * data bus and starts the ISA write cycle. The rising edge will end the
- * ISA write cycle and the NE latches the data. The processor will also
- * see and just read this same data but that is harmless.
- * Elmar Hilgart reported that the bus buffer IC shall be an TTL F-type
- * to keep up with the fast cycles on the Falcon.
- *
- * Base addresses:
- * rom4            EQU     $00fa0000       ; ROM4 base address
- * rom3            EQU     $00fb0000       ; ROM3 base address
- *
- */
-
-/* Routines for the NatSemi-based designs (NE[12]000). */
-
-static const char version1[] =
-"ne.c:v1.10 9/23/94 Donald Becker ([email protected])\n";
-static const char version2[] =
-"atari_ethernec.c 11/10/06 Michael Schmitz ([email protected])\n";
-
-
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/wait.h>
-#include <linux/sched.h>
-#include <linux/errno.h>
-#include <linux/isapnp.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/delay.h>
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/jiffies.h>
-#include <linux/workqueue.h>
-
-#include <asm/atarihw.h>
-#include <asm/atariints.h>
-#include <asm/io.h>
-
-#include "8390.h"
-
-#define DRV_NAME "ethernec"
-
-/* Some defines that people can play with if so inclined. */
-
-/* Do we support clones that don't adhere to 14,15 of the SAprom ? */
-#define SUPPORT_NE_BAD_CLONES
-
-/* Do we perform extra sanity checks on stuff ? */
-/* #define NE_SANITY_CHECK */
-
-/* Do we implement the read before write bugfix ? */
-/* #define NE_RW_BUGFIX */
-
-/* Do we have a non std. amount of memory? (in units of 256 byte pages) */
-/* #define PACKETBUF_MEMSIZE   0x40 */
-
-/* A zero-terminated list of I/O addresses to be probed at boot. */
-#ifndef MODULE
-static unsigned int netcard_portlist[] __initdata = {
-       0x300, 0
-};
-#endif
-
-static struct isapnp_device_id isapnp_clone_list[] __initdata = {
-       {       ISAPNP_CARD_ID('A','X','E',0x2011),
-               ISAPNP_VENDOR('A','X','E'), ISAPNP_FUNCTION(0x2011),
-               (long) "NetGear EA201" },
-       {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
-               ISAPNP_VENDOR('E','D','I'), ISAPNP_FUNCTION(0x0216),
-               (long) "NN NE2000" },
-       {       ISAPNP_ANY_ID, ISAPNP_ANY_ID,
-               ISAPNP_VENDOR('P','N','P'), ISAPNP_FUNCTION(0x80d6),
-               (long) "Generic PNP" },
-       { }     /* terminate list */
-};
-
-MODULE_DEVICE_TABLE(isapnp, isapnp_clone_list);
-
-#ifdef SUPPORT_NE_BAD_CLONES
-/* A list of bad clones that we none-the-less recognize. */
-static struct { const char *name8, *name16; unsigned char SAprefix[4];}
-bad_clone_list[] __initdata = {
-       {"DE100", "DE200", {0x00, 0xDE, 0x01,}},
-       {"DE120", "DE220", {0x00, 0x80, 0xc8,}},
-       {"DFI1000", "DFI2000", {'D', 'F', 'I',}}, /* Original, eh?  */
-       {"EtherNext UTP8", "EtherNext UTP16", {0x00, 0x00, 0x79}},
-       {"NE1000","NE2000-invalid", {0x00, 0x00, 0xd8}}, /* Ancient real 
NE1000. */
-       {"NN1000", "NN2000",  {0x08, 0x03, 0x08}}, /* Outlaw no-name clone. */
-       {"4-DIM8","4-DIM16", {0x00,0x00,0x4d,}},  /* Outlaw 4-Dimension cards. 
*/
-       {"Con-Intl_8", "Con-Intl_16", {0x00, 0x00, 0x24}}, /* Connect Int'nl */
-       {"ET-100","ET-200", {0x00, 0x45, 0x54}}, /* YANG and YA clone */
-       {"COMPEX","COMPEX16",{0x00,0x80,0x48}}, /* Broken ISA Compex cards */
-       {"E-LAN100", "E-LAN200", {0x00, 0x00, 0x5d}}, /* Broken ne1000 clones */
-       {"PCM-4823", "PCM-4823", {0x00, 0xc0, 0x6c}}, /* Broken Advantech MoBo 
*/
-       {"REALTEK", "RTL8019", {0x00, 0x00, 0xe8}}, /* no-name with Realtek 
chip */
-#if defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938)
-       {"RBHMA4X00-RTL8019", "RBHMA4X00/RTL8019", {0x00, 0x60, 0x0a}},  /* 
Toshiba built-in */
-#endif
-       {"LCS-8834", "LCS-8836", {0x04, 0x04, 0x37}}, /* ShinyNet (SET) */
-       {NULL,}
-};
-#endif
-
-/* ---- No user-serviceable parts below ---- */
-
-#define NE_BASE         (dev->base_addr)
-#define NE_CMD         0x00
-#define NE_DATAPORT    0x10    /* NatSemi-defined port window offset. */
-#define NE_RESET       0x1f    /* Issue a read to reset, a write to clear. */
-#define NE_IO_EXTENT   0x20
-
-#define NE1SM_START_PG 0x20    /* First page of TX buffer */
-#define NE1SM_STOP_PG  0x40    /* Last page +1 of RX ring */
-#define NESM_START_PG  0x40    /* First page of TX buffer */
-#define NESM_STOP_PG   0x80    /* Last page +1 of RX ring */
-
-#if defined(CONFIG_PLAT_MAPPI)
-#  define DCR_VAL 0x4b
-#elif defined(CONFIG_PLAT_OAKS32R)  || \
-   defined(CONFIG_TOSHIBA_RBTX4927) || defined(CONFIG_TOSHIBA_RBTX4938) || \
-   defined(CONFIG_ATARI_ETHERNEC) || defined(CONFIG_ATARI_ETHERNEC_MODULE)
-#  define DCR_VAL 0x48         /* 8-bit mode */
-#else
-#  define DCR_VAL 0x49
-#endif
-
-#if defined(CONFIG_ATARI_ETHERNEC) || defined(CONFIG_ATARI_ETHERNEC_MODULE)
-#  define ETHERNEC_RTL_8019_BASE 0x300
-#  define ETHERNEC_RTL_8019_IRQ IRQ_MFP_TIMD
-#endif
-
-static int ne_probe1(struct net_device *dev, int ioaddr);
-static int ne_probe_isapnp(struct net_device *dev);
-
-static void ne_reset_8390(struct net_device *dev);
-static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
-                           int ring_page);
-static void ne_block_input(struct net_device *dev, int count,
-                          struct sk_buff *skb, int ring_offset);
-static void ne_block_output(struct net_device *dev, const int count,
-                           const unsigned char *buf, const int start_page);
-
-
-/*
- * The Atari ROM port has no interrupt line, so we poll the card instead.
- */
-
-static int use_poll;
-
-/*
- * This is used by cleanup, to prevent the module from being unloaded while
- * intrpt_routine is still in the task queue
- */
-static wait_queue_head_t WaitQ;
-
-static struct delayed_work tqueue;
-
-static struct net_device *poll_dev = NULL;
-
-irqreturn_t atari_ei_interrupt(int irq, void *dev_id)
-{
-       struct net_device *dev = dev_id;
-       if (netif_running(dev))
-               return ei_interrupt(dev->irq, dev);
-       return IRQ_NONE;
-}
-
-static void atari_ethernec_int(struct work_struct *work)
-{
-       struct net_device *dev = poll_dev;
-
-       if (!dev) {
-               /* If cleanup wants us to die */
-               if (waitqueue_active(&WaitQ))
-                       wake_up(&WaitQ);        /* Now cleanup_module can 
return */
-               else
-                       /* Put ourselves back in the task queue */
-                       schedule_delayed_work(&tqueue, 1);
-               return;
-       }
-
-       if (netif_running(dev))
-               ei_interrupt(dev->irq, dev);
-
-       /* If cleanup wants us to die */
-       if (waitqueue_active(&WaitQ))
-               wake_up(&WaitQ);        /* Now cleanup_module can return */
-       else
-               /* Put ourselves back in the task queue */
-               schedule_delayed_work(&tqueue, 0); /* reduced delay from 1 */
-}
-
-static void atari_ethernec_start_poll(struct net_device *dev)
-{
-       poll_dev = dev;
-
-       init_waitqueue_head(&WaitQ);
-
-       INIT_DELAYED_WORK(&tqueue, atari_ethernec_int);
-       schedule_delayed_work(&tqueue, 1);
-}
-
-static void atari_ethernec_stop_poll(struct net_device *dev)
-{
-       poll_dev = NULL;
-
-       if (dev)
-               sleep_on(&WaitQ);
-}
-
-
-/*  Probe for various non-shared-memory ethercards.
-
-   NEx000-clone boards have a Station Address PROM (SAPROM) in the packet
-   buffer memory space.  NE2000 clones have 0x57,0x57 in bytes 0x0e,0x0f of
-   the SAPROM, while other supposed NE2000 clones must be detected by their
-   SA prefix.
-
-   Reading the SAPROM from a word-wide card with the 8390 set in byte-wide
-   mode results in doubled values, which can be detected and compensated for.
-
-   The probe is also responsible for initializing the card and filling
-   in the 'dev' and 'ei_status' structures.
-
-   We use the minimum memory size for some ethercard product lines, iff we 
can't
-   distinguish models.  You can increase the packet buffer size by setting
-   PACKETBUF_MEMSIZE.  Reported Cabletron packet buffer locations are:
-       E1010   starts at 0x100 and ends at 0x2000.
-       E1010-x starts at 0x100 and ends at 0x8000. ("-x" means "more memory")
-       E2010    starts at 0x100 and ends at 0x4000.
-       E2010-x starts at 0x100 and ends at 0xffff.
-*/
-
-static int __init do_ne_probe(struct net_device *dev)
-{
-       unsigned int base_addr = dev->base_addr;
-       int rv;
-#ifndef MODULE
-       int orig_irq = dev->irq;
-#endif
-
-       /* First check any supplied i/o locations. User knows best. <cough> */
-       if (base_addr > 0x1ff) {        /* Check a single specified location. */
-               rv = ne_probe1(dev, base_addr);
-               if (!rv && use_poll) {
-                       /* Seems we have a valid device here; set up polling 
routine */
-                       poll_dev = dev;
-                       atari_ethernec_start_poll(dev);
-               }
-               return rv;
-       } else if (base_addr != 0)      /* Don't probe at all. */
-               return -ENXIO;
-
-       /* Then look for any installed ISAPnP clones */
-       if (isapnp_present() && (ne_probe_isapnp(dev) == 0))
-               return 0;
-
-#ifndef MODULE
-       /* Last resort. The semi-risky ISA auto-probe. */
-       for (base_addr = 0; netcard_portlist[base_addr] != 0; base_addr++) {
-               int ioaddr = netcard_portlist[base_addr];
-               dev->irq = orig_irq;
-               rv = ne_probe1(dev, ioaddr);
-               if (rv == 0) {
-                       if (use_poll) {
-                               poll_dev = dev;
-                               atari_ethernec_start_poll(dev);
-                       }
-                       return 0;
-               }
-       }
-#endif
-
-       return -ENODEV;
-}
-
-#ifndef MODULE
-struct net_device * __init atari_ethernec_probe(int unit)
-{
-       struct net_device *dev;
-       int err;
-
-       if (!MACH_IS_ATARI)
-               return ERR_PTR(-ENODEV);
-
-       dev = alloc_ei_netdev();
-       if (!dev)
-               return ERR_PTR(-ENOMEM);
-
-       sprintf(dev->name, "eth%d", unit);
-       netdev_boot_setup_check(dev);
-
-#if defined(CONFIG_ATARI_ETHERNEC)
-       dev->base_addr = ETHERNEC_RTL_8019_BASE;
-       dev->irq = ETHERNEC_RTL_8019_IRQ;
-#endif
-       err = do_ne_probe(dev);
-       if (err)
-               goto out;
-
-       /* Seems we have a valid device here; set up polling routine */
-       return dev;
-out:
-       free_netdev(dev);
-       return ERR_PTR(err);
-}
-#endif
-
-static int __init ne_probe_isapnp(struct net_device *dev)
-{
-       int i;
-
-       for (i = 0; isapnp_clone_list[i].vendor != 0; i++) {
-               struct pnp_dev *idev = NULL;
-
-               while ((idev = pnp_find_dev(NULL,
-                                           isapnp_clone_list[i].vendor,
-                                           isapnp_clone_list[i].function,
-                                           idev))) {
-                       /* Avoid already found cards from previous calls */
-                       if (pnp_device_attach(idev) < 0)
-                               continue;
-                       if (pnp_activate_dev(idev) < 0) {
-                               pnp_device_detach(idev);
-                               continue;
-                       }
-                       /* if no io and irq, search for next */
-                       if (!pnp_port_valid(idev, 0) || !pnp_irq_valid(idev, 
0)) {
-                               pnp_device_detach(idev);
-                               continue;
-                       }
-                       /* found it */
-                       dev->base_addr = pnp_port_start(idev, 0);
-                       dev->irq = pnp_irq(idev, 0);
-                       printk(KERN_INFO "atari_ethernec.c: ISAPnP reports %s 
at i/o %#lx, irq %d.\n",
-                              (char *) isapnp_clone_list[i].driver_data,
-                              dev->base_addr, dev->irq);
-                       if (ne_probe1(dev, dev->base_addr) != 0) {      /* 
Shouldn't happen. */
-                               printk(KERN_ERR "atari_ethernec.c: Probe of 
ISAPnP card at %#lx failed.\n",
-                                      dev->base_addr);
-                               pnp_device_detach(idev);
-                               return -ENXIO;
-                       }
-                       ei_status.priv = (unsigned long)idev;
-                       break;
-               }
-               if (!idev)
-                       continue;
-               return 0;
-       }
-
-       return -ENODEV;
-}
-
-static int __init ne_probe1(struct net_device *dev, int ioaddr)
-{
-       int i;
-       unsigned char SA_prom[32];
-       int wordlength = 2;
-       const char *name = NULL;
-       int start_page, stop_page;
-       int neX000, ctron, copam, bad_card;
-       int reg0, ret;
-       static unsigned version_printed;
-
-       if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
-               return -EBUSY;
-
-       reg0 = inb_p(ioaddr);
-       if (reg0 == 0xFF) {
-               ret = -ENODEV;
-               goto err_out;
-       }
-
-       /* Do a preliminary verification that we have a 8390. */
-       {
-               int regd;
-               outb_p(E8390_NODMA+E8390_PAGE1+E8390_STOP, ioaddr + E8390_CMD);
-               regd = inb_p(ioaddr + 0x0d);
-               outb_p(0xff, ioaddr + 0x0d);
-               outb_p(E8390_NODMA+E8390_PAGE0, ioaddr + E8390_CMD);
-               inb_p(ioaddr + EN0_COUNTER0); /* Clear the counter by reading. 
*/
-               if (inb_p(ioaddr + EN0_COUNTER0) != 0) {
-                       outb_p(reg0, ioaddr);
-                       outb_p(regd, ioaddr + 0x0d);    /* Restore the old 
values. */
-                       ret = -ENODEV;
-                       goto err_out;
-               }
-       }
-
-       if (ei_debug && version_printed++ == 0)
-               printk(KERN_INFO "%s" KERN_INFO "%s", version1, version2);
-
-       /* A user with a poor card that fails to ack the reset, or that
-          does not have a valid 0x57,0x57 signature can still use this
-          without having to recompile. Specifying an i/o address along
-          with an otherwise unused dev->mem_end value of "0xBAD" will
-          cause the driver to skip these parts of the probe. */
-
-       bad_card = ((dev->base_addr != 0) && (dev->mem_end == 0xbad));
-
-       /* Reset card. Who knows what dain-bramaged state it was left in. */
-
-       {
-               unsigned long reset_start_time = jiffies;
-
-               /* DON'T change these to inb_p/outb_p or reset will fail on 
clones. */
-               outb(inb(ioaddr + NE_RESET), ioaddr + NE_RESET);
-
-               while ((inb_p(ioaddr + EN0_ISR) & ENISR_RESET) == 0) {
-                       if (time_after(jiffies, reset_start_time + 2 * HZ / 
100)) {
-                               if (bad_card) {
-                                       printk(" (warning: no reset ack)");
-                                       break;
-                               } else {
-                                       // MSch: ARAnyM exits here
-                                       printk(" not found (no reset ack).\n");
-                                       ret = -ENODEV;
-                                       goto err_out;
-                               }
-                       }
-               }
-
-               outb_p(0xff, ioaddr + EN0_ISR);         /* Ack all intr. */
-       }
-
-       /* Read the 16 bytes of station address PROM.
-          We must first initialize registers, similar to NS8390_init(eifdev, 
0).
-          We can't reliably read the SAPROM address without this.
-          (I learned the hard way!). */
-       {
-               struct {unsigned char value, offset; } program_seq[] =
-               {
-                       {E8390_NODMA+E8390_PAGE0+E8390_STOP, E8390_CMD}, /* 
Select page 0*/
-                       {0x48,  EN0_DCFG},      /* Set byte-wide (0x48) access. 
*/
-                       {0x00,  EN0_RCNTLO},    /* Clear the count regs. */
-                       {0x00,  EN0_RCNTHI},
-                       {0x00,  EN0_IMR},       /* Mask completion irq. */
-                       {0xFF,  EN0_ISR},
-                       {E8390_RXOFF, EN0_RXCR},        /* 0x20  Set to monitor 
*/
-                       {E8390_TXOFF, EN0_TXCR},        /* 0x02  and loopback 
mode. */
-                       {32,    EN0_RCNTLO},
-                       {0x00,  EN0_RCNTHI},
-                       {0x00,  EN0_RSARLO},    /* DMA starting at 0x0000. */
-                       {0x00,  EN0_RSARHI},
-                       {E8390_RREAD+E8390_START, E8390_CMD},
-               };
-
-               for (i = 0; i < sizeof(program_seq)/sizeof(program_seq[0]); i++)
-                       outb_p(program_seq[i].value, ioaddr + 
program_seq[i].offset);
-
-       }
-       for (i = 0; i < 32 /*sizeof(SA_prom)*/; i += 2) {
-               SA_prom[i] = inb(ioaddr + NE_DATAPORT);
-               SA_prom[i+1] = inb(ioaddr + NE_DATAPORT);
-               if (SA_prom[i] != SA_prom[i+1])
-                       wordlength = 1;
-       }
-
-       if (wordlength == 2) {
-               for (i = 0; i < 16; i++)
-                       SA_prom[i] = SA_prom[i+i];
-               /* We must set the 8390 for word mode. */
-               outb_p(DCR_VAL, ioaddr + EN0_DCFG);
-               start_page = NESM_START_PG;
-
-               /*
-                * Realtek RTL8019AS datasheet says that the PSTOP register
-                * shouldn't exceed 0x60 in 8-bit mode.
-                * This chip can be identified by reading the signature from
-                * the  remote byte count registers (otherwise write-only)...
-                */
-               if ((DCR_VAL & 0x01) == 0 &&            /* 8-bit mode */
-                   inb(ioaddr + EN0_RCNTLO) == 0x50 &&
-                   inb(ioaddr + EN0_RCNTHI) == 0x70)
-                       stop_page = 0x60;
-               else
-                       stop_page = NESM_STOP_PG;
-       } else {
-               start_page = NE1SM_START_PG;
-               stop_page  = NE1SM_STOP_PG;
-       }
-
-#if  defined(CONFIG_PLAT_MAPPI) || defined(CONFIG_PLAT_OAKS32R)
-       neX000 = ((SA_prom[14] == 0x57 && SA_prom[15] == 0x57)
-               || (SA_prom[14] == 0x42 && SA_prom[15] == 0x42));
-#else
-       neX000 = (SA_prom[14] == 0x57 && SA_prom[15] == 0x57);
-#endif
-       ctron =  (SA_prom[0] == 0x00 && SA_prom[1] == 0x00 && SA_prom[2] == 
0x1d);
-       copam =  (SA_prom[14] == 0x49 && SA_prom[15] == 0x00);
-
-       /* Set up the rest of the parameters. */
-       if (neX000 || bad_card || copam) {
-               name = (wordlength == 2) ? "NE2000" : "NE1000";
-       } else if (ctron) {
-               name = (wordlength == 2) ? "Ctron-8" : "Ctron-16";
-               start_page = 0x01;
-               stop_page = (wordlength == 2) ? 0x40 : 0x20;
-       } else {
-#ifdef SUPPORT_NE_BAD_CLONES
-               /* Ack!  Well, there might be a *bad* NE*000 clone there.
-                  Check for total bogus addresses. */
-               for (i = 0; bad_clone_list[i].name8; i++) {
-                       if (SA_prom[0] == bad_clone_list[i].SAprefix[0] &&
-                           SA_prom[1] == bad_clone_list[i].SAprefix[1] &&
-                           SA_prom[2] == bad_clone_list[i].SAprefix[2]) {
-                               if (wordlength == 2) {
-                                       name = bad_clone_list[i].name16;
-                               } else {
-                                       name = bad_clone_list[i].name8;
-                               }
-                               break;
-                       }
-               }
-               if (bad_clone_list[i].name8 == NULL) {
-                       printk(" not found (invalid signature %2.2x %2.2x).\n",
-                              SA_prom[14], SA_prom[15]);
-                       ret = -ENXIO;
-                       goto err_out;
-               }
-#else
-               printk(" not found.\n");
-               ret = -ENXIO;
-               goto err_out;
-#endif
-       }
-
-       if (dev->irq < 2) {
-               unsigned long cookie = probe_irq_on();
-               outb_p(0x50, ioaddr + EN0_IMR); /* Enable one interrupt. */
-               outb_p(0x00, ioaddr + EN0_RCNTLO);
-               outb_p(0x00, ioaddr + EN0_RCNTHI);
-               outb_p(E8390_RREAD+E8390_START, ioaddr); /* Trigger it... */
-               mdelay(10);             /* wait 10ms for interrupt to propagate 
*/
-               outb_p(0x00, ioaddr + EN0_IMR);         /* Mask it again. */
-               dev->irq = probe_irq_off(cookie);
-               if (ei_debug > 2)
-                       printk(" autoirq is %d\n", dev->irq);
-       } else if (dev->irq == 2)
-               /* Fixup for users that don't know that IRQ 2 is really IRQ 9,
-                  or don't know which one to set. */
-               dev->irq = 9;
-
-       /*
-        * use timer based polling!
-        */
-       if (! dev->irq) {
-               printk(" failed to detect IRQ line. Assuming irq %d\n",
-                      ETHERNEC_RTL_8019_IRQ);
-               dev->irq = ETHERNEC_RTL_8019_IRQ;
-               /* timer routine set up in atari_ethernec_probe() */
-               if (dev->irq == IRQ_MFP_TIMD) {
-                       /* set Timer D data Register */
-                       st_mfp.tim_dt_d = 123;  /* 200 Hz */
-                       /* start timer D, div = 1:100 */
-                       st_mfp.tim_ct_cd = (st_mfp.tim_ct_cd & 0xf0) | 0x6;
-               }
-               /* Must make this shared in case other timer ints are needed */
-               ret = request_irq(dev->irq, atari_ei_interrupt, IRQF_SHARED, 
name, dev);
-               if (ret) {
-                       printk(" unable to get IRQ %d (errno=%d), polling 
instead.\n",
-                              dev->irq, ret);
-                       use_poll = 1;
-               }
-       } else {
-
-               /* Snarf the interrupt now.  There's no point in waiting since 
we cannot
-                  share and the board will usually be enabled. */
-               ret = request_irq(dev->irq, ei_interrupt, 0, name, dev);
-               if (ret) {
-                       printk(" unable to get IRQ %d (errno=%d).\n", dev->irq, 
ret);
-                       goto err_out;
-               }
-       }
-       dev->base_addr = ioaddr;
-
-#ifdef CONFIG_PLAT_MAPPI
-       outb_p(E8390_NODMA + E8390_PAGE1 + E8390_STOP,
-               ioaddr + E8390_CMD); /* 0x61 */
-       for (i = 0; i < ETH_ALEN; i++) {
-               dev->dev_addr[i] = SA_prom[i] = inb_p(ioaddr + 
EN1_PHYS_SHIFT(i));
-               printk(" %2.2x", SA_prom[i]);
-       }
-#else
-       for (i = 0; i < ETH_ALEN; i++) {
-               printk(" %2.2x", SA_prom[i]);
-               dev->dev_addr[i] = SA_prom[i];
-       }
-#endif
-
-       printk("\n%s: %s found at %#x, using IRQ %d.\n",
-               dev->name, name, ioaddr, dev->irq);
-
-       ei_status.name = name;
-       ei_status.tx_start_page = start_page;
-       ei_status.stop_page = stop_page;
-
-       /* Use 16-bit mode only if this wasn't overridden by DCR_VAL */
-       ei_status.word16 = (wordlength == 2 && (DCR_VAL & 0x01));
-
-       ei_status.rx_start_page = start_page + TX_PAGES;
-#ifdef PACKETBUF_MEMSIZE
-       /* Allow the packet buffer size to be overridden by know-it-alls. */
-       ei_status.stop_page = ei_status.tx_start_page + PACKETBUF_MEMSIZE;
-#endif
-
-       ei_status.reset_8390 = &ne_reset_8390;
-       ei_status.block_input = &ne_block_input;
-       ei_status.block_output = &ne_block_output;
-       ei_status.get_8390_hdr = &ne_get_8390_hdr;
-       ei_status.priv = 0;
-       dev->netdev_ops = &ei_netdev_ops;
-       NS8390_init(dev, 0);
-
-       ret = register_netdev(dev);
-       if (ret)
-               goto out_irq;
-       return 0;
-
-out_irq:
-       free_irq(dev->irq, dev);
-err_out:
-       release_region(ioaddr, NE_IO_EXTENT);
-       return ret;
-}
-
-/* Hard reset the card.  This used to pause for the same period that a
-   8390 reset command required, but that shouldn't be necessary. */
-
-static void ne_reset_8390(struct net_device *dev)
-{
-       unsigned long reset_start_time = jiffies;
-
-       if (ei_debug > 1)
-               printk(KERN_DEBUG "resetting the 8390 t=%ld...", jiffies);
-
-       /* DON'T change these to inb_p/outb_p or reset will fail on clones. */
-       outb(inb(NE_BASE + NE_RESET), NE_BASE + NE_RESET);
-
-       ei_status.txing = 0;
-       ei_status.dmaing = 0;
-
-       /* This check _should_not_ be necessary, omit eventually. */
-       while ((inb_p(NE_BASE+EN0_ISR) & ENISR_RESET) == 0) {
-               if (time_after(jiffies, reset_start_time + 2*HZ/100)) {
-                       printk(KERN_WARNING "%s: ne_reset_8390() did not 
complete.\n",
-                              dev->name);
-                       break;
-               }
-       }
-       outb_p(ENISR_RESET, NE_BASE + EN0_ISR); /* Ack intr. */
-}
-
-/* Grab the 8390 specific header. Similar to the block_input routine, but
-   we don't need to be concerned with ring wrap as the header will be at
-   the start of a page, so we optimize accordingly. */
-
-static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, 
int ring_page)
-{
-       int nic_base = dev->base_addr;
-
-       /* This *shouldn't* happen. If it does, it's the last thing you'll see 
*/
-
-       if (ei_status.dmaing)
-       {
-               printk(KERN_EMERG "%s: DMAing conflict in ne_get_8390_hdr "
-                       "[DMAstat:%d][irqlock:%d].\n",
-                       dev->name, ei_status.dmaing, ei_status.irqlock);
-               return;
-       }
-
-       ei_status.dmaing |= 0x01;
-       outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);
-       outb_p(sizeof(struct e8390_pkt_hdr), nic_base + EN0_RCNTLO);
-       outb_p(0, nic_base + EN0_RCNTHI);
-       outb_p(0, nic_base + EN0_RSARLO);               /* On page boundary */
-       outb_p(ring_page, nic_base + EN0_RSARHI);
-       outb_p(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-
-       if (ei_status.word16)
-               insw(NE_BASE + NE_DATAPORT, hdr, sizeof(struct 
e8390_pkt_hdr)>>1);
-       else
-               insb(NE_BASE + NE_DATAPORT, hdr, sizeof(struct e8390_pkt_hdr));
-
-       outb_p(ENISR_RDC, nic_base + EN0_ISR);  /* Ack intr. */
-       ei_status.dmaing &= ~0x01;
-
-       le16_to_cpus(&hdr->count);
-}
-
-/* Block input and output, similar to the Crynwr packet driver.  If you
-   are porting to a new ethercard, look at the packet driver source for hints.
-   The NEx000 doesn't share the on-board packet memory -- you have to put
-   the packet out through the "remote DMA" dataport using outb. */
-
-static void ne_block_input(struct net_device *dev, int count,
-                          struct sk_buff *skb, int ring_offset)
-{
-#ifdef NE_SANITY_CHECK
-       int xfer_count = count;
-#endif
-       int nic_base = dev->base_addr;
-       char *buf = skb->data;
-
-       /* This *shouldn't* happen. If it does, it's the last thing you'll see 
*/
-       if (ei_status.dmaing) {
-               printk(KERN_EMERG "%s: DMAing conflict in ne_block_input "
-                       "[DMAstat:%d][irqlock:%d].\n",
-                       dev->name, ei_status.dmaing, ei_status.irqlock);
-               return;
-       }
-       ei_status.dmaing |= 0x01;
-       outb_p(E8390_NODMA+E8390_PAGE0+E8390_START, nic_base+ NE_CMD);
-       outb_p(count & 0xff, nic_base + EN0_RCNTLO);
-       outb_p(count >> 8, nic_base + EN0_RCNTHI);
-       outb_p(ring_offset & 0xff, nic_base + EN0_RSARLO);
-       outb_p(ring_offset >> 8, nic_base + EN0_RSARHI);
-       outb_p(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-
-       if (ei_status.word16) {
-               insw(NE_BASE + NE_DATAPORT,buf,count>>1);
-               if (count & 0x01) {
-                       buf[count-1] = inb(NE_BASE + NE_DATAPORT);
-#ifdef NE_SANITY_CHECK
-                       xfer_count++;
-#endif
-               }
-       } else {
-               insb(NE_BASE + NE_DATAPORT, buf, count);
-       }
-
-#ifdef NE_SANITY_CHECK
-       /* This was for the ALPHA version only, but enough people have
-          been encountering problems so it is still here.  If you see
-          this message you either 1) have a slightly incompatible clone
-          or 2) have noise/speed problems with your bus. */
-
-       if (ei_debug > 1) {
-               /* DMA termination address check... */
-               int addr, tries = 20;
-               do {
-                       /* DON'T check for 'inb_p(EN0_ISR) & ENISR_RDC' here
-                          -- it's broken for Rx on some cards! */
-                       int high = inb_p(nic_base + EN0_RSARHI);
-                       int low = inb_p(nic_base + EN0_RSARLO);
-                       addr = (high << 8) + low;
-                       if (((ring_offset + xfer_count) & 0xff) == low)
-                               break;
-               } while (--tries > 0);
-               if (tries <= 0)
-                       printk(KERN_WARNING "%s: RX transfer address mismatch,"
-                               "%#4.4x (expected) vs. %#4.4x (actual).\n",
-                               dev->name, ring_offset + xfer_count, addr);
-       }
-#endif
-       outb_p(ENISR_RDC, nic_base + EN0_ISR);  /* Ack intr. */
-       ei_status.dmaing &= ~0x01;
-}
-
-static void ne_block_output(struct net_device *dev, int count,
-                           const unsigned char *buf, const int start_page)
-{
-       int nic_base = NE_BASE;
-       unsigned long dma_start;
-#ifdef NE_SANITY_CHECK
-       int retries = 0;
-#endif
-
-       /* Round the count up for word writes.  Do we need to do this?
-          What effect will an odd byte count have on the 8390?
-          I should check someday. */
-
-       if (ei_status.word16 && (count & 0x01))
-               count++;
-
-       /* This *shouldn't* happen. If it does, it's the last thing you'll see 
*/
-       if (ei_status.dmaing) {
-               printk(KERN_EMERG "%s: DMAing conflict in ne_block_output."
-                       "[DMAstat:%d][irqlock:%d]\n",
-                       dev->name, ei_status.dmaing, ei_status.irqlock);
-               return;
-       }
-       ei_status.dmaing |= 0x01;
-       /* We should already be in page 0, but to be safe... */
-       outb_p(E8390_PAGE0+E8390_START+E8390_NODMA, nic_base + NE_CMD);
-
-#ifdef NE_SANITY_CHECK
-retry:
-#endif
-
-#ifdef NE8390_RW_BUGFIX
-       /* Handle the read-before-write bug the same way as the
-          Crynwr packet driver -- the NatSemi method doesn't work.
-          Actually this doesn't always work either, but if you have
-          problems with your NEx000 this is better than nothing! */
-
-       outb_p(0x42, nic_base + EN0_RCNTLO);
-       outb_p(0x00,   nic_base + EN0_RCNTHI);
-       outb_p(0x42, nic_base + EN0_RSARLO);
-       outb_p(0x00, nic_base + EN0_RSARHI);
-       outb_p(E8390_RREAD+E8390_START, nic_base + NE_CMD);
-       /* Make certain that the dummy read has occurred. */
-       udelay(6);
-#endif
-
-       outb_p(ENISR_RDC, nic_base + EN0_ISR);
-
-       /* Now the normal output. */
-       outb_p(count & 0xff, nic_base + EN0_RCNTLO);
-       outb_p(count >> 8,   nic_base + EN0_RCNTHI);
-       outb_p(0x00, nic_base + EN0_RSARLO);
-       outb_p(start_page, nic_base + EN0_RSARHI);
-
-       outb_p(E8390_RWRITE+E8390_START, nic_base + NE_CMD);
-       if (ei_status.word16)
-               outsw(NE_BASE + NE_DATAPORT, buf, count>>1);
-       else
-               outsb(NE_BASE + NE_DATAPORT, buf, count);
-
-       dma_start = jiffies;
-
-#ifdef NE_SANITY_CHECK
-       /* This was for the ALPHA version only, but enough people have
-          been encountering problems so it is still here. */
-
-       if (ei_debug > 1) {
-               /* DMA termination address check... */
-               int addr, tries = 20;
-               do {
-                       int high = inb_p(nic_base + EN0_RSARHI);
-                       int low = inb_p(nic_base + EN0_RSARLO);
-                       addr = (high << 8) + low;
-                       if ((start_page << 8) + count == addr)
-                               break;
-               } while (--tries > 0);
-
-               if (tries <= 0) {
-                       printk(KERN_WARNING "%s: Tx packet transfer address 
mismatch,"
-                               "%#4.4x (expected) vs. %#4.4x (actual).\n",
-                               dev->name, (start_page << 8) + count, addr);
-                       if (retries++ == 0)
-                               goto retry;
-               }
-       }
-#endif
-
-       while ((inb_p(nic_base + EN0_ISR) & ENISR_RDC) == 0) {
-               if (time_after(jiffies, dma_start + 2*HZ/100)) {                
/* 20ms */
-                       printk(KERN_WARNING "%s: timeout waiting for Tx 
RDC.\n", dev->name);
-                       ne_reset_8390(dev);
-                       NS8390_init(dev, 1);
-                       break;
-               }
-       }
-
-       outb_p(ENISR_RDC, nic_base + EN0_ISR);  /* Ack intr. */
-       ei_status.dmaing &= ~0x01;
-       return;
-}
-
-
-#ifdef MODULE
-#define MAX_NE_CARDS   1       /* Max number of NE cards per module */
-static struct net_device *dev_ne[MAX_NE_CARDS];
-static int io[MAX_NE_CARDS] = { 0x300 };
-static int irq[MAX_NE_CARDS];
-static int bad[MAX_NE_CARDS];  /* 0xbad = bad sig or no reset ack */
-
-module_param_array(io, int, NULL, 0);
-module_param_array(irq, int, NULL, 0);
-module_param_array(bad, int, NULL, 0);
-module_param(use_poll, int, 0);
-MODULE_PARM_DESC(io, "I/O base address(es),required");
-MODULE_PARM_DESC(irq, "IRQ number(s)");
-MODULE_PARM_DESC(bad, "Accept card(s) with bad signatures");
-MODULE_PARM_DESC(use_poll, "Use timer interrupt to poll driver");
-MODULE_DESCRIPTION("NE1000/NE2000 ISA/PnP Ethernet driver");
-MODULE_LICENSE("GPL");
-
-/* This is set up so that no ISA autoprobe takes place. We can't guarantee
-that the ne2k probe is the last 8390 based probe to take place (as it
-is at boot) and so the probe will get confused by any other 8390 cards.
-ISA device autoprobes on a running machine are not recommended anyway. */
-
-int __init init_module(void)
-{
-       int this_dev, found = 0;
-
-       if (!MACH_IS_ATARI)
-               return -ENODEV;
-
-       for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
-               struct net_device *dev = alloc_ei_netdev();
-               if (!dev)
-                       break;
-               dev->irq = irq[this_dev];
-               dev->mem_end = bad[this_dev];
-               dev->base_addr = io[this_dev];
-               if (do_ne_probe(dev) == 0) {
-                       dev_ne[found++] = dev;
-                       continue;
-               }
-               free_netdev(dev);
-               if (found)
-                       break;
-               if (io[this_dev] != 0)
-                       printk(KERN_WARNING "atari_ethernec.c: No NE*000 card 
found at i/o = %#x\n", io[this_dev]);
-               else
-                       printk(KERN_NOTICE "atari_ethernec.c: You must supply 
\"io=0xNNN\" value(s) for ISA cards.\n");
-               return -ENXIO;
-       }
-       if (found)
-               return 0;
-       return -ENODEV;
-}
-
-static void cleanup_card(struct net_device *dev)
-{
-       struct pnp_dev *idev = (struct pnp_dev *)ei_status.priv;
-       if (idev)
-               pnp_device_detach(idev);
-       free_irq(dev->irq, dev);
-       release_region(dev->base_addr, NE_IO_EXTENT);
-}
-
-void cleanup_module(void)
-{
-       int this_dev;
-
-       for (this_dev = 0; this_dev < MAX_NE_CARDS; this_dev++) {
-               struct net_device *dev = dev_ne[this_dev];
-               if (dev) {
-                       if (use_poll)
-                               atari_ethernec_stop_poll(dev);
-                       unregister_netdev(dev);
-                       cleanup_card(dev);
-                       free_netdev(dev);
-               }
-       }
-}
-#endif /* MODULE */
-- 
1.7.0.4


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: 
http://lists.debian.org/[email protected]

Reply via email to