[PATCH] Char: isicom, remove unneeded memset
[safe/jmp/linux-2.6] / drivers / char / isicom.c
index 9ede7c2..c5cb2a9 100644 (file)
  *     Omit those entries for boards you don't have installed.
  *
  *     TODO
- *             Hotplug
  *             Merge testing
  *             64-bit verification
  */
 
 #include <linux/module.h>
+#include <linux/firmware.h>
 #include <linux/kernel.h>
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
 #include <linux/sched.h>
 #include <linux/serial.h>
 #include <linux/mm.h>
-#include <linux/miscdevice.h>
 #include <linux/interrupt.h>
 #include <linux/timer.h>
 #include <linux/delay.h>
 
 #include <linux/isicom.h>
 
+#define InterruptTheCard(base) outw(0, (base) + 0xc)
+#define ClearInterrupt(base) inw((base) + 0x0a)
+
+#ifdef DEBUG
+#define pr_dbg(str...) printk(KERN_DEBUG "ISICOM: " str)
+#define isicom_paranoia_check(a, b, c) __isicom_paranoia_check((a), (b), (c))
+#else
+#define pr_dbg(str...) do { } while (0)
+#define isicom_paranoia_check(a, b, c) 0
+#endif
+
+static int isicom_probe(struct pci_dev *, const struct pci_device_id *);
+static void __devexit isicom_remove(struct pci_dev *);
+
 static struct pci_device_id isicom_pci_tbl[] = {
-       { VENDOR_ID, 0x2028, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { VENDOR_ID, 0x2051, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { VENDOR_ID, 0x2052, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { VENDOR_ID, 0x2053, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { VENDOR_ID, 0x2054, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { VENDOR_ID, 0x2055, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { VENDOR_ID, 0x2056, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { VENDOR_ID, 0x2057, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
-       { VENDOR_ID, 0x2058, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 },
+       { PCI_DEVICE(VENDOR_ID, 0x2028) },
+       { PCI_DEVICE(VENDOR_ID, 0x2051) },
+       { PCI_DEVICE(VENDOR_ID, 0x2052) },
+       { PCI_DEVICE(VENDOR_ID, 0x2053) },
+       { PCI_DEVICE(VENDOR_ID, 0x2054) },
+       { PCI_DEVICE(VENDOR_ID, 0x2055) },
+       { PCI_DEVICE(VENDOR_ID, 0x2056) },
+       { PCI_DEVICE(VENDOR_ID, 0x2057) },
+       { PCI_DEVICE(VENDOR_ID, 0x2058) },
        { 0 }
 };
 MODULE_DEVICE_TABLE(pci, isicom_pci_tbl);
 
+static struct pci_driver isicom_driver = {
+       .name           = "isicom",
+       .id_table       = isicom_pci_tbl,
+       .probe          = isicom_probe,
+       .remove         = __devexit_p(isicom_remove)
+};
+
 static int prev_card = 3;      /*      start servicing isi_card[0]     */
 static struct tty_driver *isicom_normal;
 
 static struct timer_list tx;
 static char re_schedule = 1;
 
-static int ISILoad_ioctl(struct inode *inode, struct file *filp, unsigned  int cmd, unsigned long arg);
-
 static void isicom_tx(unsigned long _data);
 static void isicom_start(struct tty_struct *tty);
 
-static unsigned char *tmp_buf;
-static DECLARE_MUTEX(tmp_buf_sem);
-
 /*   baud index mappings from linux defns to isi */
 
 static signed char linuxb_to_isib[] = {
@@ -174,11 +189,10 @@ struct    isi_board {
        unsigned char           irq;
        unsigned char           port_count;
        unsigned short          status;
-       unsigned short          port_status; /* each bit represents a single port */
+       unsigned short          port_status; /* each bit for each port */
        unsigned short          shift_count;
        struct isi_port         * ports;
        signed char             count;
-       unsigned char           isa;
        spinlock_t              card_lock; /* Card wide lock 11/5/00 -sameer */
        unsigned long           flags;
 };
@@ -227,8 +241,10 @@ static int lock_card(struct isi_board *card)
                        udelay(1000);   /* 1ms */
                }
        }
-       printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n", card->base);
-       return 0;       /* Failed to aquire the card! */
+       printk(KERN_WARNING "ISICOM: Failed to lock Card (0x%lx)\n",
+               card->base);
+
+       return 0;       /* Failed to acquire the card! */
 }
 
 static int lock_card_at_interrupt(struct isi_board *card)
@@ -245,7 +261,7 @@ static int lock_card_at_interrupt(struct isi_board *card)
                        spin_unlock_irqrestore(&card->card_lock, card->flags);
        }
        /* Failing in interrupt is an acceptable event */
-       return 0;       /* Failed to aquire the card! */
+       return 0;       /* Failed to acquire the card! */
 }
 
 static void unlock_card(struct isi_board *card)
@@ -367,255 +383,25 @@ static inline void kill_queue(struct isi_port *port, short queue)
        unlock_card(card);
 }
 
-
-/*
- *  Firmware loader driver specific routines. This needs to mostly die
- *  and be replaced with request_firmware.
- */
-
-static struct file_operations ISILoad_fops = {
-       .owner          = THIS_MODULE,
-       .ioctl          = ISILoad_ioctl,
-};
-
-static struct miscdevice isiloader_device = {
-       ISILOAD_MISC_MINOR, "isictl", &ISILoad_fops
-};
-
-
-static inline int WaitTillCardIsFree(unsigned long base)
-{
-       unsigned long count=0;
-       while( (!(inw(base+0xe) & 0x1)) && (count++ < 6000000));
-       if (inw(base+0xe)&0x1)
-               return 0;
-       else
-               return 1;
-}
-
-static int ISILoad_ioctl(struct inode *inode, struct file *filp,
-       unsigned int cmd, unsigned long arg)
-{
-       unsigned int card, i, j, signature, status, portcount = 0;
-       unsigned long t, base;
-       u16 word_count;
-       bin_frame frame;
-       void __user *argp = (void __user *)arg;
-       /* exec_record exec_rec; */
-
-       if (get_user(card, (int __user *)argp))
-               return -EFAULT;
-
-       if (card < 0 || card >= BOARD_COUNT)
-               return -ENXIO;
-
-       base=isi_card[card].base;
-
-       if (base==0)
-               return -ENXIO;  /* disabled or not used */
-
-       switch(cmd) {
-       case MIOCTL_RESET_CARD:
-               if (!capable(CAP_SYS_ADMIN))
-                       return -EPERM;
-               printk(KERN_DEBUG "ISILoad:Resetting Card%d at 0x%lx ",card+1,base);
-
-               inw(base+0x8);
-
-               for (t=jiffies+HZ/100;time_before(jiffies, t););
-
-               outw(0,base+0x8); /* Reset */
-
-               for (j=1;j<=3;j++) {
-                       for (t=jiffies+HZ;time_before(jiffies, t););
-                       printk(".");
-               }
-               signature=(inw(base+0x4)) & 0xff;
-               if (isi_card[card].isa) {
-
-                       if (!(inw(base+0xe) & 0x1) || (inw(base+0x2))) {
-#ifdef ISICOM_DEBUG
-                               printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe));
-#endif
-                               printk("\nISILoad:ISA Card%d reset failure (Possible bad I/O Port Address 0x%lx).\n",card+1,base);
-                               return -EIO;
-                       }
-               }
-               else {
-                       portcount = inw(base+0x2);
-                       if (!(inw(base+0xe) & 0x1) || ((portcount!=0) && (portcount!=4) && (portcount!=8))) {
-#ifdef ISICOM_DEBUG
-                               printk("\nbase+0x2=0x%x , base+0xe=0x%x",inw(base+0x2),inw(base+0xe));
-#endif
-                               printk("\nISILoad:PCI Card%d reset failure (Possible bad I/O Port Address 0x%lx).\n",card+1,base);
-                               return -EIO;
-                       }
-               }
-               switch(signature) {
-               case    0xa5:
-               case    0xbb:
-               case    0xdd:
-                               if (isi_card[card].isa)
-                                       isi_card[card].port_count = 8;
-                               else {
-                                       if (portcount == 4)
-                                               isi_card[card].port_count = 4;
-                                       else
-                                               isi_card[card].port_count = 8;
-                               }
-                               isi_card[card].shift_count = 12;
-                               break;
-
-               case    0xcc:   isi_card[card].port_count = 16;
-                               isi_card[card].shift_count = 11;
-                               break;
-
-               default: printk("ISILoad:Card%d reset failure (Possible bad I/O Port Address 0x%lx).\n",card+1,base);
-#ifdef ISICOM_DEBUG
-                       printk("Sig=0x%x\n",signature);
-#endif
-                       return -EIO;
-               }
-               printk("-Done\n");
-               return put_user(signature,(unsigned __user *)argp);
-
-       case    MIOCTL_LOAD_FIRMWARE:
-                       if (!capable(CAP_SYS_ADMIN))
-                               return -EPERM;
-
-                       if (copy_from_user(&frame, argp, sizeof(bin_frame)))
-                               return -EFAULT;
-
-                       if (WaitTillCardIsFree(base))
-                               return -EIO;
-
-                       outw(0xf0,base); /* start upload sequence */
-                       outw(0x00,base);
-                       outw((frame.addr), base); /* lsb of adderess */
-
-                       word_count=(frame.count >> 1) + frame.count % 2;
-                       outw(word_count, base);
-                       InterruptTheCard(base);
-
-                       for (i=0;i<=0x2f;i++);  /* a wee bit of delay */
-
-                       if (WaitTillCardIsFree(base))
-                               return -EIO;
-
-                       if ((status=inw(base+0x4))!=0) {
-                               printk(KERN_WARNING "ISILoad:Card%d rejected load header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n",
-                               card+1, frame.addr, frame.count, status);
-                               return -EIO;
-                       }
-                       outsw(base, (void *) frame.bin_data, word_count);
-
-                       InterruptTheCard(base);
-
-                       for (i=0;i<=0x0f;i++);  /* another wee bit of delay */
-
-                       if (WaitTillCardIsFree(base))
-                               return -EIO;
-
-                       if ((status=inw(base+0x4))!=0) {
-                               printk(KERN_ERR "ISILoad:Card%d got out of sync.Card Status:0x%x\n",card+1, status);
-                               return -EIO;
-                       }
-                       return 0;
-
-       case    MIOCTL_READ_FIRMWARE:
-                       if (!capable(CAP_SYS_ADMIN))
-                               return -EPERM;
-
-                       if (copy_from_user(&frame, argp, sizeof(bin_header)))
-                               return -EFAULT;
-
-                       if (WaitTillCardIsFree(base))
-                               return -EIO;
-
-                       outw(0xf1,base); /* start download sequence */
-                       outw(0x00,base);
-                       outw((frame.addr), base); /* lsb of adderess */
-
-                       word_count=(frame.count >> 1) + frame.count % 2;
-                       outw(word_count+1, base);
-                       InterruptTheCard(base);
-
-                       for (i=0;i<=0xf;i++);   /* a wee bit of delay */
-
-                       if (WaitTillCardIsFree(base))
-                               return -EIO;
-
-                       if ((status=inw(base+0x4))!=0) {
-                               printk(KERN_WARNING "ISILoad:Card%d rejected verify header:\nAddress:0x%x \nCount:0x%x \nStatus:0x%x \n",
-                               card+1, frame.addr, frame.count, status);
-                               return -EIO;
-                       }
-
-                       inw(base);
-                       insw(base, frame.bin_data, word_count);
-                       InterruptTheCard(base);
-
-                       for (i=0;i<=0x0f;i++);  /* another wee bit of delay */
-
-                       if (WaitTillCardIsFree(base))
-                               return -EIO;
-
-                       if ((status=inw(base+0x4))!=0) {
-                               printk(KERN_ERR "ISILoad:Card%d verify got out of sync.Card Status:0x%x\n",card+1, status);
-                               return -EIO;
-                       }
-
-                       if (copy_to_user(argp, &frame, sizeof(bin_frame)))
-                               return -EFAULT;
-                       return 0;
-
-       case    MIOCTL_XFER_CTRL:
-                       if (!capable(CAP_SYS_ADMIN))
-                               return -EPERM;
-                       if (WaitTillCardIsFree(base))
-                               return -EIO;
-
-                       outw(0xf2, base);
-                       outw(0x800, base);
-                       outw(0x0, base);
-                       outw(0x0, base);
-                       InterruptTheCard(base);
-                       outw(0x0, base+0x4); /* for ISI4608 cards */
-
-                       isi_card[card].status |= FIRMWARE_LOADED;
-                       return 0;
-
-       default:
-#ifdef ISICOM_DEBUG
-               printk(KERN_DEBUG "ISILoad: Received Ioctl cmd 0x%x.\n", cmd);
-#endif
-               return -ENOIOCTLCMD;
-       }
-}
-
-
 /*
  *     ISICOM Driver specific routines ...
  *
  */
 
-static inline int isicom_paranoia_check(struct isi_port const *port, char *name,
-       const char *routine)
+static inline int __isicom_paranoia_check(struct isi_port const *port,
+       char *name, const char *routine)
 {
-#ifdef ISICOM_DEBUG
-       static const char *badmagic =
-                       KERN_WARNING "ISICOM: Warning: bad isicom magic for dev %s in %s.\n";
-       static const char *badport =
-                       KERN_WARNING "ISICOM: Warning: NULL isicom port for dev %s in %s.\n";
        if (!port) {
-               printk(badport, name, routine);
+               printk(KERN_WARNING "ISICOM: Warning: bad isicom magic for "
+                       "dev %s in %s.\n", name, routine);
                return 1;
        }
        if (port->magic != ISICOM_MAGIC) {
-               printk(badmagic, name, routine);
+               printk(KERN_WARNING "ISICOM: Warning: NULL isicom port for "
+                       "dev %s in %s.\n", name, routine);
                return 1;
        }
-#endif
+
        return 0;
 }
 
@@ -674,42 +460,43 @@ static void isicom_tx(unsigned long _data)
                        unlock_card(&isi_card[card]);
                        continue;
                }
