Skip to content

Commit

Permalink
staging: comedi: hwrdv_apci035: absorb private header
Browse files Browse the repository at this point in the history
The header file hwdrv_apci035.h is only included by the source
file hwrdv_apci035.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>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Oct 31, 2012
1 parent 4d0c8ee commit 9b2b9a3
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 89 deletions.
74 changes: 68 additions & 6 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,74 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+----------+-----------+------------------------------------------------+
*/

/*
+----------------------------------------------------------------------------+
| Included files |
+----------------------------------------------------------------------------+
*/
#include "hwdrv_apci035.h"
/* Card Specific information */
#define APCI035_ADDRESS_RANGE 255

/* Timer / Watchdog Related Defines */
#define APCI035_TCW_SYNC_ENABLEDISABLE 0
#define APCI035_TCW_RELOAD_VALUE 4
#define APCI035_TCW_TIMEBASE 8
#define APCI035_TCW_PROG 12
#define APCI035_TCW_TRIG_STATUS 16
#define APCI035_TCW_IRQ 20
#define APCI035_TCW_WARN_TIMEVAL 24
#define APCI035_TCW_WARN_TIMEBASE 28

#define ADDIDATA_TIMER 0
/* #define ADDIDATA_WATCHDOG 1 */

#define APCI035_TW1 0
#define APCI035_TW2 32
#define APCI035_TW3 64
#define APCI035_TW4 96

#define APCI035_AI_OFFSET 0
#define APCI035_TEMP 128
#define APCI035_ALR_SEQ 4
#define APCI035_START_STOP_INDEX 8
#define APCI035_ALR_START_STOP 12
#define APCI035_ALR_IRQ 16
#define APCI035_EOS 20
#define APCI035_CHAN_NO 24
#define APCI035_CHAN_VAL 28
#define APCI035_CONV_TIME_TIME_BASE 36
#define APCI035_RELOAD_CONV_TIME_VAL 32
#define APCI035_DELAY_TIME_TIME_BASE 44
#define APCI035_RELOAD_DELAY_TIME_VAL 40
#define ENABLE_EXT_TRIG 1
#define ENABLE_EXT_GATE 2
#define ENABLE_EXT_TRIG_GATE 3

#define ANALOG_INPUT 0
#define TEMPERATURE 1
#define RESISTANCE 2

#define ADDIDATA_GREATER_THAN_TEST 0
#define ADDIDATA_LESS_THAN_TEST 1

#define APCI035_MAXVOLT 2.5

#define ADDIDATA_UNIPOLAR 1
#define ADDIDATA_BIPOLAR 2

/* ADDIDATA Enable Disable */
#define ADDIDATA_ENABLE 1
#define ADDIDATA_DISABLE 0

/* ANALOG INPUT RANGE */
static struct comedi_lrange range_apci035_ai = {
8, {
BIP_RANGE(10),
BIP_RANGE(5),
BIP_RANGE(2),
BIP_RANGE(1),
UNI_RANGE(10),
UNI_RANGE(5),
UNI_RANGE(2),
UNI_RANGE(1)
}
};

static int i_WatchdogNbr = 0;
static int i_Temp = 0;
static int i_Flag = 1;
Expand Down
83 changes: 0 additions & 83 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci035.h

This file was deleted.

0 comments on commit 9b2b9a3

Please sign in to comment.