staging: comedi: add comedi_write_array_to_buffer()
The "comedi_fc" module contains a few functions useful to Comedi drivers. Their functionality is being migrated to the core "comedi" module and renamed to start with the prefix `comedi_`. As part of this migration, move `cfc_write_array_to_buffer()` into the core comedi module and rename it to `comedi_write_array_to_buffer()`. Change the external declaration of `cfc_write_array_to_buffer()` into an inline function that calls `comedi_write_array_to_buffer()`. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
5c520aafa0
commit
ea29c1d563
4 changed files with 36 additions and 30 deletions
|
@ -509,3 +509,30 @@ void comedi_buf_memcpy_from(struct comedi_subdevice *s, unsigned int offset,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(comedi_buf_memcpy_from);
|
EXPORT_SYMBOL_GPL(comedi_buf_memcpy_from);
|
||||||
|
|
||||||
|
/* Writes an array of data points to comedi's buffer */
|
||||||
|
unsigned int comedi_write_array_to_buffer(struct comedi_subdevice *s,
|
||||||
|
const void *data,
|
||||||
|
unsigned int num_bytes)
|
||||||
|
{
|
||||||
|
struct comedi_async *async = s->async;
|
||||||
|
unsigned int retval;
|
||||||
|
|
||||||
|
if (num_bytes == 0)
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
retval = comedi_buf_write_alloc(s, num_bytes);
|
||||||
|
if (retval != num_bytes) {
|
||||||
|
dev_warn(s->device->class_dev, "buffer overrun\n");
|
||||||
|
async->events |= COMEDI_CB_OVERFLOW;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
comedi_buf_memcpy_to(s, 0, data, num_bytes);
|
||||||
|
comedi_buf_write_free(s, num_bytes);
|
||||||
|
comedi_inc_scan_progress(s, num_bytes);
|
||||||
|
async->events |= COMEDI_CB_BLOCK;
|
||||||
|
|
||||||
|
return num_bytes;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(comedi_write_array_to_buffer);
|
||||||
|
|
|
@ -426,6 +426,9 @@ void comedi_buf_memcpy_to(struct comedi_subdevice *s, unsigned int offset,
|
||||||
const void *source, unsigned int num_bytes);
|
const void *source, unsigned int num_bytes);
|
||||||
void comedi_buf_memcpy_from(struct comedi_subdevice *s, unsigned int offset,
|
void comedi_buf_memcpy_from(struct comedi_subdevice *s, unsigned int offset,
|
||||||
void *destination, unsigned int num_bytes);
|
void *destination, unsigned int num_bytes);
|
||||||
|
unsigned int comedi_write_array_to_buffer(struct comedi_subdevice *s,
|
||||||
|
const void *data,
|
||||||
|
unsigned int num_bytes);
|
||||||
|
|
||||||
/* drivers.c - general comedi driver functions */
|
/* drivers.c - general comedi driver functions */
|
||||||
|
|
||||||
|
|
|
@ -22,32 +22,6 @@
|
||||||
|
|
||||||
#include "comedi_fc.h"
|
#include "comedi_fc.h"
|
||||||
|
|
||||||
/* Writes an array of data points to comedi's buffer */
|
|
||||||
unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *s,
|
|
||||||
const void *data, unsigned int num_bytes)
|
|
||||||
{
|
|
||||||
struct comedi_async *async = s->async;
|
|
||||||
unsigned int retval;
|
|
||||||
|
|
||||||
if (num_bytes == 0)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
retval = comedi_buf_write_alloc(s, num_bytes);
|
|
||||||
if (retval != num_bytes) {
|
|
||||||
dev_warn(s->device->class_dev, "buffer overrun\n");
|
|
||||||
async->events |= COMEDI_CB_OVERFLOW;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
comedi_buf_memcpy_to(s, 0, data, num_bytes);
|
|
||||||
comedi_buf_write_free(s, num_bytes);
|
|
||||||
comedi_inc_scan_progress(s, num_bytes);
|
|
||||||
async->events |= COMEDI_CB_BLOCK;
|
|
||||||
|
|
||||||
return num_bytes;
|
|
||||||
}
|
|
||||||
EXPORT_SYMBOL_GPL(cfc_write_array_to_buffer);
|
|
||||||
|
|
||||||
unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *s,
|
unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *s,
|
||||||
void *data, unsigned int num_bytes)
|
void *data, unsigned int num_bytes)
|
||||||
{
|
{
|
||||||
|
|
|
@ -34,10 +34,12 @@ static inline void cfc_inc_scan_progress(struct comedi_subdevice *s,
|
||||||
comedi_inc_scan_progress(s, num_bytes);
|
comedi_inc_scan_progress(s, num_bytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Writes an array of data points to comedi's buffer */
|
static inline unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *s,
|
||||||
unsigned int cfc_write_array_to_buffer(struct comedi_subdevice *s,
|
|
||||||
const void *data,
|
const void *data,
|
||||||
unsigned int num_bytes);
|
unsigned int num_bytes)
|
||||||
|
{
|
||||||
|
return comedi_write_array_to_buffer(s, data, num_bytes);
|
||||||
|
}
|
||||||
|
|
||||||
static inline unsigned int cfc_write_to_buffer(struct comedi_subdevice *s,
|
static inline unsigned int cfc_write_to_buffer(struct comedi_subdevice *s,
|
||||||
unsigned short data)
|
unsigned short data)
|
||||||
|
|
Loading…
Add table
Reference in a new issue