staging: comedi: addi_apci_3501: separate from addi_common.c

This driver is for a simple analog output board with 4 or 8, 14-bit
outputs. The board also has 4 digital i/o channels (2 out/2 in) as
well as a watchdog or timer. Using the addi-data "common" code in
this driver introduces a lot of bloat.

Copy the code in addi_common.c to this driver and remove the #include
that caused it to be compiled with the driver. This will allow removing
the bloat.

Rename the auto_attach and detach functions so they have namespace
associated with this driver.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 316 insertions, 8 deletions

diff --git a/drivers/staging/comedi/drivers/addi_apci_3501.c b/drivers/staging/comedi/drivers/addi_apci_3501.c
index ed297deb8634..e2ea54267aab 100644
--- a/drivers/staging/comedi/drivers/addi_apci_3501.c
+++ b/drivers/staging/comedi/drivers/addi_apci_3501.c
@@ -4,9 +4,12 @@
 
 #include "addi-data/addi_common.h"
 
+#ifndef COMEDI_SUBD_TTLIO
+#define COMEDI_SUBD_TTLIO   11  /* Digital Input Output But TTL */
+#endif
+
 #include "addi-data/addi_eeprom.c"
 #include "addi-data/hwdrv_apci3501.c"
-#include "addi-data/addi_common.c"
 
 static const struct addi_board apci3501_boardtypes[] = {
         {
@@ -35,17 +38,316 @@ static const struct addi_board apci3501_boardtypes[] = {
         },
 };
 
-static DEFINE_PCI_DEVICE_TABLE(apci3501_pci_table) = {
-        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3001) },
-        { 0 }
-};
-MODULE_DEVICE_TABLE(pci, apci3501_pci_table);
+static int i_ADDIDATA_InsnReadEeprom(struct comedi_device *dev,
+                                     struct comedi_subdevice *s,
+                                     struct comedi_insn *insn,
+                                     unsigned int *data)
+{
+        const struct addi_board *this_board = comedi_board(dev);
+        struct addi_private *devpriv = dev->private;
+        unsigned short w_Address = CR_CHAN(insn->chanspec);
+        unsigned short w_Data;
+
+        w_Data = addi_eeprom_readw(devpriv->i_IobaseAmcc,
+                this_board->pc_EepromChip, 2 * w_Address);
+        data[0] = w_Data;
+
+        return insn->n;
+}
+
+static irqreturn_t v_ADDI_Interrupt(int irq, void *d)
+{
+        struct comedi_device *dev = d;
+        const struct addi_board *this_board = comedi_board(dev);
+
+        this_board->interrupt(irq, d);
+        return IRQ_RETVAL(1);
+}
+
+static int i_ADDI_Reset(struct comedi_device *dev)
+{
+        const struct addi_board *this_board = comedi_board(dev);
+
+        this_board->reset(dev);
+        return 0;
+}
+
+static const void *addi_find_boardinfo(struct comedi_device *dev,
+                                       struct pci_dev *pcidev)
+{
+        const void *p = dev->driver->board_name;
+        const struct addi_board *this_board;
+        int i;
+
+        for (i = 0; i < dev->driver->num_names; i++) {
+                this_board = p;
+                if (this_board->i_VendorId == pcidev->vendor &&
+                    this_board->i_DeviceId == pcidev->device)
+                        return this_board;
+                p += dev->driver->offset;
+        }
+        return NULL;
+}
+
+static int apci3501_auto_attach(struct comedi_device *dev,
+                                unsigned long context_unused)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        const struct addi_board *this_board;
+        struct addi_private *devpriv;
+        struct comedi_subdevice *s;
+        int ret, n_subdevices;
+        unsigned int dw_Dummy;
+
+        this_board = addi_find_boardinfo(dev, pcidev);
+        if (!this_board)
+                return -ENODEV;
+        dev->board_ptr = this_board;
+        dev->board_name = this_board->pc_DriverName;
+
+        devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
+        if (!devpriv)
+                return -ENOMEM;
+        dev->private = devpriv;
+
+        ret = comedi_pci_enable(pcidev, dev->board_name);
+        if (ret)
+                return ret;
+
+        if (!this_board->pc_EepromChip ||
+            strcmp(this_board->pc_EepromChip, ADDIDATA_9054)) {
+                /* board does not have an eeprom or is not ADDIDATA_9054 */
+                if (this_board->i_IorangeBase1)
+                        dev->iobase = pci_resource_start(pcidev, 1);
+                else
+                        dev->iobase = pci_resource_start(pcidev, 0);
+
+                devpriv->iobase = dev->iobase;
+                devpriv->i_IobaseAmcc = pci_resource_start(pcidev, 0);
+                devpriv->i_IobaseAddon = pci_resource_start(pcidev, 2);
+        } else {
+                /* board has an ADDIDATA_9054 eeprom */
+                dev->iobase = pci_resource_start(pcidev, 2);
+                devpriv->iobase = pci_resource_start(pcidev, 2);
+                devpriv->dw_AiBase = ioremap(pci_resource_start(pcidev, 3),
+                                             this_board->i_IorangeBase3);
+        }
+        devpriv->i_IobaseReserved = pci_resource_start(pcidev, 3);
+
+        /* Initialize parameters that can be overridden in EEPROM */
+        devpriv->s_EeParameters.i_NbrAiChannel = this_board->i_NbrAiChannel;
+        devpriv->s_EeParameters.i_NbrAoChannel = this_board->i_NbrAoChannel;
+        devpriv->s_EeParameters.i_AiMaxdata = this_board->i_AiMaxdata;
+        devpriv->s_EeParameters.i_AoMaxdata = this_board->i_AoMaxdata;
+        devpriv->s_EeParameters.i_NbrDiChannel = this_board->i_NbrDiChannel;
+        devpriv->s_EeParameters.i_NbrDoChannel = this_board->i_NbrDoChannel;
+        devpriv->s_EeParameters.i_DoMaxdata = this_board->i_DoMaxdata;
+        devpriv->s_EeParameters.i_Dma = this_board->i_Dma;
+        devpriv->s_EeParameters.i_Timer = this_board->i_Timer;
+        devpriv->s_EeParameters.ui_MinAcquisitiontimeNs =
+                this_board->ui_MinAcquisitiontimeNs;
+        devpriv->s_EeParameters.ui_MinDelaytimeNs =
+                this_board->ui_MinDelaytimeNs;
+
+        /* ## */
+
+        if (pcidev->irq > 0) {
+                ret = request_irq(pcidev->irq, v_ADDI_Interrupt, IRQF_SHARED,
+                                  dev->board_name, dev);
+                if (ret == 0)
+                        dev->irq = pcidev->irq;
+        }
+
+        /*  Read eepeom and fill addi_board Structure */
+
+        if (this_board->i_PCIEeprom) {
+                if (!(strcmp(this_board->pc_EepromChip, "S5920"))) {
+                        /*  Set 3 wait stait */
+                        if (!(strcmp(dev->board_name, "apci035")))
+                                outl(0x80808082, devpriv->i_IobaseAmcc + 0x60);
+                        else
+                                outl(0x83838383, devpriv->i_IobaseAmcc + 0x60);
+
+                        /*  Enable the interrupt for the controller */
+                        dw_Dummy = inl(devpriv->i_IobaseAmcc + 0x38);
+                        outl(dw_Dummy | 0x2000, devpriv->i_IobaseAmcc + 0x38);
+                }
+                addi_eeprom_read_info(dev, pci_resource_start(pcidev, 0));
+        }
+
+        n_subdevices = 7;
+        ret = comedi_alloc_subdevices(dev, n_subdevices);
+        if (ret)
+                return ret;
+
+        /*  Allocate and Initialise AI Subdevice Structures */
+        s = &dev->subdevices[0];
+        if ((devpriv->s_EeParameters.i_NbrAiChannel)
+                || (this_board->i_NbrAiChannelDiff)) {
+                dev->read_subdev = s;
+                s->type = COMEDI_SUBD_AI;
+                s->subdev_flags =
+                        SDF_READABLE | SDF_COMMON | SDF_GROUND
+                        | SDF_DIFF;
+                if (devpriv->s_EeParameters.i_NbrAiChannel) {
+                        s->n_chan =
+                                devpriv->s_EeParameters.i_NbrAiChannel;
+                        devpriv->b_SingelDiff = 0;
+                } else {
+                        s->n_chan = this_board->i_NbrAiChannelDiff;
+                        devpriv->b_SingelDiff = 1;
+                }
+                s->maxdata = devpriv->s_EeParameters.i_AiMaxdata;
+                s->len_chanlist = this_board->i_AiChannelList;
+                s->range_table = this_board->pr_AiRangelist;
+
+                /* Set the initialisation flag */
+                devpriv->b_AiInitialisation = 1;
+
+                s->insn_config = this_board->ai_config;
+                s->insn_read = this_board->ai_read;
+                s->insn_write = this_board->ai_write;
+                s->insn_bits = this_board->ai_bits;
+                s->do_cmdtest = this_board->ai_cmdtest;
+                s->do_cmd = this_board->ai_cmd;
+                s->cancel = this_board->ai_cancel;
+
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
+
+        /*  Allocate and Initialise AO Subdevice Structures */
+        s = &dev->subdevices[1];
+        if (devpriv->s_EeParameters.i_NbrAoChannel) {
+                s->type = COMEDI_SUBD_AO;
+                s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+                s->n_chan = devpriv->s_EeParameters.i_NbrAoChannel;
+                s->maxdata = devpriv->s_EeParameters.i_AoMaxdata;
+                s->len_chanlist =
+                        devpriv->s_EeParameters.i_NbrAoChannel;
+                s->range_table = this_board->pr_AoRangelist;
+                s->insn_config = this_board->ao_config;
+                s->insn_write = this_board->ao_write;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
+        /*  Allocate and Initialise DI Subdevice Structures */
+        s = &dev->subdevices[2];
+        if (devpriv->s_EeParameters.i_NbrDiChannel) {
+                s->type = COMEDI_SUBD_DI;
+                s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
+                s->n_chan = devpriv->s_EeParameters.i_NbrDiChannel;
+                s->maxdata = 1;
+                s->len_chanlist =
+                        devpriv->s_EeParameters.i_NbrDiChannel;
+                s->range_table = &range_digital;
+                s->io_bits = 0; /* all bits input */
+                s->insn_config = this_board->di_config;
+                s->insn_read = this_board->di_read;
+                s->insn_write = this_board->di_write;
+                s->insn_bits = this_board->di_bits;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
+        /*  Allocate and Initialise DO Subdevice Structures */
+        s = &dev->subdevices[3];
+        if (devpriv->s_EeParameters.i_NbrDoChannel) {
+                s->type = COMEDI_SUBD_DO;
+                s->subdev_flags =
+                        SDF_READABLE | SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+                s->n_chan = devpriv->s_EeParameters.i_NbrDoChannel;
+                s->maxdata = devpriv->s_EeParameters.i_DoMaxdata;
+                s->len_chanlist =
+                        devpriv->s_EeParameters.i_NbrDoChannel;
+                s->range_table = &range_digital;
+                s->io_bits = 0xf;       /* all bits output */
+
+                /* insn_config - for digital output memory */
+                s->insn_config = this_board->do_config;
+                s->insn_write = this_board->do_write;
+                s->insn_bits = this_board->do_bits;
+                s->insn_read = this_board->do_read;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
+
+        /*  Allocate and Initialise Timer Subdevice Structures */
+        s = &dev->subdevices[4];
+        if (devpriv->s_EeParameters.i_Timer) {
+                s->type = COMEDI_SUBD_TIMER;
+                s->subdev_flags = SDF_WRITEABLE | SDF_GROUND | SDF_COMMON;
+                s->n_chan = 1;
+                s->maxdata = 0;
+                s->len_chanlist = 1;
+                s->range_table = &range_digital;
+
+                s->insn_write = this_board->timer_write;
+                s->insn_read = this_board->timer_read;
+                s->insn_config = this_board->timer_config;
+                s->insn_bits = this_board->timer_bits;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
+
+        /*  Allocate and Initialise TTL */
+        s = &dev->subdevices[5];
+        if (this_board->i_NbrTTLChannel) {
+                s->type = COMEDI_SUBD_TTLIO;
+                s->subdev_flags =
+                        SDF_WRITEABLE | SDF_READABLE | SDF_GROUND | SDF_COMMON;
+                s->n_chan = this_board->i_NbrTTLChannel;
+                s->maxdata = 1;
+                s->io_bits = 0; /* all bits input */
+                s->len_chanlist = this_board->i_NbrTTLChannel;
+                s->range_table = &range_digital;
+                s->insn_config = this_board->ttl_config;
+                s->insn_bits = this_board->ttl_bits;
+                s->insn_read = this_board->ttl_read;
+                s->insn_write = this_board->ttl_write;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
+
+        /* EEPROM */
+        s = &dev->subdevices[6];
+        if (this_board->i_PCIEeprom) {
+                s->type = COMEDI_SUBD_MEMORY;
+                s->subdev_flags = SDF_READABLE | SDF_INTERNAL;
+                s->n_chan = 256;
+                s->maxdata = 0xffff;
+                s->insn_read = i_ADDIDATA_InsnReadEeprom;
+        } else {
+                s->type = COMEDI_SUBD_UNUSED;
+        }
+
+        i_ADDI_Reset(dev);
+        return 0;
+}
+
+static void apci3501_detach(struct comedi_device *dev)
+{
+        struct pci_dev *pcidev = comedi_to_pci_dev(dev);
+        struct addi_private *devpriv = dev->private;
+
+        if (devpriv) {
+                if (dev->iobase)
+                        i_ADDI_Reset(dev);
+                if (dev->irq)
+                        free_irq(dev->irq, dev);
+                if (devpriv->dw_AiBase)
+                        iounmap(devpriv->dw_AiBase);
+        }
+        if (pcidev) {
+                if (dev->iobase)
+                        comedi_pci_disable(pcidev);
+        }
+}
 
 static struct comedi_driver apci3501_driver = {
         .driver_name    = "addi_apci_3501",
         .module         = THIS_MODULE,
-        .auto_attach    = addi_auto_attach,
-        .detach         = i_ADDI_Detach,
+        .auto_attach    = apci3501_auto_attach,
+        .detach         = apci3501_detach,
         .num_names      = ARRAY_SIZE(apci3501_boardtypes),
         .board_name     = &apci3501_boardtypes[0].pc_DriverName,
         .offset         = sizeof(struct addi_board),
@@ -62,6 +364,12 @@ static void apci3501_pci_remove(struct pci_dev *dev)
         comedi_pci_auto_unconfig(dev);
 }
 
+static DEFINE_PCI_DEVICE_TABLE(apci3501_pci_table) = {
+        { PCI_DEVICE(PCI_VENDOR_ID_ADDIDATA, 0x3001) },
+        { 0 }
+};
+MODULE_DEVICE_TABLE(pci, apci3501_pci_table);
+
 static struct pci_driver apci3501_pci_driver = {
         .name           = "addi_apci_3501",
         .id_table       = apci3501_pci_table,