AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-14 20:56:12 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: ni_mio_common: use sample manipulation helpers

Browse Source 
Use the recently added sample manipulation helpers to remove the hardcoded
assumption of the sample size.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-10-31 12:04:29 -07:00 committed by Greg Kroah-Hartman
parent c39e050d21
commit 836b571df7
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/staging/comedi/drivers/ni_mio_common.c
View File

@ -1167,19 +1167,20 @@ static int ni_ao_fifo_half_empty(struct comedi_device *dev,
struct comedi_subdevice *s) struct comedi_subdevice *s)
{ {
const struct ni_board_struct *board = dev->board_ptr; const struct ni_board_struct *board = dev->board_ptr;
int n; unsigned int nbytes;
unsigned int nsamples;
n = comedi_buf_read_n_available(s); nbytes = comedi_buf_read_n_available(s);
if (n == 0) { if (nbytes == 0) {
s->async->events |= COMEDI_CB_OVERFLOW; s->async->events |= COMEDI_CB_OVERFLOW;
return 0; return 0;
} }
n /= sizeof(short); nsamples = comedi_bytes_to_samples(s, nbytes);
if (n > board->ao_fifo_depth / 2) if (nsamples > board->ao_fifo_depth / 2)
n = board->ao_fifo_depth / 2; nsamples = board->ao_fifo_depth / 2;
ni_ao_fifo_load(dev, s, n); ni_ao_fifo_load(dev, s, nsamples);
return 1; return 1;
} }
@ -1189,7 +1190,8 @@ static int ni_ao_prep_fifo(struct comedi_device *dev,
{ {
const struct ni_board_struct *board = dev->board_ptr; const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private; struct ni_private *devpriv = dev->private;
int n; unsigned int nbytes;
unsigned int nsamples;
/* reset fifo */ /* reset fifo */
ni_stc_writew(dev, 1, DAC_FIFO_Clear); ni_stc_writew(dev, 1, DAC_FIFO_Clear);
@ -1197,17 +1199,17 @@ static int ni_ao_prep_fifo(struct comedi_device *dev,
ni_ao_win_outl(dev, 0x6, AO_FIFO_Offset_Load_611x); ni_ao_win_outl(dev, 0x6, AO_FIFO_Offset_Load_611x);
/* load some data */ /* load some data */
n = comedi_buf_read_n_available(s); nbytes = comedi_buf_read_n_available(s);
if (n == 0) if (nbytes == 0)
return 0; return 0;
n /= sizeof(short); nsamples = comedi_bytes_to_samples(s, nbytes);
if (n > board->ao_fifo_depth) if (nsamples > board->ao_fifo_depth)
n = board->ao_fifo_depth; nsamples = board->ao_fifo_depth;
ni_ao_fifo_load(dev, s, n); ni_ao_fifo_load(dev, s, nsamples);
return n; return nsamples;
} }
static void ni_ai_fifo_read(struct comedi_device *dev, static void ni_ai_fifo_read(struct comedi_device *dev,
@ -2951,12 +2953,15 @@ static int ni_ao_insn_config(struct comedi_device *dev,
{ {
const struct ni_board_struct *board = dev->board_ptr; const struct ni_board_struct *board = dev->board_ptr;
struct ni_private *devpriv = dev->private; struct ni_private *devpriv = dev->private;
unsigned int nbytes;
switch (data[0]) { switch (data[0]) {
case INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE: case INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE:
switch (data[1]) { switch (data[1]) {
case COMEDI_OUTPUT: case COMEDI_OUTPUT:
data[2] = 1 + board->ao_fifo_depth * sizeof(short); nbytes = comedi_samples_to_bytes(s,
board->ao_fifo_depth);
data[2] = 1 + nbytes;
if (devpriv->mite) if (devpriv->mite)
data[2] += devpriv->mite->fifo_size; data[2] += devpriv->mite->fifo_size;
break; break;