From 3e78f7d3e3e8a979261f19f05d977a438dfc996c Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sun, 17 Mar 2002 22:08:56 +0000 Subject: [PATCH] Documentation updates --- comedi/drivers/adl_pci9111.c | 9 ++++----- comedi/drivers/cb_pcidas.c | 10 +++++----- comedi/drivers/cb_pcidas64.c | 1 + comedi/drivers/cb_pcidda.c | 6 +++--- comedi/drivers/comedi_test.c | 9 +++++++-- comedi/drivers/das6402.c | 4 +++- comedi/drivers/dt3000.c | 8 +++++--- comedi/drivers/mpc8260cpm.c | 4 ++++ comedi/drivers/ni_670x.c | 3 +++ comedi/drivers/ni_labpc.c | 17 ++++++++++------- comedi/drivers/ni_pcidio.c | 10 ++++++---- comedi/drivers/pcl726.c | 3 +-- comedi/drivers/pcl818.c | 4 +--- comedi/drivers/poc.c | 2 ++ comedi/drivers/rti802.c | 19 +++++++++---------- 15 files changed, 64 insertions(+), 45 deletions(-) diff --git a/comedi/drivers/adl_pci9111.c b/comedi/drivers/adl_pci9111.c index 40071009..d210e86e 100644 --- a/comedi/drivers/adl_pci9111.c +++ b/comedi/drivers/adl_pci9111.c @@ -28,8 +28,7 @@ Driver: adl_pci9111.o Description: Driver for the Adlink PCI-9111HR card. Author: Emmanuel Pacaud Devices: [ADLink] PCI-9111HR (adl_pci9111) - -Status: alpha - not fully tested. +Status: experimental Supports: @@ -284,7 +283,7 @@ typedef enum static int pci9111_attach (comedi_device *dev,comedi_devconfig *it); static int pci9111_detach (comedi_device *dev); -comedi_lrange pci9111_hr_ai_range= +static comedi_lrange pci9111_hr_ai_range= { 5, { @@ -342,7 +341,7 @@ static pci9111_board_struct pci9111_boards[] = #define pci9111_board_nbr \ (sizeof(pci9111_boards)/sizeof(pci9111_board_struct)) -comedi_driver pci9111_driver= +static comedi_driver pci9111_driver= { driver_name: PCI9111_DRIVER_NAME, module: THIS_MODULE, @@ -352,6 +351,7 @@ comedi_driver pci9111_driver= board_name: pci9111_boards, offset: sizeof(pci9111_board_struct), }; +COMEDI_INITCLEANUP(pci9111_driver); // // Private data structure @@ -380,7 +380,6 @@ typedef struct } pci9111_private_data_struct; -COMEDI_INITCLEANUP(pci9111_driver); #define dev_private ((pci9111_private_data_struct *)dev->private) diff --git a/comedi/drivers/cb_pcidas.c b/comedi/drivers/cb_pcidas.c index 34a863a7..7a41d7ec 100644 --- a/comedi/drivers/cb_pcidas.c +++ b/comedi/drivers/cb_pcidas.c @@ -45,6 +45,11 @@ Description: Driver for the ComputerBoards/MeasurementComputing cards of the PCI-DAS series with the AMCC S5933 PCI controller. Author: Ivan Martinez , Frank Mori Hess +Updated: 2002-1-09 +Devices: [Measurement Computing] PCI-DAS1602/16 (cb_pcidas), + PCI-DAS1602/16jr, PCI-DAS1602/12, PCI-DAS1200, PCI-DAS1200jr, + PCI-DAS1000, PCI-DAS1001, PCI_DAS1002 + Status: - PCI-DAS1602/16: Analog input is tested, works. Analog output untested. - PCI-DAS1602/16jr: Driver should work, but untested. Please @@ -56,11 +61,6 @@ Status: The boards' autocalibration features are not yet supported. -Updated: 2002-1-09 -Devices: [Measurement Computing] PCI-DAS1602/16 (cb_pcidas), - PCI-DAS1602/16jr, PCI-DAS1602/12, PCI-DAS1200, PCI-DAS1200jr, - PCI-DAS1000, PCI-DAS1001, PCI_DAS1002 - Configuration options: [0] - PCI bus of device (optional) [1] - PCI slot of device (optional) diff --git a/comedi/drivers/cb_pcidas64.c b/comedi/drivers/cb_pcidas64.c index 14098521..5a2d9a1b 100644 --- a/comedi/drivers/cb_pcidas64.c +++ b/comedi/drivers/cb_pcidas64.c @@ -45,6 +45,7 @@ Devices: [Measurement Computing] PCI-DAS6402/16 (cb_pcidas64), PCI-DAS64/M2/16/JR, PCI-DAS64/M3/16/JR, PCI-DAS64/M1/14, PCI-DAS64/M2/14, PCI-DAS64/M3/14, PCI-DAS6025E, PCI-DAS6034E, PCI-DAS6035E, PCI-DAS4020/12 + Configuration options: [0] - PCI bus of device (optional) [1] - PCI slot of device (optional) diff --git a/comedi/drivers/cb_pcidda.c b/comedi/drivers/cb_pcidda.c index 3c254e19..c38f691f 100644 --- a/comedi/drivers/cb_pcidda.c +++ b/comedi/drivers/cb_pcidda.c @@ -40,10 +40,10 @@ Configuration options: Only simple analog output writing is supported. -SO FAR IT HAS ONLY BEEN TESTED WITH: +So far it has only been tested with: - PCI-DDA08/12 -PLEASE REPORT IF YOU ARE USING IT WITH A DIFFERENT CARD -. +Please report sucess/failure with other different cards to +. */ #include diff --git a/comedi/drivers/comedi_test.c b/comedi/drivers/comedi_test.c index 2ddc7c88..627910ef 100644 --- a/comedi/drivers/comedi_test.c +++ b/comedi/drivers/comedi_test.c @@ -30,10 +30,15 @@ /* Driver: comedi_test.o Description: generates fake waveforms -Author: Joachim Wuttke , Frank Mori Hess +Author: Joachim Wuttke , Frank Mori Hess + , ds Devices: Status: works -Updated: 2002-03-05 +Updated: Sat, 16 Mar 2002 17:34:48 -0800 + +This driver is mainly for testing purposes, but can also be used to +generate sample waveforms on systems that don't have data acquisition +hardware. Configuration options: [0] - Amplitude in microvolts for fake waveforms (default 1 volt) diff --git a/comedi/drivers/das6402.c b/comedi/drivers/das6402.c index 90f3008c..e61796c2 100644 --- a/comedi/drivers/das6402.c +++ b/comedi/drivers/das6402.c @@ -32,8 +32,10 @@ Driver: das6402.o Description: Keithley Metrabyte DAS6402 (& compatibles) Author: Oystein Svendsen -Status: unknown +Status: bitrotten Devices: [Keithley Metrabyte] DAS6402 (das6402) + +This driver has suffered bitrot. */ #include diff --git a/comedi/drivers/dt3000.c b/comedi/drivers/dt3000.c index aa615f61..a066e01d 100644 --- a/comedi/drivers/dt3000.c +++ b/comedi/drivers/dt3000.c @@ -26,7 +26,11 @@ Description: Data Translation DT3000 series Author: ds Devices: [Data Translation] DT3001 (dt3000), DT3001-PGL, DT3002, DT3003, DT3003-PGL, DT3004, DT3005, DT3004-200 -Status: untested +Status: works + +There is code to support AI commands, but it may not work. + +AO commands are not supported. */ /* @@ -44,8 +48,6 @@ Status: untested Data Translation originally wanted an NDA for the documentation for the 3k series. However, if you ask nicely, they might send you the docs without one, also. - - Streaming I/O is not supported. */ #define DEBUG 1 diff --git a/comedi/drivers/mpc8260cpm.c b/comedi/drivers/mpc8260cpm.c index 343d0080..ae19f55a 100644 --- a/comedi/drivers/mpc8260cpm.c +++ b/comedi/drivers/mpc8260cpm.c @@ -25,9 +25,13 @@ Driver: mpc8260cpm.o Description: MPC8260 CPM module generic digital I/O lines Devices: [Motorola] MPC8260 CPM (mpc8260cpm) Author: ds +Status: experimental +Updated: Sat, 16 Mar 2002 17:34:48 -0800 This driver is specific to the Motorola MPC8260 processor, allowing you to access the processor's generic digital I/O lines. + +It is apparently missing some code. */ #include diff --git a/comedi/drivers/ni_670x.c b/comedi/drivers/ni_670x.c index 67980dd3..b41dd7a0 100644 --- a/comedi/drivers/ni_670x.c +++ b/comedi/drivers/ni_670x.c @@ -26,9 +26,12 @@ Description: National Instruments 670x Author: Bart Joris Updated: Wed, 22 Aug 2001 22:47:32 -0700 Devices: [National Instruments] PCI-6703 (ni_670x), PCI-6704 +Status: unknown The driver currently does not recognize the 6704, because the PCI ID is not known. + +Commands are not supported. */ /* diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c index 0a198195..556cb69b 100644 --- a/comedi/drivers/ni_labpc.c +++ b/comedi/drivers/ni_labpc.c @@ -30,10 +30,12 @@ Description: National Instruments Lab-PC (& compatibles) Author: Frank Mori Hess Devices: [National Instruments] DAQCard-1200 (daqcard-1200), Lab-PC-1200 (labpc-1200), Lab-PC-1200AI (labpc-1200ai), Lab-PC+ (lab-pc+), PCI-1200 (pci-1200) -Status: Works (tested with lab-pc-1200). For the older Lab-PC+, not all input - ranges and analog references will work, the available - ranges/arefs will depend on how you have configured - the jumpers on your board (see your owner's manual). +Status: works + +Tested with lab-pc-1200. For the older Lab-PC+, not all input ranges +and analog references will work, the available ranges/arefs will +depend on how you have configured the jumpers on your board +(see your owner's manual). Configuration options - ISA boards: [0] - I/O port base address @@ -47,9 +49,10 @@ Configuration options - PCI boards: Configuration options - PCMCIA boards: none -Lab-pc+ has quirky chanlist when scanning multiple channels. Scan sequence must start -at highest channel, then decrement down to channel 0. 1200 series cards can scan down -like lab-pc+ or scan up from channel zero. +Lab-pc+ has quirky chanlist when scanning multiple channels. Scan +sequence must start at highest channel, then decrement down to +channel 0. 1200 series cards can scan down like lab-pc+ or scan +up from channel zero. */ diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c index d2a790b1..225a19aa 100644 --- a/comedi/drivers/ni_pcidio.c +++ b/comedi/drivers/ni_pcidio.c @@ -26,19 +26,21 @@ Driver: ni_pcidio.o Description: National Instruments PCI-DIO32HS, PCI-DIO96, PCI-6533, PCI-6503 Author: ds -Status: works in immediate mode +Status: works Devices: [National Instruments] PCI-DIO-32HS (ni_pcidio), PXI-6533, PCI-DIO-96, PCI-DIO-96B, PXI-6508, PCI-6503, PCI-6503B, PCI-6503X, PXI-6503 +Updated: Sat, 16 Mar 2002 17:34:48 -0800 The DIO-96 appears as four 8255 subdevices. See the 8255 driver notes for details. The DIO32HS board appears as one subdevice, with 32 channels. -Each channel is individually I/O configurable. The channel order, -as one might guess, is 0=A0, 1=A1, 2=A2, ... 8=B0, 16=C0, 24=D0. +Each channel is individually I/O configurable. The channel order +is 0=A0, 1=A1, 2=A2, ... 8=B0, 16=C0, 24=D0. The driver only +supports simple digital I/O; no handshaking is supported. -DMA is halfway completed, but not operational, for the PCI-DIO32HS. +DMA mostly works for the PCI-DIO32HS, but only in timed input mode. This driver could be easily modified to support AT-MIO32HS and AT-MIO96. diff --git a/comedi/drivers/pcl726.c b/comedi/drivers/pcl726.c index d42c1b3e..145c7ec2 100644 --- a/comedi/drivers/pcl726.c +++ b/comedi/drivers/pcl726.c @@ -56,11 +56,10 @@ Interrupts are not supported. Options for ACL-6126: [0] - IO Base - [1] - IRQ (0=disable, 3, 5, 6, 7, 9, 10, 11, 12, 15) + [1] - IRQ (0=disable, 3, 5, 6, 7, 9, 10, 11, 12, 15) (currently ignored) [2]...[7] - D/A output range for channel 1-6: 0: 0-5V, 1: 0-10V, 2: +/-5V, 3: +/-10V, 4: 4-20mA - NOTE: IRQ operations isn't now supported. */ /* diff --git a/comedi/drivers/pcl818.c b/comedi/drivers/pcl818.c index c4fa1209..cd34e2f0 100644 --- a/comedi/drivers/pcl818.c +++ b/comedi/drivers/pcl818.c @@ -39,9 +39,7 @@ A word or two about DMA. Driver support DMA operations at two ways: If you've data dropouts with DMA mode 2 then: a) disable IDE DMA b) switch text mode console to fb. -See the head of the source file pcl818.c for configuration options. -*/ -/* + Options for PCL-818L: [0] - IO Base [1] - IRQ (0=disable, 2, 3, 4, 5, 6, 7) diff --git a/comedi/drivers/poc.c b/comedi/drivers/poc.c index ca897a16..c2c32fa7 100644 --- a/comedi/drivers/poc.c +++ b/comedi/drivers/poc.c @@ -25,6 +25,8 @@ Device names: dac02 Author: ds Devices: [Keithley Metrabyte] DAC-02 (dac02), [Advantech] PCL-733 (pcl733), PCL-734 (pcl734) +Updated: Sat, 16 Mar 2002 17:34:48 -0800 +Status: unknown This driver is indended to support very simple ISA-based devices, including: diff --git a/comedi/drivers/rti802.c b/comedi/drivers/rti802.c index 51971073..08724463 100644 --- a/comedi/drivers/rti802.c +++ b/comedi/drivers/rti802.c @@ -26,6 +26,15 @@ Description: Analog Devices RTI-802 Author: Anders Blomdell Devices: [Analog Devices] RTI-802 (rti802) Status: works + +Configuration Options: + [0] - i/o base + [1] - unused + [2] - dac#0 0=two's comp, 1=straight + [3] - dac#0 0=bipolar, 1=unipolar + [4] - dac#1 ... + ... + [17] - dac#7 ... */ #include @@ -97,16 +106,6 @@ static int rti802_ao_insn_write(comedi_device *dev, comedi_subdevice *s, } -/* - options: - [0] - i/o base - [1] - unused - [2] - dac#0 0=two's comp, 1=straight - [3] - dac#0 0=bipolar, 1=unipolar - [4] - dac#1 ... - ... - [17] - dac#7 ... - */ static int rti802_attach(comedi_device * dev, comedi_devconfig * it) { -- 2.26.2