added ao interrupt debugging

now checks ao interrupt flag
remove incorrect comment in ni_mio_cs

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index 06449fd77dc7fc6e6d90b822e7f8c5beb65b00a0..da62147c74ff8b08dcf1e56056b8e2fb6f59c784 100644 (file)
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -176,6 +176,7 @@ static void caldac_setup(comedi_device *dev,comedi_subdevice *s);
 static int ni_read_eeprom(comedi_device *dev,int addr);
 
 static void ni_mio_print_status_a(int status);
+static void ni_mio_print_status_b(int status);
 
 static int ni_ai_reset(comedi_device *dev,comedi_subdevice *s);
 static void ni_handle_fifo_half_full(comedi_device *dev);
@@ -206,7 +207,7 @@ static void pfi_setup(comedi_device *dev);
 #define AIMODE_SAMPLE          3
 
 
-//static
+static
 void ni_E_interrupt(int irq,void *d,struct pt_regs * regs)
 {
        comedi_device *dev=d;
@@ -229,7 +230,8 @@ void ni_E_interrupt(int irq,void *d,struct pt_regs * regs)
 #ifdef DEBUG_INTERRUPT
 printk("ni_mio_common interrupt: ");
 ni_mio_print_status_a(status);
-printk(" b_status=0x%04x\n",b_status);
+ni_mio_print_status_b(b_status);
+printk("\n");
 #endif
 #ifdef PCIDMA
 printk("mite status=0x%08x\n",readw(devpriv->mite->mite_io_addr+0x14));
@@ -298,29 +300,31 @@ printk("ni_mio_common: SC_TC interrupt\n");
                break;
        }
 
-       if(b_status&AO_Overrun_St){
-               printk("ni-E: AO FIFO underrun status=0x%04x status2=0x%04x\n",b_status,ni_readw(AO_Status_2));
-       }
-
-       if(b_status&AO_BC_TC_St){
-               printk("ni-E: AO BC_TC status=0x%04x status2=0x%04x\n",b_status,ni_readw(AO_Status_2));
+       if(ack){
+               ack|=AI_START1_Interrupt_Ack;
+               ni_writew(ack,Interrupt_A_Ack);
        }
 
-       if(b_status&AO_FIFO_Request_St)
-               ni_ao_fifo_half_empty(dev,dev->subdevices+1);
-
-       b_status=ni_readw(AO_Status_1);
        if(b_status&Interrupt_B_St){
-               if(b_status&AO_FIFO_Request_St){
-                       printk("AO buffer underrun\n");
+               if(b_status&AO_Overrun_St){
+                       printk("ni-E: AO FIFO underrun status=0x%04x status2=0x%04x\n",b_status,ni_readw(AO_Status_2));
+               }
+       
+               if(b_status&AO_BC_TC_St){
+                       printk("ni-E: AO BC_TC status=0x%04x status2=0x%04x\n",b_status,ni_readw(AO_Status_2));
+               }
+       
+               if(b_status&AO_FIFO_Request_St)
+                       ni_ao_fifo_half_empty(dev,dev->subdevices+1);
+       
+               b_status=ni_readw(AO_Status_1);
+               if(b_status&Interrupt_B_St){
+                       if(b_status&AO_FIFO_Request_St){
+                               printk("AO buffer underrun\n");
+                       }
+                       printk("Ack! didn't clear AO interrupt. b_status=0x%04x\n",b_status);
+                       win_out(0,Interrupt_B_Enable_Register);
                }
-               printk("Ack! didn't clear AO interrupt. b_status=0x%04x\n",b_status);
-               win_out(0,Interrupt_B_Enable_Register);
-       }
-
-       if(ack){
-               ack|=AI_START1_Interrupt_Ack;
-               ni_writew(ack,Interrupt_A_Ack);
        }
 
        win_restore(wsave);
@@ -345,6 +349,25 @@ static void ni_mio_print_status_a(int status)
        }
 }
 
+static char *status_b_strings[]={
+       "passthru1","fifo","G1_gate","G1_TC",
+       "UI2_TC","UPDATE","UC_TC","BC_TC",
+       "start1","overrun","start","bc_tc_error",
+       "fifo_empty","fifo_half_full","fifo_full","interrupt_b"
+};
+
+static void ni_mio_print_status_b(int status)
+{
+       int i;
+
+       printk("b_status=0x%04x",status);
+       for(i=15;i>=0;i--){
+               if(status&(1<<i)){
+                       printk(" %s",status_b_strings[i]);
+               }
+       }
+}
+
 static void ni_ai_fifo_read(comedi_device *dev,comedi_subdevice *s,
                sampl_t *data,int n)
 {

diff --git a/comedi/drivers/ni_mio_cs.c b/comedi/drivers/ni_mio_cs.c
index d6332045585224de086fac8ffa6cac7644b2884a..05338d804158bdf3432000f4ff526bf3bb516218 100644 (file)
--- a/comedi/drivers/ni_mio_cs.c
+++ b/comedi/drivers/ni_mio_cs.c
@@ -70,7 +70,6 @@ static struct caldac_struct *type2[]={&caldac_dac8800,&caldac_dac8043,NULL};
 static ni_board ni_boards[]={
        {       device_id:      0x010d,
                name:           "DAQCard-ai-16xe-50",
-       // This board apparently doesn't have DIO.  Not accounted for.
                n_adchan:       16,
                adbits:         16,
                ai_fifo_depth:  1024,