staging: comedi: APCI1710_INCCPT: absorb private header

The header file APCI1710_INCCPT.h is only included by the source
file APCI1710_INCCPT.c. Absorb the header into the source and
delete the header.

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

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
index 7c997f65d282c86c4d2067bb8ab5847d2e65f26c..70a7f953fa2f3f97282f94c08917b147a7736c44 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
+++ b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c
@@ -51,13 +51,121 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   +-----------------------------------------------------------------------+
 */
 
-/*
-+----------------------------------------------------------------------------+
-|                               Included files                               |
-+----------------------------------------------------------------------------+
-*/
-
-#include "APCI1710_INCCPT.h"
+#define APCI1710_16BIT_COUNTER                 0x10
+#define APCI1710_32BIT_COUNTER                 0x0
+#define APCI1710_QUADRUPLE_MODE                        0x0
+#define APCI1710_DOUBLE_MODE                   0x3
+#define APCI1710_SIMPLE_MODE                   0xF
+#define APCI1710_DIRECT_MODE                   0x80
+#define APCI1710_HYSTERESIS_ON                 0x60
+#define APCI1710_HYSTERESIS_OFF                        0x0
+#define APCI1710_INCREMENT                     0x60
+#define APCI1710_DECREMENT                     0x0
+#define APCI1710_LATCH_COUNTER                 0x1
+#define APCI1710_CLEAR_COUNTER                 0x0
+#define APCI1710_LOW                           0x0
+#define APCI1710_HIGH                          0x1
+
+/*********************/
+/* Version 0600-0229 */
+/*********************/
+#define APCI1710_HIGH_EDGE_CLEAR_COUNTER               0x0
+#define APCI1710_HIGH_EDGE_LATCH_COUNTER               0x1
+#define APCI1710_LOW_EDGE_CLEAR_COUNTER                        0x2
+#define APCI1710_LOW_EDGE_LATCH_COUNTER                        0x3
+#define APCI1710_HIGH_EDGE_LATCH_AND_CLEAR_COUNTER     0x4
+#define APCI1710_LOW_EDGE_LATCH_AND_CLEAR_COUNTER      0x5
+#define APCI1710_SOURCE_0                              0x0
+#define APCI1710_SOURCE_1                              0x1
+
+#define APCI1710_30MHZ                         30
+#define APCI1710_33MHZ                         33
+#define APCI1710_40MHZ                         40
+
+#define APCI1710_ENABLE_LATCH_INT              0x80
+#define APCI1710_DISABLE_LATCH_INT             (~APCI1710_ENABLE_LATCH_INT)
+
+#define APCI1710_INDEX_LATCH_COUNTER           0x10
+#define APCI1710_INDEX_AUTO_MODE               0x8
+#define APCI1710_ENABLE_INDEX                  0x4
+#define APCI1710_DISABLE_INDEX                 (~APCI1710_ENABLE_INDEX)
+#define APCI1710_ENABLE_LATCH_AND_CLEAR                0x8
+#define APCI1710_DISABLE_LATCH_AND_CLEAR       (~APCI1710_ENABLE_LATCH_AND_CLEAR)
+#define APCI1710_SET_LOW_INDEX_LEVEL           0x4
+#define APCI1710_SET_HIGH_INDEX_LEVEL          (~APCI1710_SET_LOW_INDEX_LEVEL)
+#define APCI1710_INVERT_INDEX_RFERENCE         0x2
+#define APCI1710_DEFAULT_INDEX_RFERENCE         (~APCI1710_INVERT_INDEX_RFERENCE)
+
+#define APCI1710_ENABLE_INDEX_INT              0x1
+#define APCI1710_DISABLE_INDEX_INT             (~APCI1710_ENABLE_INDEX_INT)
+
+#define APCI1710_ENABLE_FREQUENCY              0x4
+#define APCI1710_DISABLE_FREQUENCY             (~APCI1710_ENABLE_FREQUENCY)
+
+#define APCI1710_ENABLE_FREQUENCY_INT          0x8
+#define APCI1710_DISABLE_FREQUENCY_INT         (~APCI1710_ENABLE_FREQUENCY_INT)
+
+#define APCI1710_ENABLE_40MHZ_FREQUENCY                0x40
+#define APCI1710_DISABLE_40MHZ_FREQUENCY       (~APCI1710_ENABLE_40MHZ_FREQUENCY)
+
+#define APCI1710_ENABLE_40MHZ_FILTER           0x80
+#define APCI1710_DISABLE_40MHZ_FILTER          (~APCI1710_ENABLE_40MHZ_FILTER)
+
+#define APCI1710_ENABLE_COMPARE_INT            0x2
+#define APCI1710_DISABLE_COMPARE_INT           (~APCI1710_ENABLE_COMPARE_INT)
+
+#define APCI1710_ENABLE_INDEX_ACTION           0x20
+#define APCI1710_DISABLE_INDEX_ACTION          (~APCI1710_ENABLE_INDEX_ACTION)
+#define APCI1710_REFERENCE_HIGH                        0x40
+#define APCI1710_REFERENCE_LOW                 (~APCI1710_REFERENCE_HIGH)
+
+#define APCI1710_TOR_GATE_LOW                  0x40
+#define APCI1710_TOR_GATE_HIGH                 (~APCI1710_TOR_GATE_LOW)
+
+/* INSN CONFIG */
+#define        APCI1710_INCCPT_INITCOUNTER                     100
+#define APCI1710_INCCPT_COUNTERAUTOTEST                        101
+#define APCI1710_INCCPT_INITINDEX                      102
+#define APCI1710_INCCPT_INITREFERENCE                  103
+#define APCI1710_INCCPT_INITEXTERNALSTROBE             104
+#define APCI1710_INCCPT_INITCOMPARELOGIC               105
+#define APCI1710_INCCPT_INITFREQUENCYMEASUREMENT       106
+
+/* INSN READ */
+#define APCI1710_INCCPT_READLATCHREGISTERSTATUS                200
+#define APCI1710_INCCPT_READLATCHREGISTERVALUE         201
+#define APCI1710_INCCPT_READ16BITCOUNTERVALUE          202
+#define APCI1710_INCCPT_READ32BITCOUNTERVALUE          203
+#define APCI1710_INCCPT_GETINDEXSTATUS                 204
+#define APCI1710_INCCPT_GETREFERENCESTATUS             205
+#define APCI1710_INCCPT_GETUASSTATUS                   206
+#define APCI1710_INCCPT_GETCBSTATUS                    207
+#define APCI1710_INCCPT_GET16BITCBSTATUS               208
+#define APCI1710_INCCPT_GETUDSTATUS                    209
+#define APCI1710_INCCPT_GETINTERRUPTUDLATCHEDSTATUS    210
+#define APCI1710_INCCPT_READFREQUENCYMEASUREMENT       211
+#define APCI1710_INCCPT_READINTERRUPT                  212
+
+/* INSN BITS */
+#define APCI1710_INCCPT_CLEARCOUNTERVALUE              300
+#define APCI1710_INCCPT_CLEARALLCOUNTERVALUE           301
+#define APCI1710_INCCPT_SETINPUTFILTER                 302
+#define APCI1710_INCCPT_LATCHCOUNTER                   303
+#define APCI1710_INCCPT_SETINDEXANDREFERENCESOURCE     304
+#define APCI1710_INCCPT_SETDIGITALCHLON                        305
+#define APCI1710_INCCPT_SETDIGITALCHLOFF               306
+
+/* INSN WRITE */
+#define APCI1710_INCCPT_ENABLELATCHINTERRUPT           400
+#define APCI1710_INCCPT_DISABLELATCHINTERRUPT          401
+#define APCI1710_INCCPT_WRITE16BITCOUNTERVALUE         402
+#define APCI1710_INCCPT_WRITE32BITCOUNTERVALUE         403
+#define APCI1710_INCCPT_ENABLEINDEX                    404
+#define APCI1710_INCCPT_DISABLEINDEX                   405
+#define APCI1710_INCCPT_ENABLECOMPARELOGIC             406
+#define APCI1710_INCCPT_DISABLECOMPARELOGIC            407
+#define APCI1710_INCCPT_ENABLEFREQUENCYMEASUREMENT     408
+#define APCI1710_INCCPT_DISABLEFREQUENCYMEASUREMENT    409
 
 /*
 +----------------------------------------------------------------------------+

diff --git a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h b/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
deleted file mode 100644 (file)
index ff3ea6e..0000000
--- a/drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (C) 2004,2005  ADDI-DATA GmbH for the source code of this module.
- *
- *     ADDI-DATA GmbH
- *     Dieselstrasse 3
- *     D-77833 Ottersweier
- *     Tel: +19(0)7223/9493-0
- *     Fax: +49(0)7223/9493-92
- *     http://www.addi-data.com
- *     info@addi-data.com
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- */
-
-#define APCI1710_16BIT_COUNTER                 0x10
-#define APCI1710_32BIT_COUNTER                 0x0
-#define APCI1710_QUADRUPLE_MODE                        0x0
-#define APCI1710_DOUBLE_MODE                   0x3
-#define APCI1710_SIMPLE_MODE                   0xF
-#define APCI1710_DIRECT_MODE                   0x80
-#define APCI1710_HYSTERESIS_ON                 0x60
-#define APCI1710_HYSTERESIS_OFF                        0x0
-#define APCI1710_INCREMENT                     0x60
-#define APCI1710_DECREMENT                     0x0
-#define APCI1710_LATCH_COUNTER                 0x1
-#define APCI1710_CLEAR_COUNTER                 0x0
-#define APCI1710_LOW                           0x0
-#define APCI1710_HIGH                          0x1
-
-/*********************/
-/* Version 0600-0229 */
-/*********************/
-#define APCI1710_HIGH_EDGE_CLEAR_COUNTER               0x0
-#define APCI1710_HIGH_EDGE_LATCH_COUNTER               0x1
-#define APCI1710_LOW_EDGE_CLEAR_COUNTER                        0x2
-#define APCI1710_LOW_EDGE_LATCH_COUNTER                        0x3
-#define APCI1710_HIGH_EDGE_LATCH_AND_CLEAR_COUNTER     0x4
-#define APCI1710_LOW_EDGE_LATCH_AND_CLEAR_COUNTER      0x5
-#define APCI1710_SOURCE_0                              0x0
-#define APCI1710_SOURCE_1                              0x1
-
-#define APCI1710_30MHZ                         30
-#define APCI1710_33MHZ                         33
-#define APCI1710_40MHZ                         40
-
-#define APCI1710_ENABLE_LATCH_INT              0x80
-#define APCI1710_DISABLE_LATCH_INT             (~APCI1710_ENABLE_LATCH_INT)
-
-#define APCI1710_INDEX_LATCH_COUNTER           0x10
-#define APCI1710_INDEX_AUTO_MODE               0x8
-#define APCI1710_ENABLE_INDEX                  0x4
-#define APCI1710_DISABLE_INDEX                 (~APCI1710_ENABLE_INDEX)
-#define APCI1710_ENABLE_LATCH_AND_CLEAR                0x8
-#define APCI1710_DISABLE_LATCH_AND_CLEAR       (~APCI1710_ENABLE_LATCH_AND_CLEAR)
-#define APCI1710_SET_LOW_INDEX_LEVEL           0x4
-#define APCI1710_SET_HIGH_INDEX_LEVEL          (~APCI1710_SET_LOW_INDEX_LEVEL)
-#define APCI1710_INVERT_INDEX_RFERENCE         0x2
-#define APCI1710_DEFAULT_INDEX_RFERENCE         (~APCI1710_INVERT_INDEX_RFERENCE)
-
-#define APCI1710_ENABLE_INDEX_INT              0x1
-#define APCI1710_DISABLE_INDEX_INT             (~APCI1710_ENABLE_INDEX_INT)
-
-#define APCI1710_ENABLE_FREQUENCY              0x4
-#define APCI1710_DISABLE_FREQUENCY             (~APCI1710_ENABLE_FREQUENCY)
-
-#define APCI1710_ENABLE_FREQUENCY_INT          0x8
-#define APCI1710_DISABLE_FREQUENCY_INT         (~APCI1710_ENABLE_FREQUENCY_INT)
-
-#define APCI1710_ENABLE_40MHZ_FREQUENCY                0x40
-#define APCI1710_DISABLE_40MHZ_FREQUENCY       (~APCI1710_ENABLE_40MHZ_FREQUENCY)
-
-#define APCI1710_ENABLE_40MHZ_FILTER           0x80
-#define APCI1710_DISABLE_40MHZ_FILTER          (~APCI1710_ENABLE_40MHZ_FILTER)
-
-#define APCI1710_ENABLE_COMPARE_INT            0x2
-#define APCI1710_DISABLE_COMPARE_INT           (~APCI1710_ENABLE_COMPARE_INT)
-
-#define APCI1710_ENABLE_INDEX_ACTION           0x20
-#define APCI1710_DISABLE_INDEX_ACTION          (~APCI1710_ENABLE_INDEX_ACTION)
-#define APCI1710_REFERENCE_HIGH                        0x40
-#define APCI1710_REFERENCE_LOW                 (~APCI1710_REFERENCE_HIGH)
-
-#define APCI1710_TOR_GATE_LOW                  0x40
-#define APCI1710_TOR_GATE_HIGH                 (~APCI1710_TOR_GATE_LOW)
-
-/* INSN CONFIG */
-#define        APCI1710_INCCPT_INITCOUNTER                             100
-#define APCI1710_INCCPT_COUNTERAUTOTEST                                101
-#define APCI1710_INCCPT_INITINDEX                              102
-#define APCI1710_INCCPT_INITREFERENCE                          103
-#define APCI1710_INCCPT_INITEXTERNALSTROBE                     104
-#define APCI1710_INCCPT_INITCOMPARELOGIC                       105
-#define APCI1710_INCCPT_INITFREQUENCYMEASUREMENT               106
-
-/* INSN READ */
-#define APCI1710_INCCPT_READLATCHREGISTERSTATUS                        200
-#define APCI1710_INCCPT_READLATCHREGISTERVALUE                 201
-#define APCI1710_INCCPT_READ16BITCOUNTERVALUE                  202
-#define APCI1710_INCCPT_READ32BITCOUNTERVALUE                  203
-#define APCI1710_INCCPT_GETINDEXSTATUS                         204
-#define APCI1710_INCCPT_GETREFERENCESTATUS                     205
-#define APCI1710_INCCPT_GETUASSTATUS                           206
-#define APCI1710_INCCPT_GETCBSTATUS                            207
-#define APCI1710_INCCPT_GET16BITCBSTATUS                       208
-#define APCI1710_INCCPT_GETUDSTATUS                            209
-#define APCI1710_INCCPT_GETINTERRUPTUDLATCHEDSTATUS            210
-#define APCI1710_INCCPT_READFREQUENCYMEASUREMENT               211
-#define APCI1710_INCCPT_READINTERRUPT                          212
-
-/* INSN BITS */
-#define APCI1710_INCCPT_CLEARCOUNTERVALUE                      300
-#define APCI1710_INCCPT_CLEARALLCOUNTERVALUE                   301
-#define APCI1710_INCCPT_SETINPUTFILTER                         302
-#define APCI1710_INCCPT_LATCHCOUNTER                           303
-#define APCI1710_INCCPT_SETINDEXANDREFERENCESOURCE             304
-#define APCI1710_INCCPT_SETDIGITALCHLON                                305
-#define APCI1710_INCCPT_SETDIGITALCHLOFF                       306
-
-/* INSN WRITE */
-#define APCI1710_INCCPT_ENABLELATCHINTERRUPT                   400
-#define APCI1710_INCCPT_DISABLELATCHINTERRUPT                  401
-#define APCI1710_INCCPT_WRITE16BITCOUNTERVALUE                 402
-#define APCI1710_INCCPT_WRITE32BITCOUNTERVALUE                 403
-#define APCI1710_INCCPT_ENABLEINDEX                            404
-#define APCI1710_INCCPT_DISABLEINDEX                           405
-#define APCI1710_INCCPT_ENABLECOMPARELOGIC                     406
-#define APCI1710_INCCPT_DISABLECOMPARELOGIC                    407
-#define APCI1710_INCCPT_ENABLEFREQUENCYMEASUREMENT             408
-#define APCI1710_INCCPT_DISABLEFREQUENCYMEASUREMENT            409