]> err.no Git - linux-2.6/blobdiff - drivers/char/moxa.c
Char: moxa, ioctl cleanup
[linux-2.6] / drivers / char / moxa.c
index 64b7b2b18352526d92e0ebf83f6bda424aed7d1c..f737fbb8598c24d9e34c0572f3107c30b2f2a0a8 100644 (file)
@@ -25,6 +25,7 @@
 #include <linux/mm.h>
 #include <linux/ioport.h>
 #include <linux/errno.h>
+#include <linux/firmware.h>
 #include <linux/signal.h>
 #include <linux/sched.h>
 #include <linux/timer.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 
+#include "moxa.h"
+
 #define MOXA_VERSION           "5.1k"
 
+#define MOXA_FW_HDRLEN         32
+
 #define MOXAMAJOR              172
 #define MOXACUMAJOR            173
 
@@ -92,24 +97,16 @@ static struct pci_device_id moxa_pcibrds[] = {
 MODULE_DEVICE_TABLE(pci, moxa_pcibrds);
 #endif /* CONFIG_PCI */
 
-struct moxa_isa_board_conf {
-       int boardType;
-       int numPorts;
-       unsigned long baseAddr;
-};
-
-static struct moxa_isa_board_conf moxa_isa_boards[] =
-{
-/*       {MOXA_BOARD_C218_ISA,8,0xDC000}, */
-};
+struct moxa_port;
 
 static struct moxa_board_conf {
        int boardType;
        int numPorts;
-       unsigned long baseAddr;
        int busType;
 
-       int loadstat;
+       unsigned int ready;
+
+       struct moxa_port *ports;
 
        void __iomem *basemem;
        void __iomem *intNdx;
@@ -131,13 +128,11 @@ struct moxaq_str {
 };
 
 struct moxa_port {
+       struct moxa_board_conf *board;
        int type;
-       int port;
        int close_delay;
-       unsigned short closing_wait;
        int count;
        int blocked_open;
-       long event; /* long req'd for set_bit --RR */
        int asyncflags;
        unsigned long statusflags;
        struct tty_struct *tty;
@@ -147,16 +142,20 @@ struct moxa_port {
 
        struct timer_list emptyTimer;
 
-       char chkPort;
        char lineCtrl;
        void __iomem *tableAddr;
-       long curBaud;
        char DCDState;
        char lowChkFlag;
 
        ushort breakCnt;
 };
 
+struct mon_str {
+       int tick;
+       int rxcnt[MAX_PORTS];
+       int txcnt[MAX_PORTS];
+};
+
 /* statusflags */
 #define TXSTOPPED      0x1
 #define LOWWAIT        0x2
@@ -168,20 +167,25 @@ struct moxa_port {
 #define WAKEUP_CHARS           256
 
 static int ttymajor = MOXAMAJOR;
+static struct mon_str moxaLog;
+static unsigned int moxaFuncTout = HZ / 2;
 /* Variables for insmod */
 #ifdef MODULE
-static int baseaddr[4];
-static int type[4];
-static int numports[4];
+static unsigned long baseaddr[MAX_BOARDS];
+static unsigned int type[MAX_BOARDS];
+static unsigned int numports[MAX_BOARDS];
 #endif
 
 MODULE_AUTHOR("William Chen");
 MODULE_DESCRIPTION("MOXA Intellio Family Multiport Board Device Driver");
 MODULE_LICENSE("GPL");
 #ifdef MODULE
-module_param_array(type, int, NULL, 0);
-module_param_array(baseaddr, int, NULL, 0);
-module_param_array(numports, int, NULL, 0);
+module_param_array(type, uint, NULL, 0);
+MODULE_PARM_DESC(type, "card type: C218=2, C320=4");
+module_param_array(baseaddr, ulong, NULL, 0);
+MODULE_PARM_DESC(baseaddr, "base address");
+module_param_array(numports, uint, NULL, 0);
+MODULE_PARM_DESC(numports, "numports (ignored for C218)");
 #endif
 module_param(ttymajor, int, 0);
 
@@ -196,7 +200,6 @@ static void moxa_flush_buffer(struct tty_struct *);
 static int moxa_chars_in_buffer(struct tty_struct *);
 static void moxa_flush_chars(struct tty_struct *);
 static void moxa_put_char(struct tty_struct *, unsigned char);
-static int moxa_ioctl(struct tty_struct *, struct file *, unsigned int, unsigned long);
 static void moxa_throttle(struct tty_struct *);
 static void moxa_unthrottle(struct tty_struct *);
 static void moxa_set_termios(struct tty_struct *, struct ktermios *);
@@ -217,60 +220,653 @@ static void moxa_receive_data(struct moxa_port *);
 /*
  * moxa board interface functions:
  */
-static void MoxaDriverInit(void);
-static int MoxaDriverIoctl(unsigned int, unsigned long, int);
 static int MoxaDriverPoll(void);
-static int MoxaPortsOfCard(int);
-static int MoxaPortIsValid(int);
-static void MoxaPortEnable(int);
-static void MoxaPortDisable(int);
-static long MoxaPortGetMaxBaud(int);
-static long MoxaPortSetBaud(int, long);
-static int MoxaPortSetTermio(int, struct ktermios *, speed_t);
-static int MoxaPortGetLineOut(int, int *, int *);
-static void MoxaPortLineCtrl(int, int, int);
-static void MoxaPortFlowCtrl(int, int, int, int, int, int);
-static int MoxaPortLineStatus(int);
-static int MoxaPortDCDChange(int);
-static int MoxaPortDCDON(int);
-static void MoxaPortFlushData(int, int);
-static int MoxaPortWriteData(int, unsigned char *, int);
-static int MoxaPortReadData(int, struct tty_struct *tty);
-static int MoxaPortTxQueue(int);
-static int MoxaPortRxQueue(int);
-static int MoxaPortTxFree(int);
-static void MoxaPortTxDisable(int);
-static void MoxaPortTxEnable(int);
-static int MoxaPortResetBrkCnt(int);
-static void MoxaPortSendBreak(int, int);
+static void MoxaPortEnable(struct moxa_port *);
+static void MoxaPortDisable(struct moxa_port *);
+static int MoxaPortSetTermio(struct moxa_port *, struct ktermios *, speed_t);
+static int MoxaPortGetLineOut(struct moxa_port *, int *, int *);
+static void MoxaPortLineCtrl(struct moxa_port *, int, int);
+static void MoxaPortFlowCtrl(struct moxa_port *, int, int, int, int, int);
+static int MoxaPortLineStatus(struct moxa_port *);
+static int MoxaPortDCDChange(struct moxa_port *);
+static int MoxaPortDCDON(struct moxa_port *);
+static void MoxaPortFlushData(struct moxa_port *, int);
+static int MoxaPortWriteData(struct moxa_port *, unsigned char *, int);
+static int MoxaPortReadData(struct moxa_port *, struct tty_struct *tty);
+static int MoxaPortTxQueue(struct moxa_port *);
+static int MoxaPortRxQueue(struct moxa_port *);
+static int MoxaPortTxFree(struct moxa_port *);
+static void MoxaPortTxDisable(struct moxa_port *);
+static void MoxaPortTxEnable(struct moxa_port *);
+static int MoxaPortResetBrkCnt(struct moxa_port *);
 static int moxa_get_serial_info(struct moxa_port *, struct serial_struct __user *);
 static int moxa_set_serial_info(struct moxa_port *, struct serial_struct __user *);
-static void MoxaSetFifo(int port, int enable);
+static void MoxaSetFifo(struct moxa_port *port, int enable);
+
+/*
+ * I/O functions
+ */
+
+static void moxa_wait_finish(void __iomem *ofsAddr)
+{
+       unsigned long end = jiffies + moxaFuncTout;
+
+       while (readw(ofsAddr + FuncCode) != 0)
+               if (time_after(jiffies, end))
+                       return;
+       if (readw(ofsAddr + FuncCode) != 0 && printk_ratelimit())
+               printk(KERN_WARNING "moxa function expired\n");
+}
+
+static void moxafunc(void __iomem *ofsAddr, int cmd, ushort arg)
+{
+       writew(arg, ofsAddr + FuncArg);
+       writew(cmd, ofsAddr + FuncCode);
+       moxa_wait_finish(ofsAddr);
+}
+
+/*
+ * TTY operations
+ */
+
+static int moxa_ioctl(struct tty_struct *tty, struct file *file,
+                     unsigned int cmd, unsigned long arg)
+{
+       struct moxa_port *ch = tty->driver_data;
+       void __user *argp = (void __user *)arg;
+       int status;
+
+       if (tty->index == MAX_PORTS) {
+               if (cmd != MOXA_GETDATACOUNT && cmd != MOXA_GET_IOQUEUE &&
+                               cmd != MOXA_GETMSTATUS)
+                       return -EINVAL;
+       } else if (!ch)
+               return -ENODEV;
+
+       switch (cmd) {
+       case MOXA_GETDATACOUNT:
+               moxaLog.tick = jiffies;
+               return copy_to_user(argp, &moxaLog, sizeof(moxaLog)) ?
+                       -EFAULT : 0;
+       case MOXA_FLUSH_QUEUE:
+               MoxaPortFlushData(ch, arg);
+               return 0;
+       case MOXA_GET_IOQUEUE: {
+               struct moxaq_str __user *argm = argp;
+               struct moxaq_str tmp;
+               struct moxa_port *p;
+               unsigned int i, j;
+
+               for (i = 0; i < MAX_BOARDS; i++) {
+                       p = moxa_boards[i].ports;
+                       for (j = 0; j < MAX_PORTS_PER_BOARD; j++, p++, argm++) {
+                               memset(&tmp, 0, sizeof(tmp));
+                               if (moxa_boards[i].ready) {
+                                       tmp.inq = MoxaPortRxQueue(p);
+                                       tmp.outq = MoxaPortTxQueue(p);
+                               }
+                               if (copy_to_user(argm, &tmp, sizeof(tmp)))
+                                       return -EFAULT;
+                       }
+               }
+               return 0;
+       } case MOXA_GET_OQUEUE:
+               status = MoxaPortTxQueue(ch);
+               return put_user(status, (unsigned long __user *)argp);
+       case MOXA_GET_IQUEUE:
+               status = MoxaPortRxQueue(ch);
+               return put_user(status, (unsigned long __user *)argp);
+       case MOXA_GETMSTATUS: {
+               struct mxser_mstatus __user *argm = argp;
+               struct mxser_mstatus tmp;
+               struct moxa_port *p;
+               unsigned int i, j;
+
+               for (i = 0; i < MAX_BOARDS; i++) {
+                       p = moxa_boards[i].ports;
+                       for (j = 0; j < MAX_PORTS_PER_BOARD; j++, p++, argm++) {
+                               memset(&tmp, 0, sizeof(tmp));
+                               if (!moxa_boards[i].ready)
+                                       goto copy;
+
+                               status = MoxaPortLineStatus(p);
+                               if (status & 1)
+                                       tmp.cts = 1;
+                               if (status & 2)
+                                       tmp.dsr = 1;
+                               if (status & 4)
+                                       tmp.dcd = 1;
+
+                               if (!p->tty || !p->tty->termios)
+                                       tmp.cflag = p->cflag;
+                               else
+                                       tmp.cflag = p->tty->termios->c_cflag;
+copy:
+                               if (copy_to_user(argm, &tmp, sizeof(tmp)))
+                                       return -EFAULT;
+                       }
+               }
+               return 0;
+       }
+       case TIOCGSERIAL:
+               return moxa_get_serial_info(ch, argp);
+       case TIOCSSERIAL:
+               return moxa_set_serial_info(ch, argp);
+       }
+       return -ENOIOCTLCMD;
+}
+
+static void moxa_break_ctl(struct tty_struct *tty, int state)
+{
+       struct moxa_port *port = tty->driver_data;
+
+       moxafunc(port->tableAddr, state ? FC_SendBreak : FC_StopBreak,
+                       Magic_code);
+}
+
+static const struct tty_operations moxa_ops = {
+       .open = moxa_open,
+       .close = moxa_close,
+       .write = moxa_write,
+       .write_room = moxa_write_room,
+       .flush_buffer = moxa_flush_buffer,
+       .chars_in_buffer = moxa_chars_in_buffer,
+       .flush_chars = moxa_flush_chars,
+       .put_char = moxa_put_char,
+       .ioctl = moxa_ioctl,
+       .throttle = moxa_throttle,
+       .unthrottle = moxa_unthrottle,
+       .set_termios = moxa_set_termios,
+       .stop = moxa_stop,
+       .start = moxa_start,
+       .hangup = moxa_hangup,
+       .break_ctl = moxa_break_ctl,
+       .tiocmget = moxa_tiocmget,
+       .tiocmset = moxa_tiocmset,
+};
+
+static struct tty_driver *moxaDriver;
+static DEFINE_TIMER(moxaTimer, moxa_poll, 0, 0);
+static DEFINE_SPINLOCK(moxa_lock);
+
+/*
+ * HW init
+ */
+
+static int moxa_check_fw_model(struct moxa_board_conf *brd, u8 model)
+{
+       switch (brd->boardType) {
+       case MOXA_BOARD_C218_ISA:
+       case MOXA_BOARD_C218_PCI:
+               if (model != 1)
+                       goto err;
+               break;
+       case MOXA_BOARD_CP204J:
+               if (model != 3)
+                       goto err;
+               break;
+       default:
+               if (model != 2)
+                       goto err;
+               break;
+       }
+       return 0;
+err:
+       return -EINVAL;
+}
+
+static int moxa_check_fw(const void *ptr)
+{
+       const __le16 *lptr = ptr;
+
+       if (*lptr != cpu_to_le16(0x7980))
+               return -EINVAL;
+
+       return 0;
+}
+
+static int moxa_load_bios(struct moxa_board_conf *brd, const u8 *buf,
+               size_t len)
+{
+       void __iomem *baseAddr = brd->basemem;
+       u16 tmp;
+
+       writeb(HW_reset, baseAddr + Control_reg);       /* reset */
+       msleep(10);
+       memset_io(baseAddr, 0, 4096);
+       memcpy_toio(baseAddr, buf, len);        /* download BIOS */
+       writeb(0, baseAddr + Control_reg);      /* restart */
+
+       msleep(2000);
+
+       switch (brd->boardType) {
+       case MOXA_BOARD_C218_ISA:
+       case MOXA_BOARD_C218_PCI:
+               tmp = readw(baseAddr + C218_key);
+               if (tmp != C218_KeyCode)
+                       goto err;
+               break;
+       case MOXA_BOARD_CP204J:
+               tmp = readw(baseAddr + C218_key);
+               if (tmp != CP204J_KeyCode)
+                       goto err;
+               break;
+       default:
+               tmp = readw(baseAddr + C320_key);
+               if (tmp != C320_KeyCode)
+                       goto err;
+               tmp = readw(baseAddr + C320_status);
+               if (tmp != STS_init) {
+                       printk(KERN_ERR "moxa: bios upload failed -- CPU/Basic "
+                                       "module not found\n");
+                       return -EIO;
+               }
+               break;
+       }
+
+       return 0;
+err:
+       printk(KERN_ERR "moxa: bios upload failed -- board not found\n");
+       return -EIO;
+}
+
+static int moxa_load_320b(struct moxa_board_conf *brd, const u8 *ptr,
+               size_t len)
+{
+       void __iomem *baseAddr = brd->basemem;
+
+       if (len < 7168) {
+               printk(KERN_ERR "moxa: invalid 320 bios -- too short\n");
+               return -EINVAL;
+       }
+
+       writew(len - 7168 - 2, baseAddr + C320bapi_len);
+       writeb(1, baseAddr + Control_reg);      /* Select Page 1 */
+       memcpy_toio(baseAddr + DynPage_addr, ptr, 7168);
+       writeb(2, baseAddr + Control_reg);      /* Select Page 2 */
+       memcpy_toio(baseAddr + DynPage_addr, ptr + 7168, len - 7168);
+
+       return 0;
+}
+
+static int moxa_real_load_code(struct moxa_board_conf *brd, const void *ptr,
+               size_t len)
+{
+       void __iomem *baseAddr = brd->basemem;
+       const u16 *uptr = ptr;
+       size_t wlen, len2, j;
+       unsigned long key, loadbuf, loadlen, checksum, checksum_ok;
+       unsigned int i, retry, c320;
+       u16 usum, keycode;
+
+       c320 = brd->boardType == MOXA_BOARD_C320_PCI ||
+                       brd->boardType == MOXA_BOARD_C320_ISA;
+       keycode = (brd->boardType == MOXA_BOARD_CP204J) ? CP204J_KeyCode :
+                               C218_KeyCode;
+
+       switch (brd->boardType) {
+       case MOXA_BOARD_CP204J:
+       case MOXA_BOARD_C218_ISA:
+       case MOXA_BOARD_C218_PCI:
+               key = C218_key;
+               loadbuf = C218_LoadBuf;
+               loadlen = C218DLoad_len;
+               checksum = C218check_sum;
+               checksum_ok = C218chksum_ok;
+               break;
+       default:
+               key = C320_key;
+               keycode = C320_KeyCode;
+               loadbuf = C320_LoadBuf;
+               loadlen = C320DLoad_len;
+               checksum = C320check_sum;
+               checksum_ok = C320chksum_ok;
+               break;
+       }
+
+       usum = 0;
+       wlen = len >> 1;
+       for (i = 0; i < wlen; i++)
+               usum += le16_to_cpu(uptr[i]);
+       retry = 0;
+       do {
+               wlen = len >> 1;
+               j = 0;
+               while (wlen) {
+                       len2 = (wlen > 2048) ? 2048 : wlen;
+                       wlen -= len2;
+                       memcpy_toio(baseAddr + loadbuf, ptr + j, len2 << 1);
+                       j += len2 << 1;
+
+                       writew(len2, baseAddr + loadlen);
+                       writew(0, baseAddr + key);
+                       for (i = 0; i < 100; i++) {
+                               if (readw(baseAddr + key) == keycode)
+                                       break;
+                               msleep(10);
+                       }
+                       if (readw(baseAddr + key) != keycode)
+                               return -EIO;
+               }
+               writew(0, baseAddr + loadlen);
+               writew(usum, baseAddr + checksum);
+               writew(0, baseAddr + key);
+               for (i = 0; i < 100; i++) {
+                       if (readw(baseAddr + key) == keycode)
+                               break;
+                       msleep(10);
+               }
+               retry++;
+       } while ((readb(baseAddr + checksum_ok) != 1) && (retry < 3));
+       if (readb(baseAddr + checksum_ok) != 1)
+               return -EIO;
+
+       writew(0, baseAddr + key);
+       for (i = 0; i < 600; i++) {
+               if (readw(baseAddr + Magic_no) == Magic_code)
+                       break;
+               msleep(10);
+       }
+       if (readw(baseAddr + Magic_no) != Magic_code)
+               return -EIO;
+
+       if (c320) {
+               if (brd->busType == MOXA_BUS_TYPE_PCI) {        /* ASIC board */
+                       writew(0x3800, baseAddr + TMS320_PORT1);
+                       writew(0x3900, baseAddr + TMS320_PORT2);
+                       writew(28499, baseAddr + TMS320_CLOCK);
+               } else {
+                       writew(0x3200, baseAddr + TMS320_PORT1);
+                       writew(0x3400, baseAddr + TMS320_PORT2);
+                       writew(19999, baseAddr + TMS320_CLOCK);
+               }
+       }
+       writew(1, baseAddr + Disable_IRQ);
+       writew(0, baseAddr + Magic_no);
+       for (i = 0; i < 500; i++) {
+               if (readw(baseAddr + Magic_no) == Magic_code)
+                       break;
+               msleep(10);
+       }
+       if (readw(baseAddr + Magic_no) != Magic_code)
+               return -EIO;
+
+       if (c320) {
+               j = readw(baseAddr + Module_cnt);
+               if (j <= 0)
+                       return -EIO;
+               brd->numPorts = j * 8;
+               writew(j, baseAddr + Module_no);
+               writew(0, baseAddr + Magic_no);
+               for (i = 0; i < 600; i++) {
+                       if (readw(baseAddr + Magic_no) == Magic_code)
+                               break;
+                       msleep(10);
+               }
+               if (readw(baseAddr + Magic_no) != Magic_code)
+                       return -EIO;
+       }
+       brd->intNdx = baseAddr + IRQindex;
+       brd->intPend = baseAddr + IRQpending;
+       brd->intTable = baseAddr + IRQtable;
+
+       return 0;
+}
+
+static int moxa_load_code(struct moxa_board_conf *brd, const void *ptr,
+               size_t len)
+{
+       void __iomem *ofsAddr, *baseAddr = brd->basemem;
+       struct moxa_port *port;
+       int retval, i;
+
+       if (len % 2) {
+               printk(KERN_ERR "moxa: bios length is not even\n");
+               return -EINVAL;
+       }
+
+       retval = moxa_real_load_code(brd, ptr, len); /* may change numPorts */
+       if (retval)
+               return retval;
+
+       switch (brd->boardType) {
+       case MOXA_BOARD_C218_ISA:
+       case MOXA_BOARD_C218_PCI:
+       case MOXA_BOARD_CP204J:
+               port = brd->ports;
+               for (i = 0; i < brd->numPorts; i++, port++) {
+                       port->board = brd;
+                       port->DCDState = 0;
+                       port->tableAddr = baseAddr + Extern_table +
+                                       Extern_size * i;
+                       ofsAddr = port->tableAddr;
+                       writew(C218rx_mask, ofsAddr + RX_mask);
+                       writew(C218tx_mask, ofsAddr + TX_mask);
+                       writew(C218rx_spage + i * C218buf_pageno, ofsAddr + Page_rxb);
+                       writew(readw(ofsAddr + Page_rxb) + C218rx_pageno, ofsAddr + EndPage_rxb);
+
+                       writew(C218tx_spage + i * C218buf_pageno, ofsAddr + Page_txb);
+                       writew(readw(ofsAddr + Page_txb) + C218tx_pageno, ofsAddr + EndPage_txb);
+
+               }
+               break;
+       default:
+               port = brd->ports;
+               for (i = 0; i < brd->numPorts; i++, port++) {
+                       port->board = brd;
+                       port->DCDState = 0;
+                       port->tableAddr = baseAddr + Extern_table +
+                                       Extern_size * i;
+                       ofsAddr = port->tableAddr;
+                       switch (brd->numPorts) {
+                       case 8:
+                               writew(C320p8rx_mask, ofsAddr + RX_mask);
+                               writew(C320p8tx_mask, ofsAddr + TX_mask);
+                               writew(C320p8rx_spage + i * C320p8buf_pgno, ofsAddr + Page_rxb);
+                               writew(readw(ofsAddr + Page_rxb) + C320p8rx_pgno, ofsAddr + EndPage_rxb);
+                               writew(C320p8tx_spage + i * C320p8buf_pgno, ofsAddr + Page_txb);
+                               writew(readw(ofsAddr + Page_txb) + C320p8tx_pgno, ofsAddr + EndPage_txb);
+
+                               break;
+                       case 16:
+                               writew(C320p16rx_mask, ofsAddr + RX_mask);
+                               writew(C320p16tx_mask, ofsAddr + TX_mask);
+                               writew(C320p16rx_spage + i * C320p16buf_pgno, ofsAddr + Page_rxb);
+                               writew(readw(ofsAddr + Page_rxb) + C320p16rx_pgno, ofsAddr + EndPage_rxb);
+                               writew(C320p16tx_spage + i * C320p16buf_pgno, ofsAddr + Page_txb);
+                               writew(readw(ofsAddr + Page_txb) + C320p16tx_pgno, ofsAddr + EndPage_txb);
+                               break;
+
+                       case 24:
+                               writew(C320p24rx_mask, ofsAddr + RX_mask);
+                               writew(C320p24tx_mask, ofsAddr + TX_mask);
+                               writew(C320p24rx_spage + i * C320p24buf_pgno, ofsAddr + Page_rxb);
+                               writew(readw(ofsAddr + Page_rxb) + C320p24rx_pgno, ofsAddr + EndPage_rxb);
+                               writew(C320p24tx_spage + i * C320p24buf_pgno, ofsAddr + Page_txb);
+                               writew(readw(ofsAddr + Page_txb), ofsAddr + EndPage_txb);
+                               break;
+                       case 32:
+                               writew(C320p32rx_mask, ofsAddr + RX_mask);
+                               writew(C320p32tx_mask, ofsAddr + TX_mask);
+                               writew(C320p32tx_ofs, ofsAddr + Ofs_txb);
+                               writew(C320p32rx_spage + i * C320p32buf_pgno, ofsAddr + Page_rxb);
+                               writew(readb(ofsAddr + Page_rxb), ofsAddr + EndPage_rxb);
+                               writew(C320p32tx_spage + i * C320p32buf_pgno, ofsAddr + Page_txb);
+                               writew(readw(ofsAddr + Page_txb), ofsAddr + EndPage_txb);
+                               break;
+                       }
+               }
+               break;
+       }
+       return 0;
+}
+
+static int moxa_load_fw(struct moxa_board_conf *brd, const struct firmware *fw)
+{
+       void *ptr = fw->data;
+       char rsn[64];
+       u16 lens[5];
+       size_t len;
+       unsigned int a, lenp, lencnt;
+       int ret = -EINVAL;
+       struct {
+               __le32 magic;   /* 0x34303430 */
+               u8 reserved1[2];
+               u8 type;        /* UNIX = 3 */
+               u8 model;       /* C218T=1, C320T=2, CP204=3 */
+               u8 reserved2[8];
+               __le16 len[5];
+       } *hdr = ptr;
+
+       BUILD_BUG_ON(ARRAY_SIZE(hdr->len) != ARRAY_SIZE(lens));
+
+       if (fw->size < MOXA_FW_HDRLEN) {
+               strcpy(rsn, "too short (even header won't fit)");
+               goto err;
+       }
+       if (hdr->magic != cpu_to_le32(0x30343034)) {
+               sprintf(rsn, "bad magic: %.8x", le32_to_cpu(hdr->magic));
+               goto err;
+       }
+       if (hdr->type != 3) {
+               sprintf(rsn, "not for linux, type is %u", hdr->type);
+               goto err;
+       }
+       if (moxa_check_fw_model(brd, hdr->model)) {
+               sprintf(rsn, "not for this card, model is %u", hdr->model);
+               goto err;
+       }
+
+       len = MOXA_FW_HDRLEN;
+       lencnt = hdr->model == 2 ? 5 : 3;
+       for (a = 0; a < ARRAY_SIZE(lens); a++) {
+               lens[a] = le16_to_cpu(hdr->len[a]);
+               if (lens[a] && len + lens[a] <= fw->size &&
+                               moxa_check_fw(&fw->data[len]))
+                       printk(KERN_WARNING "moxa firmware: unexpected input "
+                               "at offset %u, but going on\n", (u32)len);
+               if (!lens[a] && a < lencnt) {
+                       sprintf(rsn, "too few entries in fw file");
+                       goto err;
+               }
+               len += lens[a];
+       }
+
+       if (len != fw->size) {
+               sprintf(rsn, "bad length: %u (should be %u)", (u32)fw->size,
+                               (u32)len);
+               goto err;
+       }
+
+       ptr += MOXA_FW_HDRLEN;
+       lenp = 0; /* bios */
+
+       strcpy(rsn, "read above");
+
+       ret = moxa_load_bios(brd, ptr, lens[lenp]);
+       if (ret)
+               goto err;
+
+       /* we skip the tty section (lens[1]), since we don't need it */
+       ptr += lens[lenp] + lens[lenp + 1];
+       lenp += 2; /* comm */
+
+       if (hdr->model == 2) {
+               ret = moxa_load_320b(brd, ptr, lens[lenp]);
+               if (ret)
+                       goto err;
+               /* skip another tty */
+               ptr += lens[lenp] + lens[lenp + 1];
+               lenp += 2;
+       }
+
+       ret = moxa_load_code(brd, ptr, lens[lenp]);
+       if (ret)
+               goto err;
+
+       return 0;
+err:
+       printk(KERN_ERR "firmware failed to load, reason: %s\n", rsn);
+       return ret;
+}
+
+static int moxa_init_board(struct moxa_board_conf *brd, struct device *dev)
+{
+       const struct firmware *fw;
+       const char *file;
+       struct moxa_port *p;
+       unsigned int i;
+       int ret;
 
-static const struct tty_operations moxa_ops = {
-       .open = moxa_open,
-       .close = moxa_close,
-       .write = moxa_write,
-       .write_room = moxa_write_room,
-       .flush_buffer = moxa_flush_buffer,
-       .chars_in_buffer = moxa_chars_in_buffer,
-       .flush_chars = moxa_flush_chars,
-       .put_char = moxa_put_char,
-       .ioctl = moxa_ioctl,
-       .throttle = moxa_throttle,
-       .unthrottle = moxa_unthrottle,
-       .set_termios = moxa_set_termios,
-       .stop = moxa_stop,
-       .start = moxa_start,
-       .hangup = moxa_hangup,
-       .tiocmget = moxa_tiocmget,
-       .tiocmset = moxa_tiocmset,
-};
+       brd->ports = kcalloc(MAX_PORTS_PER_BOARD, sizeof(*brd->ports),
+                       GFP_KERNEL);
+       if (brd->ports == NULL) {
+               printk(KERN_ERR "cannot allocate memory for ports\n");
+               ret = -ENOMEM;
+               goto err;
+       }
 
-static struct tty_driver *moxaDriver;
-static struct moxa_port moxa_ports[MAX_PORTS];
-static DEFINE_TIMER(moxaTimer, moxa_poll, 0, 0);
-static DEFINE_SPINLOCK(moxa_lock);
+       for (i = 0, p = brd->ports; i < MAX_PORTS_PER_BOARD; i++, p++) {
+               p->type = PORT_16550A;
+               p->close_delay = 5 * HZ / 10;
+               p->cflag = B9600 | CS8 | CREAD | CLOCAL | HUPCL;
+               init_waitqueue_head(&p->open_wait);
+               init_completion(&p->close_wait);
+
+               setup_timer(&p->emptyTimer, moxa_check_xmit_empty,
+                               (unsigned long)p);
+       }
+
+       switch (brd->boardType) {
+       case MOXA_BOARD_C218_ISA:
+       case MOXA_BOARD_C218_PCI:
+               file = "c218tunx.cod";
+               break;
+       case MOXA_BOARD_CP204J:
+               file = "cp204unx.cod";
+               break;
+       default:
+               file = "c320tunx.cod";
+               break;
+       }
+
+       ret = request_firmware(&fw, file, dev);
+       if (ret) {
+               printk(KERN_ERR "request_firmware failed\n");
+               goto err_free;
+       }
+
+       ret = moxa_load_fw(brd, fw);
+
+       release_firmware(fw);
+
+       if (ret)
+               goto err_free;
+
+       brd->ready = 1;
+
+       if (!timer_pending(&moxaTimer))
+               mod_timer(&moxaTimer, jiffies + HZ / 50);
+
+       return 0;
+err_free:
+       kfree(brd->ports);
+err:
+       return ret;
+}
+
+static void moxa_board_deinit(struct moxa_board_conf *brd)
+{
+       unsigned int i;
+
+       brd->ready = 0;
+       for (i = 0; i < MAX_PORTS_PER_BOARD; i++)
+               del_timer_sync(&brd->ports[i].emptyTimer);
+
+       iounmap(brd->basemem);
+       brd->basemem = NULL;
+       kfree(brd->ports);
+}
 
 #ifdef CONFIG_PCI
 static int __devinit moxa_pci_probe(struct pci_dev *pdev,
@@ -299,10 +895,17 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
        }
 
        board = &moxa_boards[i];
-       board->basemem = pci_iomap(pdev, 2, 0x4000);
+
+       retval = pci_request_region(pdev, 2, "moxa-base");
+       if (retval) {
+               dev_err(&pdev->dev, "can't request pci region 2\n");
+               goto err;
+       }
+
+       board->basemem = ioremap(pci_resource_start(pdev, 2), 0x4000);
        if (board->basemem == NULL) {
                dev_err(&pdev->dev, "can't remap io space 2\n");
-               goto err;
+               goto err_reg;
        }
 
        board->boardType = board_type;
@@ -321,9 +924,18 @@ static int __devinit moxa_pci_probe(struct pci_dev *pdev,
        }
        board->busType = MOXA_BUS_TYPE_PCI;
 
+       retval = moxa_init_board(board, &pdev->dev);
+       if (retval)
+               goto err_base;
+
        pci_set_drvdata(pdev, board);
 
        return (0);
+err_base:
+       iounmap(board->basemem);
+       board->basemem = NULL;
+err_reg:
+       pci_release_region(pdev, 2);
 err:
        return retval;
 }
@@ -332,8 +944,9 @@ static void __devexit moxa_pci_remove(struct pci_dev *pdev)
 {
        struct moxa_board_conf *brd = pci_get_drvdata(pdev);
 
-       pci_iounmap(pdev, brd->basemem);
-       brd->basemem = NULL;
+       moxa_board_deinit(brd);
+
+       pci_release_region(pdev, 2);
 }
 
 static struct pci_driver moxa_pci_driver = {
@@ -346,8 +959,8 @@ static struct pci_driver moxa_pci_driver = {
 
 static int __init moxa_init(void)
 {
-       int i, numBoards, retval = 0;
-       struct moxa_port *ch;
+       unsigned int isabrds = 0;
+       int retval = 0;
 
        printk(KERN_INFO "MOXA Intellio family driver version %s\n",
                        MOXA_VERSION);
@@ -368,19 +981,6 @@ static int __init moxa_init(void)
        moxaDriver->flags = TTY_DRIVER_REAL_RAW;
        tty_set_operations(moxaDriver, &moxa_ops);
 
-       for (i = 0, ch = moxa_ports; i < MAX_PORTS; i++, ch++) {
-               ch->type = PORT_16550A;
-               ch->port = i;
-               ch->close_delay = 5 * HZ / 10;
-               ch->closing_wait = 30 * HZ;
-               ch->cflag = B9600 | CS8 | CREAD | CLOCAL | HUPCL;
-               init_waitqueue_head(&ch->open_wait);
-               init_completion(&ch->close_wait);
-
-               setup_timer(&ch->emptyTimer, moxa_check_xmit_empty,
-                               (unsigned long)ch);
-       }
-
        pr_debug("Moxa tty devices major number = %d\n", ttymajor);
 
        if (tty_register_driver(moxaDriver)) {
@@ -389,67 +989,51 @@ static int __init moxa_init(void)
                return -1;
        }
 
-       mod_timer(&moxaTimer, jiffies + HZ / 50);
-
-       /* Find the boards defined in source code */
-       numBoards = 0;
-       for (i = 0; i < MAX_BOARDS; i++) {
-               if ((moxa_isa_boards[i].boardType == MOXA_BOARD_C218_ISA) ||
-                (moxa_isa_boards[i].boardType == MOXA_BOARD_C320_ISA)) {
-                       moxa_boards[numBoards].boardType = moxa_isa_boards[i].boardType;
-                       if (moxa_isa_boards[i].boardType == MOXA_BOARD_C218_ISA)
-                               moxa_boards[numBoards].numPorts = 8;
-                       else
-                               moxa_boards[numBoards].numPorts = moxa_isa_boards[i].numPorts;
-                       moxa_boards[numBoards].busType = MOXA_BUS_TYPE_ISA;
-                       moxa_boards[numBoards].baseAddr = moxa_isa_boards[i].baseAddr;
-                       pr_debug("Moxa board %2d: %s board(baseAddr=%lx)\n",
-                              numBoards + 1,
-                              moxa_brdname[moxa_boards[numBoards].boardType-1],
-                              moxa_boards[numBoards].baseAddr);
-                       numBoards++;
-               }
-       }
-       /* Find the boards defined form module args. */
+       /* Find the boards defined from module args. */
 #ifdef MODULE
+       {
+       struct moxa_board_conf *brd = moxa_boards;
+       unsigned int i;
        for (i = 0; i < MAX_BOARDS; i++) {
-               if ((type[i] == MOXA_BOARD_C218_ISA) ||
-                   (type[i] == MOXA_BOARD_C320_ISA)) {
+               if (!baseaddr[i])
+                       break;
+               if (type[i] == MOXA_BOARD_C218_ISA ||
+                               type[i] == MOXA_BOARD_C320_ISA) {
                        pr_debug("Moxa board %2d: %s board(baseAddr=%lx)\n",
-                              numBoards + 1, moxa_brdname[type[i] - 1],
-                              (unsigned long)baseaddr[i]);
-                       if (numBoards >= MAX_BOARDS) {
-                               printk(KERN_WARNING "More than %d MOXA "
-                                       "Intellio family boards found. Board "
-                                       "is ignored.\n", MAX_BOARDS);
+                                       isabrds + 1, moxa_brdname[type[i] - 1],
+                                       baseaddr[i]);
+                       brd->boardType = type[i];
+                       brd->numPorts = type[i] == MOXA_BOARD_C218_ISA ? 8 :
+                                       numports[i];
+                       brd->busType = MOXA_BUS_TYPE_ISA;
+                       brd->basemem = ioremap(baseaddr[i], 0x4000);
+                       if (!brd->basemem) {
+                               printk(KERN_ERR "moxa: can't remap %lx\n",
+                                               baseaddr[i]);
                                continue;
                        }
-                       moxa_boards[numBoards].boardType = type[i];
-                       if (moxa_isa_boards[i].boardType == MOXA_BOARD_C218_ISA)
-                               moxa_boards[numBoards].numPorts = 8;
-                       else
-                               moxa_boards[numBoards].numPorts = numports[i];
-                       moxa_boards[numBoards].busType = MOXA_BUS_TYPE_ISA;
-                       moxa_boards[numBoards].baseAddr = baseaddr[i];
-                       numBoards++;
+                       if (moxa_init_board(brd, NULL)) {
+                               iounmap(brd->basemem);
+                               brd->basemem = NULL;
+                               continue;
+                       }
+
+                       brd++;
+                       isabrds++;
                }
        }
+       }
 #endif
 
 #ifdef CONFIG_PCI
        retval = pci_register_driver(&moxa_pci_driver);
        if (retval) {
                printk(KERN_ERR "Can't register moxa pci driver!\n");
-               if (numBoards)
+               if (isabrds)
                        retval = 0;
        }
 #endif
 
-       for (i = 0; i < numBoards; i++) {
-               moxa_boards[i].basemem = ioremap(moxa_boards[i].baseAddr,
-                               0x4000);
-       }
-
        return retval;
 }
 
@@ -459,9 +1043,6 @@ static void __exit moxa_exit(void)
 
        del_timer_sync(&moxaTimer);
 
-       for (i = 0; i < MAX_PORTS; i++)
-               del_timer_sync(&moxa_ports[i].emptyTimer);
-
        if (tty_unregister_driver(moxaDriver))
                printk(KERN_ERR "Couldn't unregister MOXA Intellio family "
                                "serial driver\n");
@@ -471,9 +1052,9 @@ static void __exit moxa_exit(void)
        pci_unregister_driver(&moxa_pci_driver);
 #endif
 
-       for (i = 0; i < MAX_BOARDS; i++)
-               if (moxa_boards[i].basemem)
-                       iounmap(moxa_boards[i].basemem);
+       for (i = 0; i < MAX_BOARDS; i++) /* ISA boards */
+               if (moxa_boards[i].ready)
+                       moxa_board_deinit(&moxa_boards[i]);
 }
 
 module_init(moxa_init);
@@ -481,28 +1062,28 @@ module_exit(moxa_exit);
 
 static int moxa_open(struct tty_struct *tty, struct file *filp)
 {
+       struct moxa_board_conf *brd;
        struct moxa_port *ch;
        int port;
        int retval;
 
        port = tty->index;
        if (port == MAX_PORTS) {
-               return (0);
-       }
-       if (!MoxaPortIsValid(port)) {
-               tty->driver_data = NULL;
-               return (-ENODEV);
+               return capable(CAP_SYS_ADMIN) ? 0 : -EPERM;
        }
+       brd = &moxa_boards[port / MAX_PORTS_PER_BOARD];
+       if (!brd->ready)
+               return -ENODEV;
 
-       ch = &moxa_ports[port];
+       ch = &brd->ports[port % MAX_PORTS_PER_BOARD];
        ch->count++;
        tty->driver_data = ch;
        ch->tty = tty;
        if (!(ch->asyncflags & ASYNC_INITIALIZED)) {
                ch->statusflags = 0;
                moxa_set_tty_param(tty, tty->termios);
-               MoxaPortLineCtrl(ch->port, 1, 1);
-               MoxaPortEnable(ch->port);
+               MoxaPortLineCtrl(ch, 1, 1);
+               MoxaPortEnable(ch);
                ch->asyncflags |= ASYNC_INITIALIZED;
        }
        retval = moxa_block_till_ready(tty, filp, ch);
@@ -510,9 +1091,9 @@ static int moxa_open(struct tty_struct *tty, struct file *filp)
        moxa_unthrottle(tty);
 
        if (ch->type == PORT_16550A) {
-               MoxaSetFifo(ch->port, 1);
+               MoxaSetFifo(ch, 1);
        } else {
-               MoxaSetFifo(ch->port, 0);
+               MoxaSetFifo(ch, 0);
        }
 
        return (retval);
@@ -527,11 +1108,6 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)
        if (port == MAX_PORTS) {
                return;
        }
-       if (!MoxaPortIsValid(port)) {
-               pr_debug("Invalid portno in moxa_close\n");
-               tty->driver_data = NULL;
-               return;
-       }
        if (tty->driver_data == NULL) {
                return;
        }
@@ -559,17 +1135,16 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)
        if (ch->asyncflags & ASYNC_INITIALIZED) {
                moxa_setup_empty_event(tty);
                tty_wait_until_sent(tty, 30 * HZ);      /* 30 seconds timeout */
-               del_timer_sync(&moxa_ports[ch->port].emptyTimer);
+               del_timer_sync(&ch->emptyTimer);
        }
        moxa_shut_down(ch);
-       MoxaPortFlushData(port, 2);
+       MoxaPortFlushData(ch, 2);
 
        if (tty->driver->flush_buffer)
                tty->driver->flush_buffer(tty);
        tty_ldisc_flush(tty);
                        
        tty->closing = 0;
-       ch->event = 0;
        ch->tty = NULL;
        if (ch->blocked_open) {
                if (ch->close_delay) {
@@ -584,17 +1159,15 @@ static void moxa_close(struct tty_struct *tty, struct file *filp)
 static int moxa_write(struct tty_struct *tty,
                      const unsigned char *buf, int count)
 {
-       struct moxa_port *ch;
-       int len, port;
+       struct moxa_port *ch = tty->driver_data;
        unsigned long flags;
+       int len;
 
-       ch = (struct moxa_port *) tty->driver_data;
        if (ch == NULL)
-               return (0);
-       port = ch->port;
+               return 0;
 
        spin_lock_irqsave(&moxa_lock, flags);
-       len = MoxaPortWriteData(port, (unsigned char *) buf, count);
+       len = MoxaPortWriteData(ch, (unsigned char *) buf, count);
        spin_unlock_irqrestore(&moxa_lock, flags);
 
        /*********************************************
@@ -611,26 +1184,26 @@ static int moxa_write_room(struct tty_struct *tty)
 
        if (tty->stopped)
                return (0);
-       ch = (struct moxa_port *) tty->driver_data;
+       ch = tty->driver_data;
        if (ch == NULL)
                return (0);
-       return (MoxaPortTxFree(ch->port));
+       return MoxaPortTxFree(ch);
 }
 
 static void moxa_flush_buffer(struct tty_struct *tty)
 {
-       struct moxa_port *ch = (struct moxa_port *) tty->driver_data;
+       struct moxa_port *ch = tty->driver_data;
 
        if (ch == NULL)
                return;
-       MoxaPortFlushData(ch->port, 1);
+       MoxaPortFlushData(ch, 1);
        tty_wakeup(tty);
 }
 
 static int moxa_chars_in_buffer(struct tty_struct *tty)
 {
+       struct moxa_port *ch = tty->driver_data;
        int chars;
-       struct moxa_port *ch = (struct moxa_port *) tty->driver_data;
 
        /*
         * Sigh...I have to check if driver_data is NULL here, because
@@ -640,7 +1213,7 @@ static int moxa_chars_in_buffer(struct tty_struct *tty)
         */
        if (ch == NULL)
                return (0);
-       chars = MoxaPortTxQueue(ch->port);
+       chars = MoxaPortTxQueue(ch);
        if (chars) {
                /*
                 * Make it possible to wakeup anything waiting for output
@@ -662,16 +1235,13 @@ static void moxa_flush_chars(struct tty_struct *tty)
 
 static void moxa_put_char(struct tty_struct *tty, unsigned char c)
 {
-       struct moxa_port *ch;
-       int port;
+       struct moxa_port *ch = tty->driver_data;
        unsigned long flags;
 
-       ch = (struct moxa_port *) tty->driver_data;
        if (ch == NULL)
                return;
-       port = ch->port;
        spin_lock_irqsave(&moxa_lock, flags);
-       MoxaPortWriteData(port, &c, 1);
+       MoxaPortWriteData(ch, &c, 1);
        spin_unlock_irqrestore(&moxa_lock, flags);
        /************************************************
        if ( !(ch->statusflags & LOWWAIT) && (MoxaPortTxFree(port) <= 100) )
@@ -681,20 +1251,18 @@ static void moxa_put_char(struct tty_struct *tty, unsigned char c)
 
 static int moxa_tiocmget(struct tty_struct *tty, struct file *file)
 {
-       struct moxa_port *ch = (struct moxa_port *) tty->driver_data;
-       int port;
+       struct moxa_port *ch = tty->driver_data;
        int flag = 0, dtr, rts;
 
-       port = tty->index;
-       if ((port != MAX_PORTS) && (!ch))
-               return (-EINVAL);
+       if (!ch)
+               return -EINVAL;
 
-       MoxaPortGetLineOut(ch->port, &dtr, &rts);
+       MoxaPortGetLineOut(ch, &dtr, &rts);
        if (dtr)
                flag |= TIOCM_DTR;
        if (rts)
                flag |= TIOCM_RTS;
-       dtr = MoxaPortLineStatus(ch->port);
+       dtr = MoxaPortLineStatus(ch);
        if (dtr & 1)
                flag |= TIOCM_CTS;
        if (dtr & 2)
@@ -707,15 +1275,15 @@ static int moxa_tiocmget(struct tty_struct *tty, struct file *file)
 static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
                         unsigned int set, unsigned int clear)
 {
-       struct moxa_port *ch = (struct moxa_port *) tty->driver_data;
+       struct moxa_port *ch = tty->driver_data;
        int port;
        int dtr, rts;
 
        port = tty->index;
-       if ((port != MAX_PORTS) && (!ch))
-               return (-EINVAL);
+       if (!ch)
+               return -EINVAL;
 
-       MoxaPortGetLineOut(ch->port, &dtr, &rts);
+       MoxaPortGetLineOut(ch, &dtr, &rts);
        if (set & TIOCM_RTS)
                rts = 1;
        if (set & TIOCM_DTR)
@@ -724,64 +1292,10 @@ static int moxa_tiocmset(struct tty_struct *tty, struct file *file,
                rts = 0;
        if (clear & TIOCM_DTR)
                dtr = 0;
-       MoxaPortLineCtrl(ch->port, dtr, rts);
+       MoxaPortLineCtrl(ch, dtr, rts);
        return 0;
 }
 
-static int moxa_ioctl(struct tty_struct *tty, struct file *file,
-                     unsigned int cmd, unsigned long arg)
-{
-       struct moxa_port *ch = (struct moxa_port *) tty->driver_data;
-       register int port;
-       void __user *argp = (void __user *)arg;
-       int retval;
-
-       port = tty->index;
-       if ((port != MAX_PORTS) && (!ch))
-               return (-EINVAL);
-
-       switch (cmd) {
-       case TCSBRK:            /* SVID version: non-zero arg --> no break */
-               retval = tty_check_change(tty);
-               if (retval)
-                       return (retval);
-               moxa_setup_empty_event(tty);
-               tty_wait_until_sent(tty, 0);
-               if (!arg)
-                       MoxaPortSendBreak(ch->port, 0);
-               return (0);
-       case TCSBRKP:           /* support for POSIX tcsendbreak() */
-               retval = tty_check_change(tty);
-               if (retval)
-                       return (retval);
-               moxa_setup_empty_event(tty);
-               tty_wait_until_sent(tty, 0);
-               MoxaPortSendBreak(ch->port, arg);
-               return (0);
-       case TIOCGSOFTCAR:
-               return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *) argp);
-       case TIOCSSOFTCAR:
-               if(get_user(retval, (unsigned long __user *) argp))
-                       return -EFAULT;
-               arg = retval;
-               tty->termios->c_cflag = ((tty->termios->c_cflag & ~CLOCAL) |
-                                        (arg ? CLOCAL : 0));
-               if (C_CLOCAL(tty))
-                       ch->asyncflags &= ~ASYNC_CHECK_CD;
-               else
-                       ch->asyncflags |= ASYNC_CHECK_CD;
-               return (0);
-       case TIOCGSERIAL:
-               return moxa_get_serial_info(ch, argp);
-
-       case TIOCSSERIAL:
-               return moxa_set_serial_info(ch, argp);
-       default:
-               retval = MoxaDriverIoctl(cmd, arg, port);
-       }
-       return (retval);
-}
-
 static void moxa_throttle(struct tty_struct *tty)
 {
        struct moxa_port *ch = (struct moxa_port *) tty->driver_data;
@@ -815,7 +1329,7 @@ static void moxa_stop(struct tty_struct *tty)
 
        if (ch == NULL)
                return;
-       MoxaPortTxDisable(ch->port);
+       MoxaPortTxDisable(ch);
        ch->statusflags |= TXSTOPPED;
 }
 
@@ -830,7 +1344,7 @@ static void moxa_start(struct tty_struct *tty)
        if (!(ch->statusflags & TXSTOPPED))
                return;
 
-       MoxaPortTxEnable(ch->port);
+       MoxaPortTxEnable(ch);
        ch->statusflags &= ~TXSTOPPED;
 }
 
@@ -840,7 +1354,6 @@ static void moxa_hangup(struct tty_struct *tty)
 
        moxa_flush_buffer(tty);
        moxa_shut_down(ch);
-       ch->event = 0;
        ch->count = 0;
        ch->asyncflags &= ~ASYNC_NORMAL_ACTIVE;
        ch->tty = NULL;
@@ -849,10 +1362,10 @@ static void moxa_hangup(struct tty_struct *tty)
 
 static void moxa_poll(unsigned long ignored)
 {
-       register int card;
        struct moxa_port *ch;
-       struct tty_struct *tp;
-       int i, ports;
+       struct tty_struct *tty;
+       unsigned int card;
+       int i;
 
        del_timer(&moxaTimer);
 
@@ -860,36 +1373,38 @@ static void moxa_poll(unsigned long ignored)
                mod_timer(&moxaTimer, jiffies + HZ / 50);
                return;
        }
+
        for (card = 0; card < MAX_BOARDS; card++) {
-               if ((ports = MoxaPortsOfCard(card)) <= 0)
+               if (!moxa_boards[card].ready)
                        continue;
-               ch = &moxa_ports[card * MAX_PORTS_PER_BOARD];
-               for (i = 0; i < ports; i++, ch++) {
+               ch = moxa_boards[card].ports;
+               for (i = 0; i < moxa_boards[card].numPorts; i++, ch++) {
                        if ((ch->asyncflags & ASYNC_INITIALIZED) == 0)
                                continue;
                        if (!(ch->statusflags & THROTTLE) &&
-                           (MoxaPortRxQueue(ch->port) > 0))
+                           (MoxaPortRxQueue(ch) > 0))
                                moxa_receive_data(ch);
-                       if ((tp = ch->tty) == 0)
+                       tty = ch->tty;
+                       if (tty == NULL)
                                continue;
                        if (ch->statusflags & LOWWAIT) {
-                               if (MoxaPortTxQueue(ch->port) <= WAKEUP_CHARS) {
-                                       if (!tp->stopped) {
+                               if (MoxaPortTxQueue(ch) <= WAKEUP_CHARS) {
+                                       if (!tty->stopped) {
                                                ch->statusflags &= ~LOWWAIT;
-                                               tty_wakeup(tp);
+                                               tty_wakeup(tty);
                                        }
                                }
                        }
-                       if (!I_IGNBRK(tp) && (MoxaPortResetBrkCnt(ch->port) > 0)) {
-                               tty_insert_flip_char(tp, 0, TTY_BREAK);
-                               tty_schedule_flip(tp);
+                       if (!I_IGNBRK(tty) && (MoxaPortResetBrkCnt(ch) > 0)) {
+                               tty_insert_flip_char(tty, 0, TTY_BREAK);
+                               tty_schedule_flip(tty);
                        }
-                       if (MoxaPortDCDChange(ch->port)) {
+                       if (MoxaPortDCDChange(ch)) {
                                if (ch->asyncflags & ASYNC_CHECK_CD) {
-                                       if (MoxaPortDCDON(ch->port))
+                                       if (MoxaPortDCDON(ch))
                                                wake_up_interruptible(&ch->open_wait);
                                        else {
-                                               tty_hangup(tp);
+                                               tty_hangup(tty);
                                                wake_up_interruptible(&ch->open_wait);
                                                ch->asyncflags &= ~ASYNC_NORMAL_ACTIVE;
                                        }
@@ -927,8 +1442,8 @@ static void moxa_set_tty_param(struct tty_struct *tty, struct ktermios *old_term
 
        /* Clear the features we don't support */
        ts->c_cflag &= ~CMSPAR;
-       MoxaPortFlowCtrl(ch->port, rts, cts, txflow, rxflow, xany);
-       baud = MoxaPortSetTermio(ch->port, ts, tty_get_baud_rate(tty));
+       MoxaPortFlowCtrl(ch, rts, cts, txflow, rxflow, xany);
+       baud = MoxaPortSetTermio(ch, ts, tty_get_baud_rate(tty));
        if (baud == -1)
                baud = tty_termios_baud_rate(old_termios);
        /* Not put the baud rate into the termios data */
@@ -973,7 +1488,7 @@ static int moxa_block_till_ready(struct tty_struct *tty, struct file *filp,
        retval = 0;
        add_wait_queue(&ch->open_wait, &wait);
        pr_debug("block_til_ready before block: ttys%d, count = %d\n",
-               ch->port, ch->count);
+               tty->index, ch->count);
        spin_lock_irqsave(&moxa_lock, flags);
        if (!tty_hung_up_p(filp))
                ch->count--;
@@ -995,7 +1510,7 @@ static int moxa_block_till_ready(struct tty_struct *tty, struct file *filp,
                        break;
                }
                if (!(ch->asyncflags & ASYNC_CLOSING) && (do_clocal ||
-                                               MoxaPortDCDON(ch->port)))
+                                               MoxaPortDCDON(ch)))
                        break;
 
                if (signal_pending(current)) {
@@ -1013,7 +1528,7 @@ static int moxa_block_till_ready(struct tty_struct *tty, struct file *filp,
        ch->blocked_open--;
        spin_unlock_irqrestore(&moxa_lock, flags);
        pr_debug("block_til_ready after blocking: ttys%d, count = %d\n",
-               ch->port, ch->count);
+               tty->index, ch->count);
        if (retval)
                return (retval);
        /* FIXME: review to see if we need to use set_bit on these */
@@ -1028,7 +1543,7 @@ static void moxa_setup_empty_event(struct tty_struct *tty)
 
        spin_lock_irqsave(&moxa_lock, flags);
        ch->statusflags |= EMPTYWAIT;
-       mod_timer(&moxa_ports[ch->port].emptyTimer, jiffies + HZ);
+       mod_timer(&ch->emptyTimer, jiffies + HZ);
        spin_unlock_irqrestore(&moxa_lock, flags);
 }
 
@@ -1038,13 +1553,12 @@ static void moxa_check_xmit_empty(unsigned long data)
 
        ch = (struct moxa_port *) data;
        if (ch->tty && (ch->statusflags & EMPTYWAIT)) {
-               if (MoxaPortTxQueue(ch->port) == 0) {
+               if (MoxaPortTxQueue(ch) == 0) {
                        ch->statusflags &= ~EMPTYWAIT;
                        tty_wakeup(ch->tty);
                        return;
                }
-               mod_timer(&moxa_ports[ch->port].emptyTimer,
-                               round_jiffies(jiffies + HZ));
+               mod_timer(&ch->emptyTimer, round_jiffies(jiffies + HZ));
        } else
                ch->statusflags &= ~EMPTYWAIT;
 }
@@ -1058,13 +1572,13 @@ static void moxa_shut_down(struct moxa_port *ch)
 
        tp = ch->tty;
 
-       MoxaPortDisable(ch->port);
+       MoxaPortDisable(ch);
 
        /*
         * If we're a modem control device and HUPCL is on, drop RTS & DTR.
         */
        if (tp->termios->c_cflag & HUPCL)
-               MoxaPortLineCtrl(ch->port, 0, 0);
+               MoxaPortLineCtrl(ch, 0, 0);
 
        ch->asyncflags &= ~ASYNC_INITIALIZED;
 }
@@ -1083,598 +1597,107 @@ static void moxa_receive_data(struct moxa_port *ch)
        if ( !tp || !ts || !(ts->c_cflag & CREAD) ) {
        *****************************************************/
        if (!tp || !ts) {
-               MoxaPortFlushData(ch->port, 0);
+               MoxaPortFlushData(ch, 0);
                return;
        }
        spin_lock_irqsave(&moxa_lock, flags);
-       MoxaPortReadData(ch->port, tp);
+       MoxaPortReadData(ch, tp);
        spin_unlock_irqrestore(&moxa_lock, flags);
        tty_schedule_flip(tp);
 }
 
-#define Magic_code     0x404
-
-/*
- *    System Configuration
- */
-/*
- *    for C218 BIOS initialization
- */
-#define C218_ConfBase  0x800
-#define C218_status    (C218_ConfBase + 0)     /* BIOS running status    */
-#define C218_diag      (C218_ConfBase + 2)     /* diagnostic status      */
-#define C218_key       (C218_ConfBase + 4)     /* WORD (0x218 for C218) */
-#define C218DLoad_len  (C218_ConfBase + 6)     /* WORD           */
-#define C218check_sum  (C218_ConfBase + 8)     /* BYTE           */
-#define C218chksum_ok  (C218_ConfBase + 0x0a)  /* BYTE (1:ok)            */
-#define C218_TestRx    (C218_ConfBase + 0x10)  /* 8 bytes for 8 ports    */
-#define C218_TestTx    (C218_ConfBase + 0x18)  /* 8 bytes for 8 ports    */
-#define C218_RXerr     (C218_ConfBase + 0x20)  /* 8 bytes for 8 ports    */
-#define C218_ErrFlag   (C218_ConfBase + 0x28)  /* 8 bytes for 8 ports    */
-
-#define C218_LoadBuf   0x0F00
-#define C218_KeyCode   0x218
-#define CP204J_KeyCode 0x204
-
-/*
- *    for C320 BIOS initialization
- */
-#define C320_ConfBase  0x800
-#define C320_LoadBuf   0x0f00
-#define STS_init       0x05    /* for C320_status        */
-
-#define C320_status    C320_ConfBase + 0       /* BIOS running status    */
-#define C320_diag      C320_ConfBase + 2       /* diagnostic status      */
-#define C320_key       C320_ConfBase + 4       /* WORD (0320H for C320) */
-#define C320DLoad_len  C320_ConfBase + 6       /* WORD           */
-#define C320check_sum  C320_ConfBase + 8       /* WORD           */
-#define C320chksum_ok  C320_ConfBase + 0x0a    /* WORD (1:ok)            */
-#define C320bapi_len   C320_ConfBase + 0x0c    /* WORD           */
-#define C320UART_no    C320_ConfBase + 0x0e    /* WORD           */
-
-#define C320_KeyCode   0x320
-
-#define FixPage_addr   0x0000  /* starting addr of static page  */
-#define DynPage_addr   0x2000  /* starting addr of dynamic page */
-#define C218_start     0x3000  /* starting addr of C218 BIOS prg */
-#define Control_reg    0x1ff0  /* select page and reset control */
-#define HW_reset       0x80
-
-/*
- *    Function Codes
- */
-#define FC_CardReset   0x80
-#define FC_ChannelReset 1      /* C320 firmware not supported */
-#define FC_EnableCH    2
-#define FC_DisableCH   3
-#define FC_SetParam    4
-#define FC_SetMode     5
-#define FC_SetRate     6
-#define FC_LineControl 7
-#define FC_LineStatus  8
-#define FC_XmitControl 9
-#define FC_FlushQueue  10
-#define FC_SendBreak   11
-#define FC_StopBreak   12
-#define FC_LoopbackON  13
-#define FC_LoopbackOFF 14
-#define FC_ClrIrqTable 15
-#define FC_SendXon     16
-#define FC_SetTermIrq  17      /* C320 firmware not supported */
-#define FC_SetCntIrq   18      /* C320 firmware not supported */
-#define FC_SetBreakIrq 19
-#define FC_SetLineIrq  20
-#define FC_SetFlowCtl  21
-#define FC_GenIrq      22
-#define FC_InCD180     23
-#define FC_OutCD180    24
-#define FC_InUARTreg   23
-#define FC_OutUARTreg  24
-#define FC_SetXonXoff  25
-#define FC_OutCD180CCR 26
-#define FC_ExtIQueue   27
-#define FC_ExtOQueue   28
-#define FC_ClrLineIrq  29
-#define FC_HWFlowCtl   30
-#define FC_GetClockRate 35
-#define FC_SetBaud     36
-#define FC_SetDataMode  41
-#define FC_GetCCSR      43
-#define FC_GetDataError 45
-#define FC_RxControl   50
-#define FC_ImmSend     51
-#define FC_SetXonState 52
-#define FC_SetXoffState        53
-#define FC_SetRxFIFOTrig 54
-#define FC_SetTxFIFOCnt 55
-#define FC_UnixRate    56
-#define FC_UnixResetTimer 57
-
-#define        RxFIFOTrig1     0
-#define        RxFIFOTrig4     1
-#define        RxFIFOTrig8     2
-#define        RxFIFOTrig14    3
-
-/*
- *    Dual-Ported RAM
- */
-#define DRAM_global    0
-#define INT_data       (DRAM_global + 0)
-#define Config_base    (DRAM_global + 0x108)
-
-#define IRQindex       (INT_data + 0)
-#define IRQpending     (INT_data + 4)
-#define IRQtable       (INT_data + 8)
-
-/*
- *    Interrupt Status
- */
-#define IntrRx         0x01    /* receiver data O.K.             */
-#define IntrTx         0x02    /* transmit buffer empty  */
-#define IntrFunc       0x04    /* function complete              */
-#define IntrBreak      0x08    /* received break         */
-#define IntrLine       0x10    /* line status change
-                                  for transmitter                */
-#define IntrIntr       0x20    /* received INTR code             */
-#define IntrQuit       0x40    /* received QUIT code             */
-#define IntrEOF        0x80    /* received EOF code              */
-
-#define IntrRxTrigger  0x100   /* rx data count reach tigger value */
-#define IntrTxTrigger  0x200   /* tx data count below trigger value */
-
-#define Magic_no       (Config_base + 0)
-#define Card_model_no  (Config_base + 2)
-#define Total_ports    (Config_base + 4)
-#define Module_cnt     (Config_base + 8)
-#define Module_no      (Config_base + 10)
-#define Timer_10ms     (Config_base + 14)
-#define Disable_IRQ    (Config_base + 20)
-#define TMS320_PORT1   (Config_base + 22)
-#define TMS320_PORT2   (Config_base + 24)
-#define TMS320_CLOCK   (Config_base + 26)
-
-/*
- *    DATA BUFFER in DRAM
- */
-#define Extern_table   0x400   /* Base address of the external table
-                                  (24 words *    64) total 3K bytes
-                                  (24 words * 128) total 6K bytes */
-#define Extern_size    0x60    /* 96 bytes                       */
-#define RXrptr         0x00    /* read pointer for RX buffer     */
-#define RXwptr         0x02    /* write pointer for RX buffer    */
-#define TXrptr         0x04    /* read pointer for TX buffer     */
-#define TXwptr         0x06    /* write pointer for TX buffer    */
-#define HostStat       0x08    /* IRQ flag and general flag      */
-#define FlagStat       0x0A
-#define FlowControl    0x0C    /* B7 B6 B5 B4 B3 B2 B1 B0              */
-                                       /*  x  x  x  x  |  |  |  |            */
-                                       /*              |  |  |  + CTS flow   */
-                                       /*              |  |  +--- RTS flow   */
-                                       /*              |  +------ TX Xon/Xoff */
-                                       /*              +--------- RX Xon/Xoff */
-#define Break_cnt      0x0E    /* received break count   */
-#define CD180TXirq     0x10    /* if non-0: enable TX irq        */
-#define RX_mask        0x12
-#define TX_mask        0x14
-#define Ofs_rxb        0x16
-#define Ofs_txb        0x18
-#define Page_rxb       0x1A
-#define Page_txb       0x1C
-#define EndPage_rxb    0x1E
-#define EndPage_txb    0x20
-#define Data_error     0x22
-#define RxTrigger      0x28
-#define TxTrigger      0x2a
-
-#define rRXwptr        0x34
-#define Low_water      0x36
-
-#define FuncCode       0x40
-#define FuncArg        0x42
-#define FuncArg1       0x44
-
-#define C218rx_size    0x2000  /* 8K bytes */
-#define C218tx_size    0x8000  /* 32K bytes */
-
-#define C218rx_mask    (C218rx_size - 1)
-#define C218tx_mask    (C218tx_size - 1)
-
-#define C320p8rx_size  0x2000
-#define C320p8tx_size  0x8000
-#define C320p8rx_mask  (C320p8rx_size - 1)
-#define C320p8tx_mask  (C320p8tx_size - 1)
-
-#define C320p16rx_size 0x2000
-#define C320p16tx_size 0x4000
-#define C320p16rx_mask (C320p16rx_size - 1)
-#define C320p16tx_mask (C320p16tx_size - 1)
-
-#define C320p24rx_size 0x2000
-#define C320p24tx_size 0x2000
-#define C320p24rx_mask (C320p24rx_size - 1)
-#define C320p24tx_mask (C320p24tx_size - 1)
-
-#define C320p32rx_size 0x1000
-#define C320p32tx_size 0x1000
-#define C320p32rx_mask (C320p32rx_size - 1)
-#define C320p32tx_mask (C320p32tx_size - 1)
-
-#define Page_size      0x2000
-#define Page_mask      (Page_size - 1)
-#define C218rx_spage   3
-#define C218tx_spage   4
-#define C218rx_pageno  1
-#define C218tx_pageno  4
-#define C218buf_pageno 5
-
-#define C320p8rx_spage 3
-#define C320p8tx_spage 4
-#define C320p8rx_pgno  1
-#define C320p8tx_pgno  4
-#define C320p8buf_pgno 5
-
-#define C320p16rx_spage 3
-#define C320p16tx_spage 4
-#define C320p16rx_pgno 1
-#define C320p16tx_pgno 2
-#define C320p16buf_pgno 3
-
-#define C320p24rx_spage 3
-#define C320p24tx_spage 4
-#define C320p24rx_pgno 1
-#define C320p24tx_pgno 1
-#define C320p24buf_pgno 2
-
-#define C320p32rx_spage 3
-#define C320p32tx_ofs  C320p32rx_size
-#define C320p32tx_spage 3
-#define C320p32buf_pgno 1
-
-/*
- *    Host Status
- */
-#define WakeupRx       0x01
-#define WakeupTx       0x02
-#define WakeupBreak    0x08
-#define WakeupLine     0x10
-#define WakeupIntr     0x20
-#define WakeupQuit     0x40
-#define WakeupEOF      0x80    /* used in VTIME control */
-#define WakeupRxTrigger        0x100
-#define WakeupTxTrigger        0x200
-/*
- *    Flag status
- */
-#define Rx_over                0x01
-#define Xoff_state     0x02
-#define Tx_flowOff     0x04
-#define Tx_enable      0x08
-#define CTS_state      0x10
-#define DSR_state      0x20
-#define DCD_state      0x80
-/*
- *    FlowControl
- */
-#define CTS_FlowCtl    1
-#define RTS_FlowCtl    2
-#define Tx_FlowCtl     4
-#define Rx_FlowCtl     8
-#define IXM_IXANY      0x10
-
-#define LowWater       128
-
-#define DTR_ON         1
-#define RTS_ON         2
-#define CTS_ON         1
-#define DSR_ON         2
-#define DCD_ON         8
-
-/* mode definition */
-#define        MX_CS8          0x03
-#define        MX_CS7          0x02
-#define        MX_CS6          0x01
-#define        MX_CS5          0x00
-
-#define        MX_STOP1        0x00
-#define        MX_STOP15       0x04
-#define        MX_STOP2        0x08
-
-#define        MX_PARNONE      0x00
-#define        MX_PAREVEN      0x40
-#define        MX_PARODD       0xC0
-
 /*
  *    Query
  */
 
-struct mon_str {
-       int tick;
-       int rxcnt[MAX_PORTS];
-       int txcnt[MAX_PORTS];
-};
-
 #define        DCD_changed     0x01
 #define        DCD_oldstate    0x80
 
-static unsigned char moxaBuff[10240];
 static int moxaLowWaterChk;
-static int moxaCard;
-static struct mon_str moxaLog;
-static int moxaFuncTout = HZ / 2;
-
-static void moxafunc(void __iomem *, int, ushort);
-static void moxa_wait_finish(void __iomem *);
-static void moxa_low_water_check(void __iomem *);
-static int moxaloadbios(int, unsigned char __user *, int);
-static int moxafindcard(int);
-static int moxaload320b(int, unsigned char __user *, int);
-static int moxaloadcode(int, unsigned char __user *, int);
-static int moxaloadc218(int, void __iomem *, int);
-static int moxaloadc320(int, void __iomem *, int, int *);
-
-/*****************************************************************************
- *     Driver level functions:                                              *
- *     1. MoxaDriverInit(void);                                             *
- *     2. MoxaDriverIoctl(unsigned int cmd, unsigned long arg, int port);   *
- *     3. MoxaDriverPoll(void);                                             *
- *****************************************************************************/
-void MoxaDriverInit(void)
-{
-       struct moxa_port *p;
-       unsigned int i;
-
-       moxaFuncTout = HZ / 2;  /* 500 mini-seconds */
-       moxaCard = 0;
-       moxaLog.tick = 0;
-       moxaLowWaterChk = 0;
-       for (i = 0; i < MAX_PORTS; i++) {
-               p = &moxa_ports[i];
-               p->chkPort = 0;
-               p->lowChkFlag = 0;
-               p->lineCtrl = 0;
-               moxaLog.rxcnt[i] = 0;
-               moxaLog.txcnt[i] = 0;
-       }
-}
-
-#define        MOXA            0x400
-#define MOXA_GET_IQUEUE        (MOXA + 1)      /* get input buffered count */
-#define MOXA_GET_OQUEUE        (MOXA + 2)      /* get output buffered count */
-#define MOXA_INIT_DRIVER       (MOXA + 6)      /* moxaCard=0 */
-#define MOXA_LOAD_BIOS         (MOXA + 9)      /* download BIOS */
-#define MOXA_FIND_BOARD                (MOXA + 10)     /* Check if MOXA card exist? */
-#define MOXA_LOAD_C320B                (MOXA + 11)     /* download 320B firmware */
-#define MOXA_LOAD_CODE         (MOXA + 12)     /* download firmware */
-#define MOXA_GETDATACOUNT       (MOXA + 23)
-#define MOXA_GET_IOQUEUE       (MOXA + 27)
-#define MOXA_FLUSH_QUEUE       (MOXA + 28)
-#define MOXA_GET_CONF          (MOXA + 35)     /* configuration */
-#define MOXA_GET_MAJOR          (MOXA + 63)
-#define MOXA_GET_CUMAJOR        (MOXA + 64)
-#define MOXA_GETMSTATUS         (MOXA + 65)
-
-struct dl_str {
-       char __user *buf;
-       int len;
-       int cardno;
-};
-
-static struct dl_str dltmp;
-
-void MoxaPortFlushData(int port, int mode)
-{
-       void __iomem *ofsAddr;
-       if ((mode < 0) || (mode > 2))
-               return;
-       ofsAddr = moxa_ports[port].tableAddr;
-       moxafunc(ofsAddr, FC_FlushQueue, mode);
-       if (mode != 1) {
-               moxa_ports[port].lowChkFlag = 0;
-               moxa_low_water_check(ofsAddr);
-       }
-}
-
-int MoxaDriverIoctl(unsigned int cmd, unsigned long arg, int port)
-{
-       int i;
-       int status;
-       int MoxaPortTxQueue(int), MoxaPortRxQueue(int);
-       void __user *argp = (void __user *)arg;
-
-       if (port == MAX_PORTS) {
-               if ((cmd != MOXA_GET_CONF) && (cmd != MOXA_INIT_DRIVER) &&
-                   (cmd != MOXA_LOAD_BIOS) && (cmd != MOXA_FIND_BOARD) && (cmd != MOXA_LOAD_C320B) &&
-                (cmd != MOXA_LOAD_CODE) && (cmd != MOXA_GETDATACOUNT) &&
-                 (cmd != MOXA_GET_IOQUEUE) && (cmd != MOXA_GET_MAJOR) &&
-                   (cmd != MOXA_GET_CUMAJOR) && (cmd != MOXA_GETMSTATUS))
-                       return (-EINVAL);
-       }
-       switch (cmd) {
-       case MOXA_GET_CONF:
-               if(copy_to_user(argp, &moxa_boards, MAX_BOARDS *
-                               sizeof(struct moxa_board_conf)))
-                       return -EFAULT;
-               return (0);
-       case MOXA_INIT_DRIVER:
-               if ((int) arg == 0x404)
-                       MoxaDriverInit();
-               return (0);
-       case MOXA_GETDATACOUNT:
-               moxaLog.tick = jiffies;
-               if(copy_to_user(argp, &moxaLog, sizeof(struct mon_str)))
-                       return -EFAULT;
-               return (0);
-       case MOXA_FLUSH_QUEUE:
-               MoxaPortFlushData(port, arg);
-               return (0);
-       case MOXA_GET_IOQUEUE: {
-               struct moxaq_str __user *argm = argp;
-               struct moxaq_str tmp;
-
-               for (i = 0; i < MAX_PORTS; i++, argm++) {
-                       memset(&tmp, 0, sizeof(tmp));
-                       if (moxa_ports[i].chkPort) {
-                               tmp.inq = MoxaPortRxQueue(i);
-                               tmp.outq = MoxaPortTxQueue(i);
-                       }
-                       if (copy_to_user(argm, &tmp, sizeof(tmp)))
-                               return -EFAULT;
-               }
-               return (0);
-       } case MOXA_GET_OQUEUE:
-               i = MoxaPortTxQueue(port);
-               return put_user(i, (unsigned long __user *)argp);
-       case MOXA_GET_IQUEUE:
-               i = MoxaPortRxQueue(port);
-               return put_user(i, (unsigned long __user *)argp);
-       case MOXA_GET_MAJOR:
-               if(copy_to_user(argp, &ttymajor, sizeof(int)))
-                       return -EFAULT;
-               return 0;
-       case MOXA_GET_CUMAJOR:
-               i = 0;
-               if(copy_to_user(argp, &i, sizeof(int)))
-                       return -EFAULT;
-               return 0;
-       case MOXA_GETMSTATUS: {
-               struct mxser_mstatus __user *argm = argp;
-               struct mxser_mstatus tmp;
-               struct moxa_port *p;
-
-               for (i = 0; i < MAX_PORTS; i++, argm++) {
-                       p = &moxa_ports[i];
-                       memset(&tmp, 0, sizeof(tmp));
-                       if (!p->chkPort) {
-                               goto copy;
-                       } else {
-                               status = MoxaPortLineStatus(p->port);
-                               if (status & 1)
-                                       tmp.cts = 1;
-                               if (status & 2)
-                                       tmp.dsr = 1;
-                               if (status & 4)
-                                       tmp.dcd = 1;
-                       }
-
-                       if (!p->tty || !p->tty->termios)
-                               tmp.cflag = p->cflag;
-                       else
-                               tmp.cflag = p->tty->termios->c_cflag;
-copy:
-                       if (copy_to_user(argm, &tmp, sizeof(tmp)))
-                               return -EFAULT;
-               }
-               return 0;
-       } default:
-               return (-ENOIOCTLCMD);
-       case MOXA_LOAD_BIOS:
-       case MOXA_FIND_BOARD:
-       case MOXA_LOAD_C320B:
-       case MOXA_LOAD_CODE:
-               if (!capable(CAP_SYS_RAWIO))
-                       return -EPERM;
-               break;
-       }
-
-       if(copy_from_user(&dltmp, argp, sizeof(struct dl_str)))
-               return -EFAULT;
-       if(dltmp.cardno < 0 || dltmp.cardno >= MAX_BOARDS || dltmp.len < 0)
-               return -EINVAL;
 
-       switch(cmd)
-       {
-       case MOXA_LOAD_BIOS:
-               i = moxaloadbios(dltmp.cardno, dltmp.buf, dltmp.len);
-               return (i);
-       case MOXA_FIND_BOARD:
-               return moxafindcard(dltmp.cardno);
-       case MOXA_LOAD_C320B:
-               moxaload320b(dltmp.cardno, dltmp.buf, dltmp.len);
-       default: /* to keep gcc happy */
-               return (0);
-       case MOXA_LOAD_CODE:
-               i = moxaloadcode(dltmp.cardno, dltmp.buf, dltmp.len);
-               if (i == -1)
-                       return (-EFAULT);
-               return (i);
+static void moxa_low_water_check(void __iomem *);
+
+/*****************************************************************************
+ *     Driver level functions:                                              *
+ *     3. MoxaDriverPoll(void);                                             *
+ *****************************************************************************/
 
+static void MoxaPortFlushData(struct moxa_port *port, int mode)
+{
+       void __iomem *ofsAddr;
+       if ((mode < 0) || (mode > 2))
+               return;
+       ofsAddr = port->tableAddr;
+       moxafunc(ofsAddr, FC_FlushQueue, mode);
+       if (mode != 1) {
+               port->lowChkFlag = 0;
+               moxa_low_water_check(ofsAddr);
        }
 }
 
-int MoxaDriverPoll(void)
+static int MoxaDriverPoll(void)
 {
        struct moxa_board_conf *brd;
-       register ushort temp;
-       register int card;
+       struct moxa_port *p;
        void __iomem *ofsAddr;
        void __iomem *ip;
-       int port, p, ports;
+       unsigned int port, ports, card;
+       ushort temp;
 
-       if (moxaCard == 0)
-               return (-1);
        for (card = 0; card < MAX_BOARDS; card++) {
                brd = &moxa_boards[card];
-               if (brd->loadstat == 0)
+               if (brd->ready == 0)
                        continue;
                if ((ports = brd->numPorts) == 0)
                        continue;
                if (readb(brd->intPend) == 0xff) {
                        ip = brd->intTable + readb(brd->intNdx);
-                       p = card * MAX_PORTS_PER_BOARD;
+                       p = brd->ports;
                        ports <<= 1;
                        for (port = 0; port < ports; port += 2, p++) {
-                               if ((temp = readw(ip + port)) != 0) {
-                                       writew(0, ip + port);
-                                       ofsAddr = moxa_ports[p].tableAddr;
-                                       if (temp & IntrTx)
-                                               writew(readw(ofsAddr + HostStat) & ~WakeupTx, ofsAddr + HostStat);
-                                       if (temp & IntrBreak) {
-                                               moxa_ports[p].breakCnt++;
-                                       }
-                                       if (temp & IntrLine) {
-                                               if (readb(ofsAddr + FlagStat) & DCD_state) {
-                                                       if ((moxa_ports[p].DCDState & DCD_oldstate) == 0)
-                                                               moxa_ports[p].DCDState = (DCD_oldstate |
-                                                                                  DCD_changed);
-                                               } else {
-                                                       if (moxa_ports[p].DCDState & DCD_oldstate)
-                                                               moxa_ports[p].DCDState = DCD_changed;
-                                               }
+                               temp = readw(ip + port);
+                               if (temp == 0)
+                                       continue;
+
+                               writew(0, ip + port);
+                               ofsAddr = p->tableAddr;
+                               if (temp & IntrTx)
+                                       writew(readw(ofsAddr + HostStat) &
+                                               ~WakeupTx, ofsAddr + HostStat);
+                               if (temp & IntrBreak)
+                                       p->breakCnt++;
+
+                               if (temp & IntrLine) {
+                                       if (readb(ofsAddr + FlagStat) & DCD_state) {
+                                               if ((p->DCDState & DCD_oldstate) == 0)
+                                                       p->DCDState = (DCD_oldstate |
+                                                                          DCD_changed);
+                                       } else {
+                                               if (p->DCDState & DCD_oldstate)
+                                                       p->DCDState = DCD_changed;
                                        }
                                }
                        }
                        writeb(0, brd->intPend);
                }
                if (moxaLowWaterChk) {
-                       p = card * MAX_PORTS_PER_BOARD;
+                       p = brd->ports;
                        for (port = 0; port < ports; port++, p++) {
-                               if (moxa_ports[p].lowChkFlag) {
-                                       moxa_ports[p].lowChkFlag = 0;
-                                       ofsAddr = moxa_ports[p].tableAddr;
+                               if (p->lowChkFlag) {
+                                       p->lowChkFlag = 0;
+                                       ofsAddr = p->tableAddr;
                                        moxa_low_water_check(ofsAddr);
                                }
                        }
                }
        }
        moxaLowWaterChk = 0;
-       return (0);
-}
-
-/*****************************************************************************
- *     Card level function:                                                 *
- *     1. MoxaPortsOfCard(int cardno);                                      *
- *****************************************************************************/
-int MoxaPortsOfCard(int cardno)
-{
 
-       if (moxa_boards[cardno].boardType == 0)
-               return (0);
-       return (moxa_boards[cardno].numPorts);
+       return 0;
 }
 
 /*****************************************************************************
  *     Port level functions:                                                *
- *     1.  MoxaPortIsValid(int port);                                       *
  *     2.  MoxaPortEnable(int port);                                        *
  *     3.  MoxaPortDisable(int port);                                       *
  *     4.  MoxaPortGetMaxBaud(int port);                                    *
@@ -1695,7 +1718,6 @@ int MoxaPortsOfCard(int cardno)
  *     24. MoxaPortTxDisable(int port);                                     *
  *     25. MoxaPortTxEnable(int port);                                      *
  *     27. MoxaPortResetBrkCnt(int port);                                   *
- *     30. MoxaPortSendBreak(int port, int ticks);                          *
  *****************************************************************************/
 /*
  *    Moxa Port Number Description:
@@ -1741,25 +1763,6 @@ int MoxaPortsOfCard(int cardno)
  *                      -1      : no any Moxa card.             
  *
  *
- *      Function 4:     Get the ports of this card.
- *      Syntax:
- *      int  MoxaPortsOfCard(int cardno);
- *
- *           int cardno         : card number (0 - 3)
- *
- *           return:    0       : this card is invalid
- *                      8/16/24/32
- *
- *
- *      Function 5:     Check this port is valid or invalid
- *      Syntax:
- *      int  MoxaPortIsValid(int port);
- *           int port           : port number (0 - 127, ref port description)
- *
- *           return:    0       : this port is invalid
- *                      1       : this port is valid
- *
- *
  *      Function 6:     Enable this port to start Tx/Rx data.
  *      Syntax:
  *      void MoxaPortEnable(int port);
@@ -1942,36 +1945,18 @@ int MoxaPortsOfCard(int cardno)
  *           return:    0 - ..  : BREAK signal count
  *
  *
- *      Function 34:    Send out a BREAK signal.
- *      Syntax:
- *      void MoxaPortSendBreak(int port, int ms100);
- *           int port           : port number (0 - 127)
- *           int ms100          : break signal time interval.
- *                                unit: 100 mini-second. if ms100 == 0, it will
- *                                send out a about 250 ms BREAK signal.
- *
  */
-int MoxaPortIsValid(int port)
-{
-
-       if (moxaCard == 0)
-               return (0);
-       if (moxa_ports[port].chkPort == 0)
-               return (0);
-       return (1);
-}
 
-void MoxaPortEnable(int port)
+static void MoxaPortEnable(struct moxa_port *port)
 {
        void __iomem *ofsAddr;
-       int MoxaPortLineStatus(int);
        short lowwater = 512;
 
-       ofsAddr = moxa_ports[port].tableAddr;
+       ofsAddr = port->tableAddr;
        writew(lowwater, ofsAddr + Low_water);
-       moxa_ports[port].breakCnt = 0;
-       if ((moxa_boards[port / MAX_PORTS_PER_BOARD].boardType == MOXA_BOARD_C320_ISA) ||
-           (moxa_boards[port / MAX_PORTS_PER_BOARD].boardType == MOXA_BOARD_C320_PCI)) {
+       port->breakCnt = 0;
+       if (port->board->boardType == MOXA_BOARD_C320_ISA ||
+           port->board->boardType == MOXA_BOARD_C320_PCI) {
                moxafunc(ofsAddr, FC_SetBreakIrq, 0);
        } else {
                writew(readw(ofsAddr + HostStat) | WakeupBreak, ofsAddr + HostStat);
@@ -1984,9 +1969,9 @@ void MoxaPortEnable(int port)
        MoxaPortLineStatus(port);
 }
 
-void MoxaPortDisable(int port)
+static void MoxaPortDisable(struct moxa_port *port)
 {
-       void __iomem *ofsAddr = moxa_ports[port].tableAddr;
+       void __iomem *ofsAddr = port->tableAddr;
 
        moxafunc(ofsAddr, FC_SetFlowCtl, 0);    /* disable flow control */
        moxafunc(ofsAddr, FC_ClrLineIrq, Magic_code);
@@ -1994,17 +1979,17 @@ void MoxaPortDisable(int port)
        moxafunc(ofsAddr, FC_DisableCH, Magic_code);
 }
 
-long MoxaPortGetMaxBaud(int port)
+static long MoxaPortGetMaxBaud(struct moxa_port *port)
 {
-       if ((moxa_boards[port / MAX_PORTS_PER_BOARD].boardType == MOXA_BOARD_C320_ISA) ||
-           (moxa_boards[port / MAX_PORTS_PER_BOARD].boardType == MOXA_BOARD_C320_PCI))
+       if (port->board->boardType == MOXA_BOARD_C320_ISA ||
+                       port->board->boardType == MOXA_BOARD_C320_PCI)
                return (460800L);
        else
                return (921600L);
 }
 
 
-long MoxaPortSetBaud(int port, long baud)
+static long MoxaPortSetBaud(struct moxa_port *port, long baud)
 {
        void __iomem *ofsAddr;
        long max, clock;
@@ -2012,7 +1997,7 @@ long MoxaPortSetBaud(int port, long baud)
 
        if ((baud < 50L) || ((max = MoxaPortGetMaxBaud(port)) == 0))
                return (0);
-       ofsAddr = moxa_ports[port].tableAddr;
+       ofsAddr = port->tableAddr;
        if (baud > max)
                baud = max;
        if (max == 38400L)
@@ -2024,19 +2009,17 @@ long MoxaPortSetBaud(int port, long baud)
        val = clock / baud;
        moxafunc(ofsAddr, FC_SetBaud, val);
        baud = clock / val;
-       moxa_ports[port].curBaud = baud;
        return (baud);
 }
 
-int MoxaPortSetTermio(int port, struct ktermios *termio, speed_t baud)
+static int MoxaPortSetTermio(struct moxa_port *port, struct ktermios *termio,
+               speed_t baud)
 {
        void __iomem *ofsAddr;
        tcflag_t cflag;
        tcflag_t mode = 0;
 
-       if (moxa_ports[port].chkPort == 0 || termio == 0)
-               return (-1);
-       ofsAddr = moxa_ports[port].tableAddr;
+       ofsAddr = port->tableAddr;
        cflag = termio->c_cflag;        /* termio->c_cflag */
 
        mode = termio->c_cflag & CSIZE;
@@ -2067,8 +2050,8 @@ int MoxaPortSetTermio(int port, struct ktermios *termio, speed_t baud)
 
        moxafunc(ofsAddr, FC_SetDataMode, (ushort) mode);
 
-       if ((moxa_boards[port / MAX_PORTS_PER_BOARD].boardType == MOXA_BOARD_C320_ISA) ||
-           (moxa_boards[port / MAX_PORTS_PER_BOARD].boardType == MOXA_BOARD_C320_PCI)) {
+       if (port->board->boardType == MOXA_BOARD_C320_ISA ||
+                       port->board->boardType == MOXA_BOARD_C320_PCI) {
                if (baud >= 921600L)
                        return (-1);
        }
@@ -2084,48 +2067,35 @@ int MoxaPortSetTermio(int port, struct ktermios *termio, speed_t baud)
        return (baud);
 }
 
-int MoxaPortGetLineOut(int port, int *dtrState, int *rtsState)
+static int MoxaPortGetLineOut(struct moxa_port *port, int *dtrState,
+               int *rtsState)
 {
 
-       if (!MoxaPortIsValid(port))
-               return (-1);
-       if (dtrState) {
-               if (moxa_ports[port].lineCtrl & DTR_ON)
-                       *dtrState = 1;
-               else
-                       *dtrState = 0;
-       }
-       if (rtsState) {
-               if (moxa_ports[port].lineCtrl & RTS_ON)
-                       *rtsState = 1;
-               else
-                       *rtsState = 0;
-       }
+       if (dtrState)
+               *dtrState = !!(port->lineCtrl & DTR_ON);
+       if (rtsState)
+               *rtsState = !!(port->lineCtrl & RTS_ON);
+
        return (0);
 }
 
-void MoxaPortLineCtrl(int port, int dtr, int rts)
+static void MoxaPortLineCtrl(struct moxa_port *port, int dtr, int rts)
 {
-       void __iomem *ofsAddr;
-       int mode;
+       int mode = 0;
 
-       ofsAddr = moxa_ports[port].tableAddr;
-       mode = 0;
        if (dtr)
                mode |= DTR_ON;
        if (rts)
                mode |= RTS_ON;
-       moxa_ports[port].lineCtrl = mode;
-       moxafunc(ofsAddr, FC_LineControl, mode);
+       port->lineCtrl = mode;
+       moxafunc(port->tableAddr, FC_LineControl, mode);
 }
 
-void MoxaPortFlowCtrl(int port, int rts, int cts, int txflow, int rxflow, int txany)
+static void MoxaPortFlowCtrl(struct moxa_port *port, int rts, int cts,
+               int txflow, int rxflow, int txany)
 {
-       void __iomem *ofsAddr;
-       int mode;
+       int mode = 0;
 
-       ofsAddr = moxa_ports[port].tableAddr;
-       mode = 0;
        if (rts)
                mode |= RTS_FlowCtl;
        if (cts)
@@ -2136,17 +2106,17 @@ void MoxaPortFlowCtrl(int port, int rts, int cts, int txflow, int rxflow, int tx
                mode |= Rx_FlowCtl;
        if (txany)
                mode |= IXM_IXANY;
-       moxafunc(ofsAddr, FC_SetFlowCtl, mode);
+       moxafunc(port->tableAddr, FC_SetFlowCtl, mode);
 }
 
-int MoxaPortLineStatus(int port)
+static int MoxaPortLineStatus(struct moxa_port *port)
 {
        void __iomem *ofsAddr;
        int val;
 
-       ofsAddr = moxa_ports[port].tableAddr;
-       if ((moxa_boards[port / MAX_PORTS_PER_BOARD].boardType == MOXA_BOARD_C320_ISA) ||
-           (moxa_boards[port / MAX_PORTS_PER_BOARD].boardType == MOXA_BOARD_C320_PCI)) {
+       ofsAddr = port->tableAddr;
+       if (port->board->boardType == MOXA_BOARD_C320_ISA ||
+                       port->board->boardType == MOXA_BOARD_C320_PCI) {
                moxafunc(ofsAddr, FC_LineStatus, 0);
                val = readw(ofsAddr + FuncArg);
        } else {
@@ -2155,42 +2125,39 @@ int MoxaPortLineStatus(int port)
        val &= 0x0B;
        if (val & 8) {
                val |= 4;
-               if ((moxa_ports[port].DCDState & DCD_oldstate) == 0)
-                       moxa_ports[port].DCDState = (DCD_oldstate | DCD_changed);
+               if ((port->DCDState & DCD_oldstate) == 0)
+                       port->DCDState = (DCD_oldstate | DCD_changed);
        } else {
-               if (moxa_ports[port].DCDState & DCD_oldstate)
-                       moxa_ports[port].DCDState = DCD_changed;
+               if (port->DCDState & DCD_oldstate)
+                       port->DCDState = DCD_changed;
        }
        val &= 7;
        return (val);
 }
 
-int MoxaPortDCDChange(int port)
+static int MoxaPortDCDChange(struct moxa_port *port)
 {
        int n;
 
-       if (moxa_ports[port].chkPort == 0)
-               return (0);
-       n = moxa_ports[port].DCDState;
-       moxa_ports[port].DCDState &= ~DCD_changed;
+       n = port->DCDState;
+       port->DCDState &= ~DCD_changed;
        n &= DCD_changed;
        return (n);
 }
 
-int MoxaPortDCDON(int port)
+static int MoxaPortDCDON(struct moxa_port *port)
 {
        int n;
 
-       if (moxa_ports[port].chkPort == 0)
-               return (0);
-       if (moxa_ports[port].DCDState & DCD_oldstate)
+       if (port->DCDState & DCD_oldstate)
                n = 1;
        else
                n = 0;
        return (n);
 }
 
-int MoxaPortWriteData(int port, unsigned char * buffer, int len)
+static int MoxaPortWriteData(struct moxa_port *port, unsigned char *buffer,
+               int len)
 {
        int c, total, i;
        ushort tail;
@@ -2199,8 +2166,8 @@ int MoxaPortWriteData(int port, unsigned char * buffer, int len)
        ushort pageno, pageofs, bufhead;
        void __iomem *baseAddr, *ofsAddr, *ofs;
 
-       ofsAddr = moxa_ports[port].tableAddr;
-       baseAddr = moxa_boards[port / MAX_PORTS_PER_BOARD].basemem;
+       ofsAddr = port->tableAddr;
+       baseAddr = port->board->basemem;
        tx_mask = readw(ofsAddr + TX_mask);
        spage = readw(ofsAddr + Page_txb);
        epage = readw(ofsAddr + EndPage_txb);
@@ -2210,7 +2177,7 @@ int MoxaPortWriteData(int port, unsigned char * buffer, int len)
            : (head - tail + tx_mask);
        if (c > len)
                c = len;
-       moxaLog.txcnt[port] += c;
+       moxaLog.txcnt[port->tty->index] += c;
        total = c;
        if (spage == epage) {
                bufhead = readw(ofsAddr + Ofs_txb);
@@ -2254,7 +2221,7 @@ int MoxaPortWriteData(int port, unsigned char * buffer, int len)
        return (total);
 }
 
-int MoxaPortReadData(int port, struct tty_struct *tty)
+static int MoxaPortReadData(struct moxa_port *port, struct tty_struct *tty)
 {
        register ushort head, pageofs;
        int i, count, cnt, len, total, remain;
@@ -2262,8 +2229,8 @@ int MoxaPortReadData(int port, struct tty_struct *tty)
        ushort pageno, bufhead;
        void __iomem *baseAddr, *ofsAddr, *ofs;
 
-       ofsAddr = moxa_ports[port].tableAddr;
-       baseAddr = moxa_boards[port / MAX_PORTS_PER_BOARD].basemem;
+       ofsAddr = port->tableAddr;
+       baseAddr = port->board->basemem;
        head = readw(ofsAddr + RXrptr);
        tail = readw(ofsAddr + RXwptr);
        rx_mask = readw(ofsAddr + RX_mask);
@@ -2276,7 +2243,7 @@ int MoxaPortReadData(int port, struct tty_struct *tty)
 
        total = count;
        remain = count - total;
-       moxaLog.rxcnt[port] += total;
+       moxaLog.rxcnt[port->tty->index] += total;
        count = total;
        if (spage == epage) {
                bufhead = readw(ofsAddr + Ofs_rxb);
@@ -2318,19 +2285,18 @@ int MoxaPortReadData(int port, struct tty_struct *tty)
        }
        if ((readb(ofsAddr + FlagStat) & Xoff_state) && (remain < LowWater)) {
                moxaLowWaterChk = 1;
-               moxa_ports[port].lowChkFlag = 1;
+               port->lowChkFlag = 1;
        }
        return (total);
 }
 
 
-int MoxaPortTxQueue(int port)
+static int MoxaPortTxQueue(struct moxa_port *port)
 {
-       void __iomem *ofsAddr;
+       void __iomem *ofsAddr = port->tableAddr;
        ushort rptr, wptr, mask;
        int len;
 
-       ofsAddr = moxa_ports[port].tableAddr;
        rptr = readw(ofsAddr + TXrptr);
        wptr = readw(ofsAddr + TXwptr);
        mask = readw(ofsAddr + TX_mask);
@@ -2338,13 +2304,12 @@ int MoxaPortTxQueue(int port)
        return (len);
 }
 
-int MoxaPortTxFree(int port)
+static int MoxaPortTxFree(struct moxa_port *port)
 {
-       void __iomem *ofsAddr;
+       void __iomem *ofsAddr = port->tableAddr;
        ushort rptr, wptr, mask;
        int len;
 
-       ofsAddr = moxa_ports[port].tableAddr;
        rptr = readw(ofsAddr + TXrptr);
        wptr = readw(ofsAddr + TXwptr);
        mask = readw(ofsAddr + TX_mask);
@@ -2352,13 +2317,12 @@ int MoxaPortTxFree(int port)
        return (len);
 }
 
-int MoxaPortRxQueue(int port)
+static int MoxaPortRxQueue(struct moxa_port *port)
 {
-       void __iomem *ofsAddr;
+       void __iomem *ofsAddr = port->tableAddr;
        ushort rptr, wptr, mask;
        int len;
 
-       ofsAddr = moxa_ports[port].tableAddr;
        rptr = readw(ofsAddr + RXrptr);
        wptr = readw(ofsAddr + RXwptr);
        mask = readw(ofsAddr + RX_mask);
@@ -2367,47 +2331,25 @@ int MoxaPortRxQueue(int port)
 }
 
 
-void MoxaPortTxDisable(int port)
+static void MoxaPortTxDisable(struct moxa_port *port)
 {
-       void __iomem *ofsAddr;
-
-       ofsAddr = moxa_ports[port].tableAddr;
-       moxafunc(ofsAddr, FC_SetXoffState, Magic_code);
+       moxafunc(port->tableAddr, FC_SetXoffState, Magic_code);
 }
 
-void MoxaPortTxEnable(int port)
+static void MoxaPortTxEnable(struct moxa_port *port)
 {
-       void __iomem *ofsAddr;
-
-       ofsAddr = moxa_ports[port].tableAddr;
-       moxafunc(ofsAddr, FC_SetXonState, Magic_code);
+       moxafunc(port->tableAddr, FC_SetXonState, Magic_code);
 }
 
 
-int MoxaPortResetBrkCnt(int port)
+static int MoxaPortResetBrkCnt(struct moxa_port *port)
 {
        ushort cnt;
-       cnt = moxa_ports[port].breakCnt;
-       moxa_ports[port].breakCnt = 0;
+       cnt = port->breakCnt;
+       port->breakCnt = 0;
        return (cnt);
 }
 
-
-void MoxaPortSendBreak(int port, int ms100)
-{
-       void __iomem *ofsAddr;
-
-       ofsAddr = moxa_ports[port].tableAddr;
-       if (ms100) {
-               moxafunc(ofsAddr, FC_SendBreak, Magic_code);
-               msleep(ms100 * 10);
-       } else {
-               moxafunc(ofsAddr, FC_SendBreak, Magic_code);
-               msleep(250);
-       }
-       moxafunc(ofsAddr, FC_StopBreak, Magic_code);
-}
-
 static int moxa_get_serial_info(struct moxa_port *info,
                                struct serial_struct __user *retinfo)
 {
@@ -2415,13 +2357,12 @@ static int moxa_get_serial_info(struct moxa_port *info,
 
        memset(&tmp, 0, sizeof(tmp));
        tmp.type = info->type;
-       tmp.line = info->port;
+       tmp.line = info->tty->index;
        tmp.port = 0;
        tmp.irq = 0;
        tmp.flags = info->asyncflags;
        tmp.baud_base = 921600;
        tmp.close_delay = info->close_delay;
-       tmp.closing_wait = info->closing_wait;
        tmp.custom_divisor = 0;
        tmp.hub6 = 0;
        if(copy_to_user(retinfo, &tmp, sizeof(*retinfo)))
@@ -2451,16 +2392,15 @@ static int moxa_set_serial_info(struct moxa_port *info,
                        return (-EPERM);
        } else {
                info->close_delay = new_serial.close_delay * HZ / 100;
-               info->closing_wait = new_serial.closing_wait * HZ / 100;
        }
 
        new_serial.flags = (new_serial.flags & ~ASYNC_FLAGS);
        new_serial.flags |= (info->asyncflags & ASYNC_FLAGS);
 
        if (new_serial.type == PORT_16550A) {
-               MoxaSetFifo(info->port, 1);
+               MoxaSetFifo(info, 1);
        } else {
-               MoxaSetFifo(info->port, 0);
+               MoxaSetFifo(info, 0);
        }
 
        info->type = new_serial.type;
@@ -2472,26 +2412,6 @@ static int moxa_set_serial_info(struct moxa_port *info,
 /*****************************************************************************
  *     Static local functions:                                              *
  *****************************************************************************/
-static void moxafunc(void __iomem *ofsAddr, int cmd, ushort arg)
-{
-
-       writew(arg, ofsAddr + FuncArg);
-       writew(cmd, ofsAddr + FuncCode);
-       moxa_wait_finish(ofsAddr);
-}
-
-static void moxa_wait_finish(void __iomem *ofsAddr)
-{
-       unsigned long i, j;
-
-       i = jiffies;
-       while (readw(ofsAddr + FuncCode) != 0) {
-               j = jiffies;
-               if ((j - i) > moxaFuncTout) {
-                       return;
-               }
-       }
-}
 
 static void moxa_low_water_check(void __iomem *ofsAddr)
 {
@@ -2508,338 +2428,9 @@ static void moxa_low_water_check(void __iomem *ofsAddr)
        }
 }
 
-static int moxaloadbios(int cardno, unsigned char __user *tmp, int len)
-{
-       void __iomem *baseAddr;
-       int i;
-
-       if(len < 0 || len > sizeof(moxaBuff))
-               return -EINVAL;
-       if(copy_from_user(moxaBuff, tmp, len))
-               return -EFAULT;
-       baseAddr = moxa_boards[cardno].basemem;
-       writeb(HW_reset, baseAddr + Control_reg);       /* reset */
-       msleep(10);
-       for (i = 0; i < 4096; i++)
-               writeb(0, baseAddr + i);        /* clear fix page */
-       for (i = 0; i < len; i++)
-               writeb(moxaBuff[i], baseAddr + i);      /* download BIOS */
-       writeb(0, baseAddr + Control_reg);      /* restart */
-       return (0);
-}
-
-static int moxafindcard(int cardno)
-{
-       void __iomem *baseAddr;
-       ushort tmp;
-
-       baseAddr = moxa_boards[cardno].basemem;
-       switch (moxa_boards[cardno].boardType) {
-       case MOXA_BOARD_C218_ISA:
-       case MOXA_BOARD_C218_PCI:
-               if ((tmp = readw(baseAddr + C218_key)) != C218_KeyCode) {
-                       return (-1);
-               }
-               break;
-       case MOXA_BOARD_CP204J:
-               if ((tmp = readw(baseAddr + C218_key)) != CP204J_KeyCode) {
-                       return (-1);
-               }
-               break;
-       default:
-               if ((tmp = readw(baseAddr + C320_key)) != C320_KeyCode) {
-                       return (-1);
-               }
-               if ((tmp = readw(baseAddr + C320_status)) != STS_init) {
-                       return (-2);
-               }
-       }
-       return (0);
-}
-
-static int moxaload320b(int cardno, unsigned char __user *tmp, int len)
-{
-       void __iomem *baseAddr;
-       int i;
-
-       if(len < 0 || len > sizeof(moxaBuff))
-               return -EINVAL;
-       if(copy_from_user(moxaBuff, tmp, len))
-               return -EFAULT;
-       baseAddr = moxa_boards[cardno].basemem;
-       writew(len - 7168 - 2, baseAddr + C320bapi_len);
-       writeb(1, baseAddr + Control_reg);      /* Select Page 1 */
-       for (i = 0; i < 7168; i++)
-               writeb(moxaBuff[i], baseAddr + DynPage_addr + i);
-       writeb(2, baseAddr + Control_reg);      /* Select Page 2 */
-       for (i = 0; i < (len - 7168); i++)
-               writeb(moxaBuff[i + 7168], baseAddr + DynPage_addr + i);
-       return (0);
-}
-
-static int moxaloadcode(int cardno, unsigned char __user *tmp, int len)
-{
-       void __iomem *baseAddr, *ofsAddr;
-       int retval, port, i;
-
-       if(len < 0 || len > sizeof(moxaBuff))
-               return -EINVAL;
-       if(copy_from_user(moxaBuff, tmp, len))
-               return -EFAULT;
-       baseAddr = moxa_boards[cardno].basemem;
-       switch (moxa_boards[cardno].boardType) {
-       case MOXA_BOARD_C218_ISA:
-       case MOXA_BOARD_C218_PCI:
-       case MOXA_BOARD_CP204J:
-               retval = moxaloadc218(cardno, baseAddr, len);
-               if (retval)
-                       return (retval);
-               port = cardno * MAX_PORTS_PER_BOARD;
-               for (i = 0; i < moxa_boards[cardno].numPorts; i++, port++) {
-                       struct moxa_port *p = &moxa_ports[port];
-
-                       p->chkPort = 1;
-                       p->curBaud = 9600L;
-                       p->DCDState = 0;
-                       p->tableAddr = baseAddr + Extern_table + Extern_size * i;
-                       ofsAddr = p->tableAddr;
-                       writew(C218rx_mask, ofsAddr + RX_mask);
-                       writew(C218tx_mask, ofsAddr + TX_mask);
-                       writew(C218rx_spage + i * C218buf_pageno, ofsAddr + Page_rxb);
-                       writew(readw(ofsAddr + Page_rxb) + C218rx_pageno, ofsAddr + EndPage_rxb);
-
-                       writew(C218tx_spage + i * C218buf_pageno, ofsAddr + Page_txb);
-                       writew(readw(ofsAddr + Page_txb) + C218tx_pageno, ofsAddr + EndPage_txb);
-
-               }
-               break;
-       default:
-               retval = moxaloadc320(cardno, baseAddr, len,
-                                     &moxa_boards[cardno].numPorts);
-               if (retval)
-                       return (retval);
-               port = cardno * MAX_PORTS_PER_BOARD;
-               for (i = 0; i < moxa_boards[cardno].numPorts; i++, port++) {
-                       struct moxa_port *p = &moxa_ports[port];
-
-                       p->chkPort = 1;
-                       p->curBaud = 9600L;
-                       p->DCDState = 0;
-                       p->tableAddr = baseAddr + Extern_table + Extern_size * i;
-                       ofsAddr = p->tableAddr;
-                       if (moxa_boards[cardno].numPorts == 8) {
-                               writew(C320p8rx_mask, ofsAddr + RX_mask);
-                               writew(C320p8tx_mask, ofsAddr + TX_mask);
-                               writew(C320p8rx_spage + i * C320p8buf_pgno, ofsAddr + Page_rxb);
-                               writew(readw(ofsAddr + Page_rxb) + C320p8rx_pgno, ofsAddr + EndPage_rxb);
-                               writew(C320p8tx_spage + i * C320p8buf_pgno, ofsAddr + Page_txb);
-                               writew(readw(ofsAddr + Page_txb) + C320p8tx_pgno, ofsAddr + EndPage_txb);
-
-                       } else if (moxa_boards[cardno].numPorts == 16) {
-                               writew(C320p16rx_mask, ofsAddr + RX_mask);
-                               writew(C320p16tx_mask, ofsAddr + TX_mask);
-                               writew(C320p16rx_spage + i * C320p16buf_pgno, ofsAddr + Page_rxb);
-                               writew(readw(ofsAddr + Page_rxb) + C320p16rx_pgno, ofsAddr + EndPage_rxb);
-                               writew(C320p16tx_spage + i * C320p16buf_pgno, ofsAddr + Page_txb);
-                               writew(readw(ofsAddr + Page_txb) + C320p16tx_pgno, ofsAddr + EndPage_txb);
-
-                       } else if (moxa_boards[cardno].numPorts == 24) {
-                               writew(C320p24rx_mask, ofsAddr + RX_mask);
-                               writew(C320p24tx_mask, ofsAddr + TX_mask);
-                               writew(C320p24rx_spage + i * C320p24buf_pgno, ofsAddr + Page_rxb);
-                               writew(readw(ofsAddr + Page_rxb) + C320p24rx_pgno, ofsAddr + EndPage_rxb);
-                               writew(C320p24tx_spage + i * C320p24buf_pgno, ofsAddr + Page_txb);
-                               writew(readw(ofsAddr + Page_txb), ofsAddr + EndPage_txb);
-                       } else if (moxa_boards[cardno].numPorts == 32) {
-                               writew(C320p32rx_mask, ofsAddr + RX_mask);
-                               writew(C320p32tx_mask, ofsAddr + TX_mask);
-                               writew(C320p32tx_ofs, ofsAddr + Ofs_txb);
-                               writew(C320p32rx_spage + i * C320p32buf_pgno, ofsAddr + Page_rxb);
-                               writew(readb(ofsAddr + Page_rxb), ofsAddr + EndPage_rxb);
-                               writew(C320p32tx_spage + i * C320p32buf_pgno, ofsAddr + Page_txb);
-                               writew(readw(ofsAddr + Page_txb), ofsAddr + EndPage_txb);
-                       }
-               }
-               break;
-       }
-       moxa_boards[cardno].loadstat = 1;
-       return (0);
-}
-
-static int moxaloadc218(int cardno, void __iomem *baseAddr, int len)
-{
-       char retry;
-       int i, j, len1, len2;
-       ushort usum, *ptr, keycode;
-
-       if (moxa_boards[cardno].boardType == MOXA_BOARD_CP204J)
-               keycode = CP204J_KeyCode;
-       else
-               keycode = C218_KeyCode;
-       usum = 0;
-       len1 = len >> 1;
-       ptr = (ushort *) moxaBuff;
-       for (i = 0; i < len1; i++)
-               usum += le16_to_cpu(*(ptr + i));
-       retry = 0;
-       do {
-               len1 = len >> 1;
-               j = 0;
-               while (len1) {
-                       len2 = (len1 > 2048) ? 2048 : len1;
-                       len1 -= len2;
-                       for (i = 0; i < len2 << 1; i++)
-                               writeb(moxaBuff[i + j], baseAddr + C218_LoadBuf + i);
-                       j += i;
-
-                       writew(len2, baseAddr + C218DLoad_len);
-                       writew(0, baseAddr + C218_key);
-                       for (i = 0; i < 100; i++) {
-                               if (readw(baseAddr + C218_key) == keycode)
-                                       break;
-                               msleep(10);
-                       }
-                       if (readw(baseAddr + C218_key) != keycode) {
-                               return (-1);
-                       }
-               }
-               writew(0, baseAddr + C218DLoad_len);
-               writew(usum, baseAddr + C218check_sum);
-               writew(0, baseAddr + C218_key);
-               for (i = 0; i < 100; i++) {
-                       if (readw(baseAddr + C218_key) == keycode)
-                               break;
-                       msleep(10);
-               }
-               retry++;
-       } while ((readb(baseAddr + C218chksum_ok) != 1) && (retry < 3));
-       if (readb(baseAddr + C218chksum_ok) != 1) {
-               return (-1);
-       }
-       writew(0, baseAddr + C218_key);
-       for (i = 0; i < 100; i++) {
-               if (readw(baseAddr + Magic_no) == Magic_code)
-                       break;
-               msleep(10);
-       }
-       if (readw(baseAddr + Magic_no) != Magic_code) {
-               return (-1);
-       }
-       writew(1, baseAddr + Disable_IRQ);
-       writew(0, baseAddr + Magic_no);
-       for (i = 0; i < 100; i++) {
-               if (readw(baseAddr + Magic_no) == Magic_code)
-                       break;
-               msleep(10);
-       }
-       if (readw(baseAddr + Magic_no) != Magic_code) {
-               return (-1);
-       }
-       moxaCard = 1;
-       moxa_boards[cardno].intNdx = baseAddr + IRQindex;
-       moxa_boards[cardno].intPend = baseAddr + IRQpending;
-       moxa_boards[cardno].intTable = baseAddr + IRQtable;
-       return (0);
-}
-
-static int moxaloadc320(int cardno, void __iomem *baseAddr, int len, int *numPorts)
-{
-       ushort usum;
-       int i, j, wlen, len2, retry;
-       ushort *uptr;
-
-       usum = 0;
-       wlen = len >> 1;
-       uptr = (ushort *) moxaBuff;
-       for (i = 0; i < wlen; i++)
-               usum += le16_to_cpu(uptr[i]);
-       retry = 0;
-       j = 0;
-       do {
-               while (wlen) {
-                       if (wlen > 2048)
-                               len2 = 2048;
-                       else
-                               len2 = wlen;
-                       wlen -= len2;
-                       len2 <<= 1;
-                       for (i = 0; i < len2; i++)
-                               writeb(moxaBuff[j + i], baseAddr + C320_LoadBuf + i);
-                       len2 >>= 1;
-                       j += i;
-                       writew(len2, baseAddr + C320DLoad_len);
-                       writew(0, baseAddr + C320_key);
-                       for (i = 0; i < 10; i++) {
-                               if (readw(baseAddr + C320_key) == C320_KeyCode)
-                                       break;
-                               msleep(10);
-                       }
-                       if (readw(baseAddr + C320_key) != C320_KeyCode)
-                               return (-1);
-               }
-               writew(0, baseAddr + C320DLoad_len);
-               writew(usum, baseAddr + C320check_sum);
-               writew(0, baseAddr + C320_key);
-               for (i = 0; i < 10; i++) {
-                       if (readw(baseAddr + C320_key) == C320_KeyCode)
-                               break;
-                       msleep(10);
-               }
-               retry++;
-       } while ((readb(baseAddr + C320chksum_ok) != 1) && (retry < 3));
-       if (readb(baseAddr + C320chksum_ok) != 1)
-               return (-1);
-       writew(0, baseAddr + C320_key);
-       for (i = 0; i < 600; i++) {
-               if (readw(baseAddr + Magic_no) == Magic_code)
-                       break;
-               msleep(10);
-       }
-       if (readw(baseAddr + Magic_no) != Magic_code)
-               return (-100);
-
-       if (moxa_boards[cardno].busType == MOXA_BUS_TYPE_PCI) {         /* ASIC board */
-               writew(0x3800, baseAddr + TMS320_PORT1);
-               writew(0x3900, baseAddr + TMS320_PORT2);
-               writew(28499, baseAddr + TMS320_CLOCK);
-       } else {
-               writew(0x3200, baseAddr + TMS320_PORT1);
-               writew(0x3400, baseAddr + TMS320_PORT2);
-               writew(19999, baseAddr + TMS320_CLOCK);
-       }
-       writew(1, baseAddr + Disable_IRQ);
-       writew(0, baseAddr + Magic_no);
-       for (i = 0; i < 500; i++) {
-               if (readw(baseAddr + Magic_no) == Magic_code)
-                       break;
-               msleep(10);
-       }
-       if (readw(baseAddr + Magic_no) != Magic_code)
-               return (-102);
-
-       j = readw(baseAddr + Module_cnt);
-       if (j <= 0)
-               return (-101);
-       *numPorts = j * 8;
-       writew(j, baseAddr + Module_no);
-       writew(0, baseAddr + Magic_no);
-       for (i = 0; i < 600; i++) {
-               if (readw(baseAddr + Magic_no) == Magic_code)
-                       break;
-               msleep(10);
-       }
-       if (readw(baseAddr + Magic_no) != Magic_code)
-               return (-102);
-       moxaCard = 1;
-       moxa_boards[cardno].intNdx = baseAddr + IRQindex;
-       moxa_boards[cardno].intPend = baseAddr + IRQpending;
-       moxa_boards[cardno].intTable = baseAddr + IRQtable;
-       return (0);
-}
-
-static void MoxaSetFifo(int port, int enable)
+static void MoxaSetFifo(struct moxa_port *port, int enable)
 {
-       void __iomem *ofsAddr = moxa_ports[port].tableAddr;
+       void __iomem *ofsAddr = port->tableAddr;
 
        if (!enable) {
                moxafunc(ofsAddr, FC_SetRxFIFOTrig, 0);