Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141671
b: refs/heads/master
c: 1c7f40d
h: refs/heads/master
i:
  141669: 2f57bcb
  141667: bf39563
  141663: 34b72d8
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 0397267 commit c90b207
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: fb1314de41d8fbd14e7aeb735d7849be8a852dbc
refs/heads/master: 1c7f40d91b99e73ae11056708225058afd0278d7
14 changes: 8 additions & 6 deletions trunk/drivers/staging/comedi/drivers/pcl816.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ static const struct comedi_lrange range_pcl816 = { 8, {
UNI_RANGE(1.25),
}
};
typedef struct {
struct pcl816_board {

const char *name; // board name
int n_ranges; // len of range list
int n_aichan; // num of A/D chans in diferencial mode
Expand All @@ -119,9 +120,10 @@ typedef struct {
int ai_chanlist; // allowed len of channel list A/D
int ao_chanlist; // allowed len of channel list D/A
int i8254_osc_base; // 1/frequency of on board oscilator in ns
} boardtype;
};


static const boardtype boardtypes[] = {
static const struct pcl816_board boardtypes[] = {
{"pcl816", 8, 16, 10000, 1, 16, 16, &range_pcl816,
&range_pcl816, PCLx1x_RANGE,
0x00fc, // IRQ mask
Expand All @@ -142,9 +144,9 @@ static const boardtype boardtypes[] = {
100},
};

#define n_boardtypes (sizeof(boardtypes)/sizeof(boardtype))
#define n_boardtypes (sizeof(boardtypes)/sizeof(struct pcl816_board))
#define devpriv ((struct pcl816_private *)dev->private)
#define this_board ((const boardtype *)dev->board_ptr)
#define this_board ((const struct pcl816_board *)dev->board_ptr)

static int pcl816_attach(struct comedi_device * dev, struct comedi_devconfig * it);
static int pcl816_detach(struct comedi_device * dev);
Expand All @@ -161,7 +163,7 @@ static struct comedi_driver driver_pcl816 = {
detach:pcl816_detach,
board_name:&boardtypes[0].name,
num_names:n_boardtypes,
offset:sizeof(boardtype),
offset:sizeof(struct pcl816_board),
};

COMEDI_INITCLEANUP(driver_pcl816);
Expand Down

0 comments on commit c90b207

Please sign in to comment.