Update from ivan

diff --git a/Documentation/comedi/drivers.txt b/Documentation/comedi/drivers.txt
index 49513b6426fbf60baefd8cb005a9a1234e5d2c06..764a983c78d6dc33110839f8fb61e1b74bb92519 100644 (file)
--- a/Documentation/comedi/drivers.txt
+++ b/Documentation/comedi/drivers.txt
@@ -38,14 +38,14 @@ 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.
 For AI:
-- If cmd->scan_begin_src=TRIG_EXT (or trigger mode4) then trigger input 
+- 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 
+- If cmd->convert_src=TRIG_EXT (or trigger mode3) 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 
+- 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.
-- If return value of cmdtest is 5 then you've bad channel list 
+- If return value of cmdtest is 5 then you've bad channel list
   (it isn't possible mixture S.E. and DIFF inputs or bipolar and unipolar
   ranges).
 There is know problem with this driver:
@@ -64,7 +64,7 @@ multiplexer.
 
 
 Driver: adv_pci1710.o
-Description: Advantech PCI-1710, PCI-1710HG, PCI-1711, PCI-1713, 
+Description: Advantech PCI-1710, PCI-1710HG, PCI-1711, PCI-1713,
              Advantech PCI-1720, PCI-1731
 Author: Michal Dobes <majkl@tesnet.cz>
 Device Names: pci1710, pci1710hg, pci1711, pci1713, pci1720, pci1731
@@ -83,35 +83,50 @@ Configuration options:
 
 
 Driver: cb_pcidas.o
-Description: ComputerBoards PCI-DAS1200, PCI-DAS1200/JR, may work with other PCI-DAS
-Author: Ivan Martinez <ivanmr@altavista.com>, Frank Mori Hess <fmhess@uiuc.edu>
-Status: Works with PCI-DAS1200.
-       Should work with PCI-DAS1200/JR, and PCI-DAS100X but not tested.
-       May work with other PCI-DAS-XXX.
-
-This intends to be the driver for the whole PCI-DAS series. However,
-it was programmed with the manuals for PCI-DAS1200 and PCI-DAS1200/JR,
-and tested with the first one. IF YOU TRY THE DRIVER WITH ANOTHER PCI-DAS
-CARD, PLEASE REPORT ANY SUCCESS OR FAILURE TO <ivanmr@altavista.com>
+Description: Driver for the ComputerBoards/MeasurementComputing cards
+  of the PCI-DAS series with the AMCC S5933 PCI controller.
+Author: Ivan Martinez <ivanmr@altavista.com>,
+  Frank Mori Hess <fmhess@uiuc.edu>
+Status:
+  - PCI-DAS1602/16, 16jr: Manual of these cards hasn't been read.
+    Driver will work as far as they are compatible with the other
+    supported cards. Please report usage.
+  - PCI-DAS1602/12: Same as before.
+  - PCI-DAS1200, 1200jr: Simple analog input reading has been tested
+    enough. Commands testing is in progress, and may be finished when
+    you read this (check mailing list archive for latest news).
+  - PCI-DAS1000, 1001, 1002: Manual of these cards has been read,
+    but they haven't been tested at all. Please report usage.
+
+This driver originally intended to support the whole PCI-DAS series,
+but cards based on the PLX PCI controller are excluded for being
+too different.
 
 Configuration options:
   [0] - PCI bus of device (optional)
-          If bus/slot is not specified, the first available PCI
-         device will be used.
   [1] - PCI slot of device (optional)
+  If bus/slot is not specified, the first available PCI
+  device will be used.
+
+Commands must meet scan_begin_src=TRIG_FOLLOW and
+convert_src=TRIG_TIMER. Scaned channels must be consecutive
+(i.e. 4-5-6-7, 2-3-4,...). Other features such as digital I/O are not
+supported.
 
 
 
 Driver: cb_pcidda.o
-Description: ComputerBoards PCI-DDA series
+Description: ComputerBoards/MeasurementComputing PCI-DDA series
 Author: Ivan Martinez <ivanmr@altavista.com>
-Status: supports 08/16, 04/16, 02/16, 08/12, 04/12, and 02/12
+Status: Supports 08/16, 04/16, 02/16, 08/12, 04/12, and 02/12
 
 Configuration options:
   [0] - PCI bus of device (optional)
-          If bus/slot is not specified, the first available PCI
-         device will be used.
   [1] - PCI slot of device (optional)
+  If bus/slot is not specified, the first available PCI
+  device will be used.
+
+Only simple analog output writing is supported.