mirror of https://gitee.com/openkylin/linux.git
Staging: comedi: fix up a lot of checkpatch.pl warnings
Only clean up some of the easier ones in the .h files Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Cc: David Schleef <ds@schleef.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman
parent
ed9eccbe89
commit
e0dcef71f6
|
|
@ -50,8 +50,8 @@ extern "C" {
|
|||
#define COMEDI_DEVCONF_AUX_DATA2_LENGTH 26
|
||||
#define COMEDI_DEVCONF_AUX_DATA1_LENGTH 27
|
||||
#define COMEDI_DEVCONF_AUX_DATA0_LENGTH 28
|
||||
#define COMEDI_DEVCONF_AUX_DATA_HI 29 /*most significant 32 bits of pointer address (if needed) */
|
||||
#define COMEDI_DEVCONF_AUX_DATA_LO 30 /*least significant 32 bits of pointer address */
|
||||
#define COMEDI_DEVCONF_AUX_DATA_HI 29 /* most significant 32 bits of pointer address (if needed) */
|
||||
#define COMEDI_DEVCONF_AUX_DATA_LO 30 /* least significant 32 bits of pointer address */
|
||||
#define COMEDI_DEVCONF_AUX_DATA_LENGTH 31 /* total data length */
|
||||
|
||||
/* max length of device and driver names */
|
||||
|
|
@ -62,7 +62,7 @@ extern "C" {
|
|||
|
||||
/* packs and unpacks a channel/range number */
|
||||
|
||||
#define CR_PACK(chan,rng,aref) ( (((aref)&0x3)<<24) | (((rng)&0xff)<<16) | (chan) )
|
||||
#define CR_PACK(chan, rng, aref) ((((aref)&0x3)<<24) | (((rng)&0xff)<<16) | (chan))
|
||||
#define CR_PACK_FLAGS(chan, range, aref, flags) (CR_PACK(chan, range, aref) | ((flags) & CR_FLAGS_MASK))
|
||||
|
||||
#define CR_CHAN(a) ((a)&0xffff)
|
||||
|
|
@ -110,13 +110,13 @@ extern "C" {
|
|||
#define INSN_MASK_READ 0x4000000
|
||||
#define INSN_MASK_SPECIAL 0x2000000
|
||||
|
||||
#define INSN_READ ( 0 | INSN_MASK_READ)
|
||||
#define INSN_WRITE ( 1 | INSN_MASK_WRITE)
|
||||
#define INSN_BITS ( 2 | INSN_MASK_READ|INSN_MASK_WRITE)
|
||||
#define INSN_CONFIG ( 3 | INSN_MASK_READ|INSN_MASK_WRITE)
|
||||
#define INSN_GTOD ( 4 | INSN_MASK_READ|INSN_MASK_SPECIAL)
|
||||
#define INSN_WAIT ( 5 | INSN_MASK_WRITE|INSN_MASK_SPECIAL)
|
||||
#define INSN_INTTRIG ( 6 | INSN_MASK_WRITE|INSN_MASK_SPECIAL)
|
||||
#define INSN_READ (0 | INSN_MASK_READ)
|
||||
#define INSN_WRITE (1 | INSN_MASK_WRITE)
|
||||
#define INSN_BITS (2 | INSN_MASK_READ|INSN_MASK_WRITE)
|
||||
#define INSN_CONFIG (3 | INSN_MASK_READ|INSN_MASK_WRITE)
|
||||
#define INSN_GTOD (4 | INSN_MASK_READ|INSN_MASK_SPECIAL)
|
||||
#define INSN_WAIT (5 | INSN_MASK_WRITE|INSN_MASK_SPECIAL)
|
||||
#define INSN_INTTRIG (6 | INSN_MASK_WRITE|INSN_MASK_SPECIAL)
|
||||
|
||||
/* trigger flags */
|
||||
/* These flags are used in comedi_trig structures */
|
||||
|
|
@ -124,10 +124,10 @@ extern "C" {
|
|||
#define TRIG_BOGUS 0x0001 /* do the motions */
|
||||
#define TRIG_DITHER 0x0002 /* enable dithering */
|
||||
#define TRIG_DEGLITCH 0x0004 /* enable deglitching */
|
||||
//#define TRIG_RT 0x0008 /* perform op in real time */
|
||||
/*#define TRIG_RT 0x0008 */ /* perform op in real time */
|
||||
#define TRIG_CONFIG 0x0010 /* perform configuration, not triggering */
|
||||
#define TRIG_WAKE_EOS 0x0020 /* wake up on end-of-scan events */
|
||||
//#define TRIG_WRITE 0x0040 /* write to bidirectional devices */
|
||||
/*#define TRIG_WRITE 0x0040*/ /* write to bidirectional devices */
|
||||
|
||||
/* command flags */
|
||||
/* These flags are used in comedi_cmd structures */
|
||||
|
|
@ -210,7 +210,7 @@ extern "C" {
|
|||
|
||||
/* subdevice types */
|
||||
|
||||
enum comedi_subdevice_type {
|
||||
enum comedi_subdevice_type {
|
||||
COMEDI_SUBD_UNUSED, /* unused by driver */
|
||||
COMEDI_SUBD_AI, /* analog input */
|
||||
COMEDI_SUBD_AO, /* analog output */
|
||||
|
|
@ -224,18 +224,18 @@ extern "C" {
|
|||
COMEDI_SUBD_PROC, /* processor, DSP */
|
||||
COMEDI_SUBD_SERIAL, /* serial IO */
|
||||
COMEDI_SUBD_PWM /* PWM */
|
||||
};
|
||||
};
|
||||
|
||||
/* configuration instructions */
|
||||
|
||||
enum configuration_ids {
|
||||
enum configuration_ids {
|
||||
INSN_CONFIG_DIO_INPUT = 0,
|
||||
INSN_CONFIG_DIO_OUTPUT = 1,
|
||||
INSN_CONFIG_DIO_OPENDRAIN = 2,
|
||||
INSN_CONFIG_ANALOG_TRIG = 16,
|
||||
// INSN_CONFIG_WAVEFORM = 17,
|
||||
// INSN_CONFIG_TRIG = 18,
|
||||
// INSN_CONFIG_COUNTER = 19,
|
||||
/* INSN_CONFIG_WAVEFORM = 17, */
|
||||
/* INSN_CONFIG_TRIG = 18, */
|
||||
/* INSN_CONFIG_COUNTER = 19, */
|
||||
INSN_CONFIG_ALT_SOURCE = 20,
|
||||
INSN_CONFIG_DIGITAL_TRIG = 21,
|
||||
INSN_CONFIG_BLOCK_SIZE = 22,
|
||||
|
|
@ -252,16 +252,19 @@ extern "C" {
|
|||
INSN_CONFIG_DISARM = 32,
|
||||
INSN_CONFIG_GET_COUNTER_STATUS = 33,
|
||||
INSN_CONFIG_RESET = 34,
|
||||
INSN_CONFIG_GPCT_SINGLE_PULSE_GENERATOR = 1001, // Use CTR as single pulsegenerator
|
||||
INSN_CONFIG_GPCT_PULSE_TRAIN_GENERATOR = 1002, // Use CTR as pulsetraingenerator
|
||||
INSN_CONFIG_GPCT_QUADRATURE_ENCODER = 1003, // Use the counter as encoder
|
||||
INSN_CONFIG_SET_GATE_SRC = 2001, // Set gate source
|
||||
INSN_CONFIG_GET_GATE_SRC = 2002, // Get gate source
|
||||
INSN_CONFIG_SET_CLOCK_SRC = 2003, // Set master clock source
|
||||
INSN_CONFIG_GET_CLOCK_SRC = 2004, // Get master clock source
|
||||
INSN_CONFIG_SET_OTHER_SRC = 2005, // Set other source
|
||||
// INSN_CONFIG_GET_OTHER_SRC = 2006, // Get other source
|
||||
INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE, // Get size in bytes of subdevice's on-board fifos used during streaming input/output
|
||||
INSN_CONFIG_GPCT_SINGLE_PULSE_GENERATOR = 1001, /* Use CTR as single pulsegenerator */
|
||||
INSN_CONFIG_GPCT_PULSE_TRAIN_GENERATOR = 1002, /* Use CTR as pulsetraingenerator */
|
||||
INSN_CONFIG_GPCT_QUADRATURE_ENCODER = 1003, /* Use the counter as encoder */
|
||||
INSN_CONFIG_SET_GATE_SRC = 2001, /* Set gate source */
|
||||
INSN_CONFIG_GET_GATE_SRC = 2002, /* Get gate source */
|
||||
INSN_CONFIG_SET_CLOCK_SRC = 2003, /* Set master clock source */
|
||||
INSN_CONFIG_GET_CLOCK_SRC = 2004, /* Get master clock source */
|
||||
INSN_CONFIG_SET_OTHER_SRC = 2005, /* Set other source */
|
||||
/* INSN_CONFIG_GET_OTHER_SRC = 2006,*/ /* Get other source */
|
||||
INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE, /* Get size in bytes of
|
||||
subdevice's on-board fifos
|
||||
used during streaming
|
||||
input/output */
|
||||
INSN_CONFIG_SET_COUNTER_MODE = 4097,
|
||||
INSN_CONFIG_8254_SET_MODE = INSN_CONFIG_SET_COUNTER_MODE, /* deprecated */
|
||||
INSN_CONFIG_8254_READ_STATUS = 4098,
|
||||
|
|
@ -273,57 +276,56 @@ extern "C" {
|
|||
INSN_CONFIG_GET_PWM_STATUS = 5002, /* is it running? */
|
||||
INSN_CONFIG_PWM_SET_H_BRIDGE = 5003, /* sets H bridge: duty cycle and sign bit for a relay at the same time*/
|
||||
INSN_CONFIG_PWM_GET_H_BRIDGE = 5004 /* gets H bridge data: duty cycle and the sign bit */
|
||||
};
|
||||
};
|
||||
|
||||
enum comedi_io_direction {
|
||||
enum comedi_io_direction {
|
||||
COMEDI_INPUT = 0,
|
||||
COMEDI_OUTPUT = 1,
|
||||
COMEDI_OPENDRAIN = 2
|
||||
};
|
||||
};
|
||||
|
||||
enum comedi_support_level
|
||||
{
|
||||
enum comedi_support_level {
|
||||
COMEDI_UNKNOWN_SUPPORT = 0,
|
||||
COMEDI_SUPPORTED,
|
||||
COMEDI_UNSUPPORTED
|
||||
};
|
||||
};
|
||||
|
||||
/* ioctls */
|
||||
|
||||
#define CIO 'd'
|
||||
#define COMEDI_DEVCONFIG _IOW(CIO,0,comedi_devconfig)
|
||||
#define COMEDI_DEVINFO _IOR(CIO,1,comedi_devinfo)
|
||||
#define COMEDI_SUBDINFO _IOR(CIO,2,comedi_subdinfo)
|
||||
#define COMEDI_CHANINFO _IOR(CIO,3,comedi_chaninfo)
|
||||
#define COMEDI_TRIG _IOWR(CIO,4,comedi_trig)
|
||||
#define COMEDI_LOCK _IO(CIO,5)
|
||||
#define COMEDI_UNLOCK _IO(CIO,6)
|
||||
#define COMEDI_CANCEL _IO(CIO,7)
|
||||
#define COMEDI_RANGEINFO _IOR(CIO,8,comedi_rangeinfo)
|
||||
#define COMEDI_CMD _IOR(CIO,9,comedi_cmd)
|
||||
#define COMEDI_CMDTEST _IOR(CIO,10,comedi_cmd)
|
||||
#define COMEDI_INSNLIST _IOR(CIO,11,comedi_insnlist)
|
||||
#define COMEDI_INSN _IOR(CIO,12,comedi_insn)
|
||||
#define COMEDI_BUFCONFIG _IOR(CIO,13,comedi_bufconfig)
|
||||
#define COMEDI_BUFINFO _IOWR(CIO,14,comedi_bufinfo)
|
||||
#define COMEDI_POLL _IO(CIO,15)
|
||||
#define COMEDI_DEVCONFIG _IOW(CIO, 0, comedi_devconfig)
|
||||
#define COMEDI_DEVINFO _IOR(CIO, 1, comedi_devinfo)
|
||||
#define COMEDI_SUBDINFO _IOR(CIO, 2, comedi_subdinfo)
|
||||
#define COMEDI_CHANINFO _IOR(CIO, 3, comedi_chaninfo)
|
||||
#define COMEDI_TRIG _IOWR(CIO, 4, comedi_trig)
|
||||
#define COMEDI_LOCK _IO(CIO, 5)
|
||||
#define COMEDI_UNLOCK _IO(CIO, 6)
|
||||
#define COMEDI_CANCEL _IO(CIO, 7)
|
||||
#define COMEDI_RANGEINFO _IOR(CIO, 8, comedi_rangeinfo)
|
||||
#define COMEDI_CMD _IOR(CIO, 9, comedi_cmd)
|
||||
#define COMEDI_CMDTEST _IOR(CIO, 10, comedi_cmd)
|
||||
#define COMEDI_INSNLIST _IOR(CIO, 11, comedi_insnlist)
|
||||
#define COMEDI_INSN _IOR(CIO, 12, comedi_insn)
|
||||
#define COMEDI_BUFCONFIG _IOR(CIO, 13, comedi_bufconfig)
|
||||
#define COMEDI_BUFINFO _IOWR(CIO, 14, comedi_bufinfo)
|
||||
#define COMEDI_POLL _IO(CIO, 15)
|
||||
|
||||
/* structures */
|
||||
|
||||
typedef struct comedi_trig_struct comedi_trig;
|
||||
typedef struct comedi_cmd_struct comedi_cmd;
|
||||
typedef struct comedi_insn_struct comedi_insn;
|
||||
typedef struct comedi_insnlist_struct comedi_insnlist;
|
||||
typedef struct comedi_chaninfo_struct comedi_chaninfo;
|
||||
typedef struct comedi_subdinfo_struct comedi_subdinfo;
|
||||
typedef struct comedi_devinfo_struct comedi_devinfo;
|
||||
typedef struct comedi_devconfig_struct comedi_devconfig;
|
||||
typedef struct comedi_rangeinfo_struct comedi_rangeinfo;
|
||||
typedef struct comedi_krange_struct comedi_krange;
|
||||
typedef struct comedi_bufconfig_struct comedi_bufconfig;
|
||||
typedef struct comedi_bufinfo_struct comedi_bufinfo;
|
||||
typedef struct comedi_trig_struct comedi_trig;
|
||||
typedef struct comedi_cmd_struct comedi_cmd;
|
||||
typedef struct comedi_insn_struct comedi_insn;
|
||||
typedef struct comedi_insnlist_struct comedi_insnlist;
|
||||
typedef struct comedi_chaninfo_struct comedi_chaninfo;
|
||||
typedef struct comedi_subdinfo_struct comedi_subdinfo;
|
||||
typedef struct comedi_devinfo_struct comedi_devinfo;
|
||||
typedef struct comedi_devconfig_struct comedi_devconfig;
|
||||
typedef struct comedi_rangeinfo_struct comedi_rangeinfo;
|
||||
typedef struct comedi_krange_struct comedi_krange;
|
||||
typedef struct comedi_bufconfig_struct comedi_bufconfig;
|
||||
typedef struct comedi_bufinfo_struct comedi_bufinfo;
|
||||
|
||||
struct comedi_trig_struct {
|
||||
struct comedi_trig_struct {
|
||||
unsigned int subdev; /* subdevice */
|
||||
unsigned int mode; /* mode */
|
||||
unsigned int flags;
|
||||
|
|
@ -336,23 +338,23 @@ extern "C" {
|
|||
unsigned int trigvar1;
|
||||
unsigned int data_len;
|
||||
unsigned int unused[3];
|
||||
};
|
||||
};
|
||||
|
||||
struct comedi_insn_struct {
|
||||
struct comedi_insn_struct {
|
||||
unsigned int insn;
|
||||
unsigned int n;
|
||||
lsampl_t *data;
|
||||
unsigned int subdev;
|
||||
unsigned int chanspec;
|
||||
unsigned int unused[3];
|
||||
};
|
||||
};
|
||||
|
||||
struct comedi_insnlist_struct {
|
||||
struct comedi_insnlist_struct {
|
||||
unsigned int n_insns;
|
||||
comedi_insn *insns;
|
||||
};
|
||||
};
|
||||
|
||||
struct comedi_cmd_struct {
|
||||
struct comedi_cmd_struct {
|
||||
unsigned int subdev;
|
||||
unsigned int flags;
|
||||
|
||||
|
|
@ -376,29 +378,29 @@ extern "C" {
|
|||
|
||||
sampl_t *data; /* data list, size depends on subd flags */
|
||||
unsigned int data_len;
|
||||
};
|
||||
};
|
||||
|
||||
struct comedi_chaninfo_struct {
|
||||
struct comedi_chaninfo_struct {
|
||||
unsigned int subdev;
|
||||
lsampl_t *maxdata_list;
|
||||
unsigned int *flaglist;
|
||||
unsigned int *rangelist;
|
||||
unsigned int unused[4];
|
||||
};
|
||||
};
|
||||
|
||||
struct comedi_rangeinfo_struct {
|
||||
struct comedi_rangeinfo_struct {
|
||||
unsigned int range_type;
|
||||
void *range_ptr;
|
||||
};
|
||||
};
|
||||
|
||||
struct comedi_krange_struct {
|
||||
struct comedi_krange_struct {
|
||||
int min; /* fixed point, multiply by 1e-6 */
|
||||
int max; /* fixed point, multiply by 1e-6 */
|
||||
unsigned int flags;
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
struct comedi_subdinfo_struct {
|
||||
struct comedi_subdinfo_struct {
|
||||
unsigned int type;
|
||||
unsigned int n_chan;
|
||||
unsigned int subd_flags;
|
||||
|
|
@ -410,9 +412,9 @@ extern "C" {
|
|||
unsigned int settling_time_0;
|
||||
unsigned insn_bits_support; /* see support_level enum for values*/
|
||||
unsigned int unused[8];
|
||||
};
|
||||
};
|
||||
|
||||
struct comedi_devinfo_struct {
|
||||
struct comedi_devinfo_struct {
|
||||
unsigned int version_code;
|
||||
unsigned int n_subdevs;
|
||||
char driver_name[COMEDI_NAMELEN];
|
||||
|
|
@ -420,14 +422,14 @@ extern "C" {
|
|||
int read_subdevice;
|
||||
int write_subdevice;
|
||||
int unused[30];
|
||||
};
|
||||
};
|
||||
|
||||
struct comedi_devconfig_struct {
|
||||
struct comedi_devconfig_struct {
|
||||
char board_name[COMEDI_NAMELEN];
|
||||
int options[COMEDI_NDEVCONFOPTS];
|
||||
};
|
||||
};
|
||||
|
||||
struct comedi_bufconfig_struct {
|
||||
struct comedi_bufconfig_struct {
|
||||
unsigned int subdevice;
|
||||
unsigned int flags;
|
||||
|
||||
|
|
@ -435,9 +437,9 @@ extern "C" {
|
|||
unsigned int size;
|
||||
|
||||
unsigned int unused[4];
|
||||
};
|
||||
};
|
||||
|
||||
struct comedi_bufinfo_struct {
|
||||
struct comedi_bufinfo_struct {
|
||||
unsigned int subdevice;
|
||||
unsigned int bytes_read;
|
||||
|
||||
|
|
@ -449,11 +451,11 @@ extern "C" {
|
|||
unsigned int bytes_written;
|
||||
|
||||
unsigned int unused[4];
|
||||
};
|
||||
};
|
||||
|
||||
/* range stuff */
|
||||
|
||||
#define __RANGE(a,b) ((((a)&0xffff)<<16)|((b)&0xffff))
|
||||
#define __RANGE(a, b) ((((a)&0xffff)<<16)|((b)&0xffff))
|
||||
|
||||
#define RANGE_OFFSET(a) (((a)>>16)&0xffff)
|
||||
#define RANGE_LENGTH(b) ((b)&0xffff)
|
||||
|
|
@ -494,13 +496,13 @@ extern "C" {
|
|||
|
||||
0 ID: INSN_CONFIG_8254_READ_STATUS
|
||||
1 <-- Status byte returned here.
|
||||
B7=Output
|
||||
B6=NULL Count
|
||||
B5-B0 Current mode.
|
||||
B7 = Output
|
||||
B6 = NULL Count
|
||||
B5 - B0 Current mode.
|
||||
|
||||
*/
|
||||
|
||||
enum i8254_mode {
|
||||
enum i8254_mode {
|
||||
I8254_MODE0 = (0 << 1), /* Interrupt on terminal count */
|
||||
I8254_MODE1 = (1 << 1), /* Hardware retriggerable one-shot */
|
||||
I8254_MODE2 = (2 << 1), /* Rate generator */
|
||||
|
|
@ -509,24 +511,28 @@ extern "C" {
|
|||
I8254_MODE5 = (5 << 1), /* Hardware triggered strobe (retriggerable) */
|
||||
I8254_BCD = 1, /* use binary-coded decimal instead of binary (pretty useless) */
|
||||
I8254_BINARY = 0
|
||||
};
|
||||
};
|
||||
|
||||
static inline unsigned NI_USUAL_PFI_SELECT(unsigned pfi_channel) {
|
||||
static inline unsigned NI_USUAL_PFI_SELECT(unsigned pfi_channel)
|
||||
{
|
||||
if (pfi_channel < 10)
|
||||
return 0x1 + pfi_channel;
|
||||
else
|
||||
return 0xb + pfi_channel;
|
||||
} static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel) {
|
||||
}
|
||||
static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel)
|
||||
{
|
||||
if (rtsi_channel < 7)
|
||||
return 0xb + rtsi_channel;
|
||||
else
|
||||
return 0x1b;
|
||||
}
|
||||
/* mode bits for NI general-purpose counters, set with INSN_CONFIG_SET_COUNTER_MODE */
|
||||
}
|
||||
/* mode bits for NI general-purpose counters, set with
|
||||
* INSN_CONFIG_SET_COUNTER_MODE */
|
||||
#define NI_GPCT_COUNTING_MODE_SHIFT 16
|
||||
#define NI_GPCT_INDEX_PHASE_BITSHIFT 20
|
||||
#define NI_GPCT_COUNTING_DIRECTION_SHIFT 24
|
||||
enum ni_gpct_mode_bits {
|
||||
enum ni_gpct_mode_bits {
|
||||
NI_GPCT_GATE_ON_BOTH_EDGES_BIT = 0x4,
|
||||
NI_GPCT_EDGE_GATE_MODE_MASK = 0x18,
|
||||
NI_GPCT_EDGE_GATE_STARTS_STOPS_BITS = 0x0,
|
||||
|
|
@ -588,11 +594,11 @@ extern "C" {
|
|||
NI_GPCT_RELOAD_SOURCE_GATE_SELECT_BITS = 0x8000000,
|
||||
NI_GPCT_OR_GATE_BIT = 0x10000000,
|
||||
NI_GPCT_INVERT_OUTPUT_BIT = 0x20000000
|
||||
};
|
||||
};
|
||||
|
||||
/* Bits for setting a clock source with
|
||||
* INSN_CONFIG_SET_CLOCK_SRC when using NI general-purpose counters. */
|
||||
enum ni_gpct_clock_source_bits {
|
||||
enum ni_gpct_clock_source_bits {
|
||||
NI_GPCT_CLOCK_SRC_SELECT_MASK = 0x3f,
|
||||
NI_GPCT_TIMEBASE_1_CLOCK_SRC_BITS = 0x0,
|
||||
NI_GPCT_TIMEBASE_2_CLOCK_SRC_BITS = 0x1,
|
||||
|
|
@ -609,21 +615,26 @@ extern "C" {
|
|||
NI_GPCT_PRESCALE_X2_CLOCK_SRC_BITS = 0x10000000, /* divide source by 2 */
|
||||
NI_GPCT_PRESCALE_X8_CLOCK_SRC_BITS = 0x20000000, /* divide source by 8 */
|
||||
NI_GPCT_INVERT_CLOCK_SRC_BIT = 0x80000000
|
||||
};
|
||||
static inline unsigned NI_GPCT_SOURCE_PIN_CLOCK_SRC_BITS(unsigned n) { /* NI 660x-specific */
|
||||
};
|
||||
static inline unsigned NI_GPCT_SOURCE_PIN_CLOCK_SRC_BITS(unsigned n)
|
||||
{
|
||||
/* NI 660x-specific */
|
||||
return 0x10 + n;
|
||||
}
|
||||
static inline unsigned NI_GPCT_RTSI_CLOCK_SRC_BITS(unsigned n) {
|
||||
}
|
||||
static inline unsigned NI_GPCT_RTSI_CLOCK_SRC_BITS(unsigned n)
|
||||
{
|
||||
return 0x18 + n;
|
||||
}
|
||||
static inline unsigned NI_GPCT_PFI_CLOCK_SRC_BITS(unsigned n) { /* no pfi on NI 660x */
|
||||
}
|
||||
static inline unsigned NI_GPCT_PFI_CLOCK_SRC_BITS(unsigned n)
|
||||
{
|
||||
/* no pfi on NI 660x */
|
||||
return 0x20 + n;
|
||||
}
|
||||
}
|
||||
|
||||
/* Possibilities for setting a gate source with
|
||||
INSN_CONFIG_SET_GATE_SRC when using NI general-purpose counters.
|
||||
May be bitwise-or'd with CR_EDGE or CR_INVERT. */
|
||||
enum ni_gpct_gate_select {
|
||||
enum ni_gpct_gate_select {
|
||||
/* m-series gates */
|
||||
NI_GPCT_TIMESTAMP_MUX_GATE_SELECT = 0x0,
|
||||
NI_GPCT_AI_START2_GATE_SELECT = 0x12,
|
||||
|
|
@ -642,50 +653,58 @@ May be bitwise-or'd with CR_EDGE or CR_INVERT. */
|
|||
/* m-series "second gate" sources are unknown,
|
||||
we should add them here with an offset of 0x300 when known. */
|
||||
NI_GPCT_DISABLED_GATE_SELECT = 0x8000,
|
||||
};
|
||||
static inline unsigned NI_GPCT_GATE_PIN_GATE_SELECT(unsigned n) {
|
||||
};
|
||||
static inline unsigned NI_GPCT_GATE_PIN_GATE_SELECT(unsigned n)
|
||||
{
|
||||
return 0x102 + n;
|
||||
}
|
||||
static inline unsigned NI_GPCT_RTSI_GATE_SELECT(unsigned n) {
|
||||
}
|
||||
static inline unsigned NI_GPCT_RTSI_GATE_SELECT(unsigned n)
|
||||
{
|
||||
return NI_USUAL_RTSI_SELECT(n);
|
||||
}
|
||||
static inline unsigned NI_GPCT_PFI_GATE_SELECT(unsigned n) {
|
||||
}
|
||||
static inline unsigned NI_GPCT_PFI_GATE_SELECT(unsigned n)
|
||||
{
|
||||
return NI_USUAL_PFI_SELECT(n);
|
||||
}
|
||||
static inline unsigned NI_GPCT_UP_DOWN_PIN_GATE_SELECT(unsigned n) {
|
||||
}
|
||||
static inline unsigned NI_GPCT_UP_DOWN_PIN_GATE_SELECT(unsigned n)
|
||||
{
|
||||
return 0x202 + n;
|
||||
}
|
||||
}
|
||||
|
||||
/* Possibilities for setting a source with
|
||||
INSN_CONFIG_SET_OTHER_SRC when using NI general-purpose counters. */
|
||||
enum ni_gpct_other_index {
|
||||
enum ni_gpct_other_index {
|
||||
NI_GPCT_SOURCE_ENCODER_A,
|
||||
NI_GPCT_SOURCE_ENCODER_B,
|
||||
NI_GPCT_SOURCE_ENCODER_Z
|
||||
};
|
||||
enum ni_gpct_other_select {
|
||||
};
|
||||
enum ni_gpct_other_select {
|
||||
/* m-series gates */
|
||||
// Still unknown, probably only need NI_GPCT_PFI_OTHER_SELECT
|
||||
/* Still unknown, probably only need NI_GPCT_PFI_OTHER_SELECT */
|
||||
NI_GPCT_DISABLED_OTHER_SELECT = 0x8000,
|
||||
};
|
||||
static inline unsigned NI_GPCT_PFI_OTHER_SELECT(unsigned n) {
|
||||
};
|
||||
static inline unsigned NI_GPCT_PFI_OTHER_SELECT(unsigned n)
|
||||
{
|
||||
return NI_USUAL_PFI_SELECT(n);
|
||||
}
|
||||
}
|
||||
|
||||
/* start sources for ni general-purpose counters for use with
|
||||
INSN_CONFIG_ARM */
|
||||
enum ni_gpct_arm_source {
|
||||
enum ni_gpct_arm_source {
|
||||
NI_GPCT_ARM_IMMEDIATE = 0x0,
|
||||
NI_GPCT_ARM_PAIRED_IMMEDIATE = 0x1, /* Start both the counter and the adjacent paired counter simultaneously */
|
||||
NI_GPCT_ARM_PAIRED_IMMEDIATE = 0x1, /* Start both the counter and
|
||||
the adjacent paired counter
|
||||
simultaneously */
|
||||
/* NI doesn't document bits for selecting hardware arm triggers. If
|
||||
the NI_GPCT_ARM_UNKNOWN bit is set, we will pass the least significant
|
||||
bits (3 bits for 660x or 5 bits for m-series) through to the hardware.
|
||||
This will at least allow someone to figure out what the bits do later. */
|
||||
* the NI_GPCT_ARM_UNKNOWN bit is set, we will pass the least
|
||||
* significant bits (3 bits for 660x or 5 bits for m-series) through to
|
||||
* the hardware. This will at least allow someone to figure out what
|
||||
* the bits do later. */
|
||||
NI_GPCT_ARM_UNKNOWN = 0x1000,
|
||||
};
|
||||
};
|
||||
|
||||
/* digital filtering options for ni 660x for use with INSN_CONFIG_FILTER. */
|
||||
enum ni_gpct_filter_select {
|
||||
enum ni_gpct_filter_select {
|
||||
NI_GPCT_FILTER_OFF = 0x0,
|
||||
NI_GPCT_FILTER_TIMEBASE_3_SYNC = 0x1,
|
||||
NI_GPCT_FILTER_100x_TIMEBASE_1 = 0x2,
|
||||
|
|
@ -693,33 +712,36 @@ INSN_CONFIG_ARM */
|
|||
NI_GPCT_FILTER_10x_TIMEBASE_1 = 0x4,
|
||||
NI_GPCT_FILTER_2x_TIMEBASE_1 = 0x5,
|
||||
NI_GPCT_FILTER_2x_TIMEBASE_3 = 0x6
|
||||
};
|
||||
};
|
||||
|
||||
/* PFI digital filtering options for ni m-series for use with INSN_CONFIG_FILTER. */
|
||||
enum ni_pfi_filter_select {
|
||||
/* PFI digital filtering options for ni m-series for use with
|
||||
* INSN_CONFIG_FILTER. */
|
||||
enum ni_pfi_filter_select {
|
||||
NI_PFI_FILTER_OFF = 0x0,
|
||||
NI_PFI_FILTER_125ns = 0x1,
|
||||
NI_PFI_FILTER_6425ns = 0x2,
|
||||
NI_PFI_FILTER_2550us = 0x3
|
||||
};
|
||||
};
|
||||
|
||||
/* master clock sources for ni mio boards and INSN_CONFIG_SET_CLOCK_SRC */
|
||||
enum ni_mio_clock_source {
|
||||
enum ni_mio_clock_source {
|
||||
NI_MIO_INTERNAL_CLOCK = 0,
|
||||
NI_MIO_RTSI_CLOCK = 1, /* doesn't work for m-series, use NI_MIO_PLL_RTSI_CLOCK() */
|
||||
NI_MIO_RTSI_CLOCK = 1, /* doesn't work for m-series, use
|
||||
NI_MIO_PLL_RTSI_CLOCK() */
|
||||
/* the NI_MIO_PLL_* sources are m-series only */
|
||||
NI_MIO_PLL_PXI_STAR_TRIGGER_CLOCK = 2,
|
||||
NI_MIO_PLL_PXI10_CLOCK = 3,
|
||||
NI_MIO_PLL_RTSI0_CLOCK = 4
|
||||
};
|
||||
static inline unsigned NI_MIO_PLL_RTSI_CLOCK(unsigned rtsi_channel) {
|
||||
};
|
||||
static inline unsigned NI_MIO_PLL_RTSI_CLOCK(unsigned rtsi_channel)
|
||||
{
|
||||
return NI_MIO_PLL_RTSI0_CLOCK + rtsi_channel;
|
||||
}
|
||||
}
|
||||
|
||||
/* Signals which can be routed to an NI RTSI pin with INSN_CONFIG_SET_ROUTING.
|
||||
The numbers assigned are not arbitrary, they correspond to the bits required
|
||||
to program the board. */
|
||||
enum ni_rtsi_routing {
|
||||
enum ni_rtsi_routing {
|
||||
NI_RTSI_OUTPUT_ADR_START1 = 0,
|
||||
NI_RTSI_OUTPUT_ADR_START2 = 1,
|
||||
NI_RTSI_OUTPUT_SCLKG = 2,
|
||||
|
|
@ -729,19 +751,20 @@ INSN_CONFIG_ARM */
|
|||
NI_RTSI_OUTPUT_G_GATE0 = 6,
|
||||
NI_RTSI_OUTPUT_RGOUT0 = 7,
|
||||
NI_RTSI_OUTPUT_RTSI_BRD_0 = 8,
|
||||
NI_RTSI_OUTPUT_RTSI_OSC = 12 /* pre-m-series always have RTSI clock on line 7 */
|
||||
};
|
||||
static inline unsigned NI_RTSI_OUTPUT_RTSI_BRD(unsigned n) {
|
||||
NI_RTSI_OUTPUT_RTSI_OSC = 12 /* pre-m-series always have RTSI clock
|
||||
on line 7 */
|
||||
};
|
||||
static inline unsigned NI_RTSI_OUTPUT_RTSI_BRD(unsigned n)
|
||||
{
|
||||
return NI_RTSI_OUTPUT_RTSI_BRD_0 + n;
|
||||
}
|
||||
}
|
||||
|
||||
/* Signals which can be routed to an NI PFI pin on an m-series board
|
||||
with INSN_CONFIG_SET_ROUTING. These numbers are also returned
|
||||
by INSN_CONFIG_GET_ROUTING on pre-m-series boards, even though
|
||||
their routing cannot be changed. The numbers assigned are
|
||||
not arbitrary, they correspond to the bits required
|
||||
to program the board. */
|
||||
enum ni_pfi_routing {
|
||||
/* Signals which can be routed to an NI PFI pin on an m-series board with
|
||||
* INSN_CONFIG_SET_ROUTING. These numbers are also returned by
|
||||
* INSN_CONFIG_GET_ROUTING on pre-m-series boards, even though their routing
|
||||
* cannot be changed. The numbers assigned are not arbitrary, they correspond
|
||||
* to the bits required to program the board. */
|
||||
enum ni_pfi_routing {
|
||||
NI_PFI_OUTPUT_PFI_DEFAULT = 0,
|
||||
NI_PFI_OUTPUT_AI_START1 = 1,
|
||||
NI_PFI_OUTPUT_AI_START2 = 2,
|
||||
|
|
@ -766,10 +789,11 @@ INSN_CONFIG_ARM */
|
|||
NI_PFI_OUTPUT_DIO_CHANGE_DETECT_RTSI = 28,
|
||||
NI_PFI_OUTPUT_CDI_SAMPLE = 29,
|
||||
NI_PFI_OUTPUT_CDO_UPDATE = 30
|
||||
};
|
||||
static inline unsigned NI_PFI_OUTPUT_RTSI(unsigned rtsi_channel) {
|
||||
};
|
||||
static inline unsigned NI_PFI_OUTPUT_RTSI(unsigned rtsi_channel)
|
||||
{
|
||||
return NI_PFI_OUTPUT_RTSI0 + rtsi_channel;
|
||||
}
|
||||
}
|
||||
|
||||
/* Signals which can be routed to output on a NI PFI pin on a 660x board
|
||||
with INSN_CONFIG_SET_ROUTING. The numbers assigned are
|
||||
|
|
@ -777,31 +801,34 @@ INSN_CONFIG_ARM */
|
|||
to program the board. Lines 0 to 7 can only be set to
|
||||
NI_660X_PFI_OUTPUT_DIO. Lines 32 to 39 can only be set to
|
||||
NI_660X_PFI_OUTPUT_COUNTER. */
|
||||
enum ni_660x_pfi_routing {
|
||||
NI_660X_PFI_OUTPUT_COUNTER = 1, // counter
|
||||
NI_660X_PFI_OUTPUT_DIO = 2, // static digital output
|
||||
};
|
||||
enum ni_660x_pfi_routing {
|
||||
NI_660X_PFI_OUTPUT_COUNTER = 1, /* counter */
|
||||
NI_660X_PFI_OUTPUT_DIO = 2, /* static digital output */
|
||||
};
|
||||
|
||||
/* NI External Trigger lines. These values are not arbitrary, but are related to
|
||||
the bits required to program the board (offset by 1 for historical reasons). */
|
||||
static inline unsigned NI_EXT_PFI(unsigned pfi_channel) {
|
||||
/* NI External Trigger lines. These values are not arbitrary, but are related
|
||||
* to the bits required to program the board (offset by 1 for historical
|
||||
* reasons). */
|
||||
static inline unsigned NI_EXT_PFI(unsigned pfi_channel)
|
||||
{
|
||||
return NI_USUAL_PFI_SELECT(pfi_channel) - 1;
|
||||
}
|
||||
static inline unsigned NI_EXT_RTSI(unsigned rtsi_channel) {
|
||||
}
|
||||
static inline unsigned NI_EXT_RTSI(unsigned rtsi_channel)
|
||||
{
|
||||
return NI_USUAL_RTSI_SELECT(rtsi_channel) - 1;
|
||||
}
|
||||
}
|
||||
|
||||
/* status bits for INSN_CONFIG_GET_COUNTER_STATUS */
|
||||
enum comedi_counter_status_flags {
|
||||
enum comedi_counter_status_flags {
|
||||
COMEDI_COUNTER_ARMED = 0x1,
|
||||
COMEDI_COUNTER_COUNTING = 0x2,
|
||||
COMEDI_COUNTER_TERMINAL_COUNT = 0x4,
|
||||
};
|
||||
};
|
||||
|
||||
/* Clock sources for CDIO subdevice on NI m-series boards.
|
||||
Used as the scan_begin_arg for a comedi_command. These
|
||||
sources may also be bitwise-or'd with CR_INVERT to change polarity. */
|
||||
enum ni_m_series_cdio_scan_begin_src {
|
||||
/* Clock sources for CDIO subdevice on NI m-series boards. Used as the
|
||||
* scan_begin_arg for a comedi_command. These sources may also be bitwise-or'd
|
||||
* with CR_INVERT to change polarity. */
|
||||
enum ni_m_series_cdio_scan_begin_src {
|
||||
NI_CDIO_SCAN_BEGIN_SRC_GROUND = 0,
|
||||
NI_CDIO_SCAN_BEGIN_SRC_AI_START = 18,
|
||||
NI_CDIO_SCAN_BEGIN_SRC_AI_CONVERT = 19,
|
||||
|
|
@ -812,31 +839,34 @@ sources may also be bitwise-or'd with CR_INVERT to change polarity. */
|
|||
NI_CDIO_SCAN_BEGIN_SRC_AO_UPDATE = 31,
|
||||
NI_CDIO_SCAN_BEGIN_SRC_FREQ_OUT = 32,
|
||||
NI_CDIO_SCAN_BEGIN_SRC_DIO_CHANGE_DETECT_IRQ = 33
|
||||
};
|
||||
static inline unsigned NI_CDIO_SCAN_BEGIN_SRC_PFI(unsigned pfi_channel) {
|
||||
};
|
||||
static inline unsigned NI_CDIO_SCAN_BEGIN_SRC_PFI(unsigned pfi_channel)
|
||||
{
|
||||
return NI_USUAL_PFI_SELECT(pfi_channel);
|
||||
}
|
||||
static inline unsigned NI_CDIO_SCAN_BEGIN_SRC_RTSI(unsigned
|
||||
rtsi_channel) {
|
||||
}
|
||||
static inline unsigned NI_CDIO_SCAN_BEGIN_SRC_RTSI(unsigned rtsi_channel)
|
||||
{
|
||||
return NI_USUAL_RTSI_SELECT(rtsi_channel);
|
||||
}
|
||||
}
|
||||
|
||||
/* scan_begin_src for scan_begin_arg==TRIG_EXT with analog output command
|
||||
on NI boards. These scan begin sources can also be bitwise-or'd with
|
||||
CR_INVERT to change polarity. */
|
||||
static inline unsigned NI_AO_SCAN_BEGIN_SRC_PFI(unsigned pfi_channel) {
|
||||
/* scan_begin_src for scan_begin_arg==TRIG_EXT with analog output command on NI
|
||||
* boards. These scan begin sources can also be bitwise-or'd with CR_INVERT to
|
||||
* change polarity. */
|
||||
static inline unsigned NI_AO_SCAN_BEGIN_SRC_PFI(unsigned pfi_channel)
|
||||
{
|
||||
return NI_USUAL_PFI_SELECT(pfi_channel);
|
||||
}
|
||||
static inline unsigned NI_AO_SCAN_BEGIN_SRC_RTSI(unsigned rtsi_channel) {
|
||||
}
|
||||
static inline unsigned NI_AO_SCAN_BEGIN_SRC_RTSI(unsigned rtsi_channel)
|
||||
{
|
||||
return NI_USUAL_RTSI_SELECT(rtsi_channel);
|
||||
}
|
||||
}
|
||||
|
||||
/* Bits for setting a clock source with
|
||||
* INSN_CONFIG_SET_CLOCK_SRC when using NI frequency output subdevice. */
|
||||
enum ni_freq_out_clock_source_bits {
|
||||
NI_FREQ_OUT_TIMEBASE_1_DIV_2_CLOCK_SRC, // 10 MHz
|
||||
NI_FREQ_OUT_TIMEBASE_2_CLOCK_SRC // 100 KHz
|
||||
};
|
||||
enum ni_freq_out_clock_source_bits {
|
||||
NI_FREQ_OUT_TIMEBASE_1_DIV_2_CLOCK_SRC, /* 10 MHz */
|
||||
NI_FREQ_OUT_TIMEBASE_2_CLOCK_SRC /* 100 KHz */
|
||||
};
|
||||
|
||||
/* Values for setting a clock source with INSN_CONFIG_SET_CLOCK_SRC for
|
||||
* 8254 counter subdevices on Amplicon DIO boards (amplc_dio200 driver). */
|
||||
|
|
|
|||
|
|
@ -36,8 +36,8 @@
|
|||
|
||||
extern long comedi_compat_ioctl(struct file *file, unsigned int cmd,
|
||||
unsigned long arg);
|
||||
#define comedi_register_ioctl32() do{}while(0)
|
||||
#define comedi_unregister_ioctl32() do{}while(0)
|
||||
#define comedi_register_ioctl32() do {} while (0)
|
||||
#define comedi_unregister_ioctl32() do {} while (0)
|
||||
|
||||
#else /* HAVE_COMPAT_IOCTL */
|
||||
|
||||
|
|
@ -50,8 +50,8 @@ extern void comedi_unregister_ioctl32(void);
|
|||
#else /* CONFIG_COMPAT */
|
||||
|
||||
#define comedi_compat_ioctl 0 /* NULL */
|
||||
#define comedi_register_ioctl32() do{}while(0)
|
||||
#define comedi_unregister_ioctl32() do{}while(0)
|
||||
#define comedi_register_ioctl32() do {} while (0)
|
||||
#define comedi_unregister_ioctl32() do {} while (0)
|
||||
|
||||
#endif /* CONFIG_COMPAT */
|
||||
|
||||
|
|
|
|||
|
|
@ -5,4 +5,4 @@
|
|||
extern struct class *comedi_class;
|
||||
extern const struct file_operations comedi_fops;
|
||||
|
||||
#endif //_COMEDI_FOPS_H
|
||||
#endif /* _COMEDI_FOPS_H */
|
||||
|
|
|
|||
|
|
@ -45,13 +45,13 @@
|
|||
#ifdef CONFIG_COMEDI_RTL
|
||||
#include <rtl_core.h>
|
||||
#include <rtl_time.h>
|
||||
//#ifdef RTLINUX_VERSION_CODE
|
||||
/* #ifdef RTLINUX_VERSION_CODE */
|
||||
#include <rtl_sync.h>
|
||||
//#endif
|
||||
/* #endif */
|
||||
#define rt_printk rtl_printf
|
||||
#endif
|
||||
#ifdef CONFIG_COMEDI_FUSION
|
||||
#define rt_printk(format, args...) printk(format , ## args )
|
||||
#define rt_printk(format, args...) printk(format , ## args)
|
||||
#endif /* CONFIG_COMEDI_FUSION */
|
||||
#ifdef CONFIG_PRIORITY_IRQ
|
||||
#define rt_printk printk
|
||||
|
|
@ -59,27 +59,27 @@
|
|||
|
||||
int comedi_request_irq(unsigned int irq, irqreturn_t(*handler) (int,
|
||||
void *PT_REGS_ARG), unsigned long flags, const char *device,
|
||||
comedi_device * dev_id);
|
||||
void comedi_free_irq(unsigned int irq, comedi_device * dev_id);
|
||||
comedi_device *dev_id);
|
||||
void comedi_free_irq(unsigned int irq, comedi_device *dev_id);
|
||||
void comedi_rt_init(void);
|
||||
void comedi_rt_cleanup(void);
|
||||
int comedi_switch_to_rt(comedi_device * dev);
|
||||
void comedi_switch_to_non_rt(comedi_device * dev);
|
||||
void comedi_rt_pend_wakeup(wait_queue_head_t * q);
|
||||
int comedi_switch_to_rt(comedi_device *dev);
|
||||
void comedi_switch_to_non_rt(comedi_device *dev);
|
||||
void comedi_rt_pend_wakeup(wait_queue_head_t *q);
|
||||
extern int rt_pend_call(void (*func) (int arg1, void *arg2), int arg1,
|
||||
void *arg2);
|
||||
|
||||
#else
|
||||
|
||||
#define comedi_request_irq(a,b,c,d,e) request_irq(a,b,c,d,e)
|
||||
#define comedi_free_irq(a,b) free_irq(a,b)
|
||||
#define comedi_rt_init() do{}while(0)
|
||||
#define comedi_rt_cleanup() do{}while(0)
|
||||
#define comedi_request_irq(a, b, c, d, e) request_irq(a, b, c, d, e)
|
||||
#define comedi_free_irq(a, b) free_irq(a, b)
|
||||
#define comedi_rt_init() do {} while (0)
|
||||
#define comedi_rt_cleanup() do {} while (0)
|
||||
#define comedi_switch_to_rt(a) (-1)
|
||||
#define comedi_switch_to_non_rt(a) do{}while(0)
|
||||
#define comedi_rt_pend_wakeup(a) do{}while(0)
|
||||
#define comedi_switch_to_non_rt(a) do {} while (0)
|
||||
#define comedi_rt_pend_wakeup(a) do {} while (0)
|
||||
|
||||
#define rt_printk(format,args...) printk(format,##args)
|
||||
#define rt_printk(format, args...) printk(format, ##args)
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -89,7 +89,7 @@ extern int rt_pend_call(void (*func) (int arg1, void *arg2), int arg1,
|
|||
#define comedi_spin_lock_irqsave(lock_ptr, flags) \
|
||||
(flags = __comedi_spin_lock_irqsave(lock_ptr))
|
||||
|
||||
static inline unsigned long __comedi_spin_lock_irqsave(spinlock_t * lock_ptr)
|
||||
static inline unsigned long __comedi_spin_lock_irqsave(spinlock_t *lock_ptr)
|
||||
{
|
||||
unsigned long flags;
|
||||
|
||||
|
|
@ -112,7 +112,7 @@ static inline unsigned long __comedi_spin_lock_irqsave(spinlock_t * lock_ptr)
|
|||
return flags;
|
||||
}
|
||||
|
||||
static inline void comedi_spin_unlock_irqrestore(spinlock_t * lock_ptr,
|
||||
static inline void comedi_spin_unlock_irqrestore(spinlock_t *lock_ptr,
|
||||
unsigned long flags)
|
||||
{
|
||||
|
||||
|
|
|
|||
|
|
@ -39,17 +39,18 @@
|
|||
#include <linux/mm.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/io.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/io.h>
|
||||
|
||||
#include "comedi.h"
|
||||
|
||||
#define DPRINTK(format, args...) do{ \
|
||||
if(comedi_debug)printk("comedi: " format , ## args ); \
|
||||
} while(0)
|
||||
#define DPRINTK(format, args...) do { \
|
||||
if (comedi_debug) \
|
||||
printk(KERN_DEBUG "comedi: " format , ## args); \
|
||||
} while (0)
|
||||
|
||||
#define COMEDI_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
|
||||
#define COMEDI_VERSION_CODE COMEDI_VERSION(COMEDI_MAJORVERSION,COMEDI_MINORVERSION,COMEDI_MICROVERSION)
|
||||
#define COMEDI_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
|
||||
#define COMEDI_VERSION_CODE COMEDI_VERSION(COMEDI_MAJORVERSION, COMEDI_MINORVERSION, COMEDI_MICROVERSION)
|
||||
#define COMEDI_RELEASE VERSION
|
||||
|
||||
#define COMEDI_INITCLEANUP_NOMODULE(x) \
|
||||
|
|
@ -82,21 +83,22 @@
|
|||
static struct pci_driver comedi_driver ## _pci_driver = \
|
||||
{ \
|
||||
.id_table = pci_id_table, \
|
||||
.probe = & comedi_driver ## _pci_probe, \
|
||||
.remove = __devexit_p(& comedi_driver ## _pci_remove) \
|
||||
.probe = &comedi_driver ## _pci_probe, \
|
||||
.remove = __devexit_p(&comedi_driver ## _pci_remove) \
|
||||
}; \
|
||||
static int __init comedi_driver ## _init_module(void) \
|
||||
{ \
|
||||
int retval; \
|
||||
retval = comedi_driver_register(& comedi_driver); \
|
||||
if(retval < 0) return retval; \
|
||||
comedi_driver ## _pci_driver.name = (char*)comedi_driver.driver_name; \
|
||||
return pci_register_driver(& comedi_driver ## _pci_driver); \
|
||||
retval = comedi_driver_register(&comedi_driver); \
|
||||
if (retval < 0) \
|
||||
return retval; \
|
||||
comedi_driver ## _pci_driver.name = (char *)comedi_driver.driver_name; \
|
||||
return pci_register_driver(&comedi_driver ## _pci_driver); \
|
||||
} \
|
||||
static void __exit comedi_driver ## _cleanup_module(void) \
|
||||
{ \
|
||||
pci_unregister_driver(& comedi_driver ## _pci_driver); \
|
||||
comedi_driver_unregister(& comedi_driver); \
|
||||
pci_unregister_driver(&comedi_driver ## _pci_driver); \
|
||||
comedi_driver_unregister(&comedi_driver); \
|
||||
} \
|
||||
module_init(comedi_driver ## _init_module); \
|
||||
module_exit(comedi_driver ## _cleanup_module);
|
||||
|
|
@ -177,14 +179,14 @@ struct comedi_subdevice_struct {
|
|||
int (*do_cmdtest) (comedi_device *, comedi_subdevice *, comedi_cmd *);
|
||||
int (*poll) (comedi_device *, comedi_subdevice *);
|
||||
int (*cancel) (comedi_device *, comedi_subdevice *);
|
||||
//int (*do_lock)(comedi_device *,comedi_subdevice *);
|
||||
//int (*do_unlock)(comedi_device *,comedi_subdevice *);
|
||||
/* int (*do_lock)(comedi_device *,comedi_subdevice *); */
|
||||
/* int (*do_unlock)(comedi_device *,comedi_subdevice *); */
|
||||
|
||||
/* called when the buffer changes */
|
||||
int (*buf_change) (comedi_device * dev, comedi_subdevice * s,
|
||||
int (*buf_change) (comedi_device *dev, comedi_subdevice *s,
|
||||
unsigned long new_size);
|
||||
|
||||
void (*munge) (comedi_device * dev, comedi_subdevice * s, void *data,
|
||||
void (*munge) (comedi_device *dev, comedi_subdevice *s, void *data,
|
||||
unsigned int num_bytes, unsigned int start_chan_index);
|
||||
enum dma_data_direction async_dma_dir;
|
||||
|
||||
|
|
@ -234,12 +236,12 @@ struct comedi_async_struct {
|
|||
|
||||
wait_queue_head_t wait_head;
|
||||
|
||||
// callback stuff
|
||||
/* callback stuff */
|
||||
unsigned int cb_mask;
|
||||
int (*cb_func) (unsigned int flags, void *);
|
||||
void *cb_arg;
|
||||
|
||||
int (*inttrig) (comedi_device * dev, comedi_subdevice * s,
|
||||
int (*inttrig) (comedi_device *dev, comedi_subdevice *s,
|
||||
unsigned int x);
|
||||
};
|
||||
|
||||
|
|
@ -265,8 +267,9 @@ struct comedi_device_struct {
|
|||
|
||||
device_create_result_type *class_dev;
|
||||
int minor;
|
||||
/* hw_dev is passed to dma_alloc_coherent when allocating async buffers for subdevices
|
||||
that have async_dma_dir set to something other than DMA_NONE */
|
||||
/* hw_dev is passed to dma_alloc_coherent when allocating async buffers
|
||||
* for subdevices that have async_dma_dir set to something other than
|
||||
* DMA_NONE */
|
||||
struct device *hw_dev;
|
||||
|
||||
const char *board_name;
|
||||
|
|
@ -289,8 +292,8 @@ struct comedi_device_struct {
|
|||
|
||||
struct fasync_struct *async_queue;
|
||||
|
||||
void (*open) (comedi_device * dev);
|
||||
void (*close) (comedi_device * dev);
|
||||
void (*open) (comedi_device *dev);
|
||||
void (*close) (comedi_device *dev);
|
||||
};
|
||||
|
||||
struct comedi_device_file_info {
|
||||
|
|
@ -302,15 +305,15 @@ struct comedi_device_file_info {
|
|||
#ifdef CONFIG_COMEDI_DEBUG
|
||||
extern int comedi_debug;
|
||||
#else
|
||||
static const int comedi_debug = 0;
|
||||
static const int comedi_debug;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* function prototypes
|
||||
*/
|
||||
|
||||
void comedi_event(comedi_device * dev, comedi_subdevice * s);
|
||||
void comedi_error(const comedi_device * dev, const char *s);
|
||||
void comedi_event(comedi_device *dev, comedi_subdevice *s);
|
||||
void comedi_error(const comedi_device *dev, const char *s);
|
||||
|
||||
/* we can expand the number of bits used to encode devices/subdevices into
|
||||
the minor number soon, after more distros support > 8 bit minor numbers
|
||||
|
|
@ -322,24 +325,30 @@ enum comedi_minor_bits {
|
|||
static const unsigned COMEDI_SUBDEVICE_MINOR_SHIFT = 4;
|
||||
static const unsigned COMEDI_SUBDEVICE_MINOR_OFFSET = 1;
|
||||
|
||||
struct comedi_device_file_info* comedi_get_device_file_info(unsigned minor);
|
||||
struct comedi_device_file_info *comedi_get_device_file_info(unsigned minor);
|
||||
|
||||
static inline comedi_subdevice* comedi_get_read_subdevice(const struct comedi_device_file_info *info)
|
||||
static inline comedi_subdevice *comedi_get_read_subdevice(
|
||||
const struct comedi_device_file_info *info)
|
||||
{
|
||||
if(info->read_subdevice) return info->read_subdevice;
|
||||
if(info->device == NULL) return NULL;
|
||||
if (info->read_subdevice)
|
||||
return info->read_subdevice;
|
||||
if (info->device == NULL)
|
||||
return NULL;
|
||||
return info->device->read_subdev;
|
||||
}
|
||||
|
||||
static inline comedi_subdevice* comedi_get_write_subdevice(const struct comedi_device_file_info *info)
|
||||
static inline comedi_subdevice *comedi_get_write_subdevice(
|
||||
const struct comedi_device_file_info *info)
|
||||
{
|
||||
if(info->write_subdevice) return info->write_subdevice;
|
||||
if(info->device == NULL) return NULL;
|
||||
if (info->write_subdevice)
|
||||
return info->write_subdevice;
|
||||
if (info->device == NULL)
|
||||
return NULL;
|
||||
return info->device->write_subdev;
|
||||
}
|
||||
|
||||
void comedi_device_detach(comedi_device * dev);
|
||||
int comedi_device_attach(comedi_device * dev, comedi_devconfig * it);
|
||||
void comedi_device_detach(comedi_device *dev);
|
||||
int comedi_device_attach(comedi_device *dev, comedi_devconfig *it);
|
||||
int comedi_driver_register(comedi_driver *);
|
||||
int comedi_driver_unregister(comedi_driver *);
|
||||
|
||||
|
|
@ -348,7 +357,7 @@ void cleanup_polling(void);
|
|||
void start_polling(comedi_device *);
|
||||
void stop_polling(comedi_device *);
|
||||
|
||||
int comedi_buf_alloc(comedi_device * dev, comedi_subdevice * s, unsigned long
|
||||
int comedi_buf_alloc(comedi_device *dev, comedi_subdevice *s, unsigned long
|
||||
new_size);
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
|
|
@ -367,7 +376,8 @@ static inline void comedi_proc_cleanup(void)
|
|||
enum subdevice_runflags {
|
||||
SRF_USER = 0x00000001,
|
||||
SRF_RT = 0x00000002,
|
||||
/* indicates an COMEDI_CB_ERROR event has occurred since the last command was started */
|
||||
/* indicates an COMEDI_CB_ERROR event has occurred since the last
|
||||
* command was started */
|
||||
SRF_ERROR = 0x00000004,
|
||||
SRF_RUNNING = 0x08000000
|
||||
};
|
||||
|
|
@ -376,22 +386,22 @@ enum subdevice_runflags {
|
|||
various internal comedi functions
|
||||
*/
|
||||
|
||||
int do_rangeinfo_ioctl(comedi_device * dev, comedi_rangeinfo * arg);
|
||||
int check_chanlist(comedi_subdevice * s, int n, unsigned int *chanlist);
|
||||
void comedi_set_subdevice_runflags(comedi_subdevice * s, unsigned mask,
|
||||
int do_rangeinfo_ioctl(comedi_device *dev, comedi_rangeinfo *arg);
|
||||
int check_chanlist(comedi_subdevice *s, int n, unsigned int *chanlist);
|
||||
void comedi_set_subdevice_runflags(comedi_subdevice *s, unsigned mask,
|
||||
unsigned bits);
|
||||
unsigned comedi_get_subdevice_runflags(comedi_subdevice * s);
|
||||
int insn_inval(comedi_device * dev, comedi_subdevice * s,
|
||||
comedi_insn * insn, lsampl_t * data);
|
||||
unsigned comedi_get_subdevice_runflags(comedi_subdevice *s);
|
||||
int insn_inval(comedi_device *dev, comedi_subdevice *s,
|
||||
comedi_insn *insn, lsampl_t *data);
|
||||
|
||||
/* range stuff */
|
||||
|
||||
#define RANGE(a,b) {(a)*1e6,(b)*1e6,0}
|
||||
#define RANGE_ext(a,b) {(a)*1e6,(b)*1e6,RF_EXTERNAL}
|
||||
#define RANGE_mA(a,b) {(a)*1e6,(b)*1e6,UNIT_mA}
|
||||
#define RANGE_unitless(a,b) {(a)*1e6,(b)*1e6,0} /* XXX */
|
||||
#define BIP_RANGE(a) {-(a)*1e6,(a)*1e6,0}
|
||||
#define UNI_RANGE(a) {0,(a)*1e6,0}
|
||||
#define RANGE(a, b) {(a)*1e6, (b)*1e6, 0}
|
||||
#define RANGE_ext(a, b) {(a)*1e6, (b)*1e6, RF_EXTERNAL}
|
||||
#define RANGE_mA(a, b) {(a)*1e6, (b)*1e6, UNIT_mA}
|
||||
#define RANGE_unitless(a, b) {(a)*1e6, (b)*1e6, 0} /* XXX */
|
||||
#define BIP_RANGE(a) {-(a)*1e6, (a)*1e6, 0}
|
||||
#define UNI_RANGE(a) {0, (a)*1e6, 0}
|
||||
|
||||
extern const comedi_lrange range_bipolar10;
|
||||
extern const comedi_lrange range_bipolar5;
|
||||
|
|
@ -415,7 +425,7 @@ struct comedi_lrange_struct {
|
|||
|
||||
/* some silly little inline functions */
|
||||
|
||||
static inline int alloc_subdevices(comedi_device * dev,
|
||||
static inline int alloc_subdevices(comedi_device *dev,
|
||||
unsigned int num_subdevices)
|
||||
{
|
||||
unsigned i;
|
||||
|
|
@ -434,7 +444,7 @@ static inline int alloc_subdevices(comedi_device * dev,
|
|||
return 0;
|
||||
}
|
||||
|
||||
static inline int alloc_private(comedi_device * dev, int size)
|
||||
static inline int alloc_private(comedi_device *dev, int size)
|
||||
{
|
||||
dev->private = kzalloc(size, GFP_KERNEL);
|
||||
if (!dev->private)
|
||||
|
|
@ -442,7 +452,7 @@ static inline int alloc_private(comedi_device * dev, int size)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static inline unsigned int bytes_per_sample(const comedi_subdevice * subd)
|
||||
static inline unsigned int bytes_per_sample(const comedi_subdevice *subd)
|
||||
{
|
||||
if (subd->subdev_flags & SDF_LSAMPL)
|
||||
return sizeof(lsampl_t);
|
||||
|
|
@ -452,11 +462,11 @@ static inline unsigned int bytes_per_sample(const comedi_subdevice * subd)
|
|||
|
||||
/* must be used in attach to set dev->hw_dev if you wish to dma directly
|
||||
into comedi's buffer */
|
||||
static inline void comedi_set_hw_dev(comedi_device * dev, struct device *hw_dev)
|
||||
static inline void comedi_set_hw_dev(comedi_device *dev, struct device *hw_dev)
|
||||
{
|
||||
if (dev->hw_dev) {
|
||||
if (dev->hw_dev)
|
||||
put_device(dev->hw_dev);
|
||||
}
|
||||
|
||||
dev->hw_dev = hw_dev;
|
||||
if (dev->hw_dev) {
|
||||
dev->hw_dev = get_device(dev->hw_dev);
|
||||
|
|
@ -464,31 +474,31 @@ static inline void comedi_set_hw_dev(comedi_device * dev, struct device *hw_dev)
|
|||
}
|
||||
}
|
||||
|
||||
int comedi_buf_put(comedi_async * async, sampl_t x);
|
||||
int comedi_buf_get(comedi_async * async, sampl_t * x);
|
||||
int comedi_buf_put(comedi_async *async, sampl_t x);
|
||||
int comedi_buf_get(comedi_async *async, sampl_t *x);
|
||||
|
||||
unsigned int comedi_buf_write_n_available(comedi_async * async);
|
||||
unsigned int comedi_buf_write_alloc(comedi_async * async, unsigned int nbytes);
|
||||
unsigned int comedi_buf_write_alloc_strict(comedi_async * async,
|
||||
unsigned int comedi_buf_write_n_available(comedi_async *async);
|
||||
unsigned int comedi_buf_write_alloc(comedi_async *async, unsigned int nbytes);
|
||||
unsigned int comedi_buf_write_alloc_strict(comedi_async *async,
|
||||
unsigned int nbytes);
|
||||
unsigned comedi_buf_write_free(comedi_async * async, unsigned int nbytes);
|
||||
unsigned comedi_buf_read_alloc(comedi_async * async, unsigned nbytes);
|
||||
unsigned comedi_buf_read_free(comedi_async * async, unsigned int nbytes);
|
||||
unsigned int comedi_buf_read_n_available(comedi_async * async);
|
||||
void comedi_buf_memcpy_to(comedi_async * async, unsigned int offset,
|
||||
unsigned comedi_buf_write_free(comedi_async *async, unsigned int nbytes);
|
||||
unsigned comedi_buf_read_alloc(comedi_async *async, unsigned nbytes);
|
||||
unsigned comedi_buf_read_free(comedi_async *async, unsigned int nbytes);
|
||||
unsigned int comedi_buf_read_n_available(comedi_async *async);
|
||||
void comedi_buf_memcpy_to(comedi_async *async, unsigned int offset,
|
||||
const void *source, unsigned int num_bytes);
|
||||
void comedi_buf_memcpy_from(comedi_async * async, unsigned int offset,
|
||||
void comedi_buf_memcpy_from(comedi_async *async, unsigned int offset,
|
||||
void *destination, unsigned int num_bytes);
|
||||
static inline unsigned comedi_buf_write_n_allocated(comedi_async * async)
|
||||
static inline unsigned comedi_buf_write_n_allocated(comedi_async *async)
|
||||
{
|
||||
return async->buf_write_alloc_count - async->buf_write_count;
|
||||
}
|
||||
static inline unsigned comedi_buf_read_n_allocated(comedi_async * async)
|
||||
static inline unsigned comedi_buf_read_n_allocated(comedi_async *async)
|
||||
{
|
||||
return async->buf_read_alloc_count - async->buf_read_count;
|
||||
}
|
||||
|
||||
void comedi_reset_async_buf(comedi_async * async);
|
||||
void comedi_reset_async_buf(comedi_async *async);
|
||||
|
||||
static inline void *comedi_aux_data(int options[], int n)
|
||||
{
|
||||
|
|
@ -522,8 +532,6 @@ void comedi_free_subdevice_minor(comedi_subdevice *s);
|
|||
int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name);
|
||||
void comedi_pci_auto_unconfig(struct pci_dev *pcidev);
|
||||
|
||||
//#ifdef CONFIG_COMEDI_RT
|
||||
#include "comedi_rt.h"
|
||||
//#endif
|
||||
|
||||
#endif /* _COMEDIDEV_H */
|
||||
|
|
|
|||
|
|
@ -41,13 +41,13 @@ typedef void comedi_t;
|
|||
/* these functions may not be called at real-time priority */
|
||||
|
||||
comedi_t *comedi_open(const char *path);
|
||||
int comedi_close(comedi_t * dev);
|
||||
int comedi_close(comedi_t *dev);
|
||||
|
||||
/* these functions may be called at any priority, but may fail at
|
||||
real-time priority */
|
||||
|
||||
int comedi_lock(comedi_t * dev, unsigned int subdev);
|
||||
int comedi_unlock(comedi_t * dev, unsigned int subdev);
|
||||
int comedi_lock(comedi_t *dev, unsigned int subdev);
|
||||
int comedi_unlock(comedi_t *dev, unsigned int subdev);
|
||||
|
||||
/* these functions may be called at any priority, but you must hold
|
||||
the lock for the subdevice */
|
||||
|
|
@ -56,68 +56,68 @@ int comedi_loglevel(int loglevel);
|
|||
void comedi_perror(const char *s);
|
||||
char *comedi_strerror(int errnum);
|
||||
int comedi_errno(void);
|
||||
int comedi_fileno(comedi_t * dev);
|
||||
int comedi_fileno(comedi_t *dev);
|
||||
|
||||
int comedi_cancel(comedi_t * dev, unsigned int subdev);
|
||||
int comedi_register_callback(comedi_t * dev, unsigned int subdev,
|
||||
int comedi_cancel(comedi_t *dev, unsigned int subdev);
|
||||
int comedi_register_callback(comedi_t *dev, unsigned int subdev,
|
||||
unsigned int mask, int (*cb) (unsigned int, void *), void *arg);
|
||||
|
||||
int comedi_command(comedi_t * dev, comedi_cmd * cmd);
|
||||
int comedi_command_test(comedi_t * dev, comedi_cmd * cmd);
|
||||
int comedi_trigger(comedi_t * dev, unsigned int subdev, comedi_trig * it);
|
||||
int __comedi_trigger(comedi_t * dev, unsigned int subdev, comedi_trig * it);
|
||||
int comedi_data_write(comedi_t * dev, unsigned int subdev, unsigned int chan,
|
||||
int comedi_command(comedi_t *dev, comedi_cmd *cmd);
|
||||
int comedi_command_test(comedi_t *dev, comedi_cmd *cmd);
|
||||
int comedi_trigger(comedi_t *dev, unsigned int subdev, comedi_trig *it);
|
||||
int __comedi_trigger(comedi_t *dev, unsigned int subdev, comedi_trig *it);
|
||||
int comedi_data_write(comedi_t *dev, unsigned int subdev, unsigned int chan,
|
||||
unsigned int range, unsigned int aref, lsampl_t data);
|
||||
int comedi_data_read(comedi_t * dev, unsigned int subdev, unsigned int chan,
|
||||
unsigned int range, unsigned int aref, lsampl_t * data);
|
||||
int comedi_data_read_hint(comedi_t * dev, unsigned int subdev,
|
||||
int comedi_data_read(comedi_t *dev, unsigned int subdev, unsigned int chan,
|
||||
unsigned int range, unsigned int aref, lsampl_t *data);
|
||||
int comedi_data_read_hint(comedi_t *dev, unsigned int subdev,
|
||||
unsigned int chan, unsigned int range, unsigned int aref);
|
||||
int comedi_data_read_delayed(comedi_t * dev, unsigned int subdev,
|
||||
int comedi_data_read_delayed(comedi_t *dev, unsigned int subdev,
|
||||
unsigned int chan, unsigned int range, unsigned int aref,
|
||||
lsampl_t * data, unsigned int nano_sec);
|
||||
int comedi_dio_config(comedi_t * dev, unsigned int subdev, unsigned int chan,
|
||||
lsampl_t *data, unsigned int nano_sec);
|
||||
int comedi_dio_config(comedi_t *dev, unsigned int subdev, unsigned int chan,
|
||||
unsigned int io);
|
||||
int comedi_dio_read(comedi_t * dev, unsigned int subdev, unsigned int chan,
|
||||
int comedi_dio_read(comedi_t *dev, unsigned int subdev, unsigned int chan,
|
||||
unsigned int *val);
|
||||
int comedi_dio_write(comedi_t * dev, unsigned int subdev, unsigned int chan,
|
||||
int comedi_dio_write(comedi_t *dev, unsigned int subdev, unsigned int chan,
|
||||
unsigned int val);
|
||||
int comedi_dio_bitfield(comedi_t * dev, unsigned int subdev, unsigned int mask,
|
||||
int comedi_dio_bitfield(comedi_t *dev, unsigned int subdev, unsigned int mask,
|
||||
unsigned int *bits);
|
||||
int comedi_get_n_subdevices(comedi_t * dev);
|
||||
int comedi_get_version_code(comedi_t * dev);
|
||||
const char *comedi_get_driver_name(comedi_t * dev);
|
||||
const char *comedi_get_board_name(comedi_t * dev);
|
||||
int comedi_get_subdevice_type(comedi_t * dev, unsigned int subdevice);
|
||||
int comedi_find_subdevice_by_type(comedi_t * dev, int type, unsigned int subd);
|
||||
int comedi_get_n_channels(comedi_t * dev, unsigned int subdevice);
|
||||
lsampl_t comedi_get_maxdata(comedi_t * dev, unsigned int subdevice, unsigned
|
||||
int comedi_get_n_subdevices(comedi_t *dev);
|
||||
int comedi_get_version_code(comedi_t *dev);
|
||||
const char *comedi_get_driver_name(comedi_t *dev);
|
||||
const char *comedi_get_board_name(comedi_t *dev);
|
||||
int comedi_get_subdevice_type(comedi_t *dev, unsigned int subdevice);
|
||||
int comedi_find_subdevice_by_type(comedi_t *dev, int type, unsigned int subd);
|
||||
int comedi_get_n_channels(comedi_t *dev, unsigned int subdevice);
|
||||
lsampl_t comedi_get_maxdata(comedi_t *dev, unsigned int subdevice, unsigned
|
||||
int chan);
|
||||
int comedi_get_n_ranges(comedi_t * dev, unsigned int subdevice, unsigned int
|
||||
int comedi_get_n_ranges(comedi_t *dev, unsigned int subdevice, unsigned int
|
||||
chan);
|
||||
int comedi_do_insn(comedi_t * dev, comedi_insn * insn);
|
||||
int comedi_poll(comedi_t * dev, unsigned int subdev);
|
||||
int comedi_do_insn(comedi_t *dev, comedi_insn *insn);
|
||||
int comedi_poll(comedi_t *dev, unsigned int subdev);
|
||||
|
||||
/* DEPRECATED functions */
|
||||
int comedi_get_rangetype(comedi_t * dev, unsigned int subdevice,
|
||||
int comedi_get_rangetype(comedi_t *dev, unsigned int subdevice,
|
||||
unsigned int chan);
|
||||
|
||||
/* ALPHA functions */
|
||||
unsigned int comedi_get_subdevice_flags(comedi_t * dev, unsigned int subdevice);
|
||||
int comedi_get_len_chanlist(comedi_t * dev, unsigned int subdevice);
|
||||
int comedi_get_krange(comedi_t * dev, unsigned int subdevice, unsigned int
|
||||
chan, unsigned int range, comedi_krange * krange);
|
||||
unsigned int comedi_get_buf_head_pos(comedi_t * dev, unsigned int subdevice);
|
||||
int comedi_set_user_int_count(comedi_t * dev, unsigned int subdevice,
|
||||
unsigned int comedi_get_subdevice_flags(comedi_t *dev, unsigned int subdevice);
|
||||
int comedi_get_len_chanlist(comedi_t *dev, unsigned int subdevice);
|
||||
int comedi_get_krange(comedi_t *dev, unsigned int subdevice, unsigned int
|
||||
chan, unsigned int range, comedi_krange *krange);
|
||||
unsigned int comedi_get_buf_head_pos(comedi_t *dev, unsigned int subdevice);
|
||||
int comedi_set_user_int_count(comedi_t *dev, unsigned int subdevice,
|
||||
unsigned int buf_user_count);
|
||||
int comedi_map(comedi_t * dev, unsigned int subdev, void *ptr);
|
||||
int comedi_unmap(comedi_t * dev, unsigned int subdev);
|
||||
int comedi_get_buffer_size(comedi_t * dev, unsigned int subdev);
|
||||
int comedi_mark_buffer_read(comedi_t * dev, unsigned int subdevice,
|
||||
int comedi_map(comedi_t *dev, unsigned int subdev, void *ptr);
|
||||
int comedi_unmap(comedi_t *dev, unsigned int subdev);
|
||||
int comedi_get_buffer_size(comedi_t *dev, unsigned int subdev);
|
||||
int comedi_mark_buffer_read(comedi_t *dev, unsigned int subdevice,
|
||||
unsigned int num_bytes);
|
||||
int comedi_mark_buffer_written(comedi_t * d, unsigned int subdevice,
|
||||
int comedi_mark_buffer_written(comedi_t *d, unsigned int subdevice,
|
||||
unsigned int num_bytes);
|
||||
int comedi_get_buffer_contents(comedi_t * dev, unsigned int subdevice);
|
||||
int comedi_get_buffer_offset(comedi_t * dev, unsigned int subdevice);
|
||||
int comedi_get_buffer_contents(comedi_t *dev, unsigned int subdevice);
|
||||
int comedi_get_buffer_offset(comedi_t *dev, unsigned int subdevice);
|
||||
|
||||
#else
|
||||
|
||||
|
|
@ -139,14 +139,14 @@ int comedi_cancel(unsigned int minor, unsigned int subdev);
|
|||
int comedi_register_callback(unsigned int minor, unsigned int subdev,
|
||||
unsigned int mask, int (*cb) (unsigned int, void *), void *arg);
|
||||
|
||||
int comedi_command(unsigned int minor, comedi_cmd * cmd);
|
||||
int comedi_command_test(unsigned int minor, comedi_cmd * cmd);
|
||||
int comedi_trigger(unsigned int minor, unsigned int subdev, comedi_trig * it);
|
||||
int __comedi_trigger(unsigned int minor, unsigned int subdev, comedi_trig * it);
|
||||
int comedi_command(unsigned int minor, comedi_cmd *cmd);
|
||||
int comedi_command_test(unsigned int minor, comedi_cmd *cmd);
|
||||
int comedi_trigger(unsigned int minor, unsigned int subdev, comedi_trig *it);
|
||||
int __comedi_trigger(unsigned int minor, unsigned int subdev, comedi_trig *it);
|
||||
int comedi_data_write(unsigned int dev, unsigned int subdev, unsigned int chan,
|
||||
unsigned int range, unsigned int aref, lsampl_t data);
|
||||
int comedi_data_read(unsigned int dev, unsigned int subdev, unsigned int chan,
|
||||
unsigned int range, unsigned int aref, lsampl_t * data);
|
||||
unsigned int range, unsigned int aref, lsampl_t *data);
|
||||
int comedi_dio_config(unsigned int dev, unsigned int subdev, unsigned int chan,
|
||||
unsigned int io);
|
||||
int comedi_dio_read(unsigned int dev, unsigned int subdev, unsigned int chan,
|
||||
|
|
@ -167,7 +167,7 @@ lsampl_t comedi_get_maxdata(unsigned int minor, unsigned int subdevice, unsigned
|
|||
int chan);
|
||||
int comedi_get_n_ranges(unsigned int minor, unsigned int subdevice, unsigned int
|
||||
chan);
|
||||
int comedi_do_insn(unsigned int minor, comedi_insn * insn);
|
||||
int comedi_do_insn(unsigned int minor, comedi_insn *insn);
|
||||
int comedi_poll(unsigned int minor, unsigned int subdev);
|
||||
|
||||
/* DEPRECATED functions */
|
||||
|
|
@ -179,7 +179,7 @@ unsigned int comedi_get_subdevice_flags(unsigned int minor, unsigned int
|
|||
subdevice);
|
||||
int comedi_get_len_chanlist(unsigned int minor, unsigned int subdevice);
|
||||
int comedi_get_krange(unsigned int minor, unsigned int subdevice, unsigned int
|
||||
chan, unsigned int range, comedi_krange * krange);
|
||||
chan, unsigned int range, comedi_krange *krange);
|
||||
unsigned int comedi_get_buf_head_pos(unsigned int minor, unsigned int
|
||||
subdevice);
|
||||
int comedi_set_user_int_count(unsigned int minor, unsigned int subdevice,
|
||||
|
|
|
|||
|
|
@ -19,13 +19,7 @@
|
|||
#ifndef __COMPAT_LINUX_WRAPPER_H_
|
||||
#define __COMPAT_LINUX_WRAPPER_H_
|
||||
|
||||
#include <linux/version.h>
|
||||
|
||||
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0)
|
||||
#define mem_map_reserve(p) set_bit(PG_reserved, &((p)->flags))
|
||||
#define mem_map_unreserve(p) clear_bit(PG_reserved, &((p)->flags))
|
||||
#else
|
||||
#include_next <linux/wrapper.h>
|
||||
#endif
|
||||
|
||||
#endif /* __COMPAT_LINUX_WRAPPER_H_ */
|
||||
|
|
|
|||
Loading…
Reference in New Issue