-#ifdef ISICOM_DEBUG
-               printk(KERN_DEBUG "ISICOM: txing %d bytes, port%d.\n",
-                               txcount, port->channel+1);
-#endif
-               outw((port->channel << isi_card[card].shift_count) | txcount
-                                       , base);
+               pr_dbg("txing %d bytes, port%d.\n", txcount,
+                       port->channel + 1);
+               outw((port->channel << isi_card[card].shift_count) | txcount,
+                       base);
                residue = NO;
                wrd = 0;
                while (1) {
-                       cnt = min_t(int, txcount, (SERIAL_XMIT_SIZE - port->xmit_tail));
+                       cnt = min_t(int, txcount, (SERIAL_XMIT_SIZE
+                                       - port->xmit_tail));
                        if (residue == YES) {
                                residue = NO;
                                if (cnt > 0) {
-                                       wrd |= (port->xmit_buf[port->xmit_tail] << 8);
-                                       port->xmit_tail = (port->xmit_tail + 1) & (SERIAL_XMIT_SIZE - 1);
+                                       wrd |= (port->xmit_buf[port->xmit_tail]
+                                                                       << 8);
+                                       port->xmit_tail = (port->xmit_tail + 1)
+                                               & (SERIAL_XMIT_SIZE - 1);
                                        port->xmit_cnt--;
                                        txcount--;
                                        cnt--;
                                        outw(wrd, base);
-                               }
-                               else {
+                               } else {
                                        outw(wrd, base);
                                        break;
                                }
                        }
                        if (cnt <= 0) break;
                        word_count = cnt >> 1;
-                       outsw(base, port->xmit_buf+port->xmit_tail, word_count);
-                       port->xmit_tail = (port->xmit_tail + (word_count << 1)) &
-                                               (SERIAL_XMIT_SIZE - 1);
+                       outsw(base, port->xmit_buf+port->xmit_tail,word_count);
+                       port->xmit_tail = (port->xmit_tail
+                               + (word_count << 1)) & (SERIAL_XMIT_SIZE - 1);
                        txcount -= (word_count << 1);
                        port->xmit_cnt -= (word_count << 1);
                        if (cnt & 0x0001) {
                                residue = YES;
                                wrd = port->xmit_buf[port->xmit_tail];
-                               port->xmit_tail = (port->xmit_tail + 1) & (SERIAL_XMIT_SIZE - 1);
+                               port->xmit_tail = (port->xmit_tail + 1)
+                                       & (SERIAL_XMIT_SIZE - 1);
                                port->xmit_cnt--;
                                txcount--;
                        }
@@ -725,8 +512,11 @@ static void isicom_tx(unsigned long _data)
 
        /*      schedule another tx for hopefully in about 10ms */
 sched_again:
-       if (!re_schedule)
-               return;
+       if (!re_schedule) {
+               re_schedule = 2;
+               return;
+       }
+
        init_timer(&tx);
        tx.expires = jiffies + HZ/100;
        tx.data = 0;
@@ -739,9 +529,9 @@ sched_again:
 /*     Interrupt handlers      */
 
 
-static void isicom_bottomhalf(void *data)
+static void isicom_bottomhalf(struct work_struct *work)
 {
-       struct isi_port *port = (struct isi_port *) data;
+       struct isi_port *port = container_of(work, struct isi_port, bh_tqueue);
        struct tty_struct *tty = port->tty;
 
        if (!tty)
@@ -755,7 +545,7 @@ static void isicom_bottomhalf(void *data)
  *     Main interrupt handler routine
  */
 
-static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t isicom_interrupt(int irq, void *dev_id)
 {
        struct isi_board *card = dev_id;
        struct isi_port *port;
@@ -771,14 +561,12 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        base = card->base;
        spin_lock(&card->card_lock);
 
-       if (card->isa == NO) {
-               /*
-                * disable any interrupts from the PCI card and lower the
-                * interrupt line
-                */
-               outw(0x8000, base+0x04);
-               ClearInterrupt(base);
-       }
+       /*
+        * disable any interrupts from the PCI card and lower the
+        * interrupt line
+        */
+       outw(0x8000, base+0x04);
+       ClearInterrupt(base);
 
        inw(base);              /* get the dummy word out */
        header = inw(base);
@@ -786,21 +574,15 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs)
        byte_count = header & 0xff;
 
        if (channel + 1 > card->port_count) {
-               printk(KERN_WARNING "ISICOM: isicom_interrupt(0x%lx): %d(channel) > port_count.\n",
-                               base, channel+1);
-               if (card->isa)
-                       ClearInterrupt(base);
-               else
-                       outw(0x0000, base+0x04); /* enable interrupts */
+               printk(KERN_WARNING "ISICOM: isicom_interrupt(0x%lx): "
+                       "%d(channel) > port_count.\n", base, channel+1);
+               outw(0x0000, base+0x04); /* enable interrupts */
                spin_unlock(&card->card_lock);
                return IRQ_HANDLED;
        }
        port = card->ports + channel;
        if (!(port->flags & ASYNC_INITIALIZED)) {
-               if (card->isa)
-                       ClearInterrupt(base);
-               else
-                       outw(0x0000, base+0x04); /* enable interrupts */
+               outw(0x0000, base+0x04); /* enable interrupts */
                return IRQ_HANDLED;
        }
 
@@ -813,10 +595,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                }
                if (byte_count & 0x01)
                        inw(base);
-               if (card->isa == YES)
-                       ClearInterrupt(base);
-               else
-                       outw(0x0000, base+0x04); /* enable interrupts */
+               outw(0x0000, base+0x04); /* enable interrupts */
                spin_unlock(&card->card_lock);
                return IRQ_HANDLED;
        }
