staging: comedi: pcl730: tidy up the boardinfo
Convert the boardinfo declaration to C99 format and move it near the struct definition. Since the *_SIZE defines are only used in the boardinfo, remove them and just open code the values in the boardinfo. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e3693fd3ba
commit
a32b885ebe
1 changed files with 13 additions and 9 deletions
|
@ -19,19 +19,29 @@ The ACL-7130 card have an 8254 timer/counter not supported by this driver.
|
||||||
|
|
||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
|
|
||||||
#define PCL730_SIZE 4
|
|
||||||
#define ACL7130_SIZE 8
|
|
||||||
#define PCL730_IDIO_LO 0 /* Isolated Digital I/O low byte (ID0-ID7) */
|
#define PCL730_IDIO_LO 0 /* Isolated Digital I/O low byte (ID0-ID7) */
|
||||||
#define PCL730_IDIO_HI 1 /* Isolated Digital I/O high byte (ID8-ID15) */
|
#define PCL730_IDIO_HI 1 /* Isolated Digital I/O high byte (ID8-ID15) */
|
||||||
#define PCL730_DIO_LO 2 /* TTL Digital I/O low byte (D0-D7) */
|
#define PCL730_DIO_LO 2 /* TTL Digital I/O low byte (D0-D7) */
|
||||||
#define PCL730_DIO_HI 3 /* TTL Digital I/O high byte (D8-D15) */
|
#define PCL730_DIO_HI 3 /* TTL Digital I/O high byte (D8-D15) */
|
||||||
|
|
||||||
struct pcl730_board {
|
struct pcl730_board {
|
||||||
|
|
||||||
const char *name; /* board name */
|
const char *name; /* board name */
|
||||||
unsigned int io_range; /* len of I/O space */
|
unsigned int io_range; /* len of I/O space */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const struct pcl730_board boardtypes[] = {
|
||||||
|
{
|
||||||
|
.name = "pcl730",
|
||||||
|
.io_range = 0x04,
|
||||||
|
}, {
|
||||||
|
.name = "iso730",
|
||||||
|
.io_range = 0x04,
|
||||||
|
}, {
|
||||||
|
.name = "acl7130",
|
||||||
|
.io_range = 0x08,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
static int pcl730_do_insn(struct comedi_device *dev, struct comedi_subdevice *s,
|
static int pcl730_do_insn(struct comedi_device *dev, struct comedi_subdevice *s,
|
||||||
struct comedi_insn *insn, unsigned int *data)
|
struct comedi_insn *insn, unsigned int *data)
|
||||||
{
|
{
|
||||||
|
@ -119,12 +129,6 @@ static int pcl730_attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct pcl730_board boardtypes[] = {
|
|
||||||
{ "pcl730", PCL730_SIZE, },
|
|
||||||
{ "iso730", PCL730_SIZE, },
|
|
||||||
{ "acl7130", ACL7130_SIZE, },
|
|
||||||
};
|
|
||||||
|
|
||||||
static struct comedi_driver pcl730_driver = {
|
static struct comedi_driver pcl730_driver = {
|
||||||
.driver_name = "pcl730",
|
.driver_name = "pcl730",
|
||||||
.module = THIS_MODULE,
|
.module = THIS_MODULE,
|
||||||
|
|
Loading…
Add table
Reference in a new issue