Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141651
b: refs/heads/master
c: c0d1482
h: refs/heads/master
i:
  141649: e004bd6
  141647: 1924711
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 8ee019b commit 50bcf06
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: c1dd2fa6a12bfba92d3522fa43173480f52dbaed
refs/heads/master: c0d1482252b9b87c62b8d0ddb7ceecc369c6e34e
12 changes: 6 additions & 6 deletions trunk/drivers/staging/comedi/drivers/ssv_dnp.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ Status: unknown

/* This data structure holds information about the supported boards -------- */

typedef struct dnp_board_struct {
struct dnp_board {
const char *name;
int ai_chans;
int ai_bits;
int have_dio;
} dnp_board;
};

static const dnp_board dnp_boards[] = { /* we only support one DNP 'board' */
static const struct dnp_board dnp_boards[] = { /* we only support one DNP 'board' */
{ /* variant at the moment */
name: "dnp-1486",
ai_chans:16,
Expand All @@ -69,7 +69,7 @@ static const dnp_board dnp_boards[] = { /* we only support one DNP 'board' */
};

/* Useful for shorthand access to the particular board structure ----------- */
#define thisboard ((const dnp_board *)dev->board_ptr)
#define thisboard ((const struct dnp_board *)dev->board_ptr)

/* This structure is for data unique to the DNP driver --------------------- */
struct dnp_private_data {
Expand Down Expand Up @@ -99,8 +99,8 @@ static struct comedi_driver driver_dnp = {
detach:dnp_detach,
board_name:&dnp_boards[0].name,
/* only necessary for non-PnP devs */
offset:sizeof(dnp_board),/* like ISA-PnP, PCI or PCMCIA. */
num_names:sizeof(dnp_boards) / sizeof(dnp_board),
offset:sizeof(struct dnp_board),/* like ISA-PnP, PCI or PCMCIA. */
num_names:sizeof(dnp_boards) / sizeof(struct dnp_board),
};

COMEDI_INITCLEANUP(driver_dnp);
Expand Down

0 comments on commit 50bcf06

Please sign in to comment.