Skip to content

L
linux
Commit 18002713 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files
Options

Staging: comedi: Remove CHAR, *PCHAR, and *PCSTR typedefs in addi-data 

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 3019b410
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 34 deletions
drivers/staging/comedi/drivers/addi-data/addi_common.h
View file @ 18002713
...@@ -37,8 +37,6 @@ ...@@ -37,8 +37,6 @@
#define SUCCESS 1 #define SUCCESS 1
/* variable type definition */ /* variable type definition */
typedef char CHAR, *PCHAR;
typedef const CHAR *PCSTR;
typedef unsigned char BYTE, *PBYTE; typedef unsigned char BYTE, *PBYTE;
typedef short SHORT, *PSHORT; typedef short SHORT, *PSHORT;
typedef unsigned short USHORT, *PUSHORT; typedef unsigned short USHORT, *PUSHORT;
...@@ -78,7 +76,7 @@ typedef const struct comedi_lrange *PCRANGE; ...@@ -78,7 +76,7 @@ typedef const struct comedi_lrange *PCRANGE;
/* structure for the boardtype */ /* structure for the boardtype */
typedef struct { typedef struct {
PCSTR pc_DriverName; // driver name const char *pc_DriverName; // driver name
INT i_VendorId; //PCI vendor a device ID of card INT i_VendorId; //PCI vendor a device ID of card
INT i_DeviceId; INT i_DeviceId;
INT i_IorangeBase0; INT i_IorangeBase0;
...@@ -86,7 +84,7 @@ typedef struct { ...@@ -86,7 +84,7 @@ typedef struct {
INT i_IorangeBase2; // base 2 range INT i_IorangeBase2; // base 2 range
INT i_IorangeBase3; // base 3 range INT i_IorangeBase3; // base 3 range
INT i_PCIEeprom; // eeprom present or not INT i_PCIEeprom; // eeprom present or not
PCHAR pc_EepromChip; // type of chip char *pc_EepromChip; // type of chip
INT i_NbrAiChannel; // num of A/D chans INT i_NbrAiChannel; // num of A/D chans
INT i_NbrAiChannelDiff; // num of A/D chans in diff mode INT i_NbrAiChannelDiff; // num of A/D chans in diff mode
INT i_AiChannelList; // len of chanlist INT i_AiChannelList; // len of chanlist
......
drivers/staging/comedi/drivers/addi-data/addi_eeprom.c
View file @ 18002713
...@@ -121,32 +121,32 @@ typedef struct { ...@@ -121,32 +121,32 @@ typedef struct {
/*****************************************/ /*****************************************/
INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, struct comedi_device *dev); char *pc_PCIChipInformation, struct comedi_device *dev);
INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, WORD w_Address, char *pc_PCIChipInformation, WORD w_Address,
str_DigitalInputHeader * s_Header); str_DigitalInputHeader * s_Header);
INT i_EepromReadDigitalOutputHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadDigitalOutputHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, WORD w_Address, char *pc_PCIChipInformation, WORD w_Address,
str_DigitalOutputHeader * s_Header); str_DigitalOutputHeader * s_Header);
INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, WORD w_Address, char *pc_PCIChipInformation, WORD w_Address,
str_TimerMainHeader * s_Header); str_TimerMainHeader * s_Header);
INT i_EepromReadAnlogOutputHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadAnlogOutputHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, WORD w_Address, char *pc_PCIChipInformation, WORD w_Address,
str_AnalogOutputHeader * s_Header); str_AnalogOutputHeader * s_Header);
INT i_EepromReadAnlogInputHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadAnlogInputHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, WORD w_Address, char *pc_PCIChipInformation, WORD w_Address,
str_AnalogInputHeader * s_Header); str_AnalogInputHeader * s_Header);
/******************************************/ /******************************************/
/* Eeprom Specific Functions */ /* Eeprom Specific Functions */
/******************************************/ /******************************************/
WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, PCHAR pc_PCIChipInformation, WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, char *pc_PCIChipInformation,
WORD w_EepromStartAddress); WORD w_EepromStartAddress);
void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress); void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress);
void v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue); void v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue);
...@@ -159,14 +159,14 @@ void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value); ...@@ -159,14 +159,14 @@ void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value);
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : WORD w_EepromReadWord | | Function Name : WORD w_EepromReadWord |
| (WORD w_PCIBoardEepromAddress, | | (WORD w_PCIBoardEepromAddress, |
| PCHAR pc_PCIChipInformation, | | char * pc_PCIChipInformation, |
| WORD w_EepromStartAddress) | | WORD w_EepromStartAddress) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read from eepromn a word | | Task : Read from eepromn a word |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address | | Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address |
| | | |
| PCHAR pc_PCIChipInformation : PCI Chip Type. | | char *pc_PCIChipInformation : PCI Chip Type. |
| | | |
| WORD w_EepromStartAddress : Selected eeprom address | | WORD w_EepromStartAddress : Selected eeprom address |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -176,7 +176,7 @@ void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value); ...@@ -176,7 +176,7 @@ void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value);
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, PCHAR pc_PCIChipInformation, WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, char *pc_PCIChipInformation,
WORD w_EepromStartAddress) WORD w_EepromStartAddress)
{ {
...@@ -522,7 +522,7 @@ void v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand, ...@@ -522,7 +522,7 @@ void v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand,
BYTE b_DataLengthInBits) BYTE b_DataLengthInBits)
{ {
CHAR c_BitPos = 0; char c_BitPos = 0;
DWORD dw_RegisterValue = 0; DWORD dw_RegisterValue = 0;
...@@ -656,7 +656,7 @@ void v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand, ...@@ -656,7 +656,7 @@ void v_EepromSendCommand76(DWORD dw_Address, DWORD dw_EepromCommand,
void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value) void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value)
{ {
CHAR c_BitPos = 0; char c_BitPos = 0;
DWORD dw_RegisterValue = 0; DWORD dw_RegisterValue = 0;
...@@ -787,13 +787,13 @@ void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value) ...@@ -787,13 +787,13 @@ void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value)
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, | | Function Name : INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, |
| PCHAR pc_PCIChipInformation,struct comedi_device *dev) | | char * pc_PCIChipInformation,struct comedi_device *dev) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read from eeprom Main Header | | Task : Read from eeprom Main Header |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address | | Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address |
| | | |
| PCHAR pc_PCIChipInformation : PCI Chip Type. | | char *pc_PCIChipInformation : PCI Chip Type. |
| | | |
| struct comedi_device *dev : comedi device structure | | struct comedi_device *dev : comedi device structure |
| pointer | | pointer |
...@@ -805,7 +805,7 @@ void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value) ...@@ -805,7 +805,7 @@ void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value)
*/ */
INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, struct comedi_device *dev) char *pc_PCIChipInformation, struct comedi_device *dev)
{ {
WORD w_Temp, i, w_Count = 0; WORD w_Temp, i, w_Count = 0;
UINT ui_Temp; UINT ui_Temp;
...@@ -921,7 +921,7 @@ INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, ...@@ -921,7 +921,7 @@ INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_EepromReadDigitalInputHeader(WORD | | Function Name : INT i_EepromReadDigitalInputHeader(WORD |
| w_PCIBoardEepromAddress,PCHAR pc_PCIChipInformation, | | w_PCIBoardEepromAddress,char *pc_PCIChipInformation, |
| WORD w_Address,str_DigitalInputHeader *s_Header) | | WORD w_Address,str_DigitalInputHeader *s_Header) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -929,7 +929,7 @@ INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, ...@@ -929,7 +929,7 @@ INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address | | Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address |
| | | |
| PCHAR pc_PCIChipInformation : PCI Chip Type. | | char *pc_PCIChipInformation : PCI Chip Type. |
| | | |
| str_DigitalInputHeader *s_Header: Digita Input Header | | str_DigitalInputHeader *s_Header: Digita Input Header |
| Pointer | | Pointer |
...@@ -940,7 +940,7 @@ INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress, ...@@ -940,7 +940,7 @@ INT i_EepromReadMainHeader(WORD w_PCIBoardEepromAddress,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, WORD w_Address, char *pc_PCIChipInformation, WORD w_Address,
str_DigitalInputHeader * s_Header) str_DigitalInputHeader * s_Header)
{ {
WORD w_Temp; WORD w_Temp;
...@@ -966,7 +966,7 @@ INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress, ...@@ -966,7 +966,7 @@ INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_EepromReadDigitalOutputHeader(WORD | | Function Name : INT i_EepromReadDigitalOutputHeader(WORD |
| w_PCIBoardEepromAddress,PCHAR pc_PCIChipInformation, | | w_PCIBoardEepromAddress,char *pc_PCIChipInformation, |
| WORD w_Address,str_DigitalOutputHeader *s_Header) | | WORD w_Address,str_DigitalOutputHeader *s_Header) |
| | | |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
...@@ -974,7 +974,7 @@ INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress, ...@@ -974,7 +974,7 @@ INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address | | Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address |
| | | |
| PCHAR pc_PCIChipInformation : PCI Chip Type. | | char *pc_PCIChipInformation : PCI Chip Type. |
| | | |
| str_DigitalOutputHeader *s_Header: Digital Output Header| | str_DigitalOutputHeader *s_Header: Digital Output Header|
| Pointer | | Pointer |
...@@ -985,7 +985,7 @@ INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress, ...@@ -985,7 +985,7 @@ INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_EepromReadDigitalOutputHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadDigitalOutputHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, WORD w_Address, char *pc_PCIChipInformation, WORD w_Address,
str_DigitalOutputHeader * s_Header) str_DigitalOutputHeader * s_Header)
{ {
// Read Nbr channels // Read Nbr channels
...@@ -998,14 +998,14 @@ INT i_EepromReadDigitalOutputHeader(WORD w_PCIBoardEepromAddress, ...@@ -998,14 +998,14 @@ INT i_EepromReadDigitalOutputHeader(WORD w_PCIBoardEepromAddress,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress, | | Function Name : INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress, |
| PCHAR pc_PCIChipInformation,WORD w_Address, | | char *pc_PCIChipInformation,WORD w_Address, |
| str_TimerMainHeader *s_Header) | | str_TimerMainHeader *s_Header) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read Timer or Watchdog Header | | Task : Read Timer or Watchdog Header |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address | | Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address |
| | | |
| PCHAR pc_PCIChipInformation : PCI Chip Type. | | char *pc_PCIChipInformation : PCI Chip Type. |
| | | |
| str_TimerMainHeader *s_Header: Timer Header | | str_TimerMainHeader *s_Header: Timer Header |
| Pointer | | Pointer |
...@@ -1016,7 +1016,7 @@ INT i_EepromReadDigitalOutputHeader(WORD w_PCIBoardEepromAddress, ...@@ -1016,7 +1016,7 @@ INT i_EepromReadDigitalOutputHeader(WORD w_PCIBoardEepromAddress,
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, WORD w_Address, char *pc_PCIChipInformation, WORD w_Address,
str_TimerMainHeader * s_Header) str_TimerMainHeader * s_Header)
{ {
...@@ -1063,14 +1063,14 @@ INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress, ...@@ -1063,14 +1063,14 @@ INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_EepromReadAnlogOutputHeader(WORD | | Function Name : INT i_EepromReadAnlogOutputHeader(WORD |
| w_PCIBoardEepromAddress,PCHAR pc_PCIChipInformation, | | w_PCIBoardEepromAddress,char *pc_PCIChipInformation, |
| WORD w_Address,str_AnalogOutputHeader *s_Header) | | WORD w_Address,str_AnalogOutputHeader *s_Header) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read Nalog Output Header | | Task : Read Nalog Output Header |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address | | Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address |
| | | |
| PCHAR pc_PCIChipInformation : PCI Chip Type. | | char *pc_PCIChipInformation : PCI Chip Type. |
| | | |
| str_AnalogOutputHeader *s_Header:Anlog Output Header | | str_AnalogOutputHeader *s_Header:Anlog Output Header |
| Pointer | | Pointer |
...@@ -1082,7 +1082,7 @@ INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress, ...@@ -1082,7 +1082,7 @@ INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress,
*/ */
INT i_EepromReadAnlogOutputHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadAnlogOutputHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, WORD w_Address, char *pc_PCIChipInformation, WORD w_Address,
str_AnalogOutputHeader * s_Header) str_AnalogOutputHeader * s_Header)
{ {
WORD w_Temp; WORD w_Temp;
...@@ -1100,14 +1100,14 @@ INT i_EepromReadAnlogOutputHeader(WORD w_PCIBoardEepromAddress, ...@@ -1100,14 +1100,14 @@ INT i_EepromReadAnlogOutputHeader(WORD w_PCIBoardEepromAddress,
/* /*
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Function Name : INT i_EepromReadAnlogInputHeader(WORD | | Function Name : INT i_EepromReadAnlogInputHeader(WORD |
| w_PCIBoardEepromAddress,PCHAR pc_PCIChipInformation, | | w_PCIBoardEepromAddress,char *pc_PCIChipInformation, |
| WORD w_Address,str_AnalogInputHeader *s_Header) | | WORD w_Address,str_AnalogInputHeader *s_Header) |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Task : Read Nalog Output Header | | Task : Read Nalog Output Header |
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
| Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address | | Input Parameters : WORD w_PCIBoardEepromAddress : PCI eeprom address |
| | | |
| PCHAR pc_PCIChipInformation : PCI Chip Type. | | char *pc_PCIChipInformation : PCI Chip Type. |
| | | |
| str_AnalogInputHeader *s_Header:Anlog Input Header | | str_AnalogInputHeader *s_Header:Anlog Input Header |
| Pointer | | Pointer |
...@@ -1120,7 +1120,7 @@ INT i_EepromReadAnlogOutputHeader(WORD w_PCIBoardEepromAddress, ...@@ -1120,7 +1120,7 @@ INT i_EepromReadAnlogOutputHeader(WORD w_PCIBoardEepromAddress,
// Reads only for ONE hardware component // Reads only for ONE hardware component
INT i_EepromReadAnlogInputHeader(WORD w_PCIBoardEepromAddress, INT i_EepromReadAnlogInputHeader(WORD w_PCIBoardEepromAddress,
PCHAR pc_PCIChipInformation, WORD w_Address, char *pc_PCIChipInformation, WORD w_Address,
str_AnalogInputHeader * s_Header) str_AnalogInputHeader * s_Header)
{ {
WORD w_Temp, w_Offset; WORD w_Temp, w_Offset;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7