Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126723
b: refs/heads/master
c: 6d62a12
h: refs/heads/master
i:
  126721: 4f909e8
  126719: 74b1a2f
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jan 6, 2009
1 parent a4e771c commit eadc112
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 15 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: 652dd4e7c78a2ad1fcf38c12e8be69651922c690
refs/heads/master: 6d62a12bb0fde6a70eb18e2ba25e48f6fd5eee07
29 changes: 15 additions & 14 deletions trunk/drivers/staging/comedi/drivers/comedi_fc.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,30 @@
#include "../comedidev.h"

/* Writes an array of data points to comedi's buffer */
extern unsigned int cfc_write_array_to_buffer(comedi_subdevice * subd,
void *data, unsigned int num_bytes);
extern unsigned int cfc_write_array_to_buffer(comedi_subdevice *subd,
void *data,
unsigned int num_bytes);

static inline unsigned int cfc_write_to_buffer(comedi_subdevice * subd,
sampl_t data)
static inline unsigned int cfc_write_to_buffer(comedi_subdevice *subd,
sampl_t data)
{
return cfc_write_array_to_buffer(subd, &data, sizeof(data));
};

static inline unsigned int cfc_write_long_to_buffer(comedi_subdevice * subd,
lsampl_t data)
static inline unsigned int cfc_write_long_to_buffer(comedi_subdevice *subd,
lsampl_t data)
{
return cfc_write_array_to_buffer(subd, &data, sizeof(data));
};

extern unsigned int cfc_read_array_from_buffer(comedi_subdevice * subd,
void *data, unsigned int num_bytes);
extern unsigned int cfc_read_array_from_buffer(comedi_subdevice *subd,
void *data,
unsigned int num_bytes);

extern unsigned int cfc_handle_events(comedi_device * dev,
comedi_subdevice * subd);
extern unsigned int cfc_handle_events(comedi_device *dev,
comedi_subdevice *subd);

static inline unsigned int cfc_bytes_per_scan(comedi_subdevice * subd)
static inline unsigned int cfc_bytes_per_scan(comedi_subdevice *subd)
{
int num_samples;
int bits_per_sample;
Expand All @@ -61,9 +63,8 @@ static inline unsigned int cfc_bytes_per_scan(comedi_subdevice * subd)
case COMEDI_SUBD_DO:
case COMEDI_SUBD_DIO:
bits_per_sample = 8 * bytes_per_sample(subd);
num_samples =
(subd->async->cmd.chanlist_len + bits_per_sample -
1) / bits_per_sample;
num_samples = (subd->async->cmd.chanlist_len +
bits_per_sample - 1) / bits_per_sample;
break;
default:
num_samples = subd->async->cmd.chanlist_len;
Expand Down

0 comments on commit eadc112

Please sign in to comment.