@@ -825,30 +604,22 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                header = inw(base);
                switch(header & 0xff) {
                case 0: /* Change in EIA signals */
-
                        if (port->flags & ASYNC_CHECK_CD) {
                                if (port->status & ISI_DCD) {
                                        if (!(header & ISI_DCD)) {
                                        /* Carrier has been lost  */
-#ifdef ISICOM_DEBUG
-                                               printk(KERN_DEBUG "ISICOM: interrupt: DCD->low.\n");
-#endif
+                                               pr_dbg("interrupt: DCD->low.\n"
+                                                       );
                                                port->status &= ~ISI_DCD;
                                                schedule_work(&port->hangup_tq);
                                        }
+                               } else if (header & ISI_DCD) {
+                               /* Carrier has been detected */
+                                       pr_dbg("interrupt: DCD->high.\n");
+                                       port->status |= ISI_DCD;
+                                       wake_up_interruptible(&port->open_wait);
                                }
-                               else {
-                                       if (header & ISI_DCD) {
-                                       /* Carrier has been detected */
-#ifdef ISICOM_DEBUG
-                                               printk(KERN_DEBUG "ISICOM: interrupt: DCD->high.\n");
-#endif
-                                               port->status |= ISI_DCD;
-                                               wake_up_interruptible(&port->open_wait);
-                                       }
-                               }
-                       }
-                       else {
+                       } else {
                                if (header & ISI_DCD)
                                        port->status |= ISI_DCD;
                                else
@@ -860,19 +631,16 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                                        if (header & ISI_CTS) {
                                                port->tty->hw_stopped = 0;
                                                /* start tx ing */
-                                               port->status |= (ISI_TXOK | ISI_CTS);
+                                               port->status |= (ISI_TXOK
+                                                       | ISI_CTS);
                                                schedule_work(&port->bh_tqueue);
                                        }
+                               } else if (!(header & ISI_CTS)) {
+                                       port->tty->hw_stopped = 1;
+                                       /* stop tx ing */
+                                       port->status &= ~(ISI_TXOK | ISI_CTS);
                                }
-                               else {
-                                       if (!(header & ISI_CTS)) {
-                                               port->tty->hw_stopped = 1;
-                                               /* stop tx ing */
-                                               port->status &= ~(ISI_TXOK | ISI_CTS);
-                                       }
-                               }
-                       }
-                       else {
+                       } else {
                                if (header & ISI_CTS)
                                        port->status |= ISI_CTS;
                                else
@@ -891,7 +659,7 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
                        break;
 
-               case 1: /* Received Break !!!    */
+               case 1: /* Received Break !!! */
                        tty_insert_flip_char(tty, 0, TTY_BREAK);
                        if (port->flags & ASYNC_SAK)
                                do_SAK(tty);
@@ -899,31 +667,28 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                        break;
 
                case 2: /* Statistics            */
-                       printk(KERN_DEBUG "ISICOM: isicom_interrupt: stats!!!.\n");
+                       pr_dbg("isicom_interrupt: stats!!!.\n");
                        break;
 
                default:
-                       printk(KERN_WARNING "ISICOM: Intr: Unknown code in status packet.\n");
+                       pr_dbg("Intr: Unknown code in status packet.\n");
                        break;
                }
