Commit 117102b0 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: Remove UINT and *PUINT typedefs in addi-data 



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

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

+15 −15
Original line number Diff line number Diff line
@@ -1107,7 +1107,7 @@ int i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevic 
	case APCI1710_CHRONO_READVALUE:

		i_ReturnValue = i_APCI1710_ReadChronoValue(dev,

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

			(UINT) insn->unused[0],

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

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

		break;
@@ -1118,8 +1118,8 @@ int i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevic 
			(PULONG) & data[0],

			(unsigned char *) & data[1],

			(unsigned char *) & data[2],

			(PUINT) & data[3],

			(PUINT) & data[4], (PUINT) & data[5]);

			(unsigned int *) & data[3],

			(unsigned int *) & data[4], (unsigned int *) & data[5]);

		break;



	case APCI1710_CHRONO_READINTERRUPT:
@@ -1297,7 +1297,7 @@ int i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev, 
| Function Name     : _INT_ i_APCI1710_ReadChronoValue                       |

|                               (unsigned char_     b_BoardHandle,                    |

|                                unsigned char_     b_ModulNbr,                       |

|                                UINT_    ui_TimeOut,                        |

|                                unsigned int_    ui_TimeOut,                        |

|                                unsigned char *_   pb_ChronoStatus,                   |

|                                PULONG_ pul_ChronoValue)                    |

+----------------------------------------------------------------------------+
@@ -1357,7 +1357,7 @@ int i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev, 


int i_APCI1710_ReadChronoValue(struct comedi_device * dev,

	unsigned char b_ModulNbr,

	UINT ui_TimeOut, unsigned char * pb_ChronoStatus, PULONG pul_ChronoValue)

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

{

	int i_ReturnValue = 0;

	DWORD dw_Status;
@@ -1587,9 +1587,9 @@ int i_APCI1710_ReadChronoValue(struct comedi_device * dev, 
|                                PULONG_ pul_Hour,                           |

|                                unsigned char *_   pb_Minute,                         |

|                                unsigned char *_   pb_Second,                         |

|                                PUINT_  pui_MilliSecond,                    |

|                                PUINT_  pui_MicroSecond,                    |

|                                PUINT_  pui_NanoSecond)                     |

|                                unsigned int *_  pui_MilliSecond,                    |

|                                unsigned int *_  pui_MicroSecond,                    |

|                                unsigned int *_  pui_NanoSecond)                     |

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

| Task              : Convert the chronometer measured timing                |

|                     (ul_ChronoValue) in to h, mn, s, ms, µs, ns.           |
@@ -1603,11 +1603,11 @@ int i_APCI1710_ReadChronoValue(struct comedi_device * dev, 
| Output Parameters : PULONG_   pul_Hour        : Chronometer timing hour    |

|                     unsigned char *_     pb_Minute      : Chronometer timing minute  |

|                     unsigned char *_     pb_Second      : Chronometer timing second  |

|                     PUINT_    pui_MilliSecond  : Chronometer timing mini   |

|                     unsigned int *_    pui_MilliSecond  : Chronometer timing mini   |

|                                                 second                     |

|                     PUINT_    pui_MicroSecond : Chronometer timing micro   |

|                     unsigned int *_    pui_MicroSecond : Chronometer timing micro   |

|                                                 second                     |

|                     PUINT_    pui_NanoSecond  : Chronometer timing nano    |

|                     unsigned int *_    pui_NanoSecond  : Chronometer timing nano    |

|                                                 second                     |

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

| Return Value      :  0: No error                                           |
@@ -1625,7 +1625,7 @@ int i_APCI1710_ConvertChronoValue(struct comedi_device * dev, 
	PULONG pul_Hour,

	unsigned char * pb_Minute,

	unsigned char * pb_Second,

	PUINT pui_MilliSecond, PUINT pui_MicroSecond, PUINT pui_NanoSecond)

	unsigned int * pui_MilliSecond, unsigned int * pui_MicroSecond, unsigned int * pui_NanoSecond)

