Skip to content

Commit

Permalink
Staging: comedi: pcl724: Remove boardtype typedef
Browse files Browse the repository at this point in the history
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 6445296 commit 01820e0
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions drivers/staging/comedi/drivers/pcl724.c
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,19 @@ See the source for configuration details.
static int pcl724_attach(struct comedi_device * dev, struct comedi_devconfig * it);
static int pcl724_detach(struct comedi_device * dev);

typedef struct {
struct pcl724_board {

const char *name; // board name
int dio; // num of DIO
int numofports; // num of 8255 subdevices
unsigned int IRQbits; // allowed interrupts
unsigned int io_range; // len of IO space
char can_have96;
char is_pet48;
} boardtype;
};


static const boardtype boardtypes[] = {
static const struct pcl724_board boardtypes[] = {
{"pcl724", 24, 1, 0x00fc, PCL724_SIZE, 0, 0,},
{"pcl722", 144, 6, 0x00fc, PCL722_SIZE, 1, 0,},
{"pcl731", 48, 2, 0x9cfc, PCL731_SIZE, 0, 0,},
Expand All @@ -78,8 +80,8 @@ static const boardtype boardtypes[] = {
{"pet48dio", 48, 2, 0x9eb8, PET48_SIZE, 0, 1,},
};

#define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype))
#define this_board ((const boardtype *)dev->board_ptr)
#define n_boardtypes (sizeof(boardtypes)/sizeof(struct pcl724_board))
#define this_board ((const struct pcl724_board *)dev->board_ptr)

static struct comedi_driver driver_pcl724 = {
driver_name:"pcl724",
Expand All @@ -88,7 +90,7 @@ static struct comedi_driver driver_pcl724 = {
detach:pcl724_detach,
board_name:&boardtypes[0].name,
num_names:n_boardtypes,
offset:sizeof(boardtype),
offset:sizeof(struct pcl724_board),
};

COMEDI_INITCLEANUP(driver_pcl724);
Expand Down

0 comments on commit 01820e0

Please sign in to comment.