From e422fe12f358d34f4004e2cb24158c9a531ad2d3 Mon Sep 17 00:00:00 2001 From: Bill Pemberton Date: Mon, 16 Mar 2009 22:15:56 -0400 Subject: [PATCH] --- yaml --- r: 141616 b: refs/heads/master c: 0cb5e8ff4502d60967177038e2d740dae759e4b2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/ni_660x.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4274423ba14e..230669b848a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 125edf55eb4c722afa76b43da40f24a6fd2421ef +refs/heads/master: 0cb5e8ff4502d60967177038e2d740dae759e4b2 diff --git a/trunk/drivers/staging/comedi/drivers/ni_660x.c b/trunk/drivers/staging/comedi/drivers/ni_660x.c index 0af2049feb99..2a3c1302d620 100644 --- a/trunk/drivers/staging/comedi/drivers/ni_660x.c +++ b/trunk/drivers/staging/comedi/drivers/ni_660x.c @@ -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},