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

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

staging: comedi: pcl816: move pcl816_reset() 



For aesthetics, move this function to follow the pcl812 and pcl818 drivers
better.

Remove the commented out cut-and-paste code from the pcl818 driver.

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 4ab490b3

drivers/staging/comedi/drivers/pcl816.c

+20 −23
Original line number Diff line number Diff line
@@ -552,29 +552,6 @@ static int pcl816_ai_cancel(struct comedi_device *dev, 
	return 0;

}



static void pcl816_reset(struct comedi_device *dev)

{

	unsigned long timer_base = dev->iobase + PCL816_TIMER_BASE;



/* outb (0, dev->iobase + PCL818_DA_LO);         DAC=0V */

/* outb (0, dev->iobase + PCL818_DA_HI); */

/* udelay (1); */

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

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

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



	/* Stop pacer */

	i8254_set_mode(timer_base, 0, 2, I8254_MODE0 | I8254_BINARY);

	i8254_set_mode(timer_base, 0, 1, I8254_MODE0 | I8254_BINARY);

	i8254_set_mode(timer_base, 0, 0, I8254_MODE0 | I8254_BINARY);



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



	/* set all digital outputs low */

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

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

}



static int

check_channel_list(struct comedi_device *dev,

		   struct comedi_subdevice *s, unsigned int *chanlist,
@@ -679,6 +656,26 @@ static int pcl816_do_insn_bits(struct comedi_device *dev, 
	return insn->n;

}



static void pcl816_reset(struct comedi_device *dev)

{

	unsigned long timer_base = dev->iobase + PCL816_TIMER_BASE;



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

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

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



	/* Stop pacer */

	i8254_set_mode(timer_base, 0, 2, I8254_MODE0 | I8254_BINARY);

	i8254_set_mode(timer_base, 0, 1, I8254_MODE0 | I8254_BINARY);

	i8254_set_mode(timer_base, 0, 0, I8254_MODE0 | I8254_BINARY);



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



	/* set all digital outputs low */

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

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

}



static int pcl816_attach(struct comedi_device *dev, struct comedi_devconfig *it)

{

	const struct pcl816_board *board = comedi_board(dev);