Merge branch 'for-2.6.31' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6

[pandora-kernel.git] / drivers / staging / comedi / drivers / daqboard2000.c

diff --git a/drivers/staging/comedi/drivers/daqboard2000.c b/drivers/staging/comedi/drivers/daqboard2000.c
index 794fbb2..d4526c6 100644 (file)
--- a/drivers/staging/comedi/drivers/daqboard2000.c
+++ b/drivers/staging/comedi/drivers/daqboard2000.c
@@ -119,6 +119,7 @@ Configuration options:
 #include "../comedidev.h"
 
 #include <linux/delay.h>
+#include <linux/interrupt.h>
 
 #include "comedi_pci.h"
 #include "8255.h"
@@ -300,10 +301,10 @@ static int daqboard2000_attach(struct comedi_device *dev, struct comedi_devconfi
 static int daqboard2000_detach(struct comedi_device *dev);
 
 static struct comedi_driver driver_daqboard2000 = {
-      driver_name:"daqboard2000",
-      module:THIS_MODULE,
-      attach:daqboard2000_attach,
-      detach:daqboard2000_detach,
+       .driver_name = "daqboard2000",
+       .module = THIS_MODULE,
+       .attach = daqboard2000_attach,
+       .detach = daqboard2000_detach,
 };
 
 struct daq200_boardtype {
@@ -342,9 +343,9 @@ static void writeAcqScanListEntry(struct comedi_device *dev, u16 entry)
 {
        struct daqboard2000_hw *fpga = devpriv->daq;
 
-/* comedi_udelay(4); */
+/* udelay(4); */
        fpga->acqScanListFIFO = entry & 0x00ff;
-/* comedi_udelay(4); */
+/* udelay(4); */
        fpga->acqScanListFIFO = (entry >> 8) & 0x00ff;
 }
 
@@ -425,14 +426,14 @@ static int daqboard2000_ai_insn_read(struct comedi_device *dev, struct comedi_su
                        if (fpga->acqControl & DAQBOARD2000_AcqConfigPipeFull) {
                                break;
                        }
-                       /* comedi_udelay(2); */
+                       /* udelay(2); */
                }
                fpga->acqControl = DAQBOARD2000_AdcPacerEnable;
                for (timeout = 0; timeout < 20; timeout++) {
                        if (fpga->acqControl & DAQBOARD2000_AcqLogicScanning) {
                                break;
                        }
-                       /* comedi_udelay(2); */
+                       /* udelay(2); */
                }
                for (timeout = 0; timeout < 20; timeout++) {
                        if (fpga->
@@ -440,7 +441,7 @@ static int daqboard2000_ai_insn_read(struct comedi_device *dev, struct comedi_su
                                DAQBOARD2000_AcqResultsFIFOHasValidData) {
                                break;
                        }
-                       /* comedi_udelay(2); */
+                       /* udelay(2); */
                }
                data[i] = fpga->acqResultsFIFO;
                fpga->acqControl = DAQBOARD2000_AdcPacerDisable;
@@ -476,18 +477,18 @@ static int daqboard2000_ao_insn_write(struct comedi_device *dev, struct comedi_s
                 * OK, since it works OK without enabling the DAC's, let's keep
                 * it as simple as possible...
                 */
-               /* fpga->dacControl = (chan + 2) * 0x0010 | 0x0001; comedi_udelay(1000); */
+               /* fpga->dacControl = (chan + 2) * 0x0010 | 0x0001; udelay(1000); */
                fpga->dacSetting[chan] = data[i];
                for (timeout = 0; timeout < 20; timeout++) {
                        if ((fpga->dacControl & ((chan + 1) * 0x0010)) == 0) {
                                break;
                        }
-                       /* comedi_udelay(2); */
+                       /* udelay(2); */
                }
                devpriv->ao_readback[chan] = data[i];
                /*
                 * Since we never enabled the DAC's, we don't need to disable it...
-                * fpga->dacControl = (chan + 2) * 0x0010 | 0x0000; comedi_udelay(1000);
+                * fpga->dacControl = (chan + 2) * 0x0010 | 0x0000; udelay(1000);
                 */
        }
 
@@ -498,29 +499,29 @@ static void daqboard2000_resetLocalBus(struct comedi_device *dev)
 {
        printk("daqboard2000_resetLocalBus\n");
        writel(DAQBOARD2000_SECRLocalBusHi, devpriv->plx + 0x6c);
-       comedi_udelay(10000);
+       udelay(10000);
        writel(DAQBOARD2000_SECRLocalBusLo, devpriv->plx + 0x6c);
-       comedi_udelay(10000);
+       udelay(10000);
 }
 
 static void daqboard2000_reloadPLX(struct comedi_device *dev)
 {
        printk("daqboard2000_reloadPLX\n");
        writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c);
-       comedi_udelay(10000);
+       udelay(10000);
        writel(DAQBOARD2000_SECRReloadHi, devpriv->plx + 0x6c);
-       comedi_udelay(10000);
+       udelay(10000);
        writel(DAQBOARD2000_SECRReloadLo, devpriv->plx + 0x6c);
-       comedi_udelay(10000);
+       udelay(10000);
 }
 
 static void daqboard2000_pulseProgPin(struct comedi_device *dev)
 {
        printk("daqboard2000_pulseProgPin 1\n");
        writel(DAQBOARD2000_SECRProgPinHi, devpriv->plx + 0x6c);
-       comedi_udelay(10000);
+       udelay(10000);
        writel(DAQBOARD2000_SECRProgPinLo, devpriv->plx + 0x6c);
-       comedi_udelay(10000);   /* Not in the original code, but I like symmetry... */
+       udelay(10000);  /* Not in the original code, but I like symmetry... */
 }
 
 static int daqboard2000_pollCPLD(struct comedi_device *dev, int mask)
@@ -536,9 +537,9 @@ static int daqboard2000_pollCPLD(struct comedi_device *dev, int mask)
                        result = 1;
                        break;
                }
-               comedi_udelay(100);
+               udelay(100);
        }
