Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 141616
b: refs/heads/master
c: 0cb5e8f
h: refs/heads/master
v: v3
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Apr 3, 2009
1 parent 03ca706 commit e422fe1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 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: 125edf55eb4c722afa76b43da40f24a6fd2421ef
refs/heads/master: 0cb5e8ff4502d60967177038e2d740dae759e4b2
8 changes: 5 additions & 3 deletions trunk/drivers/staging/comedi/drivers/ni_660x.c
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,16 @@ static inline unsigned NI_660X_GPCT_SUBDEV(unsigned index)
return NI_660X_GPCT_SUBDEV_0 + index;
}

typedef struct {
struct NI_660xRegisterData {

const char *name; // Register Name
int offset; // Offset from base address from GPCT chip
enum ni_660x_register_direction direction;
enum ni_660x_register_width size; // 1 byte, 2 bytes, or 4 bytes
} NI_660xRegisterData;
};


static const NI_660xRegisterData registerData[NumRegisters] = {
static const struct NI_660xRegisterData registerData[NumRegisters] = {
{"G0 Interrupt Acknowledge", 0x004, NI_660x_WRITE, DATA_2B},
{"G0 Status Register", 0x004, NI_660x_READ, DATA_2B},
{"G1 Interrupt Acknowledge", 0x006, NI_660x_WRITE, DATA_2B},
Expand Down

0 comments on commit e422fe1

Please sign in to comment.