summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/ni_660x.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2009-03-16 22:15:56 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:54:09 -0700
commit0cb5e8ff4502d60967177038e2d740dae759e4b2 (patch)
tree0a92ae658eea3c1920e208aef3d6033a68da1f5f /drivers/staging/comedi/drivers/ni_660x.c
parent125edf55eb4c722afa76b43da40f24a6fd2421ef (diff)
Staging: comedi: Remove NI_660xRegisterData typedef
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_660x.c')
-rw-r--r--drivers/staging/comedi/drivers/ni_660x.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/ni_660x.c b/drivers/staging/comedi/drivers/ni_660x.c
index 0af2049feb99..2a3c1302d620 100644
--- a/drivers/staging/comedi/drivers/ni_660x.c
+++ b/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},