Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304528
b: refs/heads/master
c: 190908b
h: refs/heads/master
v: v3
  • Loading branch information
Ravishankar Karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Apr 30, 2012
1 parent 31e7529 commit 7818f4d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ac971c948598b1ca6638ae7a89d3e237b90ad02b
refs/heads/master: 190908ba6dd1e17f00cb7f403d31c19feeeb63bf
17 changes: 12 additions & 5 deletions trunk/drivers/staging/comedi/drivers/cb_pcimdas.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,12 @@ MODULE_DEVICE_TABLE(pci, cb_pcimdas_pci_table);
*/
#define thisboard ((const struct cb_pcimdas_board *)dev->board_ptr)

/* this structure is for data unique to this hardware driver. If
several hardware drivers keep similar information in this structure,
feel free to suggest moving the variable to the struct comedi_device struct. */
/*
* this structure is for data unique to this hardware driver. If
* several hardware drivers keep similar information in this structure,
* feel free to suggest moving the variable to the struct comedi_device
* struct.
*/
struct cb_pcimdas_private {
int data;

Expand Down Expand Up @@ -317,7 +320,8 @@ static int cb_pcimdas_attach(struct comedi_device *dev,
s->subdev_flags = SDF_WRITABLE;
s->n_chan = thisboard->ao_nchan;
s->maxdata = 1 << thisboard->ao_bits;
s->range_table = &range_unknown; /* ranges are hardware settable, but not software readable. */
/* ranges are hardware settable, but not software readable. */
s->range_table = &range_unknown;
s->insn_write = &cb_pcimdas_ao_winsn;
s->insn_read = &cb_pcimdas_ao_rinsn;

Expand Down Expand Up @@ -402,7 +406,10 @@ static int cb_pcimdas_ai_rinsn(struct comedi_device *dev,
outb(0x01, devpriv->BADR3 + 6); /* set bursting off, conversions on */
outb(0x00, devpriv->BADR3 + 7); /* set range to 10V. UP/BP is controlled by a switch on the board */

/* write channel limits to multiplexer, set Low (bits 0-3) and High (bits 4-7) channels to chan. */
/*
* write channel limits to multiplexer, set Low (bits 0-3) and
* High (bits 4-7) channels to chan.
*/
chanlims = chan | (chan << 4);
outb(chanlims, devpriv->BADR3 + 0);

Expand Down

0 comments on commit 7818f4d

Please sign in to comment.