Commit 73b0d70a authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman

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

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cc0ea813
...@@ -93,11 +93,13 @@ struct str_TimerDetails { ...@@ -93,11 +93,13 @@ struct str_TimerDetails {
unsigned char b_TimeBase; unsigned char b_TimeBase;
}; };
typedef struct { struct str_TimerMainHeader {
unsigned short w_Ntimer; unsigned short w_Ntimer;
struct str_TimerDetails s_TimerDetails[4]; // supports 4 timers struct str_TimerDetails s_TimerDetails[4]; // supports 4 timers
} str_TimerMainHeader; };
typedef struct { typedef struct {
unsigned short w_Nchannel; unsigned short w_Nchannel;
...@@ -129,7 +131,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, ...@@ -129,7 +131,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress,
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,
str_TimerMainHeader * s_Header); struct str_TimerMainHeader * s_Header);
int i_EepromReadAnlogOutputHeader(unsigned short w_PCIBoardEepromAddress, int i_EepromReadAnlogOutputHeader(unsigned short w_PCIBoardEepromAddress,
char *pc_PCIChipInformation, unsigned short w_Address, char *pc_PCIChipInformation, unsigned short w_Address,
...@@ -808,7 +810,7 @@ int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress, ...@@ -808,7 +810,7 @@ int i_EepromReadMainHeader(unsigned short w_PCIBoardEepromAddress,
struct str_MainHeader s_MainHeader; struct str_MainHeader s_MainHeader;
struct str_DigitalInputHeader s_DigitalInputHeader; struct str_DigitalInputHeader s_DigitalInputHeader;
struct str_DigitalOutputHeader s_DigitalOutputHeader; struct str_DigitalOutputHeader s_DigitalOutputHeader;
//str_TimerMainHeader s_TimerMainHeader,s_WatchdogMainHeader; //struct str_TimerMainHeader s_TimerMainHeader,s_WatchdogMainHeader;
str_AnalogOutputHeader s_AnalogOutputHeader; str_AnalogOutputHeader s_AnalogOutputHeader;
str_AnalogInputHeader s_AnalogInputHeader; str_AnalogInputHeader s_AnalogInputHeader;
...@@ -995,7 +997,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, ...@@ -995,7 +997,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress, | | Function Name : int i_EepromReadTimerHeader(unsigned short w_PCIBoardEepromAddress, |
| char *pc_PCIChipInformation,WORD w_Address, | | char *pc_PCIChipInformation,WORD w_Address, |
| str_TimerMainHeader *s_Header) | | struct str_TimerMainHeader *s_Header) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read Timer or Watchdog Header | | Task : Read Timer or Watchdog Header |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -1003,7 +1005,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, ...@@ -1003,7 +1005,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress,
| | | |
| char *pc_PCIChipInformation : PCI Chip Type. | | char *pc_PCIChipInformation : PCI Chip Type. |
| | | |
| str_TimerMainHeader *s_Header: Timer Header | | struct str_TimerMainHeader *s_Header: Timer Header |
| Pointer | | Pointer |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Output Parameters : - | | Output Parameters : - |
...@@ -1013,7 +1015,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress, ...@@ -1013,7 +1015,7 @@ int i_EepromReadDigitalOutputHeader(unsigned short w_PCIBoardEepromAddress,
*/ */
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,
str_TimerMainHeader * s_Header) struct str_TimerMainHeader * s_Header)
{ {
unsigned short i, w_Size = 0, w_Temp; unsigned short i, w_Size = 0, w_Temp;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment