Commit 74b894e5 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

Staging: comedi: Remove INT and *PINT typedefs in addi-data 



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

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

+19 −19
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
|                                unsigned char_   b_InputClockLevel,                  |

|                                unsigned char_   b_OutputLevel,                      |

|                                unsigned char_   b_HardwareGateLevel)

INT i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s,

int i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s,

	struct comedi_insn *insn,unsigned int *data)

|

+----------------------------------------------------------------------------+
@@ -219,11 +219,11 @@ INT i_InsnConfig_InitTimer(struct comedi_device *dev,struct comedi_subdevice *s, 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_subdevice * s,

int i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_subdevice * s,

				   struct comedi_insn * insn, unsigned int * data)

{



	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	unsigned char b_ModulNbr;

	unsigned char b_TimerNbr;

	unsigned char b_TimerMode;
@@ -406,7 +406,7 @@ INT i_APCI1710_InsnConfigInitTimer(struct comedi_device * dev, struct comedi_sub 
|                                unsigned char_ b_ModulNbr,                           |

|                                unsigned char_ b_TimerNbr,                           |

|                                unsigned char_ b_InterruptEnable)

INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,struct comedi_subdevice *s,

int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,struct comedi_subdevice *s,

	struct comedi_insn *insn,unsigned int *data)                |

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

| Task              : Enable OR Disable the Timer (b_TimerNbr) from selected module     |
@@ -448,11 +448,11 @@ i_ReturnValue=insn->n; 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev,

int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev,

					   struct comedi_subdevice * s,

					   struct comedi_insn * insn, unsigned int * data)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	DWORD dw_DummyRead;

	unsigned char b_ModulNbr;

	unsigned char b_TimerNbr;
@@ -561,7 +561,7 @@ INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device * dev, 
|                                       (unsigned char_     b_BoardHandle,            |

|                                        unsigned char_     b_ModulNbr,               |

|                                        PULONG_ pul_TimerValueArray)

INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,struct comedi_subdevice *s,

int i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,struct comedi_subdevice *s,

	struct comedi_insn *insn,unsigned int *data)        |

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

| Task              : Return the all timer values from selected timer        |
@@ -590,10 +590,10 @@ INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev,struct comedi_sub 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_subdevice *s,

int i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_subdevice *s,

				     struct comedi_insn *insn, unsigned int *data)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	unsigned char b_ModulNbr, b_ReadType;

	PULONG pul_TimerValueArray;
@@ -681,11 +681,11 @@ struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice * s,

int i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice * s,

			     struct comedi_insn * insn, unsigned int * data)

{

	unsigned char b_BitsType;

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	b_BitsType = data[0];



