From: David Schleef Date: Mon, 23 Jul 2001 18:46:52 +0000 (+0000) Subject: Updates from Michal Dobes X-Git-Tag: r0_7_60~23 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7525d6df39b260e5f4b7f91f4ae80eb645d13d90;p=comedi.git Updates from Michal Dobes --- diff --git a/Documentation/Configure.help b/Documentation/Configure.help index 586ebcc0..16442ce9 100644 --- a/Documentation/Configure.help +++ b/Documentation/Configure.help @@ -210,8 +210,10 @@ CONFIG_COMEDI_PCL726 Advantech PCL-812PG, PCL-813B, ADLink ACL-8113 CONFIG_COMEDI_PCL812 - Includes support for Advantech PCL-812PG, Advantech PCL-813B - and ADLink ACL-8113. + Includes support for these boards: + Advantech PCL-812/PG, PCL-813/B, + ADLink ACL-8112DG/HG/PG, ACL-8113, ACL-8216, + ICP DAS A-821PGH/PGL/PGL-NDA, A-822PGH/PGL, A-823PGH/PGL, A-826PG, ISO-813 Advantech PCL-818, PCL-718 CONFIG_COMEDI_PCL818 diff --git a/Documentation/comedi/drivers.txt b/Documentation/comedi/drivers.txt index e4f47927..3bba130d 100644 --- a/Documentation/comedi/drivers.txt +++ b/Documentation/comedi/drivers.txt @@ -35,13 +35,11 @@ Device Names: pci9118dg, pci9118hg, pci9118hr Status: works This driver supports AI, AO, DI and DO subdevices. -AI subdevice support cmd, insn and mode0-4 interface, -other subdevices support insn and mode0 interface. +AI subdevice supports cmd and insn interface, +other subdevices support only insn interface. For AI: -- If cmd->scan_begin_src=TRIG_EXT (or trigger mode4) then trigger input - is TGIN (pin 46). -- If cmd->convert_src=TRIG_EXT (or trigger mode3) then trigger input - is EXTTRG (pin 44). +- If cmd->scan_begin_src=TRIG_EXT then trigger input is TGIN (pin 46). +- If cmd->convert_src=TRIG_EXT then trigger input is EXTTRG (pin 44). - If cmd->start_src/stop_src=TRIG_EXT then trigger input is TGIN (pin 46). - It is not neccessary to have cmd.scan_end_arg=cmd.chanlist_len but cmd.scan_end_arg modulo cmd.chanlist_len must by 0. @@ -49,20 +47,21 @@ For AI: (it isn't possible mixture S.E. and DIFF inputs or bipolar and unipolar ranges). There is know problem with this driver: -- If you use trigger mode4 (scan_begin_src=TRIG_EXT&convert_src=TRIG_TIMER) +- If you use scan_begin_src=TRIG_EXT & convert_src=TRIG_TIMER then this mode sometimes discards some samples. :-(( Configuration options: [0] - PCI bus of device (optional) + [1] - PCI slot of device (optional) If bus/slot is not specified, the first available PCI device will be used. - [1] - PCI slot of device (optional) If you have an external multiplexer, the third option in the option list should be used to indicate the number of channels in the multiplexer. + Driver: adv_pci1710.o Description: Advantech PCI-1710, PCI-1710HG, PCI-1711, PCI-1713, Advantech PCI-1720, PCI-1731 @@ -71,14 +70,14 @@ Device Names: pci1710, pci1710hg, pci1711, pci1713, pci1720, pci1731 Status: works This driver supports AI, AO, DI and DO subdevices. -AI subdevice supports cmd, insn, mode0, mode1 and mode3 interface, -other subdevices support insn and mode0 interface. +AI subdevice supports cmd and insn interface, +other subdevices support only insn interface. Configuration options: [0] - PCI bus of device (optional) + [1] - PCI slot of device (optional) If bus/slot is not specified, the first available PCI device will be used. - [1] - PCI slot of device (optional) @@ -677,39 +676,22 @@ See the driver source code for configuration information. Driver: pcl812.o -Description: Advantech PCL-812PG, Advantech PCL-813B and ADLink ACL-8113 +Description: Advantech PCL-812/PG, PCL-813/B, + ADLink ACL-8112DG/HG/PG, ACL-8113, ACL-8216, + ICP DAS A-821PGH/PGL/PGL-NDA, A-822PGH/PGL, A-823PGH/PGL, A-826PG, + ICP DAS ISO-813 Author: Michal Dobes +Device Names: pcl812, pcl812pg, pcl813, pcl813b, acl8112dg, acl8113hg, + acl8112pg, acl8113, acl8216, a821pgh, a821pgl, a821pglnda, + a822pgh, a822pgl, a823pgh, a823pgl, a826pg, iso813 Status: works (I hope. My board fire up under my hands - and I haven't time to finish tests.) - -Card: Advantech PCL-812PG - This card have integrated 16SE A/D 30kHz, 2 D/A, 16DI, 16DO. - Driver support mode0, 1 and 3 for A/D and mode0 for others. - If you disable IRQ then only mode0 for A/D is allowed. - -Driver name: pcl812pg -Options: - [0] - IO Base - [1] - IRQ (0=disable, 2, 3, 4, 5, 6, 7; 10, 11, 12, 14, 15) - [2] - 0=trigger source is internal 8253 with 2MHz clock - 1=trigger source is external - [3] - 0=A/D have max +/-5V input - 1=A/D have max +/-10V input - [4] - 0=D/A outputs 0-5V (internal reference -5V) - 1=D/A outputs 0-10V (internal reference -10V) - 2=D/A outputs unknow (external reference) - -Card: Advantech PCL-813B, ADLink ACL-8113 - These cards have integrated 32SE A/D 25kHz. - Driver support only mode0 A/D becouse construction of this card - don't allow anything else. - -Driver name: pcl813b -Options: - [0] - IO Base - [1] - 0= bipolar inputs - 1= unipolar inputs - [2] - max number of samples in ai_mode0 (defaul=1scan) + and I cann't test all features.) + +This driver supports insn and cmd interfaces. Some boards support only insn +becouse their hardware don't allow more (PCL-813/B, ACL-8113, ISO-813). +Data transfer over DMA is supported only when you measure only one +channel, this is too hardware limitation of these boards. +See the head of the source file pcl812.c for configuration options. diff --git a/Documentation/comedi/hardware b/Documentation/comedi/hardware index b890e049..a2672ee0 100644 --- a/Documentation/comedi/hardware +++ b/Documentation/comedi/hardware @@ -3,8 +3,12 @@ ADLink ACL-6128 pcl726 ADLink ACL-7122 pcl724 ADLink ACL-7124 pcl724 ADLink ACL-8112-DG pcl711 +ADLink ACL-8112DG pcl812 ADLink ACL-8112-HG pcl711 +ADLink ACL-8112HG pcl812 +ADLink ACL-8112PG pcl812 ADLink ACL-8113 pcl812 +ADLink ACL-8216 pcl812 ADLink PCI-9118DG adl_pci9118 ADLink PCI-9118HG adl_pci9118 ADLink PCI-9118HR adl_pci9118 @@ -25,13 +29,17 @@ Advantech PCL-726 pcl726 Advantech PCL-727 pcl726 Advantech PCL-728 pcl726 Advantech PCL-731 pcl724 +Advantech PCL-812 pcl812 Advantech PCL-812PG pcl812 +Advantech PCL-813 pcl812 Advantech PCL-813B pcl812 Advantech PCL-818 pcl818 Advantech PCL-818H pcl818 Advantech PCL-818HD pcl818 Advantech PCL-818HG pcl818 Advantech PCL-818L pcl818 +Advantech PCM-3718 pcl818 +Advantech PCM-3730 pcm3730 Analog Devices RTI800 rti800 Analog Devices RTI802 rti802 Analog Devices RTI815 rti800 @@ -104,6 +112,15 @@ Data Translation DT3004 dt3000 Data Translation DT3005 dt3000 Generic 8255 8255 Generic PC parallel port comedi_parport +ICP DAS A-821PGH pcl812 +ICP DAS A-821PGL pcl812 +ICP DAS A-821PGL-NDA pcl812 +ICP DAS A-822PGH pcl812 +ICP DAS A-822PGL pcl812 +ICP DAS A-823PGH pcl812 +ICP DAS A-823PGL pcl812 +ICP DAS A-826PG pcl812 +ICP DAS ISO-813 pcl812 IOtech DAQBoard/2000 daqboard2000 Intelligent Instrumentation PCI-20001 C-2A * ii_pci20kc Intelligent Instrumentation PCI-20006 M-2 * ii_pci20kc