changes

diff --git a/comedi/drivers/comedi_parport.c b/comedi/drivers/comedi_parport.c
index ed54cb2a1d95c72e6c1888a76288cf89b00320fc..7c1784f1099a08de7de8a97b5ad5264d67835745 100644 (file)
--- a/comedi/drivers/comedi_parport.c
+++ b/comedi/drivers/comedi_parport.c
@@ -28,7 +28,7 @@
    - support bit mask ioctl
    - EPP/ECP support
 
-   see http://www.senet.com.au/~cpeacock/parallel.htm for information.
+   see http://www.beyondlogic.org/ for information.
  */
 
 #include <linux/kernel.h>

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index 9a7768af461502570caaf53cf458fedd3fdc4dde..3cadb08d06489d191a7e0038296e4bb9f0cdf11b 100644 (file)
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -234,9 +234,11 @@ mite_dma_tcr(devpriv->mite);
 #ifdef DEBUG
 rt_printk("ni-E: SC_TC interrupt\n");
 #endif
-               ni_handle_fifo_dregs(dev);
-               win_out(0x0000,Interrupt_A_Enable_Register);
-               comedi_done(dev,s);
+               if(s->cur_trig.n){      /* XXX fix */
+                       ni_handle_fifo_dregs(dev);
+                       win_out(0x0000,Interrupt_A_Enable_Register);
+                       comedi_done(dev,s);
+               }
 
                ack|=AI_SC_TC_Interrupt_Ack;
        }
@@ -391,6 +393,7 @@ static void ni_handle_fifo_dregs(comedi_device *dev)
                n=(s->cur_trig.data_len-s->buf_int_ptr)/sizeof(sampl_t);
                for(i=0;i<n;i++){
                        if(ni_readw(AI_Status_1)&AI_FIFO_Empty_St){
+                               s->cur_chan=j;
                                return;
                        }
                        d=ni_readw(ADC_FIFO_Data_Register);
@@ -410,7 +413,6 @@ static void ni_handle_fifo_dregs(comedi_device *dev)
                data=s->cur_trig.data;
                comedi_eobuf(dev,s);
        }
-       s->cur_chan=j;
 }
 
 /*

diff --git a/comedi/rtai.c b/comedi/rtai.c
index 69625053b377bb84978658aebf7e8ebb4e6e78da..c2fb90165316c16e221ab06e0b21574d7cfee0f8 100644 (file)
--- a/comedi/rtai.c
+++ b/comedi/rtai.c
@@ -26,8 +26,6 @@ static void handle_rtai_irq(void)
 {
        struct comedi_irq_struct *it=rtai_irq;
 
-       printk("handle_rtai_irq printk, %p\n",it);
-       rt_printk("handle_rtai_irq, %p\n",it);
        if(it)
                it->handler(it->irq,it->dev_id,NULL);
 
@@ -41,7 +39,6 @@ int get_priority_irq(struct comedi_irq_struct *it)
        //free_irq(it->irq,it->dev_id);
        rt_request_global_irq(it->irq,handle_rtai_irq);
        rt_startup_irq(it->irq); // rtai 1.3
-//     rt_enable_irq(it->irq);  // did it ever work ?
 
        return 0;
 }

diff --git a/include/comedi.h b/include/comedi.h
index fbd5f6dd837f24c68a140a3af36b094c4d852e18..b2c6c45e428a7746de0a76133f6d6a84e637fd05 100644 (file)
--- a/include/comedi.h
+++ b/include/comedi.h
@@ -346,7 +346,30 @@ int comedi_dio_write(unsigned int dev,unsigned int subdev,unsigned int chan,
        unsigned int val);
 int comedi_dio_bitfield(unsigned int dev,unsigned int subdev,unsigned int mask,
        unsigned int *bits);
-
+int comedi_get_n_subdevices(unsigned int dev);
+int comedi_get_version_code(unsigned int dev);
+char *comedi_get_driver_name(unsigned int dev);
+char *comedi_get_board_name(unsigned int minor);
+int comedi_get_subdevice_type(unsigned int minor,unsigned int subdevice);
+int comedi_find_subdevice_by_type(unsigned int minor,int type,unsigned int subd);
+int comedi_get_n_channels(unsigned int minor,unsigned int subdevice);
+lsampl_t comedi_get_maxdata(unsigned int minor,unsigned int subdevice,unsigned
+       int chan);
+int comedi_get_n_ranges(unsigned int minor,unsigned int subdevice,unsigned int
+       chan);
+
+
+
+/* ALPHA functions */
+unsigned int comedi_get_subdevice_flags(unsigned int minor,unsigned int
+       subdevice);
+int comedi_get_len_chanlist(unsigned int minor,unsigned int subdevice);
+int comedi_get_krange(unsigned int minor,unsigned int subdevice,unsigned int
+       chan, unsigned int range, comedi_krange *krange);
+unsigned int comedi_get_buf_head_pos(unsigned int minor,unsigned int
+       subdevice);
+int comedi_set_user_int_count(unsigned int minor,unsigned int subdevice,
+       unsigned int buf_user_count);
 
 #endif