	printk("\n82X54");
@@ -760,11 +760,11 @@ INT i_APCI1710_InsnBitsTimer(struct comedi_device * dev, struct comedi_subdevice 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_ReadTimerValue(struct comedi_device * dev,

int i_APCI1710_ReadTimerValue(struct comedi_device * dev,

			      unsigned char b_ModulNbr, unsigned char b_TimerNbr,

			      PULONG pul_TimerValue)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;



	/* Test the module number */

	if (b_ModulNbr < 4) {
@@ -848,11 +848,11 @@ INT i_APCI1710_ReadTimerValue(struct comedi_device * dev, 
	   +----------------------------------------------------------------------------+

	 */



INT i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev,

int i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev,

				   unsigned char b_ModulNbr, unsigned char b_TimerNbr,

				   unsigned char * pb_OutputLevel)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	DWORD dw_TimerStatus;



	/* Test the module number */
@@ -927,11 +927,11 @@ INT i_APCI1710_GetTimerOutputLevel(struct comedi_device * dev, 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,

int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,

				      unsigned char b_ModulNbr, unsigned char b_TimerNbr,

				      unsigned char * pb_TimerStatus)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	DWORD dw_TimerStatus;



	/* Test the module number */
@@ -1006,11 +1006,11 @@ INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev, 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_WriteTimerValue(struct comedi_device * dev,

int i_APCI1710_WriteTimerValue(struct comedi_device * dev,

			       unsigned char b_ModulNbr, unsigned char b_TimerNbr,

			       ULONG ul_WriteValue)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;



	/* Test the module number */

	if (b_ModulNbr < 4) {

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

+8 −8
Original line number Diff line number Diff line
@@ -34,40 +34,40 @@ 
/*

 * 82X54 TIMER INISIALISATION FUNCTION

 */

INT i_APCI1710_InsnConfigInitTimer(struct comedi_device *dev, struct comedi_subdevice *s,

int i_APCI1710_InsnConfigInitTimer(struct comedi_device *dev, struct comedi_subdevice *s,

				   struct comedi_insn *insn, unsigned int *data);



INT i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,

int i_APCI1710_InsnWriteEnableDisableTimer(struct comedi_device *dev,

					   struct comedi_subdevice *s,

					   struct comedi_insn *insn, unsigned int *data);



/*

 * 82X54 READ FUNCTION

 */

INT i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_subdevice *s,

int i_APCI1710_InsnReadAllTimerValue(struct comedi_device *dev, struct comedi_subdevice *s,

				     struct comedi_insn *insn, unsigned int *data);



INT i_APCI1710_InsnBitsTimer(struct comedi_device *dev, struct comedi_subdevice *s,

int i_APCI1710_InsnBitsTimer(struct comedi_device *dev, struct comedi_subdevice *s,

			     struct comedi_insn *insn, unsigned int *data);



/*

 * 82X54 READ & WRITE FUNCTION

 */

INT i_APCI1710_ReadTimerValue(struct comedi_device *dev,

int i_APCI1710_ReadTimerValue(struct comedi_device *dev,

			      unsigned char b_ModulNbr, unsigned char b_TimerNbr,

			      PULONG pul_TimerValue);



INT i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev,

int i_APCI1710_GetTimerOutputLevel(struct comedi_device *dev,

				   unsigned char b_ModulNbr, unsigned char b_TimerNbr,

				   unsigned char * pb_OutputLevel);



INT i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,

int i_APCI1710_GetTimerProgressStatus(struct comedi_device *dev,

				      unsigned char b_ModulNbr, unsigned char b_TimerNbr,

				      unsigned char * pb_TimerStatus);



/*

 * 82X54 WRITE FUNCTION

 */

INT i_APCI1710_WriteTimerValue(struct comedi_device *dev,

int i_APCI1710_WriteTimerValue(struct comedi_device *dev,

			       unsigned char b_ModulNbr, unsigned char b_TimerNbr,

			       ULONG ul_WriteValue);

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

+16 −16
Original line number Diff line number Diff line
@@ -131,10 +131,10 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_subdevice * s,

int i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_subdevice * s,

	struct comedi_insn * insn, unsigned int * data)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	ULONG ul_TimerValue = 0;

	ULONG ul_TimingInterval = 0;

	ULONG ul_RealTimingInterval = 0;
@@ -790,7 +790,7 @@ INT i_APCI1710_InsnConfigInitChrono(struct comedi_device * dev, struct comedi_su 
|                                                unsigned char_ b_ModulNbr,           |

|                                                unsigned char_ b_CycleMode,          |

|                                                unsigned char_ b_InterruptEnable)

INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,

int i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,

struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)						 |

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

| Task              : Enable the chronometer from selected module            |
@@ -840,10 +840,10 @@ struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data) | 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device * dev,

int i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device * dev,

	struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	unsigned char b_ModulNbr, b_CycleMode, b_InterruptEnable, b_Action;

	b_ModulNbr = CR_AREF(insn->chanspec);

	b_Action = (unsigned char) data[0];
@@ -1090,11 +1090,11 @@ struct comedi_insn *insn,unsigned int *data) | 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevice * s,

int i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevice * s,

	struct comedi_insn * insn, unsigned int * data)

{

	unsigned char b_ReadType;

	INT i_ReturnValue = insn->n;

	int i_ReturnValue = insn->n;



	b_ReadType = CR_CHAN(insn->chanspec);
@@ -1194,10 +1194,10 @@ INT i_APCI1710_InsnReadChrono(struct comedi_device * dev, struct comedi_subdevic 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev,

int i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev,

	unsigned char b_ModulNbr, unsigned char * pb_ChronoStatus)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	DWORD dw_Status;



	/**************************/
@@ -1355,11 +1355,11 @@ INT i_APCI1710_GetChronoProgressStatus(struct comedi_device * dev, 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_ReadChronoValue(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)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	DWORD dw_Status;

	DWORD dw_TimeOut = 0;
@@ -1619,7 +1619,7 @@ INT i_APCI1710_ReadChronoValue(struct comedi_device * dev, 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev,

int i_APCI1710_ConvertChronoValue(struct comedi_device * dev,

	unsigned char b_ModulNbr,

	ULONG ul_ChronoValue,

	PULONG pul_Hour,
@@ -1627,7 +1627,7 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev, 
	unsigned char * pb_Second,

	PUINT pui_MilliSecond, PUINT pui_MicroSecond, PUINT pui_NanoSecond)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	double d_Hour;

	double d_Minute;

	double d_Second;
@@ -1757,7 +1757,7 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev, 


/*

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

| Function Name     : INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,struct comedi_subdevice *s,

| Function Name     : int i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,struct comedi_subdevice *s,

	struct comedi_insn *insn,unsigned int *data)                    |

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

| Task              : Sets the output witch has been passed with the         |
@@ -1876,10 +1876,10 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device * dev, 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev,

int i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device * dev,

	struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	unsigned char b_ModulNbr, b_OutputChannel, b_InputChannel, b_IOType;

	DWORD dw_Status;

	unsigned char * pb_ChannelStatus;

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

+7 −7
Original line number Diff line number Diff line
@@ -35,10 +35,10 @@ 
/*

 * CHRONOMETER INISIALISATION FUNCTION

 */

INT i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, struct comedi_subdevice *s,

int i_APCI1710_InsnConfigInitChrono(struct comedi_device *dev, struct comedi_subdevice *s,

				    struct comedi_insn *insn, unsigned int *data);



INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,

int i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev,

					    struct comedi_subdevice *s,

					    struct comedi_insn *insn,

					    unsigned int *data);
@@ -46,18 +46,18 @@ INT i_APCI1710_InsnWriteEnableDisableChrono(struct comedi_device *dev, 
/*

 * CHRONOMETER READ FUNCTION

 */

INT i_APCI1710_InsnReadChrono(struct comedi_device *dev, struct comedi_subdevice *s,

int i_APCI1710_InsnReadChrono(struct comedi_device *dev, struct comedi_subdevice *s,

			      struct comedi_insn *insn, unsigned int *data);



INT i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev,

int i_APCI1710_GetChronoProgressStatus(struct comedi_device *dev,

				       unsigned char b_ModulNbr, unsigned char * pb_ChronoStatus);



INT i_APCI1710_ReadChronoValue(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);



INT i_APCI1710_ConvertChronoValue(struct comedi_device *dev,

int i_APCI1710_ConvertChronoValue(struct comedi_device *dev,

				  unsigned char b_ModulNbr,

				  ULONG ul_ChronoValue,

				  PULONG pul_Hour,
@@ -69,6 +69,6 @@ INT i_APCI1710_ConvertChronoValue(struct comedi_device *dev, 
/*

 * CHRONOMETER DIGITAL INPUT OUTPUT FUNCTION

 */

INT i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,

int i_APCI1710_InsnBitsChronoDigitalIO(struct comedi_device *dev,

				       struct comedi_subdevice *s, struct comedi_insn *insn,

				       unsigned int *data);

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

+10 −10
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ You shoud also find the complete GPL in the COPYING file accompanying this sourc 


/*

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

| Function Name     : INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, |

| Function Name     : int i_APCI1710_InsnConfigDigitalIO(struct comedi_device *dev, |

|						struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)|

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

| Task              : Configure the digital I/O operating mode from selected |
@@ -99,12 +99,12 @@ Activates and deactivates the digital output memory. 
+----------------------------------------------------------------------------+

*/



INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_subdevice * s,

int i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_subdevice * s,

	struct comedi_insn * insn, unsigned int * data)

{

	unsigned char b_ModulNbr, b_ChannelAMode, b_ChannelBMode;

	unsigned char b_MemoryOnOff, b_ConfigType;

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	DWORD dw_WriteConfig = 0;



	b_ModulNbr = (unsigned char) CR_AREF(insn->chanspec);
@@ -293,10 +293,10 @@ INT i_APCI1710_InsnConfigDigitalIO(struct comedi_device * dev, struct comedi_sub 
//                                             unsigned char_    b_InputChannel,

//

//                                             unsigned char *_  pb_ChannelStatus)

INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev,

int i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev,

	struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	DWORD dw_StatusReg;

	unsigned char b_ModulNbr, b_InputChannel;

	unsigned char * pb_ChannelStatus;
@@ -445,7 +445,7 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, 


/*

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

| Function Name     : INT i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device

| Function Name     : int i_APCI1710_InsnWriteDigitalIOChlOnOff(comedi_device

|*dev,struct comedi_subdevice *s,struct comedi_insn *insn,unsigned int *data)



+----------------------------------------------------------------------------+
@@ -481,10 +481,10 @@ INT i_APCI1710_InsnReadDigitalIOChlValue(struct comedi_device * dev, 
//_INT_   i_APCI1710_SetDigitalIOChlOn    (unsigned char_ b_BoardHandle,

//                                       unsigned char_ b_ModulNbr,

//                                       unsigned char_ b_OutputChannel)

INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev,

int i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev,

	struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	DWORD dw_WriteValue = 0;

	unsigned char b_ModulNbr, b_OutputChannel;

	i_ReturnValue = insn->n;
@@ -728,10 +728,10 @@ INT i_APCI1710_InsnWriteDigitalIOChlOnOff(struct comedi_device * dev, 
//_INT_   i_APCI1710_SetDigitalIOPortOn   (unsigned char_ b_BoardHandle,

//                                       unsigned char_ b_ModulNbr,

//                                       unsigned char_ b_PortValue)

INT i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev,

int i_APCI1710_InsnBitsDigitalIOPortOnOff(struct comedi_device * dev,

	struct comedi_subdevice * s, struct comedi_insn * insn, unsigned int * data)

{

	INT i_ReturnValue = 0;

	int i_ReturnValue = 0;

	DWORD dw_WriteValue = 0;

	DWORD dw_StatusReg;

	unsigned char b_ModulNbr, b_PortValue;