-       comedi_udelay(5);
+       udelay(5);
        return result;
 }
 
@@ -546,7 +547,7 @@ static int daqboard2000_writeCPLD(struct comedi_device *dev, int data)
 {
        int result = 0;
 
-       comedi_udelay(10);
+       udelay(10);
        writew(data, devpriv->daq + 0x1000);
        if ((readw(devpriv->daq + 0x1000) & DAQBOARD2000_CPLD_INIT) ==
                DAQBOARD2000_CPLD_INIT) {
@@ -623,17 +624,17 @@ static void daqboard2000_adcDisarm(struct comedi_device *dev)
        struct daqboard2000_hw *fpga = devpriv->daq;
 
        /* Disable hardware triggers */
-       comedi_udelay(2);
+       udelay(2);
        fpga->trigControl = DAQBOARD2000_TrigAnalog | DAQBOARD2000_TrigDisable;
-       comedi_udelay(2);
+       udelay(2);
        fpga->trigControl = DAQBOARD2000_TrigTTL | DAQBOARD2000_TrigDisable;
 
        /* Stop the scan list FIFO from loading the configuration pipe */
-       comedi_udelay(2);
+       udelay(2);
        fpga->acqControl = DAQBOARD2000_SeqStopScanList;
 
        /* Stop the pacer clock */
-       comedi_udelay(2);
+       udelay(2);
        fpga->acqControl = DAQBOARD2000_AdcPacerDisable;
 
        /* Stop the input dma (abort channel 1) */
@@ -651,7 +652,7 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)
                if ((fpga->dacControl & DAQBOARD2000_RefBusy) == 0) {
                        break;
                }
-               comedi_udelay(2);
+               udelay(2);
        }
 /*  printk("DAQBOARD2000_PosRefDacSelect %d\n", timeout);*/
 
@@ -661,7 +662,7 @@ static void daqboard2000_activateReferenceDacs(struct comedi_device *dev)
                if ((fpga->dacControl & DAQBOARD2000_RefBusy) == 0) {
                        break;
                }
-               comedi_udelay(2);
+               udelay(2);
        }
 /*  printk("DAQBOARD2000_NegRefDacSelect %d\n", timeout);*/
 }