Commit 82a6e2e7 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: Remove ULONG and *PULONG typedefs in addi-data 



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

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

+9 −9
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ int i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s, 
|b_ModulNbr        = (unsigned char) CR_AREF(insn->chanspec);

	b_TimerNbr		  = (unsigned char) CR_CHAN(insn->chanspec);

	b_TimerMode		  = (unsigned char) data[0];

	ul_ReloadValue	  = (ULONG) data[1];

	ul_ReloadValue	  = (unsigned int) data[1];

	b_InputClockSelection	=(unsigned char) data[2];

	b_InputClockLevel		=(unsigned char) data[3];

	b_OutputLevel			=(unsigned char) data[4];
@@ -227,7 +227,7 @@ int i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_sub 
	unsigned char b_ModulNbr;

	unsigned char b_TimerNbr;

	unsigned char b_TimerMode;

	ULONG ul_ReloadValue;

	unsigned int ul_ReloadValue;

	unsigned char b_InputClockSelection;

	unsigned char b_InputClockLevel;

	unsigned char b_OutputLevel;
@@ -241,7 +241,7 @@ int i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_sub 
	b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);

	b_TimerNbr = (unsigned char) CR_CHAN(insn->chanspec);

	b_TimerMode = (unsigned char) data[0];

	ul_ReloadValue = (ULONG) data[1];

	ul_ReloadValue = (unsigned int) data[1];

	b_InputClockSelection = (unsigned char) data[2];

	b_InputClockLevel = (unsigned char) data[3];

	b_OutputLevel = (unsigned char) data[4];
@@ -595,11 +595,11 @@ int i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_su 
{

	int i_ReturnValue = 0;

	unsigned char b_ModulNbr, b_ReadType;

	PULONG pul_TimerValueArray;

	unsigned int * pul_TimerValueArray;



	b_ModulNbr = CR_AREF(insn->chanspec);

	b_ReadType = CR_CHAN(insn->chanspec);

	pul_TimerValueArray = (PULONG) data;

	pul_TimerValueArray = (unsigned int *) data;

	i_ReturnValue = insn->n;



	switch (b_ReadType) {
@@ -695,7 +695,7 @@ int i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice 
		i_ReturnValue = i_APCI1710_ReadTimerValue(dev,

							  (unsigned char)CR_AREF(insn->chanspec),

							  (unsigned char)CR_CHAN(insn->chanspec),

							  (PULONG) & data[0]);

							  (unsigned int *) & data[0]);

		break;



	case APCI1710_TIMER_GETOUTPUTLEVEL:
@@ -716,7 +716,7 @@ int i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice 
		i_ReturnValue = i_APCI1710_WriteTimerValue(dev,

							   (unsigned char)CR_AREF(insn->chanspec),

							   (unsigned char)CR_CHAN(insn->chanspec),

							   (ULONG)data[1]);

							   (unsigned int)data[1]);



		break;
@@ -762,7 +762,7 @@ int i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice 


int i_APCI1710_ReadTimerValue(struct comedi_device * dev,

			      unsigned char b_ModulNbr, unsigned char b_TimerNbr,

			      PULONG pul_TimerValue)

			      unsigned int * pul_TimerValue)

{

	int i_ReturnValue = 0;
@@ -1008,7 +1008,7 @@ int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, 


int i_APCI1710_WriteTimerValue(struct comedi_device * dev,

			       unsigned char b_ModulNbr, unsigned char b_TimerNbr,

			       ULONG ul_WriteValue)

			       unsigned int ul_WriteValue)

{

	int i_ReturnValue = 0;

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

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int i_APCI1710_InsnBitsTimer(struct comedi_device *dev, struct comedi_subdevice 
 */

int i_APCI1710_ReadTimerValue(struct comedi_device *dev,

			      unsigned char b_ModulNbr, unsigned char b_TimerNbr,

			      PULONG pul_TimerValue);

			      unsigned int * pul_TimerValue);



int i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev,

				   unsigned char b_ModulNbr, unsigned char b_TimerNbr,
@@ -70,4 +70,4 @@ int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, 
 */

int i_APCI1710_WriteTimerValue(struct comedi_device *dev,

			       unsigned char b_ModulNbr, unsigned char b_TimerNbr,

			       ULONG ul_WriteValue);
 
			       unsigned int ul_WriteValue);

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

+26 −26
Original line number Diff line number Diff line
@@ -135,9 +135,9 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 
	struct comedi_insn * insn, unsigned int * data)

{

	int i_ReturnValue = 0;

	ULONG ul_TimerValue = 0;

	ULONG ul_TimingInterval = 0;

	ULONG ul_RealTimingInterval = 0;

	unsigned int ul_TimerValue = 0;

	unsigned int ul_TimingInterval = 0;

