From 7a33de9ce30a7206bc082b445ae54a609003064b Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Wed, 9 Jan 2013 13:32:56 -0700 Subject: [PATCH] --- yaml --- r: 354033 b: refs/heads/master c: 8ae560a14abaf2b76fb486ad08fea9c6c5be640f h: refs/heads/master i: 354031: 3d928a056d35f904ab9d1f7db1c660108dface2b v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/comedi_buf.c | 9 ++++++--- trunk/drivers/staging/comedi/comedidev.h | 19 ++++++++++--------- 3 files changed, 17 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 10d6d46b4b7b..056e1ed7faf1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8bd650f91be07fb84adc2e47fb1379b7223b95a4 +refs/heads/master: 8ae560a14abaf2b76fb486ad08fea9c6c5be640f diff --git a/trunk/drivers/staging/comedi/comedi_buf.c b/trunk/drivers/staging/comedi/comedi_buf.c index c562346e4429..ac5f0a91e93b 100644 --- a/trunk/drivers/staging/comedi/comedi_buf.c +++ b/trunk/drivers/staging/comedi/comedi_buf.c @@ -255,7 +255,8 @@ unsigned int comedi_buf_write_n_allocated(struct comedi_async *async) } /* transfers a chunk from writer to filled buffer space */ -unsigned comedi_buf_write_free(struct comedi_async *async, unsigned int nbytes) +unsigned int comedi_buf_write_free(struct comedi_async *async, + unsigned int nbytes) { unsigned int allocated = comedi_buf_write_n_allocated(async); @@ -294,7 +295,8 @@ unsigned int comedi_buf_read_n_available(struct comedi_async *async) EXPORT_SYMBOL(comedi_buf_read_n_available); /* allocates a chunk for the reader from filled (and munged) buffer space */ -unsigned comedi_buf_read_alloc(struct comedi_async *async, unsigned nbytes) +unsigned int comedi_buf_read_alloc(struct comedi_async *async, + unsigned int nbytes) { unsigned int available; @@ -320,7 +322,8 @@ static unsigned int comedi_buf_read_n_allocated(struct comedi_async *async) } /* transfers control of a chunk from reader to free buffer space */ -unsigned comedi_buf_read_free(struct comedi_async *async, unsigned int nbytes) +unsigned int comedi_buf_read_free(struct comedi_async *async, + unsigned int nbytes) { unsigned int allocated; diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h index 140678da55d4..85b84b0d51dd 100644 --- a/trunk/drivers/staging/comedi/comedidev.h +++ b/trunk/drivers/staging/comedi/comedidev.h @@ -435,15 +435,16 @@ comedi_to_usb_interface(struct comedi_device *dev) return dev->hw_dev ? to_usb_interface(dev->hw_dev) : NULL; } -int comedi_buf_put(struct comedi_async *async, short x); -int comedi_buf_get(struct comedi_async *async, short *x); - -unsigned int comedi_buf_write_alloc(struct comedi_async *async, - unsigned int nbytes); -unsigned comedi_buf_write_free(struct comedi_async *async, unsigned int nbytes); -unsigned comedi_buf_read_alloc(struct comedi_async *async, unsigned nbytes); -unsigned comedi_buf_read_free(struct comedi_async *async, unsigned int nbytes); -unsigned int comedi_buf_read_n_available(struct comedi_async *async); +unsigned int comedi_buf_write_alloc(struct comedi_async *, unsigned int); +unsigned int comedi_buf_write_free(struct comedi_async *, unsigned int); + +unsigned int comedi_buf_read_n_available(struct comedi_async *); +unsigned int comedi_buf_read_alloc(struct comedi_async *, unsigned int); +unsigned int comedi_buf_read_free(struct comedi_async *, unsigned int); + +int comedi_buf_put(struct comedi_async *, short); +int comedi_buf_get(struct comedi_async *, short *); + void comedi_buf_memcpy_to(struct comedi_async *async, unsigned int offset, const void *source, unsigned int num_bytes); void comedi_buf_memcpy_from(struct comedi_async *async, unsigned int offset,