diff options
Diffstat (limited to 'drivers/staging/comedi/drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/addi_apci_3xxx.c | 4 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pci224.c | 24 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/amplc_pci230.c | 12 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/cb_pcidas64.c | 6 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/comedi_test.c | 8 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.c | 330 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.h | 18 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_atmio.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_usb6501.c | 2 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers/s626.c | 50 |
10 files changed, 233 insertions, 223 deletions
diff --git a/drivers/staging/comedi/drivers/addi_apci_3xxx.c b/drivers/staging/comedi/drivers/addi_apci_3xxx.c index b6af3eb..be1f613 100644 --- a/drivers/staging/comedi/drivers/addi_apci_3xxx.c +++ b/drivers/staging/comedi/drivers/addi_apci_3xxx.c @@ -502,7 +502,7 @@ static int apci3xxx_ai_ns_to_timer(struct comedi_device *dev, timer = *ns / base; break; case CMDF_ROUND_UP: - timer = (*ns + base - 1) / base; + timer = DIV_ROUND_UP(*ns, base); break; } @@ -787,6 +787,8 @@ static int apci3xxx_auto_attach(struct comedi_device *dev, dev->iobase = pci_resource_start(pcidev, 2); dev->mmio = pci_ioremap_bar(pcidev, 3); + if (!dev->mmio) + return -ENOMEM; if (pcidev->irq > 0) { ret = request_irq(pcidev->irq, apci3xxx_irq_handler, diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c index 2e6decf..4e55494 100644 --- a/drivers/staging/comedi/drivers/amplc_pci224.c +++ b/drivers/staging/comedi/drivers/amplc_pci224.c @@ -206,8 +206,11 @@ #define CLK_1KHZ 5 /* internal 1 kHz clock */ #define CLK_OUTNM1 6 /* output of channel-1 modulo total */ #define CLK_EXT 7 /* external clock */ -/* Macro to construct clock input configuration register value. */ -#define CLK_CONFIG(chan, src) ((((chan) & 3) << 3) | ((src) & 7)) + +static unsigned int pci224_clk_config(unsigned int chan, unsigned int src) +{ + return ((chan & 3) << 3) | (src & 7); +} /* * Counter/timer gate input configuration sources. @@ -216,8 +219,11 @@ #define GAT_GND 1 /* GND (i.e. disabled) */ #define GAT_EXT 2 /* reserved (external gate input) */ #define GAT_NOUTNM2 3 /* inverted output of channel-2 modulo total */ -/* Macro to construct gate input configuration register value. */ -#define GAT_CONFIG(chan, src) ((((chan) & 3) << 3) | ((src) & 7)) + +static unsigned int pci224_gat_config(unsigned int chan, unsigned int src) +{ + return ((chan & 3) << 3) | (src & 7); +} /* * Summary of CLK_OUTNM1 and GAT_NOUTNM2 connections for PCI224 and PCI234: @@ -817,14 +823,16 @@ static void pci224_ao_start_pacer(struct comedi_device *dev, * source. */ /* Make sure Z2-0 is gated on. */ - outb(GAT_CONFIG(0, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE); + outb(pci224_gat_config(0, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE); /* Cascading with Z2-2. */ /* Make sure Z2-2 is gated on. */ - outb(GAT_CONFIG(2, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE); + outb(pci224_gat_config(2, GAT_VCC), devpriv->iobase1 + PCI224_ZGAT_SCE); /* Z2-2 needs 10 MHz clock. */ - outb(CLK_CONFIG(2, CLK_10MHZ), devpriv->iobase1 + PCI224_ZCLK_SCE); + outb(pci224_clk_config(2, CLK_10MHZ), + devpriv->iobase1 + PCI224_ZCLK_SCE); /* Z2-0 is clocked from Z2-2's output. */ - outb(CLK_CONFIG(0, CLK_OUTNM1), devpriv->iobase1 + PCI224_ZCLK_SCE); + outb(pci224_clk_config(0, CLK_OUTNM1), + devpriv->iobase1 + PCI224_ZCLK_SCE); comedi_8254_pacer_enable(dev->pacer, 2, 0, false); } diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c index 42945de..48c7890 100644 --- a/drivers/staging/comedi/drivers/amplc_pci230.c +++ b/drivers/staging/comedi/drivers/amplc_pci230.c @@ -376,8 +376,11 @@ #define CLK_1KHZ 5 /* internal 1 kHz clock */ #define CLK_OUTNM1 6 /* output of channel-1 modulo total */ #define CLK_EXT 7 /* external clock */ -/* Macro to construct clock input configuration register value. */ -#define CLK_CONFIG(chan, src) ((((chan) & 3) << 3) | ((src) & 7)) + +static unsigned int pci230_clk_config(unsigned int chan, unsigned int src) +{ + return ((chan & 3) << 3) | (src & 7); +} /* * Counter/timer gate input configuration sources. @@ -387,8 +390,7 @@ #define GAT_EXT 2 /* external gate input (PPCn on PCI230) */ #define GAT_NOUTNM2 3 /* inverted output of channel-2 modulo total */ -static inline unsigned int pci230_gat_config(unsigned int chan, - unsigned int src) +static unsigned int pci230_gat_config(unsigned int chan, unsigned int src) { return ((chan & 3) << 3) | (src & 7); } @@ -698,7 +700,7 @@ static void pci230_ct_setup_ns_mode(struct comedi_device *dev, unsigned int ct, /* Determine clock source and count. */ clk_src = pci230_choose_clk_count(ns, &count, flags); /* Program clock source. */ - outb(CLK_CONFIG(ct, clk_src), dev->iobase + PCI230_ZCLK_SCE); + outb(pci230_clk_config(ct, clk_src), dev->iobase + PCI230_ZCLK_SCE); /* Set initial count. */ if (count >= 65536) count = 0; diff --git a/drivers/staging/comedi/drivers/cb_pcidas64.c b/drivers/staging/comedi/drivers/cb_pcidas64.c index efbf277..b761f00 100644 --- a/drivers/staging/comedi/drivers/cb_pcidas64.c +++ b/drivers/staging/comedi/drivers/cb_pcidas64.c @@ -1417,9 +1417,7 @@ static int set_ai_fifo_size(struct comedi_device *dev, unsigned int num_samples) if (retval < 0) return retval; - num_samples = retval * fifo->num_segments * fifo->sample_packing_ratio; - - return num_samples; + return retval * fifo->num_segments * fifo->sample_packing_ratio; } /* query length of fifo */ @@ -2007,7 +2005,7 @@ static unsigned int get_divisor(unsigned int ns, unsigned int flags) switch (flags & CMDF_ROUND_MASK) { case CMDF_ROUND_UP: - divisor = (ns + TIMER_BASE - 1) / TIMER_BASE; + divisor = DIV_ROUND_UP(ns, TIMER_BASE); break; case CMDF_ROUND_DOWN: divisor = ns / TIMER_BASE; diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c index 2a063f0..ccfd642 100644 --- a/drivers/staging/comedi/drivers/comedi_test.c +++ b/drivers/staging/comedi/drivers/comedi_test.c @@ -480,11 +480,11 @@ static void waveform_ao_timer(unsigned long arg) /* output the last scan */ for (i = 0; i < cmd->scan_end_arg; i++) { unsigned int chan = CR_CHAN(cmd->chanlist[i]); + unsigned short *pd; - if (comedi_buf_read_samples(s, - &devpriv-> - ao_loopbacks[chan], - 1) == 0) { + pd = &devpriv->ao_loopbacks[chan]; + + if (!comedi_buf_read_samples(s, pd, 1)) { /* unexpected underrun! (cancelled?) */ async->events |= COMEDI_CB_OVERFLOW; goto underrun; diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index 70390de..f1c2a20 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c @@ -95,27 +95,30 @@ struct jr3_pci_poll_delay { }; struct jr3_pci_dev_private { - struct jr3_t __iomem *iobase; struct timer_list timer; }; +union jr3_pci_single_range { + struct comedi_lrange l; + char _reserved[offsetof(struct comedi_lrange, range[1])]; +}; + +enum jr3_pci_poll_state { + state_jr3_poll, + state_jr3_init_wait_for_offset, + state_jr3_init_transform_complete, + state_jr3_init_set_full_scale_complete, + state_jr3_init_use_offset_complete, + state_jr3_done +}; + struct jr3_pci_subdev_private { - struct jr3_channel __iomem *channel; + struct jr3_sensor __iomem *sensor; unsigned long next_time_min; - unsigned long next_time_max; - enum { state_jr3_poll, - state_jr3_init_wait_for_offset, - state_jr3_init_transform_complete, - state_jr3_init_set_full_scale_complete, - state_jr3_init_use_offset_complete, - state_jr3_done - } state; + enum jr3_pci_poll_state state; int serial_no; int model_no; - struct { - int length; - struct comedi_krange range; - } range[9]; + union jr3_pci_single_range range[9]; const struct comedi_lrange *range_table_list[8 * 7 + 2]; unsigned int maxdata_list[8 * 7 + 2]; u16 errors; @@ -131,43 +134,43 @@ static struct jr3_pci_poll_delay poll_delay_min_max(int min, int max) return result; } -static int is_complete(struct jr3_channel __iomem *channel) +static int is_complete(struct jr3_sensor __iomem *sensor) { - return get_s16(&channel->command_word0) == 0; + return get_s16(&sensor->command_word0) == 0; } -static void set_transforms(struct jr3_channel __iomem *channel, - struct jr3_pci_transform transf, short num) +static void set_transforms(struct jr3_sensor __iomem *sensor, + const struct jr3_pci_transform *transf, short num) { int i; num &= 0x000f; /* Make sure that 0 <= num <= 15 */ for (i = 0; i < 8; i++) { - set_u16(&channel->transforms[num].link[i].link_type, - transf.link[i].link_type); + set_u16(&sensor->transforms[num].link[i].link_type, + transf->link[i].link_type); udelay(1); - set_s16(&channel->transforms[num].link[i].link_amount, - transf.link[i].link_amount); + set_s16(&sensor->transforms[num].link[i].link_amount, + transf->link[i].link_amount); udelay(1); - if (transf.link[i].link_type == end_x_form) + if (transf->link[i].link_type == end_x_form) break; } } -static void use_transform(struct jr3_channel __iomem *channel, +static void use_transform(struct jr3_sensor __iomem *sensor, short transf_num) { - set_s16(&channel->command_word0, 0x0500 + (transf_num & 0x000f)); + set_s16(&sensor->command_word0, 0x0500 + (transf_num & 0x000f)); } -static void use_offset(struct jr3_channel __iomem *channel, short offset_num) +static void use_offset(struct jr3_sensor __iomem *sensor, short offset_num) { - set_s16(&channel->command_word0, 0x0600 + (offset_num & 0x000f)); + set_s16(&sensor->command_word0, 0x0600 + (offset_num & 0x000f)); } -static void set_offset(struct jr3_channel __iomem *channel) +static void set_offset(struct jr3_sensor __iomem *sensor) { - set_s16(&channel->command_word0, 0x0700); + set_s16(&sensor->command_word0, 0x0700); } struct six_axis_t { @@ -179,43 +182,41 @@ struct six_axis_t { s16 mz; }; -static void set_full_scales(struct jr3_channel __iomem *channel, +static void set_full_scales(struct jr3_sensor __iomem *sensor, struct six_axis_t full_scale) { - set_s16(&channel->full_scale.fx, full_scale.fx); - set_s16(&channel->full_scale.fy, full_scale.fy); - set_s16(&channel->full_scale.fz, full_scale.fz); - set_s16(&channel->full_scale.mx, full_scale.mx); - set_s16(&channel->full_scale.my, full_scale.my); - set_s16(&channel->full_scale.mz, full_scale.mz); - set_s16(&channel->command_word0, 0x0a00); + set_s16(&sensor->full_scale.fx, full_scale.fx); + set_s16(&sensor->full_scale.fy, full_scale.fy); + set_s16(&sensor->full_scale.fz, full_scale.fz); + set_s16(&sensor->full_scale.mx, full_scale.mx); + set_s16(&sensor->full_scale.my, full_scale.my); + set_s16(&sensor->full_scale.mz, full_scale.mz); + set_s16(&sensor->command_word0, 0x0a00); } -static struct six_axis_t get_min_full_scales(struct jr3_channel __iomem - *channel) +static struct six_axis_t get_min_full_scales(struct jr3_sensor __iomem *sensor) { struct six_axis_t result; - result.fx = get_s16(&channel->min_full_scale.fx); - result.fy = get_s16(&channel->min_full_scale.fy); - result.fz = get_s16(&channel->min_full_scale.fz); - result.mx = get_s16(&channel->min_full_scale.mx); - result.my = get_s16(&channel->min_full_scale.my); - result.mz = get_s16(&channel->min_full_scale.mz); + result.fx = get_s16(&sensor->min_full_scale.fx); + result.fy = get_s16(&sensor->min_full_scale.fy); + result.fz = get_s16(&sensor->min_full_scale.fz); + result.mx = get_s16(&sensor->min_full_scale.mx); + result.my = get_s16(&sensor->min_full_scale.my); + result.mz = get_s16(&sensor->min_full_scale.mz); return result; } -static struct six_axis_t get_max_full_scales(struct jr3_channel __iomem - *channel) +static struct six_axis_t get_max_full_scales(struct jr3_sensor __iomem *sensor) { struct six_axis_t result; - result.fx = get_s16(&channel->max_full_scale.fx); - result.fy = get_s16(&channel->max_full_scale.fy); - result.fz = get_s16(&channel->max_full_scale.fz); - result.mx = get_s16(&channel->max_full_scale.mx); - result.my = get_s16(&channel->max_full_scale.my); - result.mz = get_s16(&channel->max_full_scale.mz); + result.fx = get_s16(&sensor->max_full_scale.fx); + result.fy = get_s16(&sensor->max_full_scale.fy); + result.fz = get_s16(&sensor->max_full_scale.fz); + result.mx = get_s16(&sensor->max_full_scale.mx); + result.my = get_s16(&sensor->max_full_scale.my); + result.mz = get_s16(&sensor->max_full_scale.mz); return result; } @@ -235,35 +236,35 @@ static unsigned int jr3_pci_ai_read_chan(struct comedi_device *dev, switch (axis) { case 0: - val = get_s16(&spriv->channel->filter[filter].fx); + val = get_s16(&spriv->sensor->filter[filter].fx); break; case 1: - val = get_s16(&spriv->channel->filter[filter].fy); + val = get_s16(&spriv->sensor->filter[filter].fy); break; case 2: - val = get_s16(&spriv->channel->filter[filter].fz); + val = get_s16(&spriv->sensor->filter[filter].fz); break; case 3: - val = get_s16(&spriv->channel->filter[filter].mx); + val = get_s16(&spriv->sensor->filter[filter].mx); break; case 4: - val = get_s16(&spriv->channel->filter[filter].my); + val = get_s16(&spriv->sensor->filter[filter].my); break; case 5: - val = get_s16(&spriv->channel->filter[filter].mz); + val = get_s16(&spriv->sensor->filter[filter].mz); break; case 6: - val = get_s16(&spriv->channel->filter[filter].v1); + val = get_s16(&spriv->sensor->filter[filter].v1); break; case 7: - val = get_s16(&spriv->channel->filter[filter].v2); + val = get_s16(&spriv->sensor->filter[filter].v2); break; } val += 0x4000; } else if (chan == 56) { - val = get_u16(&spriv->channel->model_no); + val = get_u16(&spriv->sensor->model_no); } else if (chan == 57) { - val = get_u16(&spriv->channel->serial_no); + val = get_u16(&spriv->sensor->serial_no); } return val; @@ -279,10 +280,7 @@ static int jr3_pci_ai_insn_read(struct comedi_device *dev, u16 errors; int i; - if (!spriv) - return -EINVAL; - - errors = get_u16(&spriv->channel->errors); + errors = get_u16(&spriv->sensor->errors); if (spriv->state != state_jr3_done || (errors & (watch_dog | watch_dog2 | sensor_change))) { /* No sensor or sensor changed */ @@ -309,9 +307,8 @@ static int jr3_pci_open(struct comedi_device *dev) for (i = 0; i < dev->n_subdevices; i++) { s = &dev->subdevices[i]; spriv = s->private; - if (spriv) - dev_dbg(dev->class_dev, "serial: %p %d (%d)\n", - spriv, spriv->serial_no, s->index); + dev_dbg(dev->class_dev, "serial[%d]: %d\n", s->index, + spriv->serial_no); } return 0; } @@ -375,8 +372,7 @@ static int jr3_check_firmware(struct comedi_device *dev, static void jr3_write_firmware(struct comedi_device *dev, int subdev, const u8 *data, size_t size) { - struct jr3_pci_dev_private *devpriv = dev->private; - struct jr3_t __iomem *iobase = devpriv->iobase; + struct jr3_block __iomem *block = dev->mmio; u32 __iomem *lo; u32 __iomem *hi; int more = 1; @@ -409,8 +405,8 @@ static void jr3_write_firmware(struct comedi_device *dev, unsigned int data1 = 0; unsigned int data2 = 0; - lo = &iobase->channel[subdev].program_lo[addr]; - hi = &iobase->channel[subdev].program_hi[addr]; + lo = &block[subdev].program_lo[addr]; + hi = &block[subdev].program_hi[addr]; more = more && read_idm_word(data, size, &pos, &data1); @@ -453,17 +449,14 @@ jr3_pci_poll_subdevice(struct comedi_subdevice *s) { struct jr3_pci_subdev_private *spriv = s->private; struct jr3_pci_poll_delay result = poll_delay_min_max(1000, 2000); - struct jr3_channel __iomem *channel; + struct jr3_sensor __iomem *sensor; u16 model_no; u16 serial_no; int errors; int i; - if (!spriv) - return result; - - channel = spriv->channel; - errors = get_u16(&channel->errors); + sensor = spriv->sensor; + errors = get_u16(&sensor->errors); if (errors != spriv->errors) spriv->errors = errors; @@ -474,8 +467,8 @@ jr3_pci_poll_subdevice(struct comedi_subdevice *s) switch (spriv->state) { case state_jr3_poll: - model_no = get_u16(&channel->model_no); - serial_no = get_u16(&channel->serial_no); + model_no = get_u16(&sensor->model_no); + serial_no = get_u16(&sensor->serial_no); if ((errors & (watch_dog | watch_dog2)) || model_no == 0 || serial_no == 0) { @@ -499,8 +492,8 @@ jr3_pci_poll_subdevice(struct comedi_subdevice *s) } else { struct jr3_pci_transform transf; - spriv->model_no = get_u16(&channel->model_no); - spriv->serial_no = get_u16(&channel->serial_no); + spriv->model_no = get_u16(&sensor->model_no); + spriv->serial_no = get_u16(&sensor->serial_no); /* Transformation all zeros */ for (i = 0; i < ARRAY_SIZE(transf.link); i++) { @@ -508,24 +501,24 @@ jr3_pci_poll_subdevice(struct comedi_subdevice *s) transf.link[i].link_amount = 0; } - set_transforms(channel, transf, 0); - use_transform(channel, 0); + set_transforms(sensor, &transf, 0); + use_transform(sensor, 0); spriv->state = state_jr3_init_transform_complete; /* Allow 20 ms for completion */ result = poll_delay_min_max(20, 100); } break; case state_jr3_init_transform_complete: - if (!is_complete(channel)) { + if (!is_complete(sensor)) { result = poll_delay_min_max(20, 100); } else { /* Set full scale */ struct six_axis_t min_full_scale; struct six_axis_t max_full_scale; - min_full_scale = get_min_full_scales(channel); - max_full_scale = get_max_full_scales(channel); - set_full_scales(channel, max_full_scale); + min_full_scale = get_min_full_scales(sensor); + max_full_scale = get_max_full_scales(sensor); + set_full_scales(sensor, max_full_scale); spriv->state = state_jr3_init_set_full_scale_complete; /* Allow 20 ms for completion */ @@ -533,50 +526,51 @@ jr3_pci_poll_subdevice(struct comedi_subdevice *s) } break; case state_jr3_init_set_full_scale_complete: - if (!is_complete(channel)) { + if (!is_complete(sensor)) { result = poll_delay_min_max(20, 100); } else { - struct force_array __iomem *fs = &channel->full_scale; + struct force_array __iomem *fs = &sensor->full_scale; + union jr3_pci_single_range *r = spriv->range; /* Use ranges in kN or we will overflow around 2000N! */ - spriv->range[0].range.min = -get_s16(&fs->fx) * 1000; - spriv->range[0].range.max = get_s16(&fs->fx) * 1000; - spriv->range[1].range.min = -get_s16(&fs->fy) * 1000; - spriv->range[1].range.max = get_s16(&fs->fy) * 1000; - spriv->range[2].range.min = -get_s16(&fs->fz) * 1000; - spriv->range[2].range.max = get_s16(&fs->fz) * 1000; - spriv->range[3].range.min = -get_s16(&fs->mx) * 100; - spriv->range[3].range.max = get_s16(&fs->mx) * 100; - spriv->range[4].range.min = -get_s16(&fs->my) * 100; - spriv->range[4].range.max = get_s16(&fs->my) * 100; - spriv->range[5].range.min = -get_s16(&fs->mz) * 100; + r[0].l.range[0].min = -get_s16(&fs->fx) * 1000; + r[0].l.range[0].max = get_s16(&fs->fx) * 1000; + r[1].l.range[0].min = -get_s16(&fs->fy) * 1000; + r[1].l.range[0].max = get_s16(&fs->fy) * 1000; + r[2].l.range[0].min = -get_s16(&fs->fz) * 1000; + r[2].l.range[0].max = get_s16(&fs->fz) * 1000; + r[3].l.range[0].min = -get_s16(&fs->mx) * 100; + r[3].l.range[0].max = get_s16(&fs->mx) * 100; + r[4].l.range[0].min = -get_s16(&fs->my) * 100; + r[4].l.range[0].max = get_s16(&fs->my) * 100; + r[5].l.range[0].min = -get_s16(&fs->mz) * 100; /* the next five are questionable */ - spriv->range[5].range.max = get_s16(&fs->mz) * 100; - spriv->range[6].range.min = -get_s16(&fs->v1) * 100; - spriv->range[6].range.max = get_s16(&fs->v1) * 100; - spriv->range[7].range.min = -get_s16(&fs->v2) * 100; - spriv->range[7].range.max = get_s16(&fs->v2) * 100; - spriv->range[8].range.min = 0; - spriv->range[8].range.max = 65535; - - use_offset(channel, 0); + r[5].l.range[0].max = get_s16(&fs->mz) * 100; + r[6].l.range[0].min = -get_s16(&fs->v1) * 100; + r[6].l.range[0].max = get_s16(&fs->v1) * 100; + r[7].l.range[0].min = -get_s16(&fs->v2) * 100; + r[7].l.range[0].max = get_s16(&fs->v2) * 100; + r[8].l.range[0].min = 0; + r[8].l.range[0].max = 65535; + + use_offset(sensor, 0); spriv->state = state_jr3_init_use_offset_complete; /* Allow 40 ms for completion */ result = poll_delay_min_max(40, 100); } break; case state_jr3_init_use_offset_complete: - if (!is_complete(channel)) { + if (!is_complete(sensor)) { result = poll_delay_min_max(20, 100); } else { - set_s16(&channel->offsets.fx, 0); - set_s16(&channel->offsets.fy, 0); - set_s16(&channel->offsets.fz, 0); - set_s16(&channel->offsets.mx, 0); - set_s16(&channel->offsets.my, 0); - set_s16(&channel->offsets.mz, 0); + set_s16(&sensor->offsets.fx, 0); + set_s16(&sensor->offsets.fy, 0); + set_s16(&sensor->offsets.fz, 0); + set_s16(&sensor->offsets.mx, 0); + set_s16(&sensor->offsets.my, 0); + set_s16(&sensor->offsets.mz, 0); - set_offset(channel); + set_offset(sensor); spriv->state = state_jr3_done; } @@ -606,25 +600,23 @@ static void jr3_pci_poll_dev(unsigned long data) delay = 1000; now = jiffies; - /* Poll all channels that are ready to be polled */ + /* Poll all sensors that are ready to be polled */ for (i = 0; i < dev->n_subdevices; i++) { s = &dev->subdevices[i]; spriv = s->private; - if (now > spriv->next_time_min) { + if (time_after_eq(now, spriv->next_time_min)) { struct jr3_pci_poll_delay sub_delay; sub_delay = jr3_pci_poll_subdevice(s); spriv->next_time_min = jiffies + msecs_to_jiffies(sub_delay.min); - spriv->next_time_max = jiffies + - msecs_to_jiffies(sub_delay.max); if (sub_delay.max && sub_delay.max < delay) /* * Wake up as late as possible -> - * poll as many channels as possible at once. + * poll as many sensors as possible at once. */ delay = sub_delay.max; } @@ -638,7 +630,7 @@ static void jr3_pci_poll_dev(unsigned long data) static struct jr3_pci_subdev_private * jr3_pci_alloc_spriv(struct comedi_device *dev, struct comedi_subdevice *s) { - struct jr3_pci_dev_private *devpriv = dev->private; + struct jr3_block __iomem *block = dev->mmio; struct jr3_pci_subdev_private *spriv; int j; int k; @@ -647,36 +639,43 @@ jr3_pci_alloc_spriv(struct comedi_device *dev, struct comedi_subdevice *s) if (!spriv) return NULL; - spriv->channel = &devpriv->iobase->channel[s->index].data; + spriv->sensor = &block[s->index].sensor; for (j = 0; j < 8; j++) { - spriv->range[j].length = 1; - spriv->range[j].range.min = -1000000; - spriv->range[j].range.max = 1000000; + spriv->range[j].l.length = 1; + spriv->range[j].l.range[0].min = -1000000; + spriv->range[j].l.range[0].max = 1000000; for (k = 0; k < 7; k++) { - spriv->range_table_list[j + k * 8] = - (struct comedi_lrange *)&spriv->range[j]; + spriv->range_table_list[j + k * 8] = &spriv->range[j].l; spriv->maxdata_list[j + k * 8] = 0x7fff; } } - spriv->range[8].length = 1; - spriv->range[8].range.min = 0; - spriv->range[8].range.max = 65536; + spriv->range[8].l.length = 1; + spriv->range[8].l.range[0].min = 0; + spriv->range[8].l.range[0].max = 65535; - spriv->range_table_list[56] = (struct comedi_lrange *)&spriv->range[8]; - spriv->range_table_list[57] = (struct comedi_lrange *)&spriv->range[8]; + spriv->range_table_list[56] = &spriv->range[8].l; + spriv->range_table_list[57] = &spriv->range[8].l; spriv->maxdata_list[56] = 0xffff; spriv->maxdata_list[57] = 0xffff; - dev_dbg(dev->class_dev, "p->channel %p %p (%tx)\n", - spriv->channel, devpriv->iobase, - ((char __iomem *)spriv->channel - - (char __iomem *)devpriv->iobase)); - return spriv; } +static void jr3_pci_show_copyright(struct comedi_device *dev) +{ + struct jr3_block __iomem *block = dev->mmio; + struct jr3_sensor __iomem *sensor0 = &block[0].sensor; + char copy[ARRAY_SIZE(sensor0->copyright) + 1]; + int i; + + for (i = 0; i < ARRAY_SIZE(sensor0->copyright); i++) + copy[i] = (char)(get_u16(&sensor0->copyright[i]) >> 8); + copy[i] = '\0'; + dev_dbg(dev->class_dev, "Firmware copyright: %s\n", copy); +} + static int jr3_pci_auto_attach(struct comedi_device *dev, unsigned long context) { @@ -684,16 +683,12 @@ static int jr3_pci_auto_attach(struct comedi_device *dev, static const struct jr3_pci_board *board; struct jr3_pci_dev_private *devpriv; struct jr3_pci_subdev_private *spriv; + struct jr3_block __iomem *block; struct comedi_subdevice *s; int ret; int i; - if (sizeof(struct jr3_channel) != 0xc00) { - dev_err(dev->class_dev, - "sizeof(struct jr3_channel) = %x [expected %x]\n", - (unsigned int)sizeof(struct jr3_channel), 0xc00); - return -EINVAL; - } + BUILD_BUG_ON(sizeof(struct jr3_block) != 0x80000); if (context < ARRAY_SIZE(jr3_pci_boards)) board = &jr3_pci_boards[context]; @@ -710,10 +705,15 @@ static int jr3_pci_auto_attach(struct comedi_device *dev, if (ret) return ret; - devpriv->iobase = pci_ioremap_bar(pcidev, 0); - if (!devpriv->iobase) + if (pci_resource_len(pcidev, 0) < board->n_subdevs * sizeof(*block)) + return -ENXIO; + + dev->mmio = pci_ioremap_bar(pcidev, 0); + if (!dev->mmio) return -ENOMEM; + block = dev->mmio; + ret = comedi_alloc_subdevices(dev, board->n_subdevs); if (ret) return ret; @@ -727,15 +727,17 @@ static int jr3_pci_auto_attach(struct comedi_device *dev, s->insn_read = jr3_pci_ai_insn_read; spriv = jr3_pci_alloc_spriv(dev, s); - if (spriv) { - /* Channel specific range and maxdata */ - s->range_table_list = spriv->range_table_list; - s->maxdata_list = spriv->maxdata_list; - } + if (!spriv) + return -ENOMEM; + + /* Channel specific range and maxdata */ + s->range_table_list = spriv->range_table_list; + s->maxdata_list = spriv->maxdata_list; } /* Reset DSP card */ - writel(0, &devpriv->iobase->channel[0].reset); + for (i = 0; i < dev->n_subdevices; i++) + writel(0, &block[i].reset); ret = comedi_load_firmware(dev, &comedi_to_pci_dev(dev)->dev, "comedi/jr3pci.idm", @@ -758,11 +760,7 @@ static int jr3_pci_auto_attach(struct comedi_device *dev, * can read firmware version */ msleep_interruptible(25); - for (i = 0; i < 0x18; i++) { - dev_dbg(dev->class_dev, "%c\n", - get_u16(&devpriv->iobase->channel[0]. - data.copyright[i]) >> 8); - } + jr3_pci_show_copyright(dev); /* Start card timer */ for (i = 0; i < dev->n_subdevices; i++) { @@ -770,7 +768,6 @@ static int jr3_pci_auto_attach(struct comedi_device *dev, spriv = s->private; spriv->next_time_min = jiffies + msecs_to_jiffies(500); - spriv->next_time_max = jiffies + msecs_to_jiffies(2000); } setup_timer(&devpriv->timer, jr3_pci_poll_dev, (unsigned long)dev); @@ -784,13 +781,10 @@ static void jr3_pci_detach(struct comedi_device *dev) { struct jr3_pci_dev_private *devpriv = dev->private; - if (devpriv) { + if (devpriv) del_timer_sync(&devpriv->timer); - if (devpriv->iobase) - iounmap(devpriv->iobase); - } - comedi_pci_disable(dev); + comedi_pci_detach(dev); } static struct comedi_driver jr3_pci_driver = { @@ -825,6 +819,6 @@ static struct pci_driver jr3_pci_pci_driver = { module_comedi_pci_driver(jr3_pci_driver, jr3_pci_pci_driver); MODULE_AUTHOR("Comedi http://www.comedi.org"); -MODULE_DESCRIPTION("Comedi low-level driver"); +MODULE_DESCRIPTION("Comedi driver for JR3/PCI force sensor board"); MODULE_LICENSE("GPL"); MODULE_FIRMWARE("comedi/jr3pci.idm"); diff --git a/drivers/staging/comedi/drivers/jr3_pci.h b/drivers/staging/comedi/drivers/jr3_pci.h index f10a84f..28ff0c2a 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.h +++ b/drivers/staging/comedi/drivers/jr3_pci.h @@ -280,7 +280,7 @@ struct intern_transform { * and hardware manuals. */ -struct jr3_channel { +struct jr3_sensor { /* * Raw_channels is the area used to store the raw data coming from * the sensor. @@ -724,13 +724,11 @@ struct jr3_channel { struct intern_transform transforms[0x10]; /* offset 0x0200 */ }; -struct jr3_t { - struct { - u32 program_lo[0x4000]; /* 0x00000 - 0x10000 */ - struct jr3_channel data; /* 0x10000 - 0x10c00 */ - char pad2[0x30000 - 0x00c00]; /* 0x10c00 - 0x40000 */ - u32 program_hi[0x8000]; /* 0x40000 - 0x60000 */ - u32 reset; /* 0x60000 - 0x60004 */ - char pad3[0x20000 - 0x00004]; /* 0x60004 - 0x80000 */ - } channel[4]; +struct jr3_block { + u32 program_lo[0x4000]; /* 0x00000 - 0x10000 */ + struct jr3_sensor sensor; /* 0x10000 - 0x10c00 */ + char pad2[0x30000 - 0x00c00]; /* 0x10c00 - 0x40000 */ + u32 program_hi[0x8000]; /* 0x40000 - 0x60000 */ + u32 reset; /* 0x60000 - 0x60004 */ + char pad3[0x20000 - 0x00004]; /* 0x60004 - 0x80000 */ }; diff --git a/drivers/staging/comedi/drivers/ni_atmio.c b/drivers/staging/comedi/drivers/ni_atmio.c index ffcf7af..2d62a8c 100644 --- a/drivers/staging/comedi/drivers/ni_atmio.c +++ b/drivers/staging/comedi/drivers/ni_atmio.c @@ -216,7 +216,7 @@ static const int ni_irqpin[] = { #include "ni_mio_common.c" -static struct pnp_device_id device_ids[] = { +static const struct pnp_device_id device_ids[] = { {.id = "NIC1900", .driver_data = 0}, {.id = "NIC2400", .driver_data = 0}, {.id = "NIC2500", .driver_data = 0}, diff --git a/drivers/staging/comedi/drivers/ni_usb6501.c b/drivers/staging/comedi/drivers/ni_usb6501.c index 5036eeb..9a0a963 100644 --- a/drivers/staging/comedi/drivers/ni_usb6501.c +++ b/drivers/staging/comedi/drivers/ni_usb6501.c @@ -45,7 +45,7 @@ * byte 3 is the total packet length * * byte 4 is always 00 - * byte 5 is is the total packet length - 4 + * byte 5 is the total packet length - 4 * byte 6 is always 01 * byte 7 is the command * diff --git a/drivers/staging/comedi/drivers/s626.c b/drivers/staging/comedi/drivers/s626.c index 97939b4..4b9c226 100644 --- a/drivers/staging/comedi/drivers/s626.c +++ b/drivers/staging/comedi/drivers/s626.c @@ -74,26 +74,34 @@ struct s626_buffer_dma { void *logical_base; }; +/** + * struct s626_private - Working data for s626 driver. + * @ai_cmd_running: non-zero if ai_cmd is running. + * @ai_sample_timer: time between samples in units of the timer. + * @ai_convert_count: conversion counter. + * @ai_convert_timer: time between conversion in units of the timer. + * @counter_int_enabs: counter interrupt enable mask for MISC2 register. + * @adc_items: number of items in ADC poll list. + * @rps_buf: DMA buffer used to hold ADC (RPS1) program. + * @ana_buf: DMA buffer used to receive ADC data and hold DAC data. + * @dac_wbuf: pointer to logical adrs of DMA buffer used to hold DAC data. + * @dacpol: image of DAC polarity register. + * @trim_setpoint: images of TrimDAC setpoints. + * @i2c_adrs: I2C device address for onboard EEPROM (board rev dependent) + */ struct s626_private { - u8 ai_cmd_running; /* ai_cmd is running */ - unsigned int ai_sample_timer; /* time between samples in - * units of the timer */ - int ai_convert_count; /* conversion counter */ - unsigned int ai_convert_timer; /* time between conversion in - * units of the timer */ - u16 counter_int_enabs; /* counter interrupt enable mask - * for MISC2 register */ - u8 adc_items; /* number of items in ADC poll list */ - struct s626_buffer_dma rps_buf; /* DMA buffer used to hold ADC (RPS1) - * program */ - struct s626_buffer_dma ana_buf; /* DMA buffer used to receive ADC data - * and hold DAC data */ - u32 *dac_wbuf; /* pointer to logical adrs of DMA buffer - * used to hold DAC data */ - u16 dacpol; /* image of DAC polarity register */ - u8 trim_setpoint[12]; /* images of TrimDAC setpoints */ - u32 i2c_adrs; /* I2C device address for onboard EEPROM - * (board rev dependent) */ + u8 ai_cmd_running; + unsigned int ai_sample_timer; + int ai_convert_count; + unsigned int ai_convert_timer; + u16 counter_int_enabs; + u8 adc_items; + struct s626_buffer_dma rps_buf; + struct s626_buffer_dma ana_buf; + u32 *dac_wbuf; + u16 dacpol; + u8 trim_setpoint[12]; + u32 i2c_adrs; }; /* Counter overflow/index event flag masks for RDMISC2. */ @@ -591,7 +599,7 @@ static int s626_write_trim_dac(struct comedi_device *dev, * Save the new setpoint in case the application needs to read it back * later. */ - devpriv->trim_setpoint[logical_chan] = (u8)dac_data; + devpriv->trim_setpoint[logical_chan] = dac_data; /* Map logical channel number to physical channel number. */ chan = s626_trimchan[logical_chan]; @@ -1928,7 +1936,7 @@ static int s626_ao_insn_write(struct comedi_device *dev, int i; for (i = 0; i < insn->n; i++) { - int16_t dacdata = (int16_t)data[i]; + s16 dacdata = (s16)data[i]; int ret; dacdata -= (0x1fff); |
