Skip to content

L
linux
Commit e0dcef71 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

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: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ed9eccbe
Hide whitespace changes
Inline Side-by-side
Showing with 736 additions and 704 deletions
drivers/staging/comedi/comedi.h
View file @ e0dcef71
...@@ -50,9 +50,9 @@ extern "C" { ...@@ -50,9 +50,9 @@ extern "C" {
#define COMEDI_DEVCONF_AUX_DATA2_LENGTH 26 #define COMEDI_DEVCONF_AUX_DATA2_LENGTH 26
#define COMEDI_DEVCONF_AUX_DATA1_LENGTH 27 #define COMEDI_DEVCONF_AUX_DATA1_LENGTH 27
#define COMEDI_DEVCONF_AUX_DATA0_LENGTH 28 #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_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_LO 30 /* least significant 32 bits of pointer address */
#define COMEDI_DEVCONF_AUX_DATA_LENGTH 31 /* total data length */ #define COMEDI_DEVCONF_AUX_DATA_LENGTH 31 /* total data length */
/* max length of device and driver names */ /* max length of device and driver names */
#define COMEDI_NAMELEN 20 #define COMEDI_NAMELEN 20
...@@ -62,7 +62,7 @@ extern "C" { ...@@ -62,7 +62,7 @@ extern "C" {
/* packs and unpacks a channel/range number */ /* 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_PACK_FLAGS(chan, range, aref, flags) (CR_PACK(chan, range, aref) | ((flags) & CR_FLAGS_MASK))
#define CR_CHAN(a) ((a)&0xffff) #define CR_CHAN(a) ((a)&0xffff)
...@@ -71,10 +71,10 @@ extern "C" { ...@@ -71,10 +71,10 @@ extern "C" {
#define CR_FLAGS_MASK 0xfc000000 #define CR_FLAGS_MASK 0xfc000000
#define CR_ALT_FILTER (1<<26) #define CR_ALT_FILTER (1<<26)
#define CR_DITHER CR_ALT_FILTER #define CR_DITHER CR_ALT_FILTER
#define CR_DEGLITCH CR_ALT_FILTER #define CR_DEGLITCH CR_ALT_FILTER
#define CR_ALT_SOURCE (1<<27) #define CR_ALT_SOURCE (1<<27)
#define CR_EDGE (1<<30) #define CR_EDGE (1<<30)
#define CR_INVERT (1<<31) #define CR_INVERT (1<<31)
#define AREF_GROUND 0x00 /* analog ref = analog ground */ #define AREF_GROUND 0x00 /* analog ref = analog ground */
...@@ -110,13 +110,13 @@ extern "C" { ...@@ -110,13 +110,13 @@ extern "C" {
#define INSN_MASK_READ 0x4000000 #define INSN_MASK_READ 0x4000000
#define INSN_MASK_SPECIAL 0x2000000 #define INSN_MASK_SPECIAL 0x2000000
#define INSN_READ ( 0 | INSN_MASK_READ) #define INSN_READ (0 | INSN_MASK_READ)
#define INSN_WRITE ( 1 | INSN_MASK_WRITE) #define INSN_WRITE (1 | INSN_MASK_WRITE)
#define INSN_BITS ( 2 | INSN_MASK_READ|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_CONFIG (3 | INSN_MASK_READ|INSN_MASK_WRITE)
#define INSN_GTOD ( 4 | INSN_MASK_READ|INSN_MASK_SPECIAL) #define INSN_GTOD (4 | INSN_MASK_READ|INSN_MASK_SPECIAL)
#define INSN_WAIT ( 5 | INSN_MASK_WRITE|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_INTTRIG (6 | INSN_MASK_WRITE|INSN_MASK_SPECIAL)
/* trigger flags */ /* trigger flags */
/* These flags are used in comedi_trig structures */ /* These flags are used in comedi_trig structures */
...@@ -124,10 +124,10 @@ extern "C" { ...@@ -124,10 +124,10 @@ extern "C" {
#define TRIG_BOGUS 0x0001 /* do the motions */ #define TRIG_BOGUS 0x0001 /* do the motions */
#define TRIG_DITHER 0x0002 /* enable dithering */ #define TRIG_DITHER 0x0002 /* enable dithering */
#define TRIG_DEGLITCH 0x0004 /* enable deglitching */ #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_CONFIG 0x0010 /* perform configuration, not triggering */
#define TRIG_WAKE_EOS 0x0020 /* wake up on end-of-scan events */ #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 */ /* command flags */
/* These flags are used in comedi_cmd structures */ /* These flags are used in comedi_cmd structures */
...@@ -210,250 +210,252 @@ extern "C" { ...@@ -210,250 +210,252 @@ extern "C" {
/* subdevice types */ /* subdevice types */
enum comedi_subdevice_type { enum comedi_subdevice_type {
COMEDI_SUBD_UNUSED, /* unused by driver */ COMEDI_SUBD_UNUSED, /* unused by driver */
COMEDI_SUBD_AI, /* analog input */ COMEDI_SUBD_AI, /* analog input */
COMEDI_SUBD_AO, /* analog output */ COMEDI_SUBD_AO, /* analog output */
COMEDI_SUBD_DI, /* digital input */ COMEDI_SUBD_DI, /* digital input */
COMEDI_SUBD_DO, /* digital output */ COMEDI_SUBD_DO, /* digital output */
COMEDI_SUBD_DIO, /* digital input/output */ COMEDI_SUBD_DIO, /* digital input/output */
COMEDI_SUBD_COUNTER, /* counter */ COMEDI_SUBD_COUNTER, /* counter */
COMEDI_SUBD_TIMER, /* timer */ COMEDI_SUBD_TIMER, /* timer */
COMEDI_SUBD_MEMORY, /* memory, EEPROM, DPRAM */ COMEDI_SUBD_MEMORY, /* memory, EEPROM, DPRAM */
COMEDI_SUBD_CALIB, /* calibration DACs */ COMEDI_SUBD_CALIB, /* calibration DACs */
COMEDI_SUBD_PROC, /* processor, DSP */ COMEDI_SUBD_PROC, /* processor, DSP */
COMEDI_SUBD_SERIAL, /* serial IO */ COMEDI_SUBD_SERIAL, /* serial IO */
COMEDI_SUBD_PWM /* PWM */ COMEDI_SUBD_PWM /* PWM */
}; };
/* configuration instructions */ /* configuration instructions */
enum configuration_ids { enum configuration_ids {
INSN_CONFIG_DIO_INPUT = 0, INSN_CONFIG_DIO_INPUT = 0,
INSN_CONFIG_DIO_OUTPUT = 1, INSN_CONFIG_DIO_OUTPUT = 1,
INSN_CONFIG_DIO_OPENDRAIN = 2, INSN_CONFIG_DIO_OPENDRAIN = 2,
INSN_CONFIG_ANALOG_TRIG = 16, INSN_CONFIG_ANALOG_TRIG = 16,
// INSN_CONFIG_WAVEFORM = 17, /* INSN_CONFIG_WAVEFORM = 17, */
// INSN_CONFIG_TRIG = 18, /* INSN_CONFIG_TRIG = 18, */
// INSN_CONFIG_COUNTER = 19, /* INSN_CONFIG_COUNTER = 19, */
INSN_CONFIG_ALT_SOURCE = 20, INSN_CONFIG_ALT_SOURCE = 20,
INSN_CONFIG_DIGITAL_TRIG = 21, INSN_CONFIG_DIGITAL_TRIG = 21,
INSN_CONFIG_BLOCK_SIZE = 22, INSN_CONFIG_BLOCK_SIZE = 22,
INSN_CONFIG_TIMER_1 = 23, INSN_CONFIG_TIMER_1 = 23,
INSN_CONFIG_FILTER = 24, INSN_CONFIG_FILTER = 24,
INSN_CONFIG_CHANGE_NOTIFY = 25, INSN_CONFIG_CHANGE_NOTIFY = 25,
/*ALPHA*/ INSN_CONFIG_SERIAL_CLOCK = 26, /*ALPHA*/ INSN_CONFIG_SERIAL_CLOCK = 26,
INSN_CONFIG_BIDIRECTIONAL_DATA = 27, INSN_CONFIG_BIDIRECTIONAL_DATA = 27,
INSN_CONFIG_DIO_QUERY = 28, INSN_CONFIG_DIO_QUERY = 28,
INSN_CONFIG_PWM_OUTPUT = 29, INSN_CONFIG_PWM_OUTPUT = 29,
INSN_CONFIG_GET_PWM_OUTPUT = 30, INSN_CONFIG_GET_PWM_OUTPUT = 30,
INSN_CONFIG_ARM = 31, INSN_CONFIG_ARM = 31,
INSN_CONFIG_DISARM = 32, INSN_CONFIG_DISARM = 32,
INSN_CONFIG_GET_COUNTER_STATUS = 33, INSN_CONFIG_GET_COUNTER_STATUS = 33,
INSN_CONFIG_RESET = 34, INSN_CONFIG_RESET = 34,
INSN_CONFIG_GPCT_SINGLE_PULSE_GENERATOR = 1001, // Use CTR as single pulsegenerator 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_PULSE_TRAIN_GENERATOR = 1002, /* Use CTR as pulsetraingenerator */
INSN_CONFIG_GPCT_QUADRATURE_ENCODER = 1003, // Use the counter as encoder INSN_CONFIG_GPCT_QUADRATURE_ENCODER = 1003, /* Use the counter as encoder */
INSN_CONFIG_SET_GATE_SRC = 2001, // Set gate source INSN_CONFIG_SET_GATE_SRC = 2001, /* Set gate source */
INSN_CONFIG_GET_GATE_SRC = 2002, // Get gate source INSN_CONFIG_GET_GATE_SRC = 2002, /* Get gate source */
INSN_CONFIG_SET_CLOCK_SRC = 2003, // Set master clock source INSN_CONFIG_SET_CLOCK_SRC = 2003, /* Set master clock source */
INSN_CONFIG_GET_CLOCK_SRC = 2004, // Get master clock source INSN_CONFIG_GET_CLOCK_SRC = 2004, /* Get master clock source */
INSN_CONFIG_SET_OTHER_SRC = 2005, // Set other source INSN_CONFIG_SET_OTHER_SRC = 2005, /* Set other source */
// INSN_CONFIG_GET_OTHER_SRC = 2006, // Get 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_GET_HARDWARE_BUFFER_SIZE, /* Get size in bytes of
INSN_CONFIG_SET_COUNTER_MODE = 4097, subdevice's on-board fifos
INSN_CONFIG_8254_SET_MODE = INSN_CONFIG_SET_COUNTER_MODE, /* deprecated */ used during streaming
INSN_CONFIG_8254_READ_STATUS = 4098, input/output */
INSN_CONFIG_SET_ROUTING = 4099, INSN_CONFIG_SET_COUNTER_MODE = 4097,
INSN_CONFIG_GET_ROUTING = 4109, INSN_CONFIG_8254_SET_MODE = INSN_CONFIG_SET_COUNTER_MODE, /* deprecated */
INSN_CONFIG_8254_READ_STATUS = 4098,
INSN_CONFIG_SET_ROUTING = 4099,
INSN_CONFIG_GET_ROUTING = 4109,
/* PWM */ /* PWM */
INSN_CONFIG_PWM_SET_PERIOD = 5000, /* sets frequency */ INSN_CONFIG_PWM_SET_PERIOD = 5000, /* sets frequency */
INSN_CONFIG_PWM_GET_PERIOD = 5001, /* gets frequency */ INSN_CONFIG_PWM_GET_PERIOD = 5001, /* gets frequency */
INSN_CONFIG_GET_PWM_STATUS = 5002, /* is it running? */ 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_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 */ 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_INPUT = 0,
COMEDI_OUTPUT = 1, COMEDI_OUTPUT = 1,
COMEDI_OPENDRAIN = 2 COMEDI_OPENDRAIN = 2
}; };
enum comedi_support_level enum comedi_support_level {
{ COMEDI_UNKNOWN_SUPPORT = 0,
COMEDI_UNKNOWN_SUPPORT = 0, COMEDI_SUPPORTED,
COMEDI_SUPPORTED, COMEDI_UNSUPPORTED
COMEDI_UNSUPPORTED };
};
/* ioctls */ /* ioctls */
#define CIO 'd' #define CIO 'd'
#define COMEDI_DEVCONFIG _IOW(CIO,0,comedi_devconfig) #define COMEDI_DEVCONFIG _IOW(CIO, 0, comedi_devconfig)
#define COMEDI_DEVINFO _IOR(CIO,1,comedi_devinfo) #define COMEDI_DEVINFO _IOR(CIO, 1, comedi_devinfo)
#define COMEDI_SUBDINFO _IOR(CIO,2,comedi_subdinfo) #define COMEDI_SUBDINFO _IOR(CIO, 2, comedi_subdinfo)
#define COMEDI_CHANINFO _IOR(CIO,3,comedi_chaninfo) #define COMEDI_CHANINFO _IOR(CIO, 3, comedi_chaninfo)
#define COMEDI_TRIG _IOWR(CIO,4,comedi_trig) #define COMEDI_TRIG _IOWR(CIO, 4, comedi_trig)
#define COMEDI_LOCK _IO(CIO,5) #define COMEDI_LOCK _IO(CIO, 5)
#define COMEDI_UNLOCK _IO(CIO,6) #define COMEDI_UNLOCK _IO(CIO, 6)
#define COMEDI_CANCEL _IO(CIO,7) #define COMEDI_CANCEL _IO(CIO, 7)
#define COMEDI_RANGEINFO _IOR(CIO,8,comedi_rangeinfo) #define COMEDI_RANGEINFO _IOR(CIO, 8, comedi_rangeinfo)
#define COMEDI_CMD _IOR(CIO,9,comedi_cmd) #define COMEDI_CMD _IOR(CIO, 9, comedi_cmd)
#define COMEDI_CMDTEST _IOR(CIO,10,comedi_cmd) #define COMEDI_CMDTEST _IOR(CIO, 10, comedi_cmd)
#define COMEDI_INSNLIST _IOR(CIO,11,comedi_insnlist) #define COMEDI_INSNLIST _IOR(CIO, 11, comedi_insnlist)
#define COMEDI_INSN _IOR(CIO,12,comedi_insn) #define COMEDI_INSN _IOR(CIO, 12, comedi_insn)
#define COMEDI_BUFCONFIG _IOR(CIO,13,comedi_bufconfig) #define COMEDI_BUFCONFIG _IOR(CIO, 13, comedi_bufconfig)
#define COMEDI_BUFINFO _IOWR(CIO,14,comedi_bufinfo) #define COMEDI_BUFINFO _IOWR(CIO, 14, comedi_bufinfo)
#define COMEDI_POLL _IO(CIO,15) #define COMEDI_POLL _IO(CIO, 15)
/* structures */ /* structures */
typedef struct comedi_trig_struct comedi_trig; typedef struct comedi_trig_struct comedi_trig;
typedef struct comedi_cmd_struct comedi_cmd; typedef struct comedi_cmd_struct comedi_cmd;
typedef struct comedi_insn_struct comedi_insn; typedef struct comedi_insn_struct comedi_insn;
typedef struct comedi_insnlist_struct comedi_insnlist; typedef struct comedi_insnlist_struct comedi_insnlist;
typedef struct comedi_chaninfo_struct comedi_chaninfo; typedef struct comedi_chaninfo_struct comedi_chaninfo;
typedef struct comedi_subdinfo_struct comedi_subdinfo; typedef struct comedi_subdinfo_struct comedi_subdinfo;
typedef struct comedi_devinfo_struct comedi_devinfo; typedef struct comedi_devinfo_struct comedi_devinfo;
typedef struct comedi_devconfig_struct comedi_devconfig; typedef struct comedi_devconfig_struct comedi_devconfig;
typedef struct comedi_rangeinfo_struct comedi_rangeinfo; typedef struct comedi_rangeinfo_struct comedi_rangeinfo;
typedef struct comedi_krange_struct comedi_krange; typedef struct comedi_krange_struct comedi_krange;
typedef struct comedi_bufconfig_struct comedi_bufconfig; typedef struct comedi_bufconfig_struct comedi_bufconfig;
typedef struct comedi_bufinfo_struct comedi_bufinfo; typedef struct comedi_bufinfo_struct comedi_bufinfo;
struct comedi_trig_struct { struct comedi_trig_struct {
unsigned int subdev; /* subdevice */ unsigned int subdev; /* subdevice */
unsigned int mode; /* mode */ unsigned int mode; /* mode */
unsigned int flags; unsigned int flags;
unsigned int n_chan; /* number of channels */ unsigned int n_chan; /* number of channels */
unsigned int *chanlist; /* channel/range list */ unsigned int *chanlist; /* channel/range list */
sampl_t *data; /* data list, size depends on subd flags */ sampl_t *data; /* data list, size depends on subd flags */
unsigned int n; /* number of scans */ unsigned int n; /* number of scans */
unsigned int trigsrc; unsigned int trigsrc;
unsigned int trigvar; unsigned int trigvar;
unsigned int trigvar1; unsigned int trigvar1;
unsigned int data_len; unsigned int data_len;
unsigned int unused[3]; unsigned int unused[3];
}; };
struct comedi_insn_struct { struct comedi_insn_struct {
unsigned int insn; unsigned int insn;
unsigned int n; unsigned int n;
lsampl_t *data; lsampl_t *data;
unsigned int subdev; unsigned int subdev;
unsigned int chanspec; unsigned int chanspec;
unsigned int unused[3]; unsigned int unused[3];
}; };
struct comedi_insnlist_struct { struct comedi_insnlist_struct {
unsigned int n_insns; unsigned int n_insns;
comedi_insn *insns; comedi_insn *insns;
}; };
struct comedi_cmd_struct { struct comedi_cmd_struct {
unsigned int subdev; unsigned int subdev;
unsigned int flags; unsigned int flags;
unsigned int start_src; unsigned int start_src;
unsigned int start_arg; unsigned int start_arg;
unsigned int scan_begin_src; unsigned int scan_begin_src;
unsigned int scan_begin_arg; unsigned int scan_begin_arg;
unsigned int convert_src; unsigned int convert_src;
unsigned int convert_arg; unsigned int convert_arg;
unsigned int scan_end_src; unsigned int scan_end_src;
unsigned int scan_end_arg; unsigned int scan_end_arg;
unsigned int stop_src; unsigned int stop_src;
unsigned int stop_arg; unsigned int stop_arg;
unsigned int *chanlist; /* channel/range list */ unsigned int *chanlist; /* channel/range list */
unsigned int chanlist_len; unsigned int chanlist_len;
sampl_t *data; /* data list, size depends on subd flags */ sampl_t *data; /* data list, size depends on subd flags */
unsigned int data_len; unsigned int data_len;
}; };
struct comedi_chaninfo_struct { struct comedi_chaninfo_struct {
unsigned int subdev; unsigned int subdev;
lsampl_t *maxdata_list; lsampl_t *maxdata_list;
unsigned int *flaglist; unsigned int *flaglist;
unsigned int *rangelist; unsigned int *rangelist;
unsigned int unused[4]; unsigned int unused[4];
}; };
struct comedi_rangeinfo_struct { struct comedi_rangeinfo_struct {
unsigned int range_type; unsigned int range_type;
void *range_ptr; void *range_ptr;
}; };
struct comedi_krange_struct { struct comedi_krange_struct {
int min; /* fixed point, multiply by 1e-6 */ int min; /* fixed point, multiply by 1e-6 */
int max; /* fixed point, multiply by 1e-6 */ int max; /* fixed point, multiply by 1e-6 */
unsigned int flags; unsigned int flags;
}; };
struct comedi_subdinfo_struct { struct comedi_subdinfo_struct {
unsigned int type; unsigned int type;
unsigned int n_chan; unsigned int n_chan;
unsigned int subd_flags; unsigned int subd_flags;
unsigned int timer_type; unsigned int timer_type;
unsigned int len_chanlist; unsigned int len_chanlist;
lsampl_t maxdata; lsampl_t maxdata;
unsigned int flags; /* channel flags */ unsigned int flags; /* channel flags */
unsigned int range_type; /* lookup in kernel */ unsigned int range_type; /* lookup in kernel */
unsigned int settling_time_0; unsigned int settling_time_0;
unsigned insn_bits_support; /* see support_level enum for values*/ unsigned insn_bits_support; /* see support_level enum for values*/
unsigned int unused[8]; unsigned int unused[8];
}; };
struct comedi_devinfo_struct { struct comedi_devinfo_struct {
unsigned int version_code; unsigned int version_code;
unsigned int n_subdevs; unsigned int n_subdevs;
char driver_name[COMEDI_NAMELEN]; char driver_name[COMEDI_NAMELEN];
char board_name[COMEDI_NAMELEN]; char board_name[COMEDI_NAMELEN];
int read_subdevice; int read_subdevice;
int write_subdevice; int write_subdevice;
int unused[30]; int unused[30];
}; };
struct comedi_devconfig_struct { struct comedi_devconfig_struct {
char board_name[COMEDI_NAMELEN]; char board_name[COMEDI_NAMELEN];
int options[COMEDI_NDEVCONFOPTS]; int options[COMEDI_NDEVCONFOPTS];
}; };
struct comedi_bufconfig_struct { struct comedi_bufconfig_struct {
unsigned int subdevice; unsigned int subdevice;
unsigned int flags; unsigned int flags;
unsigned int maximum_size; unsigned int maximum_size;
unsigned int size; unsigned int size;
unsigned int unused[4]; unsigned int unused[4];
}; };
struct comedi_bufinfo_struct { struct comedi_bufinfo_struct {
unsigned int subdevice; unsigned int subdevice;
unsigned int bytes_read; unsigned int bytes_read;
unsigned int buf_write_ptr; unsigned int buf_write_ptr;
unsigned int buf_read_ptr; unsigned int buf_read_ptr;
unsigned int buf_write_count; unsigned int buf_write_count;
unsigned int buf_read_count; unsigned int buf_read_count;
unsigned int bytes_written; unsigned int bytes_written;
unsigned int unused[4]; unsigned int unused[4];
}; };
/* range stuff */ /* 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_OFFSET(a) (((a)>>16)&0xffff)
#define RANGE_LENGTH(b) ((b)&0xffff) #define RANGE_LENGTH(b) ((b)&0xffff)
...@@ -494,282 +496,304 @@ extern "C" { ...@@ -494,282 +496,304 @@ extern "C" {
0 ID: INSN_CONFIG_8254_READ_STATUS 0 ID: INSN_CONFIG_8254_READ_STATUS
1 <-- Status byte returned here. 1 <-- Status byte returned here.
B7=Output B7 = Output
B6=NULL Count B6 = NULL Count
B5-B0 Current mode. B5 - B0 Current mode.
*/ */
enum i8254_mode { enum i8254_mode {
I8254_MODE0 = (0 << 1), /* Interrupt on terminal count */ I8254_MODE0 = (0 << 1), /* Interrupt on terminal count */
I8254_MODE1 = (1 << 1), /* Hardware retriggerable one-shot */ I8254_MODE1 = (1 << 1), /* Hardware retriggerable one-shot */
I8254_MODE2 = (2 << 1), /* Rate generator */ I8254_MODE2 = (2 << 1), /* Rate generator */
I8254_MODE3 = (3 << 1), /* Square wave mode */ I8254_MODE3 = (3 << 1), /* Square wave mode */
I8254_MODE4 = (4 << 1), /* Software triggered strobe */ I8254_MODE4 = (4 << 1), /* Software triggered strobe */
I8254_MODE5 = (5 << 1), /* Hardware triggered strobe (retriggerable) */ I8254_MODE5 = (5 << 1), /* Hardware triggered strobe (retriggerable) */
I8254_BCD = 1, /* use binary-coded decimal instead of binary (pretty useless) */ I8254_BCD = 1, /* use binary-coded decimal instead of binary (pretty useless) */
I8254_BINARY = 0 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; if (pfi_channel < 10)
else return 0x1 + pfi_channel;
return 0xb + pfi_channel; else
} static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel) { return 0xb + pfi_channel;
if (rtsi_channel < 7) }
return 0xb + rtsi_channel; static inline unsigned NI_USUAL_RTSI_SELECT(unsigned rtsi_channel)
else {
return 0x1b; if (rtsi_channel < 7)
} return 0xb + rtsi_channel;
/* mode bits for NI general-purpose counters, set with INSN_CONFIG_SET_COUNTER_MODE */ else
return 0x1b;
}
/* mode bits for NI general-purpose counters, set with
* INSN_CONFIG_SET_COUNTER_MODE */
#define NI_GPCT_COUNTING_MODE_SHIFT 16 #define NI_GPCT_COUNTING_MODE_SHIFT 16
#define NI_GPCT_INDEX_PHASE_BITSHIFT 20 #define NI_GPCT_INDEX_PHASE_BITSHIFT 20
#define NI_GPCT_COUNTING_DIRECTION_SHIFT 24 #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_GATE_ON_BOTH_EDGES_BIT = 0x4,
NI_GPCT_EDGE_GATE_MODE_MASK = 0x18, NI_GPCT_EDGE_GATE_MODE_MASK = 0x18,
NI_GPCT_EDGE_GATE_STARTS_STOPS_BITS = 0x0, NI_GPCT_EDGE_GATE_STARTS_STOPS_BITS = 0x0,
NI_GPCT_EDGE_GATE_STOPS_STARTS_BITS = 0x8, NI_GPCT_EDGE_GATE_STOPS_STARTS_BITS = 0x8,
NI_GPCT_EDGE_GATE_STARTS_BITS = 0x10, NI_GPCT_EDGE_GATE_STARTS_BITS = 0x10,
NI_GPCT_EDGE_GATE_NO_STARTS_NO_STOPS_BITS = 0x18, NI_GPCT_EDGE_GATE_NO_STARTS_NO_STOPS_BITS = 0x18,
NI_GPCT_STOP_MODE_MASK = 0x60, NI_GPCT_STOP_MODE_MASK = 0x60,
NI_GPCT_STOP_ON_GATE_BITS = 0x00, NI_GPCT_STOP_ON_GATE_BITS = 0x00,
NI_GPCT_STOP_ON_GATE_OR_TC_BITS = 0x20, NI_GPCT_STOP_ON_GATE_OR_TC_BITS = 0x20,
NI_GPCT_STOP_ON_GATE_OR_SECOND_TC_BITS = 0x40, NI_GPCT_STOP_ON_GATE_OR_SECOND_TC_BITS = 0x40,
NI_GPCT_LOAD_B_SELECT_BIT = 0x80, NI_GPCT_LOAD_B_SELECT_BIT = 0x80,
NI_GPCT_OUTPUT_MODE_MASK = 0x300, NI_GPCT_OUTPUT_MODE_MASK = 0x300,
NI_GPCT_OUTPUT_TC_PULSE_BITS = 0x100, NI_GPCT_OUTPUT_TC_PULSE_BITS = 0x100,
NI_GPCT_OUTPUT_TC_TOGGLE_BITS = 0x200, NI_GPCT_OUTPUT_TC_TOGGLE_BITS = 0x200,
NI_GPCT_OUTPUT_TC_OR_GATE_TOGGLE_BITS = 0x300, NI_GPCT_OUTPUT_TC_OR_GATE_TOGGLE_BITS = 0x300,
NI_GPCT_HARDWARE_DISARM_MASK = 0xc00, NI_GPCT_HARDWARE_DISARM_MASK = 0xc00,
NI_GPCT_NO_HARDWARE_DISARM_BITS = 0x000, NI_GPCT_NO_HARDWARE_DISARM_BITS = 0x000,
NI_GPCT_DISARM_AT_TC_BITS = 0x400, NI_GPCT_DISARM_AT_TC_BITS = 0x400,
NI_GPCT_DISARM_AT_GATE_BITS = 0x800, NI_GPCT_DISARM_AT_GATE_BITS = 0x800,
NI_GPCT_DISARM_AT_TC_OR_GATE_BITS = 0xc00, NI_GPCT_DISARM_AT_TC_OR_GATE_BITS = 0xc00,
NI_GPCT_LOADING_ON_TC_BIT = 0x1000, NI_GPCT_LOADING_ON_TC_BIT = 0x1000,
NI_GPCT_LOADING_ON_GATE_BIT = 0x4000, NI_GPCT_LOADING_ON_GATE_BIT = 0x4000,
NI_GPCT_COUNTING_MODE_MASK = 0x7 << NI_GPCT_COUNTING_MODE_SHIFT, NI_GPCT_COUNTING_MODE_MASK = 0x7 << NI_GPCT_COUNTING_MODE_SHIFT,
NI_GPCT_COUNTING_MODE_NORMAL_BITS = NI_GPCT_COUNTING_MODE_NORMAL_BITS =
0x0 << NI_GPCT_COUNTING_MODE_SHIFT, 0x0 << NI_GPCT_COUNTING_MODE_SHIFT,
NI_GPCT_COUNTING_MODE_QUADRATURE_X1_BITS = NI_GPCT_COUNTING_MODE_QUADRATURE_X1_BITS =
0x1 << NI_GPCT_COUNTING_MODE_SHIFT, 0x1 << NI_GPCT_COUNTING_MODE_SHIFT,
NI_GPCT_COUNTING_MODE_QUADRATURE_X2_BITS = NI_GPCT_COUNTING_MODE_QUADRATURE_X2_BITS =
0x2 << NI_GPCT_COUNTING_MODE_SHIFT, 0x2 << NI_GPCT_COUNTING_MODE_SHIFT,
NI_GPCT_COUNTING_MODE_QUADRATURE_X4_BITS = NI_GPCT_COUNTING_MODE_QUADRATURE_X4_BITS =
0x3 << NI_GPCT_COUNTING_MODE_SHIFT, 0x3 << NI_GPCT_COUNTING_MODE_SHIFT,
NI_GPCT_COUNTING_MODE_TWO_PULSE_BITS = NI_GPCT_COUNTING_MODE_TWO_PULSE_BITS =
0x4 << NI_GPCT_COUNTING_MODE_SHIFT, 0x4 << NI_GPCT_COUNTING_MODE_SHIFT,
NI_GPCT_COUNTING_MODE_SYNC_SOURCE_BITS = NI_GPCT_COUNTING_MODE_SYNC_SOURCE_BITS =
0x6 << NI_GPCT_COUNTING_MODE_SHIFT, 0x6 << NI_GPCT_COUNTING_MODE_SHIFT,
NI_GPCT_INDEX_PHASE_MASK = 0x3 << NI_GPCT_INDEX_PHASE_BITSHIFT, NI_GPCT_INDEX_PHASE_MASK = 0x3 << NI_GPCT_INDEX_PHASE_BITSHIFT,
NI_GPCT_INDEX_PHASE_LOW_A_LOW_B_BITS = NI_GPCT_INDEX_PHASE_LOW_A_LOW_B_BITS =
0x0 << NI_GPCT_INDEX_PHASE_BITSHIFT, 0x0 << NI_GPCT_INDEX_PHASE_BITSHIFT,
NI_GPCT_INDEX_PHASE_LOW_A_HIGH_B_BITS = NI_GPCT_INDEX_PHASE_LOW_A_HIGH_B_BITS =
0x1 << NI_GPCT_INDEX_PHASE_BITSHIFT, 0x1 << NI_GPCT_INDEX_PHASE_BITSHIFT,
NI_GPCT_INDEX_PHASE_HIGH_A_LOW_B_BITS = NI_GPCT_INDEX_PHASE_HIGH_A_LOW_B_BITS =
0x2 << NI_GPCT_INDEX_PHASE_BITSHIFT, 0x2 << NI_GPCT_INDEX_PHASE_BITSHIFT,
NI_GPCT_INDEX_PHASE_HIGH_A_HIGH_B_BITS = NI_GPCT_INDEX_PHASE_HIGH_A_HIGH_B_BITS =
0x3 << NI_GPCT_INDEX_PHASE_BITSHIFT, 0x3 << NI_GPCT_INDEX_PHASE_BITSHIFT,
NI_GPCT_INDEX_ENABLE_BIT = 0x400000, NI_GPCT_INDEX_ENABLE_BIT = 0x400000,
NI_GPCT_COUNTING_DIRECTION_MASK = NI_GPCT_COUNTING_DIRECTION_MASK =
0x3 << NI_GPCT_COUNTING_DIRECTION_SHIFT, 0x3 << NI_GPCT_COUNTING_DIRECTION_SHIFT,
NI_GPCT_COUNTING_DIRECTION_DOWN_BITS = NI_GPCT_COUNTING_DIRECTION_DOWN_BITS =
0x00 << NI_GPCT_COUNTING_DIRECTION_SHIFT, 0x00 << NI_GPCT_COUNTING_DIRECTION_SHIFT,
NI_GPCT_COUNTING_DIRECTION_UP_BITS = NI_GPCT_COUNTING_DIRECTION_UP_BITS =
0x1 << NI_GPCT_COUNTING_DIRECTION_SHIFT, 0x1 << NI_GPCT_COUNTING_DIRECTION_SHIFT,
NI_GPCT_COUNTING_DIRECTION_HW_UP_DOWN_BITS = NI_GPCT_COUNTING_DIRECTION_HW_UP_DOWN_BITS =
0x2 << NI_GPCT_COUNTING_DIRECTION_SHIFT, 0x2 << NI_GPCT_COUNTING_DIRECTION_SHIFT,
NI_GPCT_COUNTING_DIRECTION_HW_GATE_BITS = NI_GPCT_COUNTING_DIRECTION_HW_GATE_BITS =
0x3 << NI_GPCT_COUNTING_DIRECTION_SHIFT, 0x3 << NI_GPCT_COUNTING_DIRECTION_SHIFT,
NI_GPCT_RELOAD_SOURCE_MASK = 0xc000000, NI_GPCT_RELOAD_SOURCE_MASK = 0xc000000,
NI_GPCT_RELOAD_SOURCE_FIXED_BITS = 0x0, NI_GPCT_RELOAD_SOURCE_FIXED_BITS = 0x0,
NI_GPCT_RELOAD_SOURCE_SWITCHING_BITS = 0x4000000, NI_GPCT_RELOAD_SOURCE_SWITCHING_BITS = 0x4000000,
NI_GPCT_RELOAD_SOURCE_GATE_SELECT_BITS = 0x8000000, NI_GPCT_RELOAD_SOURCE_GATE_SELECT_BITS = 0x8000000,
NI_GPCT_OR_GATE_BIT = 0x10000000, NI_GPCT_OR_GATE_BIT = 0x10000000,
NI_GPCT_INVERT_OUTPUT_BIT = 0x20000000 NI_GPCT_INVERT_OUTPUT_BIT = 0x20000000
}; };
/* Bits for setting a clock source with /* Bits for setting a clock source with
* INSN_CONFIG_SET_CLOCK_SRC when using NI general-purpose counters. */ * 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_CLOCK_SRC_SELECT_MASK = 0x3f,
NI_GPCT_TIMEBASE_1_CLOCK_SRC_BITS = 0x0, NI_GPCT_TIMEBASE_1_CLOCK_SRC_BITS = 0x0,
NI_GPCT_TIMEBASE_2_CLOCK_SRC_BITS = 0x1, NI_GPCT_TIMEBASE_2_CLOCK_SRC_BITS = 0x1,
NI_GPCT_TIMEBASE_3_CLOCK_SRC_BITS = 0x2, NI_GPCT_TIMEBASE_3_CLOCK_SRC_BITS = 0x2,
NI_GPCT_LOGIC_LOW_CLOCK_SRC_BITS = 0x3, NI_GPCT_LOGIC_LOW_CLOCK_SRC_BITS = 0x3,
NI_GPCT_NEXT_GATE_CLOCK_SRC_BITS = 0x4, NI_GPCT_NEXT_GATE_CLOCK_SRC_BITS = 0x4,
NI_GPCT_NEXT_TC_CLOCK_SRC_BITS = 0x5, NI_GPCT_NEXT_TC_CLOCK_SRC_BITS = 0x5,
NI_GPCT_SOURCE_PIN_i_CLOCK_SRC_BITS = 0x6, /* NI 660x-specific */ NI_GPCT_SOURCE_PIN_i_CLOCK_SRC_BITS = 0x6, /* NI 660x-specific */
NI_GPCT_PXI10_CLOCK_SRC_BITS = 0x7, NI_GPCT_PXI10_CLOCK_SRC_BITS = 0x7,
NI_GPCT_PXI_STAR_TRIGGER_CLOCK_SRC_BITS = 0x8, NI_GPCT_PXI_STAR_TRIGGER_CLOCK_SRC_BITS = 0x8,
NI_GPCT_ANALOG_TRIGGER_OUT_CLOCK_SRC_BITS = 0x9, NI_GPCT_ANALOG_TRIGGER_OUT_CLOCK_SRC_BITS = 0x9,
NI_GPCT_PRESCALE_MODE_CLOCK_SRC_MASK = 0x30000000, NI_GPCT_PRESCALE_MODE_CLOCK_SRC_MASK = 0x30000000,
NI_GPCT_NO_PRESCALE_CLOCK_SRC_BITS = 0x0, NI_GPCT_NO_PRESCALE_CLOCK_SRC_BITS = 0x0,
NI_GPCT_PRESCALE_X2_CLOCK_SRC_BITS = 0x10000000, /* divide source by 2 */ 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_PRESCALE_X8_CLOCK_SRC_BITS = 0x20000000, /* divide source by 8 */
NI_GPCT_INVERT_CLOCK_SRC_BIT = 0x80000000 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)
return 0x10 + n; {
} /* NI 660x-specific */
static inline unsigned NI_GPCT_RTSI_CLOCK_SRC_BITS(unsigned n) { return 0x10 + n;
return 0x18 + n; }
} static inline unsigned NI_GPCT_RTSI_CLOCK_SRC_BITS(unsigned n)
static inline unsigned NI_GPCT_PFI_CLOCK_SRC_BITS(unsigned n) { /* no pfi on NI 660x */ {
return 0x20 + n; return 0x18 + n;
} }
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 /* Possibilities for setting a gate source with
INSN_CONFIG_SET_GATE_SRC when using NI general-purpose counters. INSN_CONFIG_SET_GATE_SRC when using NI general-purpose counters.
May be bitwise-or'd with CR_EDGE or CR_INVERT. */ May be bitwise-or'd with CR_EDGE or CR_INVERT. */
enum ni_gpct_gate_select { enum ni_gpct_gate_select {
/* m-series gates */ /* m-series gates */
NI_GPCT_TIMESTAMP_MUX_GATE_SELECT = 0x0, NI_GPCT_TIMESTAMP_MUX_GATE_SELECT = 0x0,
NI_GPCT_AI_START2_GATE_SELECT = 0x12, NI_GPCT_AI_START2_GATE_SELECT = 0x12,
NI_GPCT_PXI_STAR_TRIGGER_GATE_SELECT = 0x13, NI_GPCT_PXI_STAR_TRIGGER_GATE_SELECT = 0x13,
NI_GPCT_NEXT_OUT_GATE_SELECT = 0x14, NI_GPCT_NEXT_OUT_GATE_SELECT = 0x14,
NI_GPCT_AI_START1_GATE_SELECT = 0x1c, NI_GPCT_AI_START1_GATE_SELECT = 0x1c,
NI_GPCT_NEXT_SOURCE_GATE_SELECT = 0x1d, NI_GPCT_NEXT_SOURCE_GATE_SELECT = 0x1d,
NI_GPCT_ANALOG_TRIGGER_OUT_GATE_SELECT = 0x1e, NI_GPCT_ANALOG_TRIGGER_OUT_GATE_SELECT = 0x1e,
NI_GPCT_LOGIC_LOW_GATE_SELECT = 0x1f, NI_GPCT_LOGIC_LOW_GATE_SELECT = 0x1f,
/* more gates for 660x */ /* more gates for 660x */
NI_GPCT_SOURCE_PIN_i_GATE_SELECT = 0x100, NI_GPCT_SOURCE_PIN_i_GATE_SELECT = 0x100,
NI_GPCT_GATE_PIN_i_GATE_SELECT = 0x101, NI_GPCT_GATE_PIN_i_GATE_SELECT = 0x101,
/* more gates for 660x "second gate" */ /* more gates for 660x "second gate" */
NI_GPCT_UP_DOWN_PIN_i_GATE_SELECT = 0x201, NI_GPCT_UP_DOWN_PIN_i_GATE_SELECT = 0x201,
NI_GPCT_SELECTED_GATE_GATE_SELECT = 0x21e, NI_GPCT_SELECTED_GATE_GATE_SELECT = 0x21e,
/* m-series "second gate" sources are unknown, /* m-series "second gate" sources are unknown,
we should add them here with an offset of 0x300 when known. */ we should add them here with an offset of 0x300 when known. */
NI_GPCT_DISABLED_GATE_SELECT = 0x8000, 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; {
} return 0x102 + n;
static inline unsigned NI_GPCT_RTSI_GATE_SELECT(unsigned n) { }
return NI_USUAL_RTSI_SELECT(n); static inline unsigned NI_GPCT_RTSI_GATE_SELECT(unsigned n)
} {
static inline unsigned NI_GPCT_PFI_GATE_SELECT(unsigned n) { return NI_USUAL_RTSI_SELECT(n);
return NI_USUAL_PFI_SELECT(n); }
} static inline unsigned NI_GPCT_PFI_GATE_SELECT(unsigned n)
static inline unsigned NI_GPCT_UP_DOWN_PIN_GATE_SELECT(unsigned n) { {
return 0x202 + n; return NI_USUAL_PFI_SELECT(n);
} }
static inline unsigned NI_GPCT_UP_DOWN_PIN_GATE_SELECT(unsigned n)
{
return 0x202 + n;
}
/* Possibilities for setting a source with /* Possibilities for setting a source with
INSN_CONFIG_SET_OTHER_SRC when using NI general-purpose counters. */ 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_A,
NI_GPCT_SOURCE_ENCODER_B, NI_GPCT_SOURCE_ENCODER_B,
NI_GPCT_SOURCE_ENCODER_Z NI_GPCT_SOURCE_ENCODER_Z
}; };
enum ni_gpct_other_select { enum ni_gpct_other_select {
/* m-series gates */ /* 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, 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); {
} return NI_USUAL_PFI_SELECT(n);
}
/* start sources for ni general-purpose counters for use with /* start sources for ni general-purpose counters for use with
INSN_CONFIG_ARM */ INSN_CONFIG_ARM */
enum ni_gpct_arm_source { enum ni_gpct_arm_source {
NI_GPCT_ARM_IMMEDIATE = 0x0, 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
/* NI doesn't document bits for selecting hardware arm triggers. If the adjacent paired counter
the NI_GPCT_ARM_UNKNOWN bit is set, we will pass the least significant simultaneously */
bits (3 bits for 660x or 5 bits for m-series) through to the hardware. /* NI doesn't document bits for selecting hardware arm triggers. If
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
NI_GPCT_ARM_UNKNOWN = 0x1000, * 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. */ /* 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_OFF = 0x0,
NI_GPCT_FILTER_TIMEBASE_3_SYNC = 0x1, NI_GPCT_FILTER_TIMEBASE_3_SYNC = 0x1,
NI_GPCT_FILTER_100x_TIMEBASE_1 = 0x2, NI_GPCT_FILTER_100x_TIMEBASE_1 = 0x2,
NI_GPCT_FILTER_20x_TIMEBASE_1 = 0x3, NI_GPCT_FILTER_20x_TIMEBASE_1 = 0x3,
NI_GPCT_FILTER_10x_TIMEBASE_1 = 0x4, NI_GPCT_FILTER_10x_TIMEBASE_1 = 0x4,
NI_GPCT_FILTER_2x_TIMEBASE_1 = 0x5, NI_GPCT_FILTER_2x_TIMEBASE_1 = 0x5,
NI_GPCT_FILTER_2x_TIMEBASE_3 = 0x6 NI_GPCT_FILTER_2x_TIMEBASE_3 = 0x6
}; };
/* PFI digital filtering options for ni m-series for use with INSN_CONFIG_FILTER. */ /* PFI digital filtering options for ni m-series for use with
enum ni_pfi_filter_select { * INSN_CONFIG_FILTER. */
NI_PFI_FILTER_OFF = 0x0, enum ni_pfi_filter_select {
NI_PFI_FILTER_125ns = 0x1, NI_PFI_FILTER_OFF = 0x0,
NI_PFI_FILTER_6425ns = 0x2, NI_PFI_FILTER_125ns = 0x1,
NI_PFI_FILTER_2550us = 0x3 NI_PFI_FILTER_6425ns = 0x2,
}; NI_PFI_FILTER_2550us = 0x3
};
/* master clock sources for ni mio boards and INSN_CONFIG_SET_CLOCK_SRC */ /* 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_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
/* the NI_MIO_PLL_* sources are m-series only */ NI_MIO_PLL_RTSI_CLOCK() */
NI_MIO_PLL_PXI_STAR_TRIGGER_CLOCK = 2, /* the NI_MIO_PLL_* sources are m-series only */
NI_MIO_PLL_PXI10_CLOCK = 3, NI_MIO_PLL_PXI_STAR_TRIGGER_CLOCK = 2,
NI_MIO_PLL_RTSI0_CLOCK = 4 NI_MIO_PLL_PXI10_CLOCK = 3,
}; NI_MIO_PLL_RTSI0_CLOCK = 4
static inline unsigned NI_MIO_PLL_RTSI_CLOCK(unsigned rtsi_channel) { };
return NI_MIO_PLL_RTSI0_CLOCK + 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. /* 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 The numbers assigned are not arbitrary, they correspond to the bits required
to program the board. */ to program the board. */
enum ni_rtsi_routing { enum ni_rtsi_routing {
NI_RTSI_OUTPUT_ADR_START1 = 0, NI_RTSI_OUTPUT_ADR_START1 = 0,
NI_RTSI_OUTPUT_ADR_START2 = 1, NI_RTSI_OUTPUT_ADR_START2 = 1,
NI_RTSI_OUTPUT_SCLKG = 2, NI_RTSI_OUTPUT_SCLKG = 2,
NI_RTSI_OUTPUT_DACUPDN = 3, NI_RTSI_OUTPUT_DACUPDN = 3,
NI_RTSI_OUTPUT_DA_START1 = 4, NI_RTSI_OUTPUT_DA_START1 = 4,
NI_RTSI_OUTPUT_G_SRC0 = 5, NI_RTSI_OUTPUT_G_SRC0 = 5,
NI_RTSI_OUTPUT_G_GATE0 = 6, NI_RTSI_OUTPUT_G_GATE0 = 6,
NI_RTSI_OUTPUT_RGOUT0 = 7, NI_RTSI_OUTPUT_RGOUT0 = 7,
NI_RTSI_OUTPUT_RTSI_BRD_0 = 8, NI_RTSI_OUTPUT_RTSI_BRD_0 = 8,
NI_RTSI_OUTPUT_RTSI_OSC = 12 /* pre-m-series always have RTSI clock on line 7 */ 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; 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 /* Signals which can be routed to an NI PFI pin on an m-series board with
their routing cannot be changed. The numbers assigned are * INSN_CONFIG_SET_ROUTING. These numbers are also returned by
not arbitrary, they correspond to the bits required * INSN_CONFIG_GET_ROUTING on pre-m-series boards, even though their routing
to program the board. */ * cannot be changed. The numbers assigned are not arbitrary, they correspond
enum ni_pfi_routing { * to the bits required to program the board. */
NI_PFI_OUTPUT_PFI_DEFAULT = 0, enum ni_pfi_routing {
NI_PFI_OUTPUT_AI_START1 = 1, NI_PFI_OUTPUT_PFI_DEFAULT = 0,
NI_PFI_OUTPUT_AI_START2 = 2, NI_PFI_OUTPUT_AI_START1 = 1,
NI_PFI_OUTPUT_AI_CONVERT = 3, NI_PFI_OUTPUT_AI_START2 = 2,
NI_PFI_OUTPUT_G_SRC1 = 4, NI_PFI_OUTPUT_AI_CONVERT = 3,
NI_PFI_OUTPUT_G_GATE1 = 5, NI_PFI_OUTPUT_G_SRC1 = 4,
NI_PFI_OUTPUT_AO_UPDATE_N = 6, NI_PFI_OUTPUT_G_GATE1 = 5,
NI_PFI_OUTPUT_AO_START1 = 7, NI_PFI_OUTPUT_AO_UPDATE_N = 6,
NI_PFI_OUTPUT_AI_START_PULSE = 8, NI_PFI_OUTPUT_AO_START1 = 7,
NI_PFI_OUTPUT_G_SRC0 = 9, NI_PFI_OUTPUT_AI_START_PULSE = 8,
NI_PFI_OUTPUT_G_GATE0 = 10, NI_PFI_OUTPUT_G_SRC0 = 9,
NI_PFI_OUTPUT_EXT_STROBE = 11, NI_PFI_OUTPUT_G_GATE0 = 10,
NI_PFI_OUTPUT_AI_EXT_MUX_CLK = 12, NI_PFI_OUTPUT_EXT_STROBE = 11,
NI_PFI_OUTPUT_GOUT0 = 13, NI_PFI_OUTPUT_AI_EXT_MUX_CLK = 12,
NI_PFI_OUTPUT_GOUT1 = 14, NI_PFI_OUTPUT_GOUT0 = 13,
NI_PFI_OUTPUT_FREQ_OUT = 15, NI_PFI_OUTPUT_GOUT1 = 14,
NI_PFI_OUTPUT_PFI_DO = 16, NI_PFI_OUTPUT_FREQ_OUT = 15,
NI_PFI_OUTPUT_I_ATRIG = 17, NI_PFI_OUTPUT_PFI_DO = 16,
NI_PFI_OUTPUT_RTSI0 = 18, NI_PFI_OUTPUT_I_ATRIG = 17,
NI_PFI_OUTPUT_PXI_STAR_TRIGGER_IN = 26, NI_PFI_OUTPUT_RTSI0 = 18,
NI_PFI_OUTPUT_SCXI_TRIG1 = 27, NI_PFI_OUTPUT_PXI_STAR_TRIGGER_IN = 26,
NI_PFI_OUTPUT_DIO_CHANGE_DETECT_RTSI = 28, NI_PFI_OUTPUT_SCXI_TRIG1 = 27,
NI_PFI_OUTPUT_CDI_SAMPLE = 29, NI_PFI_OUTPUT_DIO_CHANGE_DETECT_RTSI = 28,
NI_PFI_OUTPUT_CDO_UPDATE = 30 NI_PFI_OUTPUT_CDI_SAMPLE = 29,
}; NI_PFI_OUTPUT_CDO_UPDATE = 30
static inline unsigned NI_PFI_OUTPUT_RTSI(unsigned rtsi_channel) { };
return NI_PFI_OUTPUT_RTSI0 + 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 /* 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 with INSN_CONFIG_SET_ROUTING. The numbers assigned are
...@@ -777,66 +801,72 @@ INSN_CONFIG_ARM */ ...@@ -777,66 +801,72 @@ INSN_CONFIG_ARM */
to program the board. Lines 0 to 7 can only be set to 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_DIO. Lines 32 to 39 can only be set to
NI_660X_PFI_OUTPUT_COUNTER. */ NI_660X_PFI_OUTPUT_COUNTER. */
enum ni_660x_pfi_routing { enum ni_660x_pfi_routing {
NI_660X_PFI_OUTPUT_COUNTER = 1, // counter NI_660X_PFI_OUTPUT_COUNTER = 1, /* counter */
NI_660X_PFI_OUTPUT_DIO = 2, // static digital output NI_660X_PFI_OUTPUT_DIO = 2, /* static digital output */
}; };
/* NI External Trigger lines. These values are not arbitrary, but are related to /* NI External Trigger lines. These values are not arbitrary, but are related
the bits required to program the board (offset by 1 for historical reasons). */ * to the bits required to program the board (offset by 1 for historical
static inline unsigned NI_EXT_PFI(unsigned pfi_channel) { * reasons). */
return NI_USUAL_PFI_SELECT(pfi_channel) - 1; static inline unsigned NI_EXT_PFI(unsigned pfi_channel)
} {
static inline unsigned NI_EXT_RTSI(unsigned rtsi_channel) { return NI_USUAL_PFI_SELECT(pfi_channel) - 1;
return NI_USUAL_RTSI_SELECT(rtsi_channel) - 1; }
} 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 */ /* status bits for INSN_CONFIG_GET_COUNTER_STATUS */
enum comedi_counter_status_flags { enum comedi_counter_status_flags {
COMEDI_COUNTER_ARMED = 0x1, COMEDI_COUNTER_ARMED = 0x1,
COMEDI_COUNTER_COUNTING = 0x2, COMEDI_COUNTER_COUNTING = 0x2,
COMEDI_COUNTER_TERMINAL_COUNT = 0x4, 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 {
NI_CDIO_SCAN_BEGIN_SRC_GROUND = 0,
NI_CDIO_SCAN_BEGIN_SRC_AI_START = 18,
NI_CDIO_SCAN_BEGIN_SRC_AI_CONVERT = 19,
NI_CDIO_SCAN_BEGIN_SRC_PXI_STAR_TRIGGER = 20,
NI_CDIO_SCAN_BEGIN_SRC_G0_OUT = 28,
NI_CDIO_SCAN_BEGIN_SRC_G1_OUT = 29,
NI_CDIO_SCAN_BEGIN_SRC_ANALOG_TRIGGER = 30,
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)
{
return NI_USUAL_PFI_SELECT(pfi_channel);
}
static inline unsigned NI_CDIO_SCAN_BEGIN_SRC_RTSI(unsigned rtsi_channel)
{
return NI_USUAL_RTSI_SELECT(rtsi_channel);
}
/* Clock sources for CDIO subdevice on NI m-series boards. /* scan_begin_src for scan_begin_arg==TRIG_EXT with analog output command on NI
Used as the scan_begin_arg for a comedi_command. These * boards. These scan begin sources can also be bitwise-or'd with CR_INVERT to
sources may also be bitwise-or'd with CR_INVERT to change polarity. */ * change polarity. */
enum ni_m_series_cdio_scan_begin_src { static inline unsigned NI_AO_SCAN_BEGIN_SRC_PFI(unsigned pfi_channel)
NI_CDIO_SCAN_BEGIN_SRC_GROUND = 0, {
NI_CDIO_SCAN_BEGIN_SRC_AI_START = 18, return NI_USUAL_PFI_SELECT(pfi_channel);
NI_CDIO_SCAN_BEGIN_SRC_AI_CONVERT = 19, }
NI_CDIO_SCAN_BEGIN_SRC_PXI_STAR_TRIGGER = 20, static inline unsigned NI_AO_SCAN_BEGIN_SRC_RTSI(unsigned rtsi_channel)
NI_CDIO_SCAN_BEGIN_SRC_G0_OUT = 28, {
NI_CDIO_SCAN_BEGIN_SRC_G1_OUT = 29, return NI_USUAL_RTSI_SELECT(rtsi_channel);
NI_CDIO_SCAN_BEGIN_SRC_ANALOG_TRIGGER = 30, }
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) {
return NI_USUAL_PFI_SELECT(pfi_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) {
return NI_USUAL_PFI_SELECT(pfi_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 /* Bits for setting a clock source with
* INSN_CONFIG_SET_CLOCK_SRC when using NI frequency output subdevice. */ * INSN_CONFIG_SET_CLOCK_SRC when using NI frequency output subdevice. */
enum ni_freq_out_clock_source_bits { enum ni_freq_out_clock_source_bits {
NI_FREQ_OUT_TIMEBASE_1_DIV_2_CLOCK_SRC, // 10 MHz NI_FREQ_OUT_TIMEBASE_1_DIV_2_CLOCK_SRC, /* 10 MHz */
NI_FREQ_OUT_TIMEBASE_2_CLOCK_SRC // 100 KHz NI_FREQ_OUT_TIMEBASE_2_CLOCK_SRC /* 100 KHz */
}; };
/* Values for setting a clock source with INSN_CONFIG_SET_CLOCK_SRC for /* Values for setting a clock source with INSN_CONFIG_SET_CLOCK_SRC for
* 8254 counter subdevices on Amplicon DIO boards (amplc_dio200 driver). */ * 8254 counter subdevices on Amplicon DIO boards (amplc_dio200 driver). */
......
drivers/staging/comedi/comedi_compat32.h
View file @ e0dcef71
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
extern long comedi_compat_ioctl(struct file *file, unsigned int cmd, extern long comedi_compat_ioctl(struct file *file, unsigned int cmd,
unsigned long arg); unsigned long arg);
#define comedi_register_ioctl32() do{}while(0) #define comedi_register_ioctl32() do {} while (0)
#define comedi_unregister_ioctl32() do{}while(0) #define comedi_unregister_ioctl32() do {} while (0)
#else /* HAVE_COMPAT_IOCTL */ #else /* HAVE_COMPAT_IOCTL */
...@@ -50,8 +50,8 @@ extern void comedi_unregister_ioctl32(void); ...@@ -50,8 +50,8 @@ extern void comedi_unregister_ioctl32(void);
#else /* CONFIG_COMPAT */ #else /* CONFIG_COMPAT */
#define comedi_compat_ioctl 0 /* NULL */ #define comedi_compat_ioctl 0 /* NULL */
#define comedi_register_ioctl32() do{}while(0) #define comedi_register_ioctl32() do {} while (0)
#define comedi_unregister_ioctl32() do{}while(0) #define comedi_unregister_ioctl32() do {} while (0)
#endif /* CONFIG_COMPAT */ #endif /* CONFIG_COMPAT */
......
drivers/staging/comedi/comedi_fops.h
View file @ e0dcef71
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
extern struct class *comedi_class; extern struct class *comedi_class;
extern const struct file_operations comedi_fops; extern const struct file_operations comedi_fops;
#endif //_COMEDI_FOPS_H #endif /* _COMEDI_FOPS_H */
drivers/staging/comedi/comedi_rt.h
View file @ e0dcef71
...@@ -45,13 +45,13 @@ ...@@ -45,13 +45,13 @@
#ifdef CONFIG_COMEDI_RTL #ifdef CONFIG_COMEDI_RTL
#include <rtl_core.h> #include <rtl_core.h>
#include <rtl_time.h> #include <rtl_time.h>
//#ifdef RTLINUX_VERSION_CODE /* #ifdef RTLINUX_VERSION_CODE */
#include <rtl_sync.h> #include <rtl_sync.h>
//#endif /* #endif */
#define rt_printk rtl_printf #define rt_printk rtl_printf
#endif #endif
#ifdef CONFIG_COMEDI_FUSION #ifdef CONFIG_COMEDI_FUSION
#define rt_printk(format, args...) printk(format , ## args ) #define rt_printk(format, args...) printk(format , ## args)
#endif /* CONFIG_COMEDI_FUSION */ #endif /* CONFIG_COMEDI_FUSION */
#ifdef CONFIG_PRIORITY_IRQ #ifdef CONFIG_PRIORITY_IRQ
#define rt_printk printk #define rt_printk printk
...@@ -59,27 +59,27 @@ ...@@ -59,27 +59,27 @@
int comedi_request_irq(unsigned int irq, irqreturn_t(*handler) (int, int comedi_request_irq(unsigned int irq, irqreturn_t(*handler) (int,
void *PT_REGS_ARG), unsigned long flags, const char *device, void *PT_REGS_ARG), unsigned long flags, const char *device,
comedi_device * dev_id); comedi_device *dev_id);
void comedi_free_irq(unsigned int irq, comedi_device * dev_id); void comedi_free_irq(unsigned int irq, comedi_device *dev_id);
void comedi_rt_init(void); void comedi_rt_init(void);
void comedi_rt_cleanup(void); void comedi_rt_cleanup(void);
int comedi_switch_to_rt(comedi_device * dev); int comedi_switch_to_rt(comedi_device *dev);
void comedi_switch_to_non_rt(comedi_device * dev); void comedi_switch_to_non_rt(comedi_device *dev);
void comedi_rt_pend_wakeup(wait_queue_head_t * q); void comedi_rt_pend_wakeup(wait_queue_head_t *q);
extern int rt_pend_call(void (*func) (int arg1, void *arg2), int arg1, extern int rt_pend_call(void (*func) (int arg1, void *arg2), int arg1,
void *arg2); void *arg2);
#else #else
#define comedi_request_irq(a,b,c,d,e) request_irq(a,b,c,d,e) #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_free_irq(a, b) free_irq(a, b)
#define comedi_rt_init() do{}while(0) #define comedi_rt_init() do {} while (0)
#define comedi_rt_cleanup() do{}while(0) #define comedi_rt_cleanup() do {} while (0)
#define comedi_switch_to_rt(a) (-1) #define comedi_switch_to_rt(a) (-1)
#define comedi_switch_to_non_rt(a) do{}while(0) #define comedi_switch_to_non_rt(a) do {} while (0)
#define comedi_rt_pend_wakeup(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 #endif
...@@ -89,7 +89,7 @@ extern int rt_pend_call(void (*func) (int arg1, void *arg2), int arg1, ...@@ -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) \ #define comedi_spin_lock_irqsave(lock_ptr, flags) \
(flags = __comedi_spin_lock_irqsave(lock_ptr)) (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; unsigned long flags;
...@@ -112,7 +112,7 @@ static inline unsigned long __comedi_spin_lock_irqsave(spinlock_t * lock_ptr) ...@@ -112,7 +112,7 @@ static inline unsigned long __comedi_spin_lock_irqsave(spinlock_t * lock_ptr)
return flags; 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) unsigned long flags)
{ {
......
drivers/staging/comedi/comedidev.h
View file @ e0dcef71
...@@ -39,17 +39,18 @@ ...@@ -39,17 +39,18 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <asm/uaccess.h> #include <linux/uaccess.h>
#include <asm/io.h> #include <linux/io.h>
#include "comedi.h" #include "comedi.h"
#define DPRINTK(format, args...) do{ \ #define DPRINTK(format, args...) do { \
if(comedi_debug)printk("comedi: " format , ## args ); \ if (comedi_debug) \
} while(0) printk(KERN_DEBUG "comedi: " format , ## args); \
} while (0)
#define COMEDI_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) #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_CODE COMEDI_VERSION(COMEDI_MAJORVERSION, COMEDI_MINORVERSION, COMEDI_MICROVERSION)
#define COMEDI_RELEASE VERSION #define COMEDI_RELEASE VERSION
#define COMEDI_INITCLEANUP_NOMODULE(x) \ #define COMEDI_INITCLEANUP_NOMODULE(x) \
...@@ -82,21 +83,22 @@ ...@@ -82,21 +83,22 @@
static struct pci_driver comedi_driver ## _pci_driver = \ static struct pci_driver comedi_driver ## _pci_driver = \
{ \ { \
.id_table = pci_id_table, \ .id_table = pci_id_table, \
.probe = & comedi_driver ## _pci_probe, \ .probe = &comedi_driver ## _pci_probe, \
.remove = __devexit_p(& comedi_driver ## _pci_remove) \ .remove = __devexit_p(&comedi_driver ## _pci_remove) \
}; \ }; \
static int __init comedi_driver ## _init_module(void) \ static int __init comedi_driver ## _init_module(void) \
{ \ { \
int retval; \ int retval; \
retval = comedi_driver_register(& comedi_driver); \ retval = comedi_driver_register(&comedi_driver); \
if(retval < 0) return retval; \ if (retval < 0) \
comedi_driver ## _pci_driver.name = (char*)comedi_driver.driver_name; \ return retval; \
return pci_register_driver(& comedi_driver ## _pci_driver); \ 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) \ static void __exit comedi_driver ## _cleanup_module(void) \
{ \ { \
pci_unregister_driver(& comedi_driver ## _pci_driver); \ pci_unregister_driver(&comedi_driver ## _pci_driver); \
comedi_driver_unregister(& comedi_driver); \ comedi_driver_unregister(&comedi_driver); \
} \ } \
module_init(comedi_driver ## _init_module); \ module_init(comedi_driver ## _init_module); \
module_exit(comedi_driver ## _cleanup_module); module_exit(comedi_driver ## _cleanup_module);
...@@ -177,14 +179,14 @@ struct comedi_subdevice_struct { ...@@ -177,14 +179,14 @@ struct comedi_subdevice_struct {
int (*do_cmdtest) (comedi_device *, comedi_subdevice *, comedi_cmd *); int (*do_cmdtest) (comedi_device *, comedi_subdevice *, comedi_cmd *);
int (*poll) (comedi_device *, comedi_subdevice *); int (*poll) (comedi_device *, comedi_subdevice *);
int (*cancel) (comedi_device *, comedi_subdevice *); int (*cancel) (comedi_device *, comedi_subdevice *);
//int (*do_lock)(comedi_device *,comedi_subdevice *); /* int (*do_lock)(comedi_device *,comedi_subdevice *); */
//int (*do_unlock)(comedi_device *,comedi_subdevice *); /* int (*do_unlock)(comedi_device *,comedi_subdevice *); */
/* called when the buffer changes */ /* 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); 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); unsigned int num_bytes, unsigned int start_chan_index);
enum dma_data_direction async_dma_dir; enum dma_data_direction async_dma_dir;
...@@ -234,13 +236,13 @@ struct comedi_async_struct { ...@@ -234,13 +236,13 @@ struct comedi_async_struct {
wait_queue_head_t wait_head; wait_queue_head_t wait_head;
// callback stuff /* callback stuff */
unsigned int cb_mask; unsigned int cb_mask;
int (*cb_func) (unsigned int flags, void *); int (*cb_func) (unsigned int flags, void *);
void *cb_arg; void *cb_arg;
int (*inttrig) (comedi_device * dev, comedi_subdevice * s, int (*inttrig) (comedi_device *dev, comedi_subdevice *s,
unsigned int x); unsigned int x);
}; };
struct comedi_driver_struct { struct comedi_driver_struct {
...@@ -265,8 +267,9 @@ struct comedi_device_struct { ...@@ -265,8 +267,9 @@ struct comedi_device_struct {
device_create_result_type *class_dev; device_create_result_type *class_dev;
int minor; int minor;
/* hw_dev is passed to dma_alloc_coherent when allocating async buffers for subdevices /* hw_dev is passed to dma_alloc_coherent when allocating async buffers
that have async_dma_dir set to something other than DMA_NONE */ * for subdevices that have async_dma_dir set to something other than
* DMA_NONE */
struct device *hw_dev; struct device *hw_dev;
const char *board_name; const char *board_name;
...@@ -289,8 +292,8 @@ struct comedi_device_struct { ...@@ -289,8 +292,8 @@ struct comedi_device_struct {
struct fasync_struct *async_queue; struct fasync_struct *async_queue;
void (*open) (comedi_device * dev); void (*open) (comedi_device *dev);
void (*close) (comedi_device * dev); void (*close) (comedi_device *dev);
}; };
struct comedi_device_file_info { struct comedi_device_file_info {
...@@ -302,15 +305,15 @@ struct comedi_device_file_info { ...@@ -302,15 +305,15 @@ struct comedi_device_file_info {
#ifdef CONFIG_COMEDI_DEBUG #ifdef CONFIG_COMEDI_DEBUG
extern int comedi_debug; extern int comedi_debug;
#else #else
static const int comedi_debug = 0; static const int comedi_debug;
#endif #endif
/* /*
* function prototypes * function prototypes
*/ */
void comedi_event(comedi_device * dev, comedi_subdevice * s); void comedi_event(comedi_device *dev, comedi_subdevice *s);
void comedi_error(const comedi_device * dev, const char *s); void comedi_error(const comedi_device *dev, const char *s);
/* we can expand the number of bits used to encode devices/subdevices into /* 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 the minor number soon, after more distros support > 8 bit minor numbers
...@@ -322,24 +325,30 @@ enum comedi_minor_bits { ...@@ -322,24 +325,30 @@ enum comedi_minor_bits {
static const unsigned COMEDI_SUBDEVICE_MINOR_SHIFT = 4; static const unsigned COMEDI_SUBDEVICE_MINOR_SHIFT = 4;
static const unsigned COMEDI_SUBDEVICE_MINOR_OFFSET = 1; 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->read_subdevice)
if(info->device == NULL) return NULL; return info->read_subdevice;
if (info->device == NULL)
return NULL;
return info->device->read_subdev; 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->write_subdevice)
if(info->device == NULL) return NULL; return info->write_subdevice;
if (info->device == NULL)
return NULL;
return info->device->write_subdev; return info->device->write_subdev;
} }
void comedi_device_detach(comedi_device * dev); void comedi_device_detach(comedi_device *dev);
int comedi_device_attach(comedi_device * dev, comedi_devconfig * it); int comedi_device_attach(comedi_device *dev, comedi_devconfig *it);
int comedi_driver_register(comedi_driver *); int comedi_driver_register(comedi_driver *);
int comedi_driver_unregister(comedi_driver *); int comedi_driver_unregister(comedi_driver *);
...@@ -348,7 +357,7 @@ void cleanup_polling(void); ...@@ -348,7 +357,7 @@ void cleanup_polling(void);
void start_polling(comedi_device *); void start_polling(comedi_device *);
void stop_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); new_size);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
...@@ -367,7 +376,8 @@ static inline void comedi_proc_cleanup(void) ...@@ -367,7 +376,8 @@ static inline void comedi_proc_cleanup(void)
enum subdevice_runflags { enum subdevice_runflags {
SRF_USER = 0x00000001, SRF_USER = 0x00000001,
SRF_RT = 0x00000002, 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_ERROR = 0x00000004,
SRF_RUNNING = 0x08000000 SRF_RUNNING = 0x08000000
}; };
...@@ -376,22 +386,22 @@ enum subdevice_runflags { ...@@ -376,22 +386,22 @@ enum subdevice_runflags {
various internal comedi functions various internal comedi functions
*/ */
int do_rangeinfo_ioctl(comedi_device * dev, comedi_rangeinfo * arg); int do_rangeinfo_ioctl(comedi_device *dev, comedi_rangeinfo *arg);
int check_chanlist(comedi_subdevice * s, int n, unsigned int *chanlist); int check_chanlist(comedi_subdevice *s, int n, unsigned int *chanlist);
void comedi_set_subdevice_runflags(comedi_subdevice * s, unsigned mask, void comedi_set_subdevice_runflags(comedi_subdevice *s, unsigned mask,
unsigned bits); unsigned bits);
unsigned comedi_get_subdevice_runflags(comedi_subdevice * s); unsigned comedi_get_subdevice_runflags(comedi_subdevice *s);
int insn_inval(comedi_device * dev, comedi_subdevice * s, int insn_inval(comedi_device *dev, comedi_subdevice *s,
comedi_insn * insn, lsampl_t * data); comedi_insn *insn, lsampl_t *data);
/* range stuff */ /* range stuff */
#define RANGE(a,b) {(a)*1e6,(b)*1e6,0} #define RANGE(a, b) {(a)*1e6, (b)*1e6, 0}
#define RANGE_ext(a,b) {(a)*1e6,(b)*1e6,RF_EXTERNAL} #define RANGE_ext(a, b) {(a)*1e6, (b)*1e6, RF_EXTERNAL}
#define RANGE_mA(a,b) {(a)*1e6,(b)*1e6,UNIT_mA} #define RANGE_mA(a, b) {(a)*1e6, (b)*1e6, UNIT_mA}
#define RANGE_unitless(a,b) {(a)*1e6,(b)*1e6,0} /* XXX */ #define RANGE_unitless(a, b) {(a)*1e6, (b)*1e6, 0} /* XXX */
#define BIP_RANGE(a) {-(a)*1e6,(a)*1e6,0} #define BIP_RANGE(a) {-(a)*1e6, (a)*1e6, 0}
#define UNI_RANGE(a) {0,(a)*1e6,0} #define UNI_RANGE(a) {0, (a)*1e6, 0}
extern const comedi_lrange range_bipolar10; extern const comedi_lrange range_bipolar10;
extern const comedi_lrange range_bipolar5; extern const comedi_lrange range_bipolar5;
...@@ -415,8 +425,8 @@ struct comedi_lrange_struct { ...@@ -415,8 +425,8 @@ struct comedi_lrange_struct {
/* some silly little inline functions */ /* 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 int num_subdevices)
{ {
unsigned i; unsigned i;
...@@ -434,7 +444,7 @@ static inline int alloc_subdevices(comedi_device * dev, ...@@ -434,7 +444,7 @@ static inline int alloc_subdevices(comedi_device * dev,
return 0; 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); dev->private = kzalloc(size, GFP_KERNEL);
if (!dev->private) if (!dev->private)
...@@ -442,7 +452,7 @@ static inline int alloc_private(comedi_device * dev, int size) ...@@ -442,7 +452,7 @@ static inline int alloc_private(comedi_device * dev, int size)
return 0; 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) if (subd->subdev_flags & SDF_LSAMPL)
return sizeof(lsampl_t); return sizeof(lsampl_t);
...@@ -452,11 +462,11 @@ static inline unsigned int bytes_per_sample(const comedi_subdevice * subd) ...@@ -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 /* must be used in attach to set dev->hw_dev if you wish to dma directly
into comedi's buffer */ 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); put_device(dev->hw_dev);
}
dev->hw_dev = hw_dev; dev->hw_dev = hw_dev;
if (dev->hw_dev) { if (dev->hw_dev) {
dev->hw_dev = get_device(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) ...@@ -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_put(comedi_async *async, sampl_t x);
int comedi_buf_get(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_n_available(comedi_async *async);
unsigned int comedi_buf_write_alloc(comedi_async * async, unsigned int nbytes); 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_alloc_strict(comedi_async *async,
unsigned int nbytes); unsigned int nbytes);
unsigned comedi_buf_write_free(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_alloc(comedi_async *async, unsigned nbytes);
unsigned comedi_buf_read_free(comedi_async * async, unsigned int nbytes); unsigned comedi_buf_read_free(comedi_async *async, unsigned int nbytes);
unsigned int comedi_buf_read_n_available(comedi_async * async); unsigned int comedi_buf_read_n_available(comedi_async *async);
void comedi_buf_memcpy_to(comedi_async * async, unsigned int offset, void comedi_buf_memcpy_to(comedi_async *async, unsigned int offset,
const void *source, unsigned int num_bytes); 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); 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; 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; 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) static inline void *comedi_aux_data(int options[], int n)
{ {
...@@ -522,8 +532,6 @@ void comedi_free_subdevice_minor(comedi_subdevice *s); ...@@ -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); int comedi_pci_auto_config(struct pci_dev *pcidev, const char *board_name);
void comedi_pci_auto_unconfig(struct pci_dev *pcidev); void comedi_pci_auto_unconfig(struct pci_dev *pcidev);
//#ifdef CONFIG_COMEDI_RT
#include "comedi_rt.h" #include "comedi_rt.h"
//#endif
#endif /* _COMEDIDEV_H */ #endif /* _COMEDIDEV_H */
drivers/staging/comedi/comedilib.h
View file @ e0dcef71
...@@ -41,13 +41,13 @@ typedef void comedi_t; ...@@ -41,13 +41,13 @@ typedef void comedi_t;
/* these functions may not be called at real-time priority */ /* these functions may not be called at real-time priority */
comedi_t *comedi_open(const char *path); 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 /* these functions may be called at any priority, but may fail at
real-time priority */ real-time priority */
int comedi_lock(comedi_t * dev, unsigned int subdev); int comedi_lock(comedi_t *dev, unsigned int subdev);
int comedi_unlock(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 /* these functions may be called at any priority, but you must hold
the lock for the subdevice */ the lock for the subdevice */
...@@ -56,68 +56,68 @@ int comedi_loglevel(int loglevel); ...@@ -56,68 +56,68 @@ int comedi_loglevel(int loglevel);
void comedi_perror(const char *s); void comedi_perror(const char *s);
char *comedi_strerror(int errnum); char *comedi_strerror(int errnum);
int comedi_errno(void); 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_cancel(comedi_t *dev, unsigned int subdev);
int comedi_register_callback(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); unsigned int mask, int (*cb) (unsigned int, void *), void *arg);
int comedi_command(comedi_t * dev, comedi_cmd * cmd); int comedi_command(comedi_t *dev, comedi_cmd *cmd);
int comedi_command_test(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_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_data_write(comedi_t *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_data_read(comedi_t * dev, unsigned int subdev, unsigned int chan, int comedi_data_read(comedi_t *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_data_read_hint(comedi_t * dev, unsigned int subdev, int comedi_data_read_hint(comedi_t *dev, unsigned int subdev,
unsigned int chan, unsigned int range, unsigned int aref); 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, unsigned int chan, unsigned int range, unsigned int aref,
lsampl_t * data, unsigned int nano_sec); lsampl_t *data, unsigned int nano_sec);
int comedi_dio_config(comedi_t * dev, unsigned int subdev, unsigned int chan, int comedi_dio_config(comedi_t *dev, unsigned int subdev, unsigned int chan,
unsigned int io); 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); 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); 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); unsigned int *bits);
int comedi_get_n_subdevices(comedi_t * dev); int comedi_get_n_subdevices(comedi_t *dev);
int comedi_get_version_code(comedi_t * dev); int comedi_get_version_code(comedi_t *dev);
const char *comedi_get_driver_name(comedi_t * dev); const char *comedi_get_driver_name(comedi_t *dev);
const char *comedi_get_board_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_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_find_subdevice_by_type(comedi_t *dev, int type, unsigned int subd);
int comedi_get_n_channels(comedi_t * dev, unsigned int subdevice); int comedi_get_n_channels(comedi_t *dev, unsigned int subdevice);
lsampl_t comedi_get_maxdata(comedi_t * dev, unsigned int subdevice, unsigned lsampl_t comedi_get_maxdata(comedi_t *dev, unsigned int subdevice, unsigned
int chan); 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); chan);
int comedi_do_insn(comedi_t * dev, comedi_insn * insn); int comedi_do_insn(comedi_t *dev, comedi_insn *insn);
int comedi_poll(comedi_t * dev, unsigned int subdev); int comedi_poll(comedi_t *dev, unsigned int subdev);
/* DEPRECATED functions */ /* 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); unsigned int chan);
/* ALPHA functions */ /* ALPHA functions */
unsigned int comedi_get_subdevice_flags(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_len_chanlist(comedi_t *dev, unsigned int subdevice);
int comedi_get_krange(comedi_t * dev, unsigned int subdevice, unsigned int int comedi_get_krange(comedi_t *dev, 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(comedi_t * dev, unsigned int subdevice); 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, int comedi_set_user_int_count(comedi_t *dev, unsigned int subdevice,
unsigned int buf_user_count); unsigned int buf_user_count);
int comedi_map(comedi_t * dev, unsigned int subdev, void *ptr); int comedi_map(comedi_t *dev, unsigned int subdev, void *ptr);
int comedi_unmap(comedi_t * dev, unsigned int subdev); int comedi_unmap(comedi_t *dev, unsigned int subdev);
int comedi_get_buffer_size(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_mark_buffer_read(comedi_t *dev, unsigned int subdevice,
unsigned int num_bytes); 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); unsigned int num_bytes);
int comedi_get_buffer_contents(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); int comedi_get_buffer_offset(comedi_t *dev, unsigned int subdevice);
#else #else
...@@ -139,14 +139,14 @@ int comedi_cancel(unsigned int minor, unsigned int subdev); ...@@ -139,14 +139,14 @@ int comedi_cancel(unsigned int minor, unsigned int subdev);
int comedi_register_callback(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); unsigned int mask, int (*cb) (unsigned int, void *), void *arg);
int comedi_command(unsigned int minor, comedi_cmd * cmd); int comedi_command(unsigned int minor, comedi_cmd *cmd);
int comedi_command_test(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_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, int comedi_data_write(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_data_read(unsigned int dev, unsigned int subdev, unsigned int chan, 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, int comedi_dio_config(unsigned int dev, unsigned int subdev, unsigned int chan,
unsigned int io); unsigned int io);
int comedi_dio_read(unsigned int dev, unsigned int subdev, unsigned int chan, 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 ...@@ -167,7 +167,7 @@ lsampl_t comedi_get_maxdata(unsigned int minor, unsigned int subdevice, unsigned
int chan); int chan);
int comedi_get_n_ranges(unsigned int minor, unsigned int subdevice, unsigned int int comedi_get_n_ranges(unsigned int minor, unsigned int subdevice, unsigned int
chan); 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); int comedi_poll(unsigned int minor, unsigned int subdev);
/* DEPRECATED functions */ /* DEPRECATED functions */
...@@ -179,7 +179,7 @@ unsigned int comedi_get_subdevice_flags(unsigned int minor, unsigned int ...@@ -179,7 +179,7 @@ unsigned int comedi_get_subdevice_flags(unsigned int minor, unsigned int
subdevice); subdevice);
int comedi_get_len_chanlist(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 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 unsigned int comedi_get_buf_head_pos(unsigned int minor, unsigned int
subdevice); subdevice);
int comedi_set_user_int_count(unsigned int minor, unsigned int subdevice, int comedi_set_user_int_count(unsigned int minor, unsigned int subdevice,
......
drivers/staging/comedi/wrapper.h
View file @ e0dcef71
...@@ -19,13 +19,7 @@ ...@@ -19,13 +19,7 @@
#ifndef __COMPAT_LINUX_WRAPPER_H_ #ifndef __COMPAT_LINUX_WRAPPER_H_
#define __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_reserve(p) set_bit(PG_reserved, &((p)->flags))
#define mem_map_unreserve(p) clear_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_ */ #endif /* __COMPAT_LINUX_WRAPPER_H_ */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7