staging: comedi: comedidev.h: don't expose COMEDI_CB_* defines to userspace

The COMEDI_CB_* defines are the comedi_async "events" that the drivers set
to let the core detect the state of running async commands. These "events"
are only relevant to the kernel modules and should not be exposed to
userspace in the comedi.h user API header.

Move the defines to comedidev.h to avoid exposing them. For aesthetics,
convert the defines to bit shifts to better indicate that they are bitmask
values. Cleanup the documentation.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h
index c8c99e65423b2a3a46c231a36e2bafc0a979d38b..f302ce6c93de571c8eb10df3e4c50072b6001652 100644 (file)
--- a/drivers/staging/comedi/comedi.h
+++ b/drivers/staging/comedi/comedi.h
@@ -514,17 +514,6 @@ struct comedi_bufinfo {
 
 #define COMEDI_MIN_SPEED       ((unsigned int)0xffffffff)
 
-/* callback stuff */
-/* only relevant to kernel modules. */
-
-#define COMEDI_CB_EOS          1       /* end of scan */
-#define COMEDI_CB_EOA          2       /* end of acquisition/output */
-#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 */
-
 /**********************************************************/
 /* everything after this line is ALPHA */
 /**********************************************************/

diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h
index 1b2bbd56f6efba746b6c6671623c7abc8646c6b0..0b504b1d3f008cd8e03e82c31df049ddeafa1021 100644 (file)
--- a/drivers/staging/comedi/comedidev.h
+++ b/drivers/staging/comedi/comedidev.h
@@ -213,6 +213,22 @@ struct comedi_async {
                       unsigned int x);
 };
 
+/**
+ * comedi_async callback "events"
+ * @COMEDI_CB_EOS:             end-of-scan
+ * @COMEDI_CB_EOA:             end-of-acquisition/output
+ * @COMEDI_CB_BLOCK:           data has arrived, wakes up read() / write()
+ * @COMEDI_CB_EOBUF:           DEPRECATED: end of buffer
+ * @COMEDI_CB_ERROR:           card error during acquisition
+ * @COMEDI_CB_OVERFLOW:                buffer overflow/underflow
+ */
+#define COMEDI_CB_EOS          (1 << 0)
+#define COMEDI_CB_EOA          (1 << 1)
+#define COMEDI_CB_BLOCK                (1 << 2)
+#define COMEDI_CB_EOBUF                (1 << 3)
+#define COMEDI_CB_ERROR                (1 << 4)
+#define COMEDI_CB_OVERFLOW     (1 << 5)
+
 struct comedi_driver {
        struct comedi_driver *next;