aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi/comedi.h
diff options
context:
space:
mode:
authorBernd Porr <berndporr@f2s.com>2009-11-27 12:07:48 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-23 11:27:45 -0800
commitd103bef45180892515345e761f42db5601de9846 (patch)
treedaffbc6b222ad21d7b02b51ab833f67e1361a709 /drivers/staging/comedi/comedi.h
parentStaging: comedi: usbdux.c: fix locking up of the driver when the comedi ringbuffer runs empty (diff)
downloadlinux-dev-d103bef45180892515345e761f42db5601de9846.tar.xz
linux-dev-d103bef45180892515345e761f42db5601de9846.zip
Staging: comedi: removed "depricated" from COMEDI_CB_BLOCK
The flag COMEDI_CB_BLOCK was marked as "depricated in the header file". However, this flag is important to wake up the data-reader (and writer) after new data has arrived from(for) the DAQ card. Signed-off-by: Bernd Porr <berndporr@f2s.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/comedi.h')
-rw-r--r--drivers/staging/comedi/comedi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index ccc5cdc008c6..b559a9c2f857 100644
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -451,7 +451,7 @@
#define COMEDI_CB_EOS 1 /* end of scan */
#define COMEDI_CB_EOA 2 /* end of acquisition */
-#define COMEDI_CB_BLOCK 4 /* DEPRECATED: convenient block size */
+#define COMEDI_CB_BLOCK 4 /* data has arrived: wakes up read() / write() */
#define COMEDI_CB_EOBUF 8 /* DEPRECATED: end of buffer */
#define COMEDI_CB_ERROR 16 /* card error during acquisition */
#define COMEDI_CB_OVERFLOW 32 /* buffer overflow/underflow */