Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 363f570e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_stc.h: tidy up ADC_FIFO_Data_Register 



Rename the CamelCase.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 61260f58

drivers/staging/comedi/drivers/ni_mio_common.c

+3 −3
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ static void ni_ai_fifo_read(struct comedi_device *dev, 
		}

		for (i = 0; i < n; i++) {

			devpriv->ai_fifo_buffer[i] =

			    ni_readw(dev, ADC_FIFO_Data_Register);

			    ni_readw(dev, NI_E_AI_FIFO_DATA_REG);

		}

		comedi_buf_write_samples(s, devpriv->ai_fifo_buffer, n);

	}
@@ -1230,7 +1230,7 @@ static void ni_handle_fifo_dregs(struct comedi_device *dev) 
				if (fifo_empty)

					break;

				devpriv->ai_fifo_buffer[i] =

				    ni_readw(dev, ADC_FIFO_Data_Register);

				    ni_readw(dev, NI_E_AI_FIFO_DATA_REG);

			}

			comedi_buf_write_samples(s, devpriv->ai_fifo_buffer, i);

		}
@@ -2006,7 +2006,7 @@ static int ni_ai_insn_read(struct comedi_device *dev, 
				dl &= mask;

				data[n] = dl;

			} else {

				d = ni_readw(dev, ADC_FIFO_Data_Register);

				d = ni_readw(dev, NI_E_AI_FIFO_DATA_REG);

				d += signbits;	/* subtle: needs to be short addition */

				data[n] = d;

			}

drivers/staging/comedi/drivers/ni_stc.h

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ static inline unsigned int AI_CONFIG_CHANNEL(unsigned int channel) 


#define NI_E_8255_BASE			0x19	/* rw8 */



#define ADC_FIFO_Data_Register		0x1c

#define NI_E_AI_FIFO_DATA_REG		0x1c	/* r16 */



#define AO_Configuration		0x16

#define AO_Bipolar		_bit0