Staging: comedi: add ni_pcidio driver
authorDavid Schleef <ds@schleef.org>
Thu, 19 Feb 2009 17:47:26 +0000 (09:47 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 3 Apr 2009 21:53:49 +0000 (14:53 -0700)
Driver for National Instruments PCI-DIO-96/PCI-6508, PCI-DIO-32HS, and
PCI-6503 cards.

From: David Schleef <ds@schleef.org>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/comedi/drivers/ni_pcidio.c [new file with mode: 0644]

diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
new file mode 100644 (file)
index 0000000..a3e1221
--- /dev/null
@@ -0,0 +1,1300 @@
+/*
+    comedi/drivers/ni_pcidio.c
+    driver for National Instruments PCI-DIO-96/PCI-6508
+               National Instruments PCI-DIO-32HS
+               National Instruments PCI-6503
+
+    COMEDI - Linux Control and Measurement Device Interface
+    Copyright (C) 1999,2002 David A. Schleef <ds@schleef.org>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+/*
+Driver: ni_pcidio
+Description: National Instruments PCI-DIO32HS, PCI-DIO96, PCI-6533, PCI-6503
+Author: ds
+Status: works
+Devices: [National Instruments] PCI-DIO-32HS (ni_pcidio), PXI-6533,
+  PCI-DIO-96, PCI-DIO-96B, PXI-6508, PCI-6503, PCI-6503B, PCI-6503X,
+  PXI-6503, PCI-6533, PCI-6534
+Updated: Sun, 21 Apr 2002 21:03:38 -0700
+
+The DIO-96 appears as four 8255 subdevices.  See the 8255
+driver notes for details.
+
+The DIO32HS board appears as one subdevice, with 32 channels.
+Each channel is individually I/O configurable.  The channel order
+is 0=A0, 1=A1, 2=A2, ... 8=B0, 16=C0, 24=D0.  The driver only
+supports simple digital I/O; no handshaking is supported.
+
+DMA mostly works for the PCI-DIO32HS, but only in timed input mode.
+
+This driver could be easily modified to support AT-MIO32HS and
+AT-MIO96.
+
+The PCI-6534 requires a firmware upload after power-up to work, the
+firmware data and instructions for loading it with comedi_config
+it are contained in the
+comedi_nonfree_firmware tarball available from http://www.comedi.org
+*/
+
+/*
+   This driver is for both the NI PCI-DIO-32HS and the PCI-DIO-96,
+   which have very different architectures.  But, since the '96 is
+   so simple, it is included here.
+
+   Manuals (available from ftp://ftp.natinst.com/support/manuals)
+
+       320938c.pdf     PCI-DIO-96/PXI-6508/PCI-6503 User Manual
+       321464b.pdf     AT/PCI-DIO-32HS User Manual
+       341329A.pdf     PCI-6533 Register-Level Programmer Manual
+       341330A.pdf     DAQ-DIO Technical Reference Manual
+
+ */
+
+#define USE_DMA
+//#define DEBUG 1
+//#define DEBUG_FLAGS
+
+#include "../comedidev.h"
+
+#include "mite.h"
+#include "8255.h"
+
+#undef DPRINTK
+#ifdef DEBUG
+#define DPRINTK(format, args...)       printk(format, ## args)
+#else
+#define DPRINTK(format, args...)
+#endif
+
+#define PCI_VENDOR_ID_NATINST  0x1093
+
+#define PCI_DIO_SIZE 4096
+#define PCI_MITE_SIZE 4096
+
+/* defines for the PCI-DIO-96 */
+
+#define NIDIO_8255_BASE(x)     ((x)*4)
+#define NIDIO_A 0
+#define NIDIO_B 4
+#define NIDIO_C 8
+#define NIDIO_D 12
+
+/* defines for the PCI-DIO-32HS */
+
+#define Window_Address                 4       /* W */
+#define Interrupt_And_Window_Status    4       /* R */
+#define IntStatus1                             (1<<0)
+#define IntStatus2                             (1<<1)
+#define WindowAddressStatus_mask               0x7c
+
+#define Master_DMA_And_Interrupt_Control 5     /* W */
+#define InterruptLine(x)                       ((x)&3)
+#define OpenInt                                (1<<2)
+#define Group_Status                   5       /* R */
+#define DataLeft                               (1<<0)
+#define Req                                    (1<<2)
+#define StopTrig                               (1<<3)
+
+#define Group_1_Flags                  6       /* R */
+#define Group_2_Flags                  7       /* R */
+#define TransferReady                          (1<<0)
+#define CountExpired                           (1<<1)
+#define Waited                         (1<<5)
+#define PrimaryTC                              (1<<6)
+#define SecondaryTC                            (1<<7)
+  //#define SerialRose
+  //#define ReqRose
+  //#define Paused
+
+#define Group_1_First_Clear            6       /* W */
+#define Group_2_First_Clear            7       /* W */
+#define ClearWaited                            (1<<3)
+#define ClearPrimaryTC                 (1<<4)
+#define ClearSecondaryTC                       (1<<5)
+#define DMAReset                               (1<<6)
+#define FIFOReset                              (1<<7)
+#define ClearAll                               0xf8
+
+#define Group_1_FIFO                   8       /* W */
+#define Group_2_FIFO                   12      /* W */
+
+#define Transfer_Count                 20
+#define Chip_ID_D                      24
+#define Chip_ID_I                      25
+#define Chip_ID_O                      26
+#define Chip_Version                   27
+#define Port_IO(x)                     (28+(x))
+#define Port_Pin_Directions(x)         (32+(x))
+#define Port_Pin_Mask(x)               (36+(x))
+#define Port_Pin_Polarities(x)         (40+(x))
+
+#define Master_Clock_Routing           45
+#define RTSIClocking(x)                        (((x)&3)<<4)
+
+#define Group_1_Second_Clear           46      /* W */
+#define Group_2_Second_Clear           47      /* W */
+#define ClearExpired                           (1<<0)
+
+#define Port_Pattern(x)                        (48+(x))
+
+#define Data_Path                      64
+#define FIFOEnableA            (1<<0)
+#define FIFOEnableB            (1<<1)
+#define FIFOEnableC            (1<<2)
+#define FIFOEnableD            (1<<3)
+#define Funneling(x)           (((x)&3)<<4)
+#define GroupDirection (1<<7)
+
+#define Protocol_Register_1            65
+#define OpMode                         Protocol_Register_1
+#define RunMode(x)             ((x)&7)
+#define Numbered               (1<<3)
+
+#define Protocol_Register_2            66
+#define ClockReg                       Protocol_Register_2
+#define ClockLine(x)           (((x)&3)<<5)
+#define InvertStopTrig (1<<7)
+#define DataLatching(x)       (((x)&3)<<5)
+
+#define Protocol_Register_3            67
+#define Sequence                       Protocol_Register_3
+
+#define Protocol_Register_14           68      /* 16 bit */
+#define ClockSpeed                     Protocol_Register_14
+
+#define Protocol_Register_4            70
+#define ReqReg                         Protocol_Register_4
+#define ReqConditioning(x)     (((x)&7)<<3)
+
+#define Protocol_Register_5            71
+#define BlockMode                      Protocol_Register_5
+
+#define FIFO_Control                   72
+#define ReadyLevel(x)          ((x)&7)
+
+#define Protocol_Register_6            73
+#define LinePolarities                 Protocol_Register_6
+#define InvertAck              (1<<0)
+#define InvertReq              (1<<1)
+#define InvertClock            (1<<2)
+#define InvertSerial           (1<<3)
+#define OpenAck                (1<<4)
+#define OpenClock              (1<<5)
+
+#define Protocol_Register_7            74
+#define AckSer                         Protocol_Register_7
+#define AckLine(x)             (((x)&3)<<2)
+#define ExchangePins           (1<<7)
+
+#define Interrupt_Control              75
+  /* bits same as flags */
+
+#define DMA_Line_Control_Group1                76
+#define DMA_Line_Control_Group2                108
+// channel zero is none
+static inline unsigned primary_DMAChannel_bits(unsigned channel)
+{
+       return channel & 0x3;
+}
+static inline unsigned secondary_DMAChannel_bits(unsigned channel)
+{
+       return (channel << 2) & 0xc;
+}
+
+#define Transfer_Size_Control          77
+#define TransferWidth(x)       ((x)&3)
+#define TransferLength(x)      (((x)&3)<<3)
+#define RequireRLevel          (1<<5)
+
+#define Protocol_Register_15           79
+#define DAQOptions                     Protocol_Register_15
+#define StartSource(x)                 ((x)&0x3)
+#define InvertStart                            (1<<2)
+#define StopSource(x)                          (((x)&0x3)<<3)
+#define ReqStart                               (1<<6)
+#define PreStart                               (1<<7)
+
+#define Pattern_Detection              81
+#define DetectionMethod                        (1<<0)
+#define InvertMatch                            (1<<1)
+#define IE_Pattern_Detection                   (1<<2)
+
+#define Protocol_Register_9            82
+#define ReqDelay                       Protocol_Register_9
+
+#define Protocol_Register_10           83
+#define ReqNotDelay                    Protocol_Register_10
+
+#define Protocol_Register_11           84
+#define AckDelay                       Protocol_Register_11
+
+#define Protocol_Register_12           85
+#define AckNotDelay                    Protocol_Register_12
+
+#define Protocol_Register_13           86
+#define Data1Delay                     Protocol_Register_13
+
+#define Protocol_Register_8            88      /* 32 bit */
+#define StartDelay                     Protocol_Register_8
+
+enum pci_6534_firmware_registers {     /* 16 bit */
+       Firmware_Control_Register = 0x100,
+       Firmware_Status_Register = 0x104,
+       Firmware_Data_Register = 0x108,
+       Firmware_Mask_Register = 0x10c,
+       Firmware_Debug_Register = 0x110,
+};
+/* main fpga registers (32 bit)*/
+enum pci_6534_fpga_registers {
+       FPGA_Control1_Register = 0x200,
+       FPGA_Control2_Register = 0x204,
+       FPGA_Irq_Mask_Register = 0x208,
+       FPGA_Status_Register = 0x20c,
+       FPGA_Signature_Register = 0x210,
+       FPGA_SCALS_Counter_Register = 0x280,    /*write-clear */
+       FPGA_SCAMS_Counter_Register = 0x284,    /*write-clear */
+       FPGA_SCBLS_Counter_Register = 0x288,    /*write-clear */
+       FPGA_SCBMS_Counter_Register = 0x28c,    /*write-clear */
+       FPGA_Temp_Control_Register = 0x2a0,
+       FPGA_DAR_Register = 0x2a8,
+       FPGA_ELC_Read_Register = 0x2b8,
+       FPGA_ELC_Write_Register = 0x2bc,
+};
+enum FPGA_Control_Bits {
+       FPGA_Enable_Bit = 0x8000,
+};
+
+#define TIMER_BASE 50          /* nanoseconds */
+
+#ifdef USE_DMA
+#define IntEn (CountExpired|Waited|PrimaryTC|SecondaryTC)
+#else
+#define IntEn (TransferReady|CountExpired|Waited|PrimaryTC|SecondaryTC)
+#endif
+
+static int nidio_attach(comedi_device * dev, comedi_devconfig * it);
+static int nidio_detach(comedi_device * dev);
+static int ni_pcidio_cancel(comedi_device * dev, comedi_subdevice * s);
+
+static comedi_driver driver_pcidio = {
+      driver_name:"ni_pcidio",
+      module:THIS_MODULE,
+      attach:nidio_attach,
+      detach:nidio_detach,
+};
+
+typedef struct {
+       int dev_id;
+       const char *name;
+       int n_8255;
+       unsigned int is_diodaq:1;
+       unsigned int uses_firmware:1;
+} nidio_board;
+static const nidio_board nidio_boards[] = {
+       {
+             dev_id:   0x1150,
+             name:     "pci-dio-32hs",
+             n_8255:   0,
+             is_diodaq:1,
+               },
+       {
+             dev_id:   0x1320,
+             name:     "pxi-6533",
+             n_8255:   0,
+             is_diodaq:1,
+               },
+       {
+             dev_id:   0x12b0,
+             name:     "pci-6534",
+             n_8255:   0,
+             is_diodaq:1,
+             uses_firmware:1,
+               },
+       {
+             dev_id:   0x0160,
+             name:     "pci-dio-96",
+             n_8255:   4,
+             is_diodaq:0,
+               },
+       {
+             dev_id:   0x1630,
+             name:     "pci-dio-96b",
+             n_8255:   4,
+             is_diodaq:0,
+               },
+       {
+             dev_id:   0x13c0,
+             name:     "pxi-6508",
+             n_8255:   4,
+             is_diodaq:0,
+               },
+       {
+             dev_id:   0x0400,
+             name:     "pci-6503",
+             n_8255:   1,
+             is_diodaq:0,
+               },
+       {
+             dev_id:   0x1250,
+             name:     "pci-6503b",
+             n_8255:   1,
+             is_diodaq:0,
+               },
+       {
+             dev_id:   0x17d0,
+             name:     "pci-6503x",
+             n_8255:   1,
+             is_diodaq:0,
+               },
+       {
+             dev_id:   0x1800,
+             name:     "pxi-6503",
+             n_8255:   1,
+             is_diodaq:0,
+               },
+};
+
+#define n_nidio_boards (sizeof(nidio_boards)/sizeof(nidio_boards[0]))
+#define this_board ((const nidio_board *)dev->board_ptr)
+
+static DEFINE_PCI_DEVICE_TABLE(ni_pcidio_pci_table) = {
+       {PCI_VENDOR_ID_NATINST, 0x1150, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {PCI_VENDOR_ID_NATINST, 0x1320, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {PCI_VENDOR_ID_NATINST, 0x12b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {PCI_VENDOR_ID_NATINST, 0x0160, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {PCI_VENDOR_ID_NATINST, 0x1630, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {PCI_VENDOR_ID_NATINST, 0x13c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {PCI_VENDOR_ID_NATINST, 0x0400, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {PCI_VENDOR_ID_NATINST, 0x1250, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {PCI_VENDOR_ID_NATINST, 0x17d0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {PCI_VENDOR_ID_NATINST, 0x1800, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+       {0}
+};
+
+MODULE_DEVICE_TABLE(pci, ni_pcidio_pci_table);
+
+typedef struct {
+       struct mite_struct *mite;
+       int boardtype;
+       int dio;
+       unsigned short OpModeBits;
+       struct mite_channel *di_mite_chan;
+       struct mite_dma_descriptor_ring *di_mite_ring;
+       spinlock_t mite_channel_lock;
+} nidio96_private;
+#define devpriv ((nidio96_private *)dev->private)
+
+static int ni_pcidio_cmdtest(comedi_device * dev, comedi_subdevice * s,
+       comedi_cmd * cmd);
+static int ni_pcidio_cmd(comedi_device * dev, comedi_subdevice * s);
+static int ni_pcidio_inttrig(comedi_device * dev, comedi_subdevice * s,
+       unsigned int trignum);
+static int nidio_find_device(comedi_device * dev, int bus, int slot);
+static int ni_pcidio_ns_to_timer(int *nanosec, int round_mode);
+static int setup_mite_dma(comedi_device * dev, comedi_subdevice * s);
+
+#ifdef DEBUG_FLAGS
+static void ni_pcidio_print_flags(unsigned int flags);
+static void ni_pcidio_print_status(unsigned int status);
+#else
+#define ni_pcidio_print_flags(x)
+#define ni_pcidio_print_status(x)
+#endif
+
+static int ni_pcidio_request_di_mite_channel(comedi_device * dev)
+{
+       unsigned long flags;
+
+       comedi_spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
+       BUG_ON(devpriv->di_mite_chan);
+       devpriv->di_mite_chan =
+               mite_request_channel_in_range(devpriv->mite,
+               devpriv->di_mite_ring, 1, 2);
+       if (devpriv->di_mite_chan == NULL) {
+               comedi_spin_unlock_irqrestore(&devpriv->mite_channel_lock,
+                       flags);
+               comedi_error(dev, "failed to reserve mite dma channel.");
+               return -EBUSY;
+       }
+       writeb(primary_DMAChannel_bits(devpriv->di_mite_chan->channel) |
+               secondary_DMAChannel_bits(devpriv->di_mite_chan->channel),
+               devpriv->mite->daq_io_addr + DMA_Line_Control_Group1);
+       mmiowb();
+       comedi_spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
+       return 0;
+}
+
+static void ni_pcidio_release_di_mite_channel(comedi_device * dev)
+{
+       unsigned long flags;
+
+       comedi_spin_lock_irqsave(&devpriv->mite_channel_lock, flags);
+       if (devpriv->di_mite_chan) {
+               mite_dma_disarm(devpriv->di_mite_chan);
+               mite_dma_reset(devpriv->di_mite_chan);
+               mite_release_channel(devpriv->di_mite_chan);
+               devpriv->di_mite_chan = NULL;
+               writeb(primary_DMAChannel_bits(0) |
+                       secondary_DMAChannel_bits(0),
+                       devpriv->mite->daq_io_addr + DMA_Line_Control_Group1);
+               mmiowb();
+       }
+       comedi_spin_unlock_irqrestore(&devpriv->mite_channel_lock, flags);
+}
+
+static int nidio96_8255_cb(int dir, int port, int data, unsigned long iobase)
+{
+       if (dir) {
+               writeb(data, (void *)(iobase + port));
+               return 0;
+       } else {
+               return readb((void *)(iobase + port));
+       }
+}
+
+void ni_pcidio_event(comedi_device * dev, comedi_subdevice * s)
+{
+       if (s->async->
+               events & (COMEDI_CB_EOA | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW))
+       {
+               ni_pcidio_cancel(dev, s);
+       }
+       comedi_event(dev, s);
+}
+
+static irqreturn_t nidio_interrupt(int irq, void *d PT_REGS_ARG)
+{
+       comedi_device *dev = d;
+       comedi_subdevice *s = dev->subdevices;
+       comedi_async *async = s->async;
+       struct mite_struct *mite = devpriv->mite;
+
+       //int i, j;
+       long int AuxData = 0;
+       sampl_t data1 = 0;
+       sampl_t data2 = 0;
+       int flags;
+       int status;
+       int work = 0;
+       unsigned int m_status = 0;
+       unsigned long irq_flags;
+
+       //interrupcions parasites
+       if (dev->attached == 0) {
+               // assume it's from another card
+               return IRQ_NONE;
+       }
+
+       status = readb(devpriv->mite->daq_io_addr +
+               Interrupt_And_Window_Status);
+       flags = readb(devpriv->mite->daq_io_addr + Group_1_Flags);
+
+       DPRINTK("ni_pcidio_interrupt: status=0x%02x,flags=0x%02x\n",
+               status, flags);
+       ni_pcidio_print_flags(flags);
+       ni_pcidio_print_status(status);
+
+       //printk("buf[0]=%08x\n",*(unsigned int *)async->prealloc_buf);
+       //printk("buf[4096]=%08x\n",*(unsigned int *)(async->prealloc_buf+4096));
+
+       comedi_spin_lock_irqsave(&devpriv->mite_channel_lock, irq_flags);
+       if (devpriv->di_mite_chan)
+               m_status = mite_get_status(devpriv->di_mite_chan);
+#ifdef MITE_DEBUG
+       mite_print_chsr(m_status);
+#endif
+       //printk("mite_bytes_transferred: %d\n",mite_bytes_transferred(mite,DI_DMA_CHAN));
+       //mite_dump_regs(mite);
+       if (m_status & CHSR_INT) {
+               if (m_status & CHSR_LINKC) {
+                       writel(CHOR_CLRLC,
+                               mite->mite_io_addr +
+                               MITE_CHOR(devpriv->di_mite_chan->channel));
+                       mite_sync_input_dma(devpriv->di_mite_chan, s->async);
+                       /* XXX need to byteswap */
+               }
+               if (m_status & ~(CHSR_INT | CHSR_LINKC | CHSR_DONE | CHSR_DRDY |
+                               CHSR_DRQ1 | CHSR_MRDY)) {
+                       DPRINTK("unknown mite interrupt, disabling IRQ\n");
+                       async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
+                       disable_irq(dev->irq);
+               }
+       }
+       comedi_spin_unlock_irqrestore(&devpriv->mite_channel_lock, irq_flags);
+
+       while (status & DataLeft) {
+               work++;
+               if (work > 20) {
+                       DPRINTK("too much work in interrupt\n");
+                       writeb(0x00,
+                               devpriv->mite->daq_io_addr +
+                               Master_DMA_And_Interrupt_Control);
+                       break;
+               }
+
+               flags &= IntEn;
+
+               if (flags & TransferReady) {
+                       //DPRINTK("TransferReady\n");
+                       while (flags & TransferReady) {
+                               work++;
+                               if (work > 100) {
+                                       DPRINTK("too much work in interrupt\n");
+                                       writeb(0x00,
+                                               devpriv->mite->daq_io_addr +
+                                               Master_DMA_And_Interrupt_Control);
+                                       goto out;
+                               }
+                               AuxData =
+                                       readl(devpriv->mite->daq_io_addr +
+                                       Group_1_FIFO);
+                               data1 = AuxData & 0xffff;
+                               data2 = (AuxData & 0xffff0000) >> 16;
+                               comedi_buf_put(async, data1);
+                               comedi_buf_put(async, data2);
+                               //DPRINTK("read:%d, %d\n",data1,data2);
+                               flags = readb(devpriv->mite->daq_io_addr +
+                                       Group_1_Flags);
+                       }
+                       //DPRINTK("buf_int_count: %d\n",async->buf_int_count);
+                       //DPRINTK("1) IntEn=%d,flags=%d,status=%d\n",IntEn,flags,status);
+                       //ni_pcidio_print_flags(flags);
+                       //ni_pcidio_print_status(status);
+                       async->events |= COMEDI_CB_BLOCK;
+               }
+
+               if (flags & CountExpired) {
+                       DPRINTK("CountExpired\n");
+                       writeb(ClearExpired,
+                               devpriv->mite->daq_io_addr +
+                               Group_1_Second_Clear);
+                       async->events |= COMEDI_CB_EOA;
+
+                       writeb(0x00, devpriv->mite->daq_io_addr + OpMode);
+                       break;
+               } else if (flags & Waited) {
+                       DPRINTK("Waited\n");
+                       writeb(ClearWaited,
+                               devpriv->mite->daq_io_addr +
+                               Group_1_First_Clear);
+                       async->events |= COMEDI_CB_EOA | COMEDI_CB_ERROR;
+                       break;
+               } else if (flags & PrimaryTC) {
+                       DPRINTK("PrimaryTC\n");
+                       writeb(ClearPrimaryTC,
+                               devpriv->mite->daq_io_addr +
+                               Group_1_First_Clear);
+                       async->events |= COMEDI_CB_EOA;
+               } else if (flags & SecondaryTC) {
+                       DPRINTK("SecondaryTC\n");
+                       writeb(ClearSecondaryTC,
+                               devpriv->mite->daq_io_addr +
+                               Group_1_First_Clear);
+                       async->events |= COMEDI_CB_EOA;
+               }
+#if 0
+               else {
+                       printk("ni_pcidio: unknown interrupt\n");
+                       async->events |= COMEDI_CB_ERROR | COMEDI_CB_EOA;
+                       writeb(0x00,
+                               devpriv->mite->daq_io_addr +
+                               Master_DMA_And_Interrupt_Control);
+               }
+#endif
+               flags = readb(devpriv->mite->daq_io_addr + Group_1_Flags);
+               status = readb(devpriv->mite->daq_io_addr +
+                       Interrupt_And_Window_Status);
+               //DPRINTK("loop end: IntEn=0x%02x,flags=0x%02x,status=0x%02x\n",
+               //      IntEn,flags,status);
+               //ni_pcidio_print_flags(flags);
+               //ni_pcidio_print_status(status);
+       }
+
+      out:
+       ni_pcidio_event(dev, s);
+#if 0
+       if (!tag) {
+               writeb(0x03,
+                       devpriv->mite->daq_io_addr +
+                       Master_DMA_And_Interrupt_Control);
+       }
+#endif
+       return IRQ_HANDLED;
+}
+
+#ifdef DEBUG_FLAGS
+static const char *const flags_strings[] = {
+       "TransferReady", "CountExpired", "2", "3",
+       "4", "Waited", "PrimaryTC", "SecondaryTC",
+};
+static void ni_pcidio_print_flags(unsigned int flags)
+{
+       int i;
+
+       printk("group_1_flags:");
+       for (i = 7; i >= 0; i--) {
+               if (flags & (1 << i)) {
+                       printk(" %s", flags_strings[i]);
+               }
+       }
+       printk("\n");
+}
+static char *status_strings[] = {
+       "DataLeft1", "Reserved1", "Req1", "StopTrig1",
+       "DataLeft2", "Reserved2", "Req2", "StopTrig2",
+};
+static void ni_pcidio_print_status(unsigned int flags)
+{
+       int i;
+
+       printk("group_status:");
+       for (i = 7; i >= 0; i--) {
+               if (flags & (1 << i)) {
+                       printk(" %s", status_strings[i]);
+               }
+       }
+       printk("\n");
+}
+#endif
+
+#ifdef unused
+static void debug_int(comedi_device * dev)
+{
+       int a, b;
+       static int n_int = 0;
+       struct timeval tv;
+
+       do_gettimeofday(&tv);
+       a = readb(devpriv->mite->daq_io_addr + Group_Status);
+       b = readb(devpriv->mite->daq_io_addr + Group_1_Flags);
+
+       if (n_int < 10) {
+               DPRINTK("status 0x%02x flags 0x%02x time %06d\n", a, b,
+                       (int)tv.tv_usec);
+       }
+
+       while (b & 1) {
+               writew(0xff, devpriv->mite->daq_io_addr + Group_1_FIFO);
+               b = readb(devpriv->mite->daq_io_addr + Group_1_Flags);
+       }
+
+       b = readb(devpriv->mite->daq_io_addr + Group_1_Flags);
+
+       if (n_int < 10) {
+               DPRINTK("new status 0x%02x\n", b);
+               n_int++;
+       }
+}
+#endif
+
+static int ni_pcidio_insn_config(comedi_device * dev, comedi_subdevice * s,
+       comedi_insn * insn, lsampl_t * data)
+{
+       if (insn->n != 1)
+               return -EINVAL;
+       switch (data[0]) {
+       case INSN_CONFIG_DIO_OUTPUT:
+               s->io_bits |= 1 << CR_CHAN(insn->chanspec);
+               break;
+       case INSN_CONFIG_DIO_INPUT:
+               s->io_bits &= ~(1 << CR_CHAN(insn->chanspec));
+               break;
+       case INSN_CONFIG_DIO_QUERY:
+               data[1] =
+                       (s->io_bits & (1 << CR_CHAN(insn->
+                                       chanspec))) ? COMEDI_OUTPUT :
+                       COMEDI_INPUT;
+               return insn->n;
+               break;
+       default:
+               return -EINVAL;
+       }
+       writel(s->io_bits, devpriv->mite->daq_io_addr + Port_Pin_Directions(0));
+
+       return 1;
+}
+
+static int ni_pcidio_insn_bits(comedi_device * dev, comedi_subdevice * s,
+       comedi_insn * insn, lsampl_t * data)
+{
+       if (insn->n != 2)
+               return -EINVAL;
+       if (data[0]) {
+               s->state &= ~data[0];
+               s->state |= (data[0] & data[1]);
+               writel(s->state, devpriv->mite->daq_io_addr + Port_IO(0));
+       }
+       data[1] = readl(devpriv->mite->daq_io_addr + Port_IO(0));
+
+       return 2;
+}
+
+static int ni_pcidio_cmdtest(comedi_device * dev, comedi_subdevice * s,
+       comedi_cmd * cmd)
+{
+       int err = 0;
+       int tmp;
+
+       /* step 1: make sure trigger sources are trivially valid */
+
+       tmp = cmd->start_src;
+       cmd->start_src &= TRIG_NOW | TRIG_INT;
+       if (!cmd->start_src || tmp != cmd->start_src)
+               err++;
+
+       tmp = cmd->scan_begin_src;
+       cmd->scan_begin_src &= TRIG_TIMER | TRIG_EXT;
+       if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src)
+               err++;
+
+       tmp = cmd->convert_src;
+       cmd->convert_src &= TRIG_NOW;
+       if (!cmd->convert_src || tmp != cmd->convert_src)
+               err++;
+
+       tmp = cmd->scan_end_src;
+       cmd->scan_end_src &= TRIG_COUNT;
+       if (!cmd->scan_end_src || tmp != cmd->scan_end_src)
+               err++;
+
+       tmp = cmd->stop_src;
+       cmd->stop_src &= TRIG_COUNT | TRIG_NONE;
+       if (!cmd->stop_src || tmp != cmd->stop_src)
+               err++;
+
+       if (err)
+               return 1;
+
+       /* step 2: make sure trigger sources are unique and mutually compatible */
+
+       /* note that mutual compatiblity is not an issue here */
+       if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_INT)
+               err++;
+       if (cmd->scan_begin_src != TRIG_TIMER &&
+               cmd->scan_begin_src != TRIG_EXT)
+               err++;
+
+       if (err)
+               return 2;
+
+       /* step 3: make sure arguments are trivially compatible */
+
+       if (cmd->start_arg != 0) {
+               /* same for both TRIG_INT and TRIG_NOW */
+               cmd->start_arg = 0;
+               err++;
+       }
+#define MAX_SPEED      (TIMER_BASE)    /* in nanoseconds */
+
+       if (cmd->scan_begin_src == TRIG_TIMER) {
+               if (cmd->scan_begin_arg < MAX_SPEED) {
+                       cmd->scan_begin_arg = MAX_SPEED;
+                       err++;
+               }
+               /* no minumum speed */
+       } else {
+               /* TRIG_EXT */
+               /* should be level/edge, hi/lo specification here */
+               if (cmd->scan_begin_arg != 0) {
+                       cmd->scan_begin_arg = 0;
+                       err++;
+               }
+       }
+       if (cmd->convert_arg != 0) {
+               cmd->convert_arg = 0;
+               err++;
+       }
+
+       if (cmd->scan_end_arg != cmd->chanlist_len) {
+               cmd->scan_end_arg = cmd->chanlist_len;
+               err++;
+       }
+       if (cmd->stop_src == TRIG_COUNT) {
+               /* no limit */
+       } else {
+               /* TRIG_NONE */
+               if (cmd->stop_arg != 0) {
+                       cmd->stop_arg = 0;
+                       err++;
+               }
+       }
+
+       if (err)
+               return 3;
+
+       /* step 4: fix up any arguments */
+
+       if (cmd->scan_begin_src == TRIG_TIMER) {
+               tmp = cmd->scan_begin_arg;
+               ni_pcidio_ns_to_timer(&cmd->scan_begin_arg,
+                       cmd->flags & TRIG_ROUND_MASK);
+               if (tmp != cmd->scan_begin_arg)
+                       err++;
+       }
+
+       if (err)
+               return 4;
+
+       return 0;
+}
+
+static int ni_pcidio_ns_to_timer(int *nanosec, int round_mode)
+{
+       int divider, base;
+
+       base = TIMER_BASE;
+
+       switch (round_mode) {
+       case TRIG_ROUND_NEAREST:
+       default:
+               divider = (*nanosec + base / 2) / base;
+               break;
+       case TRIG_ROUND_DOWN:
+               divider = (*nanosec) / base;
+               break;
+       case TRIG_ROUND_UP:
+               divider = (*nanosec + base - 1) / base;
+               break;
+       }
+
+       *nanosec = base * divider;
+       return divider;
+}
+
+static int ni_pcidio_cmd(comedi_device * dev, comedi_subdevice * s)
+{
+       comedi_cmd *cmd = &s->async->cmd;
+
+       /* XXX configure ports for input */
+       writel(0x0000, devpriv->mite->daq_io_addr + Port_Pin_Directions(0));
+
+       if (1) {
+               /* enable fifos A B C D */
+               writeb(0x0f, devpriv->mite->daq_io_addr + Data_Path);
+
+               /* set transfer width a 32 bits */
+               writeb(TransferWidth(0) | TransferLength(0),
+                       devpriv->mite->daq_io_addr + Transfer_Size_Control);
+       } else {
+               writeb(0x03, devpriv->mite->daq_io_addr + Data_Path);
+               writeb(TransferWidth(3) | TransferLength(0),
+                       devpriv->mite->daq_io_addr + Transfer_Size_Control);
+       }
+
+       /* protocol configuration */
+       if (cmd->scan_begin_src == TRIG_TIMER) {
+               /* page 4-5, "input with internal REQs" */
+               writeb(0, devpriv->mite->daq_io_addr + OpMode);
+               writeb(0x00, devpriv->mite->daq_io_addr + ClockReg);
+               writeb(1, devpriv->mite->daq_io_addr + Sequence);
+               writeb(0x04, devpriv->mite->daq_io_addr + ReqReg);
+               writeb(4, devpriv->mite->daq_io_addr + BlockMode);
+               writeb(3, devpriv->mite->daq_io_addr + LinePolarities);
+               writeb(0xc0, devpriv->mite->daq_io_addr + AckSer);
+               writel(ni_pcidio_ns_to_timer(&cmd->scan_begin_arg,
+                               TRIG_ROUND_NEAREST),
+                       devpriv->mite->daq_io_addr + StartDelay);
+               writeb(1, devpriv->mite->daq_io_addr + ReqDelay);
+               writeb(1, devpriv->mite->daq_io_addr + ReqNotDelay);
+               writeb(1, devpriv->mite->daq_io_addr + AckDelay);
+               writeb(0x0b, devpriv->mite->daq_io_addr + AckNotDelay);
+               writeb(0x01, devpriv->mite->daq_io_addr + Data1Delay);
+               /* manual, page 4-5: ClockSpeed comment is incorrectly listed
+                * on DAQOptions */
+               writew(0, devpriv->mite->daq_io_addr + ClockSpeed);
+               writeb(0, devpriv->mite->daq_io_addr + DAQOptions);
+       } else {
+               /* TRIG_EXT */
+               /* page 4-5, "input with external REQs" */
+               writeb(0, devpriv->mite->daq_io_addr + OpMode);
+               writeb(0x00, devpriv->mite->daq_io_addr + ClockReg);
+               writeb(0, devpriv->mite->daq_io_addr + Sequence);
+               writeb(0x00, devpriv->mite->daq_io_addr + ReqReg);
+               writeb(4, devpriv->mite->daq_io_addr + BlockMode);
+               writeb(0, devpriv->mite->daq_io_addr + LinePolarities);
+               writeb(0x00, devpriv->mite->daq_io_addr + AckSer);
+               writel(1, devpriv->mite->daq_io_addr + StartDelay);
+               writeb(1, devpriv->mite->daq_io_addr + ReqDelay);
+               writeb(1, devpriv->mite->daq_io_addr + ReqNotDelay);
+               writeb(1, devpriv->mite->daq_io_addr + AckDelay);
+               writeb(0x0C, devpriv->mite->daq_io_addr + AckNotDelay);
+               writeb(0x10, devpriv->mite->daq_io_addr + Data1Delay);
+               writew(0, devpriv->mite->daq_io_addr + ClockSpeed);
+               writeb(0x60, devpriv->mite->daq_io_addr + DAQOptions);
+       }
+
+       if (cmd->stop_src == TRIG_COUNT) {
+               writel(cmd->stop_arg,
+                       devpriv->mite->daq_io_addr + Transfer_Count);
+       } else {
+               /* XXX */
+       }
+
+#ifdef USE_DMA
+       writeb(ClearPrimaryTC | ClearSecondaryTC,
+               devpriv->mite->daq_io_addr + Group_1_First_Clear);
+
+       {
+               int retval = setup_mite_dma(dev, s);
+               if (retval)
+                       return retval;
+       }
+#else
+       writeb(0x00, devpriv->mite->daq_io_addr + DMA_Line_Control_Group1);
+#endif
+       writeb(0x00, devpriv->mite->daq_io_addr + DMA_Line_Control_Group2);
+
+       /* clear and enable interrupts */
+       writeb(0xff, devpriv->mite->daq_io_addr + Group_1_First_Clear);
+       //writeb(ClearExpired,devpriv->mite->daq_io_addr+Group_1_Second_Clear);
+
+       writeb(IntEn, devpriv->mite->daq_io_addr + Interrupt_Control);
+       writeb(0x03,
+               devpriv->mite->daq_io_addr + Master_DMA_And_Interrupt_Control);
+
+       if (cmd->stop_src == TRIG_NONE) {
+               devpriv->OpModeBits = DataLatching(0) | RunMode(7);
+       } else {                // TRIG_TIMER
+               devpriv->OpModeBits = Numbered | RunMode(7);
+       }
+       if (cmd->start_src == TRIG_NOW) {
+               /* start */
+               writeb(devpriv->OpModeBits,
+                       devpriv->mite->daq_io_addr + OpMode);
+               s->async->inttrig = NULL;
+       } else {
+               /* TRIG_INT */
+               s->async->inttrig = ni_pcidio_inttrig;
+       }
+
+       DPRINTK("ni_pcidio: command started\n");
+       return 0;
+}
+
+static int setup_mite_dma(comedi_device * dev, comedi_subdevice * s)
+{
+       int retval;
+
+       retval = ni_pcidio_request_di_mite_channel(dev);
+       if (retval)
+               return retval;
+
+       devpriv->di_mite_chan->dir = COMEDI_INPUT;
+
+       mite_prep_dma(devpriv->di_mite_chan, 32, 32);
+
+       mite_dma_arm(devpriv->di_mite_chan);
+       return 0;
+}
+
+static int ni_pcidio_inttrig(comedi_device * dev, comedi_subdevice * s,
+       unsigned int trignum)
+{
+       if (trignum != 0)
+               return -EINVAL;
+
+       writeb(devpriv->OpModeBits, devpriv->mite->daq_io_addr + OpMode);
+       s->async->inttrig = NULL;
+
+       return 1;
+}
+
+static int ni_pcidio_cancel(comedi_device * dev, comedi_subdevice * s)
+{
+       writeb(0x00,
+               devpriv->mite->daq_io_addr + Master_DMA_And_Interrupt_Control);
+       ni_pcidio_release_di_mite_channel(dev);
+
+       return 0;
+}
+
+static int ni_pcidio_change(comedi_device * dev, comedi_subdevice * s,
+       unsigned long new_size)
+{
+       int ret;
+
+       ret = mite_buf_change(devpriv->di_mite_ring, s->async);
+       if (ret < 0)
+               return ret;
+
+       memset(s->async->prealloc_buf, 0xaa, s->async->prealloc_bufsz);
+
+       return 0;
+}
+
+static int pci_6534_load_fpga(comedi_device * dev, int fpga_index, u8 * data,
+       int data_len)
+{
+       static const int timeout = 1000;
+       int i, j;
+       writew(0x80 | fpga_index,
+               devpriv->mite->daq_io_addr + Firmware_Control_Register);
+       writew(0xc0 | fpga_index,
+               devpriv->mite->daq_io_addr + Firmware_Control_Register);
+       for (i = 0;
+               (readw(devpriv->mite->daq_io_addr +
+                               Firmware_Status_Register) & 0x2) == 0
+               && i < timeout; ++i) {
+               udelay(1);
+       }
+       if (i == timeout) {
+               printk("ni_pcidio: failed to load fpga %i, waiting for status 0x2\n", fpga_index);
+               return -EIO;
+       }
+       writew(0x80 | fpga_index,
+               devpriv->mite->daq_io_addr + Firmware_Control_Register);
+       for (i = 0;
+               readw(devpriv->mite->daq_io_addr + Firmware_Status_Register) !=
+               0x3 && i < timeout; ++i) {
+               udelay(1);
+       }
+       if (i == timeout) {
+               printk("ni_pcidio: failed to load fpga %i, waiting for status 0x3\n", fpga_index);
+               return -EIO;
+       }
+       for (j = 0; j + 1 < data_len;) {
+               unsigned int value = data[j++];
+               value |= data[j++] << 8;
+               writew(value,
+                       devpriv->mite->daq_io_addr + Firmware_Data_Register);
+               for (i = 0;
+                       (readw(devpriv->mite->daq_io_addr +
+                                       Firmware_Status_Register) & 0x2) == 0
+                       && i < timeout; ++i) {
+                       udelay(1);
+               }
+               if (i == timeout) {
+                       printk("ni_pcidio: failed to load word into fpga %i\n",
+                               fpga_index);
+                       return -EIO;
+               }
+               if (need_resched())
+                       schedule();
+       }
+       writew(0x0, devpriv->mite->daq_io_addr + Firmware_Control_Register);
+       return 0;
+}
+
+static int pci_6534_reset_fpga(comedi_device * dev, int fpga_index)
+{
+       return pci_6534_load_fpga(dev, fpga_index, NULL, 0);
+}
+
+static int pci_6534_reset_fpgas(comedi_device * dev)
+{
+       int ret;
+       int i;
+       writew(0x0, devpriv->mite->daq_io_addr + Firmware_Control_Register);
+       for (i = 0; i < 3; ++i) {
+               ret = pci_6534_reset_fpga(dev, i);
+               if (ret < 0)
+                       break;
+       }
+       writew(0x0, devpriv->mite->daq_io_addr + Firmware_Mask_Register);
+       return ret;
+}
+
+static void pci_6534_init_main_fpga(comedi_device * dev)
+{
+       writel(0, devpriv->mite->daq_io_addr + FPGA_Control1_Register);
+       writel(0, devpriv->mite->daq_io_addr + FPGA_Control2_Register);
+       writel(0, devpriv->mite->daq_io_addr + FPGA_SCALS_Counter_Register);
+       writel(0, devpriv->mite->daq_io_addr + FPGA_SCAMS_Counter_Register);
+       writel(0, devpriv->mite->daq_io_addr + FPGA_SCBLS_Counter_Register);
+       writel(0, devpriv->mite->daq_io_addr + FPGA_SCBMS_Counter_Register);
+}
+
+static int pci_6534_upload_firmware(comedi_device * dev, int options[])
+{
+       int ret;
+       void *main_fpga_data, *scarab_a_data, *scarab_b_data;
+       int main_fpga_data_len, scarab_a_data_len, scarab_b_data_len;
+
+       if (options[COMEDI_DEVCONF_AUX_DATA_LENGTH] == 0)
+               return 0;
+       ret = pci_6534_reset_fpgas(dev);
+       if (ret < 0)
+               return ret;
+       main_fpga_data = comedi_aux_data(options, 0);
+       main_fpga_data_len = options[COMEDI_DEVCONF_AUX_DATA0_LENGTH];
+       ret = pci_6534_load_fpga(dev, 2, main_fpga_data, main_fpga_data_len);
+       if (ret < 0)
+               return ret;
+       pci_6534_init_main_fpga(dev);
+       scarab_a_data = comedi_aux_data(options, 1);
+       scarab_a_data_len = options[COMEDI_DEVCONF_AUX_DATA1_LENGTH];
+       ret = pci_6534_load_fpga(dev, 0, scarab_a_data, scarab_a_data_len);
+       if (ret < 0)
+               return ret;
+       scarab_b_data = comedi_aux_data(options, 2);
+       scarab_b_data_len = options[COMEDI_DEVCONF_AUX_DATA2_LENGTH];
+       ret = pci_6534_load_fpga(dev, 1, scarab_b_data, scarab_b_data_len);
+       if (ret < 0)
+               return ret;
+       return 0;
+}
+
+static int nidio_attach(comedi_device * dev, comedi_devconfig * it)
+{
+       comedi_subdevice *s;
+       int i;
+       int ret;
+       int n_subdevices;
+       unsigned int irq;
+
+       printk("comedi%d: nidio:", dev->minor);
+
+       if ((ret = alloc_private(dev, sizeof(nidio96_private))) < 0)
+               return ret;
+       spin_lock_init(&devpriv->mite_channel_lock);
+
+       ret = nidio_find_device(dev, it->options[0], it->options[1]);
+       if (ret < 0)
+               return ret;
+
+       ret = mite_setup(devpriv->mite);
+       if (ret < 0) {
+               printk("error setting up mite\n");
+               return ret;
+       }
+       comedi_set_hw_dev(dev, &devpriv->mite->pcidev->dev);
+       devpriv->di_mite_ring = mite_alloc_ring(devpriv->mite);
+       if (devpriv->di_mite_ring == NULL)
+               return -ENOMEM;
+
+       dev->board_name = this_board->name;
+       irq = mite_irq(devpriv->mite);
+       printk(" %s", dev->board_name);
+       if (this_board->uses_firmware) {
+               ret = pci_6534_upload_firmware(dev, it->options);
+               if (ret < 0)
+                       return ret;
+       }
+       if (!this_board->is_diodaq) {
+               n_subdevices = this_board->n_8255;
+       } else {
+               n_subdevices = 1;
+       }
+       if ((ret = alloc_subdevices(dev, n_subdevices)) < 0)
+               return ret;
+
+       if (!this_board->is_diodaq) {
+               for (i = 0; i < this_board->n_8255; i++) {
+                       subdev_8255_init(dev, dev->subdevices + i,
+                               nidio96_8255_cb,
+                               (unsigned long)(devpriv->mite->daq_io_addr +
+                                       NIDIO_8255_BASE(i)));
+               }
+       } else {
+
+               printk(" rev=%d",
+                       readb(devpriv->mite->daq_io_addr + Chip_Version));
+
+               s = dev->subdevices + 0;
+
+               dev->read_subdev = s;
+               s->type = COMEDI_SUBD_DIO;
+               s->subdev_flags =
+                       SDF_READABLE | SDF_WRITABLE | SDF_LSAMPL | SDF_PACKED |
+                       SDF_CMD_READ;
+               s->n_chan = 32;
+               s->range_table = &range_digital;
+               s->maxdata = 1;
+               s->insn_config = &ni_pcidio_insn_config;
+               s->insn_bits = &ni_pcidio_insn_bits;
+               s->do_cmd = &ni_pcidio_cmd;
+               s->do_cmdtest = &ni_pcidio_cmdtest;
+               s->cancel = &ni_pcidio_cancel;
+               s->len_chanlist = 32;   /* XXX */
+               s->buf_change = &ni_pcidio_change;
+               s->async_dma_dir = DMA_BIDIRECTIONAL;
+
+               writel(0, devpriv->mite->daq_io_addr + Port_IO(0));
+               writel(0, devpriv->mite->daq_io_addr + Port_Pin_Directions(0));
+               writel(0, devpriv->mite->daq_io_addr + Port_Pin_Mask(0));
+
+               /* disable interrupts on board */
+               writeb(0x00,
+                       devpriv->mite->daq_io_addr +
+                       Master_DMA_And_Interrupt_Control);
+
+               ret = comedi_request_irq(irq, nidio_interrupt, IRQF_SHARED,
+                       "ni_pcidio", dev);
+               if (ret < 0) {
+                       printk(" irq not available");
+               }
+               dev->irq = irq;
+       }
+
+       printk("\n");
+
+       return 0;
+}
+
+static int nidio_detach(comedi_device * dev)
+{
+       int i;
+
+       if (this_board && !this_board->is_diodaq) {
+               for (i = 0; i < this_board->n_8255; i++) {
+                       subdev_8255_cleanup(dev, dev->subdevices + i);
+               }
+       }
+
+       if (dev->irq)
+               comedi_free_irq(dev->irq, dev);
+
+       if (devpriv) {
+               if (devpriv->di_mite_ring) {
+                       mite_free_ring(devpriv->di_mite_ring);
+                       devpriv->di_mite_ring = NULL;
+               }
+               if (devpriv->mite)
+                       mite_unsetup(devpriv->mite);
+       }
+       return 0;
+}
+
+static int nidio_find_device(comedi_device * dev, int bus, int slot)
+{
+       struct mite_struct *mite;
+       int i;
+
+       for (mite = mite_devices; mite; mite = mite->next) {
+               if (mite->used)
+                       continue;
+               if (bus || slot) {
+                       if (bus != mite->pcidev->bus->number ||
+                               slot != PCI_SLOT(mite->pcidev->devfn))
+                               continue;
+               }
+               for (i = 0; i < n_nidio_boards; i++) {
+                       if (mite_device_id(mite) == nidio_boards[i].dev_id) {
+                               dev->board_ptr = nidio_boards + i;
+                               devpriv->mite = mite;
+
+                               return 0;
+                       }
+               }
+       }
+       printk("no device found\n");
+       mite_list_devices();
+       return -EIO;
+}
+
+COMEDI_PCI_INITCLEANUP(driver_pcidio, ni_pcidio_pci_table);