fix breakage

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index b457f47a1d5014cba017e2d36d5d954cfa015fb7..c1382693bcce027b714ae8ee03530f4c2192ec13 100644 (file)
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -608,7 +608,7 @@ static void ni_load_channelgain_list(comedi_device *dev,unsigned int n_chan,unsi
                ni_writew(lo,Configuration_Memory_Low);
        }
 
-        prime the channel/gain list */
+       /* prime the channel/gain list */
 
        win_out(1,AI_Command_1_Register);
        for(i=0;i<40;i++){
@@ -1004,7 +1004,9 @@ static int ni_ai_mode2(comedi_device *dev,comedi_subdevice *s,comedi_trig *it)
                int bits;
 
                /* interrupt on FIFO, errors, SC_TC */
-               bits=0x00a1;
+               bits=AI_FIFO_Interrupt_Enable|AI_Error_Interrupt_Enable|
+                    AI_SC_TC_Interrupt_Enable;
+               //bits|=Pass_Thru_0_Interrupt_Enable;
 
                if(it->flags&TRIG_WAKE_EOS){
                        /* wake on end-of-scan */
@@ -1032,9 +1034,6 @@ static int ni_ai_mode2(comedi_device *dev,comedi_subdevice *s,comedi_trig *it)
                        break;
                }
 
-bits=AI_SC_TC_Interrupt_Enable;
-bits|=AI_Error_Interrupt_Enable;
-//bits|=Pass_Thru_0_Interrupt_Enable;
                win_out(0x3f80,Interrupt_A_Ack_Register); /* clear interrupts */
 
                win_out(bits,Interrupt_A_Enable_Register) ;

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index 9a302140518fff84a4a1abc9126e27df034546c9..d4272b7706f90fff9d8303bb62e6f4387bbdda40 100644 (file)
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -459,6 +459,14 @@ static int pcimio_attach(comedi_device *dev,comedi_devconfig *it)
 
        dev->irq=mite_irq(devpriv->mite);
 
+{
+       int i;
+       printk("\n");
+       for(i=2048;i<4096;i+=2){
+               printk("%04x ",readw(dev->iobase+i));
+               if((i%64)==62)printk("\n");
+       }
+}
         if(dev->irq==0){
                printk(" unknown irq (bad)\n");
        }else{