staging: comedi: hwrdv_apci1500: absorb private header

The header file hwdrv_apci1500.h is only included by the source
file hwrdv_apci1500.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/hwdrv_apci1500.c b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
index cc47821a7457b64c6200a0bdf2016ef976dcec40..771a3054f926ad58e92f3773fccfcade58d3cf70 100644 (file)
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
+++ b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.c
@@ -45,7 +45,105 @@ You should also find the complete GPL in the COPYING file accompanying this sour
   |          |           |                                                |
   +----------+-----------+------------------------------------------------+
 */
-#include "hwdrv_apci1500.h"
+
+/*********      Definitions for APCI-1500 card  *****/
+
+/* Card Specific information */
+#define APCI1500_ADDRESS_RANGE         4
+
+/* DIGITAL INPUT-OUTPUT DEFINE */
+
+#define APCI1500_DIGITAL_OP            2
+#define APCI1500_DIGITAL_IP            0
+#define APCI1500_AND                   2
+#define APCI1500_OR                    4
+#define APCI1500_OR_PRIORITY           6
+#define APCI1500_CLK_SELECT            0
+#define COUNTER1                       0
+#define COUNTER2                       1
+#define COUNTER3                       2
+#define APCI1500_COUNTER               0x20
+#define APCI1500_TIMER                 0
+#define APCI1500_WATCHDOG              0
+#define APCI1500_SINGLE                        0
+#define APCI1500_CONTINUOUS            0x80
+#define APCI1500_DISABLE               0
+#define APCI1500_ENABLE                        1
+#define APCI1500_SOFTWARE_TRIGGER      0x4
+#define APCI1500_HARDWARE_TRIGGER      0x10
+#define APCI1500_SOFTWARE_GATE         0
+#define APCI1500_HARDWARE_GATE         0x8
+#define START                          0
+#define STOP                           1
+#define TRIGGER                                2
+
+/*
+ * Zillog I/O enumeration
+ */
+enum {
+       APCI1500_Z8536_PORT_C,
+       APCI1500_Z8536_PORT_B,
+       APCI1500_Z8536_PORT_A,
+       APCI1500_Z8536_CONTROL_REGISTER
+};
+
+/*
+ * Z8536 CIO Internal Address
+ */
+enum {
+       APCI1500_RW_MASTER_INTERRUPT_CONTROL,
+       APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
+       APCI1500_RW_PORT_A_INTERRUPT_CONTROL,
+       APCI1500_RW_PORT_B_INTERRUPT_CONTROL,
+       APCI1500_RW_TIMER_COUNTER_INTERRUPT_VECTOR,
+       APCI1500_RW_PORT_C_DATA_PCITCH_POLARITY,
+       APCI1500_RW_PORT_C_DATA_DIRECTION,
+       APCI1500_RW_PORT_C_SPECIAL_IO_CONTROL,
+
+       APCI1500_RW_PORT_A_COMMAND_AND_STATUS,
+       APCI1500_RW_PORT_B_COMMAND_AND_STATUS,
+       APCI1500_RW_CPT_TMR1_CMD_STATUS,
+       APCI1500_RW_CPT_TMR2_CMD_STATUS,
+       APCI1500_RW_CPT_TMR3_CMD_STATUS,
+       APCI1500_RW_PORT_A_DATA,
+       APCI1500_RW_PORT_B_DATA,
+       APCI1500_RW_PORT_C_DATA,
+
+       APCI1500_R_CPT_TMR1_VALUE_HIGH,
+       APCI1500_R_CPT_TMR1_VALUE_LOW,
+       APCI1500_R_CPT_TMR2_VALUE_HIGH,
+       APCI1500_R_CPT_TMR2_VALUE_LOW,
+       APCI1500_R_CPT_TMR3_VALUE_HIGH,
+       APCI1500_R_CPT_TMR3_VALUE_LOW,
+       APCI1500_RW_CPT_TMR1_TIME_CST_HIGH,
+       APCI1500_RW_CPT_TMR1_TIME_CST_LOW,
+       APCI1500_RW_CPT_TMR2_TIME_CST_HIGH,
+       APCI1500_RW_CPT_TMR2_TIME_CST_LOW,
+       APCI1500_RW_CPT_TMR3_TIME_CST_HIGH,
+       APCI1500_RW_CPT_TMR3_TIME_CST_LOW,
+       APCI1500_RW_CPT_TMR1_MODE_SPECIFICATION,
+       APCI1500_RW_CPT_TMR2_MODE_SPECIFICATION,
+       APCI1500_RW_CPT_TMR3_MODE_SPECIFICATION,
+       APCI1500_R_CURRENT_VECTOR,
+
+       APCI1500_RW_PORT_A_SPECIFICATION,
+       APCI1500_RW_PORT_A_HANDSHAKE_SPECIFICATION,
+       APCI1500_RW_PORT_A_DATA_PCITCH_POLARITY,
+       APCI1500_RW_PORT_A_DATA_DIRECTION,
+       APCI1500_RW_PORT_A_SPECIAL_IO_CONTROL,
+       APCI1500_RW_PORT_A_PATTERN_POLARITY,
+       APCI1500_RW_PORT_A_PATTERN_TRANSITION,
+       APCI1500_RW_PORT_A_PATTERN_MASK,
+
+       APCI1500_RW_PORT_B_SPECIFICATION,
+       APCI1500_RW_PORT_B_HANDSHAKE_SPECIFICATION,
+       APCI1500_RW_PORT_B_DATA_PCITCH_POLARITY,
+       APCI1500_RW_PORT_B_DATA_DIRECTION,
+       APCI1500_RW_PORT_B_SPECIAL_IO_CONTROL,
+       APCI1500_RW_PORT_B_PATTERN_POLARITY,
+       APCI1500_RW_PORT_B_PATTERN_TRANSITION,
+       APCI1500_RW_PORT_B_PATTERN_MASK
+};
 
 static int i_TimerCounter1Init = 0;
 static int i_TimerCounter2Init = 0;

