X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fstaging%2Fcomedi%2Fdrivers%2Fcb_pcidas.c;h=1dcf7dde78ee897ae17ae49aec401ab3207b75b0;hb=9ced1de69125b60f40127eddaa3be2a92bb0a1df;hp=aa431466053eb3353d5665cb33805a54c980f67c;hpb=34c43922e62708d45e9660eee4b4f1fb7b4bf2c7;p=pandora-kernel.git diff --git a/drivers/staging/comedi/drivers/cb_pcidas.c b/drivers/staging/comedi/drivers/cb_pcidas.c index aa431466053e..1dcf7dde78ee 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas.c +++ b/drivers/staging/comedi/drivers/cb_pcidas.c @@ -196,7 +196,7 @@ static inline unsigned int DAC_DATA_REG(unsigned int channel) // bit in hexadecimal representation of range index that indicates unipolar input range #define IS_UNIPOLAR 0x4 // analog input ranges for most boards -static const comedi_lrange cb_pcidas_ranges = { +static const struct comedi_lrange cb_pcidas_ranges = { 8, { BIP_RANGE(10), @@ -211,7 +211,7 @@ static const comedi_lrange cb_pcidas_ranges = { }; // pci-das1001 input ranges -static const comedi_lrange cb_pcidas_alt_ranges = { +static const struct comedi_lrange cb_pcidas_alt_ranges = { 8, { BIP_RANGE(10), @@ -226,7 +226,7 @@ static const comedi_lrange cb_pcidas_alt_ranges = { }; // analog output ranges -static const comedi_lrange cb_pcidas_ao_ranges = { +static const struct comedi_lrange cb_pcidas_ao_ranges = { 4, { BIP_RANGE(5), @@ -252,7 +252,7 @@ typedef struct cb_pcidas_board_struct { int has_ao_fifo; // analog output has fifo int ao_scan_speed; // analog output speed for 1602 series (for a scan, not conversion) int fifo_size; // number of samples fifo can hold - const comedi_lrange *ranges; + const struct comedi_lrange *ranges; enum trimpot_model trimpot; unsigned has_dac08:1; } cb_pcidas_board; @@ -435,21 +435,21 @@ typedef struct { #define devpriv ((cb_pcidas_private *)dev->private) /* - * The comedi_driver structure tells the Comedi core module + * The struct comedi_driver structure tells the Comedi core module * which functions to call to configure/deconfigure (attach/detach) * the board, and also about the kernel module that contains * the device code. */ static int cb_pcidas_attach(struct comedi_device * dev, comedi_devconfig * it); static int cb_pcidas_detach(struct comedi_device * dev); -static comedi_driver driver_cb_pcidas = { +static struct comedi_driver driver_cb_pcidas = { driver_name:"cb_pcidas", module:THIS_MODULE, attach:cb_pcidas_attach, detach:cb_pcidas_detach, }; -static int cb_pcidas_ai_rinsn(struct comedi_device * dev, struct comedi_subdevice * s, +static int cb_pcidas_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); static int ai_config_insn(struct comedi_device * dev, struct comedi_subdevice * s, comedi_insn * insn, unsigned int * data); @@ -463,8 +463,9 @@ static int cb_pcidas_ai_cmd(struct comedi_device * dev, struct comedi_subdevice static int cb_pcidas_ai_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, comedi_cmd * cmd); static int cb_pcidas_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s); -static int cb_pcidas_ao_inttrig(struct comedi_device * dev, struct comedi_subdevice * subdev, - unsigned int trig_num); +static int cb_pcidas_ao_inttrig(struct comedi_device *dev, + struct comedi_subdevice *subdev, + unsigned int trig_num); static int cb_pcidas_ao_cmdtest(struct comedi_device * dev, struct comedi_subdevice * s, comedi_cmd * cmd); static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG); @@ -1164,7 +1165,7 @@ static int cb_pcidas_ai_cmdtest(struct comedi_device * dev, struct comedi_subdev static int cb_pcidas_ai_cmd(struct comedi_device * dev, struct comedi_subdevice * s) { - comedi_async *async = s->async; + struct comedi_async *async = s->async; comedi_cmd *cmd = &async->cmd; unsigned int bits; unsigned long flags; @@ -1364,7 +1365,7 @@ static int cb_pcidas_ao_cmdtest(struct comedi_device * dev, struct comedi_subdev static int cb_pcidas_ao_cmd(struct comedi_device * dev, struct comedi_subdevice * s) { - comedi_async *async = s->async; + struct comedi_async *async = s->async; comedi_cmd *cmd = &async->cmd; unsigned int i; unsigned long flags; @@ -1425,11 +1426,12 @@ static int cb_pcidas_ao_cmd(struct comedi_device * dev, struct comedi_subdevice return 0; } -static int cb_pcidas_ao_inttrig(struct comedi_device * dev, struct comedi_subdevice * s, - unsigned int trig_num) +static int cb_pcidas_ao_inttrig(struct comedi_device *dev, + struct comedi_subdevice *s, + unsigned int trig_num) { unsigned int num_bytes, num_points = thisboard->fifo_size; - comedi_async *async = s->async; + struct comedi_async *async = s->async; comedi_cmd *cmd = &s->async->cmd; unsigned long flags; @@ -1478,7 +1480,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG) { struct comedi_device *dev = (struct comedi_device *) d; struct comedi_subdevice *s = dev->read_subdev; - comedi_async *async; + struct comedi_async *async; int status, s5933_status; int half_fifo = thisboard->fifo_size / 2; unsigned int num_samples, i; @@ -1589,7 +1591,7 @@ static irqreturn_t cb_pcidas_interrupt(int irq, void *d PT_REGS_ARG) static void handle_ao_interrupt(struct comedi_device * dev, unsigned int status) { struct comedi_subdevice *s = dev->write_subdev; - comedi_async *async = s->async; + struct comedi_async *async = s->async; comedi_cmd *cmd = &async->cmd; unsigned int half_fifo = thisboard->fifo_size / 2; unsigned int num_points; @@ -1642,7 +1644,7 @@ static void handle_ao_interrupt(struct comedi_device * dev, unsigned int status) comedi_event(dev, s); } -// cancel analog input command +/* cancel analog input command */ static int cb_pcidas_cancel(struct comedi_device * dev, struct comedi_subdevice * s) { unsigned long flags; @@ -1661,8 +1663,9 @@ static int cb_pcidas_cancel(struct comedi_device * dev, struct comedi_subdevice return 0; } -// cancel analog output command -static int cb_pcidas_ao_cancel(struct comedi_device * dev, struct comedi_subdevice * s) +/* cancel analog output command */ +static int cb_pcidas_ao_cancel(struct comedi_device *dev, + struct comedi_subdevice *s) { unsigned long flags;