From 6892b4046874e107778b927da927d47e1566a3a4 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 2 May 2012 12:54:46 +0100 Subject: [PATCH 1/3] doc/other.xml: Use comedi_dio_bitfield2 instead of comedi_dio_bitfield. Rework text to use comedi_dio_bitfield2 as comedi_dio_bitfield is marked as deprecated elsewhere in the document. --- doc/other.xml | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/doc/other.xml b/doc/other.xml index 9486205..cbac5f3 100644 --- a/doc/other.xml +++ b/doc/other.xml @@ -108,27 +108,37 @@ Multiple channels can be read and written simultaneously using the function -int comedi_dio_bitfield +int comedi_dio_bitfield2 comedi_t *device unsigned int subdevice unsigned int write_mask unsigned int *bits +unsigned int base_channel -Each channel is assigned to a bit in the +Each channel from base_channel +to base_channel + +31 is assigned to a bit in the write_mask and bits -bitfield. If a bit in +bitfield with bit 0 assigned to channel +base_channel, bit 1 assigned to channel +base_channel + +1, etc. If a bit in write_mask is set, the corresponding bit in *bits will -be written to the corresponding digital output line. +be written to the digital output line corresponding to the channel given by +base_channel plus the bit number. Each digital line is then read and placed into *bits. The value of bits in *bits corresponding to digital output lines is undefined and device-specific. Channel -0 is the least significant bit in the bitfield; -channel 31 is the most significant bit. Channels -higher than 31 cannot be accessed using this method. +base_channel + +0 is the least significant bit in the bitfield. No +more than 32 channels at once can be accessed using this method. +Warning! Older versions of &comedi; +may ignore base_channel and treat +it as 0 unless the subdevice has more than 32 channels. From ad6a93952f384011bb3f44356aebd6916d8be666 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 2 May 2012 13:01:41 +0100 Subject: [PATCH 2/3] doc/tutorial.xml: Fix a broken link. --- doc/tutorial.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tutorial.xml b/doc/tutorial.xml index b4ccfeb..5ca284e 100644 --- a/doc/tutorial.xml +++ b/doc/tutorial.xml @@ -212,7 +212,7 @@ For advanced programmers the - function comedi_get_buffer_contents + function comedi_get_buffer_contents is useful to check if there is actually data in the ringbuffer so that a call of read can be avoided for example when the data readout is called by a timer call-back function. From 708b802811611b04828b51c98e5a131a1b32a207 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Wed, 2 May 2012 13:04:24 +0100 Subject: [PATCH 3/3] doc/comedilib.xml: Add myself (Ian Abbott) to list of authors. --- doc/comedilib.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/doc/comedilib.xml b/doc/comedilib.xml index 082ad83..db4dcd0 100644 --- a/doc/comedilib.xml +++ b/doc/comedilib.xml @@ -33,6 +33,11 @@ Porr Bernd.Porr@glasgow.ac.uk + + Ian + Abbott + abbotti@mev.co.uk + 1998-2003 David Schleef @@ -49,6 +54,10 @@ 2012 Bernd Porr + + 2012 + Ian Abbott +