lots of changes

diff --git a/Documentation/comedi/FAQ b/Documentation/comedi/FAQ
index 611d6869e7e9d205eb492af42772f58a162a4990..768e97221d9402be1bb5e6a6ad22509019cb0861 100644 (file)
--- a/Documentation/comedi/FAQ
+++ b/Documentation/comedi/FAQ
@@ -1,13 +1,5 @@
 
-1.  Should I use CONFIG_MODVERSIONS when compiling a Linux kernel?
-
-Short answer:  No.  Long answer: MODVERSIONS allows you to safely
-use a module on multiple kernel versions.  However, making comedi
-work with CONFIG_MODVERSIONS is a real pain.  Sometimes it works,
-sometimes it doesn't.
-
-
-2. I get the error message:
+1. I get the error message:
 
 Makefile:14: /usr/src/linux/.config: No such file or directory
 make: *** No rule to make target `/usr/src/linux/.config'.  Stop.
@@ -21,16 +13,3 @@ compiling your own kernel.  This file is automatically created
 when you run 'make config', the first step in compiling a kernel.
 
 
-3. When compiling programs that use libcomedi, I get error message:
-
-/usr/lib/libcomedi.a(range.o): In function `comedi_from_phys':
-range.o(.text+0x169): undefined reference to `floor'
-
-
-This error messsage indicates that the linker cannot resolve the
-reference to floor(), which is a function in the math library
-that is used in the function comedi_from_phys().  This only
-happens when you link statically.  Add '-lm' to your linking
-command.
-
-

diff --git a/Documentation/comedi/hardware b/Documentation/comedi/hardware
index 4d93fee1635d81e9fd73859579dee0c7852e9caa..8e2f0832fa28ac617f07ac3114385b59ccda133f 100644 (file)
--- a/Documentation/comedi/hardware
+++ b/Documentation/comedi/hardware
@@ -1,10 +1,14 @@
-Advantech                      ACL-8112-DG                     pcl711
-Advantech                      ACL-8112-HG                     pcl711
+ADLink                         ACL-8112-DG                     pcl711
+ADLink                         ACL-8112-HG                     pcl711
+ADLink                         ACL-6126                        pcl726
+ADLink                         ACL-6128                        pcl726
 Advantech                      PCL-711                         pcl711
 Advantech                      PCL-711B                        pcl711
 Advantech                      PCL-718                         pcl818
 Advantech                      PCL-725                         pcl725
 Advantech                      PCL-726                         pcl726
+Advantech                      PCL-727                         pcl726
+Advantech                      PCL-728                         pcl726
 Advantech                      PCL-812PG                       pcl812
 Advantech                      PCL-813B                        pcl812
 Advantech                      PCL-818                         pcl818
@@ -28,6 +32,16 @@ ComputerBoards                       CIO-DAS08/JR-16-AO              das08
 ComputerBoards                 CIO-DAS08/JR-AO                 das08
 ComputerBoards                 CIO-DAS08/JR-AO                 das08jr
 ComputerBoards                 CIO-DAS08/JR/16                 das08
+ComputerBoards                 CIO-DAS16                       das16
+ComputerBoards                 CIO-DAS16/F                     das16
+ComputerBoards                 CIO-DAS16/JR                    das16
+ComputerBoards                 CIO-DAS1401/12                  das16
+ComputerBoards                 CIO-DAS1402/12                  das16
+ComputerBoards                 CIO-DAS1402/16                  das16
+ComputerBoards                 CIO-DAS1601/12                  das16
+ComputerBoards                 CIO-DAS1602/12                  das16
+ComputerBoards                 CIO-DAS1602/16                  das16
+ComputerBoards                 CIO-DAS16/330                   das16
 Data Translation               DT21-EZ                         dt282x
 Data Translation               DT23-EZ                         dt282x
 Data Translation               DT24-EZ                         dt282x
@@ -79,7 +93,7 @@ National Instruments          AT-MIO-16E-2                    ni_atmio
 National Instruments           AT-MIO-16XE-10                  ni_atmio
 National Instruments           AT-MIO-16XE-50                  ni_atmio
 National Instruments           AT-MIO-64E-3                    ni_atmio
-National Instruments           DAQCard-AI-16E-4        *       ni_mio_cs
+National Instruments           DAQCard-AI-16E-4                ni_mio_cs
 National Instruments           DAQCard-AI-16XE-50              ni_mio_cs
 National Instruments           PCI-6023E                       ni_pcimio
 National Instruments           PCI-6024E                       ni_pcimio

diff --git a/Makefile b/Makefile
index 0b0284cc16dda02873507d7bb3b98ce37056d44f..c492f666bae3d2aafeb6b2a44fe949e6ee58b51d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
 
 CFLAGS = -Wall -O2 -Wstrict-prototypes
 CFLAGS += -D__KERNEL__ -I $(LINUXDIR)/include -I $(TOPDIR)/include -I .
+CFLAGS += -D__MODBUILD__
 
 CONFIG_SHELL := sh
 

diff --git a/comedi/Config.in b/comedi/Config.in
index 229b9e35fe61ff3b3f0c162f67581d51745fc5c2..8f85eb92ae4b6238c56b73a5db2679b21432d291 100644 (file)
--- a/comedi/Config.in
+++ b/comedi/Config.in
@@ -1,6 +1,10 @@
 
 comment 'Comedi Features'
 
+define_bool CONFIG_COMEDI_MODES y
+define_bool CONFIG_COMEDI_MODE0 y
+define_bool CONFIG_COMEDI_MODE_CORE y
+
 #bool 'Backwards compatibility' CONFIG_COMEDI_BACKWARDS
 
 if [ "$CONFIG_RTL" = "y" ];then
@@ -77,6 +81,7 @@ dep_tristate 'Intelligent Instrumentation PCI-20001C' CONFIG_COMEDI_II_PCI20KC $
 if [ "$CONFIG_PCI" = "y" ];then
        dep_tristate 'IOtech DaqBoard/2000' CONFIG_COMEDI_DAQBOARD2000 $CONFIG_COMEDI
 fi
+dep_tristate 'Skeleton driver' CONFIG_COMEDI_SKEL $CONFIG_COMEDI
 
 if [ "$CONFIG_COMEDI_RT" = "y" ];then
        comment 'Virtual device drivers'
@@ -85,4 +90,3 @@ if [ "$CONFIG_COMEDI_RT" = "y" ];then
        dep_tristate 'Direct Digital Synthesis' CONFIG_COMEDI_VD_DDS $CONFIG_COMEDI
 fi
 
-

diff --git a/comedi/Makefile b/comedi/Makefile
index fc64529349f48b2b505cca83acd0793067950a49..8213c6dda4d0b60de1b2d98b92177ffea82bda92 100644 (file)
--- a/comedi/Makefile
+++ b/comedi/Makefile
@@ -21,12 +21,12 @@ MOD_LIST_NAME := MISC_MODULES
 
 ifeq ($(CONFIG_COMEDI),y)
   O_TARGET := comedi.o
-  O_OBJS := comedi_fops.o dummy.o proc.o range.o drivers.o kvmem.o
+  O_OBJS := comedi_fops.o proc.o range.o drivers.o kvmem.o
   OX_OBJS := comedi_ksyms.o
 else
   ifeq ($(CONFIG_COMEDI),m)
     M_OBJS := comedi.o
-    MI_OBJS := comedi_fops.o dummy.o proc.o range.o drivers.o kvmem.o
+    MI_OBJS := comedi_fops.o proc.o range.o drivers.o kvmem.o
     MIX_OBJS := comedi_ksyms.o
   endif
 endif

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index fb79b8b536d73ee5f35ae0801fdce2effeb8a2f7..f93c9f0bca209f3de73b8343b6c8db74e4eefc26 100644 (file)
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -47,7 +47,9 @@ static int do_devconfig_ioctl(comedi_device *dev,comedi_devconfig *arg,kdev_t mi
 static int do_devinfo_ioctl(comedi_device *dev,comedi_devinfo *arg);
 static int do_subdinfo_ioctl(comedi_device *dev,comedi_subdinfo *arg,void *file);
 static int do_chaninfo_ioctl(comedi_device *dev,comedi_chaninfo *arg);
+#ifdef CONFIG_COMEDI_MODE_CORE
 static int do_trig_ioctl(comedi_device *dev,void *arg,void *file);
+#endif
 static int do_cmd_ioctl(comedi_device *dev,void *arg,void *file);
 static int do_lock_ioctl(comedi_device *dev,unsigned int arg,void * file);
 static int do_unlock_ioctl(comedi_device *dev,unsigned int arg,void * file);
@@ -74,8 +76,10 @@ static int comedi_ioctl(struct inode * inode,struct file * file,unsigned int cmd
                return do_chaninfo_ioctl(dev,(void *)arg);
        case COMEDI_RANGEINFO:
                return do_rangeinfo_ioctl(dev,(void *)arg);
+#ifdef CONFIG_COMEDI_MODE_CORE
        case COMEDI_TRIG:
                return do_trig_ioctl(dev,(void *)arg,file);
+#endif
        case COMEDI_LOCK:
                return do_lock_ioctl(dev,arg,file);
        case COMEDI_UNLOCK:
@@ -228,6 +232,7 @@ static int do_subdinfo_ioctl(comedi_device *dev,comedi_subdinfo *arg,void *file)
                        us->subd_flags |= SDF_FLAGS;
                if(s->range_table_list)
                        us->subd_flags |= SDF_RANGETYPE;
+#ifdef CONFIG_COMEDI_MODE_CORE
                if(s->trig[0])
                        us->subd_flags |= SDF_MODE0;
                if(s->trig[1])
@@ -238,6 +243,7 @@ static int do_subdinfo_ioctl(comedi_device *dev,comedi_subdinfo *arg,void *file)
                        us->subd_flags |= SDF_MODE3;
                if(s->trig[4])
                        us->subd_flags |= SDF_MODE4;
+#endif
        }
        
        ret=copy_to_user(arg,tmp,dev->n_subdevices*sizeof(comedi_subdinfo));
@@ -306,6 +312,7 @@ static int do_chaninfo_ioctl(comedi_device *dev,comedi_chaninfo *arg)
 }
 
 
+#ifdef CONFIG_COMEDI_MODE_CORE
 /*
        COMEDI_TRIG
        trigger ioctl
@@ -537,6 +544,9 @@ static int do_trig_ioctl_modeN(comedi_device *dev,comedi_subdevice *s,comedi_tri
                s->buf_user_count=0;
        }
 
+       s->cur_chan=0;
+       s->cur_chanlist_len=s->cur_trig.n_chan;
+
        s->cb_mask=COMEDI_CB_EOA|COMEDI_CB_BLOCK|COMEDI_CB_ERROR;
        if(s->cur_trig.flags & TRIG_WAKE_EOS){
                s->cb_mask|=COMEDI_CB_EOS;
@@ -561,6 +571,7 @@ cleanup:
        
        return ret;
 }
+#endif
 
 
 /*
@@ -813,8 +824,10 @@ static int do_cmd_ioctl(comedi_device *dev,void *arg,void *file)
        }
        s->cmd.data_len=s->prealloc_bufsz;
 
-       s->cur_trig.data=s->prealloc_buf;
+#ifdef CONFIG_COMEDI_MODE_CORE
+       s->cur_trig.data=s->prealloc_buf;       /* XXX */
        s->cur_trig.data_len=s->prealloc_bufsz;
+#endif
 
        s->buf_int_ptr=0;
        s->buf_int_count=0;
@@ -823,6 +836,11 @@ if(s->subdev_flags & SDF_READABLE){
        s->buf_user_count=0;
 }
        
+       s->cb_mask = COMEDI_CB_EOA|COMEDI_CB_BLOCK|COMEDI_CB_ERROR;
+       if(s->cmd.flags & TRIG_WAKE_EOS){
+               s->cb_mask |= COMEDI_CB_EOS;
+       }
+
        s->runflags=SRF_USER;
 #ifdef CONFIG_COMEDI_RT
        if(s->cmd.flags & TRIG_RT){
@@ -1191,8 +1209,10 @@ static ssize_t comedi_write_v22(struct file *file,const char *buf,size_t nbytes,
                if(s->busy != file)
                        return -EACCES;
 
-               buf_ptr=s->cur_trig.data;
+#ifdef CONFIG_COMEDI_MODE_CORE
+               buf_ptr=s->cur_trig.data; /* XXX */
                buf_len=s->cur_trig.data_len;
+#endif
        }
 
        if(!buf_ptr)
@@ -1275,8 +1295,10 @@ static ssize_t comedi_read_v22(struct file * file,char *buf,size_t nbytes,loff_t
        if(!s->busy)
                return 0;
 
-       if(!s->cur_trig.data || !(s->subdev_flags&SDF_READABLE))
+#ifdef CONFIG_COMEDI_MODE_CORE
+       if(!s->cur_trig.data || !(s->subdev_flags&SDF_READABLE))        /* XXX */
                return -EIO;
+#endif
 
        if(s->busy != file)
                return -EACCES;
@@ -1288,13 +1310,13 @@ static ssize_t comedi_read_v22(struct file * file,char *buf,size_t nbytes,loff_t
                n=nbytes;
 
                m=s->buf_int_count-s->buf_user_count;
-               if(m>s->cur_trig.data_len){
+               if(m>s->cur_trig.data_len){     /* XXX MODE */
                        s->buf_user_count=s->buf_int_count;
                        s->buf_user_ptr=s->buf_int_ptr;
                        retval=-EINVAL; /* OVERRUN */
                        break;
                }
-               if(s->buf_user_ptr+m > s->cur_trig.data_len){
+               if(s->buf_user_ptr+m > s->cur_trig.data_len){ /* XXX MODE */
                        m=s->cur_trig.data_len - s->buf_user_ptr;
 #if 0
 printk("m is %d\n",m);
@@ -1361,7 +1383,7 @@ static void do_become_nonbusy(comedi_device *dev,comedi_subdevice *s)
        }
 #endif
 
-       if(s->cur_trig.chanlist){
+       if(s->cur_trig.chanlist){               /* XXX wrong? */
                kfree(s->cur_trig.chanlist);
                s->cur_trig.chanlist=NULL;
        }
@@ -1604,7 +1626,7 @@ int init_module(void)
        return comedi_init();
 }
 
-int cleanup_module(void)
+void cleanup_module(void)
 {
        comedi_cleanup();
 }

diff --git a/comedi/comedi_module.h b/comedi/comedi_module.h
index 8c200f1dcd4d407a55a937bd301e4368dab25b46..96b41ac1e0a53865748b1e8aa6c5af471b8d17f2 100644 (file)
--- a/comedi/comedi_module.h
+++ b/comedi/comedi_module.h
@@ -30,7 +30,7 @@
 #include <linux/malloc.h>
 #include <linux/errno.h>
 #include <comedi.h>
-#ifdef COMEDI_STANDALONE
+#ifdef __MODBUILD__
 #include <config.h>
 #endif
 
@@ -93,7 +93,9 @@ struct comedi_subdevice_struct{
        
        unsigned int *chanlist;         /* driver-owned chanlist (not used) */
        
+#ifdef CONFIG_COMEDI_MODE_CORE
        comedi_trig     cur_trig;       /* current trig structure */
+#endif
        comedi_cmd      cmd;
        
        volatile unsigned int buf_int_ptr;      /* buffer marker for interrupt */
@@ -101,11 +103,14 @@ struct comedi_subdevice_struct{
        volatile unsigned int buf_int_count;    /* byte count for interrupt */
        unsigned int buf_user_count;            /* byte count for read() and write() */
        unsigned int cur_chan;          /* useless channel marker for interrupt */
+       unsigned int cur_chanlist_len;
        
+#ifdef CONFIG_COMEDI_MODE_CORE
        int (*trig[5])(comedi_device *,comedi_subdevice *,comedi_trig *);
+#endif
 
-       int (*insn_read)(comedi_device *,comedi_subdevice *,comedi_insn *,lsampl_t *data);
-       int (*insn_write)(comedi_device *,comedi_subdevice *,comedi_insn *,lsampl_t *data);
+       int (*insn_read)(comedi_device *,comedi_subdevice *,comedi_insn *,lsampl_t *);
+       int (*insn_write)(comedi_device *,comedi_subdevice *,comedi_insn *,lsampl_t *);
 
        int (*do_cmd)(comedi_device *,comedi_subdevice *);
        int (*do_cmdtest)(comedi_device *,comedi_subdevice *,comedi_cmd *);
@@ -191,8 +196,10 @@ void stop_polling(comedi_device *);
 void comedi_proc_init(void);
 void comedi_proc_cleanup(void);
 
+#ifdef CONFIG_COMEDI_MODE_CORE
 int di_unpack(unsigned int bits,comedi_trig *it);
 int do_pack(unsigned int *bits,comedi_trig *it);
+#endif
 
 #ifndef CONFIG_COMEDI_RT
 

diff --git a/comedi/drivers.c b/comedi/drivers.c
index 93ea63d847ab820410a35061181a3554b48e8e0f..f8aeca964a5fc0a5391545af306d99db8b6114b2 100644 (file)
--- a/comedi/drivers.c
+++ b/comedi/drivers.c
@@ -460,8 +460,6 @@ static int mode_to_command(comedi_cmd *cmd,comedi_trig *it)
 
 void init_drivers(void)
 {
-       REG(driver_dummy);
-#if 0
 #ifdef CONFIG_COMEDI_DT282x
        REG(driver_dt282x);
 #endif
@@ -540,6 +538,5 @@ void init_drivers(void)
 #ifdef CONFIG_COMEDI_DAQBOARD2000
        REG(driver_daqboard2000);
 #endif
-#endif
 }
 

diff --git a/comedi/drivers/Makefile b/comedi/drivers/Makefile
index f69eaf0e6110d42afd78bd2907bde3889b7a4e3a..a6de973bfb09ee993eb4394351230fbe47445d1f 100644 (file)
--- a/comedi/drivers/Makefile
+++ b/comedi/drivers/Makefile
@@ -59,6 +59,8 @@ obj-$(CONFIG_COMEDI_PARPORT)          += comedi_parport.o
 obj-$(CONFIG_COMEDI_RTI800)            += rti800.o
 obj-$(CONFIG_COMEDI_RTI802)            += rti802.o
 
+obj-$(CONFIG_COMEDI_SKEL)              += skel.o
+
 #obj-m += $(obj-y)
 
 O_OBJS         := $(sort $(filter-out $(export-objs), $(obj-y)))
@@ -73,5 +75,6 @@ include $(TOPDIR)/Rules.make
 
 ni_pcimio.o:   ni_mio_common.c
 ni_atmio.o:    ni_mio_common.c
+ni_mio_cs.o:   ni_mio_common.c
 
 

diff --git a/comedi/drivers/das08-new.c b/comedi/drivers/das08-new.c
index fa0140babaa29ccbe51db253fa8449544d6b965f..4100dc973689d0e7c08d60c538c72e90adc19c40 100644 (file)
--- a/comedi/drivers/das08-new.c
+++ b/comedi/drivers/das08-new.c
@@ -125,13 +125,13 @@
 
 */
 
-static int das08_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn);
-static int das08_di_rbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn);
-static int das08_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn);
-static int das08jr_di_rbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn);
-static int das08jr_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn);
-static int das08jr_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn);
-static int das08ao_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn);
+static int das08_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);
+static int das08_di_rbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);
+static int das08_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);
+static int das08jr_di_rbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);
+static int das08jr_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);
+static int das08jr_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);
+static int das08ao_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);
 
 static comedi_lrange range_das08_pgl = { 9, {
        BIP_RANGE(10),
@@ -339,7 +339,7 @@ struct das08_private_struct{
 
 #define TIMEOUT 1000
 
-static int das08_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn)
+static int das08_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data)
 {
        int i,n;
        int chan;
@@ -389,14 +389,14 @@ static int das08_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *in
        return n;
 }
 
-static int das08_di_rbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn)
+static int das08_di_rbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data)
 {
        insn->data[0]=DAS08_IP(inb(dev->iobase+DAS08_STATUS));
 
        return 1;
 }
 
-static int das08_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn)
+static int das08_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data)
 {
        /* XXX race with ai */
 
@@ -407,21 +407,21 @@ static int das08_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *in
        return 1;
 }
 
-static int das08jr_di_rbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn)
+static int das08jr_di_rbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data)
 {
        insn->data[0]=inb(dev->iobase+DAS08JR_DIO);
 
        return 1;
 }
 
-static int das08jr_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn)
+static int das08jr_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data)
 {
        outb(insn->data[0],dev->iobase+DAS08JR_DIO);
 
        return 1;
 }
 
-static int das08jr_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn)
+static int das08jr_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data)
 {
        int n;
        int lsb,msb;
@@ -457,7 +457,7 @@ static int das08jr_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *
  * a different method to force an update.
  *
  */
-static int das08ao_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn)
+static int das08ao_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data)
 {
        int n;
        int lsb,msb;

diff --git a/comedi/drivers/das16-new.c b/comedi/drivers/das16-new.c
index 3047a893f1c6eea29ccaa0410da92e11c21f445d..186c062db2df27fece751d1d68380ca296a16b76 100644 (file)
--- a/comedi/drivers/das16-new.c
+++ b/comedi/drivers/das16-new.c
@@ -206,10 +206,10 @@ static comedi_lrange *das16_ai_bip_lranges[]={
        &range_das1x02_bip,
 };
 
-static int das16_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn);
-static int das16_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn);
-static int das16_di_rbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn);
-static int das16_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn);
+static int das16_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);
+static int das16_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);
+static int das16_di_rbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);
+static int das16_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data);
 
 struct das16_board_struct{
        char            *name;
@@ -409,7 +409,7 @@ struct das16_private_struct {
 #define thisboard ((struct das16_board_struct *)(dev->board_ptr))
 
 
-static int das16_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn)
+static int das16_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data)
 {
        int i,n;
        int range;
@@ -449,41 +449,41 @@ static int das16_ai_rinsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *in
                msb = inb(dev->iobase + DAS16_AI_MSB);
                lsb = inb(dev->iobase + DAS16_AI_LSB);
                if(thisboard->ai_nbits==12){
-                       insn->data[n] = (lsb>>4) | (msb << 4);
+                       data[n] = (lsb>>4) | (msb << 4);
                }else{
-                       insn->data[n] = lsb | (msb << 8);
+                       data[n] = lsb | (msb << 8);
                }
        }
 
        return n;
 }
 
-static int das16_di_rbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn)
+static int das16_di_rbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data)
 {
-       insn->data[0]=inb(dev->iobase+DAS16_DIO)&0xf;
+       data[0]=inb(dev->iobase+DAS16_DIO)&0xf;
 
        return 1;
 }
 
-static int das16_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn)
+static int das16_do_wbits(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data)
 {
-       outb(insn->data[0],dev->iobase+DAS16_DIO);
+       outb(data[0],dev->iobase+DAS16_DIO);
 
        return 1;
 }
 
-static int das16_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn)
+static int das16_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *insn,lsampl_t *data)
 {
        int n;
        int lsb,msb;
        int chan;
 
        if(thisboard->ao_nbits==12){
-               lsb=(insn->data[0]<<4)&0xff;
-               msb=(insn->data[0]>>4)&0xff;
+               lsb=(data[0]<<4)&0xff;
+               msb=(data[0]>>4)&0xff;
        }else{
-               lsb=insn->data[0]&0xff;
-               msb=(insn->data[0]>>8)&0xff;
+               lsb=data[0]&0xff;
+               msb=(data[0]>>8)&0xff;
        }
 
        chan=CR_CHAN(insn->chanspec);
@@ -506,13 +506,6 @@ static int das16_ao_winsn(comedi_device *dev,comedi_subdevice *s,comedi_insn *in
 
 
 
-static void das16_init(comedi_device *dev)
-{
-       outb(DAS16_IRQ(dev->irq),dev->iobase+DAS16_CONTROL);
-       outb(0,DAS16_PACER);
-
-}
-
 static int detect_ao(comedi_device *dev)
 {
        int in_aa;
@@ -635,6 +628,11 @@ static int das16_attach(comedi_device *dev, comedi_devconfig *it)
 
        printk("comedi%d: das16:",dev->minor);
 
+       if((ret=alloc_private(dev,sizeof(struct das16_private_struct)))<0)
+               return ret;
+
+       dev->board = das16_probe(dev);
+
        dev->board_ptr = das16_boards + dev->board;
        dev->board_name = thisboard->name;
 
@@ -659,8 +657,6 @@ static int das16_attach(comedi_device *dev, comedi_devconfig *it)
        dev->n_subdevices = 5;
        if((ret=alloc_subdevices(dev))<0)
                return ret;
-       if((ret=alloc_private(dev,sizeof(struct das16_private_struct)))<0)
-               return ret;
 
        if(thisboard->size<0x400){
                request_region(dev->iobase,thisboard->size,"das16");
@@ -740,6 +736,9 @@ static int das16_attach(comedi_device *dev, comedi_devconfig *it)
                s->type = COMEDI_SUBD_UNUSED;
        }
 
+       outb(DAS16_IRQ(dev->irq),dev->iobase+DAS16_CONTROL);
+       outb(0,DAS16_PACER);
+
        return 0;
 }
 

diff --git a/comedi/drivers/dt282x.c b/comedi/drivers/dt282x.c
index 504f35e58701f8815cb9dd2bd7f62eb41c9bc6c5..578de19bcd76615b02bfd0bcff279c587fd76890 100644 (file)
--- a/comedi/drivers/dt282x.c
+++ b/comedi/drivers/dt282x.c
@@ -820,6 +820,7 @@ static int dt282x_ai_cmd(comedi_device * dev, comedi_subdevice * s)
        return 0;
 }
 
+#ifdef CONFIG_COMEDI_MODES
 static int dt282x_ai_mode1(comedi_device * dev, comedi_subdevice * s, comedi_trig * it)
 {
        int timer;
@@ -954,6 +955,7 @@ static int dt282x_ai_mode4(comedi_device * dev, comedi_subdevice * s, comedi_tri
                return 0;
        }
 }
+#endif
 
 static int dt282x_ai_cancel(comedi_device * dev, comedi_subdevice * s)
 {
@@ -1034,6 +1036,122 @@ static int dt282x_ao(comedi_device * dev, comedi_subdevice * s, comedi_trig * it
        return 1;
 }
 
+static int dt282x_ao_cmdtest(comedi_device *dev,comedi_subdevice *s,comedi_cmd *cmd)
+{
+       int err=0;
+       int tmp;
+
+       /* step 1: make sure trigger sources are trivially valid */
+
+       tmp=cmd->start_src;
+       cmd->start_src &= TRIG_NOW;
+       if(!cmd->start_src && tmp!=cmd->start_src)err++;
+
+       tmp=cmd->scan_begin_src;
+       cmd->scan_begin_src &= TRIG_TIMER;
+       if(!cmd->scan_begin_src && tmp!=cmd->scan_begin_src)err++;
+
+       tmp=cmd->convert_src;
+       cmd->convert_src &= TRIG_NOW;
+       if(!cmd->convert_src && tmp!=cmd->convert_src)err++;
+
+       tmp=cmd->scan_end_src;
+       cmd->scan_end_src &= TRIG_COUNT;
+       if(!cmd->scan_end_src && tmp!=cmd->scan_end_src)err++;
+
+       tmp=cmd->stop_src;
+       //cmd->stop_src &= TRIG_COUNT|TRIG_NONE;
+       cmd->stop_src &= TRIG_COUNT;    /* XXX */
+       if(!cmd->stop_src && tmp!=cmd->stop_src)err++;
+
+       if(err)return 1;
+
+       /* step 2: make sure trigger sources are unique and mutually compatible */
+
+       /* note that mutual compatiblity is not an issue here */
+       if(cmd->stop_src!=TRIG_COUNT &&
+          cmd->stop_src!=TRIG_NONE)err++;
+
+       if(err)return 2;
+
+       /* step 3: make sure arguments are trivially compatible */
+
+       if(cmd->start_arg!=0){
+               cmd->start_arg=0;
+               err++;
+       }
+       if(cmd->scan_begin_arg <= 5000 /* XXX unknown */){
+               cmd->scan_begin_arg = 5000;
+               err++;
+       }
+       if(cmd->convert_arg != 0){
+               cmd->convert_arg = 0;
+               err++;
+       }
+       if(cmd->scan_end_arg > 2){
+               /* XXX chanlist stuff? */
+               cmd->scan_end_arg = 2;
+               err++;
+       }
+       if(cmd->stop_src==TRIG_COUNT){
+               /* any count is allowed */
+       }else{
+               /* TRIG_NONE */
+               if(cmd->stop_arg!=0){
+                       cmd->stop_arg=0;
+                       err++;
+               }
+       }
+
+       if(err)return 3;
+
+       /* step 4: fix up any arguments */
+
+       tmp=cmd->scan_begin_arg;
+       dt282x_ns_to_timer(&cmd->scan_begin_arg,cmd->flags&TRIG_ROUND_MASK);
+       if(tmp!=cmd->scan_begin_arg)err++;
+
+       if(err)return 4;
+
+       return 0;
+
+}
+
+static int dt282x_ao_cmd(comedi_device *dev,comedi_subdevice *s)
+{
+       int size;
+       int timer;
+       comedi_cmd *cmd=&s->cmd;
+
+       devpriv->supcsr = DT2821_ERRINTEN | DT2821_DS1 | DT2821_DDMA;
+       update_supcsr(DT2821_CLRDMADNE | DT2821_BUFFB | DT2821_DACINIT);
+
+       devpriv->ntrig=cmd->stop_arg*cmd->chanlist_len;
+       devpriv->nread=devpriv->ntrig;
+
+       devpriv->dma_dir=DMA_MODE_WRITE;
+       devpriv->current_dma_chan=0;
+
+       size=copy_from_buf(dev,s,devpriv->dma[0].buf,devpriv->dma_maxsize*2);
+       prep_ao_dma(dev,0,size/2);
+       enable_dma(devpriv->dma[0].chan);
+
+       size=copy_from_buf(dev,s,devpriv->dma[1].buf,devpriv->dma_maxsize*2);
+       prep_ao_dma(dev,1,size/2);
+       enable_dma(devpriv->dma[1].chan);
+       
+       timer=dt282x_ns_to_timer(&cmd->scan_begin_arg,TRIG_ROUND_NEAREST);
+       outw(timer, dev->iobase + DT2821_TMRCTR);
+
+       devpriv->dacsr = DT2821_SSEL| DT2821_DACLK | DT2821_IDARDY;
+       update_dacsr(0);
+
+       update_supcsr(DT2821_STRIG);
+
+       return 0;
+}
+
+#ifdef CONFIG_COMEDI_MODES
 static int dt282x_ao_mode2(comedi_device *dev,comedi_subdevice *s,comedi_trig *it)
 {
        int size;
@@ -1066,6 +1184,7 @@ static int dt282x_ao_mode2(comedi_device *dev,comedi_subdevice *s,comedi_trig *i
 
        return 0;
 }
+#endif
 
 static int dt282x_ao_cancel(comedi_device * dev, comedi_subdevice * s)
 {
@@ -1267,9 +1386,13 @@ static int dt282x_attach(comedi_device * dev, comedi_devconfig * it)
        s->type=COMEDI_SUBD_AI;
        s->subdev_flags=SDF_READABLE|((it->options[opt_diff])?SDF_DIFF:SDF_COMMON);
        s->n_chan=(it->options[opt_diff])?boardtype.adchan_di:boardtype.adchan_se;
+#ifdef CONFIG_COMEDI_MODE0
        s->trig[0]=dt282x_ai_mode0;
+#endif
+#ifdef CONFIG_COMEDI_MODES
        s->trig[1]=dt282x_ai_mode1;
        s->trig[4]=dt282x_ai_mode4;
+#endif
        s->do_cmdtest=dt282x_ai_cmdtest;
        s->do_cmd=dt282x_ai_cmd;
        s->cancel=dt282x_ai_cancel;
@@ -1283,8 +1406,14 @@ static int dt282x_attach(comedi_device * dev, comedi_devconfig * it)
                /* ao subsystem */
                s->type=COMEDI_SUBD_AO;
                s->subdev_flags=SDF_WRITEABLE;
+#ifdef CONFIG_COMEDI_MODE0
                s->trig[0]=dt282x_ao;
+#endif
+#ifdef CONFIG_COMEDI_MODES
                s->trig[2]=dt282x_ao_mode2;
+#endif
+               s->do_cmdtest=dt282x_ao_cmdtest;
+               s->do_cmd=dt282x_ao_cmd;
                s->cancel=dt282x_ao_cancel;
                s->maxdata=(1<<boardtype.dabits)-1;
                s->len_chanlist=1;                      /* XXX could do 2 */

diff --git a/comedi/drivers/ni_atmio.c b/comedi/drivers/ni_atmio.c
index 5953e69e91622776ccc4eb2fa319e5d849cac56e..6e52a63c8e176dc6b9e9a5c9a25a9aee8d134097 100644 (file)
--- a/comedi/drivers/ni_atmio.c
+++ b/comedi/drivers/ni_atmio.c
@@ -270,8 +270,6 @@ typedef struct{
        unsigned short gpct_input_select0;
        unsigned short gpct_input_select1;
 
-       unsigned int ai_n_chans;
-       unsigned int ai_chanlistptr;
        unsigned short ai_xorlist[512];
 }ni_private;
 #define devpriv ((ni_private *)dev->private)

diff --git a/comedi/drivers/ni_atmio16d.c b/comedi/drivers/ni_atmio16d.c
index abb77e1f44b661407a5d1b29aad1f85a65f22a0a..a78731494550cfaa2f179845262405b5839cc989 100644 (file)
--- a/comedi/drivers/ni_atmio16d.c
+++ b/comedi/drivers/ni_atmio16d.c
@@ -264,9 +264,8 @@ static void atmio16d_interrupt(int irq, void *d, struct pt_regs *regs)
        s->buf_int_ptr += sizeof(sampl_t);
        s->buf_int_count += sizeof(sampl_t);
        
-       if((++s->cur_chan) >= s->cmd.chanlist_len) {    /* one scan done */
+       if((++s->cur_chan) >= s->cur_chanlist_len) {    /* one scan done */
                s->cur_chan = 0;
-               s->cur_trig.flags |= TRIG_WAKE_EOS;
                comedi_eos(dev, s);
        }
 

diff --git a/comedi/drivers/ni_mio_common.c b/comedi/drivers/ni_mio_common.c
index c1382693bcce027b714ae8ee03530f4c2192ec13..9a7768af461502570caaf53cf458fedd3fdc4dde 100644 (file)
--- a/comedi/drivers/ni_mio_common.c
+++ b/comedi/drivers/ni_mio_common.c
@@ -142,11 +142,11 @@ static comedi_lrange *ni_range_lkup[]={
 
 
 static int ni_dio(comedi_device *dev,comedi_subdevice *s,comedi_trig *it);
-static int ni_read_eeprom(comedi_device *dev,int addr);
-
 static int ni_eeprom(comedi_device *dev,comedi_subdevice *s,comedi_trig *it);
 static int ni_calib(comedi_device *dev,comedi_subdevice *s,comedi_trig *it);
+
 static void caldac_setup(comedi_device *dev,comedi_subdevice *s);
+static int ni_read_eeprom(comedi_device *dev,int addr);
 
 
 static void ni_handle_fifo_half_full(comedi_device *dev);
@@ -230,15 +230,6 @@ mite_dma_tcr(devpriv->mite);
                return;
        }
 
-#if 0
-       /* this is wrong, since we do AO now  */
-       if(!dev->subdevices->cur_trig.data){
-               rt_printk("aiee! cur_trig.data got zapped!\n");
-               comedi_done(dev,s);
-               return;
-       }
-#endif
-
        if(status&AI_SC_TC_St){
 #ifdef DEBUG
 rt_printk("ni-E: SC_TC interrupt\n");
@@ -249,28 +240,8 @@ rt_printk("ni-E: SC_TC interrupt\n");
 
                ack|=AI_SC_TC_Interrupt_Ack;
        }
-       if(status&AI_FIFO_Half_Full_St){
-               ni_handle_fifo_half_full(dev);
-       }
-       if(dev->subdevices->cur_trig.flags&TRIG_WAKE_EOS){
-#if 0
-               if(status&AI_START_St){
-                       /* just ack it */
-                       ack|=AI_START_Interrupt_Ack;
-               }
-#endif
-               if(status&AI_STOP_St){
-                       ni_handle_fifo_dregs(dev);
-       
-                       comedi_eos(dev,dev->subdevices+0);
-       
-                       /* we need to ack the START, also */
-                       ack|=AI_STOP_Interrupt_Ack|AI_START_Interrupt_Ack;
-               }
-       }
-#if 0
        switch(devpriv->aimode){
-       deafult:
+       default:
                break;
        case AIMODE_HALF_FULL:
                if(status&AI_FIFO_Half_Full_St){
@@ -295,14 +266,13 @@ rt_printk("ni-E: SC_TC interrupt\n");
                break;
        case AIMODE_SAMPLE:
                ni_handle_fifo_dregs(dev);
-               if(s->buf_int_count>=s->cur_chan){
-                       while(s->buf_int_count>=s->cur_chan)
-                               s->cur_chan+=s->cur_trig.n_chan*sizeof(sampl_t);
+#if 0
+               if(s->event_mask&COMEDI_CB_EOS){
                        comedi_eos(dev,dev->subdevices+0);
                }
+#endif
                break;
        }
-#endif
 
        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));
@@ -341,16 +311,19 @@ static void ni_ai_fifo_read(comedi_device *dev,comedi_subdevice *s,
        unsigned int mask;
 
        mask=(1<<boardtype.adbits)-1;
-       j=devpriv->ai_chanlistptr;
+       j=s->cur_chan;
        for(i=0;i<n;i++){
                d=ni_readw(ADC_FIFO_Data_Register);
                d^=devpriv->ai_xorlist[j];
                d&=mask;
                data[i]=d;
                j++;
-               if(j>=s->cur_trig.n_chan)j=0;
+               if(j>=s->cur_chanlist_len){
+                       j=0;
+                       //s->event_mask |= COMEDI_CB_EOS;
+               }
        }
-       devpriv->ai_chanlistptr=j;
+       s->cur_chan=j;
 }
 
 
@@ -412,7 +385,7 @@ static void ni_handle_fifo_dregs(comedi_device *dev)
        */
 
        mask=(1<<boardtype.adbits)-1;
-       j=devpriv->ai_chanlistptr;
+       j=s->cur_chan;
        data=((void *)s->cur_trig.data)+s->buf_int_ptr;
        while(1){
                n=(s->cur_trig.data_len-s->buf_int_ptr)/sizeof(sampl_t);
@@ -425,7 +398,10 @@ static void ni_handle_fifo_dregs(comedi_device *dev)
                        d&=mask;
                        *data=d;
                        j++;
-                       if(j>=s->cur_trig.n_chan)j=0;
+                       if(j>=s->cur_chanlist_len){
+                               j=0;
+                               //s->event_mask |= COMEDI_CB_EOS;
+                       }
                        data++;
                        s->buf_int_ptr+=sizeof(sampl_t);
                        s->buf_int_count+=sizeof(sampl_t);
@@ -434,7 +410,7 @@ static void ni_handle_fifo_dregs(comedi_device *dev)
                data=s->cur_trig.data;
                comedi_eobuf(dev,s);
        }
-       devpriv->ai_chanlistptr=j;
+       s->cur_chan=j;
 }
 
 /*
@@ -662,7 +638,7 @@ static int ni_ai_cmdtest(comedi_device *dev,comedi_subdevice *s,comedi_cmd *cmd)
        if(!cmd->scan_begin_src && tmp!=cmd->scan_begin_src)err++;
 
        tmp=cmd->convert_src;
-       cmd->convert_src &= TRIG_TIMER;
+       cmd->convert_src &= TRIG_TIMER|TRIG_EXT;
        if(!cmd->convert_src && tmp!=cmd->convert_src)err++;
 
        tmp=cmd->scan_end_src;
@@ -680,6 +656,8 @@ static int ni_ai_cmdtest(comedi_device *dev,comedi_subdevice *s,comedi_cmd *cmd)
        /* note that mutual compatiblity is not an issue here */
        if(cmd->scan_begin_src!=TRIG_TIMER &&
           cmd->scan_begin_src!=TRIG_EXT)err++;
+       if(cmd->convert_src!=TRIG_TIMER &&
+          cmd->convert_src!=TRIG_EXT)err++;
 
        if(err)return 2;
 
@@ -694,26 +672,35 @@ static int ni_ai_cmdtest(comedi_device *dev,comedi_subdevice *s,comedi_cmd *cmd)
                        cmd->scan_begin_arg=boardtype.ai_speed;
                        err++;
                }
-               if(cmd->scan_begin_arg>TIMER_BASE*0xffff){      /* XXX */
-                       cmd->scan_begin_arg=TIMER_BASE*0xffff;
+               if(cmd->scan_begin_arg>TIMER_BASE*0xffffff){
+                       cmd->scan_begin_arg=TIMER_BASE*0xffffff;
                        err++;
                }
        }else{
                /* external trigger */
                /* should be level/edge, hi/lo specification here */
                /* should specify multiple external triggers */
-               if(cmd->scan_begin_arg!=0){
-                       cmd->scan_begin_arg=0;
+               if(cmd->scan_begin_arg>9){
+                       cmd->scan_begin_arg=9;
                        err++;
                }
        }
-       if(cmd->convert_arg<boardtype.ai_speed){
-               cmd->convert_arg=boardtype.ai_speed;
-               err++;
-       }
-       if(cmd->convert_arg>TIMER_BASE*0xffff){ /* XXX */
-               cmd->convert_arg=TIMER_BASE*0xffff;
-               err++;
+       if(cmd->convert_src==TRIG_TIMER){
+               if(cmd->convert_arg<boardtype.ai_speed){
+                       cmd->convert_arg=boardtype.ai_speed;
+                       err++;
+               }
+               if(cmd->convert_arg>TIMER_BASE*0xffff){
+                       cmd->convert_arg=TIMER_BASE*0xffff;
+                       err++;
+               }
+       }else{
+               /* external trigger */
+               /* see above */
+               if(cmd->convert_arg>9){
+                       cmd->convert_arg=9;
+                       err++;
+               }
        }
 
        if(cmd->scan_end_arg!=cmd->chanlist_len){
@@ -761,6 +748,8 @@ static int ni_ai_cmd(comedi_device *dev,comedi_subdevice *s)
        int wsave;
        comedi_cmd *cmd=&s->cmd;
        int timer;
+       int mode1=0; /* mode1 is needed for both stop and convert */
+       int mode2=0;
 
        wsave = win_save();
 
@@ -777,11 +766,12 @@ static int ni_ai_cmd(comedi_device *dev,comedi_subdevice *s)
                /* stage number of scans */
                win_out((cmd->stop_arg-1)>>16,AI_SC_Load_A_Registers);
                win_out((cmd->stop_arg-1)&0xffff,AI_SC_Load_A_Registers+1);
+
+               mode1 |= AI_Start_Stop | AI_Mode_1_Reserved | AI_Trigger_Once;
+               win_out(mode1,AI_Mode_1_Register);
        
                /* load SC (Scan Count) */
-               win_out(0x20,AI_Command_1_Register);
-
-               win_out(0x000d,AI_Mode_1_Register);
+               win_out(AI_SC_Load,AI_Command_1_Register);
 
                break;
        case TRIG_NONE:
@@ -789,10 +779,11 @@ static int ni_ai_cmd(comedi_device *dev,comedi_subdevice *s)
                win_out(0,AI_SC_Load_A_Registers);
                win_out(0,AI_SC_Load_A_Registers+1);
        
-               /* load SC (Scan Count) */
-               win_out(0x20,AI_Command_1_Register);
+               mode1 |= AI_Start_Stop | AI_Mode_1_Reserved | AI_Continuous;
+               win_out(mode1,AI_Mode_1_Register);
 
-               win_out(0x000e,AI_Mode_1_Register);
+               /* load SC (Scan Count) */
+               win_out(AI_SC_Load,AI_Command_1_Register);
 
                break;
        }
@@ -819,10 +810,13 @@ static int ni_ai_cmd(comedi_device *dev,comedi_subdevice *s)
                timer=ni_ns_to_timer(&cmd->scan_begin_arg,TRIG_ROUND_NEAREST);
                win_out((timer>>16),AI_SI_Load_A_Registers);
                win_out((timer&0xffff),AI_SI_Load_A_Registers+1);
+
                /* AI_SI_Initial_Load_Source=A */
-               win_out(0,AI_Mode_2_Register);
+               mode2 |= AI_SI_Initial_Load_Source&0;
+               win_out(mode2,AI_Mode_2_Register);
+
                /* load SI */
-               win_out(0x200,AI_Command_1_Register);
+               win_out(AI_SI_Load,AI_Command_1_Register);
 
                /* stage freq. counter into SI B */
                win_out((timer>>16),AI_SI_Load_B_Registers);
@@ -830,39 +824,65 @@ static int ni_ai_cmd(comedi_device *dev,comedi_subdevice *s)
 
                break;
        case TRIG_EXT:
-               win_out(AI_START_Edge|AI_START_Sync|AI_START_Select(1)|
+               win_out(AI_START_Edge|AI_START_Sync|
+                       AI_START_Select(1+cmd->scan_begin_arg)|
                        AI_STOP_Select(19)|AI_STOP_Sync,
                        AI_START_STOP_Select_Register);
                break;
        }
 
-       timer=ni_ns_to_timer(&cmd->convert_arg,TRIG_ROUND_NEAREST);
-       win_out(timer,AI_SI2_Load_A_Register); /* 0,0 does not work. */
-       win_out(timer,AI_SI2_Load_B_Register);
+       switch(cmd->convert_src){
+       case TRIG_TIMER:
+               timer=ni_ns_to_timer(&cmd->convert_arg,TRIG_ROUND_NEAREST);
+               win_out(timer,AI_SI2_Load_A_Register); /* 0,0 does not work. */
+               win_out(timer,AI_SI2_Load_B_Register);
 
-       /* AI_SI2_Reload_Mode = alternate */
-       /* AI_SI2_Initial_Load_Source = A */
-       win_out(0x0100,AI_Mode_2_Register);
+               /* AI_SI2_Reload_Mode = alternate */
+               /* AI_SI2_Initial_Load_Source = A */
+               win_out((AI_SI2_Initial_Load_Source&0)|
+                       (AI_SI2_Reload_Mode),
+                       AI_Mode_2_Register);
 
-       /* AI_SI2_Load */
-       win_out(0x0800,AI_Command_1_Register);
+               /* AI_SI2_Load */
+               win_out(AI_SI2_Load,AI_Command_1_Register);
 
-       /* AI_SI_Initial_Load_Source=0
-          AI_SI_Reload_Mode(0)
-          AI_SI2_Reload_Mode = alternate, AI_SI2_Initial_Load_Source = B */
-       win_out(0x0300,AI_Mode_2_Register);
+               mode2 |= AI_SI_Reload_Mode(0);
+               mode2 |= 0&AI_SI_Initial_Load_Source;
+               mode2 |= AI_SI2_Reload_Mode; // alternate
+               mode2 |= AI_SI2_Initial_Load_Source; // B
+
+               win_out(mode2,AI_Mode_2_Register);
+
+               break;
+       case TRIG_EXT:
+               mode1 |= AI_CONVERT_Source_Select(1+cmd->convert_arg) |
+                       AI_CONVERT_Source_Polarity |
+                       AI_Start_Stop;
+               win_out(mode1,AI_Mode_1_Register);
+
+               win_out(mode2 | AI_SI2_Reload_Mode,AI_Mode_2_Register);
+
+               mode2 |= AI_SI_Reload_Mode(0);
+               mode2 |= 0&AI_SI_Initial_Load_Source;
+               mode2 |= AI_SI2_Reload_Mode; // alternate
+               mode2 |= AI_SI2_Initial_Load_Source; // B
+
+               win_out(mode2,AI_Mode_2_Register);
+
+               break;
+       }
 
        if(dev->irq){
                int bits;
 
                /* interrupt on FIFO, errors, SC_TC */
-               bits=0x00a1;
+               bits=AI_FIFO_Interrupt_Enable|
+                       AI_Error_Interrupt_Enable|
+                       AI_SC_TC_Interrupt_Enable;
 
-               if(cmd->flags&TRIG_WAKE_EOS){
+               if(s->cb_mask&COMEDI_CB_EOS){
                        /* wake on end-of-scan */
                        devpriv->aimode=AIMODE_SCAN;
-               }else if(s->cb_mask&COMEDI_CB_EOS){
-                       devpriv->aimode=AIMODE_SAMPLE;
                }else{
                        devpriv->aimode=AIMODE_HALF_FULL;
                }
@@ -911,12 +931,6 @@ static int ni_ai_cmd(comedi_device *dev,comedi_subdevice *s)
        /* AI_START1_Pulse */
        win_out(AI_START1_Pulse,AI_Command_2_Register);
 
-       devpriv->ai_n_chans = s->cur_trig.n_chan;
-#if 0
-       /* XXX hack alert */
-       s->cur_chan=s->cur_trig.n_chan*sizeof(sampl_t);
-#endif
-
        win_restore(wsave);
        return 0;
 }
@@ -1008,11 +1022,9 @@ static int ni_ai_mode2(comedi_device *dev,comedi_subdevice *s,comedi_trig *it)
                     AI_SC_TC_Interrupt_Enable;
                //bits|=Pass_Thru_0_Interrupt_Enable;
 
-               if(it->flags&TRIG_WAKE_EOS){
+               if(s->cb_mask&COMEDI_CB_EOS){
                        /* wake on end-of-scan */
                        devpriv->aimode=AIMODE_SCAN;
-               }else if(s->cb_mask&COMEDI_CB_EOS){
-                       devpriv->aimode=AIMODE_SAMPLE;
                }else{
                        devpriv->aimode=AIMODE_HALF_FULL;
                }
@@ -1072,9 +1084,6 @@ rt_printk("end config\n");
 rt_printk("START1 pulse\n");
 #endif
 
-       /* XXX hack alert */
-       s->cur_chan=s->cur_trig.n_chan*sizeof(sampl_t);
-
        win_restore(wsave);
        return 0;
 }
@@ -1164,11 +1173,9 @@ static int ni_ai_mode4(comedi_device *dev,comedi_subdevice *s,comedi_trig *it)
                /* interrupt on FIFO, errors, SC_TC */
                bits=0x00a1;
 
-               if(it->flags&TRIG_WAKE_EOS){
+               if(s->cb_mask&COMEDI_CB_EOS){
                        /* wake on end-of-scan */
                        devpriv->aimode=AIMODE_SCAN;
-               }else if(s->cb_mask&COMEDI_CB_EOS){
-                       devpriv->aimode=AIMODE_SAMPLE;
                }else{
                        devpriv->aimode=AIMODE_HALF_FULL;
                }
@@ -1210,9 +1217,6 @@ static int ni_ai_mode4(comedi_device *dev,comedi_subdevice *s,comedi_trig *it)
        /* AI_START1_Pulse */
        win_out(AI_START1_Pulse,AI_Command_2_Register);
 
-       /* XXX hack alert */
-       s->cur_chan=s->cur_trig.n_chan*sizeof(sampl_t);
-
        win_restore(wsave);
        return 0;
 }

diff --git a/comedi/drivers/ni_mio_cs.c b/comedi/drivers/ni_mio_cs.c
index e8fb979a5b2101396a70e830152f95b731d2c5b9..163678076419e80f369ee1c55cffdd29dc60cf86 100644 (file)
--- a/comedi/drivers/ni_mio_cs.c
+++ b/comedi/drivers/ni_mio_cs.c
@@ -22,36 +22,12 @@
 */
 
 /*
-       The real guts of the driver is in ni-E.c, which is included
-       both here and in pcimio-E.c
-
-       
-       Interrupt support added by Truxton Fulton <trux@truxton.com>
+       The real guts of the driver is in ni_mio_common.c, which is
+       included by all the E series drivers.
 
        References for specifications:
        
-          321747b.pdf  Register Level Programmer Manual (obsolete)
-          321747c.pdf  Register Level Programmer Manual (new)
-          DAQ-STC reference manual
-
-       Other possibly relevant info:
-       
-          320517c.pdf  User manual (obsolete)
-          320517f.pdf  User manual (new)
-          320889a.pdf  delete
-          320906c.pdf  maximum signal ratings
-          321066a.pdf  about 16x
-          321791a.pdf  discontinuation of at-mio-16e-10 rev. c
-          321808a.pdf  about at-mio-16e-10 rev P
-          321837a.pdf  discontinuation of at-mio-16de-10 rev d
-          321838a.pdf  about at-mio-16de-10 rev N
-       
-       ISSUES:
-
-       need to deal with external reference for DAC, and other DAC
-       properties in board properties
-       
-       deal with at-mio-16de-10 revision D to N changes, etc.
+          341080a.pdf  DAQCard E Series Register Level Programmer Manual
        
 */
 
@@ -94,14 +70,15 @@ static struct caldac_struct *type1[]={&caldac_mb88341,NULL,NULL};
 static struct caldac_struct *type2[]={&caldac_dac8800,&caldac_dac8043,NULL};
 
 static ni_board ni_boards[]={
-       {       device_id:      52,
+       {       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:  8192,
                alwaysdither:   0,
                gainlkup:       ai_gain_16,
-               ai_speed:       800,
+               ai_speed:       50000,
                n_aochan:       0,
                aobits:         0,
                ao_fifo_depth:  0,
@@ -109,14 +86,14 @@ static ni_board ni_boards[]={
                has_8255:       0,
                caldac:         type2,
        },
-       {       device_id:      52,
+       {       device_id:      0x0000,
                name:           "DAQCard-ai-16e-4",
                n_adchan:       16,
                adbits:         16,
                ai_fifo_depth:  8192,
                alwaysdither:   0,
                gainlkup:       ai_gain_16,
-               ai_speed:       800,
+               ai_speed:       4000,
                n_aochan:       0,
                aobits:         0,
                ao_fifo_depth:  0,
@@ -180,8 +157,6 @@ typedef struct{
        unsigned short gpct_input_select0;
        unsigned short gpct_input_select1;
 
-       unsigned int ai_n_chans;
-       unsigned int ai_chanlistptr;
        unsigned short ai_xorlist[512];
 }ni_private;
 #define devpriv ((ni_private *)dev->private)
@@ -500,6 +475,7 @@ static int mio_cs_attach(comedi_device *dev,comedi_devconfig *it)
        
        printk(" %s",ni_boards[dev->board].name);
        dev->board_name=ni_boards[dev->board].name;
+       dev->board_ptr = ni_boards+dev->board;
 
        if( (ret=comedi_request_irq(dev->irq,ni_E_interrupt,NI_E_IRQ_FLAGS,"ni_mio_cs",dev))<0 ){
                printk(" irq not available\n");
@@ -534,7 +510,6 @@ static int get_prodid(comedi_device *dev,dev_link_t *link)
           (CardServices(GetTupleData,handle,&tuple) == CS_SUCCESS)){
                prodid = le16_to_cpu(buf[1]);
        }
-       //printk("manfid = 0x%04x, 0x%04x\n",manfid,prodid);
        
        return prodid;
 }
@@ -552,7 +527,9 @@ static int ni_getboardtype(comedi_device *dev,dev_link_t *link)
                }
        }
 
-       return -1;
+       printk("unknown board -- pretend it is a ");
+
+       return 0;
 }
 
 

diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index d4272b7706f90fff9d8303bb62e6f4387bbdda40..237ec227a2352766f43ffdd41abd905ba0b8ca7b 100644 (file)
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -411,8 +411,6 @@ typedef struct{
        unsigned short gpct_input_select0;
        unsigned short gpct_input_select1;
 
-       unsigned int ai_n_chans;
-       unsigned int ai_chanlistptr;
        unsigned short ai_xorlist[512];
 }ni_private;
 #define devpriv ((ni_private *)dev->private)

diff --git a/comedi/drivers/ni_stc.h b/comedi/drivers/ni_stc.h
index 6cef7f4306f5b3ff7f8693e808b032450850017f..7fbefdc4dda2a48601138b2d7d6d6fb47569e07a 100644 (file)
--- a/comedi/drivers/ni_stc.h
+++ b/comedi/drivers/ni_stc.h
@@ -131,7 +131,23 @@
 #define AO_START1_Pulse                                _bit0
 
 #define DIO_Input_Register             7
+
 #define AI_Command_1_Register          8
+#define AI_Analog_Trigger_Reset                        _bit14
+#define AI_Disarm                              _bit13
+#define AI_SI2_Arm                             _bit12
+#define AI_SI2_Load                            _bit11
+#define AI_SI_Arm                              _bit10
+#define AI_SI_Load                             _bit9
+#define AI_DIV_Arm                             _bit8
+#define AI_DIV_Load                            _bit7
+#define AI_SC_Arm                              _bit6
+#define AI_SC_Load                             _bit5
+#define AI_SCAN_IN_PROG_Pulse                  _bit4
+#define AI_EXTMUX_CLK_Pulse                    _bit3
+#define AI_LOCALMUX_CLK_Pulse                  _bit2
+#define AI_SC_TC_Pulse                         _bit1
+#define AI_CONVERT_Pulse                       _bit0
 
 #define AO_Command_1_Register          9
 #define AO_Analog_Trigger_Reset                        _bit15
@@ -154,14 +170,22 @@
 
 #define DIO_Output_Register            10
 #define DIO_Control_Register           11
+
 #define AI_Mode_1_Register             12
+#define AI_CONVERT_Source_Select(a)            ((a)<<11)
+#define AI_SI_Source_select(a)                 ((a)<<6)
+#define AI_CONVERT_Source_Polarity             _bit5
+#define AI_Start_Stop                          _bit3
+#define AI_Mode_1_Reserved                     _bit2
+#define AI_Continuous                          _bit1
+#define AI_Trigger_Once                                _bit0
 
 #define AI_Mode_2_Register             13
 #define AI_SC_Gate_Enable                      _bit15
 #define AI_Start_Stop_Gate_Enable              _bit14
 #define AI_Pre_Trigger                         _bit13
 #define AI_External_MUX_Present                        _bit12
-#define AI_SI2_Ininial_Load_Source             _bit9
+#define AI_SI2_Initial_Load_Source             _bit9
 #define AI_SI2_Reload_Mode                     _bit8
 #define AI_SI_Initial_Load_Source              _bit7
 #define AI_SI_Reload_Mode(a)                   ((a)<<4)
@@ -226,7 +250,24 @@
 #define AI_START_Select(a)                     (a)
 
 #define AI_Trigger_Select_Register     63
+#define AI_START1_Polarity                     _bit15
+#define AI_START2_Polarity                     _bit14
+#define AI_START2_Sync                         _bit13
+#define AI_START2_Edge                         _bit12
+#define AI_START2_Select(a)                    ((a)<<7)
+#define AI_START1_Sync                         _bit6
+#define AI_START1_Edge                         _bit5
+#define AI_START1_Select(a)                    (a)
+
 #define AO_Start_Select_Register       66
+#define AO_UI2_Software_Gate                   _bit15
+#define AO_UI2_External_Gate_Polarity          _bit14
+#define AO_START_Polarity                      _bit13
+#define AO_AOFREQ_Enable                       _bit12
+#define AO_UI2_External_Gate_Select(a)         ((a)<<7)
+#define AO_START_Sync                          _bit6
+#define AO_START_Edge                          _bit5
+#define AO_START_Select(a)                     (a)
 
 #define AO_Trigger_Select_Register     67
 #define AO_UI2_External_Gate_Enable            _bit15