lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: comedi: Remove str_DigitalOutputHeader typedef in addi-data/addi_eeprom.c

Browse Source 
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Bill Pemberton
2009-03-25 11:06:08 -04:00
committed by Greg Kroah-Hartman
parent a28f34b7e9
commit d2e0cc9ae1
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
View File

@@ -76,9 +76,11 @@ struct str_DigitalInputHeader {
unsigned short w_NinterruptLogic; unsigned short w_NinterruptLogic;
}; };
typedef struct { struct str_DigitalOutputHeader {
unsigned short w_Nchannel; unsigned short w_Nchannel;
} str_DigitalOutputHeader; };
// used for timer as well as watchdog // used for timer as well as watchdog
@@ -121,7 +123,7 @@ int i_EepromReadDigitalInputHeader(unsigned short w_PCIBoardEepromAddress,
int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress,
char *pc_PCIChipInformation, unsigned short w_Address, char *pc_PCIChipInformation, unsigned short w_Address,
str_DigitalOutputHeader * s_Header); struct str_DigitalOutputHeader * s_Header);
int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress, int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress,
char *pc_PCIChipInformation, unsigned short w_Address, char *pc_PCIChipInformation, unsigned short w_Address,
@@ -803,7 +805,7 @@ int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress,
unsigned int ui_Temp; unsigned int ui_Temp;
struct str_MainHeader s_MainHeader; struct str_MainHeader s_MainHeader;
struct str_DigitalInputHeader s_DigitalInputHeader; struct str_DigitalInputHeader s_DigitalInputHeader;
str_DigitalOutputHeader s_DigitalOutputHeader; struct str_DigitalOutputHeader s_DigitalOutputHeader;
//str_TimerMainHeader s_TimerMainHeader,s_WatchdogMainHeader; //str_TimerMainHeader s_TimerMainHeader,s_WatchdogMainHeader;
str_AnalogOutputHeader s_AnalogOutputHeader; str_AnalogOutputHeader s_AnalogOutputHeader;
str_AnalogInputHeader s_AnalogInputHeader; str_AnalogInputHeader s_AnalogInputHeader;
@@ -959,7 +961,7 @@ int i_EepromReadDigitalInputHeader(unsigned short w_PCIBoardEepromAddress,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_EepromReadDigitalOutputHeader(unsigned short | | Function Name : int i_EepromReadDigitalOutputHeader(unsigned short |
| w_PCIBoardEepromAddress,char *pc_PCIChipInformation, | | w_PCIBoardEepromAddress,char *pc_PCIChipInformation, |
| unsigned short w_Address,str_DigitalOutputHeader *s_Header) | | unsigned short w_Address,struct str_DigitalOutputHeader *s_Header) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read Digital Output Header | | Task : Read Digital Output Header |
@@ -968,7 +970,7 @@ int i_EepromReadDigitalInputHeader(unsigned short w_PCIBoardEepromAddress,
| | | |
| char *pc_PCIChipInformation : PCI Chip Type. | | char *pc_PCIChipInformation : PCI Chip Type. |
| | | |
| str_DigitalOutputHeader *s_Header: Digital Output Header| | struct str_DigitalOutputHeader *s_Header: Digital Output Header|
| Pointer | | Pointer |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
@@ -978,7 +980,7 @@ int i_EepromReadDigitalInputHeader(unsigned short w_PCIBoardEepromAddress,
*/ */
int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress,
char *pc_PCIChipInformation, unsigned short w_Address, char *pc_PCIChipInformation, unsigned short w_Address,
str_DigitalOutputHeader * s_Header) struct str_DigitalOutputHeader * s_Header)
{ {
// Read Nbr channels // Read Nbr channels
s_Header->w_Nchannel = s_Header->w_Nchannel =