Commit 756e9d7c authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: Remove DWORD and *PDWORD typedefs in addi-data 



Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 82a6e2e7

drivers/staging/comedi/drivers/addi-data/APCI1710_82x54.c

+7 −7
Original line number Diff line number Diff line
@@ -234,7 +234,7 @@ int i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_sub 
	unsigned char b_HardwareGateLevel;



	//BEGIN JK 27.10.2003 : Add the possibility to use a 40 Mhz quartz

	DWORD dw_Test = 0;

	unsigned int dw_Test = 0;

	//END JK 27.10.2003 : Add the possibility to use a 40 Mhz quartz



	i_ReturnValue = insn->n;
@@ -319,7 +319,7 @@ int i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_sub 
											   devpriv->s_ModuleInfo [b_ModulNbr].

											   s_82X54ModuleInfo.

											   s_82X54TimerInfo  [b_TimerNbr].

											   dw_ConfigurationWord = (DWORD) (((b_HardwareGateLevel         << 0) & 0x1) |

											   dw_ConfigurationWord = (unsigned int) (((b_HardwareGateLevel         << 0) & 0x1) |

											   ((b_InputClockLevel           << 1) & 0x2) |

											   (((~b_OutputLevel       & 1)  << 2) & 0x4) |

											   ((b_InputClockSelection       << 4) & 0x10));
@@ -329,12 +329,12 @@ int i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_sub 
												b_InputClockSelection = 2;

											}



											devpriv->s_ModuleInfo[b_ModulNbr].s_82X54ModuleInfo.s_82X54TimerInfo[b_TimerNbr].dw_ConfigurationWord = (DWORD)(((b_HardwareGateLevel << 0) & 0x1) | ((b_InputClockLevel << 1) & 0x2) | (((~b_OutputLevel & 1) << 2) & 0x4) | ((b_InputClockSelection << 4) & 0x30));

											devpriv->s_ModuleInfo[b_ModulNbr].s_82X54ModuleInfo.s_82X54TimerInfo[b_TimerNbr].dw_ConfigurationWord = (unsigned int)(((b_HardwareGateLevel << 0) & 0x1) | ((b_InputClockLevel << 1) & 0x2) | (((~b_OutputLevel & 1) << 2) & 0x4) | ((b_InputClockSelection << 4) & 0x30));

											//END JK 27.10.03 : Add the possibility to use a 40 Mhz quartz

											outl(devpriv->s_ModuleInfo[b_ModulNbr].s_82X54ModuleInfo.s_82X54TimerInfo[b_TimerNbr].dw_ConfigurationWord, devpriv->s_BoardInfos.ui_Address + 32 + (b_TimerNbr * 4) + (64 * b_ModulNbr));



											/* Initialise the 82X54 Timer */

											outl((DWORD) b_TimerMode, devpriv->s_BoardInfos.ui_Address + 16 + (b_TimerNbr * 4) + (64 * b_ModulNbr));

											outl((unsigned int) b_TimerMode, devpriv->s_BoardInfos.ui_Address + 16 + (b_TimerNbr * 4) + (64 * b_ModulNbr));



											/* Write the reload value */

											outl(ul_ReloadValue, devpriv->s_BoardInfos.ui_Address + 0 + (b_TimerNbr * 4) + (64 * b_ModulNbr));
@@ -453,7 +453,7 @@ int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev, 
					   struct comedi_insn * insn, unsigned int * data)

{

	int i_ReturnValue = 0;

	DWORD dw_DummyRead;

	unsigned int dw_DummyRead;

	unsigned char b_ModulNbr;

	unsigned char b_TimerNbr;

	unsigned char b_ActionType;
@@ -853,7 +853,7 @@ int i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev, 
				   unsigned char * pb_OutputLevel)

{

	int i_ReturnValue = 0;

	DWORD dw_TimerStatus;

	unsigned int dw_TimerStatus;



	/* Test the module number */

	if (b_ModulNbr < 4) {
@@ -932,7 +932,7 @@ int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, 
				      unsigned char * pb_TimerStatus)

{

	int i_ReturnValue = 0;

	DWORD dw_TimerStatus;

	unsigned int dw_TimerStatus;



	/* Test the module number */

	if (b_ModulNbr < 4) {

drivers/staging/comedi/drivers/addi-data/APCI1710_Chrono.c

+5 −5
Original line number Diff line number Diff line
@@ -139,7 +139,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 
	unsigned int ul_TimingInterval = 0;

	unsigned int ul_RealTimingInterval = 0;

	double d_RealTimingInterval = 0;

	DWORD dw_ModeArray[8] =

	unsigned int dw_ModeArray[8] =

		{ 0x01, 0x05, 0x00, 0x04, 0x02, 0x0E, 0x0A, 0x06 };

	unsigned char b_ModulNbr, b_ChronoMode, b_PCIInputClock, b_TimingUnit;
@@ -1198,7 +1198,7 @@ int i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev, 
	unsigned char b_ModulNbr, unsigned char * pb_ChronoStatus)

{

	int i_ReturnValue = 0;

	DWORD dw_Status;

	unsigned int dw_Status;



	/**************************/

	/* Test the module number */
@@ -1360,8 +1360,8 @@ int i_APCI1710_ReadChronoValue(struct comedi_device * dev, 
	unsigned int ui_TimeOut, unsigned char * pb_ChronoStatus, unsigned int * pul_ChronoValue)

{

	int i_ReturnValue = 0;

	DWORD dw_Status;

	DWORD dw_TimeOut = 0;

	unsigned int dw_Status;

	unsigned int dw_TimeOut = 0;



	/**************************/

	/* Test the module number */
@@ -1881,7 +1881,7 @@ int i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev, 
{

	int i_ReturnValue = 0;

	unsigned char b_ModulNbr, b_OutputChannel, b_InputChannel, b_IOType;

	DWORD dw_Status;

	unsigned int dw_Status;

	unsigned char * pb_ChannelStatus;

	unsigned char * pb_PortValue;

drivers/staging/comedi/drivers/addi-data/APCI1710_Dig_io.c

+6 −6
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ int i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_sub 
	unsigned char b_ModulNbr, b_ChannelAMode, b_ChannelBMode;

	unsigned char b_MemoryOnOff, b_ConfigType;

	int i_ReturnValue = 0;

	DWORD dw_WriteConfig = 0;

	unsigned int dw_WriteConfig = 0;



	b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);

	b_ConfigType = (unsigned char) data[0];	// Memory or  Init
@@ -197,7 +197,7 @@ int i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_sub 
	/*****************************************/



					dw_WriteConfig =

						(DWORD) (b_ChannelAMode |

						(unsigned int) (b_ChannelAMode |

						(b_ChannelBMode * 2));



	/***************************/
@@ -297,7 +297,7 @@ int i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, 
	struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)

{

	int i_ReturnValue = 0;

	DWORD dw_StatusReg;

	unsigned int dw_StatusReg;

	unsigned char b_ModulNbr, b_InputChannel;

	unsigned char * pb_ChannelStatus;

	b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
@@ -485,7 +485,7 @@ int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev, 
	struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)

{

	int i_ReturnValue = 0;

	DWORD dw_WriteValue = 0;

	unsigned int dw_WriteValue = 0;

	unsigned char b_ModulNbr, b_OutputChannel;

	i_ReturnValue = insn->n;

	b_ModulNbr = CR_AREF(insn->chanspec);
@@ -732,8 +732,8 @@ int i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev, 
	struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)

{

	int i_ReturnValue = 0;

	DWORD dw_WriteValue = 0;

	DWORD dw_StatusReg;

	unsigned int dw_WriteValue = 0;

	unsigned int dw_StatusReg;

	unsigned char b_ModulNbr, b_PortValue;

	unsigned char b_PortOperation, b_PortOnOFF;

drivers/staging/comedi/drivers/addi-data/APCI1710_INCCPT.c

+13 −13
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ int i_APCI1710_CounterAutoTest(struct comedi_device * dev, unsigned char * pb_Te 
{

	unsigned char b_ModulCpt = 0;

	int i_ReturnValue = 0;

	DWORD dw_LathchValue;

	unsigned int dw_LathchValue;



	*pb_TestStatus = 0;
@@ -1496,7 +1496,7 @@ int i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev, 
	int i_ReturnValue = 0;

	unsigned int ul_TimerValue = 0;

	double d_RealTimingInterval;

	DWORD dw_Status = 0;

	unsigned int dw_Status = 0;



	/**************************/

	/* Test the module number */
@@ -2301,7 +2301,7 @@ int i_APCI1710_SetInputFilter(struct comedi_device * dev, 
	unsigned char b_ModulNbr, unsigned char b_PCIInputClock, unsigned char b_Filter)

{

	int i_ReturnValue = 0;

	DWORD dw_Status = 0;

	unsigned int dw_Status = 0;



	/**************************/

	/* Test the module number */
@@ -4197,7 +4197,7 @@ int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device * dev, 
	unsigned char b_ModulNbr, unsigned char b_LatchReg, unsigned char * pb_LatchStatus)

{

	int i_ReturnValue = 0;

	DWORD dw_LatchReg;

	unsigned int dw_LatchReg;



	/**************************/

	/* Test the module number */
@@ -4368,7 +4368,7 @@ int i_APCI1710_Read16BitCounterValue(struct comedi_device * dev, 
	unsigned char b_ModulNbr, unsigned char b_SelectedCounter, unsigned int * pui_CounterValue)

{

	int i_ReturnValue = 0;

	DWORD dw_LathchValue = 0;

	unsigned int dw_LathchValue = 0;



	/**************************/

	/* Test the module number */
@@ -4539,7 +4539,7 @@ int i_APCI1710_GetIndexStatus(struct comedi_device * dev, 
	unsigned char b_ModulNbr, unsigned char * pb_IndexStatus)

{

	int i_ReturnValue = 0;

	DWORD dw_StatusReg = 0;

	unsigned int dw_StatusReg = 0;



	/**************************/

	/* Test the module number */
@@ -4623,7 +4623,7 @@ int i_APCI1710_GetReferenceStatus(struct comedi_device * dev, 
	unsigned char b_ModulNbr, unsigned char * pb_ReferenceStatus)

{

	int i_ReturnValue = 0;

	DWORD dw_StatusReg = 0;

	unsigned int dw_StatusReg = 0;



	/**************************/

	/* Test the module number */
@@ -4707,7 +4707,7 @@ int i_APCI1710_GetUASStatus(struct comedi_device * dev, 
	unsigned char b_ModulNbr, unsigned char * pb_UASStatus)

{

	int i_ReturnValue = 0;

	DWORD dw_StatusReg = 0;

	unsigned int dw_StatusReg = 0;



	/**************************/

	/* Test the module number */
@@ -4775,7 +4775,7 @@ int i_APCI1710_GetCBStatus(struct comedi_device * dev, 
	unsigned char b_ModulNbr, unsigned char * pb_CBStatus)

{

	int i_ReturnValue = 0;

	DWORD dw_StatusReg = 0;

	unsigned int dw_StatusReg = 0;



	/**************************/

	/* Test the module number */
@@ -4857,7 +4857,7 @@ int i_APCI1710_Get16BitCBStatus(struct comedi_device * dev, 
	unsigned char b_ModulNbr, unsigned char * pb_CBStatusCounter0, unsigned char * pb_CBStatusCounter1)

{

	int i_ReturnValue = 0;

	DWORD dw_StatusReg = 0;

	unsigned int dw_StatusReg = 0;



	/**************************/

	/* Test the module number */
@@ -4970,7 +4970,7 @@ int i_APCI1710_GetUDStatus(struct comedi_device * dev, 
	unsigned char b_ModulNbr, unsigned char * pb_UDStatus)

{

	int i_ReturnValue = 0;

	DWORD dw_StatusReg = 0;

	unsigned int dw_StatusReg = 0;



	/**************************/

	/* Test the module number */
@@ -5044,7 +5044,7 @@ int i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device * dev, 
	unsigned char b_ModulNbr, unsigned char * pb_UDStatus)

{

	int i_ReturnValue = 0;

	DWORD dw_StatusReg = 0;

	unsigned int dw_StatusReg = 0;



	/**************************/

	/* Test the module number */
@@ -5151,7 +5151,7 @@ int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device * dev, 
{

	int i_ReturnValue = 0;

	unsigned int ui_16BitValue;

	DWORD dw_StatusReg;

	unsigned int dw_StatusReg;



	/**************************/

	/* Test the module number */

drivers/staging/comedi/drivers/addi-data/APCI1710_Inp_cpt.c

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ int i_APCI1710_InsnConfigInitPulseEncoder(struct comedi_device * dev, 
	struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)

{

	int i_ReturnValue = 0;

	DWORD dw_IntRegister;

	unsigned int dw_IntRegister;



	unsigned char b_ModulNbr;

	unsigned char b_PulseEncoderNbr;
@@ -712,7 +712,7 @@ int i_APCI1710_InsnBitsReadWritePulseEncoder(struct comedi_device * dev, 
	struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)

{

	int i_ReturnValue = 0;

	DWORD dw_StatusRegister;

	unsigned int dw_StatusRegister;

	unsigned char b_ModulNbr;

	unsigned char b_PulseEncoderNbr;

	unsigned char * pb_Status;