	unsigned int ul_RealTimingInterval = 0;

	double d_RealTimingInterval = 0;

	DWORD dw_ModeArray[8] =

		{ 0x01, 0x05, 0x00, 0x04, 0x02, 0x0E, 0x0A, 0x06 };
@@ -147,7 +147,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 
	b_ChronoMode = (unsigned char) data[0];

	b_PCIInputClock = (unsigned char) data[1];

	b_TimingUnit = (unsigned char) data[2];

	ul_TimingInterval = (ULONG) data[3];

	ul_TimingInterval = (unsigned int) data[3];

	i_ReturnValue = insn->n;



	/**************************/
@@ -214,7 +214,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 


										ul_TimerValue

											=

											(ULONG)

											(unsigned int)

											(ul_TimingInterval

											*

											(0.001 * b_PCIInputClock));
@@ -237,7 +237,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 


										ul_RealTimingInterval

											=

											(ULONG)

											(unsigned int)

											(ul_TimerValue

											/

											(0.001 * (double)b_PCIInputClock));
@@ -272,7 +272,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 
										if (b_PCIInputClock != APCI1710_40MHZ) {

											ul_TimerValue

												=

												(ULONG)

												(unsigned int)

												(

												(double)

												(ul_TimerValue)
@@ -294,7 +294,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 


										ul_TimerValue

											=

											(ULONG)

											(unsigned int)

											(ul_TimingInterval

											*

											(1.0 * b_PCIInputClock));
@@ -317,7 +317,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 


										ul_RealTimingInterval

											=

											(ULONG)

											(unsigned int)

											(ul_TimerValue

											/

											(1.0 * (double)b_PCIInputClock));
@@ -354,7 +354,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 
										if (b_PCIInputClock != APCI1710_40MHZ) {

											ul_TimerValue

												=

												(ULONG)

												(unsigned int)

												(

												(double)

												(ul_TimerValue)
@@ -400,7 +400,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 


										ul_RealTimingInterval

											=

											(ULONG)

											(unsigned int)

											(ul_TimerValue

											/

											(1000.0 * (double)b_PCIInputClock));
@@ -435,7 +435,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 
										if (b_PCIInputClock != APCI1710_40MHZ) {

											ul_TimerValue

												=

												(ULONG)

												(unsigned int)

												(

												(double)

												(ul_TimerValue)
@@ -457,7 +457,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 


										ul_TimerValue

											=

											(ULONG)

											(unsigned int)

											(ul_TimingInterval

											*

											(1000000.0
@@ -482,7 +482,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 


										ul_RealTimingInterval

											=

											(ULONG)

											(unsigned int)

											(ul_TimerValue

											/

											(1000000.0
@@ -520,7 +520,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 
										if (b_PCIInputClock != APCI1710_40MHZ) {

											ul_TimerValue

												=

												(ULONG)

												(unsigned int)

												(

												(double)

												(ul_TimerValue)
@@ -542,7 +542,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 


										ul_TimerValue

											=

											(ULONG)

											(unsigned int)

											(

											(ul_TimingInterval

												*
@@ -570,7 +570,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 


										ul_RealTimingInterval

											=

											(ULONG)

											(unsigned int)

											(ul_TimerValue

											/

											(1000000.0
@@ -608,7 +608,7 @@ int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 
										if (b_PCIInputClock != APCI1710_40MHZ) {

											ul_TimerValue

												=

												(ULONG)

												(unsigned int)

												(

												(double)

												(ul_TimerValue)
@@ -1108,14 +1108,14 @@ int i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevic 
		i_ReturnValue = i_APCI1710_ReadChronoValue(dev,

			(unsigned char) CR_AREF(insn->chanspec),

			(unsigned int) insn->unused[0],

			(unsigned char *) & data[0], (PULONG) & data[1]);

			(unsigned char *) & data[0], (unsigned int *) & data[1]);

		break;



	case APCI1710_CHRONO_CONVERTVALUE:

		i_ReturnValue = i_APCI1710_ConvertChronoValue(dev,

			(unsigned char) CR_AREF(insn->chanspec),

			(ULONG) insn->unused[0],

			(PULONG) & data[0],

			(unsigned int) insn->unused[0],

			(unsigned int *) & data[0],

			(unsigned char *) & data[1],

			(unsigned char *) & data[2],

			(unsigned int *) & data[3],
@@ -1341,7 +1341,7 @@ int i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev, 
|                                                   timing witch the         |

|                                                   function                 |

|                                                   "i_APCI1710_InitChrono"  |

|                     PULONG  pul_ChronoValue  : Chronometer timing value.   |

|                     unsigned int *  pul_ChronoValue  : Chronometer timing value.   |

+----------------------------------------------------------------------------+

| Return Value      :  0: No error                                           |

|                     -1: The handle parameter of the board is wrong         |
@@ -1357,7 +1357,7 @@ int i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev, 


int i_APCI1710_ReadChronoValue(struct comedi_device * dev,

	unsigned char b_ModulNbr,

	unsigned int ui_TimeOut, unsigned char * pb_ChronoStatus, PULONG pul_ChronoValue)

	unsigned int ui_TimeOut, unsigned char * pb_ChronoStatus, unsigned int * pul_ChronoValue)

{

	int i_ReturnValue = 0;

	DWORD dw_Status;
@@ -1621,8 +1621,8 @@ int i_APCI1710_ReadChronoValue(struct comedi_device * dev, 


int i_APCI1710_ConvertChronoValue(struct comedi_device * dev,

	unsigned char b_ModulNbr,

	ULONG ul_ChronoValue,

	PULONG pul_Hour,

	unsigned int ul_ChronoValue,

	unsigned int * pul_Hour,

	unsigned char * pb_Minute,

	unsigned char * pb_Second,

	unsigned int * pui_MilliSecond, unsigned int * pui_MicroSecond, unsigned int * pui_NanoSecond)
@@ -1681,7 +1681,7 @@ int i_APCI1710_ConvertChronoValue(struct comedi_device * dev, 
			    /**********************/



					d_Hour = d_Hour / (double)60.0;

					*pul_Hour = (ULONG) d_Hour;

					*pul_Hour = (unsigned int) d_Hour;



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

					/* Calculate the minute */

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

+3 −3
Original line number Diff line number Diff line
@@ -55,12 +55,12 @@ int i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev, 
int i_APCI1710_ReadChronoValue(struct comedi_device *dev,

			       unsigned char b_ModulNbr,

			       unsigned int ui_TimeOut, unsigned char * pb_ChronoStatus,

			       PULONG pul_ChronoValue);

			       unsigned int * pul_ChronoValue);



int i_APCI1710_ConvertChronoValue(struct comedi_device *dev,

				  unsigned char b_ModulNbr,

				  ULONG ul_ChronoValue,

				  PULONG pul_Hour,

				  unsigned int ul_ChronoValue,

				  unsigned int * pul_Hour,

				  unsigned char * pb_Minute,

				  unsigned char * pb_Second,

				  unsigned int * pui_MilliSecond, unsigned int * pui_MicroSecond,

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

+18 −18
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ int i_APCI1710_InsnConfigINCCPT(struct comedi_device * dev, struct comedi_subdev 
		i_ReturnValue = i_APCI1710_InitFrequencyMeasurement(dev,

			CR_AREF(insn->chanspec),

			(unsigned char) data[0],

			(unsigned char) data[1], (ULONG) data[2], (PULONG) & data[0]);

			(unsigned char) data[1], (unsigned int) data[2], (unsigned int *) & data[0]);

		break;



	default:
@@ -1491,10 +1491,10 @@ int i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev, 
	unsigned char b_ModulNbr,

	unsigned char b_PCIInputClock,

	unsigned char b_TimingUnity,

	ULONG ul_TimingInterval, PULONG pul_RealTimingInterval)

	unsigned int ul_TimingInterval, unsigned int * pul_RealTimingInterval)

{

	int i_ReturnValue = 0;

	ULONG ul_TimerValue = 0;

	unsigned int ul_TimerValue = 0;

	double d_RealTimingInterval;

	DWORD dw_Status = 0;
@@ -1720,7 +1720,7 @@ int i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev, 


									ul_TimerValue

										=

										(ULONG)

										(unsigned int)

										(ul_TimingInterval

										*

										(0.00025 * b_PCIInputClock));
@@ -1743,7 +1743,7 @@ int i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev, 


									*pul_RealTimingInterval

										=

										(ULONG)

										(unsigned int)

										(ul_TimerValue

										/

										(0.00025 * (double)b_PCIInputClock));
@@ -1790,7 +1790,7 @@ int i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev, 


									ul_TimerValue

										=

										(ULONG)

										(unsigned int)

										(ul_TimingInterval

										*

										(0.25 * b_PCIInputClock));
@@ -1813,7 +1813,7 @@ int i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev, 


									*pul_RealTimingInterval

										=

										(ULONG)

										(unsigned int)

										(ul_TimerValue

										/

										(0.25 * (double)b_PCIInputClock));
@@ -1886,7 +1886,7 @@ int i_APCI1710_InitFrequencyMeasurement(struct comedi_device * dev, 


									*pul_RealTimingInterval

										=

										(ULONG)

										(unsigned int)

										(ul_TimerValue

										/

										(250.0 * (double)b_PCIInputClock));
@@ -2979,7 +2979,7 @@ int i_APCI1710_InsnWriteINCCPT(struct comedi_device * dev, struct comedi_subdevi 


	case APCI1710_INCCPT_WRITE32BITCOUNTERVALUE:

		i_ReturnValue = i_APCI1710_Write32BitCounterValue(dev,

			(unsigned char) CR_AREF(insn->chanspec), (ULONG) data[0]);

			(unsigned char) CR_AREF(insn->chanspec), (unsigned int) data[0]);



		break;
@@ -3257,7 +3257,7 @@ int i_APCI1710_Write16BitCounterValue(struct comedi_device * dev, 
				/* Write the value */

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



				outl((ULONG) ((ULONG) (ui_WriteValue) << (16 *

				outl((unsigned int) ((unsigned int) (ui_WriteValue) << (16 *

							b_SelectedCounter)),

					devpriv->s_BoardInfos.ui_Address + 8 +

					(b_SelectedCounter * 4) +
@@ -3317,7 +3317,7 @@ int i_APCI1710_Write16BitCounterValue(struct comedi_device * dev, 
*/



int i_APCI1710_Write32BitCounterValue(struct comedi_device * dev,

	unsigned char b_ModulNbr, ULONG ul_WriteValue)

	unsigned char b_ModulNbr, unsigned int ul_WriteValue)

{

	int i_ReturnValue = 0;
@@ -3386,7 +3386,7 @@ int i_APCI1710_Write32BitCounterValue(struct comedi_device * dev, 
int i_APCI1710_EnableIndex(struct comedi_device * dev, unsigned char b_ModulNbr)

{

	int i_ReturnValue = 0;

	ULONG ul_InterruptLatchReg;

	unsigned int ul_InterruptLatchReg;



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

	/* Test the module number */
@@ -4068,7 +4068,7 @@ int i_APCI1710_InsnReadINCCPT(struct comedi_device * dev, struct comedi_subdevic 
	case APCI1710_INCCPT_READLATCHREGISTERVALUE:

		i_ReturnValue = i_APCI1710_ReadLatchRegisterValue(dev,

			(unsigned char) CR_AREF(insn->chanspec),

			(unsigned char) CR_RANGE(insn->chanspec), (PULONG) & data[0]);

			(unsigned char) CR_RANGE(insn->chanspec), (unsigned int *) & data[0]);

		printk("Latch Register Value %d\n", data[0]);

		break;
@@ -4080,7 +4080,7 @@ int i_APCI1710_InsnReadINCCPT(struct comedi_device * dev, struct comedi_subdevic 


	case APCI1710_INCCPT_READ32BITCOUNTERVALUE:

		i_ReturnValue = i_APCI1710_Read32BitCounterValue(dev,

			(unsigned char) CR_AREF(insn->chanspec), (PULONG) & data[0]);

			(unsigned char) CR_AREF(insn->chanspec), (unsigned int *) & data[0]);

		break;



	case APCI1710_INCCPT_GETINDEXSTATUS:
@@ -4124,7 +4124,7 @@ int i_APCI1710_InsnReadINCCPT(struct comedi_device * dev, struct comedi_subdevic 
		i_ReturnValue = i_APCI1710_ReadFrequencyMeasurement(dev,

			(unsigned char) CR_AREF(insn->chanspec),

			(unsigned char *) & data[0],

			(unsigned char *) & data[1], (PULONG) & data[2]);

			(unsigned char *) & data[1], (unsigned int *) & data[2]);

		break;



	case APCI1710_INCCPT_READINTERRUPT:
@@ -4281,7 +4281,7 @@ int i_APCI1710_ReadLatchRegisterStatus(struct comedi_device * dev, 
*/



int i_APCI1710_ReadLatchRegisterValue(struct comedi_device * dev,

	unsigned char b_ModulNbr, unsigned char b_LatchReg, PULONG pul_LatchValue)

	unsigned char b_ModulNbr, unsigned char b_LatchReg, unsigned int * pul_LatchValue)

{

	int i_ReturnValue = 0;
@@ -4460,7 +4460,7 @@ int i_APCI1710_Read16BitCounterValue(struct comedi_device * dev, 
*/



int i_APCI1710_Read32BitCounterValue(struct comedi_device * dev,

	unsigned char b_ModulNbr, PULONG pul_CounterValue)

	unsigned char b_ModulNbr, unsigned int * pul_CounterValue)

{

	int i_ReturnValue = 0;
@@ -5147,7 +5147,7 @@ int i_APCI1710_GetInterruptUDLatchedStatus(struct comedi_device * dev, 


int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device * dev,

	unsigned char b_ModulNbr,

	unsigned char * pb_Status, unsigned char * pb_UDStatus, PULONG pul_ReadValue)

	unsigned char * pb_Status, unsigned char * pb_UDStatus, unsigned int * pul_ReadValue)

{

	int i_ReturnValue = 0;

	unsigned int ui_16BitValue;