lkml.org 
[lkml]   [2003]   [Feb]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] PC-9800 subarch. support for 2.5.62-AC1 (10/21) NIC
    This is additional patch to support NEC PC-9800 subarchitecture
    against 2.5.62-ac1. (10/21)

    C-bus(PC98's legacy bus like ISA) network cards support.
    PCI netwwork card works fine without patch.

    Regards,
    Osamu Tomita

    diff -Nru linux-2.5.61/drivers/net/3c509.c linux98-2.5.61/drivers/net/3c509.c
    --- linux-2.5.61/drivers/net/3c509.c 2003-02-15 08:51:09.000000000 +0900
    +++ linux98-2.5.61/drivers/net/3c509.c 2003-02-15 14:38:08.000000000 +0900
    @@ -56,6 +56,10 @@
    v1.19b 08Nov2002 Marc Zyngier <maz@wild-wind.fr.eu.org>
    - Introduce driver model for EISA cards.
    */
    +/*
    + FIXES for PC-9800:
    + Shu Iwanaga: 3c569B(PC-9801 C-bus) support
    +*/

    #define DRV_NAME "3c509"
    #define DRV_VERSION "1.19b"
    @@ -257,7 +261,7 @@
    };
    #endif /* CONFIG_MCA */

    -#ifdef __ISAPNP__
    +#if defined(__ISAPNP__) && !defined(CONFIG_X86_PC9800)
    static struct isapnp_device_id el3_isapnp_adapters[] __initdata = {
    { ISAPNP_ANY_ID, ISAPNP_ANY_ID,
    ISAPNP_VENDOR('T', 'C', 'M'), ISAPNP_FUNCTION(0x5090),
    @@ -350,7 +354,7 @@
    if (lp->pmdev)
    pm_unregister(lp->pmdev);
    #endif
    -#ifdef __ISAPNP__
    +#if defined(__ISAPNP__) && !defined(CONFIG_X86_PC9800)
    if (lp->type == EL3_PNP)
    pnp_device_detach(to_pnp_dev(lp->dev));
    #endif
    @@ -368,12 +372,12 @@
    int ioaddr, irq, if_port;
    u16 phys_addr[3];
    static int current_tag;
    -#ifdef __ISAPNP__
    +#if defined(__ISAPNP__) && !defined(CONFIG_X86_PC9800)
    static int pnp_cards;
    struct pnp_dev *idev = NULL;
    #endif /* __ISAPNP__ */

    -#ifdef __ISAPNP__
    +#if defined(__ISAPNP__) && !defined(CONFIG_X86_PC9800)
    if (nopnp == 1)
    goto no_pnp;

    @@ -421,6 +425,9 @@
    no_pnp:
    #endif /* __ISAPNP__ */

    +#ifdef CONFIG_X86_PC9800
    + id_port = 0x71d0;
    +#else
    /* Select an open I/O location at 0x1*0 to do contention select. */
    for ( ; id_port < 0x200; id_port += 0x10) {
    if (check_region(id_port, 1))
    @@ -435,6 +442,7 @@
    printk(" WARNING: No I/O port available for 3c509 activation.\n");
    return -ENODEV;
    }
    +#endif /* CONFIG_X86_PC9800 */
    /* Next check for all ISA bus boards by sending the ID sequence to the
    ID_PORT. We find cards past the first by setting the 'current_tag'
    on cards as they are found. Cards with their tag set will not
    @@ -465,7 +473,7 @@
    phys_addr[i] = htons(id_read_eeprom(i));
    }

    -#ifdef __ISAPNP__
    +#if defined(__ISAPNP__) && !defined(CONFIG_X86_PC9800)
    if (nopnp == 0) {
    /* The ISA PnP 3c509 cards respond to the ID sequence.
    This check is needed in order not to register them twice. */
    @@ -490,9 +498,19 @@
    {
    unsigned int iobase = id_read_eeprom(8);
    if_port = iobase >> 14;
    +#ifdef CONFIG_X86_PC9800
    + ioaddr = 0x40d0 + ((iobase & 0x1f) << 8);
    +#else
    ioaddr = 0x200 + ((iobase & 0x1f) << 4);
    +#endif
    }
    irq = id_read_eeprom(9) >> 12;
    +#ifdef CONFIG_X86_PC9800
    + if (irq == 7)
    + irq = 6;
    + else if (irq == 15)
    + irq = 13;
    +#endif

    if (!(dev = init_etherdev(NULL, sizeof(struct el3_private))))
    return -ENOMEM;
    @@ -522,7 +540,11 @@
    outb(0xd0 + ++current_tag, id_port);

    /* Activate the adaptor at the EEPROM location. */
    +#ifdef CONFIG_X86_PC9800
    + outb((ioaddr >> 8) | 0xe0, id_port);
    +#else
    outb((ioaddr >> 4) | 0xe0, id_port);
    +#endif

    EL3WINDOW(0);
    if (inw(ioaddr) != 0x6d50) {
    @@ -534,7 +556,7 @@
    /* Free the interrupt so that some other card can use it. */
    outw(0x0f00, ioaddr + WN0_IRQ);

    -#ifdef __ISAPNP__
    +#if defined(__ISAPNP__) && !defined(CONFIG_X86_PC9800)
    found: /* PNP jumps here... */
    #endif /* __ISAPNP__ */

    @@ -543,7 +565,7 @@
    dev->irq = irq;
    dev->if_port = if_port;
    lp = dev->priv;
    -#ifdef __ISAPNP__
    +#if defined(__ISAPNP__) && !defined(CONFIG_X86_PC9800)
    lp->dev = &idev->dev;
    #endif

    @@ -1388,6 +1410,12 @@
    outw(0x0001, ioaddr + 4);

    /* Set the IRQ line. */
    +#ifdef CONFIG_X86_PC9800
    + if (dev->irq == 6)
    + dev->irq = 7;
    + else if (dev->irq == 13)
    + dev->irq = 15;
    +#endif
    outw((dev->irq << 12) | 0x0f00, ioaddr + WN0_IRQ);

    /* Set the station address in window 2 each time opened. */
    @@ -1550,7 +1578,7 @@
    MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");
    MODULE_PARM_DESC(xcvr,"tranceiver(s) (0=internal, 1=external)");
    MODULE_PARM_DESC(max_interrupt_work, "maximum events handled per interrupt");
    -#ifdef __ISAPNP__
    +#if defined(__ISAPNP__) && !defined(CONFIG_X86_PC9800)
    MODULE_PARM(nopnp, "i");
    MODULE_PARM_DESC(nopnp, "disable ISA PnP support (0-1)");
    MODULE_DEVICE_TABLE(isapnp, el3_isapnp_adapters);
    diff -Nru linux-2.5.42/drivers/net/8390.h linux98-2.5.42/drivers/net/8390.h
    --- linux-2.5.42/drivers/net/8390.h 2002-10-12 13:22:14.000000000 +0900
    +++ linux98-2.5.42/drivers/net/8390.h 2002-10-15 23:03:22.000000000 +0900
    @@ -123,7 +123,8 @@
    #define inb_p(port) in_8(port)
    #define outb_p(val,port) out_8(port,val)

    -#elif defined(CONFIG_ARM_ETHERH) || defined(CONFIG_ARM_ETHERH_MODULE)
    +#elif defined(CONFIG_ARM_ETHERH) || defined(CONFIG_ARM_ETHERH_MODULE) || \
    + defined(CONFIG_NET_CBUS)
    #define EI_SHIFT(x) (ei_local->reg_offset[x])
    #else
    #define EI_SHIFT(x) (x)
    diff -Nru linux-2.5.62-ac1/drivers/net/Kconfig linux98-2.5.62-ac1/drivers/net/Kconfig
    --- linux-2.5.62-ac1/drivers/net/Kconfig 2003-02-18 07:56:53.000000000 +0900
    +++ linux98-2.5.62-ac1/drivers/net/Kconfig 2003-02-21 11:07:56.000000000 +0900
    @@ -663,7 +663,7 @@
    as <file:Documentation/networking/net-modules.txt>.

    config EL3
    - tristate "3c509/3c529 (MCA)/3c579 \"EtherLink III\" support"
    + tristate "3c509/3c529 (MCA)/3c569B (98)/3c579 \"EtherLink III\" support"
    depends on NET_VENDOR_3COM && (ISA || EISA || MCA)
    ---help---
    If you have a network (Ethernet) card belonging to the 3Com
    @@ -932,7 +932,7 @@
    source "drivers/net/tulip/Kconfig"

    config AT1700
    - tristate "AT1700/1720 support (EXPERIMENTAL)"
    + tristate "AT1700/1720/RE1000Plus(C-Bus) support (EXPERIMENTAL)"
    depends on NET_ETHERNET && (ISA || MCA) && EXPERIMENTAL
    ---help---
    If you have a network (Ethernet) card of this type, say Y and read
    @@ -978,7 +978,7 @@

    config NET_ISA
    bool "Other ISA cards"
    - depends on NET_ETHERNET && ISA
    + depends on NET_ETHERNET && ISA && !X86_PC9800
    ---help---
    If your network (Ethernet) card hasn't been mentioned yet and its
    bus system (that's the way the cards talks to the other components
    @@ -1176,6 +1176,55 @@
    the Ethernet-HOWTO, available from
    <http://www.linuxdoc.org/docs.html#howto>.

    +config NET_CBUS
    + bool "NEC PC-9800 C-bus cards"
    + depends on NET_ETHERNET && ISA && X86_PC9800
    + ---help---
    + If your network (Ethernet) card hasn't been mentioned yet and its
    + bus system (that's the way the cards talks to the other components
    + of your computer) is NEC PC-9800 C-Bus, say Y.
    +
    +config NE2K_CBUS
    + tristate "Most NE2000-based Ethernet support"
    + depends on NET_CBUS
    +
    +config NE2K_CBUS_EGY98
    + bool "Melco EGY-98 support"
    + depends on NE2K_CBUS
    +
    +config NE2K_CBUS_LGY98
    + bool "Melco LGY-98 support"
    + depends on NE2K_CBUS
    +
    +config NE2K_CBUS_ICM
    + bool "ICM IF-27xxET support"
    + depends on NE2K_CBUS
    +
    +config NE2K_CBUS_IOLA98
    + bool "I-O DATA LA-98 support"
    + depends on NE2K_CBUS
    +
    +config NE2K_CBUS_CNET98EL
    + bool "Contec C-NET(98)E/L support"
    + depends on NE2K_CBUS
    +
    +config NE2K_CBUS_CNET98EL_IO_BASE
    + hex "C-NET(98)E/L I/O base address (0xaaed or 0x55ed)"
    + depends on NE2K_CBUS_CNET98EL
    + default "0xaaed"
    +
    +config NE2K_CBUS_ATLA98
    + bool "Allied Telesis LA-98 Support"
    + depends on NE2K_CBUS
    +
    +config NE2K_CBUS_BDN
    + bool "ELECOM Laneed LD-BDN[123]A Support"
    + depends on NE2K_CBUS
    +
    +config NE2K_CBUS_NEC108
    + bool "NEC PC-9801-108 Support"
    + depends on NE2K_CBUS
    +
    config SKMC
    tristate "SKnet MCA support"
    depends on NET_ETHERNET && MCA
    diff -Nru linux-2.5.61/drivers/net/Makefile linux98-2.5.61/drivers/net/Makefile
    --- linux-2.5.61/drivers/net/Makefile 2003-02-15 08:51:25.000000000 +0900
    +++ linux98-2.5.61/drivers/net/Makefile 2003-02-15 14:24:25.000000000 +0900
    @@ -86,6 +86,7 @@
    obj-$(CONFIG_WD80x3) += wd.o 8390.o
    obj-$(CONFIG_EL2) += 3c503.o 8390.o
    obj-$(CONFIG_NE2000) += ne.o 8390.o
    +obj-$(CONFIG_NE2K_CBUS) += ne.o 8390.o
    obj-$(CONFIG_NE2_MCA) += ne2.o 8390.o
    obj-$(CONFIG_HPLAN) += hp.o 8390.o
    obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390.o
    diff -Nru linux-2.5.42/drivers/net/Makefile.lib linux98-2.5.42/drivers/net/Makefile.lib
    --- linux-2.5.42/drivers/net/Makefile.lib 2002-10-12 13:22:18.000000000 +0900
    +++ linux98-2.5.42/drivers/net/Makefile.lib 2002-10-15 23:03:22.000000000 +0900
    @@ -19,6 +19,7 @@
    obj-$(CONFIG_MACMACE) += crc32.o
    obj-$(CONFIG_MIPS_AU1000_ENET) += crc32.o
    obj-$(CONFIG_NATSEMI) += crc32.o
    +obj-$(CONFIG_NE2K_CBUS) += crc32.o
    obj-$(CONFIG_PCMCIA_FMVJ18X) += crc32.o
    obj-$(CONFIG_PCMCIA_SMC91C92) += crc32.o
    obj-$(CONFIG_PCMCIA_XIRTULIP) += crc32.o
    diff -Nru linux-2.5.62-ac1/drivers/net/Space.c linux98-2.5.62-ac1/drivers/net/Space.c
    --- linux-2.5.62-ac1/drivers/net/Space.c 2003-02-21 10:00:59.000000000 +0900
    +++ linux98-2.5.62-ac1/drivers/net/Space.c 2003-02-21 11:07:56.000000000 +0900
    @@ -229,7 +229,7 @@
    #ifdef CONFIG_E2100 /* Cabletron E21xx series. */
    {e2100_probe, 0},
    #endif
    -#ifdef CONFIG_NE2000 /* ISA (use ne2k-pci for PCI cards) */
    +#if defined(CONFIG_NE2000) || defined(CONFIG_NE2K_CBUS) /* ISA & PC-9800 CBUS (use ne2k-pci for PCI cards) */
    {ne_probe, 0},
    #endif
    #ifdef CONFIG_LANCE /* ISA/VLB (use pcnet32 for PCI cards) */
    diff -Nru linux-2.5.57/drivers/net/at1700.c linux98-2.5.57/drivers/net/at1700.c
    --- linux-2.5.57/drivers/net/at1700.c 2003-01-14 09:31:51.000000000 +0900
    +++ linux98-2.5.57/drivers/net/at1700.c 2003-01-14 09:55:53.000000000 +0900
    @@ -34,6 +34,10 @@
    only is it difficult to detect, it also moves around in I/O space in
    response to inb()s from other device probes!
    */
    +/*
    + 99/03/03 Allied Telesis RE1000 Plus support by T.Hagawa
    + 99/12/30 port to 2.3.35 by K.Takai
    +*/

    #include <linux/config.h>
    #include <linux/errno.h>
    @@ -76,10 +80,17 @@
    * ISA
    */

    +#ifndef CONFIG_X86_PC9800
    static int at1700_probe_list[] __initdata = {
    0x260, 0x280, 0x2a0, 0x240, 0x340, 0x320, 0x380, 0x300, 0
    };

    +#else /* CONFIG_X86_PC9800 */
    +static int at1700_probe_list[] __initdata = {
    + 0x1d6, 0x1d8, 0x1da, 0x1d4, 0xd4, 0xd2, 0xd8, 0xd0, 0
    +};
    +
    +#endif /* CONFIG_X86_PC9800 */
    /*
    * MCA
    */
    @@ -122,6 +133,7 @@


    /* Offsets from the base address. */
    +#ifndef CONFIG_X86_PC9800
    #define STATUS 0
    #define TX_STATUS 0
    #define RX_STATUS 1
    @@ -136,6 +148,7 @@
    #define TX_START 10
    #define COL16CNTL 11 /* Controll Reg for 16 collisions */
    #define MODE13 13
    +#define RX_CTRL 14
    /* Configuration registers only on the '865A/B chips. */
    #define EEPROM_Ctrl 16
    #define EEPROM_Data 17
    @@ -144,8 +157,39 @@
    #define IOCONFIG 18 /* Either read the jumper, or move the I/O. */
    #define IOCONFIG1 19
    #define SAPROM 20 /* The station address PROM, if no EEPROM. */
    +#define MODE24 24
    #define RESET 31 /* Write to reset some parts of the chip. */
    #define AT1700_IO_EXTENT 32
    +#define PORT_OFFSET(o) (o)
    +#else /* CONFIG_X86_PC9800 */
    +#define STATUS (0x0000)
    +#define TX_STATUS (0x0000)
    +#define RX_STATUS (0x0001)
    +#define TX_INTR (0x0200)/* Bit-mapped interrupt enable registers. */
    +#define RX_INTR (0x0201)
    +#define TX_MODE (0x0400)
    +#define RX_MODE (0x0401)
    +#define CONFIG_0 (0x0600)/* Misc. configuration settings. */
    +#define CONFIG_1 (0x0601)
    +/* Run-time register bank 2 definitions. */
    +#define DATAPORT (0x0800)/* Word-wide DMA or programmed-I/O dataport. */
    +#define TX_START (0x0a00)
    +#define COL16CNTL (0x0a01)/* Controll Reg for 16 collisions */
    +#define MODE13 (0x0c01)
    +#define RX_CTRL (0x0e00)
    +/* Configuration registers only on the '865A/B chips. */
    +#define EEPROM_Ctrl (0x1000)
    +#define EEPROM_Data (0x1200)
    +#define CARDSTATUS 16 /* FMV-18x Card Status */
    +#define CARDSTATUS1 17 /* FMV-18x Card Status */
    +#define IOCONFIG (0x1400)/* Either read the jumper, or move the I/O. */
    +#define IOCONFIG1 (0x1600)
    +#define SAPROM 20 /* The station address PROM, if no EEPROM. */
    +#define MODE24 (0x1800)/* The station address PROM, if no EEPROM. */
    +#define RESET (0x1e01)/* Write to reset some parts of the chip. */
    +#define PORT_OFFSET(o) ({ int _o_ = (o); (_o_ & ~1) * 0x100 + (_o_ & 1); })
    +#endif /* CONFIG_X86_PC9800 */
    +

    #define TX_TIMEOUT 10

    @@ -225,8 +269,20 @@
    int slot, ret = -ENODEV;
    struct net_local *lp;

    +#ifndef CONFIG_X86_PC9800
    if (!request_region(ioaddr, AT1700_IO_EXTENT, dev->name))
    return -EBUSY;
    +#else
    + for (i = 0; i < 0x2000; i += 0x0200) {
    + if (!request_region(ioaddr + i, 2, dev->name)) {
    + while (i > 0) {
    + i -= 0x0200;
    + release_region(ioaddr + i, 2);
    + }
    + return -EBUSY;
    + }
    + }
    +#endif

    /* Resetting the chip doesn't reset the ISA interface, so don't bother.
    That means we have to be careful with the register values we probe for.
    @@ -317,10 +373,17 @@
    /* Reset the internal state machines. */
    outb(0, ioaddr + RESET);

    - if (is_at1700)
    + if (is_at1700) {
    +#ifndef CONFIG_X86_PC9800
    irq = at1700_irqmap[(read_eeprom(ioaddr, 12)&0x04)
    | (read_eeprom(ioaddr, 0)>>14)];
    - else {
    +#else
    + {
    + char re1000plus_irqmap[4] = {3, 5, 6, 12};
    + irq = re1000plus_irqmap[inb(ioaddr + IOCONFIG1) >> 6];
    + }
    +#endif
    + } else {
    /* Check PnP mode for FMV-183/184/183A/184A. */
    /* This PnP routine is very poor. IO and IRQ should be known. */
    if (inb(ioaddr + CARDSTATUS1) & 0x20) {
    @@ -392,18 +455,22 @@
    /* Set the station address in bank zero. */
    outb(0x00, ioaddr + CONFIG_1);
    for (i = 0; i < 6; i++)
    - outb(dev->dev_addr[i], ioaddr + 8 + i);
    + outb(dev->dev_addr[i], ioaddr + PORT_OFFSET(8 + i));

    /* Switch to bank 1 and set the multicast table to accept none. */
    outb(0x04, ioaddr + CONFIG_1);
    for (i = 0; i < 8; i++)
    - outb(0x00, ioaddr + 8 + i);
    + outb(0x00, ioaddr + PORT_OFFSET(8 + i));


    /* Switch to bank 2 */
    /* Lock our I/O address, and set manual processing mode for 16 collisions. */
    outb(0x08, ioaddr + CONFIG_1);
    +#ifndef CONFIG_X86_PC9800
    outb(dev->if_port, ioaddr + MODE13);
    +#else
    + outb(0, ioaddr + MODE13);
    +#endif
    outb(0x00, ioaddr + COL16CNTL);

    if (net_debug)
    @@ -447,7 +514,12 @@
    kfree(dev->priv);
    dev->priv = NULL;
    err_out:
    +#ifndef CONFIG_X86_PC9800
    release_region(ioaddr, AT1700_IO_EXTENT);
    +#else
    + for (i = 0; i < 0x2000; i += 0x0200)
    + release_region(ioaddr + i, 2);
    +#endif
    return ret;
    }

    @@ -459,7 +531,11 @@
    #define EE_DATA_READ 0x80 /* EEPROM chip data out, in reg. 17. */

    /* Delay between EEPROM clock transitions. */
    +#ifndef CONFIG_X86_PC9800
    #define eeprom_delay() do { } while (0)
    +#else
    +#define eeprom_delay() __asm__ ("out%B0 %%al,%0" :: "N"(0x5f))
    +#endif

    /* The EEPROM commands include the alway-set leading bit. */
    #define EE_WRITE_CMD (5 << 6)
    @@ -542,12 +618,12 @@
    inw (ioaddr + STATUS), inb (ioaddr + TX_STATUS) & 0x80
    ? "IRQ conflict" : "network cable problem");
    printk ("%s: timeout registers: %04x %04x %04x %04x %04x %04x %04x %04x.\n",
    - dev->name, inw (ioaddr + 0), inw (ioaddr + 2), inw (ioaddr + 4),
    - inw (ioaddr + 6), inw (ioaddr + 8), inw (ioaddr + 10),
    - inw (ioaddr + 12), inw (ioaddr + 14));
    + dev->name, inw(ioaddr + TX_STATUS), inw(ioaddr + TX_INTR), inw(ioaddr + TX_MODE),
    + inw(ioaddr + CONFIG_0), inw(ioaddr + DATAPORT), inw(ioaddr + TX_START),
    + inw(ioaddr + MODE13 - 1), inw(ioaddr + RX_CTRL));
    lp->stats.tx_errors++;
    /* ToDo: We should try to restart the adaptor... */
    - outw (0xffff, ioaddr + 24);
    + outw(0xffff, ioaddr + MODE24);
    outw (0xffff, ioaddr + TX_STATUS);
    outb (0x5a, ioaddr + CONFIG_0);
    outb (0xe8, ioaddr + CONFIG_1);
    @@ -704,7 +780,7 @@
    dev->name, inb(ioaddr + RX_MODE), status);
    #ifndef final_version
    if (status == 0) {
    - outb(0x05, ioaddr + 14);
    + outb(0x05, ioaddr + RX_CTRL);
    break;
    }
    #endif
    @@ -724,7 +800,7 @@
    dev->name, pkt_len);
    /* Prime the FIFO and then flush the packet. */
    inw(ioaddr + DATAPORT); inw(ioaddr + DATAPORT);
    - outb(0x05, ioaddr + 14);
    + outb(0x05, ioaddr + RX_CTRL);
    lp->stats.rx_errors++;
    break;
    }
    @@ -734,7 +810,7 @@
    dev->name, pkt_len);
    /* Prime the FIFO and then flush the packet. */
    inw(ioaddr + DATAPORT); inw(ioaddr + DATAPORT);
    - outb(0x05, ioaddr + 14);
    + outb(0x05, ioaddr + RX_CTRL);
    lp->stats.rx_dropped++;
    break;
    }
    @@ -761,7 +837,7 @@
    if ((inb(ioaddr + RX_MODE) & 0x40) == 0x40)
    break;
    inw(ioaddr + DATAPORT); /* dummy status read */
    - outb(0x05, ioaddr + 14);
    + outb(0x05, ioaddr + RX_CTRL);
    }

    if (net_debug > 5)
    @@ -851,7 +927,7 @@
    /* Switch to bank 1 and set the multicast table. */
    outw((saved_bank & ~0x0C00) | 0x0480, ioaddr + CONFIG_0);
    for (i = 0; i < 8; i++)
    - outb(mc_filter[i], ioaddr + 8 + i);
    + outb(mc_filter[i], ioaddr + PORT_OFFSET(8 + i));
    memcpy(lp->mc_filter, mc_filter, sizeof(mc_filter));
    outw(saved_bank, ioaddr + CONFIG_0);
    }
    @@ -861,7 +937,12 @@

    #ifdef MODULE
    static struct net_device dev_at1700;
    +#ifndef CONFIG_X86_PC9800
    static int io = 0x260;
    +#else
    +static int io = 0xd0;
    +#endif
    +
    static int irq;

    MODULE_PARM(io, "i");
    @@ -901,7 +982,15 @@

    /* If we don't do this, we can't re-insmod it later. */
    free_irq(dev_at1700.irq, NULL);
    +#ifndef CONFIG_X86_PC9800
    release_region(dev_at1700.base_addr, AT1700_IO_EXTENT);
    +#else
    + {
    + int i;
    + for (i = 0; i < 0x2000; i += 0x200)
    + release_region(dev_at1700.base_addr + i, 2);
    + }
    +#endif
    }
    #endif /* MODULE */
    MODULE_LICENSE("GPL");
    diff -Nru linux-2.5.61/drivers/net/ne.c linux98-2.5.61/drivers/net/ne.c
    --- linux-2.5.61/drivers/net/ne.c 2003-02-15 08:51:42.000000000 +0900
    +++ linux98-2.5.61/drivers/net/ne.c 2003-02-16 11:49:42.000000000 +0900
    @@ -109,6 +109,10 @@
    {"PCM-4823", "PCM-4823", {0x00, 0xc0, 0x6c}}, /* Broken Advantech MoBo */
    {"REALTEK", "RTL8019", {0x00, 0x00, 0xe8}}, /* no-name with Realtek chip */
    {"LCS-8834", "LCS-8836", {0x04, 0x04, 0x37}}, /* ShinyNet (SET) */
    + {"LA/T-98?", "LA/T-98", {0x00, 0xa0, 0xb0}}, /* I/O Data */
    + {"EGY-98?", "EGY-98", {0x00, 0x40, 0x26}}, /* Melco EGY98 */
    + {"ICM?", "ICM-27xx-ET", {0x00, 0x80, 0xc8}}, /* ICM IF-27xx-ET */
    + {"CNET-98/EL?", "CNET(98)E/L", {0x00, 0x80, 0x4C}}, /* Contec CNET-98/EL */
    {0,}
    };
    #endif
    @@ -116,9 +120,10 @@
    /* ---- 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_CMD EI_SHIFT(0x00)
    +#define NE_DATAPORT EI_SHIFT(0x10) /* NatSemi-defined port window offset. */
    +#define NE_RESET EI_SHIFT(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 */
    @@ -126,9 +131,15 @@
    #define NESM_START_PG 0x40 /* First page of TX buffer */
    #define NESM_STOP_PG 0x80 /* Last page +1 of RX ring */

    +#ifdef CONFIG_NET_CBUS
    +#include "ne2k_cbus.h"
    +#endif
    +
    int ne_probe(struct net_device *dev);
    static int ne_probe1(struct net_device *dev, int ioaddr);
    +#ifndef CONFIG_NET_CBUS
    static int ne_probe_isapnp(struct net_device *dev);
    +#endif

    static int ne_open(struct net_device *dev);
    static int ne_close(struct net_device *dev);
    @@ -163,6 +174,8 @@
    E2010 starts at 0x100 and ends at 0x4000.
    E2010-x starts at 0x100 and ends at 0xffff. */

    +#ifndef CONFIG_NET_CBUS
    +
    int __init ne_probe(struct net_device *dev)
    {
    unsigned int base_addr = dev->base_addr;
    @@ -236,6 +249,116 @@
    return -ENODEV;
    }

    +#else /* CONFIG_NET_CBUS */
    +
    +int __init ne_probe(struct net_device *dev)
    +{
    + unsigned int base_addr = dev->base_addr;
    +
    + SET_MODULE_OWNER(dev);
    +
    + if (ei_debug > 2)
    + printk(KERN_DEBUG "ne_probe(): entered.\n");
    +
    + /* If CONFIG_NET_CBUS,
    + we need dev->priv->reg_offset BEFORE to probe */
    + if (ne2k_cbus_init(dev) != 0) {
    + return -ENOMEM;
    + }
    +
    + /* First check any supplied i/o locations. User knows best. <cough> */
    + if (base_addr > 0) {
    + int result;
    + const struct ne2k_cbus_hwinfo *hw = ne2k_cbus_get_hwinfo((int)(dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK));
    +
    + if (ei_debug > 2)
    + printk(KERN_DEBUG "ne_probe(): call ne_probe_cbus(base_addr=0x%x)\n", base_addr);
    +
    + result = ne_probe_cbus(dev, hw, base_addr);
    + if (result != 0)
    + ne2k_cbus_destroy(dev);
    +
    + return result;
    + }
    +
    + if (ei_debug > 2)
    + printk(KERN_DEBUG "ne_probe(): base_addr is not specified.\n");
    +
    +#ifndef MODULE
    + /* Last resort. The semi-risky C-Bus auto-probe. */
    + if (ei_debug > 2)
    + printk(KERN_DEBUG "ne_probe(): auto-probe start.\n");
    +
    + {
    + const struct ne2k_cbus_hwinfo *hw = ne2k_cbus_get_hwinfo((int)(dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK));
    +
    + if (hw && hw->hwtype) {
    + const unsigned short *plist;
    + for (plist = hw->portlist; *plist; plist++) {
    + const struct ne2k_cbus_region *rlist;
    + for (rlist = hw->regionlist; rlist->range; rlist++) {
    + if (check_region(*plist+rlist->start, rlist->range))
    + break;
    + }
    + if (rlist->range) {
    + /* check_region() failed */
    + continue; /* try next base port */
    + }
    + /* check_region() succeeded */
    + if (ne_probe_cbus(dev,hw,*plist) == 0)
    + return 0;
    + }
    + } else {
    + for (hw = &ne2k_cbus_hwinfo_list[0]; hw->hwtype; hw++) {
    + const unsigned short *plist;
    + for(plist=hw->portlist; *plist; plist++){
    + const struct ne2k_cbus_region *rlist;
    +
    + for (rlist = hw->regionlist; rlist->range; rlist++) {
    + if (check_region(*plist+rlist->start, rlist->range))
    + break;
    + }
    + if (rlist->range) {
    + /* check_region() failed */
    + continue; /* try next base port */
    + }
    + /* check_region() succeeded */
    + if (ne_probe_cbus(dev,hw,*plist) == 0)
    + return 0;
    + }
    + }
    + }
    + }
    +#endif
    +
    + ne2k_cbus_destroy(dev);
    +
    + return -ENODEV;
    +}
    +
    +static int __init ne_probe_cbus(struct net_device *dev, const struct ne2k_cbus_hwinfo *hw, int ioaddr)
    +{
    + if (ei_debug > 2)
    + printk(KERN_DEBUG "ne_probe_cbus(): entered. (called from %p)\n",
    + __builtin_return_address(0));
    +
    + if (hw && hw->hwtype) {
    + ne2k_cbus_set_hwtype(dev, hw, ioaddr);
    + return ne_probe1(dev, ioaddr);
    + } else {
    + /* auto detect */
    +
    + printk(KERN_DEBUG "ne_probe_cbus(): try to determine hardware types.\n");
    + for (hw = &ne2k_cbus_hwinfo_list[0]; hw->hwtype; hw++) {
    + ne2k_cbus_set_hwtype(dev, hw, ioaddr);
    + if (ne_probe1(dev, ioaddr)==0)
    + return 0;
    + }
    + }
    + return ENODEV;
    +}
    +#endif /* !CONFIG_NET_CBUS */
    +
    static int __init ne_probe1(struct net_device *dev, int ioaddr)
    {
    int i;
    @@ -243,30 +366,62 @@
    int wordlength = 2;
    const char *name = NULL;
    int start_page, stop_page;
    - int neX000, ctron, copam, bad_card;
    + int neX000, bad_card;
    +#ifndef CONFIG_NET_CBUS
    + int ctron, copam;
    +#endif
    int reg0, ret;
    static unsigned version_printed;
    +#ifdef CONFIG_NET_CBUS
    + const struct ne2k_cbus_hwinfo *hw = ne2k_cbus_get_hwinfo((int)(dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK));
    + struct ei_device *ei_local = (struct ei_device *)(dev->priv);
    +#endif
    +
    +#ifdef CONFIG_NE2K_CBUS_CNET98EL
    + if (hw->hwtype == NE2K_CBUS_HARDWARE_TYPE_CNET98EL) {
    + outb_p(0, CONFIG_NE2K_CBUS_CNET98EL_IO_BASE);
    + /* udelay(5000); */
    + outb_p(1, CONFIG_NE2K_CBUS_CNET98EL_IO_BASE);
    + /* udelay(5000); */
    + outb_p((ioaddr & 0xf000) >> 8 | 0x08 | 0x01, CONFIG_NE2K_CBUS_CNET98EL_IO_BASE + 2);
    + /* udelay(5000); */
    + }
    +#endif

    +#ifndef CONFIG_NET_CBUS
    if (!request_region(ioaddr, NE_IO_EXTENT, dev->name))
    return -EBUSY;
    +#else /* CONFIG_NET_CBUS */
    + {
    + const struct ne2k_cbus_region *rlist;
    + for (rlist = hw->regionlist; rlist->range; rlist++) {
    + if (!request_region(ioaddr + rlist->start,
    + rlist->range, dev->name))
    + return -EBUSY;
    + }
    + }
    +#endif /* !CONFIG_NET_CBUS */

    - reg0 = inb_p(ioaddr);
    + reg0 = inb_p(ioaddr + EI_SHIFT(0));
    if (reg0 == 0xFF) {
    ret = -ENODEV;
    goto err_out;
    }

    /* Do a preliminary verification that we have a 8390. */
    +#ifdef CONFIG_NE2K_CBUS_CNET98EL
    + if (hw->hwtype != NE2K_CBUS_HARDWARE_TYPE_CNET98EL)
    +#endif
    {
    int regd;
    outb_p(E8390_NODMA+E8390_PAGE1+E8390_STOP, ioaddr + E8390_CMD);
    - regd = inb_p(ioaddr + 0x0d);
    - outb_p(0xff, ioaddr + 0x0d);
    + regd = inb_p(ioaddr + EI_SHIFT(0x0d));
    + outb_p(0xff, ioaddr + EI_SHIFT(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. */
    + outb_p(regd, ioaddr + EI_SHIFT(0x0d)); /* Restore the old values. */
    ret = -ENODEV;
    goto err_out;
    }
    @@ -290,6 +445,11 @@
    {
    unsigned long reset_start_time = jiffies;

    +#ifdef CONFIG_NET_CBUS
    + /* derived from CNET98EL-patch for bad clones */
    + outb_p(E8390_NODMA | E8390_STOP, ioaddr+E8390_CMD);
    +#endif
    +
    /* DON'T change these to inb_p/outb_p or reset will fail on clones. */
    outb(inb(ioaddr + NE_RESET), ioaddr + NE_RESET);

    @@ -308,15 +468,86 @@
    outb_p(0xff, ioaddr + EN0_ISR); /* Ack all intr. */
    }

    +#ifdef CONFIG_NE2K_CBUS_CNET98EL
    + if (hw->hwtype == NE2K_CBUS_HARDWARE_TYPE_CNET98EL) {
    + static const char pat[32] ="AbcdeFghijKlmnoPqrstUvwxyZ789012";
    + char buf[32];
    + int maxwait = 200;
    +
    + if (ei_debug > 2) {
    + printk(" [CNET98EL-specific initialize...");
    + }
    + outb_p(E8390_NODMA | E8390_STOP, ioaddr+E8390_CMD); /* 0x20|0x1 */
    + i=inb(ioaddr);
    + if ((i & ~0x2) != (0x20 | 0x01))
    + return ENODEV;
    + if ((inb(ioaddr + 0x7) & 0x80) != 0x80)
    + return ENODEV;
    + outb_p(E8390_RXOFF, ioaddr+EN0_RXCR); /* out(ioaddr+0xc, 0x20) */
    + /* outb_p(ENDCFG_WTS|ENDCFG_FT1|ENDCFG_LS, ioaddr+EN0_DCFG); */
    + outb_p(ENDCFG_WTS|0x48, ioaddr+EN0_DCFG); /* 0x49 */
    + outb_p(CNET98EL_START_PG, ioaddr+EN0_STARTPG);
    + outb_p(CNET98EL_STOP_PG, ioaddr+EN0_STOPPG);
    + if (ei_debug > 2) {
    + printk("memory check");
    + }
    + for (i = 0; i < 65536; i += 1024) {
    + if (ei_debug > 2) {
    + printk(" %04x",i);
    + }
    + ne2k_cbus_writemem(dev,ioaddr, i, pat, 32);
    + while (((inb(ioaddr + EN0_ISR) & ENISR_RDC) != ENISR_RDC) && --maxwait)
    + ;
    + ne2k_cbus_readmem(dev, ioaddr, i, buf, 32);
    + if (memcmp(pat, buf, 32)) {
    + if (ei_debug > 2) {
    + printk(" failed.");
    + }
    + break;
    + }
    + }
    + if (i != 16384) {
    + if (ei_debug > 2) {
    + printk("] ");
    + }
    + printk("memory failure at %x\n", i);
    + return ENODEV;
    + }
    + if (ei_debug > 2) {
    + printk(" good...");
    + }
    + if (!dev->irq) {
    + if (ei_debug > 2) {
    + printk("] ");
    + }
    + printk("IRQ must be specified for C-NET(98)E/L. probe failed.\n");
    + return ENODEV;
    + }
    + outb((dev->irq>5) ? (dev->irq&4):(dev->irq>>1), ioaddr + (0x2 | 0x400));
    + outb(0x7e, ioaddr + (0x4 | 0x400));
    + ne2k_cbus_readmem(dev, ioaddr, 16384, SA_prom, 32);
    + outb(0xff, ioaddr + EN0_ISR);
    + if (ei_debug > 2) {
    + printk("done]");
    + }
    + } else
    +#endif /* CONFIG_NE2K_CBUS_CNET98EL */
    /* 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[] =
    + struct {unsigned char value; unsigned short offset;} program_seq[] =
    {
    {E8390_NODMA+E8390_PAGE0+E8390_STOP, E8390_CMD}, /* Select page 0*/
    +#ifndef CONFIG_NET_CBUS
    {0x48, EN0_DCFG}, /* Set byte-wide (0x48) access. */
    +#else
    + /* NEC PC-9800: some board can only handle word-wide access? */
    + {0x48 | ENDCFG_WTS, EN0_DCFG}, /* Set word-wide (0x48) access. */
    + {16384 / 256, EN0_STARTPG},
    + {32768 / 256, EN0_STOPPG},
    +#endif
    {0x00, EN0_RCNTLO}, /* Clear the count regs. */
    {0x00, EN0_RCNTHI},
    {0x00, EN0_IMR}, /* Mask completion irq. */
    @@ -332,29 +563,42 @@

    for (i = 0; i < sizeof(program_seq)/sizeof(program_seq[0]); i++)
    outb_p(program_seq[i].value, ioaddr + program_seq[i].offset);
    -
    - }
    +#ifndef CONFIG_NET_CBUS
    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;
    }
    +#else
    + insw(ioaddr + NE_DATAPORT, SA_prom, 32 >> 1);
    +#endif
    +
    + }

    if (wordlength == 2)
    {
    for (i = 0; i < 16; i++)
    SA_prom[i] = SA_prom[i+i];
    +#ifndef CONFIG_NET_CBUS
    /* We must set the 8390 for word mode. */
    outb_p(0x49, ioaddr + EN0_DCFG);
    +#endif
    start_page = NESM_START_PG;
    stop_page = NESM_STOP_PG;
    +#ifdef CONFIG_NE2K_CBUS_CNET98EL
    + if (hw->hwtype == NE2K_CBUS_HARDWARE_TYPE_CNET98EL) {
    + start_page = CNET98EL_START_PG;
    + stop_page = CNET98EL_STOP_PG;
    + }
    +#endif
    } else {
    start_page = NE1SM_START_PG;
    stop_page = NE1SM_STOP_PG;
    }

    neX000 = (SA_prom[14] == 0x57 && SA_prom[15] == 0x57);
    +#ifndef CONFIG_NET_CBUS
    ctron = (SA_prom[0] == 0x00 && SA_prom[1] == 0x00 && SA_prom[2] == 0x1d);
    copam = (SA_prom[14] == 0x49 && SA_prom[15] == 0x00);

    @@ -368,6 +612,11 @@
    start_page = 0x01;
    stop_page = (wordlength == 2) ? 0x40 : 0x20;
    }
    +#else
    + if (neX000) {
    + name = "C-Bus-NE2K-compat";
    + }
    +#endif
    else
    {
    #ifdef SUPPORT_NE_BAD_CLONES
    @@ -414,10 +663,18 @@
    dev->irq = probe_irq_off(cookie);
    if (ei_debug > 2)
    printk(" autoirq is %d\n", dev->irq);
    - } else if (dev->irq == 2)
    + } else
    +#ifndef CONFIG_X86_PC9800
    + 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;
    +#else
    + if (dev->irq == 7)
    + /* Fixup for users that don't know that IRQ 7 is really IRQ 11,
    + or don't know which one to set. */
    + dev->irq = 11;
    +#endif

    if (! dev->irq) {
    printk(" failed to detect IRQ line.\n");
    @@ -448,8 +705,13 @@
    dev->dev_addr[i] = SA_prom[i];
    }

    +#ifndef CONFIG_NET_CBUS
    printk("\n%s: %s found at %#x, using IRQ %d.\n",
    dev->name, name, ioaddr, dev->irq);
    +#else
    + printk("\n%s: %s found at %#x, hardware type %d(%s), using IRQ %d.\n",
    + dev->name, name, ioaddr, hw->hwtype, hw->hwident, dev->irq);
    +#endif

    ei_status.name = name;
    ei_status.tx_start_page = start_page;
    @@ -473,10 +735,23 @@
    return 0;

    err_out_kfree:
    +#ifndef CONFIG_NET_CBUS
    kfree(dev->priv);
    dev->priv = NULL;
    +#else
    + ne2k_cbus_destroy(dev);
    +#endif
    err_out:
    +#ifndef CONFIG_NET_CBUS
    release_region(ioaddr, NE_IO_EXTENT);
    +#else
    + {
    + const struct ne2k_cbus_region *rlist;
    + for (rlist = hw->regionlist; rlist->range; rlist++) {
    + release_region(ioaddr + rlist->start, rlist->range);
    + }
    + }
    +#endif
    return ret;
    }

    @@ -500,10 +775,18 @@
    static void ne_reset_8390(struct net_device *dev)
    {
    unsigned long reset_start_time = jiffies;
    +#ifdef CONFIG_NET_CBUS
    + struct ei_device *ei_local = (struct ei_device *)(dev->priv);
    +#endif

    if (ei_debug > 1)
    printk(KERN_DEBUG "resetting the 8390 t=%ld...", jiffies);

    +#ifdef CONFIG_NET_CBUS
    + /* derived from CNET98EL-patch for bad clones... */
    + outb_p(E8390_NODMA | E8390_STOP, NE_BASE + E8390_CMD); /* 0x20 | 0x1 */
    +#endif
    +
    /* 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);

    @@ -526,6 +809,9 @@
    static void ne_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page)
    {
    int nic_base = dev->base_addr;
    +#ifdef CONFIG_NET_CBUS
    + struct ei_device *ei_local = (struct ei_device *)(dev->priv);
    +#endif

    /* This *shouldn't* happen. If it does, it's the last thing you'll see */

    @@ -568,6 +854,9 @@
    #endif
    int nic_base = dev->base_addr;
    char *buf = skb->data;
    +#ifdef CONFIG_NET_CBUS
    + struct ei_device *ei_local = (struct ei_device *)(dev->priv);
    +#endif

    /* This *shouldn't* happen. If it does, it's the last thing you'll see */
    if (ei_status.dmaing)
    @@ -578,6 +867,12 @@
    return;
    }
    ei_status.dmaing |= 0x01;
    +
    +#ifdef CONFIG_NET_CBUS
    + /* round up count to a word (derived from ICM-patch) */
    + count = (count + 1) & ~1;
    +#endif
    +
    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);
    @@ -635,6 +930,9 @@
    #ifdef NE_SANITY_CHECK
    int retries = 0;
    #endif
    +#ifdef CONFIG_NET_CBUS
    + struct ei_device *ei_local = (struct ei_device *)(dev->priv);
    +#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?
    @@ -738,13 +1036,22 @@
    static int io[MAX_NE_CARDS];
    static int irq[MAX_NE_CARDS];
    static int bad[MAX_NE_CARDS]; /* 0xbad = bad sig or no reset ack */
    +#ifdef CONFIG_NET_CBUS
    +static int hwtype[MAX_NE_CARDS] = { 0, }; /* board type */
    +#endif

    MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
    MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
    MODULE_PARM(bad, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
    +#ifdef CONFIG_NET_CBUS
    +MODULE_PARM(hwtype, "1-" __MODULE_STRING(MAX_NE_CARDS) "i");
    +#endif
    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");
    +#ifdef CONFIG_NET_CBUS
    +MODULE_PARM_DESC(hwtype, "Board type of PC-9800 C-Bus NIC");
    +#endif
    MODULE_DESCRIPTION("NE1000/NE2000 ISA/PnP Ethernet driver");
    MODULE_LICENSE("GPL");

    @@ -762,6 +1069,9 @@
    dev->irq = irq[this_dev];
    dev->mem_end = bad[this_dev];
    dev->base_addr = io[this_dev];
    +#ifdef CONFIG_NET_CBUS
    + dev->mem_start = hwtype[this_dev];
    +#endif
    dev->init = ne_probe;
    if (register_netdev(dev) == 0) {
    found++;
    @@ -791,9 +1101,23 @@
    if (idev)
    pnp_device_detach(idev);
    free_irq(dev->irq, dev);
    +#ifndef CONFIG_NET_CBUS
    release_region(dev->base_addr, NE_IO_EXTENT);
    +#else /* CONFIG_NET_CBUS */
    + {
    + const struct ne2k_cbus_hwinfo *hw = ne2k_cbus_get_hwinfo((int)(dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK));
    + const struct ne2k_cbus_region *rlist;
    + for (rlist = hw->regionlist; rlist->range; rlist++) {
    + release_region(dev->base_addr + rlist->start, rlist->range);
    + }
    + }
    +#endif /* !CONFIG_NET_CBUS */
    unregister_netdev(dev);
    +#ifndef CONFIG_NET_CBUS
    kfree(priv);
    +#else
    + ne2k_cbus_destroy(dev);
    +#endif
    }
    }
    }
    diff -Nru linux-2.5.50/drivers/net/ne2k_cbus.h linux98-2.5.50/drivers/net/ne2k_cbus.h
    --- linux-2.5.42/drivers/net/ne2k_cbus.h 1970-01-01 09:00:00.000000000 +0900
    +++ linux98-2.5.42/drivers/net/ne2k_cbus.h 2002-12-15 10:56:15.000000000 +0900
    @@ -0,0 +1,481 @@
    +/* ne2k_cbus.h:
    + vender-specific information definition for NEC PC-9800
    + C-bus Ethernet Cards
    + Used in ne.c
    +
    + (C)1998,1999 KITAGWA Takurou & Linux/98 project
    +*/
    +
    +#include <linux/config.h>
    +
    +#undef NE_RESET
    +#define NE_RESET EI_SHIFT(0x11) /* Issue a read to reset, a write to clear. */
    +
    +#ifdef CONFIG_NE2K_CBUS_CNET98EL
    +#ifndef CONFIG_NE2K_CBUS_CNET98EL_IO_BASE
    +#warning CONFIG_NE2K_CBUS_CNET98EL_IO_BASE is not defined(config error?)
    +#warning use 0xaaed as default
    +#define CONFIG_NE2K_CBUS_CNET98EL_IO_BASE 0xaaed /* or 0x55ed */
    +#endif
    +#define CNET98EL_START_PG 0x00
    +#define CNET98EL_STOP_PG 0x40
    +#endif
    +
    +/* Hardware type definition (derived from *BSD) */
    +#define NE2K_CBUS_HARDWARE_TYPE_MASK 0xff
    +
    +/* 0: reserved for auto-detect */
    +/* 1: (not tested)
    + Allied Telesis CentreCom LA-98-T */
    +#define NE2K_CBUS_HARDWARE_TYPE_ATLA98 1
    +/* 2: (not tested)
    + ELECOM Laneed
    + LD-BDN[123]A
    + PLANET SMART COM 98 EN-2298-C
    + MACNICA ME98 */
    +#define NE2K_CBUS_HARDWARE_TYPE_BDN 2
    +/* 3:
    + Melco EGY-98
    + Contec C-NET(98)E*A/L*A,C-NET(98)P */
    +#define NE2K_CBUS_HARDWARE_TYPE_EGY98 3
    +/* 4:
    + Melco LGY-98,IND-SP,IND-SS
    + MACNICA NE2098 */
    +#define NE2K_CBUS_HARDWARE_TYPE_LGY98 4
    +/* 5:
    + ICM DT-ET-25,DT-ET-T5,IF-2766ET,IF-2771ET
    + PLANET SMART COM 98 EN-2298-T,EN-2298P-T
    + D-Link DE-298PT,DE-298PCAT
    + ELECOM Laneed LD-98P */
    +#define NE2K_CBUS_HARDWARE_TYPE_ICM 5
    +/* 6: (reserved for SIC-98, which is not supported in this driver.) */
    +/* 7: (unused in *BSD?)
    + <Original NE2000 compatible>
    + <for PCI/PCMCIA cards>
    +*/
    +#define NE2K_CBUS_HARDWARE_TYPE_NE2K 7
    +/* 8:
    + NEC PC-9801-108 */
    +#define NE2K_CBUS_HARDWARE_TYPE_NEC108 8
    +/* 9:
    + I-O DATA LA-98,LA/T-98 */
    +#define NE2K_CBUS_HARDWARE_TYPE_IOLA98 9
    +/* 10: (reserved for C-NET(98), which is not supported in this driver.) */
    +/* 11:
    + Contec C-NET(98)E,L */
    +#define NE2K_CBUS_HARDWARE_TYPE_CNET98EL 11
    +
    +#define NE2K_CBUS_HARDWARE_TYPE_MAX 11
    +
    +/* HARDWARE TYPE ID 12-31: reserved */
    +
    +struct ne2k_cbus_offsetinfo {
    + unsigned short skip;
    + unsigned short offset8; /* +0x8 - +0xf */
    + unsigned short offset10; /* +0x10 */
    + unsigned short offset1f; /* +0x1f */
    +};
    +
    +struct ne2k_cbus_region {
    + unsigned short start;
    + short range;
    +};
    +
    +struct ne2k_cbus_hwinfo {
    + const unsigned short hwtype;
    + const unsigned char *hwident;
    +#ifndef MODULE
    + const unsigned short *portlist;
    +#endif
    + const struct ne2k_cbus_offsetinfo *offsetinfo;
    + const struct ne2k_cbus_region *regionlist;
    +};
    +
    +#ifdef CONFIG_NE2K_CBUS_ATLA98
    +#ifndef MODULE
    +static unsigned short atla98_portlist[] __initdata = {
    + 0xd0,
    + 0
    +};
    +#endif
    +#define atla98_offsetinfo ne2k_offsetinfo
    +#define atla98_regionlist ne2k_regionlist
    +#endif /* CONFIG_NE2K_CBUS_ATLA98 */
    +
    +#ifdef CONFIG_NE2K_CBUS_BDN
    +#ifndef MODULE
    +static unsigned short bdn_portlist[] __initdata = {
    + 0xd0,
    + 0
    +};
    +#endif
    +static struct ne2k_cbus_offsetinfo bdn_offsetinfo __initdata = {
    +#if 0
    + /* comes from FreeBSD(98) ed98.h */
    + 0x1000, 0x8000, 0x100, 0xc200 /* ??? */
    +#else
    + /* comes from NetBSD/pc98 if_ne_isa.c */
    + 0x1000, 0x8000, 0x100, 0x7f00 /* ??? */
    +#endif
    +};
    +static struct ne2k_cbus_region bdn_regionlist[] __initdata = {
    + {0x0, 1}, {0x1000, 1}, {0x2000, 1}, {0x3000,1},
    + {0x4000, 1}, {0x5000, 1}, {0x6000, 1}, {0x7000, 1},
    + {0x8000, 1}, {0x9000, 1}, {0xa000, 1}, {0xb000, 1},
    + {0xc000, 1}, {0xd000, 1}, {0xe000, 1}, {0xf000, 1},
    + {0x100, 1}, {0x7f00, 1},
    + {0x0, 0}
    +};
    +#endif /* CONFIG_NE2K_CBUS_BDN */
    +
    +#ifdef CONFIG_NE2K_CBUS_EGY98
    +#ifndef MODULE
    +static unsigned short egy98_portlist[] __initdata = {
    + 0xd0,
    + 0
    +};
    +#endif
    +static struct ne2k_cbus_offsetinfo egy98_offsetinfo __initdata = {
    + 0x02, 0x100, 0x200, 0x300
    +};
    +static struct ne2k_cbus_region egy98_regionlist[] __initdata = {
    + {0x0, 1}, {0x2, 1}, {0x4, 1}, {0x6, 1},
    + {0x8, 1}, {0xa, 1}, {0xc, 1}, {0xe, 1},
    + {0x100, 1}, {0x102, 1}, {0x104, 1}, {0x106, 1},
    + {0x108, 1}, {0x10a, 1}, {0x10c, 1}, {0x10e, 1},
    + {0x200, 1}, {0x300, 1},
    + {0x0, 0}
    +};
    +#endif /* CONFIG_NE2K_CBUS_EGY98 */
    +
    +#ifdef CONFIG_NE2K_CBUS_LGY98
    +#ifndef MODULE
    +static unsigned short lgy98_portlist[] __initdata = {
    + 0xd0, 0x10d0, 0x20d0, 0x30d0, 0x40d0, 0x50d0, 0x60d0, 0x70d0,
    + 0
    +};
    +#endif
    +static struct ne2k_cbus_offsetinfo lgy98_offsetinfo __initdata = {
    + 0x01, 0x08, 0x200, 0x300
    +};
    +static struct ne2k_cbus_region lgy98_regionlist[] __initdata = {
    + {0x0, 16}, {0x200, 1}, {0x300, 1},
    + {0x0, 0}
    +};
    +#endif /* CONFIG_NE2K_CBUS_LGY98 */
    +
    +#ifdef CONFIG_NE2K_CBUS_ICM
    +#ifndef MODULE
    +static unsigned short icm_portlist[] __initdata = {
    + /* ICM */
    + 0x56d0,
    + /* LD-98PT */
    + 0x46d0, 0x66d0, 0x76d0, 0x86d0, 0x96d0, 0xa6d0, 0xb6d0, 0xc6d0,
    + 0
    +};
    +#endif
    +static struct ne2k_cbus_offsetinfo icm_offsetinfo __initdata = {
    + 0x01, 0x08, 0x100, 0x10f
    +};
    +static struct ne2k_cbus_region icm_regionlist[] __initdata = {
    + {0x0, 16}, {0x100, 16},
    + {0x0, 0}
    +};
    +#endif /* CONFIG_NE2K_CBUS_ICM */
    +
    +#if defined(CONFIG_NE2K_CBUS_NE2K) && !defined(MODULE)
    +static unsigned short ne2k_portlist[] __initdata = {
    + 0xd0, 0x300, 0x280, 0x320, 0x340, 0x360, 0x380,
    + 0
    +};
    +#endif
    +#if defined(CONFIG_NE2K_CBUS_NE2K) || defined(CONFIG_NE2K_CBUS_ATLA98)
    +static struct ne2k_cbus_offsetinfo ne2k_offsetinfo __initdata = {
    + 0x01, 0x08, 0x10, 0x1f
    +};
    +static struct ne2k_cbus_region ne2k_regionlist[] __initdata = {
    + {0x0, 32},
    + {0x0, 0}
    +};
    +#endif
    +
    +#ifdef CONFIG_NE2K_CBUS_NEC108
    +#ifndef MODULE
    +static unsigned short nec108_portlist[] __initdata = {
    + 0x770, 0x2770, 0x4770, 0x6770,
    + 0
    +};
    +#endif
    +static struct ne2k_cbus_offsetinfo nec108_offsetinfo __initdata = {
    + 0x02, 0x1000, 0x888, 0x88a
    +};
    +static struct ne2k_cbus_region nec108_regionlist[] __initdata = {
    + {0x0, 1}, {0x2, 1}, {0x4, 1}, {0x6, 1},
    + {0x8, 1}, {0xa, 1}, {0xc, 1}, {0xe, 1},
    + {0x1000, 1}, {0x1002, 1}, {0x1004, 1}, {0x1006, 1},
    + {0x1008, 1}, {0x100a, 1}, {0x100c, 1}, {0x100e, 1},
    + {0x888, 1}, {0x88a, 1}, {0x88c, 1}, {0x88e, 1},
    + {0x0, 0}
    +};
    +#endif
    +
    +#ifdef CONFIG_NE2K_CBUS_IOLA98
    +#ifndef MODULE
    +static unsigned short iola98_portlist[] __initdata = {
    + 0xd0, 0xd2, 0xd4, 0xd6, 0xd8, 0xda, 0xdc, 0xde,
    + 0
    +};
    +#endif
    +static struct ne2k_cbus_offsetinfo iola98_offsetinfo __initdata = {
    + 0x1000, 0x8000, 0x100, 0xf100
    +};
    +static struct ne2k_cbus_region iola98_regionlist[] __initdata = {
    + {0x0, 1}, {0x1000, 1}, {0x2000, 1}, {0x3000, 1},
    + {0x4000, 1}, {0x5000, 1}, {0x6000, 1}, {0x7000, 1},
    + {0x8000, 1}, {0x9000, 1}, {0xa000, 1}, {0xb000, 1},
    + {0xc000, 1}, {0xd000, 1}, {0xe000, 1}, {0xf000, 1},
    + {0x100, 1}, {0xf100, 1},
    + {0x0,0}
    +};
    +#endif /* CONFIG_NE2K_CBUS_IOLA98 */
    +
    +#ifdef CONFIG_NE2K_CBUS_CNET98EL
    +#ifndef MODULE
    +static unsigned short cnet98el_portlist[] __initdata = {
    + 0x3d0, 0x13d0, 0x23d0, 0x33d0, 0x43d0, 0x53d0, 0x60d0, 0x70d0,
    + 0
    +};
    +#endif
    +static struct ne2k_cbus_offsetinfo cnet98el_offsetinfo __initdata = {
    + 0x01, 0x08, 0x40e, 0x400
    +};
    +static struct ne2k_cbus_region cnet98el_regionlist[] __initdata = {
    + {0x0, 16}, {0x400, 16},
    + {0x0, 0}
    +};
    +#endif
    +
    +
    +/* port information table (for ne.c initialize/probe process) */
    +
    +static struct ne2k_cbus_hwinfo ne2k_cbus_hwinfo_list[] __initdata = {
    +#ifdef CONFIG_NE2K_CBUS_ATLA98
    +/* NOT TESTED */
    + {
    + NE2K_CBUS_HARDWARE_TYPE_ATLA98,
    + "LA-98-T",
    +#ifndef MODULE
    + atla98_portlist,
    +#endif
    + &atla98_offsetinfo, atla98_regionlist
    + },
    +#endif
    +#ifdef CONFIG_NE2K_CBUS_BDN
    +/* NOT TESTED */
    + {
    + NE2K_CBUS_HARDWARE_TYPE_BDN,
    + "LD-BDN[123]A",
    +#ifndef MODULE
    + bdn_portlist,
    +#endif
    + &bdn_offsetinfo, bdn_regionlist
    + },
    +#endif
    +#ifdef CONFIG_NE2K_CBUS_ICM
    + {
    + NE2K_CBUS_HARDWARE_TYPE_ICM,
    + "IF-27xxET",
    +#ifndef MODULE
    + icm_portlist,
    +#endif
    + &icm_offsetinfo, icm_regionlist
    + },
    +#endif
    +#ifdef CONFIG_NE2K_CBUS_NE2K
    + {
    + NE2K_CBUS_HARDWARE_TYPE_NE2K,
    + "NE2000 compat.",
    +#ifndef MODULE
    + ne2k_portlist,
    +#endif
    + &ne2k_offsetinfo, ne2k_regionlist
    + },
    +#endif
    +#ifdef CONFIG_NE2K_CBUS_NEC108
    + {
    + NE2K_CBUS_HARDWARE_TYPE_NEC108,
    + "PC-9801-108",
    +#ifndef MODULE
    + nec108_portlist,
    +#endif
    + &nec108_offsetinfo, nec108_regionlist
    + },
    +#endif
    +#ifdef CONFIG_NE2K_CBUS_IOLA98
    + {
    + NE2K_CBUS_HARDWARE_TYPE_IOLA98,
    + "LA-98",
    +#ifndef MODULE
    + iola98_portlist,
    +#endif
    + &iola98_offsetinfo, iola98_regionlist
    + },
    +#endif
    +#ifdef CONFIG_NE2K_CBUS_CNET98EL
    + {
    + NE2K_CBUS_HARDWARE_TYPE_CNET98EL,
    + "C-NET(98)E/L",
    +#ifndef MODULE
    + cnet98el_portlist,
    +#endif
    + &cnet98el_offsetinfo, cnet98el_regionlist
    + },
    +#endif
    +/* NOTE: LGY98 must be probed before EGY98, or system stalled!? */
    +#ifdef CONFIG_NE2K_CBUS_LGY98
    + {
    + NE2K_CBUS_HARDWARE_TYPE_LGY98,
    + "LGY-98",
    +#ifndef MODULE
    + lgy98_portlist,
    +#endif
    + &lgy98_offsetinfo, lgy98_regionlist
    + },
    +#endif
    +#ifdef CONFIG_NE2K_CBUS_EGY98
    + {
    + NE2K_CBUS_HARDWARE_TYPE_EGY98,
    + "EGY-98",
    +#ifndef MODULE
    + egy98_portlist,
    +#endif
    + &egy98_offsetinfo, egy98_regionlist
    + },
    +#endif
    + {
    + 0,
    + "unsupported hardware",
    +#ifndef MODULE
    + NULL,
    +#endif
    + NULL, NULL
    + }
    +};
    +
    +static int __init ne2k_cbus_init(struct net_device *dev)
    +{
    + struct ei_device *ei_local;
    + if (dev->priv == NULL) {
    + ei_local = kmalloc(sizeof(struct ei_device), GFP_KERNEL);
    + if (ei_local == NULL)
    + return -ENOMEM;
    + memset(ei_local, 0, sizeof(struct ei_device));
    + ei_local->reg_offset = kmalloc(sizeof(typeof(*ei_local->reg_offset))*18, GFP_KERNEL);
    + if (ei_local->reg_offset == NULL) {
    + kfree(ei_local);
    + return -ENOMEM;
    + }
    + spin_lock_init(&ei_local->page_lock);
    + dev->priv = ei_local;
    + }
    + return 0;
    +}
    +
    +static void ne2k_cbus_destroy(struct net_device *dev)
    +{
    + struct ei_device *ei_local = (struct ei_device *)(dev->priv);
    + if (ei_local != NULL) {
    + if (ei_local->reg_offset)
    + kfree(ei_local->reg_offset);
    + kfree(dev->priv);
    + dev->priv = NULL;
    + }
    +}
    +
    +static const struct ne2k_cbus_hwinfo * __init ne2k_cbus_get_hwinfo(int hwtype)
    +{
    + const struct ne2k_cbus_hwinfo *hw;
    +
    + for (hw = &ne2k_cbus_hwinfo_list[0]; hw->hwtype; hw++) {
    + if (hw->hwtype == hwtype) break;
    + }
    + return hw;
    +}
    +
    +static void __init ne2k_cbus_set_hwtype(struct net_device *dev, const struct ne2k_cbus_hwinfo *hw, int ioaddr)
    +{
    + struct ei_device *ei_local = (struct ei_device *)(dev->priv);
    + int i;
    + int hwtype_old = dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK;
    +
    + if (!ei_local)
    + panic("Gieee! ei_local == NULL!! (from %p)",
    + __builtin_return_address(0));
    +
    + dev->mem_start &= ~NE2K_CBUS_HARDWARE_TYPE_MASK;
    + dev->mem_start |= hw->hwtype & NE2K_CBUS_HARDWARE_TYPE_MASK;
    +
    + if (ei_debug > 2) {
    + printk(KERN_DEBUG "hwtype changed: %d -> %d\n",hwtype_old,(int)(dev->mem_start & NE2K_CBUS_HARDWARE_TYPE_MASK));
    + }
    +
    + if (hw->offsetinfo) {
    + for (i = 0; i < 8; i++) {
    + ei_local->reg_offset[i] = hw->offsetinfo->skip * i;
    + }
    + for (i = 8; i < 16; i++) {
    + ei_local->reg_offset[i] =
    + hw->offsetinfo->skip*(i-8) + hw->offsetinfo->offset8;
    + }
    +#ifdef CONFIG_NE2K_CBUS_NEC108
    + if (hw->hwtype == NE2K_CBUS_HARDWARE_TYPE_NEC108) {
    + int adj = (ioaddr & 0xf000) /2;
    + ei_local->reg_offset[16] =
    + (hw->offsetinfo->offset10 | adj) - ioaddr;
    + ei_local->reg_offset[17] =
    + (hw->offsetinfo->offset1f | adj) - ioaddr;
    + } else {
    +#endif /* CONFIG_NE2K_CBUS_NEC108 */
    + ei_local->reg_offset[16] = hw->offsetinfo->offset10;
    + ei_local->reg_offset[17] = hw->offsetinfo->offset1f;
    +#ifdef CONFIG_NE2K_CBUS_NEC108
    + }
    +#endif
    + } else {
    + /* make dummmy offset list */
    + for (i = 0; i < 16; i++) {
    + ei_local->reg_offset[i] = i;
    + }
    + ei_local->reg_offset[16] = 0x10;
    + ei_local->reg_offset[17] = 0x1f;
    + }
    +}
    +
    +#if defined(CONFIG_NE2K_CBUS_ICM) || defined(CONFIG_NE2K_CBUS_CNET98EL)
    +static void __init ne2k_cbus_readmem(struct net_device *dev, int ioaddr, unsigned short memaddr, char *buf, unsigned short len)
    +{
    + struct ei_device *ei_local = (struct ei_device *)(dev->priv);
    + outb_p(E8390_NODMA | E8390_START, ioaddr+E8390_CMD);
    + outb_p(len & 0xff, ioaddr+EN0_RCNTLO);
    + outb_p(len >> 8, ioaddr+EN0_RCNTHI);
    + outb_p(memaddr & 0xff, ioaddr+EN0_RSARLO);
    + outb_p(memaddr >> 8, ioaddr+EN0_RSARHI);
    + outb_p(E8390_RREAD | E8390_START, ioaddr+E8390_CMD);
    + insw(ioaddr+NE_DATAPORT, buf, len >> 1);
    +}
    +static void __init ne2k_cbus_writemem(struct net_device *dev, int ioaddr, unsigned short memaddr, const char *buf, unsigned short len)
    +{
    + struct ei_device *ei_local = (struct ei_device *)(dev->priv);
    + outb_p(E8390_NODMA | E8390_START, ioaddr+E8390_CMD);
    + outb_p(ENISR_RDC, ioaddr+EN0_ISR);
    + outb_p(len & 0xff, ioaddr+EN0_RCNTLO);
    + outb_p(len >> 8, ioaddr+EN0_RCNTHI);
    + outb_p(memaddr & 0xff, ioaddr+EN0_RSARLO);
    + outb_p(memaddr >> 8, ioaddr+EN0_RSARHI);
    + outb_p(E8390_RWRITE | E8390_START, ioaddr+E8390_CMD);
    + outsw(ioaddr+NE_DATAPORT, buf, len >> 1);
    +}
    +#endif
    +
    +static int ne_probe_cbus(struct net_device *dev, const struct ne2k_cbus_hwinfo *hw, int ioaddr);
    +/* End of ne2k_cbus.h */
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 13:33    [W:0.123 / U:0.392 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site