{

	int i_ReturnValue = 0;

	double d_Hour;
@@ -1705,7 +1705,7 @@ int i_APCI1710_ConvertChronoValue(struct comedi_device * dev, 


					d_MilliSecond = d_Second - *pb_Second;

					d_MilliSecond = d_MilliSecond * 1000;

					*pui_MilliSecond = (UINT) d_MilliSecond;

					*pui_MilliSecond = (unsigned int) d_MilliSecond;



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

					/* Calculate the micro second */
@@ -1715,7 +1715,7 @@ int i_APCI1710_ConvertChronoValue(struct comedi_device * dev, 
						d_MilliSecond -

						*pui_MilliSecond;

					d_MicroSecond = d_MicroSecond * 1000;

					*pui_MicroSecond = (UINT) d_MicroSecond;

					*pui_MicroSecond = (unsigned int) d_MicroSecond;



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

					/* Calculate the micro second */
@@ -1725,7 +1725,7 @@ int i_APCI1710_ConvertChronoValue(struct comedi_device * dev, 
						d_MicroSecond -

						*pui_MicroSecond;

					d_NanoSecond = d_NanoSecond * 1000;

					*pui_NanoSecond = (UINT) d_NanoSecond;

					*pui_NanoSecond = (unsigned int) d_NanoSecond;

					break;

				}

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

+3 −3
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ int i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev, 


int i_APCI1710_ReadChronoValue(struct comedi_device *dev,

			       unsigned char b_ModulNbr,

			       UINT ui_TimeOut, unsigned char * pb_ChronoStatus,

			       unsigned int ui_TimeOut, unsigned char * pb_ChronoStatus,

			       PULONG pul_ChronoValue);



int i_APCI1710_ConvertChronoValue(struct comedi_device *dev,
@@ -63,8 +63,8 @@ int i_APCI1710_ConvertChronoValue(struct comedi_device *dev, 
				  PULONG pul_Hour,

				  unsigned char * pb_Minute,

				  unsigned char * pb_Second,

				  PUINT pui_MilliSecond, PUINT pui_MicroSecond,

				  PUINT pui_NanoSecond);

				  unsigned int * pui_MilliSecond, unsigned int * pui_MicroSecond,

				  unsigned int * pui_NanoSecond);



/*

 * CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION

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

+22 −22
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ struct comedi_insn *insn,unsigned int *data) 
int i_APCI1710_InsnConfigINCCPT(struct comedi_device * dev, struct comedi_subdevice * s,

	struct comedi_insn * insn, unsigned int * data)

{

	UINT ui_ConfigType;

	unsigned int ui_ConfigType;

	int i_ReturnValue = 0;

	ui_ConfigType = CR_CHAN(insn->chanspec);
@@ -119,7 +119,7 @@ int i_APCI1710_InsnConfigINCCPT(struct comedi_device * dev, struct comedi_subdev 


	case APCI1710_INCCPT_INITCOMPARELOGIC:

		i_ReturnValue = i_APCI1710_InitCompareLogic(dev,

			CR_AREF(insn->chanspec), (UINT) data[0]);

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

		break;



	case APCI1710_INCCPT_INITFREQUENCYMEASUREMENT:
@@ -1370,7 +1370,7 @@ int i_APCI1710_InitExternalStrobe(struct comedi_device * dev, 
	   | Function Name     : _INT_ i_APCI1710_InitCompareLogic                      |

	   |                               (unsigned char_   b_BoardHandle,                      |

	   |                                unsigned char_   b_ModulNbr,                         |

	   |                                UINT_  ui_CompareValue)                     |

	   |                                unsigned int_  ui_CompareValue)                     |

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

	   | Task              : Set the 32-Bit compare value. At that moment that the  |

	   |                     incremental counter arrive to the compare value        |
@@ -1379,7 +1379,7 @@ int i_APCI1710_InitExternalStrobe(struct comedi_device * dev, 
	   | Input Parameters  : unsigned char_  b_BoardHandle    : Handle of board APCI-1710    |

	   |                     unsigned char_  b_ModulNbr       : Module number to configure   |

	   |                                               (0 to 3)                     |

	   |                     UINT_ ui_CompareValue   : 32-Bit compare value         |

	   |                     unsigned int_ ui_CompareValue   : 32-Bit compare value         |

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

	   | Output Parameters : -

	   +----------------------------------------------------------------------------+
@@ -1392,7 +1392,7 @@ int i_APCI1710_InitExternalStrobe(struct comedi_device * dev, 
	 */



int i_APCI1710_InitCompareLogic(struct comedi_device * dev,

	unsigned char b_ModulNbr, UINT ui_CompareValue)

	unsigned char b_ModulNbr, unsigned int ui_CompareValue)

{

	int i_ReturnValue = 0;
@@ -2018,7 +2018,7 @@ struct comedi_insn *insn,unsigned int *data) | 
int i_APCI1710_InsnBitsINCCPT(struct comedi_device * dev, struct comedi_subdevice * s,

	struct comedi_insn * insn, unsigned int * data)

{

	UINT ui_BitsType;

	unsigned int ui_BitsType;

	int i_ReturnValue = 0;

	ui_BitsType = CR_CHAN(insn->chanspec);

	devpriv->tsk_Current = current;	// Save the current process task structure
@@ -2954,7 +2954,7 @@ struct comedi_insn *insn,unsigned int *data) | 
int i_APCI1710_InsnWriteINCCPT(struct comedi_device * dev, struct comedi_subdevice * s,

	struct comedi_insn * insn, unsigned int * data)

{

	UINT ui_WriteType;

	unsigned int ui_WriteType;

	int i_ReturnValue = 0;



	ui_WriteType = CR_CHAN(insn->chanspec);
@@ -2974,7 +2974,7 @@ int i_APCI1710_InsnWriteINCCPT(struct comedi_device * dev, struct comedi_subdevi 
	case APCI1710_INCCPT_WRITE16BITCOUNTERVALUE:

		i_ReturnValue = i_APCI1710_Write16BitCounterValue(dev,

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

			(unsigned char) data[0], (UINT) data[1]);

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

		break;



	case APCI1710_INCCPT_WRITE32BITCOUNTERVALUE:
@@ -3207,7 +3207,7 @@ int i_APCI1710_DisableLatchInterrupt(struct comedi_device * dev, unsigned char b 
|                                               (unsigned char_  b_BoardHandle        |

|                                                unsigned char_  b_ModulNbr,          |

|                                                unsigned char_  b_SelectedCounter,   |

|                                                UINT_ ui_WriteValue)        |

|                                                unsigned int_ ui_WriteValue)        |

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

| Task              : Write a 16-Bit value (ui_WriteValue) in to the selected|

|                     16-Bit counter (b_SelectedCounter) from selected module|
@@ -3218,7 +3218,7 @@ int i_APCI1710_DisableLatchInterrupt(struct comedi_device * dev, unsigned char b 
|                                              (0 to 3)                      |

|                     unsigned char_ b_SelectedCounter : Selected 16-Bit counter      |

|                                               (0 or 1)                     |

|                     UINT_ ui_WriteValue     : 16-Bit write value           |

|                     unsigned int_ ui_WriteValue     : 16-Bit write value           |

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

| Output Parameters : -                                                      |

+----------------------------------------------------------------------------+
@@ -3232,7 +3232,7 @@ int i_APCI1710_DisableLatchInterrupt(struct comedi_device * dev, unsigned char b 
*/



int i_APCI1710_Write16BitCounterValue(struct comedi_device * dev,

	unsigned char b_ModulNbr, unsigned char b_SelectedCounter, UINT ui_WriteValue)

	unsigned char b_ModulNbr, unsigned char b_SelectedCounter, unsigned int ui_WriteValue)

{

	int i_ReturnValue = 0;
@@ -4052,7 +4052,7 @@ struct comedi_insn *insn,unsigned int *data) | 
int i_APCI1710_InsnReadINCCPT(struct comedi_device * dev, struct comedi_subdevice * s,

	struct comedi_insn * insn, unsigned int * data)

{

	UINT ui_ReadType;

	unsigned int ui_ReadType;

	int i_ReturnValue = 0;



	ui_ReadType = CR_CHAN(insn->chanspec);
@@ -4075,7 +4075,7 @@ int i_APCI1710_InsnReadINCCPT(struct comedi_device * dev, struct comedi_subdevic 
	case APCI1710_INCCPT_READ16BITCOUNTERVALUE:

		i_ReturnValue = i_APCI1710_Read16BitCounterValue(dev,

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

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

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

		break;



	case APCI1710_INCCPT_READ32BITCOUNTERVALUE:
@@ -4341,7 +4341,7 @@ int i_APCI1710_ReadLatchRegisterValue(struct comedi_device * dev, 
|                                       (unsigned char_     b_BoardHandle,            |

|                                        unsigned char_     b_ModulNbr,               |

|                                        unsigned char_     b_SelectedCounter,        |

|                                        PUINT_   pui_CounterValue)          |

|                                        unsigned int *_   pui_CounterValue)          |

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

| Task              : Latch the selected 16-Bit counter (b_SelectedCounter)  |

|                     from selected module (b_ModulNbr) in to the first      |
@@ -4353,7 +4353,7 @@ int i_APCI1710_ReadLatchRegisterValue(struct comedi_device * dev, 
|                     unsigned char_ b_SelectedCounter : Selected 16-Bit counter      |

|                                               (0 or 1)                     |

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

| Output Parameters : PUINT_ pui_CounterValue : 16-Bit counter value         |

| Output Parameters : unsigned int *_ pui_CounterValue : 16-Bit counter value         |

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

| Return Value      :  0: No error                                           |

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



int i_APCI1710_Read16BitCounterValue(struct comedi_device * dev,

	unsigned char b_ModulNbr, unsigned char b_SelectedCounter, PUINT pui_CounterValue)

	unsigned char b_ModulNbr, unsigned char b_SelectedCounter, unsigned int * pui_CounterValue)

{

	int i_ReturnValue = 0;

	DWORD dw_LathchValue = 0;
@@ -4402,7 +4402,7 @@ int i_APCI1710_Read16BitCounterValue(struct comedi_device * dev, 
					ui_Address + 4 + (64 * b_ModulNbr));



				*pui_CounterValue =

					(UINT) ((dw_LathchValue >> (16 *

					(unsigned int) ((dw_LathchValue >> (16 *

							b_SelectedCounter)) &

					0xFFFFU);

			} else {
@@ -5150,7 +5150,7 @@ int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device * dev, 
	unsigned char * pb_Status, unsigned char * pb_UDStatus, PULONG pul_ReadValue)

{

	int i_ReturnValue = 0;

	UINT ui_16BitValue;

	unsigned int ui_16BitValue;

	DWORD dw_StatusReg;



	/**************************/
@@ -5224,7 +5224,7 @@ int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device * dev, 
								if ((*pul_ReadValue & 0xFFFFU) != 0) {

									ui_16BitValue

										=

										(UINT)

										(unsigned int)

										*

										pul_ReadValue

										&
@@ -5247,7 +5247,7 @@ int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device * dev, 
								if ((*pul_ReadValue & 0xFFFF0000UL) != 0) {

									ui_16BitValue

										=

										(UINT)

										(unsigned int)

										(

										(*pul_ReadValue

											>>
@@ -5281,7 +5281,7 @@ int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device * dev, 
								if ((*pul_ReadValue & 0xFFFF0000UL) != 0) {

									ui_16BitValue

										=

										(UINT)

										(unsigned int)

										(

										(*pul_ReadValue

											>>
@@ -5307,7 +5307,7 @@ int i_APCI1710_ReadFrequencyMeasurement(struct comedi_device * dev, 
									if ((*pul_ReadValue & 0xFFFFU) != 0) {

										ui_16BitValue

											=

											(UINT)

											(unsigned int)

											*

											pul_ReadValue

											&

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

+3 −3
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ int i_APCI1710_InitExternalStrobe(struct comedi_device *dev, 
				  unsigned char b_ExternalStrobeLevel);



int i_APCI1710_InitCompareLogic(struct comedi_device *dev,

				unsigned char b_ModulNbr, UINT ui_CompareValue);

				unsigned char b_ModulNbr, unsigned int ui_CompareValue);



int i_APCI1710_InitFrequencyMeasurement(struct comedi_device *dev,

					unsigned char b_ModulNbr,
@@ -207,7 +207,7 @@ int i_APCI1710_DisableLatchInterrupt(struct comedi_device *dev, unsigned char b_ 


int i_APCI1710_Write16BitCounterValue(struct comedi_device *dev,

				      unsigned char b_ModulNbr, unsigned char b_SelectedCounter,

				      UINT ui_WriteValue);

				      unsigned int ui_WriteValue);



int i_APCI1710_Write32BitCounterValue(struct comedi_device *dev,

				      unsigned char b_ModulNbr, ULONG ul_WriteValue);
@@ -238,7 +238,7 @@ int i_APCI1710_ReadLatchRegisterValue(struct comedi_device *dev, 


int i_APCI1710_Read16BitCounterValue(struct comedi_device *dev,

				     unsigned char b_ModulNbr, unsigned char b_SelectedCounter,

				     PUINT pui_CounterValue);

				     unsigned int * pui_CounterValue);



int i_APCI1710_Read32BitCounterValue(struct comedi_device *dev,

				     unsigned char b_ModulNbr, PULONG pul_CounterValue);

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

+2 −2
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ int i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, struct comedi_subde 
	struct comedi_insn * insn, unsigned int * data)

{

	int i_ReturnValue = 0;

	UINT ui_TimerValue;

	unsigned int ui_TimerValue;

	unsigned char b_ModulNbr, b_SSIProfile, b_PositionTurnLength, b_TurnCptLength,

		b_PCIInputClock, b_SSICountingMode;

	ULONG ul_SSIOutputClock;
@@ -250,7 +250,7 @@ int i_APCI1710_InsnConfigInitSSI(struct comedi_device * dev, struct comedi_subde 


										ui_TimerValue

											=

											(UINT)

											(unsigned int)

											(

											((ULONG) (b_PCIInputClock) * 500000UL) / ul_SSIOutputClock);