Commit bfa9facd authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman

staging: comedi: add comedi_read_array_from_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_read_array_from_buffer()` into the core comedi
module and rename it to `comedi_read_array_from_buffer()`.  Change the
external declaration of `cfc_read_array_from_buffer()` into an inline
function that calls `comedi_read_array_from_buffer()`.
Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Reviewed-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af2c6a8a
......@@ -547,3 +547,30 @@ unsigned int comedi_write_array_to_buffer(struct comedi_subdevice *s,
return num_bytes;
}
EXPORT_SYMBOL_GPL(comedi_write_array_to_buffer);
/**
* comedi_read_array_from_buffer - read data from comedi buffer
* @s: comedi_subdevice struct
* @data: destination
* @num_bytes: number of bytes to read
*
* Reads up to num_bytes bytes of data from the comedi buffer associated with
* the subdevice, marks it as read and updates the acquisition scan progress.
*
* Returns the amount of data read in bytes.
*/
unsigned int comedi_read_array_from_buffer(struct comedi_subdevice *s,
void *data, unsigned int num_bytes)
{
if (num_bytes == 0)
return 0;
num_bytes = comedi_buf_read_alloc(s, num_bytes);
comedi_buf_memcpy_from(s, 0, data, num_bytes);
comedi_buf_read_free(s, num_bytes);
comedi_inc_scan_progress(s, num_bytes);
s->async->events |= COMEDI_CB_BLOCK;
return num_bytes;
}
EXPORT_SYMBOL_GPL(comedi_read_array_from_buffer);
......@@ -429,6 +429,8 @@ void comedi_buf_memcpy_from(struct comedi_subdevice *s, unsigned int offset,
unsigned int comedi_write_array_to_buffer(struct comedi_subdevice *s,
const void *data,
unsigned int num_bytes);
unsigned int comedi_read_array_from_buffer(struct comedi_subdevice *s,
void *data, unsigned int num_bytes);
/* drivers.c - general comedi driver functions */
......
......@@ -22,22 +22,6 @@
#include "comedi_fc.h"
unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *s,
void *data, unsigned int num_bytes)
{
if (num_bytes == 0)
return 0;
num_bytes = comedi_buf_read_alloc(s, num_bytes);
comedi_buf_memcpy_from(s, 0, data, num_bytes);
comedi_buf_read_free(s, num_bytes);
comedi_inc_scan_progress(s, num_bytes);
s->async->events |= COMEDI_CB_BLOCK;
return num_bytes;
}
EXPORT_SYMBOL_GPL(cfc_read_array_from_buffer);
static int __init comedi_fc_init_module(void)
{
return 0;
......
......@@ -53,8 +53,12 @@ static inline unsigned int cfc_write_long_to_buffer(struct comedi_subdevice *s,
return comedi_write_array_to_buffer(s, &data, sizeof(data));
};
unsigned int cfc_read_array_from_buffer(struct comedi_subdevice *,
void *data, unsigned int num_bytes);
static inline unsigned int
cfc_read_array_from_buffer(struct comedi_subdevice *s, void *data,
unsigned int num_bytes)
{
return comedi_read_array_from_buffer(s, data, num_bytes);
}
static inline unsigned int cfc_handle_events(struct comedi_device *dev,
struct comedi_subdevice *s)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment