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

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

staging: comedi: pcl816: tidy up analog input registers 



For aesthetics, rename the analog input register defines and convert
the offsets to hex.

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 9ab7fbd8

drivers/staging/comedi/drivers/pcl816.c

+5 −8
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ Configuration Options: 
#define PCL816_DO_DI_LSB_REG			0x00

#define PCL816_DO_DI_MSB_REG			0x01

#define PCL816_TIMER_BASE			0x04

#define PCL816_AI_LSB_REG			0x08

#define PCL816_AI_MSB_REG			0x09



/* R: A/D high byte W: A/D range control */

#define PCL816_RANGE 9
@@ -61,11 +63,6 @@ Configuration Options: 
#define PCL816_STATUS 13

#define PCL816_STATUS_DRDY_MASK 0x80



/* R: low byte of A/D W: soft A/D trigger */

#define PCL816_AD_LO 8

/* R: high byte of A/D W: A/D range control */

#define PCL816_AD_HI 9



#define MAGIC_DMA_WORD 0x5a5a



static const struct comedi_lrange range_pcl816 = {
@@ -217,7 +214,7 @@ static void pcl816_ai_clear_eoc(struct comedi_device *dev) 
static void pcl816_ai_soft_trig(struct comedi_device *dev)

{

	/* writing any value triggers a software conversion */

	outb(0, dev->iobase + PCL816_AD_LO);

	outb(0, dev->iobase + PCL816_AI_LSB_REG);

}



static unsigned int pcl816_ai_get_sample(struct comedi_device *dev,
@@ -225,8 +222,8 @@ static unsigned int pcl816_ai_get_sample(struct comedi_device *dev, 
{

	unsigned int val;



	val = inb(dev->iobase + PCL816_AD_HI) << 8;

	val |= inb(dev->iobase + PCL816_AD_LO);

	val = inb(dev->iobase + PCL816_AI_MSB_REG) << 8;

	val |= inb(dev->iobase + PCL816_AI_LSB_REG);



	return val & s->maxdata;

}