Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141615
b: refs/heads/master
c: 125edf5
h: refs/heads/master
i:
  141613: c2a4199
  141611: 6b50c68
  141607: fe4a44c
  141599: 4c0925b
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 1711ab7 commit 03ca706
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 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: 16d38ca3514bfcfad78f97dc136c955616303bf4
refs/heads/master: 125edf55eb4c722afa76b43da40f24a6fd2421ef
12 changes: 7 additions & 5 deletions trunk/drivers/staging/comedi/drivers/ni_65xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,17 @@ static struct comedi_driver driver_ni_65xx = {
detach:ni_65xx_detach,
};

typedef struct {
struct ni_65xx_board {

int dev_id;
const char *name;
unsigned num_dio_ports;
unsigned num_di_ports;
unsigned num_do_ports;
unsigned invert_outputs:1;
} ni_65xx_board;
static const ni_65xx_board ni_65xx_boards[] = {
};

static const struct ni_65xx_board ni_65xx_boards[] = {
{
dev_id: 0x7085,
name: "pci-6509",
Expand Down Expand Up @@ -239,15 +241,15 @@ static const ni_65xx_board ni_65xx_boards[] = {
};

#define n_ni_65xx_boards (sizeof(ni_65xx_boards)/sizeof(ni_65xx_boards[0]))
static inline const ni_65xx_board *board(struct comedi_device * dev)
static inline const struct ni_65xx_board *board(struct comedi_device * dev)
{
return dev->board_ptr;
}
static inline unsigned ni_65xx_port_by_channel(unsigned channel)
{
return channel / ni_65xx_channels_per_port;
}
static inline unsigned ni_65xx_total_num_ports(const ni_65xx_board * board)
static inline unsigned ni_65xx_total_num_ports(const struct ni_65xx_board * board)
{
return board->num_dio_ports + board->num_di_ports + board->num_do_ports;
}
Expand Down

0 comments on commit 03ca706

Please sign in to comment.