Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141670
b: refs/heads/master
c: fb1314d
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 2f57bcb commit 0397267
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 292090dcc85a6e8a4132a6551d73bc467b270693
refs/heads/master: fb1314de41d8fbd14e7aeb735d7849be8a852dbc
14 changes: 8 additions & 6 deletions trunk/drivers/staging/comedi/drivers/pcl812.c
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,8 @@ static const struct comedi_lrange range_a821pgh_ai = { 4, {
static int pcl812_attach(struct comedi_device * dev, struct comedi_devconfig * it);
static int pcl812_detach(struct comedi_device * dev);

typedef struct {
struct pcl812_board {

const char *name; // board name
int board_type; // type of this board
int n_aichan; // num of AI chans in S.E.
Expand All @@ -312,9 +313,10 @@ typedef struct {
unsigned char DMAbits; // allowed DMA chans
unsigned char io_range; // iorange for this board
unsigned char haveMPC508; // 1=board use MPC508A multiplexor
} boardtype;
};


static const boardtype boardtypes[] = {
static const struct pcl812_board boardtypes[] = {
{"pcl812", boardPCL812, 16, 0, 2, 16, 16, 0x0fff,
33000, 500, &range_bipolar10, &range_unipolar5,
0xdcfc, 0x0a, PCLx1x_IORANGE, 0},
Expand Down Expand Up @@ -371,8 +373,8 @@ static const boardtype boardtypes[] = {
0xdcfc, 0x0a, PCLx1x_IORANGE, 0},
};

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

static struct comedi_driver driver_pcl812 = {
driver_name:"pcl812",
Expand All @@ -381,7 +383,7 @@ static struct comedi_driver driver_pcl812 = {
detach:pcl812_detach,
board_name:&boardtypes[0].name,
num_names:n_boardtypes,
offset:sizeof(boardtype),
offset:sizeof(struct pcl812_board),
};

COMEDI_INITCLEANUP(driver_pcl812);
Expand Down

0 comments on commit 0397267

Please sign in to comment.