Skip to content

Commit

Permalink
staging: comedi: hwrdv_apci3501: absorb private header
Browse files Browse the repository at this point in the history
The header file hwdrv_apci3501.h is only included by the source
file hwrdv_apci3501.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 7526eab commit c919d71
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 58 deletions.
43 changes: 37 additions & 6 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,43 @@ You should also find the complete GPL in the COPYING file accompanying this sour
+----------+-----------+------------------------------------------------+
*/

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

#define APCI3501_DIGITAL_IP 0x50
#define APCI3501_DIGITAL_OP 0x40
#define APCI3501_ANALOG_OUTPUT 0x00

/* Analog Output related Defines */
#define APCI3501_AO_VOLT_MODE 0
#define APCI3501_AO_PROG 4
#define APCI3501_AO_TRIG_SCS 8
#define UNIPOLAR 0
#define BIPOLAR 1
#define MODE0 0
#define MODE1 1

/* Watchdog Related Defines */

#define APCI3501_WATCHDOG 0x20
#define APCI3501_TCW_SYNC_ENABLEDISABLE 0
#define APCI3501_TCW_RELOAD_VALUE 4
#define APCI3501_TCW_TIMEBASE 8
#define APCI3501_TCW_PROG 12
#define APCI3501_TCW_TRIG_STATUS 16
#define APCI3501_TCW_IRQ 20
#define APCI3501_TCW_WARN_TIMEVAL 24
#define APCI3501_TCW_WARN_TIMEBASE 28
#define ADDIDATA_TIMER 0
#define ADDIDATA_WATCHDOG 2

/* ANALOG OUTPUT RANGE */
static struct comedi_lrange range_apci3501_ao = {
2, {
BIP_RANGE(10),
UNI_RANGE(10)
}
};

/*
+----------------------------------------------------------------------------+
Expand Down
52 changes: 0 additions & 52 deletions drivers/staging/comedi/drivers/addi-data/hwdrv_apci3501.h

This file was deleted.

0 comments on commit c919d71

Please sign in to comment.