-       }
-       else {                          /* Data   Packet */
+       } else {                                /* Data   Packet */
 
                count = tty_prepare_flip_string(tty, &rp, byte_count & ~1);
-#ifdef ISICOM_DEBUG
-               printk(KERN_DEBUG "ISICOM: Intr: Can rx %d of %d bytes.\n",
-                                       count, byte_count);
-#endif
+               pr_dbg("Intr: Can rx %d of %d bytes.\n", count, byte_count);
                word_count = count >> 1;
                insw(base, rp, word_count);
                byte_count -= (word_count << 1);
                if (count & 0x0001) {
-                       tty_insert_flip_char(tty,  inw(base) & 0xff, TTY_NORMAL);
+                       tty_insert_flip_char(tty,  inw(base) & 0xff,
+                               TTY_NORMAL);
                        byte_count -= 2;
                }
                if (byte_count > 0) {
-                       printk(KERN_DEBUG "ISICOM: Intr(0x%lx:%d): Flip buffer overflow! dropping bytes...\n",
-                                       base, channel+1);
+                       pr_dbg("Intr(0x%lx:%d): Flip buffer overflow! dropping "
+                               "bytes...\n", base, channel + 1);
                        while(byte_count > 0) { /* drain out unread xtra data */
                                inw(base);
                                byte_count -= 2;
@@ -931,10 +696,8 @@ static irqreturn_t isicom_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                }
                tty_flip_buffer_push(tty);
        }
-       if (card->isa == YES)
-               ClearInterrupt(base);
-       else
-               outw(0x0000, base+0x04); /* enable interrupts */
+       outw(0x0000, base+0x04); /* enable interrupts */
+
        return IRQ_HANDLED;
 }
 
@@ -1106,7 +869,8 @@ static int isicom_setup_port(struct isi_port *port)
        return 0;
 }
 
