Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304529
b: refs/heads/master
c: 949fd38
h: refs/heads/master
i:
  304527: 31e7529
v: v3
  • Loading branch information
Ravishankar Karkala Mallikarjunayya authored and Greg Kroah-Hartman committed Apr 30, 2012
1 parent 7818f4d commit 41eeea4
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 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: 190908ba6dd1e17f00cb7f403d31c19feeeb63bf
refs/heads/master: 949fd38c7b22168bc16fea100a51c8d4a3eab144
16 changes: 12 additions & 4 deletions trunk/drivers/staging/comedi/drivers/ni_at_a2150.c
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,10 @@ static int a2150_ai_cmdtest(struct comedi_device *dev,
if (err)
return 1;

/* step 2: make sure trigger sources are unique and mutually compatible */
/*
* step 2: make sure trigger sources are unique and mutually
* compatible
*/

if (cmd->start_src != TRIG_NOW && cmd->start_src != TRIG_EXT)
err++;
Expand Down Expand Up @@ -771,7 +774,10 @@ static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
/* start acquisition for soft trigger */
outw(0, dev->iobase + FIFO_START_REG);

/* there is a 35.6 sample delay for data to get through the antialias filter */
/*
* there is a 35.6 sample delay for data to get through the
* antialias filter
*/
for (n = 0; n < filter_delay; n++) {
for (i = 0; i < timeout; i++) {
if (inw(dev->iobase + STATUS_REG) & FNE_BIT)
Expand Down Expand Up @@ -812,8 +818,10 @@ static int a2150_ai_rinsn(struct comedi_device *dev, struct comedi_subdevice *s,
return n;
}

/* sets bits in devpriv->clock_bits to nearest approximation of requested period,
* adjusts requested period to actual timing. */
/*
* sets bits in devpriv->clock_bits to nearest approximation of requested
* period, adjusts requested period to actual timing.
*/
static int a2150_get_timing(struct comedi_device *dev, unsigned int *period,
int flags)
{
Expand Down

0 comments on commit 41eeea4

Please sign in to comment.