Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141639
b: refs/heads/master
c: 657f81e
h: refs/heads/master
i:
  141637: 34636db
  141635: b9a7899
  141631: 414aaed
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 433a80c commit 6880b36
Show file tree
Hide file tree
Showing 2 changed files with 7 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: d89da61754236aee5ab8faf0cab7f5449a2fdd34
refs/heads/master: 657f81ec27758ddb859ea9c74929996bea607194
12 changes: 6 additions & 6 deletions trunk/drivers/staging/comedi/drivers/pcmmio.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ static int ao_winsn(struct comedi_device *, struct comedi_subdevice *, struct co
* boards in this way is optional, and completely driver-dependent.
* Some drivers use arrays such as this, other do not.
*/
typedef struct pcmmio_board_struct {
struct pcmmio_board {
const char *name;
const int dio_num_asics;
const int dio_num_ports;
Expand All @@ -165,7 +165,7 @@ typedef struct pcmmio_board_struct {
const int n_ao_chans;
const struct comedi_lrange *ai_range_table, *ao_range_table;
comedi_insn_fn_t ai_rinsn, ao_rinsn, ao_winsn;
} pcmmio_board;
};

static const struct comedi_lrange ranges_ai =
{ 4, {RANGE(-5., 5.), RANGE(-10., 10.), RANGE(0., 5.), RANGE(0.,
Expand All @@ -177,7 +177,7 @@ static const struct comedi_lrange ranges_ao =
RANGE(-2.5, 2.5), RANGE(-2.5, 7.5)}
};

static const pcmmio_board pcmmio_boards[] = {
static const struct pcmmio_board pcmmio_boards[] = {
{
name: "pcmmio",
dio_num_asics:1,
Expand All @@ -197,7 +197,7 @@ static const pcmmio_board pcmmio_boards[] = {
/*
* Useful for shorthand access to the particular board structure
*/
#define thisboard ((const pcmmio_board *)dev->board_ptr)
#define thisboard ((const struct pcmmio_board *)dev->board_ptr)

/* this structure is for data unique to this subdevice. */
typedef struct {
Expand Down Expand Up @@ -291,8 +291,8 @@ static struct comedi_driver driver = {
* devices are such boards.
*/
board_name:&pcmmio_boards[0].name,
offset:sizeof(pcmmio_board),
num_names:sizeof(pcmmio_boards) / sizeof(pcmmio_board),
offset:sizeof(struct pcmmio_board),
num_names:sizeof(pcmmio_boards) / sizeof(struct pcmmio_board),
};

static int pcmmio_dio_insn_bits(struct comedi_device * dev, struct comedi_subdevice * s,
Expand Down

0 comments on commit 6880b36

Please sign in to comment.