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

Commit c47c0ed2 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: das08: rename and split DAS08JR_DIO 



The `DAS08JR_DIO` macro contains the offset to the read-only digital
input register and write-only digital output register on the "JR"
boards.  Replace the macro with two new macros (with the same numeric
value) named `DAS08JR_DI_REG` for the digital input register and
`DAS08JR_DO_REG` for the digital output register, and add some comments.

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 11e8457f

drivers/staging/comedi/drivers/das08.c

+5 −4
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ 


*/



#define DAS08JR_DIO		3

#define DAS08JR_DI_REG		0x03	/* (R) digital inputs ("JR" boards) */

#define DAS08JR_DO_REG		0x03	/* (W) digital outputs ("JR" boards) */

#define DAS08JR_AO_LSB(x)	((x) ? 6 : 4)

#define DAS08JR_AO_MSB(x)	((x) ? 7 : 5)
@@ -324,7 +325,7 @@ static int das08jr_di_rbits(struct comedi_device *dev, 
			    struct comedi_insn *insn, unsigned int *data)

{

	data[0] = 0;

	data[1] = inb(dev->iobase + DAS08JR_DIO);

	data[1] = inb(dev->iobase + DAS08JR_DI_REG);



	return insn->n;

}
@@ -335,7 +336,7 @@ static int das08jr_do_wbits(struct comedi_device *dev, 
			    unsigned int *data)

{

	if (comedi_dio_update_state(s, data))

		outb(s->state, dev->iobase + DAS08JR_DIO);

		outb(s->state, dev->iobase + DAS08JR_DO_REG);



	data[1] = s->state;
@@ -355,7 +356,7 @@ static void das08_ao_set_data(struct comedi_device *dev, 
		outb(lsb, dev->iobase + DAS08JR_AO_LSB(chan));

		outb(msb, dev->iobase + DAS08JR_AO_MSB(chan));

		/* load DACs */

		inb(dev->iobase + DAS08JR_DIO);

		inb(dev->iobase + DAS08JR_DI_REG);

	} else {

		outb(lsb, dev->iobase + DAS08AO_AO_LSB(chan));

		outb(msb, dev->iobase + DAS08AO_AO_MSB(chan));