From wfp5p@virginia.edu Thu Mar 19 13:07:31 2009 From: Bill Pemberton Date: Thu, 19 Mar 2009 18:00:52 -0400 Subject: Staging: comedi: Remove CHAR, *PCHAR, and *PCSTR typedefs in addi-data To: greg@kroah.com Cc: abbotti@mev.co.uk, fmhess@users.sourceforge.net, ds@schleef.org Message-ID: <20090319220052.10220.75518.stgit@viridian.itc.Virginia.EDU> Signed-off-by: Bill Pemberton Signed-off-by: Greg Kroah-Hartman --- drivers/staging/comedi/drivers/addi-data/addi_common.h | 6 - drivers/staging/comedi/drivers/addi-data/addi_eeprom.c | 60 ++++++++--------- 2 files changed, 32 insertions(+), 34 deletions(-) --- a/drivers/staging/comedi/drivers/addi-data/addi_common.h +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.h @@ -37,8 +37,6 @@ #define SUCCESS 1 /* variable type definition */ -typedef char CHAR, *PCHAR; -typedef const CHAR *PCSTR; typedef unsigned char BYTE, *PBYTE; typedef short SHORT, *PSHORT; typedef unsigned short USHORT, *PUSHORT; @@ -78,7 +76,7 @@ typedef const struct comedi_lrange *PCRA /* structure for the boardtype */ 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_DeviceId; INT i_IorangeBase0; @@ -86,7 +84,7 @@ typedef struct { INT i_IorangeBase2; // base 2 range INT i_IorangeBase3; // base 3 range 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_NbrAiChannelDiff; // num of A/D chans in diff mode INT i_AiChannelList; // len of chanlist --- a/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_eeprom.c @@ -121,32 +121,32 @@ typedef struct { /*****************************************/ 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, - PCHAR pc_PCIChipInformation, WORD w_Address, + char *pc_PCIChipInformation, WORD w_Address, str_DigitalInputHeader * s_Header); INT i_EepromReadDigitalOutputHeader(WORD w_PCIBoardEepromAddress, - PCHAR pc_PCIChipInformation, WORD w_Address, + char *pc_PCIChipInformation, WORD w_Address, str_DigitalOutputHeader * s_Header); INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress, - PCHAR pc_PCIChipInformation, WORD w_Address, + char *pc_PCIChipInformation, WORD w_Address, str_TimerMainHeader * s_Header); INT i_EepromReadAnlogOutputHeader(WORD w_PCIBoardEepromAddress, - PCHAR pc_PCIChipInformation, WORD w_Address, + char *pc_PCIChipInformation, WORD w_Address, str_AnalogOutputHeader * s_Header); INT i_EepromReadAnlogInputHeader(WORD w_PCIBoardEepromAddress, - PCHAR pc_PCIChipInformation, WORD w_Address, + char *pc_PCIChipInformation, WORD w_Address, str_AnalogInputHeader * s_Header); /******************************************/ /* Eeprom Specific Functions */ /******************************************/ -WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, PCHAR pc_PCIChipInformation, +WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, char *pc_PCIChipInformation, WORD w_EepromStartAddress); void v_EepromWaitBusy(WORD w_PCIBoardEepromAddress); void v_EepromClock76(DWORD dw_Address, DWORD dw_RegisterValue); @@ -159,14 +159,14 @@ void v_EepromCs76Read(DWORD dw_Address, +----------------------------------------------------------------------------+ | Function Name : WORD w_EepromReadWord | | (WORD w_PCIBoardEepromAddress, | -| PCHAR pc_PCIChipInformation, | +| char * pc_PCIChipInformation, | | WORD w_EepromStartAddress) | +----------------------------------------------------------------------------+ | Task : Read from eepromn a word | +----------------------------------------------------------------------------+ | 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 | +----------------------------------------------------------------------------+ @@ -176,7 +176,7 @@ void v_EepromCs76Read(DWORD dw_Address, +----------------------------------------------------------------------------+ */ -WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, PCHAR pc_PCIChipInformation, +WORD w_EepromReadWord(WORD w_PCIBoardEepromAddress, char *pc_PCIChipInformation, WORD w_EepromStartAddress) { @@ -522,7 +522,7 @@ void v_EepromSendCommand76(DWORD dw_Addr BYTE b_DataLengthInBits) { - CHAR c_BitPos = 0; + char c_BitPos = 0; DWORD dw_RegisterValue = 0; @@ -656,7 +656,7 @@ void v_EepromSendCommand76(DWORD dw_Addr void v_EepromCs76Read(DWORD dw_Address, WORD w_offset, PWORD pw_Value) { - CHAR c_BitPos = 0; + char c_BitPos = 0; DWORD dw_RegisterValue = 0; @@ -787,13 +787,13 @@ void v_EepromCs76Read(DWORD dw_Address, /* +----------------------------------------------------------------------------+ | 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 | +----------------------------------------------------------------------------+ | 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 | | pointer | @@ -805,7 +805,7 @@ void v_EepromCs76Read(DWORD dw_Address, */ 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; UINT ui_Temp; @@ -921,7 +921,7 @@ INT i_EepromReadMainHeader(WORD w_PCIBoa /* +----------------------------------------------------------------------------+ | Function Name : INT i_EepromReadDigitalInputHeader(WORD | -| w_PCIBoardEepromAddress,PCHAR pc_PCIChipInformation, | +| w_PCIBoardEepromAddress,char *pc_PCIChipInformation, | | WORD w_Address,str_DigitalInputHeader *s_Header) | | | +----------------------------------------------------------------------------+ @@ -929,7 +929,7 @@ INT i_EepromReadMainHeader(WORD w_PCIBoa +----------------------------------------------------------------------------+ | 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 | | Pointer | @@ -940,7 +940,7 @@ INT i_EepromReadMainHeader(WORD w_PCIBoa +----------------------------------------------------------------------------+ */ INT i_EepromReadDigitalInputHeader(WORD w_PCIBoardEepromAddress, - PCHAR pc_PCIChipInformation, WORD w_Address, + char *pc_PCIChipInformation, WORD w_Address, str_DigitalInputHeader * s_Header) { WORD w_Temp; @@ -966,7 +966,7 @@ INT i_EepromReadDigitalInputHeader(WORD /* +----------------------------------------------------------------------------+ | Function Name : INT i_EepromReadDigitalOutputHeader(WORD | -| w_PCIBoardEepromAddress,PCHAR pc_PCIChipInformation, | +| w_PCIBoardEepromAddress,char *pc_PCIChipInformation, | | WORD w_Address,str_DigitalOutputHeader *s_Header) | | | +----------------------------------------------------------------------------+ @@ -974,7 +974,7 @@ INT i_EepromReadDigitalInputHeader(WORD +----------------------------------------------------------------------------+ | 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| | Pointer | @@ -985,7 +985,7 @@ INT i_EepromReadDigitalInputHeader(WORD +----------------------------------------------------------------------------+ */ INT i_EepromReadDigitalOutputHeader(WORD w_PCIBoardEepromAddress, - PCHAR pc_PCIChipInformation, WORD w_Address, + char *pc_PCIChipInformation, WORD w_Address, str_DigitalOutputHeader * s_Header) { // Read Nbr channels @@ -998,14 +998,14 @@ INT i_EepromReadDigitalOutputHeader(WORD /* +----------------------------------------------------------------------------+ | Function Name : INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress, | -| PCHAR pc_PCIChipInformation,WORD w_Address, | +| char *pc_PCIChipInformation,WORD w_Address, | | str_TimerMainHeader *s_Header) | +----------------------------------------------------------------------------+ | Task : Read Timer or Watchdog Header | +----------------------------------------------------------------------------+ | 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 | | Pointer | @@ -1016,7 +1016,7 @@ INT i_EepromReadDigitalOutputHeader(WORD +----------------------------------------------------------------------------+ */ INT i_EepromReadTimerHeader(WORD w_PCIBoardEepromAddress, - PCHAR pc_PCIChipInformation, WORD w_Address, + char *pc_PCIChipInformation, WORD w_Address, str_TimerMainHeader * s_Header) { @@ -1063,14 +1063,14 @@ INT i_EepromReadTimerHeader(WORD w_PCIBo /* +----------------------------------------------------------------------------+ | Function Name : INT i_EepromReadAnlogOutputHeader(WORD | -| w_PCIBoardEepromAddress,PCHAR pc_PCIChipInformation, | +| w_PCIBoardEepromAddress,char *pc_PCIChipInformation, | | WORD w_Address,str_AnalogOutputHeader *s_Header) | +----------------------------------------------------------------------------+ | Task : Read Nalog Output Header | +----------------------------------------------------------------------------+ | 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 | | Pointer | @@ -1082,7 +1082,7 @@ INT i_EepromReadTimerHeader(WORD w_PCIBo */ INT i_EepromReadAnlogOutputHeader(WORD w_PCIBoardEepromAddress, - PCHAR pc_PCIChipInformation, WORD w_Address, + char *pc_PCIChipInformation, WORD w_Address, str_AnalogOutputHeader * s_Header) { WORD w_Temp; @@ -1100,14 +1100,14 @@ INT i_EepromReadAnlogOutputHeader(WORD w /* +----------------------------------------------------------------------------+ | Function Name : INT i_EepromReadAnlogInputHeader(WORD | -| w_PCIBoardEepromAddress,PCHAR pc_PCIChipInformation, | +| w_PCIBoardEepromAddress,char *pc_PCIChipInformation, | | WORD w_Address,str_AnalogInputHeader *s_Header) | +----------------------------------------------------------------------------+ | Task : Read Nalog Output Header | +----------------------------------------------------------------------------+ | 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 | | Pointer | @@ -1120,7 +1120,7 @@ INT i_EepromReadAnlogOutputHeader(WORD w // Reads only for ONE hardware component INT i_EepromReadAnlogInputHeader(WORD w_PCIBoardEepromAddress, - PCHAR pc_PCIChipInformation, WORD w_Address, + char *pc_PCIChipInformation, WORD w_Address, str_AnalogInputHeader * s_Header) { WORD w_Temp, w_Offset;