-static int block_til_ready(struct tty_struct *tty, struct file *filp, struct isi_port *port)
+static int block_til_ready(struct tty_struct *tty, struct file *filp,
+       struct isi_port *port)
 {
        struct isi_board *card = port->card;
        int do_clocal = 0, retval;
@@ -1116,9 +880,7 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp, struct isi
        /* block if port is in the process of being closed */
 
        if (tty_hung_up_p(filp) || port->flags & ASYNC_CLOSING) {
-#ifdef ISICOM_DEBUG
-               printk(KERN_DEBUG "ISICOM: block_til_ready: close in progress.\n");
-#endif
+               pr_dbg("block_til_ready: close in progress.\n");
                interruptible_sleep_on(&port->close_wait);
                if (port->flags & ASYNC_HUP_NOTIFY)
                        return -EAGAIN;
@@ -1128,10 +890,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp, struct isi
 
        /* if non-blocking mode is set ... */
 
-       if ((filp->f_flags & O_NONBLOCK) || (tty->flags & (1 << TTY_IO_ERROR))) {
-#ifdef ISICOM_DEBUG
-               printk(KERN_DEBUG "ISICOM: block_til_ready: non-block mode.\n");
-#endif
+       if ((filp->f_flags & O_NONBLOCK) ||
+                       (tty->flags & (1 << TTY_IO_ERROR))) {
+               pr_dbg("block_til_ready: non-block mode.\n");
                port->flags |= ASYNC_NORMAL_ACTIVE;
                return 0;
        }
@@ -1271,12 +1032,12 @@ static void isicom_shutdown_port(struct isi_port *port)
                set_bit(TTY_IO_ERROR, &tty->flags);
 
        if (--card->count < 0) {
-               printk(KERN_DEBUG "ISICOM: isicom_shutdown_port: bad board(0x%lx) count %d.\n",
+               pr_dbg("isicom_shutdown_port: bad board(0x%lx) count %d.\n",
                        card->base, card->count);
                card->count = 0;
        }
 
-       /* last port was closed , shutdown that boad too */
+       /* last port was closed, shutdown that boad too */
        if (C_HUPCL(tty)) {
                if (!card->count)
                        isicom_shutdown_board(card);
@@ -1286,17 +1047,16 @@ static void isicom_shutdown_port(struct isi_port *port)
 static void isicom_close(struct tty_struct *tty, struct file *filp)
 {
        struct isi_port *port = tty->driver_data;
-       struct isi_board *card = port->card;
+       struct isi_board *card;
        unsigned long flags;
 
        if (!port)
                return;
+       card = port->card;
        if (isicom_paranoia_check(port, tty->name, "isicom_close"))
                return;
 
-#ifdef ISICOM_DEBUG
-       printk(KERN_DEBUG "ISICOM: Close start!!!.\n");
-#endif
+       pr_dbg("Close start!!!.\n");
 
        spin_lock_irqsave(&card->card_lock, flags);
        if (tty_hung_up_p(filp)) {
@@ -1305,14 +1065,14 @@ static void isicom_close(struct tty_struct *tty, struct file *filp)
        }
 
        if (tty->count == 1 && port->count != 1) {
-               printk(KERN_WARNING "ISICOM:(0x%lx) isicom_close: bad port count"
-                       "tty->count = 1 port count = %d.\n",
+               printk(KERN_WARNING "ISICOM:(0x%lx) isicom_close: bad port "
+                       "count tty->count = 1 port count = %d.\n",
                        card->base, port->count);
                port->count = 1;
        }
        if (--port->count < 0) {
-               printk(KERN_WARNING "ISICOM:(0x%lx) isicom_close: bad port count for"
-                       "channel%d = %d", card->base, port->channel,
+               printk(KERN_WARNING "ISICOM:(0x%lx) isicom_close: bad port "
+                       "count for channel%d = %d", card->base, port->channel,
                        port->count);
                port->count = 0;
        }
@@ -1347,10 +1107,9 @@ static void isicom_close(struct tty_struct *tty, struct file *filp)
        if (port->blocked_open) {
                spin_unlock_irqrestore(&card->card_lock, flags);
                if (port->close_delay) {
-#ifdef ISICOM_DEBUG
-                       printk(KERN_DEBUG "ISICOM: scheduling until time out.\n");
-#endif
-                       msleep_interruptible(jiffies_to_msecs(port->close_delay));
+                       pr_dbg("scheduling until time out.\n");
+                       msleep_interruptible(
+                               jiffies_to_msecs(port->close_delay));
                }
                spin_lock_irqsave(&card->card_lock, flags);
                wake_up_interruptible(&port->open_wait);
@@ -1372,19 +1131,20 @@ static int isicom_write(struct tty_struct *tty, const unsigned char *buf,
        if (isicom_paranoia_check(port, tty->name, "isicom_write"))
                return 0;
 
-       if (!tty || !port->xmit_buf || !tmp_buf)
+       if (!port->xmit_buf)
                return 0;
 
        spin_lock_irqsave(&card->card_lock, flags);
 
        while(1) {
-               cnt = min_t(int, count, min(SERIAL_XMIT_SIZE - port->xmit_cnt - 1,
-                                       SERIAL_XMIT_SIZE - port->xmit_head));
+               cnt = min_t(int, count, min(SERIAL_XMIT_SIZE - port->xmit_cnt
+                               - 1, SERIAL_XMIT_SIZE - port->xmit_head));
                if (cnt <= 0)
                        break;
 
                memcpy(port->xmit_buf + port->xmit_head, buf, cnt);
-               port->xmit_head = (port->xmit_head + cnt) & (SERIAL_XMIT_SIZE - 1);
+               port->xmit_head = (port->xmit_head + cnt) & (SERIAL_XMIT_SIZE
+                       - 1);
                port->xmit_cnt += cnt;
                buf += cnt;
                count -= cnt;
@@ -1406,7 +1166,7 @@ static void isicom_put_char(struct tty_struct *tty, unsigned char ch)
        if (isicom_paranoia_check(port, tty->name, "isicom_put_char"))
                return;
 
-       if (!tty || !port->xmit_buf)
+       if (!port->xmit_buf)
                return;
 
        spin_lock_irqsave(&card->card_lock, flags);
@@ -1429,7 +1189,8 @@ static void isicom_flush_chars(struct tty_struct *tty)
        if (isicom_paranoia_check(port, tty->name, "isicom_flush_chars"))
                return;
 
-       if (port->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped || !port->xmit_buf)
+       if (port->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
+                       !port->xmit_buf)
                return;
 
        /* this tells the transmitter to consider this port for
@@ -1462,7 +1223,8 @@ static int isicom_chars_in_buffer(struct tty_struct *tty)
 }
 
 /* ioctl et all */
-static inline void isicom_send_break(struct isi_port *port, unsigned long length)
+static inline void isicom_send_break(struct isi_port *port,
+       unsigned long length)
 {
        struct isi_board *card = port->card;
        unsigned long base = card->base;
@@ -1597,7 +1359,8 @@ static int isicom_ioctl(struct tty_struct *tty, struct file *filp,
                return 0;
 
        case TIOCGSOFTCAR:
-               return put_user(C_CLOCAL(tty) ? 1 : 0, (unsigned long __user *)argp);
+               return put_user(C_CLOCAL(tty) ? 1 : 0,
+                               (unsigned long __user *)argp);
 
        case TIOCSSOFTCAR:
                if (get_user(arg, (unsigned long __user *) argp))
@@ -1621,7 +1384,7 @@ static int isicom_ioctl(struct tty_struct *tty, struct file *filp,
 
 /* set_termios et all */
 static void isicom_set_termios(struct tty_struct *tty,
-       struct termios *old_termios)
+       struct ktermios *old_termios)
 {
        struct isi_port *port = tty->driver_data;
 
@@ -1696,9 +1459,9 @@ static void isicom_start(struct tty_struct *tty)
 }
 
 /* hangup et all */
-static void do_isicom_hangup(void *data)
+static void do_isicom_hangup(struct work_struct *work)
 {
-       struct isi_port *port = data;
+       struct isi_port *port = container_of(work, struct isi_port, hangup_tq);
        struct tty_struct *tty;
 
        tty = port->tty;
@@ -1738,35 +1501,11 @@ static void isicom_flush_buffer(struct tty_struct *tty)
        tty_wakeup(tty);
 }
 
+/*
+ * Driver init and deinit functions
+ */
 
-static int __devinit register_ioregion(void)
-{
-       int count, done=0;
-       for (count=0; count < BOARD_COUNT; count++ ) {
-               if (isi_card[count].base)
-                       if (!request_region(isi_card[count].base,16,ISICOM_NAME)) {
-                               printk(KERN_DEBUG "ISICOM: I/O Region 0x%lx-0x%lx is busy. Card%d will be disabled.\n",
-                                       isi_card[count].base,isi_card[count].base+15,count+1);
-                               isi_card[count].base=0;
-                               done++;
-                       }
-       }
-       return done;
-}
-
-static void unregister_ioregion(void)
-{
-       int count;
-       for (count=0; count < BOARD_COUNT; count++ )
-               if (isi_card[count].base) {
-                       release_region(isi_card[count].base,16);
-#ifdef ISICOM_DEBUG
-                       printk(KERN_DEBUG "ISICOM: I/O Region 0x%lx-0x%lx released for Card%d.\n",isi_card[count].base,isi_card[count].base+15,count+1);
-#endif
-               }
-}
-
-static struct tty_operations isicom_ops = {
+static const struct tty_operations isicom_ops = {
        .open                   = isicom_open,
        .close                  = isicom_close,
        .write                  = isicom_write,
@@ -1786,253 +1525,368 @@ static struct tty_operations isicom_ops = {
        .tiocmset               = isicom_tiocmset,
 };
 
-static int __devinit register_drivers(void)
+static int __devinit reset_card(struct pci_dev *pdev,
+       const unsigned int card, unsigned int *signature)
 {
-       int error;
+       struct isi_board *board = pci_get_drvdata(pdev);
+       unsigned long base = board->base;
+       unsigned int portcount = 0;
+       int retval = 0;
 
-       /* tty driver structure initialization */
-       isicom_normal = alloc_tty_driver(PORT_COUNT);
-       if (!isicom_normal)
-               return -ENOMEM;
-
-       isicom_normal->owner    = THIS_MODULE;
-       isicom_normal->name     = "ttyM";
-       isicom_normal->devfs_name = "isicom/";
-       isicom_normal->major    = ISICOM_NMAJOR;
-       isicom_normal->minor_start      = 0;
-       isicom_normal->type     = TTY_DRIVER_TYPE_SERIAL;
-       isicom_normal->subtype  = SERIAL_TYPE_NORMAL;
-       isicom_normal->init_termios     = tty_std_termios;
-       isicom_normal->init_termios.c_cflag     =
-                               B9600 | CS8 | CREAD | HUPCL |CLOCAL;
-       isicom_normal->flags    = TTY_DRIVER_REAL_RAW;
-       tty_set_operations(isicom_normal, &isicom_ops);
+       dev_dbg(&pdev->dev, "ISILoad:Resetting Card%d at 0x%lx\n", card + 1,
+               base);
 
-       if ((error=tty_register_driver(isicom_normal))!=0) {
-               printk(KERN_DEBUG "ISICOM: Couldn't register the dialin driver, error=%d\n",
-                       error);
-               put_tty_driver(isicom_normal);
-               return error;
+       inw(base + 0x8);
+
+       mdelay(10);
+
+       outw(0, base + 0x8); /* Reset */
+
+       msleep(3000);
+
+       *signature = inw(base + 0x4) & 0xff;
+
+       portcount = inw(base + 0x2);
+       if (!(inw(base + 0xe) & 0x1) || ((portcount != 0) &&
+                       (portcount != 4) && (portcount != 8))) {
+               dev_dbg(&pdev->dev, "base+0x2=0x%lx, base+0xe=0x%lx\n",
+                       inw(base + 0x2), inw(base + 0xe));
+               dev_err(&pdev->dev, "ISILoad:PCI Card%d reset failure "
+                       "(Possible bad I/O Port Address 0x%lx).\n",
+                       card + 1, base);
+               retval = -EIO;
+               goto end;
        }
-       return 0;
+
+       switch (*signature) {
+       case 0xa5:
+       case 0xbb:
+       case 0xdd:
+               board->port_count = (portcount == 4) ? 4 : 8;
+               board->shift_count = 12;
+               break;
+       case 0xcc:
+               board->port_count = 16;
+               board->shift_count = 11;
+               break;
+       default:
+               dev_warn(&pdev->dev, "ISILoad:Card%d reset failure (Possible "
+                       "bad I/O Port Address 0x%lx).\n", card + 1, base);
+               dev_dbg(&pdev->dev, "Sig=0x%lx\n", signature);
+               retval = -EIO;
+       }
+       dev_info(&pdev->dev, "-Done\n");
+
+end:
+       return retval;
 }
 
-static void unregister_drivers(void)
+static inline int WaitTillCardIsFree(u16 base)
 {
-       int error = tty_unregister_driver(isicom_normal);
-       if (error)
-               printk(KERN_DEBUG "ISICOM: couldn't unregister normal driver error=%d.\n",error);
-       put_tty_driver(isicom_normal);
+       unsigned long count = 0;
+
+       while (!(inw(base + 0xe) & 0x1) && count++ < 100)
+               msleep(5);
+
+       return !(inw(base + 0xe) & 0x1);
 }
 
-static int __devinit register_isr(void)
+static int __devinit load_firmware(struct pci_dev *pdev,
+       const unsigned int index, const unsigned int signature)
 {
-       int count, done=0;
-       unsigned long irqflags;
-
-       for (count=0; count < BOARD_COUNT; count++ ) {
-               if (isi_card[count].base) {
-                       irqflags = (isi_card[count].isa == YES) ?
-                                       SA_INTERRUPT :
-                                       (SA_INTERRUPT | SA_SHIRQ);
-
-                       if (request_irq(isi_card[count].irq,
-                                       isicom_interrupt,
-                                       irqflags,
-                                       ISICOM_NAME, &isi_card[count])) {
-
-                               printk(KERN_WARNING "ISICOM: Could not"
-                                       " install handler at Irq %d."
-                                       " Card%d will be disabled.\n",
-                                       isi_card[count].irq, count+1);
-
-                               release_region(isi_card[count].base,16);
-                               isi_card[count].base=0;
-                       }
-                       else
-                               done++;
+       struct isi_board *board = pci_get_drvdata(pdev);
+       const struct firmware *fw;
+       unsigned long base = board->base;
+       unsigned int a;
+       u16 word_count, status;
+       int retval = -EIO;
+       char *name;
+       u8 *data;
+
+       struct stframe {
+               u16     addr;
+               u16     count;
+               u8      data[0];
+       } *frame;
+
+       switch (signature) {
+       case 0xa5:
+               name = "isi608.bin";
+               break;
+       case 0xbb:
+               name = "isi608em.bin";
+               break;
+       case 0xcc:
+               name = "isi616em.bin";
+               break;
+       case 0xdd:
+               name = "isi4608.bin";
+               break;
+       case 0xee:
+               name = "isi4616.bin";
+               break;
+       default:
+               dev_err(&pdev->dev, "Unknown signature.\n");
+               goto end;
+       }
+
+       retval = request_firmware(&fw, name, &pdev->dev);
+       if (retval)
+               goto end;
+
+       retval = -EIO;
+
+       for (frame = (struct stframe *)fw->data;
+                       frame < (struct stframe *)(fw->data + fw->size);
+                       frame = (struct stframe *)((u8 *)(frame + 1) +
+                               frame->count)) {
+               if (WaitTillCardIsFree(base))
+                       goto errrelfw;
+
+               outw(0xf0, base);       /* start upload sequence */
+               outw(0x00, base);
+               outw(frame->addr, base); /* lsb of address */
+
+               word_count = frame->count / 2 + frame->count % 2;
+               outw(word_count, base);
+               InterruptTheCard(base);
+
+               udelay(100); /* 0x2f */
+
+               if (WaitTillCardIsFree(base))
+                       goto errrelfw;
+
+               if ((status = inw(base + 0x4)) != 0) {
+                       dev_warn(&pdev->dev, "Card%d rejected load header:\n"
+                               "Address:0x%x\nCount:0x%x\nStatus:0x%x\n",
+                               index + 1, frame->addr, frame->count, status);
+                       goto errrelfw;
                }
-       }
-       return done;
-}
+               outsw(base, frame->data, word_count);
 
-static void __exit unregister_isr(void)
-{
-       int count;
+               InterruptTheCard(base);
 
-       for (count=0; count < BOARD_COUNT; count++ ) {
-               if (isi_card[count].base)
-                       free_irq(isi_card[count].irq, &isi_card[count]);
-       }
-}
+               udelay(50); /* 0x0f */
 
-static int __devinit isicom_init(void)
-{
-       int card, channel, base;
-       struct isi_port *port;
-       unsigned long page;
+               if (WaitTillCardIsFree(base))
+                       goto errrelfw;
 
-       if (!tmp_buf) {
-               page = get_zeroed_page(GFP_KERNEL);
-               if (!page) {
-#ifdef ISICOM_DEBUG
-                       printk(KERN_DEBUG "ISICOM: Couldn't allocate page for tmp_buf.\n");
-#else
-                       printk(KERN_ERR "ISICOM: Not enough memory...\n");
-#endif
-                       return 0;
+               if ((status = inw(base + 0x4)) != 0) {
+                       dev_err(&pdev->dev, "Card%d got out of sync.Card "
+                               "Status:0x%x\n", index + 1, status);
+                       goto errrelfw;
                }
-               tmp_buf = (unsigned char *) page;
-       }
+       }
+
+/* XXX: should we test it by reading it back and comparing with original like
+ * in load firmware package? */
+       for (frame = (struct stframe *)fw->data;
+                       frame < (struct stframe *)(fw->data + fw->size);
+                       frame = (struct stframe *)((u8 *)(frame + 1) +
+                               frame->count)) {
+               if (WaitTillCardIsFree(base))
+                       goto errrelfw;
+
+               outw(0xf1, base); /* start download sequence */
+               outw(0x00, base);
+               outw(frame->addr, base); /* lsb of address */
+
+               word_count = (frame->count >> 1) + frame->count % 2;
+               outw(word_count + 1, base);
+               InterruptTheCard(base);
 
-       if (!register_ioregion())
-       {
-               printk(KERN_ERR "ISICOM: All required I/O space found busy.\n");
-               free_page((unsigned long)tmp_buf);
-               return 0;
-       }
-       if (register_drivers())
-       {
-               unregister_ioregion();
-               free_page((unsigned long)tmp_buf);
-               return 0;
-       }
-       if (!register_isr())
-       {
-               unregister_drivers();
-               /*  ioports already uregistered in register_isr */
-               free_page((unsigned long)tmp_buf);
-               return 0;
-       }
+               udelay(50); /* 0xf */
 
-       memset(isi_ports, 0, sizeof(isi_ports));
-       for (card = 0; card < BOARD_COUNT; card++) {
-               port = &isi_ports[card * 16];
-               isi_card[card].ports = port;
-               spin_lock_init(&isi_card[card].card_lock);
-               base = isi_card[card].base;
-               for (channel = 0; channel < 16; channel++, port++) {
-                       port->magic = ISICOM_MAGIC;
-                       port->card = &isi_card[card];
-                       port->channel = channel;
-                       port->close_delay = 50 * HZ/100;
-                       port->closing_wait = 3000 * HZ/100;
-                       INIT_WORK(&port->hangup_tq, do_isicom_hangup, port);
-                       INIT_WORK(&port->bh_tqueue, isicom_bottomhalf, port);
-                       port->status = 0;
-                       init_waitqueue_head(&port->open_wait);
-                       init_waitqueue_head(&port->close_wait);
-                       /*  . . .  */
+               if (WaitTillCardIsFree(base))
+                       goto errrelfw;
+
+               if ((status = inw(base + 0x4)) != 0) {
+                       dev_warn(&pdev->dev, "Card%d rejected verify header:\n"
+                               "Address:0x%x\nCount:0x%x\nStatus: 0x%x\n",
+                               index + 1, frame->addr, frame->count, status);
+                       goto errrelfw;
+               }
+
+               data = kmalloc(word_count * 2, GFP_KERNEL);
+               inw(base);
+               insw(base, data, word_count);
+               InterruptTheCard(base);
+
+               for (a = 0; a < frame->count; a++)
+                       if (data[a] != frame->data[a]) {
+                               kfree(data);
+                               dev_err(&pdev->dev, "Card%d, firmware upload "
+                                       "failed\n", index + 1);
+                               goto errrelfw;
+                       }
+               kfree(data);
+
+               udelay(50); /* 0xf */
+
+               if (WaitTillCardIsFree(base))
+                       goto errrelfw;
+
+               if ((status = inw(base + 0x4)) != 0) {
+                       dev_err(&pdev->dev, "Card%d verify got out of sync. "
+                               "Card Status:0x%x\n", index + 1, status);
+                       goto errrelfw;
                }
        }
 
-       return 1;
+       /* xfer ctrl */
+       if (WaitTillCardIsFree(base))
+               goto errrelfw;
+
+       outw(0xf2, base);
+       outw(0x800, base);
+       outw(0x0, base);
+       outw(0x0, base);
+       InterruptTheCard(base);
+       outw(0x0, base + 0x4); /* for ISI4608 cards */
+
+       board->status |= FIRMWARE_LOADED;
+       retval = 0;
+
+errrelfw:
+       release_firmware(fw);
+end:
+       return retval;
 }
 
 /*
  *     Insmod can set static symbols so keep these static
  */
+static int card;
 
-static int io[4];
-static int irq[4];
+static int __devinit isicom_probe(struct pci_dev *pdev,
+       const struct pci_device_id *ent)
+{
+       unsigned int ioaddr, signature, index;
+       int retval = -EPERM;
+       u8 pciirq;
+       struct isi_board *board = NULL;
+
+       if (card >= BOARD_COUNT)
+               goto err;
+
+       ioaddr = pci_resource_start(pdev, 3);
+       /* i.e at offset 0x1c in the PCI configuration register space. */
+       pciirq = pdev->irq;
+       dev_info(&pdev->dev, "ISI PCI Card(Device ID 0x%x)\n", ent->device);
+
+       /* allot the first empty slot in the array */
+       for (index = 0; index < BOARD_COUNT; index++)
+               if (isi_card[index].base == 0) {
+                       board = &isi_card[index];
+                       break;
+               }
 
-MODULE_AUTHOR("MultiTech");
-MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech");
-MODULE_LICENSE("GPL");
-module_param_array(io, int, NULL, 0);
-MODULE_PARM_DESC(io, "I/O ports for the cards");
-module_param_array(irq, int, NULL, 0);
-MODULE_PARM_DESC(irq, "Interrupts for the cards");
+       board->base = ioaddr;
+       board->irq = pciirq;
+       card++;
 
-static int __devinit isicom_setup(void)
-{
-       struct pci_dev *dev = NULL;
-       int retval, card, idx, count;
-       unsigned char pciirq;
-       unsigned int ioaddr;
+       pci_set_drvdata(pdev, board);
 
-       card = 0;
-       for (idx=0; idx < BOARD_COUNT; idx++) {
-               if (io[idx]) {
-                       isi_card[idx].base=io[idx];
-                       isi_card[idx].irq=irq[idx];
-                       isi_card[idx].isa=YES;
-                       card++;
-               }
-               else {
-                       isi_card[idx].base = 0;
-                       isi_card[idx].irq = 0;
-               }
-       }
+       if (!request_region(board->base, 16, ISICOM_NAME)) {
+               dev_err(&pdev->dev, "I/O Region 0x%lx-0x%lx is busy. Card%d "
+                       "will be disabled.\n", board->base, board->base + 15,
+                       index + 1);
+               retval = -EBUSY;
+               goto err;
+       }
 
-       for (idx=0 ;idx < card; idx++) {
-               if (!((isi_card[idx].irq==2)||(isi_card[idx].irq==3)||
-                       (isi_card[idx].irq==4)||(isi_card[idx].irq==5)||
-                       (isi_card[idx].irq==7)||(isi_card[idx].irq==10)||
-                       (isi_card[idx].irq==11)||(isi_card[idx].irq==12)||
-                       (isi_card[idx].irq==15))) {
-
-                       if (isi_card[idx].base) {
-                               printk(KERN_ERR "ISICOM: Irq %d unsupported. Disabling Card%d...\n",
-                                       isi_card[idx].irq, idx+1);
-                               isi_card[idx].base=0;
-                               card--;
-                       }
-               }
+       retval = request_irq(board->irq, isicom_interrupt,
+                       IRQF_SHARED | IRQF_DISABLED, ISICOM_NAME, board);
+       if (retval < 0) {
+               dev_err(&pdev->dev, "Could not install handler at Irq %d. "
+                       "Card%d will be disabled.\n", board->irq, index + 1);
+               goto errunrr;
        }
 
-       if (card < BOARD_COUNT) {
-               for (idx=0; idx < DEVID_COUNT; idx++) {
-                       dev = NULL;
-                       for (;;){
-                               if (!(dev = pci_find_device(VENDOR_ID, isicom_pci_tbl[idx].device, dev)))
-                                       break;
-                               if (card >= BOARD_COUNT)
-                                       break;
+       retval = reset_card(pdev, index, &signature);
+       if (retval < 0)
+               goto errunri;
 
-                               if (pci_enable_device(dev))
-                                       break;
+       retval = load_firmware(pdev, index, signature);
+       if (retval < 0)
+               goto errunri;
 
-                               /* found a PCI ISI card! */
-                               ioaddr = pci_resource_start (dev, 3);
-                               /* i.e at offset 0x1c in the
-                                * PCI configuration register
-                                * space.
-                                */
-                               pciirq = dev->irq;
-                               printk(KERN_INFO "ISI PCI Card(Device ID 0x%x)\n", isicom_pci_tbl[idx].device);
-                               /*
-                                * allot the first empty slot in the array
-                                */
-                               for (count=0; count < BOARD_COUNT; count++) {
-                                       if (isi_card[count].base == 0) {
-                                               isi_card[count].base = ioaddr;
-                                               isi_card[count].irq = pciirq;
-                                               isi_card[count].isa = NO;
-                                               card++;
-                                               break;
-                                       }
-                               }
-                       }
-                       if (card >= BOARD_COUNT) break;
-               }
+       return 0;
+
+errunri:
+       free_irq(board->irq, board);
+errunrr:
+       release_region(board->base, 16);
+err:
+       board->base = 0;
+       return retval;
+}
+
+static void __devexit isicom_remove(struct pci_dev *pdev)
+{
+       struct isi_board *board = pci_get_drvdata(pdev);
+
+       free_irq(board->irq, board);
+       release_region(board->base, 16);
+}
+
+static int __init isicom_init(void)
+{
+       int retval, idx, channel;
+       struct isi_port *port;
+
+       card = 0;
+
+       for(idx = 0; idx < BOARD_COUNT; idx++) {
+               port = &isi_ports[idx * 16];
+               isi_card[idx].ports = port;
+               spin_lock_init(&isi_card[idx].card_lock);
+               for (channel = 0; channel < 16; channel++, port++) {
+                       port->magic = ISICOM_MAGIC;
+                       port->card = &isi_card[idx];
+                       port->channel = channel;
+                       port->close_delay = 50 * HZ/100;
+                       port->closing_wait = 3000 * HZ/100;
+                       INIT_WORK(&port->hangup_tq, do_isicom_hangup);
+                       INIT_WORK(&port->bh_tqueue, isicom_bottomhalf);
+                       port->status = 0;
+                       init_waitqueue_head(&port->open_wait);
+                       init_waitqueue_head(&port->close_wait);
+                       /*  . . .  */
+               }
+               isi_card[idx].base = 0;
+               isi_card[idx].irq = 0;
        }
 
-       if (!(isi_card[0].base || isi_card[1].base || isi_card[2].base || isi_card[3].base)) {
-               printk(KERN_ERR "ISICOM: No valid card configuration. Driver cannot be initialized...\n");
-               return -EIO;
+       /* tty driver structure initialization */
+       isicom_normal = alloc_tty_driver(PORT_COUNT);
+       if (!isicom_normal) {
+               retval = -ENOMEM;
+               goto error;
        }
 
-       retval = misc_register(&isiloader_device);
-       if (retval < 0) {
-               printk(KERN_ERR "ISICOM: Unable to register firmware loader driver.\n");
-               return retval;
+       isicom_normal->owner                    = THIS_MODULE;
+       isicom_normal->name                     = "ttyM";
+       isicom_normal->major                    = ISICOM_NMAJOR;
+       isicom_normal->minor_start              = 0;
+       isicom_normal->type                     = TTY_DRIVER_TYPE_SERIAL;
+       isicom_normal->subtype                  = SERIAL_TYPE_NORMAL;
+       isicom_normal->init_termios             = tty_std_termios;
+       isicom_normal->init_termios.c_cflag     = B9600 | CS8 | CREAD | HUPCL |
+               CLOCAL;
+       isicom_normal->flags                    = TTY_DRIVER_REAL_RAW;
+       tty_set_operations(isicom_normal, &isicom_ops);
+
+       retval = tty_register_driver(isicom_normal);
+       if (retval) {
+               pr_dbg("Couldn't register the dialin driver\n");
+               goto err_puttty;
        }
 
-       if (!isicom_init()) {
-               if (misc_deregister(&isiloader_device))
-                       printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n");
-               return -EIO;
+       retval = pci_register_driver(&isicom_driver);
+       if (retval < 0) {
+               printk(KERN_ERR "ISICOM: Unable to register pci driver.\n");
+               goto err_unrtty;
        }
 
        init_timer(&tx);
@@ -2043,21 +1897,31 @@ static int __devinit isicom_setup(void)
        add_timer(&tx);
 
        return 0;
+err_unrtty:
+       tty_unregister_driver(isicom_normal);
+err_puttty:
+       put_tty_driver(isicom_normal);
+error:
+       return retval;
 }
 
 static void __exit isicom_exit(void)
 {
+       unsigned int index = 0;
+
        re_schedule = 0;
-       /* FIXME */
-       msleep(1000);
-       unregister_isr();
-       unregister_drivers();
-       unregister_ioregion();
-       if (tmp_buf)
-               free_page((unsigned long)tmp_buf);
-       if (misc_deregister(&isiloader_device))
-               printk(KERN_ERR "ISICOM: Unable to unregister Firmware Loader driver\n");
+
+       while (re_schedule != 2 && index++ < 100)
+               msleep(10);
+
+       pci_unregister_driver(&isicom_driver);
+       tty_unregister_driver(isicom_normal);
+       put_tty_driver(isicom_normal);
 }
 
-module_init(isicom_setup);
+module_init(isicom_init);
 module_exit(isicom_exit);
+
+MODULE_AUTHOR("MultiTech");
+MODULE_DESCRIPTION("Driver for the ISI series of cards by MultiTech");
+MODULE_LICENSE("GPL");