diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2009-03-25 11:06:19 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-19 11:00:27 -0700 |
| commit | 73b0d70aeb089bcfa131d8f14f547dcd933335d6 (patch) | |
| tree | fe181a5239267eb76c5c78ec3cf83d4078a01d8d | |
| parent | cc0ea813f2f3027f43e7233add423be676dd8ff3 (diff) | |
| download | kernel-crypto-73b0d70aeb089bcfa131d8f14f547dcd933335d6.tar.gz kernel-crypto-73b0d70aeb089bcfa131d8f14f547dcd933335d6.tar.xz kernel-crypto-73b0d70aeb089bcfa131d8f14f547dcd933335d6.zip | |
Staging: comedi: Remove str_TimerMainHeader typedef in addi-data/addi_eeprom.c
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/comedi/drivers/addi-data/addi_eeprom.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c index e0da604373e..2e9c15debdb 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c @@ -93,11 +93,13 @@ struct str_TimerDetails { unsigned char b_TimeBase; }; -typedef struct { +struct str_TimerMainHeader { + unsigned short w_Ntimer; struct str_TimerDetails s_TimerDetails[4]; // supports 4 timers -} str_TimerMainHeader; +}; + typedef struct { unsigned short w_Nchannel; @@ -129,7 +131,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress, char *pc_PCIChipInformation, unsigned short w_Address, - str_TimerMainHeader * s_Header); + struct str_TimerMainHeader * s_Header); int i_EepromReadAnlogOutputHeader(unsigned short w_PCIBoardEepromAddress, char *pc_PCIChipInformation, unsigned short w_Address, @@ -808,7 +810,7 @@ int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress, struct str_MainHeader s_MainHeader; struct str_DigitalInputHeader s_DigitalInputHeader; struct str_DigitalOutputHeader s_DigitalOutputHeader; - //str_TimerMainHeader s_TimerMainHeader,s_WatchdogMainHeader; + //struct str_TimerMainHeader s_TimerMainHeader,s_WatchdogMainHeader; str_AnalogOutputHeader s_AnalogOutputHeader; str_AnalogInputHeader s_AnalogInputHeader; @@ -995,7 +997,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, +----------------------------------------------------------------------------+ | Function Name : int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress, | | char *pc_PCIChipInformation,WORD w_Address, | -| str_TimerMainHeader *s_Header) | +| struct str_TimerMainHeader *s_Header) | +----------------------------------------------------------------------------+ | Task : Read Timer or Watchdog Header | +----------------------------------------------------------------------------+ @@ -1003,7 +1005,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, | | | char *pc_PCIChipInformation : PCI Chip Type. | | | -| str_TimerMainHeader *s_Header: Timer Header | +| struct str_TimerMainHeader *s_Header: Timer Header | | Pointer | +----------------------------------------------------------------------------+ | Output Parameters : - | @@ -1013,7 +1015,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, */ int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress, char *pc_PCIChipInformation, unsigned short w_Address, - str_TimerMainHeader * s_Header) + struct str_TimerMainHeader * s_Header) { unsigned short i, w_Size = 0, w_Temp; |