diff --git a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h b/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
deleted file mode 100644 (file)
index 989e880..0000000
--- a/drivers/staging/comedi/drivers/addi-data/hwdrv_apci1500.h
+++ /dev/null
@@ -1,115 +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.
- */
-
-/*********      Definitions for APCI-1500 card  *****/
-
-/* Card Specific information */
-#define APCI1500_ADDRESS_RANGE              4
-
-/* DIGITAL INPUT-OUTPUT DEFINE */
-
-#define  APCI1500_DIGITAL_OP                   2
-#define  APCI1500_DIGITAL_IP                    0
-#define  APCI1500_AND                              2
-#define  APCI1500_OR                               4
-#define  APCI1500_OR_PRIORITY                      6
-#define  APCI1500_CLK_SELECT                    0
-#define  COUNTER1                               0
-#define  COUNTER2                               1
-#define  COUNTER3                               2
-#define  APCI1500_COUNTER                              0x20
-#define  APCI1500_TIMER                                0
-#define  APCI1500_WATCHDOG                         0
-#define  APCI1500_SINGLE                           0
-#define  APCI1500_CONTINUOUS                       0x80
-#define  APCI1500_DISABLE                              0
-#define  APCI1500_ENABLE                               1
-#define  APCI1500_SOFTWARE_TRIGGER                 0x4
-#define  APCI1500_HARDWARE_TRIGGER                 0x10
-#define  APCI1500_SOFTWARE_GATE                    0
-#define  APCI1500_HARDWARE_GATE                    0x8
-#define  START                                     0
-#define  STOP                                      1
-#define  TRIGGER                                           2
-
-/*
- * Zillog I/O enumeration
- */
-enum {
-       APCI1500_Z8536_PORT_C,
-       APCI1500_Z8536_PORT_B,
-       APCI1500_Z8536_PORT_A,
-       APCI1500_Z8536_CONTROL_REGISTER
-};
-
-/*
- * Z8536 CIO Internal Address
- */
-enum {
-       APCI1500_RW_MASTER_INTERRUPT_CONTROL,
-       APCI1500_RW_MASTER_CONFIGURATION_CONTROL,
-       APCI1500_RW_PORT_A_INTERRUPT_CONTROL,
-       APCI1500_RW_PORT_B_INTERRUPT_CONTROL,
-       APCI1500_RW_TIMER_COUNTER_INTERRUPT_VECTOR,
-       APCI1500_RW_PORT_C_DATA_PCITCH_POLARITY,
-       APCI1500_RW_PORT_C_DATA_DIRECTION,
-       APCI1500_RW_PORT_C_SPECIAL_IO_CONTROL,
-
-       APCI1500_RW_PORT_A_COMMAND_AND_STATUS,
-       APCI1500_RW_PORT_B_COMMAND_AND_STATUS,
-       APCI1500_RW_CPT_TMR1_CMD_STATUS,
-       APCI1500_RW_CPT_TMR2_CMD_STATUS,
-       APCI1500_RW_CPT_TMR3_CMD_STATUS,
-       APCI1500_RW_PORT_A_DATA,
-       APCI1500_RW_PORT_B_DATA,
-       APCI1500_RW_PORT_C_DATA,
-
-       APCI1500_R_CPT_TMR1_VALUE_HIGH,
-       APCI1500_R_CPT_TMR1_VALUE_LOW,
-       APCI1500_R_CPT_TMR2_VALUE_HIGH,
-       APCI1500_R_CPT_TMR2_VALUE_LOW,
-       APCI1500_R_CPT_TMR3_VALUE_HIGH,
-       APCI1500_R_CPT_TMR3_VALUE_LOW,
-       APCI1500_RW_CPT_TMR1_TIME_CST_HIGH,
-       APCI1500_RW_CPT_TMR1_TIME_CST_LOW,
-       APCI1500_RW_CPT_TMR2_TIME_CST_HIGH,
-       APCI1500_RW_CPT_TMR2_TIME_CST_LOW,
-       APCI1500_RW_CPT_TMR3_TIME_CST_HIGH,
-       APCI1500_RW_CPT_TMR3_TIME_CST_LOW,
-       APCI1500_RW_CPT_TMR1_MODE_SPECIFICATION,
-       APCI1500_RW_CPT_TMR2_MODE_SPECIFICATION,
-       APCI1500_RW_CPT_TMR3_MODE_SPECIFICATION,
-       APCI1500_R_CURRENT_VECTOR,
-
-       APCI1500_RW_PORT_A_SPECIFICATION,
-       APCI1500_RW_PORT_A_HANDSHAKE_SPECIFICATION,
-       APCI1500_RW_PORT_A_DATA_PCITCH_POLARITY,
-       APCI1500_RW_PORT_A_DATA_DIRECTION,
-       APCI1500_RW_PORT_A_SPECIAL_IO_CONTROL,
-       APCI1500_RW_PORT_A_PATTERN_POLARITY,
-       APCI1500_RW_PORT_A_PATTERN_TRANSITION,
-       APCI1500_RW_PORT_A_PATTERN_MASK,
-
-       APCI1500_RW_PORT_B_SPECIFICATION,
-       APCI1500_RW_PORT_B_HANDSHAKE_SPECIFICATION,
-       APCI1500_RW_PORT_B_DATA_PCITCH_POLARITY,
-       APCI1500_RW_PORT_B_DATA_DIRECTION,
-       APCI1500_RW_PORT_B_SPECIAL_IO_CONTROL,
-       APCI1500_RW_PORT_B_PATTERN_POLARITY,
-       APCI1500_RW_PORT_B_PATTERN_TRANSITION,
-       APCI1500_RW_PORT_B_PATTERN_MASK
-};