UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: pcl726: remove digital i/o register offsets from boardinfo 

The PCL-727 board uses different register offsets for the digital input and
output ports. Instead of having all the register offsets in the boardinfo,
replace them with a simple bit-field flag, 'is_pcl727'. Use that flag in the
(*insn_bits) functions to determine what registers need to be used.

To save a bit of space, change the 'have_dio' flag in the boardinfo to a
bit-field.

For aesthetics, rename and tidy up the register map defines.

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 2013-09-25 15:38:55 -07:00 committed by Greg Kroah-Hartman
parent 47825a9b1b
commit 3f4d010182
1 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/staging/comedi/drivers/pcl726.c
View File

@ -73,16 +73,15 @@ Interrupts are not supported.
#define PCL726_AO_MSB_REG(x) (0x00 + ((x) * 2)) #define PCL726_AO_MSB_REG(x) (0x00 + ((x) * 2))
#define PCL726_AO_LSB_REG(x) (0x01 + ((x) * 2)) #define PCL726_AO_LSB_REG(x) (0x01 + ((x) * 2))
#define PCL726_DO_MSB_REG 0x0c
#define PCL726_DO_LSB_REG 0x0d
#define PCL726_DI_MSB_REG 0x0e
#define PCL726_DI_LSB_REG 0x0f
#define PCL726_DO_HI 12 #define PCL727_DI_MSB_REG 0x00
#define PCL726_DO_LO 13 #define PCL727_DI_LSB_REG 0x01
#define PCL726_DI_HI 14 #define PCL727_DO_MSB_REG 0x18
#define PCL726_DI_LO 15 #define PCL727_DO_LSB_REG 0x19
#define PCL727_DO_HI 24
#define PCL727_DO_LO 25
#define PCL727_DI_HI 0
#define PCL727_DI_LO 1
static const struct comedi_lrange *const rangelist_726[] = { static const struct comedi_lrange *const rangelist_726[] = {
&range_unipolar5, &range_unipolar10, &range_unipolar5, &range_unipolar10,
@ -109,11 +108,8 @@ struct pcl726_board {
int num_of_ranges; /* num of ranges */ int num_of_ranges; /* num of ranges */
unsigned int IRQbits; /* allowed interrupts */ unsigned int IRQbits; /* allowed interrupts */
unsigned int io_range; /* len of IO space */ unsigned int io_range; /* len of IO space */
char have_dio; /* 1=card have DI/DO ports */ unsigned int have_dio:1;
int di_hi; /* ports for DI/DO operations */ unsigned int is_pcl727:1;
int di_lo;
int do_hi;
int do_lo;
const struct comedi_lrange *const *range_type_list; const struct comedi_lrange *const *range_type_list;
/* list of supported ranges */ /* list of supported ranges */
}; };
@ -125,10 +121,6 @@ static const struct pcl726_board boardtypes[] = {
.num_of_ranges = 6, .num_of_ranges = 6,
.io_range = PCL726_SIZE, .io_range = PCL726_SIZE,
.have_dio = 1, .have_dio = 1,
.di_hi = PCL726_DI_HI,
.di_lo = PCL726_DI_LO,
.do_hi = PCL726_DO_HI,
.do_lo = PCL726_DO_LO,
.range_type_list = &rangelist_726[0], .range_type_list = &rangelist_726[0],
}, { }, {
.name = "pcl727", .name = "pcl727",
@ -136,10 +128,7 @@ static const struct pcl726_board boardtypes[] = {
.num_of_ranges = 4, .num_of_ranges = 4,
.io_range = PCL727_SIZE, .io_range = PCL727_SIZE,
.have_dio = 1, .have_dio = 1,
.di_hi = PCL727_DI_HI, .is_pcl727 = 1,
.di_lo = PCL727_DI_LO,
.do_hi = PCL727_DO_HI,
.do_lo = PCL727_DO_LO,
.range_type_list = &rangelist_727[0], .range_type_list = &rangelist_727[0],
}, { }, {
.name = "pcl728", .name = "pcl728",
@ -154,10 +143,6 @@ static const struct pcl726_board boardtypes[] = {
.IRQbits = 0x96e8, .IRQbits = 0x96e8,
.io_range = PCL726_SIZE, .io_range = PCL726_SIZE,
.have_dio = 1, .have_dio = 1,
.di_hi = PCL726_DI_HI,
.di_lo = PCL726_DI_LO,
.do_hi = PCL726_DO_HI,
.do_lo = PCL726_DO_LO,
.range_type_list = &rangelist_726[0], .range_type_list = &rangelist_726[0],
}, { }, {
.name = "acl6128", .name = "acl6128",
@ -222,12 +207,21 @@ static int pcl726_ao_insn_read(struct comedi_device *dev,
static int pcl726_di_insn_bits(struct comedi_device *dev, static int pcl726_di_insn_bits(struct comedi_device *dev,
struct comedi_subdevice *s, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data) struct comedi_insn *insn,
unsigned int *data)
{ {
const struct pcl726_board *board = comedi_board(dev); const struct pcl726_board *board = comedi_board(dev);
unsigned int val;
data[1] = inb(dev->iobase + board->di_lo) | if (board->is_pcl727) {
(inb(dev->iobase + board->di_hi) << 8); val = inb(dev->iobase + PCL727_DI_LSB_REG);
val |= (inb(dev->iobase + PCL727_DI_MSB_REG) << 8);
} else {
val = inb(dev->iobase + PCL726_DI_LSB_REG);
val |= (inb(dev->iobase + PCL726_DI_MSB_REG) << 8);
}
data[1] = val;
return insn->n; return insn->n;
} }
@ -238,14 +232,22 @@ static int pcl726_do_insn_bits(struct comedi_device *dev,
unsigned int *data) unsigned int *data)
{ {
const struct pcl726_board *board = comedi_board(dev); const struct pcl726_board *board = comedi_board(dev);
unsigned long io = dev->iobase;
unsigned int mask; unsigned int mask;
mask = comedi_dio_update_state(s, data); mask = comedi_dio_update_state(s, data);
if (mask) { if (mask) {
if (board->is_pcl727) {
if (mask & 0x00ff) if (mask & 0x00ff)
outb(s->state & 0xff, dev->iobase + board->do_lo); outb(s->state & 0xff, io + PCL727_DO_LSB_REG);
if (mask & 0xff00) if (mask & 0xff00)
outb((s->state >> 8), dev->iobase + board->do_hi); outb((s->state >> 8), io + PCL727_DO_MSB_REG);
} else {
if (mask & 0x00ff)
outb(s->state & 0xff, io + PCL726_DO_LSB_REG);
if (mask & 0xff00)
outb((s->state >> 8), io + PCL726_DO_MSB_REG);
}
} }
data[1] = s->state; data[1] = s->state;