diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-16 22:13:31 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 14:54:06 -0700 |
| commit | 67080790a44f6633acc250db915a4f6481e81ba1 (patch) | |
| tree | d59a2716d8c62bee73e41b43831f21444e95d237 /drivers/staging/comedi/drivers/jr3_pci.h | |
| parent | 1c31ddaf9b46bec3df20b3a3b95049f45f43bf84 (diff) | |
Staging: comedi: Remove jr3_channel_t 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/jr3_pci.h')
| -rw-r--r-- | drivers/staging/comedi/drivers/jr3_pci.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/jr3_pci.h b/drivers/staging/comedi/drivers/jr3_pci.h index d98aaa7c6f5c..3585f2941bca 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.h +++ b/drivers/staging/comedi/drivers/jr3_pci.h @@ -264,7 +264,7 @@ struct intern_transform { /* JR3 force/torque sensor data definition. For more information see sensor and */ /* hardware manuals. */ -typedef struct force_sensor_data { +struct jr3_channel { /* Raw_channels is the area used to store the raw data coming from */ /* the sensor. */ @@ -667,12 +667,12 @@ typedef struct force_sensor_data { */ struct intern_transform transforms[0x10]; /* offset 0x0200 */ -} jr3_channel_t; +}; struct jr3_t { struct { u32 program_low[0x4000]; /* 0x00000 - 0x10000 */ - jr3_channel_t data; /* 0x10000 - 0x10c00 */ + struct jr3_channel data; /* 0x10000 - 0x10c00 */ char pad2[0x30000 - 0x00c00]; /* 0x10c00 - 0x40000 */ u32 program_high[0x8000]; /* 0x40000 - 0x60000 */ u32 reset; /* 0x60000 - 0x60004 */ |