Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337548
b: refs/heads/master
c: 753b18d
h: refs/heads/master
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Nov 1, 2012
1 parent ecebc52 commit 22d8c65
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 19 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: d8cba40472d9f2cd6590a1f96f0a1be19ff52645
refs/heads/master: 753b18d39f346a7bb5c39884a727ebfbf147f72d
34 changes: 16 additions & 18 deletions trunk/drivers/staging/comedi/drivers/skel.c
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,22 @@ struct skel_private {
unsigned int ao_readback[2];
};

static int skel_ns_to_timer(unsigned int *ns, int round);
/* This function doesn't require a particular form, this is just
* what happens to be used in some of the drivers. It should
* convert ns nanoseconds to a counter value suitable for programming
* the device. Also, it should adjust ns so that it cooresponds to
* the actual time that the device will use. */
static int skel_ns_to_timer(unsigned int *ns, int round)
{
/* trivial timer */
/* if your timing is done through two cascaded timers, the
* i8253_cascade_ns_to_timer() function in 8253.h can be
* very helpful. There are also i8254_load() and i8254_mm_load()
* which can be used to load values into the ubiquitous 8254 counters
*/

return *ns;
}

/*
* "instructions" read/write data in "one-shot" or "software-triggered"
Expand Down Expand Up @@ -326,23 +341,6 @@ static int skel_ai_cmdtest(struct comedi_device *dev,
return 0;
}

/* This function doesn't require a particular form, this is just
* what happens to be used in some of the drivers. It should
* convert ns nanoseconds to a counter value suitable for programming
* the device. Also, it should adjust ns so that it cooresponds to
* the actual time that the device will use. */
static int skel_ns_to_timer(unsigned int *ns, int round)
{
/* trivial timer */
/* if your timing is done through two cascaded timers, the
* i8253_cascade_ns_to_timer() function in 8253.h can be
* very helpful. There are also i8254_load() and i8254_mm_load()
* which can be used to load values into the ubiquitous 8254 counters
*/

return *ns;
}

static int skel_ao_winsn(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
Expand Down

0 comments on commit 22d8c65

Please sign in to comment.